On Sat, Jan 18, 2025 at 04:24:09AM -0800, Ron Economos wrote:
commit 9734fd7a27772016b1f6e31a03258338a219d7d6
This fixes the build when CONFIG_PM is not set
Signed-off-by: Ron Economos re@w6rz.net
drivers/usb/host/xhci-pci.c | 8 +++++++- include/linux/usb/hcd.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-)
<snip>
I've finally been able to reproduce this issue here, and have trimmed this revert down even more to be the following patch. I'll go do a new 6.1.y release with just it in now.
thanks,
greg k-h
From: Ron Economos re@w6rz.net Date: Sat, 18 Jan 2025 04:24:09 -0800 Subject: Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals To: Greg Kroah-Hartman gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Pavel Machek pavel@denx.de, linux-kernel@vger.kernel.org, Ron Economos re@w6rz.net Message-ID: 20250118122409.4052121-1-re@w6rz.net
commit 9734fd7a2777 ("xhci: use pm_ptr() instead of #ifdef for CONFIG_PM conditionals") did not quite work properly in the 6.1.y branch where it was applied to fix a build error when CONFIG_PM was set as it left the following build errors still present:
ERROR: modpost: "xhci_suspend" [drivers/usb/host/xhci-pci.ko] undefined! ERROR: modpost: "xhci_resume" [drivers/usb/host/xhci-pci.ko] undefined!
Fix this up by properly placing the #ifdef CONFIG_PM in the xhci-pci.c and hcd.h files to handle this correctly.
Link: https://lore.kernel.org/r/133dbfa0-4a37-4ae0-bb95-1a35f668ec11@w6rz.net Signed-off-by: Ron Economos re@w6rz.net Link: https://lore.kernel.org/r/d0919169-ee06-4bdd-b2e3-2f776db90971@roeck-us.net Reported-by: Guenter Roeck linux@roeck-us.net [ Trimmed the partial revert down to an even smaller bit to only be what is required to fix the build error - gregkh] Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/usb/host/xhci-pci.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -571,6 +571,7 @@ 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, @@ -720,6 +721,7 @@ static void xhci_pci_shutdown(struct usb if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) pci_set_power_state(pdev, PCI_D3hot); } +#endif /* CONFIG_PM */
/*-------------------------------------------------------------------------*/
@@ -769,9 +771,11 @@ static struct pci_driver xhci_pci_driver 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);