* [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM
[not found] <20210813195228.2003500-1-mka@chromium.org>
@ 2021-08-13 19:52 ` Matthias Kaehlcke
2021-08-26 6:46 ` Roger Quadros
2021-08-13 19:52 ` [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on' Matthias Kaehlcke
1 sibling, 1 reply; 6+ messages in thread
From: Matthias Kaehlcke @ 2021-08-13 19:52 UTC (permalink / raw)
To: Greg Kroah-Hartman, Alan Stern, Rob Herring, Frank Rowand,
Mathias Nyman, Felipe Balbi
Cc: devicetree, Peter Chen, linux-kernel, linux-usb, Bastien Nocera,
Ravi Chandra Sadineni, Michal Simek, Douglas Anderson,
Roger Quadros, Krzysztof Kozlowski, Stephen Boyd,
Matthias Kaehlcke, Andrey Zhizhikin, Bjorn Andersson,
Catalin Marinas, Dmitry Baryshkov, Enric Balletbo i Serra,
Fabio Estevam, Guido Günther, Jagan Teki, Nishanth Menon,
Shawn Guo, Vinod Koul, Will Deacon, linux-arm-kernel
The dependency of USB_DWC3 on USB_XHCI_PLATFORM is being changed
from 'select' to 'depends on' by another patch. The defconfig selects
USB_DWC3 and implicitly USB_DWC3_DUAL_ROLE, to keep this unchanged
USB_XHCI_PLATFORM now needs to be selected explicitly.
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
---
Changes in v16:
- none
Changes in v15:
- none
Changes in v14:
- rebased on v5.14-rc1 (with the rest of the series)
- added 'Reviewed-by' tag from Doug
Changes in v13:
- patch added to the series
arch/arm64/configs/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index f423d08b9a71..b243bd11a4ed 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -802,6 +802,7 @@ CONFIG_USB_OTG=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PCI=m
CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PLATFORM=y
CONFIG_USB_XHCI_TEGRA=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_EXYNOS=y
--
2.33.0.rc1.237.g0d66db33f3-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on'
[not found] <20210813195228.2003500-1-mka@chromium.org>
2021-08-13 19:52 ` [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM Matthias Kaehlcke
@ 2021-08-13 19:52 ` Matthias Kaehlcke
2021-08-26 6:46 ` Roger Quadros
2021-11-11 23:48 ` Doug Anderson
1 sibling, 2 replies; 6+ messages in thread
From: Matthias Kaehlcke @ 2021-08-13 19:52 UTC (permalink / raw)
To: Greg Kroah-Hartman, Alan Stern, Rob Herring, Frank Rowand,
Mathias Nyman, Felipe Balbi
Cc: devicetree, Peter Chen, linux-kernel, linux-usb, Bastien Nocera,
Ravi Chandra Sadineni, Michal Simek, Douglas Anderson,
Roger Quadros, Krzysztof Kozlowski, Stephen Boyd,
Matthias Kaehlcke, Andrew Lunn, Aswath Govindraju,
Dmitry Osipenko, Fabio Estevam, Gregory Clement,
Krzysztof Kozlowski, Pawel Laszczak, Sebastian Hesselbarth,
Tony Lindgren, linux-arm-kernel, linux-omap, linux-samsung-soc
Some USB controller drivers that depend on the xhci-plat driver
specify this dependency using 'select' in Kconfig. This is not
recommended for symbols that have other dependencies as it may
lead to invalid configurations. Use 'depends on' to specify the
dependency instead of 'select'.
For dwc3 specify the dependency on USB_XHCI_PLATFORM in
USB_DWC3_HOST and USB_DWC3_DUAL_ROLE. Also adjust the
dependencies of USB_DWC3_CORE to make sure that at least one
of USB_DWC3_HOST, USB_DWC3_GADGET or USB_DWC3_DUAL_ROLE can be
selected.
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
Changes in v16:
- none
Changes in v15:
- adjusted dependencies of USB_DWC3_CORE to make sure it can only
be enabled when at least one of USB_DWC3_HOST, USB_DWC3_GADGET
or USB_DWC3_DUAL_ROLE is selectable
- updated commit message
Changes in v14:
- none
Changes in v13:
- patch added to the series
drivers/usb/cdns3/Kconfig | 2 +-
drivers/usb/dwc3/Kconfig | 5 +++--
drivers/usb/host/Kconfig | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/cdns3/Kconfig b/drivers/usb/cdns3/Kconfig
index b98ca0a1352a..07e12f786d48 100644
--- a/drivers/usb/cdns3/Kconfig
+++ b/drivers/usb/cdns3/Kconfig
@@ -1,7 +1,7 @@
config USB_CDNS_SUPPORT
tristate "Cadence USB Support"
depends on USB_SUPPORT && (USB || USB_GADGET) && HAS_DMA
- select USB_XHCI_PLATFORM if USB_XHCI_HCD
+ depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM
select USB_ROLE_SWITCH
help
Say Y here if your system has a Cadence USBSS or USBSSP
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 66b1454c4db2..870f2251350a 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -2,8 +2,7 @@
config USB_DWC3
tristate "DesignWare USB3 DRD Core Support"
- depends on (USB || USB_GADGET) && HAS_DMA
- select USB_XHCI_PLATFORM if USB_XHCI_HCD
+ depends on ((USB && USB_XHCI_PLATFORM) || USB_GADGET) && HAS_DMA
select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE
help
Say Y or M here if your system has a Dual Role SuperSpeed
@@ -30,6 +29,7 @@ choice
config USB_DWC3_HOST
bool "Host only mode"
depends on USB=y || USB=USB_DWC3
+ depends on USB_XHCI_PLATFORM
help
Select this when you want to use DWC3 in host mode only,
thereby the gadget feature will be regressed.
@@ -44,6 +44,7 @@ config USB_DWC3_GADGET
config USB_DWC3_DUAL_ROLE
bool "Dual Role mode"
depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))
+ depends on USB_XHCI_PLATFORM
depends on (EXTCON=y || EXTCON=USB_DWC3)
help
This is the default mode of working of DWC3 controller where
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index df9428f1dc5e..518c2312ef0c 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -80,7 +80,7 @@ config USB_XHCI_MTK
config USB_XHCI_MVEBU
tristate "xHCI support for Marvell Armada 375/38x/37xx"
- select USB_XHCI_PLATFORM
+ depends on USB_XHCI_PLATFORM
depends on HAS_IOMEM
depends on ARCH_MVEBU || COMPILE_TEST
help
@@ -112,9 +112,9 @@ config USB_EHCI_BRCMSTB
config USB_BRCMSTB
tristate "Broadcom STB USB support"
depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST
+ depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM
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
Enables support for XHCI, EHCI and OHCI host controllers
found in Broadcom STB SoC's.
--
2.33.0.rc1.237.g0d66db33f3-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM
2021-08-13 19:52 ` [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM Matthias Kaehlcke
@ 2021-08-26 6:46 ` Roger Quadros
0 siblings, 0 replies; 6+ messages in thread
From: Roger Quadros @ 2021-08-26 6:46 UTC (permalink / raw)
To: Matthias Kaehlcke, Greg Kroah-Hartman, Alan Stern, Rob Herring,
Frank Rowand, Mathias Nyman, Felipe Balbi
Cc: devicetree, Peter Chen, linux-kernel, linux-usb, Bastien Nocera,
Ravi Chandra Sadineni, Michal Simek, Douglas Anderson,
Krzysztof Kozlowski, Stephen Boyd, Andrey Zhizhikin,
Bjorn Andersson, Catalin Marinas, Dmitry Baryshkov,
Enric Balletbo i Serra, Fabio Estevam, Guido Günther,
Jagan Teki, Nishanth Menon, Shawn Guo, Vinod Koul, Will Deacon,
linux-arm-kernel
On 13/08/2021 22:52, Matthias Kaehlcke wrote:
> The dependency of USB_DWC3 on USB_XHCI_PLATFORM is being changed
> from 'select' to 'depends on' by another patch. The defconfig selects
> USB_DWC3 and implicitly USB_DWC3_DUAL_ROLE, to keep this unchanged
> USB_XHCI_PLATFORM now needs to be selected explicitly.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
cheers,
-roger
> ---
>
> Changes in v16:
> - none
>
> Changes in v15:
> - none
>
> Changes in v14:
> - rebased on v5.14-rc1 (with the rest of the series)
> - added 'Reviewed-by' tag from Doug
>
> Changes in v13:
> - patch added to the series
>
> arch/arm64/configs/defconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
> index f423d08b9a71..b243bd11a4ed 100644
> --- a/arch/arm64/configs/defconfig
> +++ b/arch/arm64/configs/defconfig
> @@ -802,6 +802,7 @@ CONFIG_USB_OTG=y
> CONFIG_USB_XHCI_HCD=y
> CONFIG_USB_XHCI_PCI=m
> CONFIG_USB_XHCI_PCI_RENESAS=m
> +CONFIG_USB_XHCI_PLATFORM=y
> CONFIG_USB_XHCI_TEGRA=y
> CONFIG_USB_EHCI_HCD=y
> CONFIG_USB_EHCI_EXYNOS=y
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on'
2021-08-13 19:52 ` [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on' Matthias Kaehlcke
@ 2021-08-26 6:46 ` Roger Quadros
2021-11-11 23:48 ` Doug Anderson
1 sibling, 0 replies; 6+ messages in thread
From: Roger Quadros @ 2021-08-26 6:46 UTC (permalink / raw)
To: Matthias Kaehlcke, Greg Kroah-Hartman, Alan Stern, Rob Herring,
Frank Rowand, Mathias Nyman, Felipe Balbi
Cc: devicetree, Peter Chen, linux-kernel, linux-usb, Bastien Nocera,
Ravi Chandra Sadineni, Michal Simek, Douglas Anderson,
Krzysztof Kozlowski, Stephen Boyd, Andrew Lunn,
Aswath Govindraju, Dmitry Osipenko, Fabio Estevam,
Gregory Clement, Krzysztof Kozlowski, Pawel Laszczak,
Sebastian Hesselbarth, Tony Lindgren, linux-arm-kernel,
linux-omap, linux-samsung-soc
On 13/08/2021 22:52, Matthias Kaehlcke wrote:
> Some USB controller drivers that depend on the xhci-plat driver
> specify this dependency using 'select' in Kconfig. This is not
> recommended for symbols that have other dependencies as it may
> lead to invalid configurations. Use 'depends on' to specify the
> dependency instead of 'select'.
>
> For dwc3 specify the dependency on USB_XHCI_PLATFORM in
> USB_DWC3_HOST and USB_DWC3_DUAL_ROLE. Also adjust the
> dependencies of USB_DWC3_CORE to make sure that at least one
> of USB_DWC3_HOST, USB_DWC3_GADGET or USB_DWC3_DUAL_ROLE can be
> selected.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
cheers,
-roger
> ---
>
> Changes in v16:
> - none
>
> Changes in v15:
> - adjusted dependencies of USB_DWC3_CORE to make sure it can only
> be enabled when at least one of USB_DWC3_HOST, USB_DWC3_GADGET
> or USB_DWC3_DUAL_ROLE is selectable
> - updated commit message
>
> Changes in v14:
> - none
>
> Changes in v13:
> - patch added to the series
>
> drivers/usb/cdns3/Kconfig | 2 +-
> drivers/usb/dwc3/Kconfig | 5 +++--
> drivers/usb/host/Kconfig | 4 ++--
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/cdns3/Kconfig b/drivers/usb/cdns3/Kconfig
> index b98ca0a1352a..07e12f786d48 100644
> --- a/drivers/usb/cdns3/Kconfig
> +++ b/drivers/usb/cdns3/Kconfig
> @@ -1,7 +1,7 @@
> config USB_CDNS_SUPPORT
> tristate "Cadence USB Support"
> depends on USB_SUPPORT && (USB || USB_GADGET) && HAS_DMA
> - select USB_XHCI_PLATFORM if USB_XHCI_HCD
> + depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM
> select USB_ROLE_SWITCH
> help
> Say Y here if your system has a Cadence USBSS or USBSSP
> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
> index 66b1454c4db2..870f2251350a 100644
> --- a/drivers/usb/dwc3/Kconfig
> +++ b/drivers/usb/dwc3/Kconfig
> @@ -2,8 +2,7 @@
>
> config USB_DWC3
> tristate "DesignWare USB3 DRD Core Support"
> - depends on (USB || USB_GADGET) && HAS_DMA
> - select USB_XHCI_PLATFORM if USB_XHCI_HCD
> + depends on ((USB && USB_XHCI_PLATFORM) || USB_GADGET) && HAS_DMA
> select USB_ROLE_SWITCH if USB_DWC3_DUAL_ROLE
> help
> Say Y or M here if your system has a Dual Role SuperSpeed
> @@ -30,6 +29,7 @@ choice
> config USB_DWC3_HOST
> bool "Host only mode"
> depends on USB=y || USB=USB_DWC3
> + depends on USB_XHCI_PLATFORM
> help
> Select this when you want to use DWC3 in host mode only,
> thereby the gadget feature will be regressed.
> @@ -44,6 +44,7 @@ config USB_DWC3_GADGET
> config USB_DWC3_DUAL_ROLE
> bool "Dual Role mode"
> depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))
> + depends on USB_XHCI_PLATFORM
> depends on (EXTCON=y || EXTCON=USB_DWC3)
> help
> This is the default mode of working of DWC3 controller where
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index df9428f1dc5e..518c2312ef0c 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -80,7 +80,7 @@ config USB_XHCI_MTK
>
> config USB_XHCI_MVEBU
> tristate "xHCI support for Marvell Armada 375/38x/37xx"
> - select USB_XHCI_PLATFORM
> + depends on USB_XHCI_PLATFORM
> depends on HAS_IOMEM
> depends on ARCH_MVEBU || COMPILE_TEST
> help
> @@ -112,9 +112,9 @@ config USB_EHCI_BRCMSTB
> config USB_BRCMSTB
> tristate "Broadcom STB USB support"
> depends on (ARCH_BRCMSTB && PHY_BRCM_USB) || COMPILE_TEST
> + depends on !USB_XHCI_HCD || USB_XHCI_PLATFORM
> 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
> Enables support for XHCI, EHCI and OHCI host controllers
> found in Broadcom STB SoC's.
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on'
2021-08-13 19:52 ` [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on' Matthias Kaehlcke
2021-08-26 6:46 ` Roger Quadros
@ 2021-11-11 23:48 ` Doug Anderson
2021-11-16 18:07 ` Matthias Kaehlcke
1 sibling, 1 reply; 6+ messages in thread
From: Doug Anderson @ 2021-11-11 23:48 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Greg Kroah-Hartman, Alan Stern, Rob Herring, Frank Rowand,
Mathias Nyman, Felipe Balbi, devicetree, Peter Chen,
linux-kernel, linux-usb, Bastien Nocera, Ravi Chandra Sadineni,
Michal Simek, Roger Quadros, Krzysztof Kozlowski, Stephen Boyd,
Andrew Lunn, Aswath Govindraju, Dmitry Osipenko, Fabio Estevam,
Gregory Clement, Krzysztof Kozlowski, Pawel Laszczak,
Sebastian Hesselbarth, Tony Lindgren, linux-arm-kernel,
linux-omap, linux-samsung-soc
Hi,
On Fri, Aug 13, 2021 at 12:52 PM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> config USB_DWC3
> tristate "DesignWare USB3 DRD Core Support"
> - depends on (USB || USB_GADGET) && HAS_DMA
> - select USB_XHCI_PLATFORM if USB_XHCI_HCD
> + depends on ((USB && USB_XHCI_PLATFORM) || USB_GADGET) && HAS_DMA
Technically you don't need the "USB &&", right? Since
USB_XHCI_PLATFORM is defined in 'usb/host/Kconfig' and that's only
even included if USB is defined. So it can be just:
depends on (USB_XHCI_PLATFORM || USB_GADGET) && HAS_DMA
That's not terribly important, though, so:
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on'
2021-11-11 23:48 ` Doug Anderson
@ 2021-11-16 18:07 ` Matthias Kaehlcke
0 siblings, 0 replies; 6+ messages in thread
From: Matthias Kaehlcke @ 2021-11-16 18:07 UTC (permalink / raw)
To: Doug Anderson
Cc: Greg Kroah-Hartman, Alan Stern, Rob Herring, Frank Rowand,
Mathias Nyman, Felipe Balbi, devicetree, Peter Chen,
linux-kernel, linux-usb, Bastien Nocera, Ravi Chandra Sadineni,
Michal Simek, Roger Quadros, Krzysztof Kozlowski, Stephen Boyd,
Andrew Lunn, Aswath Govindraju, Dmitry Osipenko, Fabio Estevam,
Gregory Clement, Krzysztof Kozlowski, Pawel Laszczak,
Sebastian Hesselbarth, Tony Lindgren, linux-arm-kernel,
linux-omap, linux-samsung-soc
On Thu, Nov 11, 2021 at 03:48:06PM -0800, Doug Anderson wrote:
> Hi,
>
> On Fri, Aug 13, 2021 at 12:52 PM Matthias Kaehlcke <mka@chromium.org> wrote:
> >
> > config USB_DWC3
> > tristate "DesignWare USB3 DRD Core Support"
> > - depends on (USB || USB_GADGET) && HAS_DMA
> > - select USB_XHCI_PLATFORM if USB_XHCI_HCD
> > + depends on ((USB && USB_XHCI_PLATFORM) || USB_GADGET) && HAS_DMA
>
> Technically you don't need the "USB &&", right? Since
> USB_XHCI_PLATFORM is defined in 'usb/host/Kconfig' and that's only
> even included if USB is defined. So it can be just:
>
> depends on (USB_XHCI_PLATFORM || USB_GADGET) && HAS_DMA
True, the dependency on USB isn't strictly needed.
> That's not terribly important, though, so:
>
> Reviewed-by: Douglas Anderson <dianders@chromium.org>
Thanks!
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-16 18:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20210813195228.2003500-1-mka@chromium.org>
2021-08-13 19:52 ` [PATCH v16 4/7] arm64: defconfig: Explicitly enable USB_XHCI_PLATFORM Matthias Kaehlcke
2021-08-26 6:46 ` Roger Quadros
2021-08-13 19:52 ` [PATCH v16 5/7] usb: Specify dependencies on USB_XHCI_PLATFORM with 'depends on' Matthias Kaehlcke
2021-08-26 6:46 ` Roger Quadros
2021-11-11 23:48 ` Doug Anderson
2021-11-16 18:07 ` Matthias Kaehlcke
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).