]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: ipa: use proper endpoint mask for suspend
authorAlex Elder <elder@linaro.org>
Fri, 30 Dec 2022 22:33:04 +0000 (16:33 -0600)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Jan 2023 12:01:14 +0000 (12:01 +0000)
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: f298ba785e2d ("net: ipa: add a parameter to suspend registers")
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ipa/ipa_interrupt.c

index a49f66efacb8750a50f8467007d002897fac2bb0..d458a35839cce9efff1a61ef60ff8f30a451d747 100644 (file)
@@ -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