Commit e4df9f02 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'more-fixes-for-the-ipa-driver' 

Luca Weiss says:

====================
More fixes for the IPA driver

Two more fixes for the Qualcomm IPA driver.
====================

Link: https://patch.msgid.link/20260409-ipa-fixes-v1-0-a817c30678ac@fairphone.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2bb63794 1335b903

drivers/net/ipa/gsi.c

+1 −0
Original line number Diff line number Diff line
@@ -2044,6 +2044,7 @@ static int gsi_ring_setup(struct gsi *gsi) 
		count = reg_decode(reg, NUM_EV_PER_EE, val);

	} else {

		reg = gsi_reg(gsi, HW_PARAM_4);

		val = ioread32(gsi->virt + reg_offset(reg));

		count = reg_decode(reg, EV_PER_EE, val);

	}

	if (!count) {

drivers/net/ipa/ipa_main.c

+3 −3
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static void ipa_qtime_config(struct ipa *ipa) 
{

	const struct reg *reg;

	u32 offset;

	u32 val;

	u32 val = 0;



	/* Timer clock divider must be disabled when we change the rate */

	reg = ipa_reg(ipa, TIMERS_XO_CLK_DIV_CFG);
@@ -374,8 +374,8 @@ static void ipa_qtime_config(struct ipa *ipa) 
		val |= reg_bit(reg, DPL_TIMESTAMP_SEL);

	}

	/* Configure tag and NAT Qtime timestamp resolution as well */

	val = reg_encode(reg, TAG_TIMESTAMP_LSB, TAG_TIMESTAMP_SHIFT);

	val = reg_encode(reg, NAT_TIMESTAMP_LSB, NAT_TIMESTAMP_SHIFT);

	val |= reg_encode(reg, TAG_TIMESTAMP_LSB, TAG_TIMESTAMP_SHIFT);

	val |= reg_encode(reg, NAT_TIMESTAMP_LSB, NAT_TIMESTAMP_SHIFT);



	iowrite32(val, ipa->reg_virt + reg_offset(reg));