| Message ID | 20190218112310.17860-8-chenyu56@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add support for usb on Hikey960 | expand |
Hi, On 18/02/2019 11:23, Yu Chen wrote: [...] > @@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc) > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); > } > > + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); > + dwc3_role_switch.set = dwc3_usb_role_switch_set; > + dwc3_role_switch.get = dwc3_usb_role_switch_get; > + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); Building arm64 defconfig gives me this: drivers/usb/dwc3/drd.o: In function `dwc3_drd_exit': /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604: undefined reference to `usb_role_switch_unregister' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604:(.text+0x814): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_unregister' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604: undefined reference to `usb_role_switch_unregister' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604:(.text+0x844): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_unregister' drivers/usb/dwc3/drd.o: In function `dwc3_drd_init': /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562: undefined reference to `usb_role_switch_register' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562:(.text+0xa20): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_register' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562: undefined reference to `usb_role_switch_register' /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562:(.text+0xb4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_register' Makefile:1024: recipe for target 'vmlinux' failed make: *** [vmlinux] Error 1 This has CONFIG_USB_ROLE_SWITCH=m, setting it as a built-in makes the thing linkable. I suppose that's because defconfig gives us CONFIG_USB_DWC3_DUAL_ROLE=y but then that should probably force a CONFIG_USB_ROLE_SWITCH=y. My immediate reaction to this would be to add: --- diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig index 2b1494460d0c..661b1d2efc8b 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -44,6 +44,7 @@ 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 (EXTCON=y || EXTCON=USB_DWC3) + select USB_ROLE_SWITCH help This is the default mode of working of DWC3 controller where both host and gadget features are enabled. --- Not sure how acceptable that is though. > + if (ret) { > + dwc3_drd_exit(dwc); > + return PTR_ERR(dwc->role_sw); > + } > + > return 0; > } > > @@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc) > > if (!dwc->edev) > free_irq(dwc->otg_irq, dwc); > + > + usb_role_switch_unregister(dwc->role_sw); > } >
Hi, On 2019/2/19 1:30, Valentin Schneider wrote: > Hi, > > On 18/02/2019 11:23, Yu Chen wrote: > [...] >> @@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc) >> dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); >> } >> >> + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); >> + dwc3_role_switch.set = dwc3_usb_role_switch_set; >> + dwc3_role_switch.get = dwc3_usb_role_switch_get; >> + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); > > Building arm64 defconfig gives me this: > > drivers/usb/dwc3/drd.o: In function `dwc3_drd_exit': > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604: undefined reference to `usb_role_switch_unregister' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604:(.text+0x814): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_unregister' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604: undefined reference to `usb_role_switch_unregister' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:604:(.text+0x844): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_unregister' > drivers/usb/dwc3/drd.o: In function `dwc3_drd_init': > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562: undefined reference to `usb_role_switch_register' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562:(.text+0xa20): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_register' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562: undefined reference to `usb_role_switch_register' > /home/valsch01/Work/kernel/drivers/usb/dwc3/drd.c:562:(.text+0xb4c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `usb_role_switch_register' > Makefile:1024: recipe for target 'vmlinux' failed > make: *** [vmlinux] Error 1 > > This has CONFIG_USB_ROLE_SWITCH=m, setting it as a built-in makes the thing > linkable. > > I suppose that's because defconfig gives us > > CONFIG_USB_DWC3_DUAL_ROLE=y > > but then that should probably force a CONFIG_USB_ROLE_SWITCH=y. My > immediate reaction to this would be to add: > > --- > diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig > index 2b1494460d0c..661b1d2efc8b 100644 > --- a/drivers/usb/dwc3/Kconfig > +++ b/drivers/usb/dwc3/Kconfig > @@ -44,6 +44,7 @@ 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 (EXTCON=y || EXTCON=USB_DWC3) > + select USB_ROLE_SWITCH > help > This is the default mode of working of DWC3 controller where > both host and gadget features are enabled. > --- > > Not sure how acceptable that is though. > Thanks for your notice! I will add this in next version. > >> + if (ret) { >> + dwc3_drd_exit(dwc); >> + return PTR_ERR(dwc->role_sw); >> + } >> + >> return 0; >> } >> >> @@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc) >> >> if (!dwc->edev) >> free_irq(dwc->otg_irq, dwc); >> + >> + usb_role_switch_unregister(dwc->role_sw); >> } >> > > . > Thanks Yu Chen
Hi Yu Chen <chenyu56@huawei.com> 于2019年2月18日周一 下午7:34写道： > > The Type-C drivers use USB role switch API to inform the > system about the negotiated data role, so registering a role > switch in the DRD code in order to support platforms with > USB Type-C connectors. > > Cc: John Stultz <john.stultz@linaro.org> > Cc: Felipe Balbi <balbi@kernel.org> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Signed-off-by: Yu Chen <chenyu56@huawei.com> > --- > v2: > * Assign fwnode in dwc3_role_switch. > --- > --- > drivers/usb/dwc3/core.h | 2 ++ > drivers/usb/dwc3/drd.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+) > > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index 402b3c29eb26..7385544b9936 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -25,6 +25,7 @@ > #include <linux/usb/ch9.h> > #include <linux/usb/gadget.h> > #include <linux/usb/otg.h> > +#include <linux/usb/role.h> > #include <linux/ulpi/interface.h> > > #include <linux/phy/phy.h> > @@ -1083,6 +1084,7 @@ struct dwc3 { > struct extcon_dev *edev; > struct notifier_block edev_nb; > enum usb_phy_interface hsphy_mode; > + struct usb_role_switch *role_sw; > > u32 fladj; > u32 irq_gadget; > diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c > index 869725d15c74..cf977bb0d62e 100644 > --- a/drivers/usb/dwc3/drd.c > +++ b/drivers/usb/dwc3/drd.c > @@ -474,8 +474,42 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) > return edev; > } > > +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) > +{ > + u32 mode; > + > + switch (role) { > + case USB_ROLE_HOST: > + mode = DWC3_GCTL_PRTCAP_HOST; > + break; > + case USB_ROLE_DEVICE: > + mode = DWC3_GCTL_PRTCAP_DEVICE; > + break; > + default: > + mode = DWC3_GCTL_PRTCAP_HOST; I'd propose let dwc3 stay at device mode at default case. > + break; > + }; > + > + dwc3_set_mode(dev_get_drvdata(dev), mode); > + return 0; > +} > + > +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) > +{ > + struct dwc3 *dwc = dev_get_drvdata(dev); > + unsigned long flags; > + enum usb_role role; > + > + spin_lock_irqsave(&dwc->lock, flags); > + role = dwc->current_otg_role; > + spin_unlock_irqrestore(&dwc->lock, flags); > + > + return role; > +} > + > int dwc3_drd_init(struct dwc3 *dwc) > { > + struct usb_role_switch_desc dwc3_role_switch = {0}; > int ret, irq; > > dwc->edev = dwc3_get_extcon(dwc); > @@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc) > dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); > } > > + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); > + dwc3_role_switch.set = dwc3_usb_role_switch_set; > + dwc3_role_switch.get = dwc3_usb_role_switch_get; > + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); > + if (ret) { > + dwc3_drd_exit(dwc); > + return PTR_ERR(dwc->role_sw); > + } > + My understanding is, if you use usb role switch, you don't need either edev or OTG block event, so this should be like: if (device_property_read_bool(dwc->dev, "usb-role-switch")) { usb role switch register; } else if (edev) { ... } else { ... } Jun > return 0; > } > > @@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc) > > if (!dwc->edev) > free_irq(dwc->otg_irq, dwc); > + > + usb_role_switch_unregister(dwc->role_sw); > } > -- > 2.15.0-rc2 >
Hi, On 2019/2/19 10:57, Jun Li wrote: >> >> +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) >> +{ >> + u32 mode; >> + >> + switch (role) { >> + case USB_ROLE_HOST: >> + mode = DWC3_GCTL_PRTCAP_HOST; >> + break; >> + case USB_ROLE_DEVICE: >> + mode = DWC3_GCTL_PRTCAP_DEVICE; >> + break; >> + default: >> + mode = DWC3_GCTL_PRTCAP_HOST; > > I'd propose let dwc3 stay at device mode at default case. > Setting mode to DWC3_GCTL_PRTCAP_HOST at default case due to the requirement of Hikey960 board. When there is no cable connected to type-C port, dwc3 should be set to HOST mode and the hub on the Hikey960 will be power on. Here is the details of the Hikey960: https://www.96boards.org/documentation/consumer/hikey/hikey960/hardware-docs/hardware-user-manual.md.html But I will check the code to see if it is possible to make dwc3 set to device mode at default case. >> + break; >> + }; >> + >> + dwc3_set_mode(dev_get_drvdata(dev), mode); >> + return 0; >> +} >> + >> +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) >> +{ >> + struct dwc3 *dwc = dev_get_drvdata(dev); >> + unsigned long flags; >> + enum usb_role role; >> + >> + spin_lock_irqsave(&dwc->lock, flags); >> + role = dwc->current_otg_role; >> + spin_unlock_irqrestore(&dwc->lock, flags); >> + >> + return role; >> +} >> + >> int dwc3_drd_init(struct dwc3 *dwc) >> { >> + struct usb_role_switch_desc dwc3_role_switch = {0}; >> int ret, irq; >> >> dwc->edev = dwc3_get_extcon(dwc); >> @@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc) >> dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); >> } >> >> + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); >> + dwc3_role_switch.set = dwc3_usb_role_switch_set; >> + dwc3_role_switch.get = dwc3_usb_role_switch_get; >> + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); >> + if (ret) { >> + dwc3_drd_exit(dwc); >> + return PTR_ERR(dwc->role_sw); >> + } >> + > > My understanding is, if you use usb role switch, you don't need either edev or > OTG block event, so this should be like: > > if (device_property_read_bool(dwc->dev, "usb-role-switch")) { > usb role switch register; > } else if (edev) { > ... > } else { > ... > } Yes. Thanks! > > Jun >> return 0; >> } >> >> @@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc) >> >> if (!dwc->edev) >> free_irq(dwc->otg_irq, dwc); >> + >> + usb_role_switch_unregister(dwc->role_sw); >> } >> -- >> 2.15.0-rc2 >> > > . > Thanks Yu Chen
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 402b3c29eb26..7385544b9936 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -25,6 +25,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/otg.h> +#include <linux/usb/role.h> #include <linux/ulpi/interface.h> #include <linux/phy/phy.h> @@ -1083,6 +1084,7 @@ struct dwc3 { struct extcon_dev *edev; struct notifier_block edev_nb; enum usb_phy_interface hsphy_mode; + struct usb_role_switch *role_sw; u32 fladj; u32 irq_gadget; diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c index 869725d15c74..cf977bb0d62e 100644 --- a/drivers/usb/dwc3/drd.c +++ b/drivers/usb/dwc3/drd.c @@ -474,8 +474,42 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc) return edev; } +static int dwc3_usb_role_switch_set(struct device *dev, enum usb_role role) +{ + u32 mode; + + switch (role) { + case USB_ROLE_HOST: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + case USB_ROLE_DEVICE: + mode = DWC3_GCTL_PRTCAP_DEVICE; + break; + default: + mode = DWC3_GCTL_PRTCAP_HOST; + break; + }; + + dwc3_set_mode(dev_get_drvdata(dev), mode); + return 0; +} + +static enum usb_role dwc3_usb_role_switch_get(struct device *dev) +{ + struct dwc3 *dwc = dev_get_drvdata(dev); + unsigned long flags; + enum usb_role role; + + spin_lock_irqsave(&dwc->lock, flags); + role = dwc->current_otg_role; + spin_unlock_irqrestore(&dwc->lock, flags); + + return role; +} + int dwc3_drd_init(struct dwc3 *dwc) { + struct usb_role_switch_desc dwc3_role_switch = {0}; int ret, irq; dwc->edev = dwc3_get_extcon(dwc); @@ -522,6 +556,15 @@ int dwc3_drd_init(struct dwc3 *dwc) dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG); } + dwc3_role_switch.fwnode = dev_fwnode(dwc->dev); + dwc3_role_switch.set = dwc3_usb_role_switch_set; + dwc3_role_switch.get = dwc3_usb_role_switch_get; + dwc->role_sw = usb_role_switch_register(dwc->dev, &dwc3_role_switch); + if (ret) { + dwc3_drd_exit(dwc); + return PTR_ERR(dwc->role_sw); + } + return 0; } @@ -557,4 +600,6 @@ void dwc3_drd_exit(struct dwc3 *dwc) if (!dwc->edev) free_irq(dwc->otg_irq, dwc); + + usb_role_switch_unregister(dwc->role_sw); }
The Type-C drivers use USB role switch API to inform the system about the negotiated data role, so registering a role switch in the DRD code in order to support platforms with USB Type-C connectors. Cc: John Stultz <john.stultz@linaro.org> Cc: Felipe Balbi <balbi@kernel.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Suggested-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Signed-off-by: Yu Chen <chenyu56@huawei.com> --- v2: * Assign fwnode in dwc3_role_switch. --- --- drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/drd.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)