| Message ID | 20200430111258.6091-5-alcooperx@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add XHCI, EHCI and OHCI support for Broadcom STB SoS's | expand |
On Thu, Apr 30, 2020 at 07:12:58AM -0400, Al Cooper wrote: > Add the build system changes needed to get the Broadcom STB XHCI, > EHCI and OHCI functionality working. The OHCI support does not > require anything unique to Broadcom so the standard ohci-platform > driver is being used. The link order for XHCI was changed in the > Makefile because of the way STB XHCI, EHCI and OHCI controllers > share a port which requires that the XHCI driver be initialized > first. Also update MAINTAINERS. > > Signed-off-by: Al Cooper <alcooperx@gmail.com> > --- > MAINTAINERS | 8 ++++++++ > drivers/usb/host/Kconfig | 16 ++++++++++++++++ > drivers/usb/host/Makefile | 16 ++++++++++------ > 3 files changed, 34 insertions(+), 6 deletions(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 26f281d9f32a..6147ed78d212 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3481,6 +3481,14 @@ S: Supported > F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml > F: drivers/i2c/busses/i2c-brcmstb.c > > +BROADCOM BRCMSTB USB EHCI DRIVER > +M: Al Cooper <alcooperx@gmail.com> > +L: linux-usb@vger.kernel.org > +L: bcm-kernel-feedback-list@broadcom.com > +S: Maintained > +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml > +F: drivers/usb/host/ehci-brcm.* > + > BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER > M: Al Cooper <alcooperx@gmail.com> > L: linux-kernel@vger.kernel.org > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > index 55bdfdf11e4c..7d58fd66e412 100644 > --- a/drivers/usb/host/Kconfig > +++ b/drivers/usb/host/Kconfig > @@ -97,6 +97,22 @@ config USB_XHCI_TEGRA > > endif # USB_XHCI_HCD > > +config USB_EHCI_BRCMSTB > + tristate > + > +config USB_BRCMSTB > + tristate "Broadcom STB USB support" > + depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST > + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD > + select USB_EHCI_BRCMSTB if USB_EHCI_HCD > + select USB_XHCI_PLATFORM if USB_XHCI_HCD > + help > + Say Y to enable support for XHCI, EHCI and OHCI host controllers > + found in Broadcom STB SoC's. > + > + Disabling this will keep the controllers and corresponding > + PHYs powered down. Whhat are the module names? And why 2 config options here? > + > config USB_EHCI_HCD > tristate "EHCI HCD (USB 2.0) support" > depends on HAS_DMA && HAS_IOMEM > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile > index b191361257cc..85fa6ace552a 100644 > --- a/drivers/usb/host/Makefile > +++ b/drivers/usb/host/Makefile > @@ -37,6 +37,15 @@ endif > > obj-$(CONFIG_USB_PCI) += pci-quirks.o > > +# NOTE: BRCMSTB systems require that xhci driver be linked before the > +# ehci/ohci drivers. Why? Please do this as a separate change before your makefile changes. And what else will this break? We have relied on this link order for a very long time, changing it could cause issues... I don't see how your driver needs this, please explain in great detail. thanks, greg k-h
On Tue, May 5, 2020 at 6:54 AM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > On Thu, Apr 30, 2020 at 07:12:58AM -0400, Al Cooper wrote: > > Add the build system changes needed to get the Broadcom STB XHCI, > > EHCI and OHCI functionality working. The OHCI support does not > > require anything unique to Broadcom so the standard ohci-platform > > driver is being used. The link order for XHCI was changed in the > > Makefile because of the way STB XHCI, EHCI and OHCI controllers > > share a port which requires that the XHCI driver be initialized > > first. Also update MAINTAINERS. > > > > Signed-off-by: Al Cooper <alcooperx@gmail.com> > > --- > > MAINTAINERS | 8 ++++++++ > > drivers/usb/host/Kconfig | 16 ++++++++++++++++ > > drivers/usb/host/Makefile | 16 ++++++++++------ > > 3 files changed, 34 insertions(+), 6 deletions(-) > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 26f281d9f32a..6147ed78d212 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -3481,6 +3481,14 @@ S: Supported > > F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml > > F: drivers/i2c/busses/i2c-brcmstb.c > > > > +BROADCOM BRCMSTB USB EHCI DRIVER > > +M: Al Cooper <alcooperx@gmail.com> > > +L: linux-usb@vger.kernel.org > > +L: bcm-kernel-feedback-list@broadcom.com > > +S: Maintained > > +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml > > +F: drivers/usb/host/ehci-brcm.* > > + > > BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER > > M: Al Cooper <alcooperx@gmail.com> > > L: linux-kernel@vger.kernel.org > > diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig > > index 55bdfdf11e4c..7d58fd66e412 100644 > > --- a/drivers/usb/host/Kconfig > > +++ b/drivers/usb/host/Kconfig > > @@ -97,6 +97,22 @@ config USB_XHCI_TEGRA > > > > endif # USB_XHCI_HCD > > > > +config USB_EHCI_BRCMSTB > > + tristate > > + > > +config USB_BRCMSTB > > + tristate "Broadcom STB USB support" > > + depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST > > + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD > > + select USB_EHCI_BRCMSTB if USB_EHCI_HCD > > + select USB_XHCI_PLATFORM if USB_XHCI_HCD > > + help > > + Say Y to enable support for XHCI, EHCI and OHCI host controllers > > + found in Broadcom STB SoC's. > > + > > + Disabling this will keep the controllers and corresponding > > + PHYs powered down. > > Whhat are the module names? I'll add the module names. > > And why 2 config options here? I'd like the option to build an XHCI only system by not enabling USB_EHCI_HCD and USB_OHCI_HCD. > > > + > > config USB_EHCI_HCD > > tristate "EHCI HCD (USB 2.0) support" > > depends on HAS_DMA && HAS_IOMEM > > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile > > index b191361257cc..85fa6ace552a 100644 > > --- a/drivers/usb/host/Makefile > > +++ b/drivers/usb/host/Makefile > > @@ -37,6 +37,15 @@ endif > > > > obj-$(CONFIG_USB_PCI) += pci-quirks.o > > > > +# NOTE: BRCMSTB systems require that xhci driver be linked before the > > +# ehci/ohci drivers. > > Why? Please do this as a separate change before your makefile changes. Okay > > And what else will this break? We have relied on this link order for a > very long time, changing it could cause issues... > > I don't see how your driver needs this, please explain in great detail. For this explaination, I'm going to call our EHCI and OHCI controllers EOHCI. We have some SoC's that have an XHCI controller and an EOHCI controller on the same port, where the XHCI controller handles the 3.0 devices and the EOHCI handles the <= 2.0 devices. If the EOHCI controller comes up before the XHCI controller, any 3.0 devices installed on the port will be seen as a 2.0 device. Once the 3.0 controller comes up, most 3.0 USB devices will switch to 3.0, but this seems to cause problems on some USB devices. In the past, this wasn't a problem because we had custom XHCI, EHCI and OHCI drivers that I could order any way necessary. Now that the standard platform XHCI and OHCI drivers are being used this becomes a problem. Thanks for the review Al > > thanks, > > greg k-h
diff --git a/MAINTAINERS b/MAINTAINERS index 26f281d9f32a..6147ed78d212 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3481,6 +3481,14 @@ S: Supported F: Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml F: drivers/i2c/busses/i2c-brcmstb.c +BROADCOM BRCMSTB USB EHCI DRIVER +M: Al Cooper <alcooperx@gmail.com> +L: linux-usb@vger.kernel.org +L: bcm-kernel-feedback-list@broadcom.com +S: Maintained +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml +F: drivers/usb/host/ehci-brcm.* + BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER M: Al Cooper <alcooperx@gmail.com> L: linux-kernel@vger.kernel.org diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 55bdfdf11e4c..7d58fd66e412 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -97,6 +97,22 @@ config USB_XHCI_TEGRA endif # USB_XHCI_HCD +config USB_EHCI_BRCMSTB + tristate + +config USB_BRCMSTB + tristate "Broadcom STB USB support" + depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD + select USB_EHCI_BRCMSTB if USB_EHCI_HCD + select USB_XHCI_PLATFORM if USB_XHCI_HCD + help + Say Y to enable support for XHCI, EHCI and OHCI host controllers + found in Broadcom STB SoC's. + + Disabling this will keep the controllers and corresponding + PHYs powered down. + config USB_EHCI_HCD tristate "EHCI HCD (USB 2.0) support" depends on HAS_DMA && HAS_IOMEM diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index b191361257cc..85fa6ace552a 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -37,6 +37,15 @@ endif obj-$(CONFIG_USB_PCI) += pci-quirks.o +# NOTE: BRCMSTB systems require that xhci driver be linked before the +# ehci/ohci drivers. +obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o +obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o +obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o +obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o +obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o +obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o + obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o @@ -49,6 +58,7 @@ obj-$(CONFIG_USB_EHCI_HCD_STI) += ehci-st.o obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o +obj-$(CONFIG_USB_EHCI_BRCMSTB) += ehci-brcm.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o @@ -69,12 +79,6 @@ obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o -obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o -obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o -obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o -obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o -obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o -obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
Add the build system changes needed to get the Broadcom STB XHCI, EHCI and OHCI functionality working. The OHCI support does not require anything unique to Broadcom so the standard ohci-platform driver is being used. The link order for XHCI was changed in the Makefile because of the way STB XHCI, EHCI and OHCI controllers share a port which requires that the XHCI driver be initialized first. Also update MAINTAINERS. Signed-off-by: Al Cooper <alcooperx@gmail.com> --- MAINTAINERS | 8 ++++++++ drivers/usb/host/Kconfig | 16 ++++++++++++++++ drivers/usb/host/Makefile | 16 ++++++++++------ 3 files changed, 34 insertions(+), 6 deletions(-)