Commit d9d71a89 authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: use proper endpoint mask for suspend 



It is now possible for a system to have more than 32 endpoints.  As
a result, registers related to endpoint suspend are parameterized,
with 32 endpoints represented in one more registers.

In ipa_interrupt_suspend_control(), the IPA_SUSPEND_EN register
offset is determined properly, but the bit mask used still assumes
the number of enpoints won't exceed 32.  This is a bug.  Fix it.

Fixes: f298ba78 ("net: ipa: add a parameter to suspend registers")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c429c10

drivers/net/ipa/ipa_interrupt.c

+1 −2
Original line number Diff line number Diff line
@@ -132,10 +132,10 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, 
					  u32 endpoint_id, bool enable)

{

	struct ipa *ipa = interrupt->ipa;

	u32 mask = BIT(endpoint_id % 32);

	u32 unit = endpoint_id / 32;

	const struct ipa_reg *reg;

	u32 offset;

	u32 mask;

	u32 val;



	WARN_ON(!test_bit(endpoint_id, ipa->available));
@@ -148,7 +148,6 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, 
	offset = ipa_reg_n_offset(reg, unit);

	val = ioread32(ipa->reg_virt + offset);



	mask = BIT(endpoint_id);

	if (enable)

		val |= mask;

	else