From: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
To: gregkh@linuxfoundation.org, robh+dt@kernel.org,
stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Hamish Martin <hamish.martin@alliedtelesis.co.nz>
Subject: [PATCH 1/2] usb: ohci: Add per-port overcurrent quirk
Date: Fri, 4 Sep 2020 15:22:46 +1200 [thread overview]
Message-ID: <20200904032247.11345-2-hamish.martin@alliedtelesis.co.nz> (raw)
In-Reply-To: <20200904032247.11345-1-hamish.martin@alliedtelesis.co.nz>
Some integrated OHCI controller hubs do not expose all ports of the hub
to pins on the SoC. In some cases the unconnected ports generate
spurious overcurrent events. For example the Broadcom 56060/Ranger 2 SoC
contains a nominally 3 port hub but only the first port is wired.
Default behaviour for ohci-platform driver is to use "ganged"
overcurrent protection mode. This leads to the spurious overcurrent
events affecting all ports in the hub.
Allow this to be rectified by specifying per-port overcurrent protection
mode via the device tree.
Signed-off-by: Hamish Martin <hamish.martin@alliedtelesis.co.nz>
---
drivers/usb/host/ohci-hcd.c | 4 ++++
drivers/usb/host/ohci-platform.c | 3 +++
drivers/usb/host/ohci.h | 1 +
3 files changed, 8 insertions(+)
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index dd37e77dae00..01e3d75e29d9 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -687,6 +687,10 @@ static int ohci_run (struct ohci_hcd *ohci)
val |= RH_A_NPS;
ohci_writel (ohci, val, &ohci->regs->roothub.a);
}
+ if (ohci->flags & OHCI_QUIRK_PER_PORT_OC) {
+ val |= RH_A_OCPM;
+ ohci_writel(ohci, val, &ohci->regs->roothub.a);
+ }
ohci_writel (ohci, RH_HS_LPSC, &ohci->regs->roothub.status);
ohci_writel (ohci, (val & RH_A_NPS) ? 0 : RH_B_PPCM,
&ohci->regs->roothub.b);
diff --git a/drivers/usb/host/ohci-platform.c b/drivers/usb/host/ohci-platform.c
index 4a8456f12a73..45e69ce4ef86 100644
--- a/drivers/usb/host/ohci-platform.c
+++ b/drivers/usb/host/ohci-platform.c
@@ -137,6 +137,9 @@ static int ohci_platform_probe(struct platform_device *dev)
if (of_property_read_bool(dev->dev.of_node, "no-big-frame-no"))
ohci->flags |= OHCI_QUIRK_FRAME_NO;
+ if (of_property_read_bool(dev->dev.of_node, "per-port-overcurrent"))
+ ohci->flags |= OHCI_QUIRK_PER_PORT_OC;
+
if (of_property_read_bool(dev->dev.of_node,
"remote-wakeup-connected"))
ohci->hc_control = OHCI_CTRL_RWC;
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index aac6285b37f8..9c2bc816246c 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -422,6 +422,7 @@ struct ohci_hcd {
#define OHCI_QUIRK_AMD_PREFETCH 0x400 /* pre-fetch for ISO transfer */
#define OHCI_QUIRK_GLOBAL_SUSPEND 0x800 /* must suspend ports */
#define OHCI_QUIRK_QEMU 0x1000 /* relax timing expectations */
+#define OHCI_QUIRK_PER_PORT_OC 0x2000 /* per-port overcurrent protection */
// there are also chip quirks/bugs in init logic
--
2.28.0
next prev parent reply other threads:[~2020-09-04 3:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-04 3:22 [PATCH 0/2] usb: ohci: Per-port overcurrent protection Hamish Martin
2020-09-04 3:22 ` Hamish Martin [this message]
2020-09-04 15:45 ` [PATCH 1/2] usb: ohci: Add per-port overcurrent quirk Alan Stern
2020-09-07 1:50 ` Hamish Martin
2020-09-07 14:59 ` stern
2020-09-07 22:28 ` Hamish Martin
2020-09-08 14:32 ` stern
2020-09-04 3:22 ` [PATCH 2/2] dt-bindings: usb: generic-ohci: Document per-port-overcurrent property Hamish Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200904032247.11345-2-hamish.martin@alliedtelesis.co.nz \
--to=hamish.martin@alliedtelesis.co.nz \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).