| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1413834151.2010.19.camel@x41> Date: Mon, 20 Oct 2014 21:42:31 +0200 From: Paul Bolle <pebolle@...cali.nl> To: dinguyen@...nsource.altera.com Cc: paulz@...opsys.com, balbi@...com, dinh.linux@...il.com, linux-kernel@...r.kernel.org, swarren@...dotorg.org, b.zolnierkie@...sung.com, matthijs@...in.nl, r.baldyga@...sung.com, jg1.han@...sung.com, sachin.kamat@...aro.org, ben-linux@...ff.org, dianders@...omium.org, kever.yang@...k-chips.com, linux-usb@...r.kernel.org Subject: Re: [PATCHv5 7/7] usb: dwc2: Update Kconfig to support dual-role dinguyen@...nsource.altera.com schreef op ma 20-10-2014 om 13:52 [-0500]: > From: Dinh Nguyen <dinguyen@...nsource.altera.com> > > Update DWC2 kconfig and makefile to support dual-role mode. The platform > file will always get compiled for the case where the controller is directly > connected to the CPU. So for loadable modules, dwc2.ko is built for host, > peripheral, and dual-role mode. The PCI bus interface will be called > dwc2_pci.ko and the platform interface module will be called dwc2_platform.ko. > > Signed-off-by: Dinh Nguyen <dinguyen@...nsource.altera.com> > Acked-by: Paul Zimmerman <paulz@...opsys.com> > --- > v5: dwc2.ko for all modes along with dwc2_platform.ko and dwc2_pci.ko will > get built for kernel modules. > v3: Add USB_GADGET=y and USB_GADGET=USB_DWC2 for peripheral and dual-role > config options. > v2: Remove reference to dwc2_gadget > --- > drivers/usb/dwc2/Kconfig | 61 ++++++++++++++++++++++++++++------------------- > drivers/usb/dwc2/Makefile | 32 ++++++++++++------------- > 2 files changed, 53 insertions(+), 40 deletions(-) > > diff --git a/drivers/usb/dwc2/Kconfig b/drivers/usb/dwc2/Kconfig > index f93807b..1ea702e 100644 > --- a/drivers/usb/dwc2/Kconfig > +++ b/drivers/usb/dwc2/Kconfig > @@ -1,5 +1,5 @@ > config USB_DWC2 > - bool "DesignWare USB2 DRD Core Support" > + tristate "DesignWare USB2 DRD Core Support" > depends on USB (Side note: drivers/usb/dwc2/Kconfig is sourced (in drivers/usb/Kconfig) even if USB is _not_ set. But USB_DCW2 still depends on USB. Why is that?) > help > Say Y here if your system has a Dual Role Hi-Speed USB > @@ -10,31 +10,53 @@ config USB_DWC2 > bus interface module (if you have a PCI bus system) will be > called dwc2_pci.ko, and the platform interface module (for > controllers directly connected to the CPU) will be called > - dwc2_platform.ko. For gadget mode, there will be a single > - module called dwc2_gadget.ko. > - > - NOTE: The s3c-hsotg driver is now renamed to dwc2_gadget. The > - host and gadget drivers are still currently separate drivers. > - There are plans to merge the dwc2_gadget driver with the dwc2 > - host driver in the near future to create a dual-role driver. > + dwc2_platform.ko. For all modes(host, gadget and dual-role), there > + will be a single module called dwc2.ko. > > if USB_DWC2 > > +choice > + bool "DWC2 Mode Selection" > + default USB_DWC2_DUAL_ROLE if (USB && USB_GADGET) > + default USB_DWC2_HOST if (USB && !USB_GADGET) > + default USB_DWC2_PERIPHERAL if (!USB && USB_GADGET) > + Juggling kconfig tristate logic is still rather hard for me, but don't the above three "if" rules all evaluate to non-zero if both USB and USB_GADGET are 'm'? If that's correct perhaps USB_DWC2_DUAL_ROLE should be the last default (assuming the last default wins, that is). Besides, will the default USB_DWC2_PERIPHERAL ever trigger as !USB can't be true at this point, can it? > config USB_DWC2_HOST > - tristate "Host only mode" > + bool "Host only mode" > depends on USB > help > The Designware USB2.0 high-speed host controller > - integrated into many SoCs. > + integrated into many SoCs. Select this option if you want the > + driver to operate in Host-only mode. > + > +comment "Gadget/Dual-role mode requires USB Gadget support to be enabled" > + > +config USB_DWC2_PERIPHERAL > + bool "Gadget only mode" > + depends on USB_GADGET=y || USB_GADGET=USB_DWC2 > + help > + The Designware USB2.0 high-speed gadget controller > + integrated into many SoCs. Select this option if you want the > + driver to operate in Peripheral-only mode. This option requires > + USB_GADGET=y. > + > +config USB_DWC2_DUAL_ROLE > + bool "Dual Role mode" > + depends on (USB=y || USB=USB_DWC2) && (USB_GADGET=y || USB_GADGET=USB_DWC2) > + help > + Select this option if you want the driver to work in a dual-role > + mode. In this mode both host and gadget features are enabled, and > + the role will be determined by the cable that gets plugged-in. This > + option requires USB_GADGET=y. > +endchoice (I wonder how the dependencies of these three config entries interact with the three defaults of this choice. Since we're dealing with three options here this requires a piece of paper, a pencil, and clear mind to figure out. Maybe I'll try that in a few days...) > config USB_DWC2_PLATFORM > bool "DWC2 Platform" > - depends on USB_DWC2_HOST > default USB_DWC2_HOST > - help > - The Designware USB2.0 platform interface module for > - controllers directly connected to the CPU. This is only > - used for host mode. > + default y You now have to default lines. Which one wins? > + help > + The Designware USB2.0 platform interface module for > + controllers directly connected to the CPU. > > config USB_DWC2_PCI > bool "DWC2 PCI" > @@ -44,15 +66,6 @@ config USB_DWC2_PCI > The Designware USB2.0 PCI interface module for controllers > connected to a PCI bus. This is only used for host mode. > > -comment "Gadget mode requires USB Gadget support to be enabled" > - > -config USB_DWC2_PERIPHERAL > - tristate "Gadget only mode" > - depends on USB_GADGET > - help > - The Designware USB2.0 high-speed gadget controller > - integrated into many SoCs. > - > config USB_DWC2_DEBUG > bool "Enable Debugging Messages" > help > diff --git a/drivers/usb/dwc2/Makefile b/drivers/usb/dwc2/Makefile > index b73d2a5..2175d93 100644 Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists