usb: Kconfig: make USB_ULPI_BUS select USB_COMMON
Subsystems (2)
PATCH 1/1 usb: Kconfig: make USB_ULPI_BUS select USB_COMMON
Moving the CONFIG_USB_ULPI_BUS option to the top-level Kconfig file means that we can enable it without any of the other USB support, leading to a build error because Kbuild never enters the drivers/usb/common/ directory without CONFIG_USB_COMMON:
ERROR: "ulpi_unregister_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "__ulpi_register_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "ulpi_write" [drivers/phy/phy-tusb1210.ko] undefined!
This adds a 'select USB_COMMON' for the symbol, similar to what we have for related options.
--- drivers/usb/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/usb/Kconfig +1 -0
@@ -162,6 +162,7 @@ config USB_LED_TRIG config USB_ULPI_BUS tristate "USB ULPI PHY interface support" + select USB_COMMON help UTMI+ Low Pin Interface (ULPI) is specification for a commonly used USB 2.0 PHY interface. The ULPI specification defines a standard set
Signature · 1 line
2.9.0
Quoted 9 lines · Arnd Bergmann
Moving the
CONFIG_USB_ULPI_BUSoption to the top-levelKconfigfile means that we can enable it without any of the other USB support, leading to a build error becauseKbuildnever enters thedrivers/usb/common/directory withoutCONFIG_USB_COMMON:ERROR: "
ulpi_unregister_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "__ulpi_register_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "ulpi_write" [drivers/phy/phy-tusb1210.ko] undefined!
Thanks, Arnd. I have submitted the fix.
Signature · 2 lines
Best Regards, Peter Chen
Quoted 6 lines · CEST Peter Chen
Quoted 5 lines · Arnd Bergmann
Moving the
CONFIG_USB_ULPI_BUSoption to the top-levelKconfigfile means that we can enable it without any of the other USB support, leading to a build error becauseKbuildnever enters thedrivers/usb/common/directory withoutCONFIG_USB_COMMON:
Quoted 8 lines
Quoted 4 lines
ERROR: "
ulpi_unregister_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "__ulpi_register_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "ulpi_write" [drivers/phy/phy-tusb1210.ko] undefined!Thanks, Arnd. I have submitted the fix.
I see you used 'depends on USB_COMMON' though instead of 'select USB_COMMON'.
This seems inconsistent with how we handle the other places after the patch I did earlier this year [see below].
It probably works fine for now, but having a mix of 'depends on' and 'select' can be confusing for users as well as create dependency loops that break the build.
Arnd
commit badf6d47f8a93098c6e05fdeb735b44b61877451
Author: Arnd Bergmann <[email protected]> Date: Wed Mar 23 17:45:08 2016 +0100
usb: common: rework CONFIG_USB_COMMON logic
The phy-am335x driver selects 'USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB || USB_GADGET itself, which causes a Kconfig warning:
warning: (AM335X_PHY_USB) selects USB_COMMON which has unmet direct dependencies (USB_SUPPORT && (USB || USB_GADGET))
As suggested by Felipe Balbi, this turns the logic around, and makes 'USB_COMMON' selected by everything else that needs it, so we can remove the dependencies.
drivers/phy/Kconfig +2 -1
@@ -250,7 +250,8 @@ config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF depends on RESET_CONTROLLER - depends on USB_COMMON + depends on USB_SUPPORT + select USB_COMMON select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinner
drivers/usb/Kconfig +1 -2
@@ -31,8 +31,6 @@ if USB_SUPPORT config USB_COMMON tristate - default y - depends on USB || USB_GADGET config USB_ARCH_HAS_HCD def_bool y
@@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select USB_COMMON select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial bus
drivers/usb/gadget/Kconfig +1 -0
@@ -15,6 +15,7 @@ menuconfig USB_GADGET tristate "USB Gadget Support" + select USB_COMMON select NLS help USB is a master/slave protocol, organized with one master
Quoted 18 lines · Arnd Bergmann
Quoted 6 lines · CEST Peter Chen
Quoted 5 lines · Arnd Bergmann
Moving the
CONFIG_USB_ULPI_BUSoption to the top-levelKconfigfile means that we can enable it without any of the other USB support, leading to a build error becauseKbuildnever enters thedrivers/usb/common/directory withoutCONFIG_USB_COMMON:Quoted 8 lines
Quoted 4 lines
ERROR: "
ulpi_unregister_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "__ulpi_register_driver" [drivers/phy/phy-tusb1210.ko] undefined!
ERROR: "ulpi_write" [drivers/phy/phy-tusb1210.ko] undefined!Thanks, Arnd. I have submitted the fix.
I see you used 'depends on
USB_COMMON' though instead of 'selectUSB_COMMON'.
Quoted 8 lines
This seems inconsistent with how we handle the other places after the patch I did earlier this year [see below].
It probably works fine for now, but having a mix of 'depends on' and 'select' can be confusing for users as well as create dependency loops that break the build.
Arnd
I just see below Kconfig entry at the same Kconfig (drivers/usb/Kconfig), and forget your changes.
config USB_LED_TRIG
bool "USB LED Triggers"
depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS help
This option adds LED triggers for USB host and/or gadget activity.
Say Y here if you are working on a system with led-class supported LEDs and you want to use them as activity indicators for USB host or gadget.
Just grep it, some Kconfig still uses depends on for USB_COMMON, let me change it together.
b29397@b29397-desktop:~/work/projects/usb$ find . -name Kconfig | xargs grep -nr "USB_COMMON" ./drivers/phy/Kconfig:274: select USB_COMMON ./drivers/usb/phy/Kconfig:72: select USB_COMMON ./drivers/usb/Kconfig:32:config USB_COMMON ./drivers/usb/Kconfig:42: select USB_COMMON ./drivers/usb/Kconfig:155: depends on LEDS_CLASS && USB_COMMON && LEDS_TRIGGERS ./drivers/usb/gadget/Kconfig:18: select USB_COMMON ./drivers/usb/usbip/Kconfig:3: depends on USB_COMMON && NET
Peter
Quoted 71 lines
commit
badf6d47f8a93098c6e05fdeb735b44b61877451Author: Arnd Bergmann <[email protected]> Date: Wed Mar 23 17:45:08 2016 +0100usb: common: rework
CONFIG_USB_COMMONlogicThe phy-am335x driver selects '
USB_COMMON', but all other drivers use 'depends on' for that symbol, and it depends on USB ||USB_GADGETitself, which causes aKconfigwarning:warning: (
AM335X_PHY_USB) selectsUSB_COMMONwhich has unmet direct dependencies (USB_SUPPORT&& (USB ||USB_GADGET))As suggested by Felipe Balbi, this turns the logic around, and makes '
USB_COMMON' selected by everything else that needs it, so we can remove the dependencies.Fixes 59f042f644c5 ("usb: phy: phy-am335x: bypass first VBUS sensing for host-only mode")Signed-off-by Arnd Bergmann <[email protected]>Acked-by Felipe Balbi <[email protected]>Reviewed-by Peter Chen <[email protected]>Signed-off-by Felipe Balbi <[email protected]>drivers/phy/Kconfig +2
-1@@ -250,7 +250,8 @@ config PHY_SUN9I_USB tristate "Allwinner sun9i SoC USB PHY driver" depends on ARCH_SUNXI && HAS_IOMEM && OF depends on RESET_CONTROLLER - depends on USB_COMMON + depends on USB_SUPPORT + select USB_COMMON select GENERIC_PHY help Enable this to support the transceiver that is part of Allwinnerdrivers/usb/Kconfig +1
-2@@ -31,8 +31,6 @@ if USB_SUPPORT config USB_COMMON tristate - default y - depends on USB || USB_GADGET config USB_ARCH_HAS_HCD def_bool y@@ -41,6 +39,7 @@ config USB_ARCH_HAS_HCD config USB tristate "Support for Host-side USB" depends on USB_ARCH_HAS_HCD + select USB_COMMON select NLS # for UTF-8 strings ---help--- Universal Serial Bus (USB) is a specification for a serial busdrivers/usb/gadget/Kconfig +1
-0@@ -15,6 +15,7 @@ menuconfig USB_GADGET tristate "USB Gadget Support" + select USB_COMMON select NLS help USB is a master/slave protocol, organized with one master
Signature · 2 lines
Best Regards, Peter Chen
Quoted 10 lines · CEST Peter Chen
I just see below
Kconfigentry at the sameKconfig(drivers/usb/Kconfig), and forget your changes.config
USB_LED_TRIG
bool "USB LED Triggers"
depends onLEDS_CLASS&&USB_COMMON&&LEDS_TRIGGERShelp
This option adds LED triggers for USB host and/or gadget activity.
Quoted 7 lines
Say Y here if you are working on a system with led-class supported LEDs and you want to use them as activity indicators for USB host or gadget.
Just grep it, some
Kconfigstill uses depends on forUSB_COMMON, let me change it together.
I suspect this one above should instead depend on "USB_SUPPORT".
Arnd
Quoted 15 lines · Arnd Bergmann
Quoted 14 lines · CEST Peter Chen
I just see below
Kconfigentry at the sameKconfig(drivers/usb/Kconfig), and forget your changes.config
USB_LED_TRIG
bool "USB LED Triggers"
depends onLEDS_CLASS&&USB_COMMON&&LEDS_TRIGGERShelp
This option adds LED triggers for USB host and/or gadget activity.Say Y here if you are working on a system with led-class supported LEDs and you want to use them as activity indicators for USB host or gadget.
Quoted 6 lines
Quoted 3 lines
Just grep it, some
Kconfigstill uses depends on forUSB_COMMON, let me change it together.I suspect this one above should instead depend on "
USB_SUPPORT".
No, it is embraced by "if USB_SUPPORT", so we don't need to add it additionally. Even USB_SUPPORT is chosen, the USB_COMMON may still not be chosen, so we need let USB_LET_TRIG select USB_COMMON explicitly.
Signature · 2 lines
Best Regards, Peter Chen
Quoted 20 lines · CEST Peter Chen
Quoted 19 lines · Arnd Bergmann
Quoted 17 lines · CEST Peter Chen
I just see below
Kconfigentry at the sameKconfig(drivers/usb/Kconfig), and forget your changes.config
USB_LED_TRIG
bool "USB LED Triggers"
depends onLEDS_CLASS&&USB_COMMON&&LEDS_TRIGGERShelp
This option adds LED triggers for USB host and/or gadget activity.Say Y here if you are working on a system with led-class supported LEDs and you want to use them as activity indicators for USB host or gadget.
Just grep it, some
Kconfigstill uses depends on forUSB_COMMON, let me change it together.
Quoted 5 lines
Quoted 2 lines
I suspect this one above should instead depend on "
USB_SUPPORT".No, it is embraced by "if
USB_SUPPORT", so we don't need to add it additionally.
Right, makes sense.
Quoted 3 lines
Even
USB_SUPPORTis chosen, theUSB_COMMONmay still not be chosen, so we need letUSB_LET_TRIGselectUSB_COMMONexplicitly.
My thought was that all users that could possibly call the USB_LED_TRIG interfaces already rely on USB_COMMON to be present.
There is probably no real downside in having the 'select USB_COMMON', but it shouldn't actually be needed. It would be somewhat unusual though to enable USB_LED_TRIG and not build the file because we don't enter the directory, so maybe it's better to have it after all.
Arnd