usb: dwc2: add "u-boot,force-vbus-detection" for stm32
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
---
drivers/usb/gadget/dwc2_udc_otg.c | 59 +++++++++++++++++--------- drivers/usb/gadget/dwc2_udc_otg_regs.h | 2 + include/usb/dwc2_udc.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-)
drivers/usb/gadget/dwc2_udc_otg.c +38 -21
@@ -1014,6 +1014,9 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) platdata->force_b_session_valid =dev_read_bool (dev,"u-boot,force-b-session-valid" ); + platdata->force_vbus_detection = +dev_read_bool (dev,"u-boot,force-vbus-detection" ); +/* force platdata according compatible */ drvdata =dev_get_driver_data (dev);if (drvdata) {
@@ -1106,31 +1109,45 @@ static int dwc2_udc_otg_probe(struct udevice *dev)if (ret)return ret; -if (CONFIG_IS_ENABLED (DM_REGULATOR ) && - platdata->activate_stm_id_vb_detection && - !platdata->force_b_session_valid) { - ret =device_get_supply_regulator (dev,"usb33d-supply" , - &priv->usb33d_supply); -if (ret) { -dev_err (dev,"can't get voltage level detector supply\n" ); -return ret; +if (platdata->activate_stm_id_vb_detection) { +if (CONFIG_IS_ENABLED (DM_REGULATOR ) && + (!platdata->force_b_session_valid || + platdata->force_vbus_detection)) { + ret =device_get_supply_regulator (dev,"usb33d-supply" , + &priv->usb33d_supply); +if (ret) { +dev_err (dev,"can't get voltage level detector supply\n" ); +return ret; + } + ret =regulator_set_enable (priv->usb33d_supply, true); +if (ret) { +dev_err (dev,"can't enable voltage level detector supply\n" ); +return ret; + } } - ret =regulator_set_enable (priv->usb33d_supply, true); -if (ret) { -dev_err (dev,"can't enable voltage level detector supply\n" ); -return ret; + +if (platdata->force_b_session_valid && + !platdata->force_vbus_detection) { +/* Override VBUS detection: enable then value*/ +setbits_le32 (&usbotg_reg->gotgctl,VB_VALOEN ); +setbits_le32 (&usbotg_reg->gotgctl,VB_VALOVAL ); + }else { +/* Enable VBUS sensing */ +setbits_le32 (&usbotg_reg->ggpio, +GGPIO_STM32_OTG_GCCFG_VBDEN ); + } +if (platdata->force_b_session_valid) { +/* Override B session bits: enable then value */ +setbits_le32 (&usbotg_reg->gotgctl,A_VALOEN |B_VALOEN ); +setbits_le32 (&usbotg_reg->gotgctl, +A_VALOVAL |B_VALOVAL ); + }else { +/* Enable ID detection */ +setbits_le32 (&usbotg_reg->ggpio, +GGPIO_STM32_OTG_GCCFG_IDEN ); } -/* Enable vbus sensing */ -setbits_le32 (&usbotg_reg->ggpio, -GGPIO_STM32_OTG_GCCFG_VBDEN | -GGPIO_STM32_OTG_GCCFG_IDEN ); } -if (platdata->force_b_session_valid) -/* Override B session bits : value and enable */ -setbits_le32 (&usbotg_reg->gotgctl, -A_VALOEN |A_VALOVAL |B_VALOEN |B_VALOVAL ); - ret =dwc2_udc_probe (platdata);if (ret)return ret;
drivers/usb/gadget/dwc2_udc_otg_regs.h +2 -0
@@ -94,6 +94,8 @@ struct dwc2_usbotg_reg {#define B_VALOEN BIT(6)#define A_VALOVAL BIT(5)#define A_VALOEN BIT(4) +#define VB_VALOVAL BIT(3) +#define VB_VALOEN BIT(2)/* DWC2_UDC_OTG_GOTINT */ #define GOTGINT_SES_END_DET (1<<2)
include/usb/dwc2_udc.h +1 -0
@@ -28,6 +28,7 @@ struct dwc2_plat_otg_data {unsigned int tx_fifo_sz_array[DWC2_MAX_HW_ENDPOINTS ];unsigned char tx_fifo_sz_nb;bool force_b_session_valid; +bool force_vbus_detection;bool activate_stm_id_vb_detection; };
Signature · 1 line
2.17.1
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
Quoted 6 lines · Patrick Delaunay
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
btw can you do something about that huge change in indent ? Is it necessary ?
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
Hi Marek,
Quoted 4 lines
From: Marek Vasut <[email protected]>
Sent: jeudi 15 octobre 2020 15:08On 10/15/20 2:49 PM, Patrick Delaunay wrote:
Quoted 8 lines
Quoted 6 lines
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
It is managed by Linux DWC2 driver: it is a real OTG driver, with dual mode support and by usb framework
Throught the properties
&usbotg_hs {
usb-role-switch;
};a glue treat the session and the sensing management see linux/drivers/usb/dwc2/drd.c in linux-next
PS: activate_stm_id_vb_detection is also used in driver = hsotg->params.
As ID pin / vbus is completly managed by the USB TYPE driver C (STUSB1600 for STMicroelectronics board) and DWC2 driver with dual role stack (host/gadget).
I don't found a better solution than device tree property for this task in U-Boot as DWC2 driver don't support dual role and U-Boot don't have framework for USB type C controller.
Quoted 2 lines
btw can you do something about that huge change in indent ? Is it necessary ?
I move all this code under activate_stm_id_vb_detection (linked to compatible "st,stm32mp1-hsotg") to avoid impact on other platform as this "sensing" properties are only support for STM32MP15X (it is linked to USB block detection integrated in SOC)
And after I need to check the
1/ The usb33d-supply is required of vbus or IDPIN sensing 2/ manage Vbus sensing or override (according dt) 3/ manage IDPIN or override (according dt)
I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation issue for other platform.
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update as it is required.
So yes I think it is needed but I can split the patch to simplify the review.
Patrick
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
On 10/15/20 6:52 PM, Patrick DELAUNAY wrote:
Hi,
[...]
Quoted 42 lines
Quoted 9 lines · Patrick Delaunay
Quoted 6 lines
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
It is managed by Linux DWC2 driver: it is a real OTG driver, with dual mode support and by usb framework
Throught the properties
&usbotg_hs { usb-role-switch; };a glue treat the session and the sensing management see
linux/drivers/usb/dwc2/drd.cin linux-nextPS:
activate_stm_id_vb_detectionis also used in driver =hsotg->params.As ID pin / vbus is completly managed by the USB TYPE driver C (STUSB1600 for STMicroelectronics board) and DWC2 driver with dual role stack (host/gadget).
I don't found a better solution than device tree property for this task in U-Boot as DWC2 driver don't support dual role and U-Boot don't have framework for USB type C controller.
Quoted 2 lines
btw can you do something about that huge change in indent ? Is it necessary ?
I move all this code under
activate_stm_id_vb_detection(linked to compatible "st,stm32mp1-hsotg") to avoid impact on other platform as this "sensing" properties are only support for STM32MP15X (it is linked to USB block detection integrated in SOC)And after I need to check the
1/ The usb33d-supply is required of vbus or IDPIN sensing 2/ manage Vbus sensing or override (according dt) 3/ manage IDPIN or override (according dt)
Quoted 6 lines
I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation issue for other platform.
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update as it is required.
So yes I think it is needed but I can split the patch to simplify the review.
I presume you don't feel like implementing proper OTG support, right ?
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
Hi Marek,
Quoted 55 lines
From: Marek Vasut <[email protected]>
Sent: jeudi 15 octobre 2020 19:39On 10/15/20 6:52 PM, Patrick DELAUNAY wrote:
Hi,
[...]
Quoted 21 lines
Quoted 9 lines · Patrick Delaunay
Quoted 6 lines
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
It is managed by Linux DWC2 driver: it is a real OTG driver, with dual mode support and by usb framework
Throught the properties
&usbotg_hs { usb-role-switch; };a glue treat the session and the sensing management see
linux/drivers/usb/dwc2/drd.cin linux-nextQuoted 8 lines
PS:
activate_stm_id_vb_detectionis also used in driver =hsotg->params.As ID pin / vbus is completly managed by the USB TYPE driver C (STUSB1600 for STMicroelectronics board) and DWC2 driver with dual role stack (host/gadget).
I don't found a better solution than device tree property for this task in U-Boot as DWC2 driver don't support dual role and U-Boot don't have
framework for USB type C controller.
Quoted 9 lines
Quoted 3 lines
btw can you do something about that huge change in indent ? Is it necessary ?
I move all this code under
activate_stm_id_vb_detection(linked to compatible "st,stm32mp1-hsotg") to avoid impact on other platform as this "sensing" properties are only support for STM32MP15X (it is linked to USB block detection integrated in SOC)Quoted 7 lines
And after I need to check the
1/ The usb33d-supply is required of vbus or IDPIN sensing 2/ manage Vbus sensing or override (according dt) 3/ manage IDPIN or override (according dt)I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation
Quoted 8 lines
issue for other platform.
Quoted 2 lines
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update
as it is required.
Quoted 2 lines
So yes I think it is needed but I can split the patch to simplify the review.
I presume you don't feel like implementing proper OTG support, right ?
Yes, I am afraid of this task.
Patrick
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
Quoted 1 line · Patrick DELAUNAY
Hi Marek,
Hi,
[...]
Quoted 48 lines
Quoted 48 lines
Quoted 21 lines
Quoted 9 lines · Patrick Delaunay
Quoted 6 lines
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
It is managed by Linux DWC2 driver: it is a real OTG driver, with dual mode support and by usb framework
Throught the properties
&usbotg_hs { usb-role-switch; };a glue treat the session and the sensing management see
linux/drivers/usb/dwc2/drd.cin linux-nextQuoted 8 lines
PS:
activate_stm_id_vb_detectionis also used in driver =hsotg->params.As ID pin / vbus is completly managed by the USB TYPE driver C (STUSB1600 for STMicroelectronics board) and DWC2 driver with dual role stack (host/gadget).
I don't found a better solution than device tree property for this task in U-Boot as DWC2 driver don't support dual role and U-Boot don't have
framework for USB type C controller.
Quoted 9 lines
Quoted 3 lines
btw can you do something about that huge change in indent ? Is it necessary ?
I move all this code under
activate_stm_id_vb_detection(linked to compatible "st,stm32mp1-hsotg") to avoid impact on other platform as this "sensing" properties are only support for STM32MP15X (it is linked to USB block detection integrated in SOC)Quoted 7 lines
And after I need to check the
1/ The usb33d-supply is required of vbus or IDPIN sensing 2/ manage Vbus sensing or override (according dt) 3/ manage IDPIN or override (according dt)I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation
issue for other platform.
Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update
as it is required.
Quoted 2 lines
So yes I think it is needed but I can split the patch to simplify the review.
I presume you don't feel like implementing proper OTG support, right ?
Yes, I am afraid of this task.
Can you take a look ?
I will pick this patch into next for now.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
Hi Marek,
Quoted 56 lines · Patrick DELAUNAY
-----Original Message-----
From: Marek Vasut <[email protected]>
Sent: mardi 20 octobre 2020 12:21Quoted 1 line · Patrick DELAUNAY
Hi Marek,
Hi,
[...]
Quoted 46 lines
Quoted 46 lines
Quoted 21 lines
Quoted 8 lines · Patrick Delaunay
Quoted 6 lines
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
How is this solved in Linux ?
It is managed by Linux DWC2 driver: it is a real OTG driver, with dual mode support and by usb framework
Throught the properties
&usbotg_hs { usb-role-switch; };a glue treat the session and the sensing management see
linux/drivers/usb/dwc2/drd.cin linux-nextPS:
activate_stm_id_vb_detectionis also used in driver =hsotg->params.Quoted 7 lines
As ID pin / vbus is completly managed by the USB TYPE driver C (STUSB1600 for STMicroelectronics board) and DWC2 driver with dual role stack (host/gadget).
I don't found a better solution than device tree property for this task in U-Boot as DWC2 driver don't support dual role and U-Boot don't have
framework for USB type C controller.
Quoted 6 lines
Quoted 1 line
btw can you do something about that huge change in indent ? Is it necessary ?
I move all this code under
activate_stm_id_vb_detection(linked to compatible "st,stm32mp1-hsotg") to avoid impact on other platform as this "sensing" properties are only support for STM32MP15X (it is linked to USB block detection integrated in SOC)Quoted 8 lines
And after I need to check the
1/ The usb33d-supply is required of vbus or IDPIN sensing 2/ manage Vbus sensing or override (according dt) 3/ manage IDPIN or override (according dt)I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation
issue for other platform.
Quoted 2 lines
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
as it is required.
Quoted 1 line
So yes I think it is needed but I can split the patch to simplify the review.
I presume you don't feel like implementing proper OTG support, right ?
Yes, I am afraid of this task.
Can you take a look ?
I will pick this patch into next for now.
I check this topic, I think I don't need to support OTG in dwc2
but I need to support USB port and connector as it is done in linux kernel.
and I think that I can propose a plan (6 month-1 year)
- Add a new u-class for USB connector based onlinux/drivers/usb/typec/class.c
??? => Allow to detect cable connection and USB mode (device / host)
- Add a new driver for USB type C connector (compatible "usb-c-connector")
- Migrate stusb1600 driver to use this new driver
- Update driver (dwc2 or usbphyc or directly in uclass ?) to use connector when present in device tree (devicetree/bindings/connector/usb-connector.yaml)
With these modifcations, I hope to have the same hooks than Linux.
And for future
- Add a USB typeC connector driver based on UCSI
(linux/drivers/usb/typec/ucsi)
- Adapt other driver to use USB connector..... (as DWC3 for example to manage dual role with type-c)
Patrick
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
On 12/9/20 6:04 PM, Patrick DELAUNAY wrote:
Hi,
[...]
Quoted 39 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
I add a new property to be backward compatible (even it the combinaison is less clear) I protect regulator function call to avoid compilation
issue for other platform.
Quoted 2 lines
PS: after reading the refmanual, I also split VALOEN and VALOVAL bit update
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
as it is required.
Quoted 2 lines
So yes I think it is needed but I can split the patch to simplify the review.
I presume you don't feel like implementing proper OTG support, right ?
Yes, I am afraid of this task.
Can you take a look ?
I will pick this patch into next for now.
I check this topic, I think I don't need to support OTG in dwc2
but I need to support USB port and connector as it is done in linux kernel.
and I think that I can propose a plan (6 month-1 year)
- Add a new u-class for USB connector based on
linux/drivers/usb/typec/class.c??? => Allow to detect cable connection and USB mode (device / host)
- Add a new driver for USB type C connector (compatible "usb-c-connector")
- Migrate stusb1600 driver to use this new driver
- Update driver (dwc2 or usbphyc or directly in uclass ?) to use connector when present in device tree (
devicetree/bindings/connector/usb-connector.yaml)With these modifcations, I hope to have the same hooks than Linux.
And for future
Quoted 8 lines
- Add a USB typeC connector driver based on UCSI
(linux/drivers/usb/typec/ucsi)- Adapt other driver to use USB connector..... (as DWC3 for example to manage dual role with type-c)
Sounds good, thanks :)
PATCH 1/1 usb: dwc2: add "u-boot,force-vbus-detection" for stm32
In reply to Patrick DelaunayHi Patrick
Quoted 114 lines · Patrick Delaunay
On some board, the ID pin is not connected so the B session must be overridden with "u-boot,force_b_session_valid" but the VBus sensing must continue to be handle.
To managed it, this patch adds a new DT field "u-boot,force-vbus-detection" to use with "u-boot,force_b_session_valid"
Signed-off-by Patrick Delaunay <[email protected]>---
drivers/usb/gadget/dwc2_udc_otg.c | 59 +++++++++++++++++--------- drivers/usb/gadget/dwc2_udc_otg_regs.h | 2 + include/usb/dwc2_udc.h | 1 + 3 files changed, 41 insertions(+), 21 deletions(-)drivers/usb/gadget/dwc2_udc_otg.c +38
-21@@ -1014,6 +1014,9 @@ static int dwc2_udc_otg_ofdata_to_platdata(struct udevice *dev) platdata->force_b_session_valid =dev_read_bool (dev,"u-boot,force-b-session-valid" ); + platdata->force_vbus_detection = +dev_read_bool (dev,"u-boot,force-vbus-detection" ); +/* force platdata according compatible */ drvdata =dev_get_driver_data (dev);if (drvdata) {@@ -1106,31 +1109,45 @@ static int dwc2_udc_otg_probe(struct udevice *dev)if (ret)return ret; -if (CONFIG_IS_ENABLED (DM_REGULATOR ) && - platdata->activate_stm_id_vb_detection && - !platdata->force_b_session_valid) { - ret =device_get_supply_regulator (dev,"usb33d-supply" , - &priv->usb33d_supply); -if (ret) { -dev_err (dev,"can't get voltage level detector supply\n" ); -return ret; +if (platdata->activate_stm_id_vb_detection) { +if (CONFIG_IS_ENABLED (DM_REGULATOR ) && + (!platdata->force_b_session_valid || + platdata->force_vbus_detection)) { + ret =device_get_supply_regulator (dev,"usb33d-supply" , + &priv->usb33d_supply); +if (ret) { +dev_err (dev,"can't get voltage level detector supply\n" ); +return ret; + } + ret =regulator_set_enable (priv->usb33d_supply, true); +if (ret) { +dev_err (dev,"can't enable voltage level detector supply\n" ); +return ret; + } } - ret =regulator_set_enable (priv->usb33d_supply, true); -if (ret) { -dev_err (dev,"can't enable voltage level detector supply\n" ); -return ret; + +if (platdata->force_b_session_valid && + !platdata->force_vbus_detection) { +/* Override VBUS detection: enable then value*/ +setbits_le32 (&usbotg_reg->gotgctl,VB_VALOEN ); +setbits_le32 (&usbotg_reg->gotgctl,VB_VALOVAL ); + }else { +/* Enable VBUS sensing */ +setbits_le32 (&usbotg_reg->ggpio, +GGPIO_STM32_OTG_GCCFG_VBDEN ); + } +if (platdata->force_b_session_valid) { +/* Override B session bits: enable then value */ +setbits_le32 (&usbotg_reg->gotgctl,A_VALOEN |B_VALOEN ); +setbits_le32 (&usbotg_reg->gotgctl, +A_VALOVAL |B_VALOVAL ); + }else { +/* Enable ID detection */ +setbits_le32 (&usbotg_reg->ggpio, +GGPIO_STM32_OTG_GCCFG_IDEN ); } -/* Enable vbus sensing */ -setbits_le32 (&usbotg_reg->ggpio, -GGPIO_STM32_OTG_GCCFG_VBDEN | -GGPIO_STM32_OTG_GCCFG_IDEN ); } -if (platdata->force_b_session_valid) -/* Override B session bits : value and enable */ -setbits_le32 (&usbotg_reg->gotgctl, -A_VALOEN |A_VALOVAL |B_VALOEN |B_VALOVAL ); - ret =dwc2_udc_probe (platdata);if (ret)return ret;drivers/usb/gadget/dwc2_udc_otg_regs.h +2
-0@@ -94,6 +94,8 @@ struct dwc2_usbotg_reg {#define B_VALOEN BIT(6)#define A_VALOVAL BIT(5)#define A_VALOEN BIT(4) +#define VB_VALOVAL BIT(3) +#define VB_VALOEN BIT(2)/* DWC2_UDC_OTG_GOTINT */ #define GOTGINT_SES_END_DET (1<<2)include/usb/dwc2_udc.h +0
-0
include/usb/dwc2_udc.h struct dwc2_plat_otg_data { · line 34
Quoted 7 lines
include/usb/dwc2_udc.h +1
-0@@ -28,6 +28,7 @@ struct dwc2_plat_otg_data {unsigned int tx_fifo_sz_array[DWC2_MAX_HW_ENDPOINTS ];unsigned char tx_fifo_sz_nb;bool force_b_session_valid; +bool force_vbus_detection;bool activate_stm_id_vb_detection; };
Thanks