Search Linux Wireless

Re: [PATCH v5 2/4] mwifiex: add platform specific wakeup interrupt support

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Reviewed-by: Wei-Ning Huang <wnhuang@xxxxxxxxxxxx>
Tested-by: Wei-Ning Huang <wnhuang@xxxxxxxxxxxx>

On Fri, Mar 18, 2016 at 7:03 PM, Amitkumar Karwar <akarwar@xxxxxxxxxxx> wrote:
> From: Xinming Hu <huxm@xxxxxxxxxxx>
>
> On some arm-based platforms, we need to configure platform specific
> parameters by device tree node and also define our node as a child
> node of parent SDIO host controller.
> This patch parses these parameters from device tree. It includes
> calibration data dowoload to firmware, wakeup pin configured to firmware,
> and soc specific wake up gpio, which will be set as wakeup interrupt pin.
>
> Signed-off-by: Xinming Hu <huxm@xxxxxxxxxxx>
> Signed-off-by: Amitkumar Karwar <akarwar@xxxxxxxxxxx>
> ---
>  drivers/net/wireless/marvell/mwifiex/main.h    | 11 ++++
>  drivers/net/wireless/marvell/mwifiex/sdio.c    | 77 ++++++++++++++++++++++++++
>  drivers/net/wireless/marvell/mwifiex/sdio.h    |  7 +++
>  drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 14 ++++-
>  4 files changed, 106 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wireless/marvell/mwifiex/main.h
> index eb2c90c..9da27cf 100644
> --- a/drivers/net/wireless/marvell/mwifiex/main.h
> +++ b/drivers/net/wireless/marvell/mwifiex/main.h
> @@ -37,6 +37,17 @@
>  #include <linux/idr.h>
>  #include <linux/inetdevice.h>
>  #include <linux/devcoredump.h>
> +#include <linux/err.h>
> +#include <linux/gpio.h>
> +#include <linux/gfp.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/of_gpio.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/slab.h>
> +#include <linux/of_irq.h>
>
>  #include "decl.h"
>  #include "ioctl.h"
> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
> index 901c064..c55e69b 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sdio.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
> @@ -73,6 +73,66 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = {
>         {"EXTLAST", NULL, 0, 0xFE},
>  };
>
> +static const struct of_device_id mwifiex_sdio_of_match_table[] = {
> +       { .compatible = "marvell,sd8897" },
> +       { .compatible = "marvell,sd8997" },
> +       { }
> +};
> +
> +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);
> +       }
> +
> +       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)
> +{
> +       struct mwifiex_plt_wake_cfg *cfg;
> +       int ret;
> +
> +       if (!dev->of_node ||
> +           !of_match_node(mwifiex_sdio_of_match_table, dev->of_node)) {
> +               pr_err("sdio platform data not available");
> +               return -1;
> +       }
> +
> +       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->irq_wifi = irq_of_parse_and_map(card->plt_of_node, 0);
> +               if (!cfg->irq_wifi) {
> +                       dev_err(dev, "fail to parse irq_wifi from device tree");
> +               } else {
> +                       ret = devm_request_irq(dev, cfg->irq_wifi,
> +                                              mwifiex_wake_irq_wifi,
> +                                              IRQF_TRIGGER_LOW,
> +                                              "wifi_wake", cfg);
> +                       if (ret) {
> +                               dev_err(dev,
> +                                       "Failed to request irq_wifi %d (%d)\n",
> +                                       cfg->irq_wifi, ret);
> +                       }
> +                       disable_irq(cfg->irq_wifi);
> +               }
> +       }
> +
> +       return 0;
> +}
> +
>  /*
>   * SDIO probe.
>   *
> @@ -127,6 +187,9 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
>                 return -EIO;
>         }
>
> +       /* device tree node parsing and platform specific configuration*/
> +       mwifiex_sdio_probe_of(&func->dev, card);
> +
>         if (mwifiex_add_card(card, &add_remove_card_sem, &sdio_ops,
>                              MWIFIEX_SDIO)) {
>                 pr_err("%s: add card failed\n", __func__);
> @@ -183,6 +246,13 @@ 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);
> +       }
> +
>         return 0;
>  }
>
> @@ -262,6 +332,13 @@ 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);
> +       }
> +
>         /* Enable the Host Sleep */
>         if (!mwifiex_enable_hs(adapter)) {
>                 mwifiex_dbg(adapter, ERROR,
> diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.h b/drivers/net/wireless/marvell/mwifiex/sdio.h
> index b9fbc5c..db837f1 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sdio.h
> +++ b/drivers/net/wireless/marvell/mwifiex/sdio.h
> @@ -154,6 +154,11 @@
>         a->mpa_rx.start_port = 0;                                       \
>  } while (0)
>
> +struct mwifiex_plt_wake_cfg {
> +       int irq_wifi;
> +       bool wake_by_wifi;
> +};
> +
>  /* data structure for SDIO MPA TX */
>  struct mwifiex_sdio_mpa_tx {
>         /* multiport tx aggregation buffer pointer */
> @@ -237,6 +242,8 @@ 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;
> diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> index 30f1526..930495b 100644
> --- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> +++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
> @@ -2134,6 +2134,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
>         enum state_11d_t state_11d;
>         struct mwifiex_ds_11n_tx_cfg tx_cfg;
>         u8 sdio_sp_rx_aggr_enable;
> +       int data;
>
>         if (first_sta) {
>                 if (priv->adapter->iface_type == MWIFIEX_PCIE) {
> @@ -2154,9 +2155,16 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta, bool init)
>                  * The cal-data can be read from device tree and/or
>                  * a configuration file and downloaded to firmware.
>                  */
> -               adapter->dt_node =
> -                               of_find_node_by_name(NULL, "marvell_cfgdata");
> -               if (adapter->dt_node) {
> +               if (priv->adapter->iface_type == MWIFIEX_SDIO &&
> +                   adapter->dev->of_node) {
> +                       adapter->dt_node = adapter->dev->of_node;
> +                       if (of_property_read_u32(adapter->dt_node,
> +                                                "marvell,wakeup-pin",
> +                                                &data) == 0) {
> +                               pr_debug("Wakeup pin = 0x%x\n", data);
> +                               adapter->hs_cfg.gpio = data;
> +                       }
> +
>                         ret = mwifiex_dnld_dt_cfgdata(priv, adapter->dt_node,
>                                                       "marvell,caldata");
>                         if (ret)
> --
> 1.8.1.4
>



-- 
Wei-Ning Huang, 黃偉寧 | Software Engineer, Google Inc., Taiwan |
wnhuang@xxxxxxxxxx | Cell: +886 910-380678
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Wireless Personal Area Network]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite Hiking]     [MIPS Linux]     [ARM Linux]     [Linux RAID]

  Powered by Linux