From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: f.fainelli@gmail.com, gregkh@linuxfoundation.org,
wahrenst@gmx.net, p.zabel@pengutronix.de,
linux-kernel@vger.kernel.org,
Mathias Nyman <mathias.nyman@intel.com>
Cc: linux-usb@vger.kernel.org, linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
bcm-kernel-feedback-list@broadcom.com, tim.gover@raspberrypi.org,
linux-pci@vger.kernel.org, helgaas@kernel.org,
andy.shevchenko@gmail.com, mathias.nyman@linux.intel.com,
lorenzo.pieralisi@arm.com,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH v3 7/9] usb: host: pci-quirks: Bypass xHCI quirks for Raspberry Pi 4
Date: Fri, 12 Jun 2020 19:13:31 +0200 [thread overview]
Message-ID: <20200612171334.26385-8-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200612171334.26385-1-nsaenzjulienne@suse.de>
The board doesn't need the quirks to be run, and takes care of its own
initialization through a reset controller device. So let's bypass them.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
Changes since v2:
- Correct reference counting on parent device node
- Correct typos
Changes since v1:
- Correct typos
drivers/usb/host/pci-quirks.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index 92150ecdb036..977d0b6d7577 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -16,6 +16,8 @@
#include <linux/export.h>
#include <linux/acpi.h>
#include <linux/dmi.h>
+#include <linux/of.h>
+
#include "pci-quirks.h"
#include "xhci-ext-caps.h"
@@ -1243,11 +1245,27 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
static void quirk_usb_early_handoff(struct pci_dev *pdev)
{
+ struct device_node *parent;
+ bool is_rpi;
+
/* Skip Netlogic mips SoC's internal PCI USB controller.
* This device does not need/support EHCI/OHCI handoff
*/
if (pdev->vendor == 0x184e) /* vendor Netlogic */
return;
+
+ /*
+ * Bypass the Raspberry Pi 4 controller xHCI controller, things are
+ * taken care of by the board's co-processor.
+ */
+ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
+ parent = of_get_parent(pdev->bus->dev.of_node);
+ is_rpi = of_device_is_compatible(parent, "brcm,bcm2711-pcie");
+ of_node_put(parent);
+ if (is_rpi)
+ return;
+ }
+
if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
--
2.26.2
next prev parent reply other threads:[~2020-06-12 17:14 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-12 17:13 [PATCH v3 0/9] Raspberry Pi 4 USB firmware initialization rework Nicolas Saenz Julienne
2020-06-12 17:13 ` [PATCH v3 1/9] dt-bindings: reset: Add a binding for the RPi Firmware reset controller Nicolas Saenz Julienne
2020-06-17 9:55 ` Philipp Zabel
2020-06-17 10:22 ` Nicolas Saenz Julienne
2020-07-13 18:23 ` Rob Herring
2020-07-14 11:59 ` Nicolas Saenz Julienne
2020-07-14 21:07 ` Rob Herring
2020-07-14 21:17 ` Florian Fainelli
2020-07-14 23:18 ` Rob Herring
2020-06-12 17:13 ` [PATCH v3 2/9] reset: Add Raspberry Pi 4 firmware " Nicolas Saenz Julienne
2020-06-17 10:02 ` Philipp Zabel
2020-06-17 10:44 ` Nicolas Saenz Julienne
2020-06-26 10:43 ` Philipp Zabel
2020-06-29 15:19 ` Nicolas Saenz Julienne
2020-06-12 17:13 ` [PATCH v3 3/9] ARM: dts: bcm2711: Add firmware usb reset node Nicolas Saenz Julienne
2020-06-12 17:13 ` [PATCH v3 4/9] ARM: dts: bcm2711: Add reset controller to xHCI node Nicolas Saenz Julienne
2020-06-17 19:21 ` Nicolas Saenz Julienne
2020-06-12 17:13 ` [PATCH v3 5/9] usb: xhci-pci: Add support for reset controllers Nicolas Saenz Julienne
2020-06-12 17:24 ` Florian Fainelli
2020-06-15 7:29 ` Mathias Nyman
2020-06-17 10:02 ` Philipp Zabel
2020-06-12 17:13 ` [PATCH v3 6/9] Revert "USB: pci-quirks: Add Raspberry Pi 4 quirk" Nicolas Saenz Julienne
2020-06-12 17:13 ` Nicolas Saenz Julienne [this message]
2020-06-12 17:13 ` [PATCH v3 8/9] Revert "firmware: raspberrypi: Introduce vl805 init routine" Nicolas Saenz Julienne
2020-06-12 17:13 ` [PATCH v3 9/9] Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present" Nicolas Saenz Julienne
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=20200612171334.26385-8-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=andy.shevchenko@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=helgaas@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mathias.nyman@intel.com \
--cc=mathias.nyman@linux.intel.com \
--cc=p.zabel@pengutronix.de \
--cc=tim.gover@raspberrypi.org \
--cc=wahrenst@gmx.net \
/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).