| Message ID | 20240212-vbus-glitch-v2-2-d71b73a82de1@nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | usb: dwc3: drop 'snps,host-vbus-glitches-quirk' | expand |
On Mon, Feb 12, 2024, Frank Li wrote: > Remove 'snps,host-vbus-glitches-quirk' and apply workaround > unconditionally. > > It is safer to keep vbus disabled before handing over to xhci driver. So > needn't 'snps,host-vbus-glitches' property to enable it and apply it > unconditionally. > > Remove all host_vbus_glitches variable and call > dwc3_power_off_all_roothub_ports() directly. > > Signed-off-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/usb/dwc3/core.c | 3 --- > drivers/usb/dwc3/core.h | 2 -- > drivers/usb/dwc3/host.c | 3 +-- > 3 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > index 3b68e8e45b8b9..3e55838c00014 100644 > --- a/drivers/usb/dwc3/core.c > +++ b/drivers/usb/dwc3/core.c > @@ -1626,9 +1626,6 @@ static void dwc3_get_properties(struct dwc3 *dwc) > dwc->dis_split_quirk = device_property_read_bool(dev, > "snps,dis-split-quirk"); > > - dwc->host_vbus_glitches_quirk = device_property_read_bool(dev, > - "snps,host-vbus-glitches-quirk"); > - > dwc->lpm_nyet_threshold = lpm_nyet_threshold; > dwc->tx_de_emphasis = tx_de_emphasis; > > diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h > index df544ec730d22..e3eea965e57bf 100644 > --- a/drivers/usb/dwc3/core.h > +++ b/drivers/usb/dwc3/core.h > @@ -1132,7 +1132,6 @@ struct dwc3_scratchpad_array { > * 2 - No de-emphasis > * 3 - Reserved > * @dis_metastability_quirk: set to disable metastability quirk. > - * @host_vbus_glitches_quirk: set to avoid vbus glitch during xhci reset. > * @dis_split_quirk: set to disable split boundary. > * @wakeup_configured: set if the device is configured for remote wakeup. > * @suspended: set to track suspend event due to U3/L2. > @@ -1354,7 +1353,6 @@ struct dwc3 { > unsigned tx_de_emphasis:2; > > unsigned dis_metastability_quirk:1; > - unsigned host_vbus_glitches_quirk:1; > > unsigned dis_split_quirk:1; > unsigned async_callbacks:1; > diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c > index ae189b7a4f8b8..98964e8dea1f7 100644 > --- a/drivers/usb/dwc3/host.c > +++ b/drivers/usb/dwc3/host.c > @@ -114,8 +114,7 @@ int dwc3_host_init(struct dwc3 *dwc) > * Some platforms need to power off all Root hub ports immediately after DWC3 set to host > * mode to avoid VBUS glitch happen when xhci get reset later. > */ > - if (dwc->host_vbus_glitches_quirk) > - dwc3_power_off_all_roothub_ports(dwc); > + dwc3_power_off_all_roothub_ports(dwc); > > irq = dwc3_host_get_irq(dwc); > if (irq < 0) > > -- > 2.34.1 > Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Thanks, Thinh ps: Was there a v1 of this series or did I drop it from my inbox?
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 3b68e8e45b8b9..3e55838c00014 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1626,9 +1626,6 @@ static void dwc3_get_properties(struct dwc3 *dwc) dwc->dis_split_quirk = device_property_read_bool(dev, "snps,dis-split-quirk"); - dwc->host_vbus_glitches_quirk = device_property_read_bool(dev, - "snps,host-vbus-glitches-quirk"); - dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index df544ec730d22..e3eea965e57bf 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1132,7 +1132,6 @@ struct dwc3_scratchpad_array { * 2 - No de-emphasis * 3 - Reserved * @dis_metastability_quirk: set to disable metastability quirk. - * @host_vbus_glitches_quirk: set to avoid vbus glitch during xhci reset. * @dis_split_quirk: set to disable split boundary. * @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. @@ -1354,7 +1353,6 @@ struct dwc3 { unsigned tx_de_emphasis:2; unsigned dis_metastability_quirk:1; - unsigned host_vbus_glitches_quirk:1; unsigned dis_split_quirk:1; unsigned async_callbacks:1; diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index ae189b7a4f8b8..98964e8dea1f7 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -114,8 +114,7 @@ int dwc3_host_init(struct dwc3 *dwc) * Some platforms need to power off all Root hub ports immediately after DWC3 set to host * mode to avoid VBUS glitch happen when xhci get reset later. */ - if (dwc->host_vbus_glitches_quirk) - dwc3_power_off_all_roothub_ports(dwc); + dwc3_power_off_all_roothub_ports(dwc); irq = dwc3_host_get_irq(dwc); if (irq < 0)
Remove 'snps,host-vbus-glitches-quirk' and apply workaround unconditionally. It is safer to keep vbus disabled before handing over to xhci driver. So needn't 'snps,host-vbus-glitches' property to enable it and apply it unconditionally. Remove all host_vbus_glitches variable and call dwc3_power_off_all_roothub_ports() directly. Signed-off-by: Frank Li <Frank.Li@nxp.com> --- drivers/usb/dwc3/core.c | 3 --- drivers/usb/dwc3/core.h | 2 -- drivers/usb/dwc3/host.c | 3 +-- 3 files changed, 1 insertion(+), 7 deletions(-)