| Message ID | 20200519050622.994908-1-vkoul@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | df00731cffa0edb454ee0c490696ce0c1745e680 |
| Headers | show |
| Series | usb: xhci: fix USB_XHCI_PCI depends | expand |
On Mon 18 May 22:06 PDT 2020, Vinod Koul wrote: > The xhci-pci-renesas module exports symbols for xhci-pci to load the > RAM/ROM on renesas xhci controllers. We had dependency which works > when both the modules are builtin or modules. > > But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below > linker error: > drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove': > drivers/usb/host/xhci-pci.c:411: undefined reference to `renesas_xhci_pci_exit' > drivers/usb/host/xhci-pci.o: In function `xhci_pci_probe': > drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw' > > Fix this by adding USB_XHCI_PCI having depends on USB_XHCI_PCI_RENESAS > || !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Reported-by: Anders Roxell <anders.roxell@linaro.org> > Fixes: a66d21d7dba8 ("usb: xhci: Add support for Renesas controller with memory") > Tested-by: Anders Roxell <anders.roxell@linaro.org> > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- > drivers/usb/host/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index b5c542d6a1c5..92783d175b3f 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP > config USB_XHCI_PCI > tristate > depends on USB_PCI > + depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS > default y > > config USB_XHCI_PCI_RENESAS > tristate "Support for additional Renesas xHCI controller with firwmare" > - depends on USB_XHCI_PCI > ---help--- > Say 'Y' to enable the support for the Renesas xHCI controller with > firwmare. Make sure you have the firwmare for the device and > -- > 2.25.4 >
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index b5c542d6a1c5..92783d175b3f 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -40,11 +40,11 @@ config USB_XHCI_DBGCAP config USB_XHCI_PCI tristate depends on USB_PCI + depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS default y config USB_XHCI_PCI_RENESAS tristate "Support for additional Renesas xHCI controller with firwmare" - depends on USB_XHCI_PCI ---help--- Say 'Y' to enable the support for the Renesas xHCI controller with firwmare. Make sure you have the firwmare for the device and
The xhci-pci-renesas module exports symbols for xhci-pci to load the RAM/ROM on renesas xhci controllers. We had dependency which works when both the modules are builtin or modules. But if xhci-pci is inbuilt and xhci-pci-renesas in module, we get below linker error: drivers/usb/host/xhci-pci.o: In function `xhci_pci_remove': drivers/usb/host/xhci-pci.c:411: undefined reference to `renesas_xhci_pci_exit' drivers/usb/host/xhci-pci.o: In function `xhci_pci_probe': drivers/usb/host/xhci-pci.c:345: undefined reference to `renesas_xhci_check_request_fw' Fix this by adding USB_XHCI_PCI having depends on USB_XHCI_PCI_RENESAS || !USB_XHCI_PCI_RENESAS so that both can be either inbuilt or modules. Reported-by: Anders Roxell <anders.roxell@linaro.org> Fixes: a66d21d7dba8 ("usb: xhci: Add support for Renesas controller with memory") Tested-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Vinod Koul <vkoul@kernel.org> --- drivers/usb/host/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)