usb: gadget: dwc2_udc_otg: implement pullup()
PATCH 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.
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]/
--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/usb/gadget/dwc2_udc_otg.c +16 -0
@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp; + + is_on = !!is_on; + uTemp =readl (®->dctl); +if (is_on) + uTemp = uTemp & ~SOFT_DISCONNECT ; +else + uTemp |=SOFT_DISCONNECT ; +writel (uTemp, ®->dctl); + +return 0 ; +} +#if !CONFIG_IS_ENABLED (DM_USB_GADGET )/* Register entry point for the peripheral controller driver.
@@ -805,6 +820,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,
---
base-commit: 7b84c973b96775576dcff228d865e8570be26c82
change-id: 20230110-dwc2-pullup-5b0f5a073d6b
Best regards,
Signature · 1 line
Mattijs Korpershoek <[email protected]>
Hi,
Quoted 33 lines · Mattijs Korpershoek
Pullup is used by the usb framework in order to do software-controlled
usb_gadget_connect()andusb_gadget_disconnect().Implement
pullup()for dwc2 using theSOFT_DISCONNECTbit in the dctl register.This is especially useful when a gadget disconnection is initiated but no
board_usb_cleanup()is called.Signed-off-by Mattijs Korpershoek <[email protected]>---
On some boards using the dwc2 controller, like the Khadas VIM3L, wheneverusb_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 callsusb_gadget_disconnect().[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/usb/gadget/dwc2_udc_otg.c +0
-0
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 241
Quoted 6 lines
drivers/usb/gadget/dwc2_udc_otg.c +3
-0@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp;
Just some minor points about style...
I think the u32 type should be used for 32-bit registers instead. More explicit and no room for accidentally choosing the wrong size.
Also, U-Boot and Linux don't use hungarian notation for variable names, just call it tmp or even better dctl to be explicit.
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 243
Quoted 2 lines
drivers/usb/gadget/dwc2_udc_otg.c +2
-0+ + is_on = !!is_on;
This is superfluous, the if condition works either way.
Quoted 26 lines
drivers/usb/gadget/dwc2_udc_otg.c +11
-1+ uTemp =readl (®->dctl); +if (is_on) + uTemp = uTemp & ~SOFT_DISCONNECT ; +else + uTemp |=SOFT_DISCONNECT ; +writel (uTemp, ®->dctl); + +return 0 ; +} +#if !CONFIG_IS_ENABLED (DM_USB_GADGET )/* Register entry point for the peripheral controller driver. @@ -805,6 +820,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, ---base-commit:
7b84c973b96775576dcff228d865e8570be26c82
change-id: 20230110-dwc2-pullup-5b0f5a073d6b
Quoted 1 line
Best regards,
Regards,
Harald
Quoted 48 lines · Harald Seiler
Hi,
Quoted 33 lines · Mattijs Korpershoek
Pullup is used by the usb framework in order to do software-controlled
usb_gadget_connect()andusb_gadget_disconnect().Implement
pullup()for dwc2 using theSOFT_DISCONNECTbit in the dctl register.This is especially useful when a gadget disconnection is initiated but no
board_usb_cleanup()is called.Signed-off-by Mattijs Korpershoek <[email protected]>---
On some boards using the dwc2 controller, like the Khadas VIM3L, wheneverusb_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 callsusb_gadget_disconnect().[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/usb/gadget/dwc2_udc_otg.c +0
-0drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 241
Quoted 6 lines
drivers/usb/gadget/dwc2_udc_otg.c +3
-0@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp;Just some minor points about style...
I think the
u32type should be used for 32-bit registers instead. More explicit and no room for accidentally choosing the wrong size.
Quoted 7 lines
Also, U-Boot and Linux don't use hungarian notation for variable names, just call it
tmpor even betterdctlto be explicit.drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 243
Quoted 2 lines
drivers/usb/gadget/dwc2_udc_otg.c +2
-0+ + is_on = !!is_on;This is superfluous, the if condition works either way.
clrsetbits_le32() would turn the above into a oneliner.
Hi Harald,
Thank you for your review.
Quoted 45 lines · Harald Seiler
Hi,
Quoted 33 lines · Mattijs Korpershoek
Pullup is used by the usb framework in order to do software-controlled
usb_gadget_connect()andusb_gadget_disconnect().Implement
pullup()for dwc2 using theSOFT_DISCONNECTbit in the dctl register.This is especially useful when a gadget disconnection is initiated but no
board_usb_cleanup()is called.Signed-off-by Mattijs Korpershoek <[email protected]>---
On some boards using the dwc2 controller, like the Khadas VIM3L, wheneverusb_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 callsusb_gadget_disconnect().[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/usb/gadget/dwc2_udc_otg.c +0
-0drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 241
Quoted 6 lines
drivers/usb/gadget/dwc2_udc_otg.c +3
-0@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp;Just some minor points about style...
Quoted 5 lines
I think the
u32type should be used for 32-bit registers instead. More explicit and no room for accidentally choosing the wrong size.Also, U-Boot and Linux don't use hungarian notation for variable names, just call it
tmpor even betterdctlto be explicit.
I agree with this. I actually picked up some of the code from reconfig_usbd() where hungarian nototation is used. That's also where the unsigned int comes from.
Sorry I did not convert it to some more Linux/U-Boot oriented style before submitting.
Quoted 5 lines
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 243
Quoted 3 lines
drivers/usb/gadget/dwc2_udc_otg.c +2
-0+ + is_on = !!is_on;This is superfluous, the if condition works either way.
Ack.
The maintainer (Marek) already picked this up in his usb tree:
https://lore.kernel.org/all/[email protected]/
Should I send a clean-up/follow-up patch for this?
Quoted 32 lines
Quoted 27 lines
drivers/usb/gadget/dwc2_udc_otg.c +11
-1+ uTemp =readl (®->dctl); +if (is_on) + uTemp = uTemp & ~SOFT_DISCONNECT ; +else + uTemp |=SOFT_DISCONNECT ; +writel (uTemp, ®->dctl); + +return 0 ; +} +#if !CONFIG_IS_ENABLED (DM_USB_GADGET )/* Register entry point for the peripheral controller driver. @@ -805,6 +820,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, ---base-commit:
7b84c973b96775576dcff228d865e8570be26c82
change-id: 20230110-dwc2-pullup-5b0f5a073d6bQuoted 1 line
Best regards,
Regards,
Harald
Quoted 70 lines · Mattijs Korpershoek
Hi Harald,
Thank you for your review.
Quoted 45 lines · Harald Seiler
Hi,
Quoted 33 lines · Mattijs Korpershoek
Pullup is used by the usb framework in order to do software-controlled
usb_gadget_connect()andusb_gadget_disconnect().Implement
pullup()for dwc2 using theSOFT_DISCONNECTbit in the dctl register.This is especially useful when a gadget disconnection is initiated but no
board_usb_cleanup()is called.Signed-off-by Mattijs Korpershoek <[email protected]>---
On some boards using the dwc2 controller, like the Khadas VIM3L, wheneverusb_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 callsusb_gadget_disconnect().[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/usb/gadget/dwc2_udc_otg.c +0
-0drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 241
Quoted 6 lines
drivers/usb/gadget/dwc2_udc_otg.c +3
-0@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp;Just some minor points about style...
Quoted 5 lines
I think the
u32type should be used for 32-bit registers instead. More explicit and no room for accidentally choosing the wrong size.Also, U-Boot and Linux don't use hungarian notation for variable names, just call it
tmpor even betterdctlto be explicit.I agree with this. I actually picked up some of the code from
reconfig_usbd()where hungarian nototation is used. That's also where the unsigned int comes from.Sorry I did not convert it to some more Linux/U-Boot oriented style before submitting.
Quoted 5 lines
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 243
Quoted 3 lines
drivers/usb/gadget/dwc2_udc_otg.c +2
-0+ + is_on = !!is_on;This is superfluous, the if condition works either way.
Quoted 6 lines
Ack.
The maintainer (Marek) already picked this up in his usb tree:
https://lore.kernel.org/all/[email protected]/Should I send a clean-up/follow-up patch for this?
The maintainer already dropped it and waits for V2 :)
Quoted 71 lines · Marek Vasut
Quoted 70 lines · Mattijs Korpershoek
Hi Harald,
Thank you for your review.
Quoted 45 lines · Harald Seiler
Hi,
Quoted 33 lines · Mattijs Korpershoek
Pullup is used by the usb framework in order to do software-controlled
usb_gadget_connect()andusb_gadget_disconnect().Implement
pullup()for dwc2 using theSOFT_DISCONNECTbit in the dctl register.This is especially useful when a gadget disconnection is initiated but no
board_usb_cleanup()is called.Signed-off-by Mattijs Korpershoek <[email protected]>---
On some boards using the dwc2 controller, like the Khadas VIM3L, wheneverusb_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 callsusb_gadget_disconnect().[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/--- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)drivers/usb/gadget/dwc2_udc_otg.c +0
-0drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 241
Quoted 6 lines
drivers/usb/gadget/dwc2_udc_otg.c +3
-0@@ -236,6 +236,21 @@ static int udc_enable(struct dwc2_udc *dev)return 0 ; } +static int dwc2_gadget_pullup (struct usb_gadget *g,int is_on) +{ +unsigned int uTemp;Just some minor points about style...
Quoted 5 lines
I think the
u32type should be used for 32-bit registers instead. More explicit and no room for accidentally choosing the wrong size.Also, U-Boot and Linux don't use hungarian notation for variable names, just call it
tmpor even betterdctlto be explicit.I agree with this. I actually picked up some of the code from
reconfig_usbd()where hungarian nototation is used. That's also where the unsigned int comes from.Sorry I did not convert it to some more Linux/U-Boot oriented style before submitting.
Quoted 5 lines
drivers/usb/gadget/dwc2_udc_otg.c static int udc_enable(struct dwc2_udc *dev) · line 243
Quoted 3 lines
drivers/usb/gadget/dwc2_udc_otg.c +2
-0+ + is_on = !!is_on;This is superfluous, the if condition works either way.
Quoted 8 lines
Quoted 6 lines
Ack.
The maintainer (Marek) already picked this up in his usb tree:
https://lore.kernel.org/all/[email protected]/Should I send a clean-up/follow-up patch for this?
The maintainer already dropped it and waits for V2 :)
Thank you, will send a V2 shortly.