[PATCH] usb: xilinx: Add suspend resume support

[PATCH] usb: xilinx: Add suspend resume support

[Shubhrajyoti Datta]

Add suspend resume support. In the suspend udc is disconnected
and it is set to ready at resume for it to be functional.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
---
 drivers/usb/gadget/udc/udc-xilinx.c | 52 +++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
index f5ca670776a3..1369792f195a 100644
--- a/drivers/usb/gadget/udc/udc-xilinx.c
+++ b/drivers/usb/gadget/udc/udc-xilinx.c
@@ -2176,6 +2176,57 @@ static int xudc_remove(struct platform_device *pdev)
 	return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int xudc_suspend(struct device *dev)
+{
+	struct xusb_udc *udc;
+	u32 crtlreg;
+	unsigned long flags;
+
+	udc = dev_get_drvdata(dev);
+
+	spin_lock_irqsave(&udc->lock, flags);
+
+	crtlreg = udc->read_fn(udc->addr + XUSB_CONTROL_OFFSET);
+	crtlreg &= ~XUSB_CONTROL_USB_READY_MASK;
+
+	udc->write_fn(udc->addr, XUSB_CONTROL_OFFSET, crtlreg);
+
+	spin_unlock_irqrestore(&udc->lock, flags);
+	if (udc->driver && udc->driver->disconnect)
+		udc->driver->disconnect(&udc->gadget);
+
+	clk_disable(udc->clk);
+
+	return 0;
+}
+
+static int xudc_resume(struct device *dev)
+{
+	struct xusb_udc *udc;
+	u32 crtlreg;
+	unsigned long flags;
+
+	udc = dev_get_drvdata(dev);
+
+	clk_enable(udc->clk);
+	spin_lock_irqsave(&udc->lock, flags);
+
+	crtlreg = udc->read_fn(udc->addr + XUSB_CONTROL_OFFSET);
+	crtlreg |= XUSB_CONTROL_USB_READY_MASK;
+
+	udc->write_fn(udc->addr, XUSB_CONTROL_OFFSET, crtlreg);
+
+	spin_unlock_irqrestore(&udc->lock, flags);
+
+	return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops xudc_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(xudc_suspend, xudc_resume)
+};
+
 /* Match table for of_platform binding */
 static const struct of_device_id usb_of_match[] = {
 	{ .compatible = "xlnx,usb2-device-4.00.a", },
@@ -2187,6 +2238,7 @@ static struct platform_driver xudc_driver = {
 	.driver = {
 		.name = driver_name,
 		.of_match_table = usb_of_match,
+		.pm	= &xudc_pm_ops,
 	},
 	.probe = xudc_probe,
 	.remove = xudc_remove,
-- 
2.25.1

Re: [PATCH] usb: xilinx: Add suspend resume support

[Felipe Balbi]

Hi,

Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> writes:

> Add suspend resume support. In the suspend udc is disconnected
> and it is set to ready at resume for it to be functional.
>
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
> ---
>  drivers/usb/gadget/udc/udc-xilinx.c | 52 +++++++++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
>
> diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c
> index f5ca670776a3..1369792f195a 100644
> --- a/drivers/usb/gadget/udc/udc-xilinx.c
> +++ b/drivers/usb/gadget/udc/udc-xilinx.c
> @@ -2176,6 +2176,57 @@ static int xudc_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +#ifdef CONFIG_PM_SLEEP
> +static int xudc_suspend(struct device *dev)
> +{
> +	struct xusb_udc *udc;
> +	u32 crtlreg;
> +	unsigned long flags;
> +
> +	udc = dev_get_drvdata(dev);
> +
> +	spin_lock_irqsave(&udc->lock, flags);
> +
> +	crtlreg = udc->read_fn(udc->addr + XUSB_CONTROL_OFFSET);
> +	crtlreg &= ~XUSB_CONTROL_USB_READY_MASK;
> +
> +	udc->write_fn(udc->addr, XUSB_CONTROL_OFFSET, crtlreg);
> +
> +	spin_unlock_irqrestore(&udc->lock, flags);
> +	if (udc->driver && udc->driver->disconnect)
> +		udc->driver->disconnect(&udc->gadget);

Why disconnect? Seems like you should call ->suspend() instead, no?

-- 
balbi

Re: [PATCH] usb: xilinx: Add suspend resume support

[kernel test robot]

[-- Attachment #1: Type: text/plain, Size: 3877 bytes --]

Hi Shubhrajyoti,

I love your patch! Yet something to improve:

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on peter-chen-usb/for-usb-next balbi-usb/testing/next v5.15-rc3 next-20210922]
[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]

url:    https://github.com/0day-ci/linux/commits/Shubhrajyoti-Datta/usb-xilinx-Add-suspend-resume-support/20211005-191222
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: i386-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
        # https://github.com/0day-ci/linux/commit/f7640371d031219584f4bd075cd91d91c0c13b41
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Shubhrajyoti-Datta/usb-xilinx-Add-suspend-resume-support/20211005-191222
        git checkout f7640371d031219584f4bd075cd91d91c0c13b41
        # save the attached .config to linux build tree
        make W=1 ARCH=i386 

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

All errors (new ones prefixed by >>):

   drivers/usb/gadget/udc/udc-xilinx.c: In function 'xudc_suspend':
>> drivers/usb/gadget/udc/udc-xilinx.c:2174:2: error: implicit declaration of function 'clk_disable'; did you mean 'irqs_disabled'? [-Werror=implicit-function-declaration]
    2174 |  clk_disable(udc->clk);
         |  ^~~~~~~~~~~
         |  irqs_disabled
>> drivers/usb/gadget/udc/udc-xilinx.c:2174:17: error: 'struct xusb_udc' has no member named 'clk'
    2174 |  clk_disable(udc->clk);
         |                 ^~
   drivers/usb/gadget/udc/udc-xilinx.c: In function 'xudc_resume':
>> drivers/usb/gadget/udc/udc-xilinx.c:2187:2: error: implicit declaration of function 'clk_enable'; did you mean 'sme_enable'? [-Werror=implicit-function-declaration]
    2187 |  clk_enable(udc->clk);
         |  ^~~~~~~~~~
         |  sme_enable
   drivers/usb/gadget/udc/udc-xilinx.c:2187:16: error: 'struct xusb_udc' has no member named 'clk'
    2187 |  clk_enable(udc->clk);
         |                ^~
   cc1: all warnings being treated as errors


vim +2174 drivers/usb/gadget/udc/udc-xilinx.c

  2153	
  2154	#ifdef CONFIG_PM_SLEEP
  2155	static int xudc_suspend(struct device *dev)
  2156	{
  2157		struct xusb_udc *udc;
  2158		u32 crtlreg;
  2159		unsigned long flags;
  2160	
  2161		udc = dev_get_drvdata(dev);
  2162	
  2163		spin_lock_irqsave(&udc->lock, flags);
  2164	
  2165		crtlreg = udc->read_fn(udc->addr + XUSB_CONTROL_OFFSET);
  2166		crtlreg &= ~XUSB_CONTROL_USB_READY_MASK;
  2167	
  2168		udc->write_fn(udc->addr, XUSB_CONTROL_OFFSET, crtlreg);
  2169	
  2170		spin_unlock_irqrestore(&udc->lock, flags);
  2171		if (udc->driver && udc->driver->disconnect)
  2172			udc->driver->disconnect(&udc->gadget);
  2173	
> 2174		clk_disable(udc->clk);
  2175	
  2176		return 0;
  2177	}
  2178	
  2179	static int xudc_resume(struct device *dev)
  2180	{
  2181		struct xusb_udc *udc;
  2182		u32 crtlreg;
  2183		unsigned long flags;
  2184	
  2185		udc = dev_get_drvdata(dev);
  2186	
> 2187		clk_enable(udc->clk);
  2188		spin_lock_irqsave(&udc->lock, flags);
  2189	
  2190		crtlreg = udc->read_fn(udc->addr + XUSB_CONTROL_OFFSET);
  2191		crtlreg |= XUSB_CONTROL_USB_READY_MASK;
  2192	
  2193		udc->write_fn(udc->addr, XUSB_CONTROL_OFFSET, crtlreg);
  2194	
  2195		spin_unlock_irqrestore(&udc->lock, flags);
  2196	
  2197		return 0;
  2198	}
  2199	#endif /* CONFIG_PM_SLEEP */
  2200	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 66004 bytes --]