mwifiex: Enable WoWLAN for both sdio and pcie

Commit ce4f6f0c353b ("mwifiex: add platform specific wakeup interrupt
support") added WoWLAN feature only for sdio. This patch moves that
code to the common module so that all the interface drivers can use
it for free. It enables pcie and sdio for its use currently.

Signed-off-by: Rajat Jain <rajatja@google.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 835d330140862dd38b1e4d67aec13ca0675bcbc8..948f5c26c1f080694401ce0c9a5642def5c0a259 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1552,14 +1552,55 @@ void mwifiex_do_flr(struct mwifiex_adapter *adapter, bool prepare)
 }
 EXPORT_SYMBOL_GPL(mwifiex_do_flr);
 
+static irqreturn_t mwifiex_irq_wakeup_handler(int irq, void *priv)
+{
+       struct mwifiex_adapter *adapter = priv;
+
+       if (adapter->irq_wakeup >= 0) {
+               dev_dbg(adapter->dev, "%s: wake by wifi", __func__);
+               adapter->wake_by_wifi = true;
+               disable_irq_nosync(irq);
+       }
+
+       /* Notify PM core we are wakeup source */
+       pm_wakeup_event(adapter->dev, 0);
+
+       return IRQ_HANDLED;
+}
+
 static void mwifiex_probe_of(struct mwifiex_adapter *adapter)
 {
+       int ret;
        struct device *dev = adapter->dev;
 
        if (!dev->of_node)
                return;
 
        adapter->dt_node = dev->of_node;
+       adapter->irq_wakeup = irq_of_parse_and_map(adapter->dt_node, 0);
+       if (!adapter->irq_wakeup) {
+               dev_info(dev, "fail to parse irq_wakeup from device tree\n");
+               return;
+       }
+
+       ret = devm_request_irq(dev, adapter->irq_wakeup,
+                              mwifiex_irq_wakeup_handler, IRQF_TRIGGER_LOW,
+                              "wifi_wake", adapter);
+       if (ret) {
+               dev_err(dev, "Failed to request irq_wakeup %d (%d)\n",
+                       adapter->irq_wakeup, ret);
+               goto err_exit;
+       }
+
+       disable_irq(adapter->irq_wakeup);
+       if (device_init_wakeup(dev, true)) {
+               dev_err(dev, "fail to init wakeup for mwifiex\n");
+               goto err_exit;
+       }
+       return;
+
+err_exit:
+       adapter->irq_wakeup = 0;
 }
 
 /*

diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
index 549e1ba89576af1af7f1b82625e377df27c1b758..ae5afe5829eadd46776e7f08c722c6f7ad94bb00 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/main.h
+++ b/drivers/net/wireless/marvell/mwifiex/main.h
@@ -1011,6 +1011,10 @@ struct mwifiex_adapter {
        bool usb_mc_setup;
        struct cfg80211_wowlan_nd_info *nd_info;
        struct ieee80211_regdomain *regd;
+
+       /* Wake-on-WLAN (WoWLAN) */
+       int irq_wakeup;
+       bool wake_by_wifi;
 };
 
 void mwifiex_process_tx_queue(struct mwifiex_adapter *adapter);
@@ -1410,6 +1414,27 @@ static inline u8 mwifiex_is_tdls_link_setup(u8 status)
        return false;
 }
 
+/* Disable platform specific wakeup interrupt */
+static inline void mwifiex_disable_wake(struct mwifiex_adapter *adapter)
+{
+       if (adapter->irq_wakeup >= 0) {
+               disable_irq_wake(adapter->irq_wakeup);
+               if (!adapter->wake_by_wifi)
+                       disable_irq(adapter->irq_wakeup);
+       }
+}
+
+/* Enable platform specific wakeup interrupt */
+static inline void mwifiex_enable_wake(struct mwifiex_adapter *adapter)
+{
+       /* Enable platform specific wakeup interrupt */
+       if (adapter->irq_wakeup >= 0) {
+               adapter->wake_by_wifi = false;
+               enable_irq(adapter->irq_wakeup);
+               enable_irq_wake(adapter->irq_wakeup);
+       }
+}
+
 int mwifiex_init_shutdown_fw(struct mwifiex_private *priv,
                             u32 func_init_shutdown);
 int mwifiex_add_card(void *card, struct semaphore *sem,

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 0b0f9c754f42a9e8950665d5094d1c24a112fd58..2ab1d179f16c525c3fb35dfb0e26d73bce8ea81d 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -131,6 +131,7 @@ static int mwifiex_pcie_suspend(struct device *dev)
        }
 
        adapter = card->adapter;
+       mwifiex_enable_wake(adapter);
 
        /* Enable the Host Sleep */
        if (!mwifiex_enable_hs(adapter)) {
@@ -186,6 +187,7 @@ static int mwifiex_pcie_resume(struct device *dev)
 
        mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
                          MWIFIEX_ASYNC_CMD);
+       mwifiex_disable_wake(adapter);
 
        return 0;
 }

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 037a0f9dd6d9abc00e12fbc049831afacb9f5a04..f410cf5c04e4d353d51f25a6e51ef76bb9cea208 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -79,67 +79,18 @@ static const struct of_device_id mwifiex_sdio_of_match_table[] = {
        { }
 };
 
-static irqreturn_t mwifiex_wake_irq_wifi(int irq, void *priv)
-{
-       struct mwifiex_plt_wake_cfg *cfg = priv;
-
-       if (cfg->irq_wifi >= 0) {
-               pr_info("%s: wake by wifi", __func__);
-               cfg->wake_by_wifi = true;
-               disable_irq_nosync(irq);
-       }
-
-       /* Notify PM core we are wakeup source */
-       pm_wakeup_event(cfg->dev, 0);
-
-       return IRQ_HANDLED;
-}
-
 /* This function parse device tree node using mmc subnode devicetree API.
  * The device node is saved in card->plt_of_node.
  * if the device tree node exist and include interrupts attributes, this
  * function will also request platform specific wakeup interrupt.
  */
-static int mwifiex_sdio_probe_of(struct device *dev, struct sdio_mmc_card *card)
+static int mwifiex_sdio_probe_of(struct device *dev)
 {
-       struct mwifiex_plt_wake_cfg *cfg;
-       int ret;
-
        if (!of_match_node(mwifiex_sdio_of_match_table, dev->of_node)) {
                dev_err(dev, "required compatible string missing\n");
                return -EINVAL;
        }
 
-       card->plt_of_node = dev->of_node;
-       card->plt_wake_cfg = devm_kzalloc(dev, sizeof(*card->plt_wake_cfg),
-                                         GFP_KERNEL);
-       cfg = card->plt_wake_cfg;
-       if (cfg && card->plt_of_node) {
-               cfg->dev = dev;
-               cfg->irq_wifi = irq_of_parse_and_map(card->plt_of_node, 0);
-               if (!cfg->irq_wifi) {
-                       dev_dbg(dev,
-                               "fail to parse irq_wifi from device tree\n");
-               } else {
-                       ret = devm_request_irq(dev, cfg->irq_wifi,
-                                              mwifiex_wake_irq_wifi,
-                                              IRQF_TRIGGER_LOW,
-                                              "wifi_wake", cfg);
-                       if (ret) {
-                               dev_dbg(dev,
-                                       "Failed to request irq_wifi %d (%d)\n",
-                                       cfg->irq_wifi, ret);
-                               card->plt_wake_cfg = NULL;
-                               return 0;
-                       }
-                       disable_irq(cfg->irq_wifi);
-               }
-       }
-
-       ret = device_init_wakeup(dev, true);
-       if (ret)
-               dev_err(dev, "fail to init wakeup for mwifiex");
-
        return 0;
 }
 
@@ -198,11 +149,9 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
 
        /* device tree node parsing and platform specific configuration*/
        if (func->dev.of_node) {
-               ret = mwifiex_sdio_probe_of(&func->dev, card);
-               if (ret) {
-                       dev_err(&func->dev, "SDIO dt node parse failed\n");
+               ret = mwifiex_sdio_probe_of(&func->dev);
+               if (ret)
                        goto err_disable;
-               }
        }
 
        ret = mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops,
@@ -265,12 +214,7 @@ static int mwifiex_sdio_resume(struct device *dev)
        mwifiex_cancel_hs(mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),
                          MWIFIEX_SYNC_CMD);
 
-       /* Disable platform specific wakeup interrupt */
-       if (card->plt_wake_cfg && card->plt_wake_cfg->irq_wifi >= 0) {
-               disable_irq_wake(card->plt_wake_cfg->irq_wifi);
-               if (!card->plt_wake_cfg->wake_by_wifi)
-                       disable_irq(card->plt_wake_cfg->irq_wifi);
-       }
+       mwifiex_disable_wake(adapter);
 
        return 0;
 }
@@ -350,13 +294,7 @@ static int mwifiex_sdio_suspend(struct device *dev)
        }
 
        adapter = card->adapter;
-
-       /* Enable platform specific wakeup interrupt */
-       if (card->plt_wake_cfg && card->plt_wake_cfg->irq_wifi >= 0) {
-               card->plt_wake_cfg->wake_by_wifi = false;
-               enable_irq(card->plt_wake_cfg->irq_wifi);
-               enable_irq_wake(card->plt_wake_cfg->irq_wifi);
-       }
+       mwifiex_enable_wake(adapter);
 
        /* Enable the Host Sleep */
        if (!mwifiex_enable_hs(adapter)) {

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h
index 07cdd2371eb5ac2c85e43ec4bd7714b3f6c36611..b9fbc5cf6262d8647d6064ddde51211acf749f72 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.h
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.h
@@ -154,12 +154,6 @@
        a->mpa_rx.start_port = 0;                                       \
 } while (0)
 
-struct mwifiex_plt_wake_cfg {
-       struct device *dev;
-       int irq_wifi;
-       bool wake_by_wifi;
-};
-
 /* data structure for SDIO MPA TX */
 struct mwifiex_sdio_mpa_tx {
        /* multiport tx aggregation buffer pointer */
@@ -243,8 +237,6 @@ struct mwifiex_sdio_card_reg {
 struct sdio_mmc_card {
        struct sdio_func *func;
        struct mwifiex_adapter *adapter;
-       struct device_node *plt_of_node;
-       struct mwifiex_plt_wake_cfg *plt_wake_cfg;
 
        const char *firmware;
        const struct mwifiex_sdio_card_reg *reg;