[3/3] mwifiex: parse host wakeup configuration from device tree

Commit Message

Amitkumar Karwar Feb. 3, 2016, 6:14 a.m. UTC

From: Xinming Hu <[e-mail]>

This patch implement a framework for board specific wakeup.
driver parse irq/gpio number from device tree, corresponding
resources will be allocated, and used for host suspend/resume.
driver private binding file is also updated in the patch.

Signed-off-by: Xinming Hu <[e-mail]>
Signed-off-by: Amitkumar Karwar <[e-mail]>
---
 Documentation/devicetree/bindings/mwifiex.txt      | 10 +++
 .../net/wireless/marvell/mwifiex/platform_drv.c    | 93 ++++++++++++++++++++++
 2 files changed, 103 insertions(+)

Comments

kernel test robot Feb. 3, 2016, 7:54 a.m. UTC | #1

Hi Xinming,

[auto build test ERROR on wireless-drivers/master]
[also build test ERROR on v4.5-rc2 next-20160203]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Amitkumar-Karwar/mwifiex-register-platform-specific-driver/20160203-142111
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git master
config: ia64-allmodconfig (attached as .config)
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=ia64 

All errors (new ones prefixed by >>):

>> drivers/net/wireless/marvell/mwifiex/platform_drv.c:140:22: error: 'mwifiex_plt_pm_ops' undeclared here (not in a function)
      .pm             = &mwifiex_plt_pm_ops,
                         ^

vim +/mwifiex_plt_pm_ops +140 drivers/net/wireless/marvell/mwifiex/platform_drv.c

   134	static struct platform_driver mwifiex_platform_driver = {
   135		.probe		= mwifiex_plt_probe,
   136		.remove		= mwifiex_plt_remove,
   137		.driver = {
   138			.name	= "mwifiex_plt",
   139			.of_match_table = mwifiex_dt_match,
 > 140			.pm             = &mwifiex_plt_pm_ops,
   141		}
   142	};
   143	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/Documentation/devicetree/bindings/mwifiex.txt b/Documentation/devicetree/bindings/mwifiex.txt
index 367c97e..68919c7 100644
--- a/Documentation/devicetree/bindings/mwifiex.txt
+++ b/Documentation/devicetree/bindings/mwifiex.txt
@@ -14,6 +14,11 @@  Optional properties:
   - mwifiex,chip-gpio : Chip's wakeup gpio pin number. This needs to be downloaded
 			to to firmware. Chip notifies wifi wakeup signal to SOC
 			through this pin.
+  - interrupt-parent: phandle of the parent interrupt controller
+  - interrupts : interrupt number to the cpu
+  - gpios: specify SOC's wakeup GPIO
+  - pinctrl-names : a pinctrl state named "default" must be defined
+  - pinctrl-0 : pin control group to be used for this controller
 
 Example:
 
@@ -27,5 +32,10 @@  mwifiex {
 	mwifiex,caldata_00_txpwrlimit_2g_cfg_set = /bits/ 8 <
 0x01 0x00 0x06 0x00 0x08 0x02 0x89 0x01 ...>;
 	mwifiex,chip-gpio = <3>;
+	interrupt-parent = <&pio>;
+	interrupts = <38 IRQ_TYPE_LEVEL_LOW>;
+	gpios = <&pio 38 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&wake_pins>;
 };
 
diff --git a/drivers/net/wireless/marvell/mwifiex/platform_drv.c b/drivers/net/wireless/marvell/mwifiex/platform_drv.c
index f64a12a..ed5dfc8 100644
--- a/drivers/net/wireless/marvell/mwifiex/platform_drv.c
+++ b/drivers/net/wireless/marvell/mwifiex/platform_drv.c
@@ -18,9 +18,63 @@ 
 
 struct platform_device *mwifiex_plt_dev;
 
+struct mwifiex_wake_dev {
+	struct device	*dev;
+	int		irq_wifi;
+	bool		wake_by_wifi;
+};
+
+static irqreturn_t mwifiex_wake_irq_wifi(int irq, void *priv)
+{
+	struct mwifiex_wake_dev *ctx = priv;
+
+	if (ctx->irq_wifi >= 0) {
+		ctx->wake_by_wifi = true;
+		disable_irq_nosync(ctx->irq_wifi);
+	}
+
+	return IRQ_HANDLED;
+}
+
 static int mwifiex_plt_probe(struct platform_device *pdev)
 {
+	int ret;
+	struct mwifiex_wake_dev *ctx;
+	int gpio;
+
 	mwifiex_plt_dev = pdev;
+
+	ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
+	if (!ctx)
+		return -ENOMEM;
+
+	ctx->dev = &pdev->dev;
+	ctx->irq_wifi = platform_get_irq(pdev, 0);
+	if (ctx->irq_wifi < 0)
+		dev_err(&pdev->dev, "Failed to get irq_wifi\n");
+
+	gpio = of_get_gpio(pdev->dev.of_node, 0);
+	if (gpio_is_valid(gpio))
+		gpio_direction_input(gpio);
+	else
+		dev_err(&pdev->dev, "gpio wifi is invalid\n");
+
+	if (ctx->irq_wifi >= 0) {
+		ret = devm_request_irq(&pdev->dev, ctx->irq_wifi,
+				       mwifiex_wake_irq_wifi,
+				       IRQF_TRIGGER_LOW,
+				       "wifi_wake", ctx);
+		if (ret) {
+			dev_err(&pdev->dev,
+				"Failed to request irq_wifi %d (%d)\n",
+				ctx->irq_wifi, ret);
+			return -EINVAL;
+		}
+		disable_irq(ctx->irq_wifi);
+	}
+
+	platform_set_drvdata(pdev, ctx);
+
 	return 0;
 }
 
@@ -30,6 +84,44 @@  static int mwifiex_plt_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int mwifiex_plt_suspend(struct device *dev)
+{
+	struct mwifiex_wake_dev *ctx = dev_get_drvdata(dev);
+	int ret;
+
+	if (ctx->irq_wifi >= 0) {
+		ctx->wake_by_wifi = false;
+		enable_irq(ctx->irq_wifi);
+		ret = enable_irq_wake(ctx->irq_wifi);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+static int mwifiex_plt_resume(struct device *dev)
+{
+	struct mwifiex_wake_dev *ctx = dev_get_drvdata(dev);
+	int ret;
+
+	if (ctx->irq_wifi >= 0) {
+		ret = disable_irq_wake(ctx->irq_wifi);
+		if (!ctx->wake_by_wifi)
+			disable_irq(ctx->irq_wifi);
+		if (ret)
+			return ret;
+	}
+
+	return 0;
+}
+
+static const struct dev_pm_ops mwifiex_plt_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(mwifiex_plt_suspend, mwifiex_plt_resume)
+};
+#endif /* CONFIG_PM_SLEEP */
+
 static const struct of_device_id mwifiex_dt_match[] = {
 	{
 		.compatible = "marvell,mwifiex",
@@ -45,6 +137,7 @@  static struct platform_driver mwifiex_platform_driver = {
 	.driver = {
 		.name	= "mwifiex_plt",
 		.of_match_table = mwifiex_dt_match,
+		.pm             = &mwifiex_plt_pm_ops,
 	}
 };