ath11k: Fix napi related hang

[ Upstream commit d943fdad7589653065be0e20aadc6dff37725ed4 ]

Similar to the same bug in ath10k, a napi disable w/out it being enabled
will hang forever.  I believe I saw this while trying rmmod after driver
had some failure on startup.  Fix it by keeping state on whether napi is
enabled or not.

And, remove un-used napi pointer in ath11k driver base struct.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20200903195254.29379-1-greearb@candelatech.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index e8cca58e18ffc85c9e8062a271145dbce08baf8a..9ff6e685331424df67c8ea1ae10d1bdacb1c7988 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -175,8 +175,11 @@ static void __ath11k_ahb_ext_irq_disable(struct ath11k_base *ab)
 
                ath11k_ahb_ext_grp_disable(irq_grp);
 
-               napi_synchronize(&irq_grp->napi);
-               napi_disable(&irq_grp->napi);
+               if (irq_grp->napi_enabled) {
+                       napi_synchronize(&irq_grp->napi);
+                       napi_disable(&irq_grp->napi);
+                       irq_grp->napi_enabled = false;
+               }
        }
 }
 
@@ -300,7 +303,10 @@ static void ath11k_ahb_ext_irq_enable(struct ath11k_base *ab)
        for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {
                struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
 
-               napi_enable(&irq_grp->napi);
+               if (!irq_grp->napi_enabled) {
+                       napi_enable(&irq_grp->napi);
+                       irq_grp->napi_enabled = true;
+               }
                ath11k_ahb_ext_grp_enable(irq_grp);
        }
 }

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index c8e36251068c9861bb75521be380f0dabfd2bed4..d2f2898d17b498967e646289bdd61d772d62f528 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -124,6 +124,7 @@ struct ath11k_ext_irq_grp {
        u32 num_irq;
        u32 grp_id;
        u64 timestamp;
+       bool napi_enabled;
        struct napi_struct napi;
        struct net_device napi_ndev;
 };
@@ -687,7 +688,6 @@ struct ath11k_base {
        u32 wlan_init_status;
        int irq_num[ATH11K_IRQ_NUM_MAX];
        struct ath11k_ext_irq_grp ext_irq_grp[ATH11K_EXT_IRQ_GRP_NUM_MAX];
-       struct napi_struct *napi;
        struct ath11k_targ_cap target_caps;
        u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE];
        bool pdevs_macaddr_valid;

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index d7eb6b7160bb4ff204c4a2c29819f73b90b92cd5..105e344240c100f1d9e31de57e27b467750cd485 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -416,8 +416,11 @@ static void __ath11k_pci_ext_irq_disable(struct ath11k_base *sc)
 
                ath11k_pci_ext_grp_disable(irq_grp);
 
-               napi_synchronize(&irq_grp->napi);
-               napi_disable(&irq_grp->napi);
+               if (irq_grp->napi_enabled) {
+                       napi_synchronize(&irq_grp->napi);
+                       napi_disable(&irq_grp->napi);
+                       irq_grp->napi_enabled = false;
+               }
        }
 }
 
@@ -436,7 +439,10 @@ static void ath11k_pci_ext_irq_enable(struct ath11k_base *ab)
        for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) {
                struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i];
 
-               napi_enable(&irq_grp->napi);
+               if (!irq_grp->napi_enabled) {
+                       napi_enable(&irq_grp->napi);
+                       irq_grp->napi_enabled = true;
+               }
                ath11k_pci_ext_grp_enable(irq_grp);
        }
 }