Re: [PATCH v13 3/5] usb: xhci: Add support for Renesas controller with memory

From: Vinod Koul
Date: Mon May 18 2020 - 15:57:30 EST


Hi Anders,

On 18-05-20, 19:53, Anders Roxell wrote:
> On Wed, 6 May 2020 at 08:01, Vinod Koul <vkoul@xxxxxxxxxx> wrote:
> >
> > Some rensas controller like uPD720201 and uPD720202 need firmware to be
> > loaded. Add these devices in pci table and invoke renesas firmware loader
> > functions to check and load the firmware into device memory when
> > required.
> >
> > Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
>
> Hi, I got a build error when I built an arm64 allmodconfig kernel.

Thanks for this. This is happening as we have default y for USB_XHCI_PCI
and then we make USB_XHCI_PCI_RENESAS=m. That should be not allowed as
we export as symbol so both can be inbuilt or modules but USB_XHCI_PCI=y
and USB_XHCI_PCI_RENESAS=m cant. While it is valid that USB_XHCI_PCI=y|m
and USB_XHCI_PCI_RENESAS=n

So this seems to get fixed by below for me. I have tested with
- both y and m (easy)
- make USB_XHCI_PCI_RENESAS=n, USB_XHCI_PCI=y|m works
- try making USB_XHCI_PCI=y and USB_XHCI_PCI_RENESAS=m, then
USB_XHCI_PCI=m by kbuild :)
- try making USB_XHCI_PCI=m and USB_XHCI_PCI_RENESAS=y, kbuild gives
error prompt that it will be m due to depends

Thanks to all the fixes done by Arnd which pointed me to this. Pls
verify and I will send the fix with you as reported :)

---- >8 ----

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

--
~Vinod