| Message ID | 20241022073322.6150-1-huanglei814@163.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] usb: core: adds support for PM control of specific USB dev skip suspend. | expand |
On Tue, Oct 22, 2024 at 03:33:22PM +0800, huanglei814 wrote: > From: huanglei <huanglei@kylinos.cn> > > All USB devices are brought into suspend power state after system suspend. > It is desirable for some specific manufacturers buses to keep their devices > in normal state even after system suspend. > > Signed-off-by: huanglei <huanglei@kylinos.cn> > --- > drivers/usb/core/Kconfig | 11 +++++++++++ > drivers/usb/core/driver.c | 14 ++++++++++++++ > drivers/usb/host/xhci-plat.c | 7 +++++++ > include/linux/usb.h | 9 +++++++++ > 4 files changed, 41 insertions(+) Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what needs to be done here to properly describe this. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 58e3ca7e4793..69778aa7b913 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -143,3 +143,14 @@ config USB_DEFAULT_AUTHORIZATION_MODE ACPI selecting value 2 is analogous to selecting value 0. If unsure, keep the default value. + +config USB_SKIP_SUSPEND + bool "Vendor USB support skip suspend" + depends on USB + help + Select this the associate USB devices will skip suspend when pm control. + + This option adds support skip suspend for PM control of USB devices + in specific manufacturers platforms. + + If unsure, keep the default value. diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 0c3f12daac79..05fe921f8297 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c @@ -1583,6 +1583,15 @@ int usb_suspend(struct device *dev, pm_message_t msg) struct usb_device *udev = to_usb_device(dev); int r; +#ifdef CONFIG_USB_SKIP_SUSPEND + if (udev->bus->skip_suspend && (msg.event == PM_EVENT_SUSPEND)) { + if (udev->state != USB_STATE_SUSPENDED) + dev_err(dev, "abort suspend\n"); + + return 0; + } +#endif + unbind_no_pm_drivers_interfaces(udev); /* From now on we are sure all drivers support suspend/resume @@ -1619,6 +1628,11 @@ int usb_resume(struct device *dev, pm_message_t msg) struct usb_device *udev = to_usb_device(dev); int status; +#ifdef CONFIG_USB_SKIP_SUSPEND + if (udev->bus->skip_suspend && (msg.event == PM_EVENT_RESUME)) + return 0; +#endif + /* For all calls, take the device back to full power and * tell the PM core in case it was autosuspended previously. * Unbind the interfaces that will need rebinding later, diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index ecaa75718e59..8cbc666ab5c6 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -265,6 +265,13 @@ int xhci_plat_probe(struct platform_device *pdev, struct device *sysdev, const s if (device_property_read_bool(tmpdev, "xhci-skip-phy-init-quirk")) xhci->quirks |= XHCI_SKIP_PHY_INIT; +#ifdef CONFIG_USB_SKIP_SUSPEND + if (device_property_read_bool(tmpdev, "usb-skip-suspend")) { + hcd_to_bus(hcd)->skip_suspend = true; + hcd_to_bus(xhci->shared_hcd)->skip_suspend = true; + } +#endif + device_property_read_u32(tmpdev, "imod-interval-ns", &xhci->imod_interval); } diff --git a/include/linux/usb.h b/include/linux/usb.h index 672d8fc2abdb..3074c89ed921 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -487,6 +487,15 @@ struct usb_bus { struct mon_bus *mon_bus; /* non-null when associated */ int monitored; /* non-zero when monitored */ #endif + +#ifdef CONFIG_USB_SKIP_SUSPEND + bool skip_suspend; /* All USB devices are brought into suspend + * power state after system suspend. It is + * desirable for some specific manufacturers + * buses to keep their devices in normal + * state even after system suspend. + */ +#endif }; struct usb_dev_state;