usb: gadget: dwc2_udc_otg: implement pullup()
PATCH v2 1/1 usb: gadget: dwc2_udc_otg: implement pullup()
Pullup is used by the usb framework in order to do software-controlled usb_gadget_connect() and usb_gadget_disconnect().
Implement pullup() for dwc2 using the SOFT_DISCONNECT bit in the dctl register:
* when pullup is on, clear SOFT_DISCONNECT
* when pullup is of, set SOFT_DISCONNECT
This is especially useful when a gadget disconnection is initiated but no board_usb_cleanup() is called.
---
On some boards using the dwc2 controller, like the Khadas VIM3L, whenever usb_gadget_release() is called, the D+ and D- lines are in an unknown state.
Because of that, the host can't detect usb disconnection.
It was attempted to be be fixed with [1] but ended up doing the gadget disconnection too early, creating issues on NXP-based boards which use uuu [2].
By implementing pullup() in the controller driver, we ensure that the disconnection will only be done when the framework calls usb_gadget_disconnect().
[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
---
Changes in v2:
- Simplified code to fix hungarian notation, appropriate type (u32) for register (Harald)
- Use clrsetbits_le32() for register write (Marek)
- Link to v1: https://lore.kernel.org/r/[email protected]
--- drivers/usb/gadget/dwc2_udc_otg.c | 9 +++++++++ drivers/usb/gadget/dwc2_udc_otg_regs.h | 1 + 2 files changed, 10 insertions(+)
drivers/usb/gadget/dwc2_udc_otg.c +9 -0
@@ -236,6 +236,14 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +clrsetbits_le32 (®->dctl,SOFT_DISCONNECT , + (!is_on) <<SOFT_DISCONNECT_BIT ); + +return 0 ; +} +#if !CONFIG_IS_ENABLED (DM_USB_GADGET )/* Register entry point for the peripheral controller driver.
@@ -805,6 +813,7 @@ static void dwc2_fifo_flush(struct usb_ep *_ep) }static const struct usb_gadget_ops dwc2_udc_ops = { + .pullup = dwc2_gadget_pullup,/* current versions must always be self-powered */ #if CONFIG_IS_ENABLED(DM_USB_GADGET) .udc_start = dwc2_gadget_start,
drivers/usb/gadget/dwc2_udc_otg_regs.h +1 -0
@@ -170,6 +170,7 @@ struct dwc2_usbotg_reg {/* DWC2_UDC_OTG_DCTL device control register */ #define NORMAL_OPERATION (0x1<<0)#define SOFT_DISCONNECT (0x1<<1) +#define SOFT_DISCONNECT_BIT (1)/* DWC2_UDC_OTG_DAINT device all endpoint interrupt register */ #define DAINT_OUT_BIT (16)
---
base-commit: 81996adedf42e89de97c2ed5dcde62be4bb4e4e0
change-id: 20230110-dwc2-pullup-5b0f5a073d6b
Best regards,
Signature · 1 line
Mattijs Korpershoek <[email protected]>
On 1/10/23 17:29, Mattijs Korpershoek wrote:
[...]
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 242
Quoted 12 lines
drivers/usb/gadget/dwc2_udc_otg.c +4
-0@@ -236,6 +236,14 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +clrsetbits_le32 (®->dctl,SOFT_DISCONNECT , + (!is_on) <<SOFT_DISCONNECT_BIT );
Use
is_on ? 0 : SOFT_DISCONNECT
and you get rid of SOFT_DISCONNECT_BIT macro and the extra parenthesis around (!is_on) which are not needed.
Quoted 19 lines · Marek Vasut
On 1/10/23 17:29, Mattijs Korpershoek wrote:
[...]
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 242
Quoted 12 lines
drivers/usb/gadget/dwc2_udc_otg.c +4
-0@@ -236,6 +236,14 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +clrsetbits_le32 (®->dctl,SOFT_DISCONNECT , + (!is_on) <<SOFT_DISCONNECT_BIT );Use
Quoted 4 lines
is_on? 0 :SOFT_DISCONNECTand you get rid of
SOFT_DISCONNECT_BITmacro and the extra parenthesis around (!is_on) which are not needed.
Will do. thank you for your patience and your good advice !