* [PATCH v9 0/2] the fixup for the USB HOST1 at rk3288 platform @ 2016-10-20 18:37 Randy Li 2016-10-20 18:37 ` Randy Li 2016-10-20 18:37 ` [PATCH v9 2/2] ARM: dts: rockchip: Point rk3288 dwc2 usb at the full PHY reset Randy Li 0 siblings, 2 replies; 12+ messages in thread From: Randy Li @ 2016-10-20 18:37 UTC (permalink / raw) To: linux-usb Cc: John.Youn, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li, Randy Li changelog: v9 use a work_queue to reset usb phy to prevent access mutex lock at interrupter runtime. v8 minior fixup v7 add the forgot dummy phy_reset() for the generic phy is disabled. v7 Some minor fixup v6 Send the last two patches v5 A few modification at style, add the missing doc in the last commit. v4 1. Adding the reset callback in struct phy_ops. 2. Moving the reset into phy rockchip usb. 3. Trying to call a reset when dwc2 wakeup in rk3288. v3 Rebased from previous commit v2 Rebased from previous commit v1 orignal from google Randy Li (2): usb: dwc2: assert phy reset when waking up in rk3288 platform ARM: dts: rockchip: Point rk3288 dwc2 usb at the full PHY reset arch/arm/boot/dts/rk3288.dtsi | 4 ++++ drivers/usb/dwc2/core.h | 1 + drivers/usb/dwc2/core_intr.c | 11 +++++++++++ drivers/usb/dwc2/platform.c | 9 +++++++++ 4 files changed, 25 insertions(+) -- 2.7.4 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-10-20 18:37 ` Randy Li 0 siblings, 0 replies; 12+ messages in thread From: Randy Li @ 2016-10-20 18:37 UTC (permalink / raw) To: linux-usb Cc: John.Youn, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li, Randy Li On the rk3288 USB host-only port (the one that's not the OTG-enabled port) the PHY can get into a bad state when a wakeup is asserted (not just a wakeup from full system suspend but also a wakeup from autosuspend). We can get the PHY out of its bad state by asserting its "port reset", but unfortunately that seems to assert a reset onto the USB bus so it could confuse things if we don't actually deenumerate / reenumerate the device. We can also get the PHY out of its bad state by fully resetting it using the reset from the CRU (clock reset unit) in chip, which does a more full reset. The CRU-based reset appears to actually cause devices on the bus to be removed and reinserted, which fixes the problem (albeit in a hacky way). It's unfortunate that we need to do a full re-enumeration of devices at wakeup time, but this is better than alternative of letting the bus get wedged. Signed-off-by: Randy Li <ayaka@soulik.info> --- drivers/usb/dwc2/core.h | 1 + drivers/usb/dwc2/core_intr.c | 11 +++++++++++ drivers/usb/dwc2/platform.c | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 2a21a04..e91ddbc 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -859,6 +859,7 @@ struct dwc2_hsotg { unsigned int ll_hw_enabled:1; struct phy *phy; + struct work_struct phy_rst_work; struct usb_phy *uphy; struct dwc2_hsotg_plat *plat; struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index d85c5c9..c3d2168 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) { int ret; + struct device_node *np = hsotg->dev->of_node; /* Clear interrupt */ dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) /* Restart the Phy Clock */ pcgcctl &= ~PCGCTL_STOPPCLK; dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); + + /* + * It is a quirk in Rockchip RK3288, causing by + * a hardware bug. This will propagate out and + * eventually we'll re-enumerate the device. + * Not great but the best we can do + */ + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) + schedule_work(&hsotg->phy_rst_work); + mod_timer(&hsotg->wkp_timer, jiffies + msecs_to_jiffies(71)); } else { diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 8e1728b..65953cf 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) return ret; } +/* Only used to reset usb phy at interrupter runtime */ +static void dwc2_reset_phy_work(struct work_struct *data) +{ + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, + phy_rst_work); + phy_reset(hsotg->phy); +} + static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) { int i, ret; @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) return ret; } } + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); if (!hsotg->phy) { hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-10-20 18:37 ` Randy Li 0 siblings, 0 replies; 12+ messages in thread From: Randy Li @ 2016-10-20 18:37 UTC (permalink / raw) To: linux-usb-u79uwXL29TY76Z2rM5mHXA Cc: John.Youn-HKixBCOQz3hWk0Htik3J/w, kishon-l0cyMroinI0, felipe.balbi-VuQAYsv1563Yd54FQh9/CA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, randy.li-TNX95d0MmH7DzftRWevZcw, Randy Li On the rk3288 USB host-only port (the one that's not the OTG-enabled port) the PHY can get into a bad state when a wakeup is asserted (not just a wakeup from full system suspend but also a wakeup from autosuspend). We can get the PHY out of its bad state by asserting its "port reset", but unfortunately that seems to assert a reset onto the USB bus so it could confuse things if we don't actually deenumerate / reenumerate the device. We can also get the PHY out of its bad state by fully resetting it using the reset from the CRU (clock reset unit) in chip, which does a more full reset. The CRU-based reset appears to actually cause devices on the bus to be removed and reinserted, which fixes the problem (albeit in a hacky way). It's unfortunate that we need to do a full re-enumeration of devices at wakeup time, but this is better than alternative of letting the bus get wedged. Signed-off-by: Randy Li <ayaka-xPW3/0Ywev/iB9QmIjCX8w@public.gmane.org> --- drivers/usb/dwc2/core.h | 1 + drivers/usb/dwc2/core_intr.c | 11 +++++++++++ drivers/usb/dwc2/platform.c | 9 +++++++++ 3 files changed, 21 insertions(+) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 2a21a04..e91ddbc 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -859,6 +859,7 @@ struct dwc2_hsotg { unsigned int ll_hw_enabled:1; struct phy *phy; + struct work_struct phy_rst_work; struct usb_phy *uphy; struct dwc2_hsotg_plat *plat; struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c index d85c5c9..c3d2168 100644 --- a/drivers/usb/dwc2/core_intr.c +++ b/drivers/usb/dwc2/core_intr.c @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) { int ret; + struct device_node *np = hsotg->dev->of_node; /* Clear interrupt */ dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) /* Restart the Phy Clock */ pcgcctl &= ~PCGCTL_STOPPCLK; dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); + + /* + * It is a quirk in Rockchip RK3288, causing by + * a hardware bug. This will propagate out and + * eventually we'll re-enumerate the device. + * Not great but the best we can do + */ + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) + schedule_work(&hsotg->phy_rst_work); + mod_timer(&hsotg->wkp_timer, jiffies + msecs_to_jiffies(71)); } else { diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 8e1728b..65953cf 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) return ret; } +/* Only used to reset usb phy at interrupter runtime */ +static void dwc2_reset_phy_work(struct work_struct *data) +{ + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, + phy_rst_work); + phy_reset(hsotg->phy); +} + static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) { int i, ret; @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) return ret; } } + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); if (!hsotg->phy) { hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform 2016-10-20 18:37 ` Randy Li (?) @ 2016-10-21 19:27 ` John Youn 2016-10-23 9:33 ` ayaka -1 siblings, 1 reply; 12+ messages in thread From: John Youn @ 2016-10-21 19:27 UTC (permalink / raw) To: Randy Li, linux-usb Cc: John.Youn, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li On 10/20/2016 11:38 AM, Randy Li wrote: > On the rk3288 USB host-only port (the one that's not the OTG-enabled > port) the PHY can get into a bad state when a wakeup is asserted (not > just a wakeup from full system suspend but also a wakeup from > autosuspend). > > We can get the PHY out of its bad state by asserting its "port reset", > but unfortunately that seems to assert a reset onto the USB bus so it > could confuse things if we don't actually deenumerate / reenumerate the > device. > > We can also get the PHY out of its bad state by fully resetting it using > the reset from the CRU (clock reset unit) in chip, which does a more full > reset. The CRU-based reset appears to actually cause devices on the bus > to be removed and reinserted, which fixes the problem (albeit in a hacky > way). > > It's unfortunate that we need to do a full re-enumeration of devices at > wakeup time, but this is better than alternative of letting the bus get > wedged. > > Signed-off-by: Randy Li <ayaka@soulik.info> > --- > drivers/usb/dwc2/core.h | 1 + > drivers/usb/dwc2/core_intr.c | 11 +++++++++++ > drivers/usb/dwc2/platform.c | 9 +++++++++ > 3 files changed, 21 insertions(+) > > diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h > index 2a21a04..e91ddbc 100644 > --- a/drivers/usb/dwc2/core.h > +++ b/drivers/usb/dwc2/core.h > @@ -859,6 +859,7 @@ struct dwc2_hsotg { > unsigned int ll_hw_enabled:1; > > struct phy *phy; > + struct work_struct phy_rst_work; > struct usb_phy *uphy; > struct dwc2_hsotg_plat *plat; > struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; > diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c > index d85c5c9..c3d2168 100644 > --- a/drivers/usb/dwc2/core_intr.c > +++ b/drivers/usb/dwc2/core_intr.c > @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) > static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) > { > int ret; > + struct device_node *np = hsotg->dev->of_node; > > /* Clear interrupt */ > dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); > @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) > /* Restart the Phy Clock */ > pcgcctl &= ~PCGCTL_STOPPCLK; > dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); > + > + /* > + * It is a quirk in Rockchip RK3288, causing by > + * a hardware bug. This will propagate out and > + * eventually we'll re-enumerate the device. > + * Not great but the best we can do > + */ > + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) > + schedule_work(&hsotg->phy_rst_work); > + > mod_timer(&hsotg->wkp_timer, > jiffies + msecs_to_jiffies(71)); > } else { > diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c > index 8e1728b..65953cf 100644 > --- a/drivers/usb/dwc2/platform.c > +++ b/drivers/usb/dwc2/platform.c > @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) > return ret; > } > > +/* Only used to reset usb phy at interrupter runtime */ > +static void dwc2_reset_phy_work(struct work_struct *data) > +{ > + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, > + phy_rst_work); > + phy_reset(hsotg->phy); > +} > + > static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) > { > int i, ret; > @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) > return ret; > } > } > + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); > > if (!hsotg->phy) { > hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); > Hi Randy, This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need to make a fix to your phy_reset patch first. Regards, John ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-10-23 9:33 ` ayaka 0 siblings, 0 replies; 12+ messages in thread From: ayaka @ 2016-10-23 9:33 UTC (permalink / raw) To: John Youn, linux-usb Cc: kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li On 10/22/2016 03:27 AM, John Youn wrote: > On 10/20/2016 11:38 AM, Randy Li wrote: >> On the rk3288 USB host-only port (the one that's not the OTG-enabled >> port) the PHY can get into a bad state when a wakeup is asserted (not >> just a wakeup from full system suspend but also a wakeup from >> autosuspend). >> >> We can get the PHY out of its bad state by asserting its "port reset", >> but unfortunately that seems to assert a reset onto the USB bus so it >> could confuse things if we don't actually deenumerate / reenumerate the >> device. >> >> We can also get the PHY out of its bad state by fully resetting it using >> the reset from the CRU (clock reset unit) in chip, which does a more full >> reset. The CRU-based reset appears to actually cause devices on the bus >> to be removed and reinserted, which fixes the problem (albeit in a hacky >> way). >> >> It's unfortunate that we need to do a full re-enumeration of devices at >> wakeup time, but this is better than alternative of letting the bus get >> wedged. >> >> Signed-off-by: Randy Li <ayaka@soulik.info> >> --- >> drivers/usb/dwc2/core.h | 1 + >> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >> drivers/usb/dwc2/platform.c | 9 +++++++++ >> 3 files changed, 21 insertions(+) >> >> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >> index 2a21a04..e91ddbc 100644 >> --- a/drivers/usb/dwc2/core.h >> +++ b/drivers/usb/dwc2/core.h >> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >> unsigned int ll_hw_enabled:1; >> >> struct phy *phy; >> + struct work_struct phy_rst_work; >> struct usb_phy *uphy; >> struct dwc2_hsotg_plat *plat; >> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >> index d85c5c9..c3d2168 100644 >> --- a/drivers/usb/dwc2/core_intr.c >> +++ b/drivers/usb/dwc2/core_intr.c >> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >> { >> int ret; >> + struct device_node *np = hsotg->dev->of_node; >> >> /* Clear interrupt */ >> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >> /* Restart the Phy Clock */ >> pcgcctl &= ~PCGCTL_STOPPCLK; >> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >> + >> + /* >> + * It is a quirk in Rockchip RK3288, causing by >> + * a hardware bug. This will propagate out and >> + * eventually we'll re-enumerate the device. >> + * Not great but the best we can do >> + */ >> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >> + schedule_work(&hsotg->phy_rst_work); >> + >> mod_timer(&hsotg->wkp_timer, >> jiffies + msecs_to_jiffies(71)); >> } else { >> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >> index 8e1728b..65953cf 100644 >> --- a/drivers/usb/dwc2/platform.c >> +++ b/drivers/usb/dwc2/platform.c >> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >> return ret; >> } >> >> +/* Only used to reset usb phy at interrupter runtime */ >> +static void dwc2_reset_phy_work(struct work_struct *data) >> +{ >> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >> + phy_rst_work); >> + phy_reset(hsotg->phy); >> +} >> + >> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >> { >> int i, ret; >> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >> return ret; >> } >> } >> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >> >> if (!hsotg->phy) { >> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >> > Hi Randy, > > This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need > to make a fix to your phy_reset patch first. In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been merged, I though the [PATCH v8 1/3] phy: Add reset callback for not generic phy have been merged before that. when the rebase abandon it. Should re-send that patch? As the mainline have not been affected, could you arrange a squash for it? > > Regards, > John ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-10-23 9:33 ` ayaka 0 siblings, 0 replies; 12+ messages in thread From: ayaka @ 2016-10-23 9:33 UTC (permalink / raw) To: John Youn, linux-usb-u79uwXL29TY76Z2rM5mHXA Cc: kishon-l0cyMroinI0, felipe.balbi-VuQAYsv1563Yd54FQh9/CA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, randy.li-TNX95d0MmH7DzftRWevZcw On 10/22/2016 03:27 AM, John Youn wrote: > On 10/20/2016 11:38 AM, Randy Li wrote: >> On the rk3288 USB host-only port (the one that's not the OTG-enabled >> port) the PHY can get into a bad state when a wakeup is asserted (not >> just a wakeup from full system suspend but also a wakeup from >> autosuspend). >> >> We can get the PHY out of its bad state by asserting its "port reset", >> but unfortunately that seems to assert a reset onto the USB bus so it >> could confuse things if we don't actually deenumerate / reenumerate the >> device. >> >> We can also get the PHY out of its bad state by fully resetting it using >> the reset from the CRU (clock reset unit) in chip, which does a more full >> reset. The CRU-based reset appears to actually cause devices on the bus >> to be removed and reinserted, which fixes the problem (albeit in a hacky >> way). >> >> It's unfortunate that we need to do a full re-enumeration of devices at >> wakeup time, but this is better than alternative of letting the bus get >> wedged. >> >> Signed-off-by: Randy Li <ayaka-xPW3/0Ywev/iB9QmIjCX8w@public.gmane.org> >> --- >> drivers/usb/dwc2/core.h | 1 + >> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >> drivers/usb/dwc2/platform.c | 9 +++++++++ >> 3 files changed, 21 insertions(+) >> >> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >> index 2a21a04..e91ddbc 100644 >> --- a/drivers/usb/dwc2/core.h >> +++ b/drivers/usb/dwc2/core.h >> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >> unsigned int ll_hw_enabled:1; >> >> struct phy *phy; >> + struct work_struct phy_rst_work; >> struct usb_phy *uphy; >> struct dwc2_hsotg_plat *plat; >> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >> index d85c5c9..c3d2168 100644 >> --- a/drivers/usb/dwc2/core_intr.c >> +++ b/drivers/usb/dwc2/core_intr.c >> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >> { >> int ret; >> + struct device_node *np = hsotg->dev->of_node; >> >> /* Clear interrupt */ >> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >> /* Restart the Phy Clock */ >> pcgcctl &= ~PCGCTL_STOPPCLK; >> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >> + >> + /* >> + * It is a quirk in Rockchip RK3288, causing by >> + * a hardware bug. This will propagate out and >> + * eventually we'll re-enumerate the device. >> + * Not great but the best we can do >> + */ >> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >> + schedule_work(&hsotg->phy_rst_work); >> + >> mod_timer(&hsotg->wkp_timer, >> jiffies + msecs_to_jiffies(71)); >> } else { >> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >> index 8e1728b..65953cf 100644 >> --- a/drivers/usb/dwc2/platform.c >> +++ b/drivers/usb/dwc2/platform.c >> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >> return ret; >> } >> >> +/* Only used to reset usb phy at interrupter runtime */ >> +static void dwc2_reset_phy_work(struct work_struct *data) >> +{ >> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >> + phy_rst_work); >> + phy_reset(hsotg->phy); >> +} >> + >> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >> { >> int i, ret; >> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >> return ret; >> } >> } >> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >> >> if (!hsotg->phy) { >> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >> > Hi Randy, > > This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need > to make a fix to your phy_reset patch first. In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been merged, I though the [PATCH v8 1/3] phy: Add reset callback for not generic phy have been merged before that. when the rebase abandon it. Should re-send that patch? As the mainline have not been affected, could you arrange a squash for it? > > Regards, > John -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform 2016-10-23 9:33 ` ayaka (?) @ 2016-10-25 1:30 ` John Youn 2016-12-06 12:00 ` Ayaka -1 siblings, 1 reply; 12+ messages in thread From: John Youn @ 2016-10-25 1:30 UTC (permalink / raw) To: ayaka, John Youn, linux-usb, kishon Cc: felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li On 10/23/2016 2:33 AM, ayaka wrote: > > > On 10/22/2016 03:27 AM, John Youn wrote: >> On 10/20/2016 11:38 AM, Randy Li wrote: >>> On the rk3288 USB host-only port (the one that's not the OTG-enabled >>> port) the PHY can get into a bad state when a wakeup is asserted (not >>> just a wakeup from full system suspend but also a wakeup from >>> autosuspend). >>> >>> We can get the PHY out of its bad state by asserting its "port reset", >>> but unfortunately that seems to assert a reset onto the USB bus so it >>> could confuse things if we don't actually deenumerate / reenumerate the >>> device. >>> >>> We can also get the PHY out of its bad state by fully resetting it using >>> the reset from the CRU (clock reset unit) in chip, which does a more full >>> reset. The CRU-based reset appears to actually cause devices on the bus >>> to be removed and reinserted, which fixes the problem (albeit in a hacky >>> way). >>> >>> It's unfortunate that we need to do a full re-enumeration of devices at >>> wakeup time, but this is better than alternative of letting the bus get >>> wedged. >>> >>> Signed-off-by: Randy Li <ayaka@soulik.info> >>> --- >>> drivers/usb/dwc2/core.h | 1 + >>> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >>> drivers/usb/dwc2/platform.c | 9 +++++++++ >>> 3 files changed, 21 insertions(+) >>> >>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >>> index 2a21a04..e91ddbc 100644 >>> --- a/drivers/usb/dwc2/core.h >>> +++ b/drivers/usb/dwc2/core.h >>> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >>> unsigned int ll_hw_enabled:1; >>> >>> struct phy *phy; >>> + struct work_struct phy_rst_work; >>> struct usb_phy *uphy; >>> struct dwc2_hsotg_plat *plat; >>> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >>> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >>> index d85c5c9..c3d2168 100644 >>> --- a/drivers/usb/dwc2/core_intr.c >>> +++ b/drivers/usb/dwc2/core_intr.c >>> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >>> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>> { >>> int ret; >>> + struct device_node *np = hsotg->dev->of_node; >>> >>> /* Clear interrupt */ >>> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >>> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>> /* Restart the Phy Clock */ >>> pcgcctl &= ~PCGCTL_STOPPCLK; >>> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >>> + >>> + /* >>> + * It is a quirk in Rockchip RK3288, causing by >>> + * a hardware bug. This will propagate out and >>> + * eventually we'll re-enumerate the device. >>> + * Not great but the best we can do >>> + */ >>> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >>> + schedule_work(&hsotg->phy_rst_work); >>> + >>> mod_timer(&hsotg->wkp_timer, >>> jiffies + msecs_to_jiffies(71)); >>> } else { >>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >>> index 8e1728b..65953cf 100644 >>> --- a/drivers/usb/dwc2/platform.c >>> +++ b/drivers/usb/dwc2/platform.c >>> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >>> return ret; >>> } >>> >>> +/* Only used to reset usb phy at interrupter runtime */ >>> +static void dwc2_reset_phy_work(struct work_struct *data) >>> +{ >>> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >>> + phy_rst_work); >>> + phy_reset(hsotg->phy); >>> +} >>> + >>> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>> { >>> int i, ret; >>> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>> return ret; >>> } >>> } >>> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >>> >>> if (!hsotg->phy) { >>> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >>> >> Hi Randy, >> >> This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need >> to make a fix to your phy_reset patch first. > In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been > merged, I though the > [PATCH v8 1/3] phy: Add reset callback for not generic phy have been > merged before that. when the rebase abandon it. > Should re-send that patch? As the mainline have not been affected, could > you arrange a squash for it? Hi Randy, Can you resend the fix to Kishon? The phy_reset patch landed in 4.9-rc so I think he should take the fix for the next -rc. After that we can send the dwc2 change through Felipe. Regards, John ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-12-06 12:00 ` Ayaka 0 siblings, 0 replies; 12+ messages in thread From: Ayaka @ 2016-12-06 12:00 UTC (permalink / raw) To: John Youn Cc: linux-usb, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li Hello John I still waiting them be merged, but I still can't find it at next-20161206. 從我的 iPad 傳送 > John Youn <John.Youn@synopsys.com> 於 2016年10月25日 上午9:30 寫道： > >> On 10/23/2016 2:33 AM, ayaka wrote: >> >> >>> On 10/22/2016 03:27 AM, John Youn wrote: >>>> On 10/20/2016 11:38 AM, Randy Li wrote: >>>> On the rk3288 USB host-only port (the one that's not the OTG-enabled >>>> port) the PHY can get into a bad state when a wakeup is asserted (not >>>> just a wakeup from full system suspend but also a wakeup from >>>> autosuspend). >>>> >>>> We can get the PHY out of its bad state by asserting its "port reset", >>>> but unfortunately that seems to assert a reset onto the USB bus so it >>>> could confuse things if we don't actually deenumerate / reenumerate the >>>> device. >>>> >>>> We can also get the PHY out of its bad state by fully resetting it using >>>> the reset from the CRU (clock reset unit) in chip, which does a more full >>>> reset. The CRU-based reset appears to actually cause devices on the bus >>>> to be removed and reinserted, which fixes the problem (albeit in a hacky >>>> way). >>>> >>>> It's unfortunate that we need to do a full re-enumeration of devices at >>>> wakeup time, but this is better than alternative of letting the bus get >>>> wedged. >>>> >>>> Signed-off-by: Randy Li <ayaka@soulik.info> >>>> --- >>>> drivers/usb/dwc2/core.h | 1 + >>>> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >>>> drivers/usb/dwc2/platform.c | 9 +++++++++ >>>> 3 files changed, 21 insertions(+) >>>> >>>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >>>> index 2a21a04..e91ddbc 100644 >>>> --- a/drivers/usb/dwc2/core.h >>>> +++ b/drivers/usb/dwc2/core.h >>>> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >>>> unsigned int ll_hw_enabled:1; >>>> >>>> struct phy *phy; >>>> + struct work_struct phy_rst_work; >>>> struct usb_phy *uphy; >>>> struct dwc2_hsotg_plat *plat; >>>> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >>>> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >>>> index d85c5c9..c3d2168 100644 >>>> --- a/drivers/usb/dwc2/core_intr.c >>>> +++ b/drivers/usb/dwc2/core_intr.c >>>> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >>>> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>> { >>>> int ret; >>>> + struct device_node *np = hsotg->dev->of_node; >>>> >>>> /* Clear interrupt */ >>>> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >>>> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>> /* Restart the Phy Clock */ >>>> pcgcctl &= ~PCGCTL_STOPPCLK; >>>> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >>>> + >>>> + /* >>>> + * It is a quirk in Rockchip RK3288, causing by >>>> + * a hardware bug. This will propagate out and >>>> + * eventually we'll re-enumerate the device. >>>> + * Not great but the best we can do >>>> + */ >>>> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >>>> + schedule_work(&hsotg->phy_rst_work); >>>> + >>>> mod_timer(&hsotg->wkp_timer, >>>> jiffies + msecs_to_jiffies(71)); >>>> } else { >>>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >>>> index 8e1728b..65953cf 100644 >>>> --- a/drivers/usb/dwc2/platform.c >>>> +++ b/drivers/usb/dwc2/platform.c >>>> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >>>> return ret; >>>> } >>>> >>>> +/* Only used to reset usb phy at interrupter runtime */ >>>> +static void dwc2_reset_phy_work(struct work_struct *data) >>>> +{ >>>> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >>>> + phy_rst_work); >>>> + phy_reset(hsotg->phy); >>>> +} >>>> + >>>> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>> { >>>> int i, ret; >>>> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>> return ret; >>>> } >>>> } >>>> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >>>> >>>> if (!hsotg->phy) { >>>> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >>>> >>> Hi Randy, >>> >>> This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need >>> to make a fix to your phy_reset patch first. >> In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been >> merged, I though the >> [PATCH v8 1/3] phy: Add reset callback for not generic phy have been >> merged before that. when the rebase abandon it. >> Should re-send that patch? As the mainline have not been affected, could >> you arrange a squash for it? > > Hi Randy, > > Can you resend the fix to Kishon? > > The phy_reset patch landed in 4.9-rc so I think he should take the fix > for the next -rc. After that we can send the dwc2 change through > Felipe. > > Regards, > John ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-12-06 12:00 ` Ayaka 0 siblings, 0 replies; 12+ messages in thread From: Ayaka @ 2016-12-06 12:00 UTC (permalink / raw) To: John Youn Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA, kishon-l0cyMroinI0, felipe.balbi-VuQAYsv1563Yd54FQh9/CA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, randy.li-TNX95d0MmH7DzftRWevZcw Hello John I still waiting them be merged, but I still can't find it at next-20161206. 從我的 iPad 傳送 > John Youn <John.Youn-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> 於 2016年10月25日 上午9:30 寫道： > >> On 10/23/2016 2:33 AM, ayaka wrote: >> >> >>> On 10/22/2016 03:27 AM, John Youn wrote: >>>> On 10/20/2016 11:38 AM, Randy Li wrote: >>>> On the rk3288 USB host-only port (the one that's not the OTG-enabled >>>> port) the PHY can get into a bad state when a wakeup is asserted (not >>>> just a wakeup from full system suspend but also a wakeup from >>>> autosuspend). >>>> >>>> We can get the PHY out of its bad state by asserting its "port reset", >>>> but unfortunately that seems to assert a reset onto the USB bus so it >>>> could confuse things if we don't actually deenumerate / reenumerate the >>>> device. >>>> >>>> We can also get the PHY out of its bad state by fully resetting it using >>>> the reset from the CRU (clock reset unit) in chip, which does a more full >>>> reset. The CRU-based reset appears to actually cause devices on the bus >>>> to be removed and reinserted, which fixes the problem (albeit in a hacky >>>> way). >>>> >>>> It's unfortunate that we need to do a full re-enumeration of devices at >>>> wakeup time, but this is better than alternative of letting the bus get >>>> wedged. >>>> >>>> Signed-off-by: Randy Li <ayaka-xPW3/0Ywev/iB9QmIjCX8w@public.gmane.org> >>>> --- >>>> drivers/usb/dwc2/core.h | 1 + >>>> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >>>> drivers/usb/dwc2/platform.c | 9 +++++++++ >>>> 3 files changed, 21 insertions(+) >>>> >>>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >>>> index 2a21a04..e91ddbc 100644 >>>> --- a/drivers/usb/dwc2/core.h >>>> +++ b/drivers/usb/dwc2/core.h >>>> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >>>> unsigned int ll_hw_enabled:1; >>>> >>>> struct phy *phy; >>>> + struct work_struct phy_rst_work; >>>> struct usb_phy *uphy; >>>> struct dwc2_hsotg_plat *plat; >>>> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >>>> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >>>> index d85c5c9..c3d2168 100644 >>>> --- a/drivers/usb/dwc2/core_intr.c >>>> +++ b/drivers/usb/dwc2/core_intr.c >>>> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >>>> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>> { >>>> int ret; >>>> + struct device_node *np = hsotg->dev->of_node; >>>> >>>> /* Clear interrupt */ >>>> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >>>> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>> /* Restart the Phy Clock */ >>>> pcgcctl &= ~PCGCTL_STOPPCLK; >>>> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >>>> + >>>> + /* >>>> + * It is a quirk in Rockchip RK3288, causing by >>>> + * a hardware bug. This will propagate out and >>>> + * eventually we'll re-enumerate the device. >>>> + * Not great but the best we can do >>>> + */ >>>> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >>>> + schedule_work(&hsotg->phy_rst_work); >>>> + >>>> mod_timer(&hsotg->wkp_timer, >>>> jiffies + msecs_to_jiffies(71)); >>>> } else { >>>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >>>> index 8e1728b..65953cf 100644 >>>> --- a/drivers/usb/dwc2/platform.c >>>> +++ b/drivers/usb/dwc2/platform.c >>>> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >>>> return ret; >>>> } >>>> >>>> +/* Only used to reset usb phy at interrupter runtime */ >>>> +static void dwc2_reset_phy_work(struct work_struct *data) >>>> +{ >>>> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >>>> + phy_rst_work); >>>> + phy_reset(hsotg->phy); >>>> +} >>>> + >>>> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>> { >>>> int i, ret; >>>> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>> return ret; >>>> } >>>> } >>>> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >>>> >>>> if (!hsotg->phy) { >>>> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >>>> >>> Hi Randy, >>> >>> This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need >>> to make a fix to your phy_reset patch first. >> In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been >> merged, I though the >> [PATCH v8 1/3] phy: Add reset callback for not generic phy have been >> merged before that. when the rebase abandon it. >> Should re-send that patch? As the mainline have not been affected, could >> you arrange a squash for it? > > Hi Randy, > > Can you resend the fix to Kishon? > > The phy_reset patch landed in 4.9-rc so I think he should take the fix > for the next -rc. After that we can send the dwc2 change through > Felipe. > > Regards, > John -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-12-06 19:43 ` John Youn 0 siblings, 0 replies; 12+ messages in thread From: John Youn @ 2016-12-06 19:43 UTC (permalink / raw) To: Ayaka, John Youn Cc: linux-usb, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li On 12/6/2016 4:00 AM, Ayaka wrote: > Hello John > I still waiting them be merged, but I still can't find it at next-20161206. > Can you resubmit this fixing the checkpatch issues? You can add my ack: Acked-by: John Youn <johnyoun@synopsys.com> Regards, John > 從我的 iPad 傳送 > >> John Youn <John.Youn@synopsys.com> 於 2016年10月25日 上午9:30 寫道： >> >>> On 10/23/2016 2:33 AM, ayaka wrote: >>> >>> >>>> On 10/22/2016 03:27 AM, John Youn wrote: >>>>> On 10/20/2016 11:38 AM, Randy Li wrote: >>>>> On the rk3288 USB host-only port (the one that's not the OTG-enabled >>>>> port) the PHY can get into a bad state when a wakeup is asserted (not >>>>> just a wakeup from full system suspend but also a wakeup from >>>>> autosuspend). >>>>> >>>>> We can get the PHY out of its bad state by asserting its "port reset", >>>>> but unfortunately that seems to assert a reset onto the USB bus so it >>>>> could confuse things if we don't actually deenumerate / reenumerate the >>>>> device. >>>>> >>>>> We can also get the PHY out of its bad state by fully resetting it using >>>>> the reset from the CRU (clock reset unit) in chip, which does a more full >>>>> reset. The CRU-based reset appears to actually cause devices on the bus >>>>> to be removed and reinserted, which fixes the problem (albeit in a hacky >>>>> way). >>>>> >>>>> It's unfortunate that we need to do a full re-enumeration of devices at >>>>> wakeup time, but this is better than alternative of letting the bus get >>>>> wedged. >>>>> >>>>> Signed-off-by: Randy Li <ayaka@soulik.info> >>>>> --- >>>>> drivers/usb/dwc2/core.h | 1 + >>>>> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >>>>> drivers/usb/dwc2/platform.c | 9 +++++++++ >>>>> 3 files changed, 21 insertions(+) >>>>> >>>>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >>>>> index 2a21a04..e91ddbc 100644 >>>>> --- a/drivers/usb/dwc2/core.h >>>>> +++ b/drivers/usb/dwc2/core.h >>>>> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >>>>> unsigned int ll_hw_enabled:1; >>>>> >>>>> struct phy *phy; >>>>> + struct work_struct phy_rst_work; >>>>> struct usb_phy *uphy; >>>>> struct dwc2_hsotg_plat *plat; >>>>> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >>>>> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >>>>> index d85c5c9..c3d2168 100644 >>>>> --- a/drivers/usb/dwc2/core_intr.c >>>>> +++ b/drivers/usb/dwc2/core_intr.c >>>>> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >>>>> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>>> { >>>>> int ret; >>>>> + struct device_node *np = hsotg->dev->of_node; >>>>> >>>>> /* Clear interrupt */ >>>>> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >>>>> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>>> /* Restart the Phy Clock */ >>>>> pcgcctl &= ~PCGCTL_STOPPCLK; >>>>> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >>>>> + >>>>> + /* >>>>> + * It is a quirk in Rockchip RK3288, causing by >>>>> + * a hardware bug. This will propagate out and >>>>> + * eventually we'll re-enumerate the device. >>>>> + * Not great but the best we can do >>>>> + */ >>>>> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >>>>> + schedule_work(&hsotg->phy_rst_work); >>>>> + >>>>> mod_timer(&hsotg->wkp_timer, >>>>> jiffies + msecs_to_jiffies(71)); >>>>> } else { >>>>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >>>>> index 8e1728b..65953cf 100644 >>>>> --- a/drivers/usb/dwc2/platform.c >>>>> +++ b/drivers/usb/dwc2/platform.c >>>>> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >>>>> return ret; >>>>> } >>>>> >>>>> +/* Only used to reset usb phy at interrupter runtime */ >>>>> +static void dwc2_reset_phy_work(struct work_struct *data) >>>>> +{ >>>>> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >>>>> + phy_rst_work); >>>>> + phy_reset(hsotg->phy); >>>>> +} >>>>> + >>>>> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>>> { >>>>> int i, ret; >>>>> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>>> return ret; >>>>> } >>>>> } >>>>> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >>>>> >>>>> if (!hsotg->phy) { >>>>> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >>>>> >>>> Hi Randy, >>>> >>>> This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need >>>> to make a fix to your phy_reset patch first. >>> In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been >>> merged, I though the >>> [PATCH v8 1/3] phy: Add reset callback for not generic phy have been >>> merged before that. when the rebase abandon it. >>> Should re-send that patch? As the mainline have not been affected, could >>> you arrange a squash for it? >> >> Hi Randy, >> >> Can you resend the fix to Kishon? >> >> The phy_reset patch landed in 4.9-rc so I think he should take the fix >> for the next -rc. After that we can send the dwc2 change through >> Felipe. >> >> Regards, >> John > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in rk3288 platform @ 2016-12-06 19:43 ` John Youn 0 siblings, 0 replies; 12+ messages in thread From: John Youn @ 2016-12-06 19:43 UTC (permalink / raw) To: Ayaka, John Youn Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA, kishon-l0cyMroinI0, felipe.balbi-VuQAYsv1563Yd54FQh9/CA, mark.rutland-5wv7dgnIgG8, devicetree-u79uwXL29TY76Z2rM5mHXA, heiko-4mtYJXux2i+zQB+pC5nmwQ, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r, linux-kernel-u79uwXL29TY76Z2rM5mHXA, robh+dt-DgEjT+Ai2ygdnm+yROfE0A, randy.li-TNX95d0MmH7DzftRWevZcw On 12/6/2016 4:00 AM, Ayaka wrote: > Hello John > I still waiting them be merged, but I still can't find it at next-20161206. > Can you resubmit this fixing the checkpatch issues? You can add my ack: Acked-by: John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> Regards, John > 從我的 iPad 傳送 > >> John Youn <John.Youn-HKixBCOQz3hWk0Htik3J/w@public.gmane.org> 於 2016年10月25日 上午9:30 寫道： >> >>> On 10/23/2016 2:33 AM, ayaka wrote: >>> >>> >>>> On 10/22/2016 03:27 AM, John Youn wrote: >>>>> On 10/20/2016 11:38 AM, Randy Li wrote: >>>>> On the rk3288 USB host-only port (the one that's not the OTG-enabled >>>>> port) the PHY can get into a bad state when a wakeup is asserted (not >>>>> just a wakeup from full system suspend but also a wakeup from >>>>> autosuspend). >>>>> >>>>> We can get the PHY out of its bad state by asserting its "port reset", >>>>> but unfortunately that seems to assert a reset onto the USB bus so it >>>>> could confuse things if we don't actually deenumerate / reenumerate the >>>>> device. >>>>> >>>>> We can also get the PHY out of its bad state by fully resetting it using >>>>> the reset from the CRU (clock reset unit) in chip, which does a more full >>>>> reset. The CRU-based reset appears to actually cause devices on the bus >>>>> to be removed and reinserted, which fixes the problem (albeit in a hacky >>>>> way). >>>>> >>>>> It's unfortunate that we need to do a full re-enumeration of devices at >>>>> wakeup time, but this is better than alternative of letting the bus get >>>>> wedged. >>>>> >>>>> Signed-off-by: Randy Li <ayaka-xPW3/0Ywev/iB9QmIjCX8w@public.gmane.org> >>>>> --- >>>>> drivers/usb/dwc2/core.h | 1 + >>>>> drivers/usb/dwc2/core_intr.c | 11 +++++++++++ >>>>> drivers/usb/dwc2/platform.c | 9 +++++++++ >>>>> 3 files changed, 21 insertions(+) >>>>> >>>>> diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h >>>>> index 2a21a04..e91ddbc 100644 >>>>> --- a/drivers/usb/dwc2/core.h >>>>> +++ b/drivers/usb/dwc2/core.h >>>>> @@ -859,6 +859,7 @@ struct dwc2_hsotg { >>>>> unsigned int ll_hw_enabled:1; >>>>> >>>>> struct phy *phy; >>>>> + struct work_struct phy_rst_work; >>>>> struct usb_phy *uphy; >>>>> struct dwc2_hsotg_plat *plat; >>>>> struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)]; >>>>> diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c >>>>> index d85c5c9..c3d2168 100644 >>>>> --- a/drivers/usb/dwc2/core_intr.c >>>>> +++ b/drivers/usb/dwc2/core_intr.c >>>>> @@ -345,6 +345,7 @@ static void dwc2_handle_session_req_intr(struct dwc2_hsotg *hsotg) >>>>> static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>>> { >>>>> int ret; >>>>> + struct device_node *np = hsotg->dev->of_node; >>>>> >>>>> /* Clear interrupt */ >>>>> dwc2_writel(GINTSTS_WKUPINT, hsotg->regs + GINTSTS); >>>>> @@ -379,6 +380,16 @@ static void dwc2_handle_wakeup_detected_intr(struct dwc2_hsotg *hsotg) >>>>> /* Restart the Phy Clock */ >>>>> pcgcctl &= ~PCGCTL_STOPPCLK; >>>>> dwc2_writel(pcgcctl, hsotg->regs + PCGCTL); >>>>> + >>>>> + /* >>>>> + * It is a quirk in Rockchip RK3288, causing by >>>>> + * a hardware bug. This will propagate out and >>>>> + * eventually we'll re-enumerate the device. >>>>> + * Not great but the best we can do >>>>> + */ >>>>> + if (of_device_is_compatible(np, "rockchip,rk3288-usb")) >>>>> + schedule_work(&hsotg->phy_rst_work); >>>>> + >>>>> mod_timer(&hsotg->wkp_timer, >>>>> jiffies + msecs_to_jiffies(71)); >>>>> } else { >>>>> diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c >>>>> index 8e1728b..65953cf 100644 >>>>> --- a/drivers/usb/dwc2/platform.c >>>>> +++ b/drivers/usb/dwc2/platform.c >>>>> @@ -366,6 +366,14 @@ int dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) >>>>> return ret; >>>>> } >>>>> >>>>> +/* Only used to reset usb phy at interrupter runtime */ >>>>> +static void dwc2_reset_phy_work(struct work_struct *data) >>>>> +{ >>>>> + struct dwc2_hsotg *hsotg = container_of(data, struct dwc2_hsotg, >>>>> + phy_rst_work); >>>>> + phy_reset(hsotg->phy); >>>>> +} >>>>> + >>>>> static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>>> { >>>>> int i, ret; >>>>> @@ -410,6 +418,7 @@ static int dwc2_lowlevel_hw_init(struct dwc2_hsotg *hsotg) >>>>> return ret; >>>>> } >>>>> } >>>>> + INIT_WORK(&hsotg->phy_rst_work, dwc2_reset_phy_work); >>>>> >>>>> if (!hsotg->phy) { >>>>> hsotg->uphy = devm_usb_get_phy(hsotg->dev, USB_PHY_TYPE_USB2); >>>>> >>>> Hi Randy, >>>> >>>> This fails compile if CONFIG_GENERIC_PHY is disabled. I think you need >>>> to make a fix to your phy_reset patch first. >>> In the last time, cac18ecb6f44b11bc303d7afbae3887b27938fa4 have not been >>> merged, I though the >>> [PATCH v8 1/3] phy: Add reset callback for not generic phy have been >>> merged before that. when the rebase abandon it. >>> Should re-send that patch? As the mainline have not been affected, could >>> you arrange a squash for it? >> >> Hi Randy, >> >> Can you resend the fix to Kishon? >> >> The phy_reset patch landed in 4.9-rc so I think he should take the fix >> for the next -rc. After that we can send the dwc2 change through >> Felipe. >> >> Regards, >> John > > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v9 2/2] ARM: dts: rockchip: Point rk3288 dwc2 usb at the full PHY reset 2016-10-20 18:37 [PATCH v9 0/2] the fixup for the USB HOST1 at rk3288 platform Randy Li 2016-10-20 18:37 ` Randy Li @ 2016-10-20 18:37 ` Randy Li 1 sibling, 0 replies; 12+ messages in thread From: Randy Li @ 2016-10-20 18:37 UTC (permalink / raw) To: linux-usb Cc: John.Youn, kishon, felipe.balbi, mark.rutland, devicetree, heiko, gregkh, linux-kernel, robh+dt, randy.li, Randy Li The "host1" port (AKA the dwc2 port that isn't the OTG port) on rk3288 has a hardware errata that causes everything to get confused when we get a remote wakeup. We'll use the reset that's in the CRU to reset the port when it's in a bad state. Note that we add the reset to both dwc2 controllers even though only one has the errata in case we find some other use for this reset that's unrelated to the current hardware errata. Only the host port gets the quirk property, though. Signed-off-by: Randy Li <ayaka@soulik.info> --- arch/arm/boot/dts/rk3288.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 2f814ff..4ef058c 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -859,6 +859,8 @@ clocks = <&cru SCLK_OTGPHY0>; clock-names = "phyclk"; #clock-cells = <0>; + resets = <&cru SRST_USBOTG_PHY>; + reset-names = "phy-reset"; }; usbphy1: usb-phy@334 { @@ -875,6 +877,8 @@ clocks = <&cru SCLK_OTGPHY2>; clock-names = "phyclk"; #clock-cells = <0>; + resets = <&cru SRST_USBHOST1_PHY>; + reset-names = "phy-reset"; }; }; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-12-06 19:43 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-10-20 18:37 [PATCH v9 0/2] the fixup for the USB HOST1 at rk3288 platform Randy Li 2016-10-20 18:37 ` [PATCH v9 1/2] usb: dwc2: assert phy reset when waking up in " Randy Li 2016-10-20 18:37 ` Randy Li 2016-10-21 19:27 ` John Youn 2016-10-23 9:33 ` ayaka 2016-10-23 9:33 ` ayaka 2016-10-25 1:30 ` John Youn 2016-12-06 12:00 ` Ayaka 2016-12-06 12:00 ` Ayaka 2016-12-06 19:43 ` John Youn 2016-12-06 19:43 ` John Youn 2016-10-20 18:37 ` [PATCH v9 2/2] ARM: dts: rockchip: Point rk3288 dwc2 usb at the full PHY reset Randy Li
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.