add suspend/resume support for i.mx8x SoCs

[PATCH v3 4/5] pinctrl: freescale: add pad wakeup config

Posted by Shenwei Wang 3 years, 5 months ago

add the logic to configure the pad wakeup function via
the pin_config_set handler.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
 drivers/pinctrl/freescale/pinctrl-scu.c | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c
index 59b5f8a35111..0b172f7e7261 100644
--- a/drivers/pinctrl/freescale/pinctrl-scu.c
+++ b/drivers/pinctrl/freescale/pinctrl-scu.c
@@ -15,6 +15,11 @@
 #include "../core.h"
 #include "pinctrl-imx.h"
 
+#define IMX_SC_PAD_FUNC_GET_WAKEUP	9
+#define IMX_SC_PAD_FUNC_SET_WAKEUP	4
+#define IMX_SC_IRQ_GROUP_WAKE           3   /* Wakeup interrupts */
+#define IMX_SC_IRQ_PAD			2   /* Pad wakeup */
+
 enum pad_func_e {
 	IMX_SC_PAD_FUNC_SET = 15,
 	IMX_SC_PAD_FUNC_GET = 16,
@@ -36,10 +41,18 @@ struct imx_sc_msg_resp_pad_get {
 	u32 val;
 } __packed;
 
+struct imx_sc_msg_gpio_set_pad_wakeup {
+	struct imx_sc_rpc_msg hdr;
+	u16 pad;
+	u8 wakeup;
+} __packed __aligned(4);
+
 static struct imx_sc_ipc *pinctrl_ipc_handle;
 
 int imx_pinctrl_sc_ipc_init(struct platform_device *pdev)
 {
+	imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_WAKE,
+					 IMX_SC_IRQ_PAD, true);
 	return imx_scu_get_handle(&pinctrl_ipc_handle);
 }
 EXPORT_SYMBOL_GPL(imx_pinctrl_sc_ipc_init);
@@ -81,6 +94,23 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
 	unsigned int val;
 	int ret;
 
+	if (num_configs == 1) {
+		struct imx_sc_msg_gpio_set_pad_wakeup wmsg;
+
+		hdr = &wmsg.hdr;
+		hdr->ver = IMX_SC_RPC_VERSION;
+		hdr->svc = IMX_SC_RPC_SVC_PAD;
+		hdr->func = IMX_SC_PAD_FUNC_SET_WAKEUP;
+		hdr->size = 2;
+		wmsg.pad = pin_id;
+		wmsg.wakeup = *configs;
+		ret = imx_scu_call_rpc(pinctrl_ipc_handle, &wmsg, true);
+
+		dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
+				pin_id, *configs);
+		return ret;
+	}
+
 	/*
 	 * Set mux and conf together in one IPC call
 	 */
-- 
2.34.1

Re: [PATCH v3 4/5] pinctrl: freescale: add pad wakeup config

Posted by Peng Fan 3 years, 5 months ago

On Tue, Oct 25, 2022 at 01:32:43PM -0500, Shenwei Wang wrote:
>add the logic to configure the pad wakeup function via
>the pin_config_set handler.
>
>Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
>---
> drivers/pinctrl/freescale/pinctrl-scu.c | 30 +++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c
>index 59b5f8a35111..0b172f7e7261 100644
>--- a/drivers/pinctrl/freescale/pinctrl-scu.c
>+++ b/drivers/pinctrl/freescale/pinctrl-scu.c
>@@ -15,6 +15,11 @@
> #include "../core.h"
> #include "pinctrl-imx.h"
> 
>+#define IMX_SC_PAD_FUNC_GET_WAKEUP	9
>+#define IMX_SC_PAD_FUNC_SET_WAKEUP	4
>+#define IMX_SC_IRQ_GROUP_WAKE           3   /* Wakeup interrupts */
>+#define IMX_SC_IRQ_PAD			2   /* Pad wakeup */
>+
> enum pad_func_e {
> 	IMX_SC_PAD_FUNC_SET = 15,
> 	IMX_SC_PAD_FUNC_GET = 16,
>@@ -36,10 +41,18 @@ struct imx_sc_msg_resp_pad_get {
> 	u32 val;
> } __packed;
> 
>+struct imx_sc_msg_gpio_set_pad_wakeup {
>+	struct imx_sc_rpc_msg hdr;
>+	u16 pad;
>+	u8 wakeup;
>+} __packed __aligned(4);
>+
> static struct imx_sc_ipc *pinctrl_ipc_handle;
> 
> int imx_pinctrl_sc_ipc_init(struct platform_device *pdev)
> {
>+	imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_WAKE,
>+					 IMX_SC_IRQ_PAD, true);
> 	return imx_scu_get_handle(&pinctrl_ipc_handle);
> }
> EXPORT_SYMBOL_GPL(imx_pinctrl_sc_ipc_init);
>@@ -81,6 +94,23 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
> 	unsigned int val;
> 	int ret;
> 
>+	if (num_configs == 1) {
>+		struct imx_sc_msg_gpio_set_pad_wakeup wmsg;
>+
>+		hdr = &wmsg.hdr;
>+		hdr->ver = IMX_SC_RPC_VERSION;
>+		hdr->svc = IMX_SC_RPC_SVC_PAD;
>+		hdr->func = IMX_SC_PAD_FUNC_SET_WAKEUP;
>+		hdr->size = 2;
>+		wmsg.pad = pin_id;
>+		wmsg.wakeup = *configs;
>+		ret = imx_scu_call_rpc(pinctrl_ipc_handle, &wmsg, true);
>+
>+		dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
>+				pin_id, *configs);

Format issue, and configs should be unsigned long type. Otherwise, looks good
to me.

Regards,
Peng.

>+		return ret;
>+	}
>+
> 	/*
> 	 * Set mux and conf together in one IPC call
> 	 */
>-- 
>2.34.1
>

--

Re: [PATCH v3 4/5] pinctrl: freescale: add pad wakeup config

Posted by kernel test robot 3 years, 5 months ago

Hi Shenwei,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on robh/for-next]
[also build test WARNING on linusw-pinctrl/devel brgl/gpio/for-next krzk/for-next krzk-dt/for-next linus/master v6.1-rc2 next-20221025]
[cannot apply to pinctrl-samsung/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Shenwei-Wang/add-suspend-resume-support-for-i-mx8x-SoCs/20221026-023543
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next
patch link:    https://lore.kernel.org/r/20221025183244.615318-5-shenwei.wang%40nxp.com
patch subject: [PATCH v3 4/5] pinctrl: freescale: add pad wakeup config
config: arm64-allyesconfig (attached as .config)
compiler: aarch64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/intel-lab-lkp/linux/commit/04a251addfbc0236901c463ebe3cb6d38dd71ca8
        git remote add linux-review https://github.com/intel-lab-lkp/linux
        git fetch --no-tags linux-review Shenwei-Wang/add-suspend-resume-support-for-i-mx8x-SoCs/20221026-023543
        git checkout 04a251addfbc0236901c463ebe3cb6d38dd71ca8
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/pinctrl/freescale/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   In file included from include/linux/printk.h:566,
                    from include/asm-generic/bug.h:22,
                    from arch/arm64/include/asm/bug.h:26,
                    from include/linux/bug.h:5,
                    from arch/arm64/include/asm/cpufeature.h:20,
                    from arch/arm64/include/asm/ptrace.h:11,
                    from arch/arm64/include/asm/irqflags.h:10,
                    from include/linux/irqflags.h:16,
                    from include/linux/rcupdate.h:26,
                    from include/linux/rculist.h:11,
                    from include/linux/pid.h:5,
                    from include/linux/sched.h:14,
                    from include/linux/ratelimit.h:6,
                    from include/linux/dev_printk.h:16,
                    from include/linux/device.h:15,
                    from include/linux/firmware/imx/ipc.h:11,
                    from include/linux/firmware/imx/sci.h:13,
                    from drivers/pinctrl/freescale/pinctrl-scu.c:9:
   drivers/pinctrl/freescale/pinctrl-scu.c: In function 'imx_pinconf_set_scu':
>> drivers/pinctrl/freescale/pinctrl-scu.c:109:37: warning: format '%d' expects argument of type 'int', but argument 5 has type 'long unsigned int' [-Wformat=]
     109 |                 dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
         |                                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   include/linux/dynamic_debug.h:223:29: note: in definition of macro '__dynamic_func_call_cls'
     223 |                 func(&id, ##__VA_ARGS__);                       \
         |                             ^~~~~~~~~~~
   include/linux/dynamic_debug.h:249:9: note: in expansion of macro '_dynamic_func_call_cls'
     249 |         _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__)
         |         ^~~~~~~~~~~~~~~~~~~~~~
   include/linux/dynamic_debug.h:272:9: note: in expansion of macro '_dynamic_func_call'
     272 |         _dynamic_func_call(fmt, __dynamic_dev_dbg,              \
         |         ^~~~~~~~~~~~~~~~~~
   include/linux/dev_printk.h:155:9: note: in expansion of macro 'dynamic_dev_dbg'
     155 |         dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
         |         ^~~~~~~~~~~~~~~
   include/linux/dev_printk.h:155:30: note: in expansion of macro 'dev_fmt'
     155 |         dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__)
         |                              ^~~~~~~
   drivers/pinctrl/freescale/pinctrl-scu.c:109:17: note: in expansion of macro 'dev_dbg'
     109 |                 dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
         |                 ^~~~~~~
   drivers/pinctrl/freescale/pinctrl-scu.c:109:63: note: format string is defined here
     109 |                 dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
         |                                                              ~^
         |                                                               |
         |                                                               int
         |                                                              %ld


vim +109 drivers/pinctrl/freescale/pinctrl-scu.c

    85	
    86	int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
    87				unsigned long *configs, unsigned num_configs)
    88	{
    89		struct imx_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
    90		struct imx_sc_msg_req_pad_set msg;
    91		struct imx_sc_rpc_msg *hdr = &msg.hdr;
    92		unsigned int mux = configs[0];
    93		unsigned int conf = configs[1];
    94		unsigned int val;
    95		int ret;
    96	
    97		if (num_configs == 1) {
    98			struct imx_sc_msg_gpio_set_pad_wakeup wmsg;
    99	
   100			hdr = &wmsg.hdr;
   101			hdr->ver = IMX_SC_RPC_VERSION;
   102			hdr->svc = IMX_SC_RPC_SVC_PAD;
   103			hdr->func = IMX_SC_PAD_FUNC_SET_WAKEUP;
   104			hdr->size = 2;
   105			wmsg.pad = pin_id;
   106			wmsg.wakeup = *configs;
   107			ret = imx_scu_call_rpc(pinctrl_ipc_handle, &wmsg, true);
   108	
 > 109			dev_dbg(ipctl->dev, "wakeup pin_id: %d type: %d\n",
   110					pin_id, *configs);
   111			return ret;
   112		}
   113	
   114		/*
   115		 * Set mux and conf together in one IPC call
   116		 */
   117		WARN_ON(num_configs != 2);
   118	
   119		val = conf | BM_PAD_CTL_IFMUX_ENABLE | BM_PAD_CTL_GP_ENABLE;
   120		val |= mux << BP_PAD_CTL_IFMUX;
   121	
   122		hdr->ver = IMX_SC_RPC_VERSION;
   123		hdr->svc = IMX_SC_RPC_SVC_PAD;
   124		hdr->func = IMX_SC_PAD_FUNC_SET;
   125		hdr->size = 3;
   126	
   127		msg.pad = pin_id;
   128		msg.val = val;
   129	
   130		ret = imx_scu_call_rpc(pinctrl_ipc_handle, &msg, true);
   131	
   132		dev_dbg(ipctl->dev, "write: pin_id %u config 0x%x val 0x%x\n",
   133			pin_id, conf, val);
   134	
   135		return ret;
   136	}
   137	EXPORT_SYMBOL_GPL(imx_pinconf_set_scu);
   138	

-- 
0-DAY CI Kernel Test Service
https://01.org/lkp

[PATCH v3 1/5] arm64: dts: imx8dxl-ss-lsio: add gpio-ranges property
[PATCH v3 2/5] arm64: dts: imx8qm-ss-lsio: add gpio-ranges property
[PATCH v3 3/5] arm64: dts: imx8qxp-ss-lsio: add gpio-ranges property
[PATCH v3 4/5] pinctrl: freescale: add pad wakeup config
[PATCH v3 5/5] gpio: mxc: enable pad wakeup on i.MX8x platforms