From: Greg Kroah-Hartman Date: Thu, 16 Jan 2025 15:29:36 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v6.1.125~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e1f340a720712ac0a870d8ef8c7dd70992eb10d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch --- diff --git a/queue-6.1/series b/queue-6.1/series index c5355e460f..b0de3631e3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -90,3 +90,4 @@ ocfs2-correct-return-value-of-ocfs2_local_free_info.patch ocfs2-fix-slab-use-after-free-due-to-dangling-pointe.patch drm-bridge-adv7511-use-dev_err_probe-in-probe-functi.patch drm-adv7511-fix-use-after-free-in-adv7533_attach_dsi.patch +xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch diff --git a/queue-6.1/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch b/queue-6.1/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch new file mode 100644 index 0000000000..602ee039b1 --- /dev/null +++ b/queue-6.1/xhci-use-pm_ptr-instead-of-ifdef-for-config_pm-conditionals.patch @@ -0,0 +1,105 @@ +From 130eac4170859fb368681e00d390f20f44bbf27b Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Tue, 28 Mar 2023 15:10:43 +0200 +Subject: xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals + +From: Arnd Bergmann + +commit 130eac4170859fb368681e00d390f20f44bbf27b upstream. + +A recent patch caused an unused-function warning in builds with +CONFIG_PM disabled, after the function became marked 'static': + +drivers/usb/host/xhci-pci.c:91:13: error: 'xhci_msix_sync_irqs' defined but not used [-Werror=unused-function] + 91 | static void xhci_msix_sync_irqs(struct xhci_hcd *xhci) + | ^~~~~~~~~~~~~~~~~~~ + +This could be solved by adding another #ifdef, but as there is +a trend towards removing CONFIG_PM checks in favor of helper +macros, do the same conversion here and use pm_ptr() to get +either a function pointer or NULL but avoid the warning. + +As the hidden functions reference some other symbols, make +sure those are visible at compile time, at the minimal cost of +a few extra bytes for 'struct usb_device'. + +Fixes: 9abe15d55dcc ("xhci: Move xhci MSI sync function to to xhci-pci") +Signed-off-by: Arnd Bergmann +Link: https://lore.kernel.org/r/20230328131114.1296430-1-arnd@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci-pci.c | 8 +------- + include/linux/usb.h | 3 +-- + include/linux/usb/hcd.h | 2 -- + 3 files changed, 2 insertions(+), 11 deletions(-) + +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -571,7 +571,6 @@ static void xhci_pci_remove(struct pci_d + pci_set_power_state(dev, PCI_D3hot); + } + +-#ifdef CONFIG_PM + /* + * In some Intel xHCI controllers, in order to get D3 working, + * through a vendor specific SSIC CONFIG register at offset 0x883c, +@@ -721,7 +720,6 @@ static void xhci_pci_shutdown(struct usb + if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) + pci_set_power_state(pdev, PCI_D3hot); + } +-#endif /* CONFIG_PM */ + + /*-------------------------------------------------------------------------*/ + +@@ -763,21 +761,17 @@ static struct pci_driver xhci_pci_driver + /* suspend and resume implemented later */ + + .shutdown = usb_hcd_pci_shutdown, +-#ifdef CONFIG_PM + .driver = { +- .pm = &usb_hcd_pci_pm_ops ++ .pm = pm_ptr(&usb_hcd_pci_pm_ops), + }, +-#endif + }; + + static int __init xhci_pci_init(void) + { + xhci_init_driver(&xhci_pci_hc_driver, &xhci_pci_overrides); +-#ifdef CONFIG_PM + xhci_pci_hc_driver.pci_suspend = xhci_pci_suspend; + xhci_pci_hc_driver.pci_resume = xhci_pci_resume; + xhci_pci_hc_driver.shutdown = xhci_pci_shutdown; +-#endif + return pci_register_driver(&xhci_pci_driver); + } + module_init(xhci_pci_init); +--- a/include/linux/usb.h ++++ b/include/linux/usb.h +@@ -697,13 +697,12 @@ struct usb_device { + + unsigned long active_duration; + +-#ifdef CONFIG_PM + unsigned long connect_time; + + unsigned do_remote_wakeup:1; + unsigned reset_resume:1; + unsigned port_is_suspended:1; +-#endif ++ + struct wusb_dev *wusb_dev; + int slot_id; + struct usb2_lpm_parameters l1_params; +--- a/include/linux/usb/hcd.h ++++ b/include/linux/usb/hcd.h +@@ -486,9 +486,7 @@ extern void usb_hcd_pci_shutdown(struct + + extern int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *dev); + +-#ifdef CONFIG_PM + extern const struct dev_pm_ops usb_hcd_pci_pm_ops; +-#endif + #endif /* CONFIG_USB_PCI */ + + /* pci-ish (pdev null is ok) buffer alloc/mapping support */