wil6210: fix PCIe bus mastering in case of interface down

In case of interface down, radio is turned off but PCIe mastering is
not cleared.
This can cause unexpected PCIe access to the shutdown device.
Fix this by clearing PCIe mastering also in case interface is down

Signed-off-by: Lazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index fdab8a534daaf88e12d118556be4cf3af60801e7..0592c73745cbb4284f9ba76554c23ddda5b48e1d 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -379,6 +379,9 @@ static int wil6210_suspend(struct device *dev, bool is_runtime)
        int rc = 0;
        struct pci_dev *pdev = to_pci_dev(dev);
        struct wil6210_priv *wil = pci_get_drvdata(pdev);
+       struct net_device *ndev = wil_to_ndev(wil);
+       bool keep_radio_on = ndev->flags & IFF_UP &&
+                            wil->keep_radio_on_during_sleep;
 
        wil_dbg_pm(wil, "suspend: %s\n", is_runtime ? "runtime" : "system");
 
@@ -386,14 +389,14 @@ static int wil6210_suspend(struct device *dev, bool is_runtime)
        if (rc)
                goto out;
 
-       rc = wil_suspend(wil, is_runtime);
+       rc = wil_suspend(wil, is_runtime, keep_radio_on);
        if (!rc) {
                wil->suspend_stats.successful_suspends++;
 
-               /* If platform device supports keep_radio_on_during_sleep
-                * it will control PCIe master
+               /* In case radio stays on, platform device will control
+                * PCIe master
                 */
-               if (!wil->keep_radio_on_during_sleep)
+               if (!keep_radio_on)
                        /* disable bus mastering */
                        pci_clear_master(pdev);
        }
@@ -406,20 +409,23 @@ static int wil6210_resume(struct device *dev, bool is_runtime)
        int rc = 0;
        struct pci_dev *pdev = to_pci_dev(dev);
        struct wil6210_priv *wil = pci_get_drvdata(pdev);
+       struct net_device *ndev = wil_to_ndev(wil);
+       bool keep_radio_on = ndev->flags & IFF_UP &&
+                            wil->keep_radio_on_during_sleep;
 
        wil_dbg_pm(wil, "resume: %s\n", is_runtime ? "runtime" : "system");
 
-       /* If platform device supports keep_radio_on_during_sleep it will
-        * control PCIe master
+       /* In case radio stays on, platform device will control
+        * PCIe master
         */
-       if (!wil->keep_radio_on_during_sleep)
+       if (!keep_radio_on)
                /* allow master */
                pci_set_master(pdev);
-       rc = wil_resume(wil, is_runtime);
+       rc = wil_resume(wil, is_runtime, keep_radio_on);
        if (rc) {
                wil_err(wil, "device failed to resume (%d)\n", rc);
                wil->suspend_stats.failed_resumes++;
-               if (!wil->keep_radio_on_during_sleep)
+               if (!keep_radio_on)
                        pci_clear_master(pdev);
        } else {
                wil->suspend_stats.successful_resumes++;

diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c
index 43699ac8ecd9ac83d3968b6ee6d71263eb4db0ee..6fd5420e3e9d01510a37ed8df7abe0eec61f4232 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pm.c
+++ b/drivers/net/wireless/ath/wil6210/pm.c
@@ -304,12 +304,9 @@ static int wil_resume_radio_off(struct wil6210_priv *wil)
        return rc;
 }
 
-int wil_suspend(struct wil6210_priv *wil, bool is_runtime)
+int wil_suspend(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on)
 {
        int rc = 0;
-       struct net_device *ndev = wil_to_ndev(wil);
-       bool keep_radio_on = ndev->flags & IFF_UP &&
-                            wil->keep_radio_on_during_sleep;
 
        wil_dbg_pm(wil, "suspend: %s\n", is_runtime ? "runtime" : "system");
 
@@ -332,12 +329,9 @@ int wil_suspend(struct wil6210_priv *wil, bool is_runtime)
        return rc;
 }
 
-int wil_resume(struct wil6210_priv *wil, bool is_runtime)
+int wil_resume(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on)
 {
        int rc = 0;
-       struct net_device *ndev = wil_to_ndev(wil);
-       bool keep_radio_on = ndev->flags & IFF_UP &&
-                            wil->keep_radio_on_during_sleep;
        unsigned long long suspend_time_usec = 0;
 
        wil_dbg_pm(wil, "resume: %s\n", is_runtime ? "runtime" : "system");

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 48802aebc6515d3a78c94ebbec70cdafc81f3c1b..7e017b13d14e809c24beeaddc37e0f40e0da610c 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -1016,8 +1016,8 @@ int wil_pm_runtime_get(struct wil6210_priv *wil);
 void wil_pm_runtime_put(struct wil6210_priv *wil);
 
 int wil_can_suspend(struct wil6210_priv *wil, bool is_runtime);
-int wil_suspend(struct wil6210_priv *wil, bool is_runtime);
-int wil_resume(struct wil6210_priv *wil, bool is_runtime);
+int wil_suspend(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on);
+int wil_resume(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on);
 bool wil_is_wmi_idle(struct wil6210_priv *wil);
 int wmi_resume(struct wil6210_priv *wil);
 int wmi_suspend(struct wil6210_priv *wil);