* [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck
@ 2020-01-23 12:07 Yoshihiro Shimoda
2020-01-23 13:34 ` Geert Uytterhoeven
0 siblings, 1 reply; 4+ messages in thread
From: Yoshihiro Shimoda @ 2020-01-23 12:07 UTC (permalink / raw)
To: gregkh, stern, linux, robh+dt, mark.rutland
Cc: linux-usb, linux-renesas-soc, Yoshihiro Shimoda
Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to
be getting stuck very rarely after a full/low usb device was
disconnected. To detect/recover from such a situation, the controllers
require a special way which poll the EHCI PORTSC register and changes
the OHCI functional state.
So, this patch adds a polling timer into the ehci-platform driver,
and if the ehci driver detects the issue by the EHCI PORTSC register,
the ehci driver removes a companion device (= the OHCI controller)
to change the OHCI functional state to USB Reset once. And then,
the ehci driver adds the companion device again.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
Changes from v1:
- Remove adding a new property into the generic-ehci.yaml.
- Add kerneldoc sections.
- Remove prefix "ehci_platform_" from function names.
- Rename quirk_poll_check_condition() with quirk_poll_check_port_status().
- Fix some coding style.
- Remove "start_timer" function and use HZ on mod_timer().
- Use delayed_work instead of usleep_range().
https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=229861
drivers/usb/host/ehci-platform.c | 133 +++++++++++++++++++++++++++++++++++++++
include/linux/usb/ehci_def.h | 1 +
2 files changed, 134 insertions(+)
diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 769749c..212f16f 100644
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -29,6 +29,8 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
+#include <linux/sys_soc.h>
+#include <linux/timer.h>
#include <linux/usb.h>
#include <linux/usb/hcd.h>
#include <linux/usb/ehci_pdriver.h>
@@ -44,6 +46,9 @@ struct ehci_platform_priv {
struct clk *clks[EHCI_MAX_CLKS];
struct reset_control *rsts;
bool reset_on_resume;
+ bool quirk_poll;
+ struct timer_list poll_timer;
+ struct delayed_work poll_work;
};
static const char hcd_name[] = "ehci-platform";
@@ -118,6 +123,117 @@ static struct usb_ehci_pdata ehci_platform_defaults = {
.power_off = ehci_platform_power_off,
};
+/**
+ * quirk_poll_check_port_status - Poll port_status if the device sticks
+ * @ehci: the ehci hcd pointer
+ *
+ * Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to be getting
+ * stuck very rarely after a full/low usb device was disconnected. To
+ * detect such a situation, the controllers require a special way which poll
+ * the EHCI PORTSC register.
+ *
+ * Return: true if the controller's port_status indicated getting stuck
+ */
+static bool quirk_poll_check_port_status(struct ehci_hcd *ehci)
+{
+ u32 port_status = ehci_readl(ehci, &ehci->regs->port_status[0]);
+
+ if (!(port_status & PORT_OWNER) &&
+ (port_status & PORT_POWER) &&
+ !(port_status & PORT_CONNECT) &&
+ (port_status & PORT_LS_MASK))
+ return true;
+
+ return false;
+}
+
+/**
+ * quirk_poll_rebind_companion - rebind comanion device to recover
+ * @ehci: the ehci hcd pointer
+ *
+ * Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to be getting
+ * stuck very rarely after a full/low usb device was disconnected. To
+ * recover from such a situation, the controllers require changing the OHCI
+ * functional state.
+ */
+static void quirk_poll_rebind_companion(struct ehci_hcd *ehci)
+{
+ struct device *companion_dev;
+ struct usb_hcd *hcd = ehci_to_hcd(ehci);
+
+ companion_dev = usb_of_get_companion_dev(hcd->self.controller);
+ if (!companion_dev)
+ return;
+
+ device_release_driver(companion_dev);
+ if (device_attach(companion_dev) < 0)
+ ehci_err(ehci, "%s: failed\n", __func__);
+
+ put_device(companion_dev);
+}
+
+static void quirk_poll_work(struct work_struct *work)
+{
+ struct ehci_platform_priv *priv =
+ container_of(to_delayed_work(work), struct ehci_platform_priv,
+ poll_work);
+ struct ehci_hcd *ehci = container_of((void *)priv, struct ehci_hcd,
+ priv);
+
+ /* check the status twice to reduce misdetection rate */
+ if (!quirk_poll_check_port_status(ehci))
+ return;
+ udelay(10);
+ if (!quirk_poll_check_port_status(ehci))
+ return;
+
+ ehci_dbg(ehci, "%s: detected getting stuck. rebind now!\n", __func__);
+ quirk_poll_rebind_companion(ehci);
+}
+
+static void quirk_poll_timer(struct timer_list *t)
+{
+ struct ehci_platform_priv *priv = from_timer(priv, t, poll_timer);
+ struct ehci_hcd *ehci = container_of((void *)priv, struct ehci_hcd,
+ priv);
+
+ if (quirk_poll_check_port_status(ehci)) {
+ /*
+ * Now scheduling the work for testing the port more. Note that
+ * updating the status is possible to be delayed when
+ * reconnection. So, this uses delayed work with 5 ms delay
+ * to avoid misdetection.
+ */
+ schedule_delayed_work(&priv->poll_work, msecs_to_jiffies(5));
+ }
+
+ mod_timer(&priv->poll_timer, jiffies + HZ);
+}
+
+static void quirk_poll_init(struct ehci_platform_priv *priv)
+{
+ INIT_DELAYED_WORK(&priv->poll_work, quirk_poll_work);
+ timer_setup(&priv->poll_timer, quirk_poll_timer, 0);
+ mod_timer(&priv->poll_timer, jiffies + HZ);
+}
+
+static void quirk_poll_end(struct ehci_platform_priv *priv)
+{
+ del_timer_sync(&priv->poll_timer);
+ cancel_delayed_work(&priv->poll_work);
+}
+
+static const struct soc_device_attribute quirk_poll_match[] = {
+ { .soc_id = "r8a7795" },
+ { .soc_id = "r8a77951" },
+ { .soc_id = "r8a7796" },
+ { .soc_id = "r8a77961" },
+ { .soc_id = "r8a77965" },
+ { .soc_id = "r8a77990" },
+ { .soc_id = "r8a77995" },
+ { /* sentinel*/ }
+};
+
static int ehci_platform_probe(struct platform_device *dev)
{
struct usb_hcd *hcd;
@@ -176,6 +292,9 @@ static int ehci_platform_probe(struct platform_device *dev)
"has-transaction-translator"))
hcd->has_tt = 1;
+ if (soc_device_match(quirk_poll_match))
+ priv->quirk_poll = true;
+
for (clk = 0; clk < EHCI_MAX_CLKS; clk++) {
priv->clks[clk] = of_clk_get(dev->dev.of_node, clk);
if (IS_ERR(priv->clks[clk])) {
@@ -247,6 +366,9 @@ static int ehci_platform_probe(struct platform_device *dev)
device_enable_async_suspend(hcd->self.controller);
platform_set_drvdata(dev, hcd);
+ if (priv->quirk_poll)
+ quirk_poll_init(priv);
+
return err;
err_power:
@@ -273,6 +395,9 @@ static int ehci_platform_remove(struct platform_device *dev)
struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
int clk;
+ if (priv->quirk_poll)
+ quirk_poll_end(priv);
+
usb_remove_hcd(hcd);
if (pdata->power_off)
@@ -297,9 +422,13 @@ static int ehci_platform_suspend(struct device *dev)
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct usb_ehci_pdata *pdata = dev_get_platdata(dev);
struct platform_device *pdev = to_platform_device(dev);
+ struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd);
bool do_wakeup = device_may_wakeup(dev);
int ret;
+ if (priv->quirk_poll)
+ quirk_poll_end(priv);
+
ret = ehci_suspend(hcd, do_wakeup);
if (ret)
return ret;
@@ -331,6 +460,10 @@ static int ehci_platform_resume(struct device *dev)
}
ehci_resume(hcd, priv->reset_on_resume);
+
+ if (priv->quirk_poll)
+ quirk_poll_init(priv);
+
return 0;
}
#endif /* CONFIG_PM_SLEEP */
diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h
index a15ce99..0ebfa74 100644
--- a/include/linux/usb/ehci_def.h
+++ b/include/linux/usb/ehci_def.h
@@ -150,6 +150,7 @@ struct ehci_regs {
#define PORT_LED_MASK (3<<14)
#define PORT_OWNER (1<<13) /* true: companion hc owns this port */
#define PORT_POWER (1<<12) /* true: has power (see PPC) */
+#define PORT_LS_MASK (3<<10) /* USB 1.1 device */
#define PORT_USB11(x) (((x)&(3<<10)) == (1<<10)) /* USB 1.1 device */
/* 11:10 for detecting lowspeed devices (reset vs release ownership) */
/* 9 reserved */
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck
2020-01-23 12:07 [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck Yoshihiro Shimoda
@ 2020-01-23 13:34 ` Geert Uytterhoeven
2020-01-24 4:12 ` Yoshihiro Shimoda
0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2020-01-23 13:34 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: Greg KH, Alan Stern, Tony Prisk, Rob Herring, Mark Rutland,
USB list, Linux-Renesas
Hi Shimoda-san,
On Thu, Jan 23, 2020 at 1:08 PM Yoshihiro Shimoda
<yoshihiro.shimoda.uh@renesas.com> wrote:
> Since EHCI/OHCI controllers on R-Car Gen3 SoCs are possible to
> be getting stuck very rarely after a full/low usb device was
> disconnected. To detect/recover from such a situation, the controllers
> require a special way which poll the EHCI PORTSC register and changes
> the OHCI functional state.
>
> So, this patch adds a polling timer into the ehci-platform driver,
> and if the ehci driver detects the issue by the EHCI PORTSC register,
> the ehci driver removes a companion device (= the OHCI controller)
> to change the OHCI functional state to USB Reset once. And then,
> the ehci driver adds the companion device again.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Thanks for your patch!
> --- a/drivers/usb/host/ehci-platform.c
> +++ b/drivers/usb/host/ehci-platform.c
> +static const struct soc_device_attribute quirk_poll_match[] = {
> + { .soc_id = "r8a7795" },
> + { .soc_id = "r8a77951" },
As .soc_id is derived from the main compatible value, it is "r8a7795" for both
R-Car H3 ES1.x (R8A77950) and ES2.0+ (R8A77951).
> + { .soc_id = "r8a7796" },
> + { .soc_id = "r8a77961" },
> + { .soc_id = "r8a77965" },
> + { .soc_id = "r8a77990" },
> + { .soc_id = "r8a77995" },
Instead of matching on .soc_id, you can also match on .family = "R-Car Gen3"
(until we discover a future family member that is not affected?).
I guess this affects RZ/G2, too? .family = "RZ/G2".
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck
2020-01-23 13:34 ` Geert Uytterhoeven
@ 2020-01-24 4:12 ` Yoshihiro Shimoda
2020-01-24 4:16 ` Yoshihiro Shimoda
0 siblings, 1 reply; 4+ messages in thread
From: Yoshihiro Shimoda @ 2020-01-24 4:12 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Greg KH, Alan Stern, Tony Prisk, Rob Herring, Mark Rutland,
USB list, Linux-Renesas
Hi Geert-san,
Thank you for your review!
> From: Geert Uytterhoeven, Sent: Thursday, January 23, 2020 10:34 PM
<snip>
> > --- a/drivers/usb/host/ehci-platform.c
> > +++ b/drivers/usb/host/ehci-platform.c
>
> > +static const struct soc_device_attribute quirk_poll_match[] = {
> > + { .soc_id = "r8a7795" },
> > + { .soc_id = "r8a77951" },
>
> As .soc_id is derived from the main compatible value, it is "r8a7795" for both
> R-Car H3 ES1.x (R8A77950) and ES2.0+ (R8A77951).
Oh, I got it.
> > + { .soc_id = "r8a7796" },
> > + { .soc_id = "r8a77961" },
> > + { .soc_id = "r8a77965" },
> > + { .soc_id = "r8a77990" },
> > + { .soc_id = "r8a77995" },
>
> Instead of matching on .soc_id, you can also match on .family = "R-Car Gen3"
> (until we discover a future family member that is not affected?).
Thank you for this suggestion. I'll use such a .family (until then).
> I guess this affects RZ/G2, too? .family = "RZ/G2".
I think so. So, I'll add "RZ/G2" on v3 patch.
Best regards,
Yoshihiro Shimoda
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck
2020-01-24 4:12 ` Yoshihiro Shimoda
@ 2020-01-24 4:16 ` Yoshihiro Shimoda
0 siblings, 0 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2020-01-24 4:16 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Greg KH, Alan Stern, Tony Prisk, Rob Herring, Mark Rutland,
USB list, Linux-Renesas
Hi Geert-san again,
> From: Yoshihiro Shimoda, Sent: Friday, January 24, 2020 1:13 PM
<snip>
> > I guess this affects RZ/G2, too? .family = "RZ/G2".
>
> I think so. So, I'll add "RZ/G2" on v3 patch.
Sorry, I'm asking hardware team whether "RZ/G2" family should be affected or not.
So, I'd like to add this as incremental patch if needed.
Best regards,
Yoshihiro Shimoda
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-24 4:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 12:07 [PATCH v2] usb: host: ehci-platform: add a quirk to avoid stuck Yoshihiro Shimoda
2020-01-23 13:34 ` Geert Uytterhoeven
2020-01-24 4:12 ` Yoshihiro Shimoda
2020-01-24 4:16 ` Yoshihiro Shimoda
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.