Re: [PATCH v4 4/4] USB: pci-quirks: Add Raspberry Pi 4 quirk

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello!

On 06.03.2020 14:43, Nicolas Saenz Julienne wrote:

On the Raspberry Pi 4, after a PCI reset, VL805's firmware may either be
loaded directly from an EEPROM or, if not present, by the SoC's
VideCore. Inform VideCore that VL805 was just reset.

Also, as this creates a dependency between XHCI_PCI and VideoCore's
firmware interface, reflect that on the firmware interface Kconfg.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@xxxxxxx>
---

Changes since v3:
  - Add more complete error message.
  - Add braces around if statement

Changes since v1:
  - Make RASPBERRYPI_FIRMWARE dependent on this quirk to make sure it
    gets compiled when needed.

  drivers/firmware/Kconfig      |  1 +
  drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
  2 files changed, 17 insertions(+)
[...]
diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
index beb2efa71341..452f5f12b042 100644
--- a/drivers/usb/host/pci-quirks.c
+++ b/drivers/usb/host/pci-quirks.c
@@ -16,6 +16,9 @@
  #include <linux/export.h>
  #include <linux/acpi.h>
  #include <linux/dmi.h>
+
+#include <soc/bcm2835/raspberrypi-firmware.h>
+
  #include "pci-quirks.h"
  #include "xhci-ext-caps.h"
@@ -1243,11 +1246,24 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) static void quirk_usb_early_handoff(struct pci_dev *pdev)
  {
+	int ret;
+
  	/* 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;
+
+	if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
+		ret = rpi_firmware_init_vl805(pdev);
+		if (ret) {
+			/* Firmware might be outdated, or something failed */
+			dev_warn(&pdev->dev, "Failed to load VL805's firmware: %d\n", ret);
+			dev_warn(&pdev->dev, "Will continue to attempt to work, "
+				 "but bad things might happen. You should fix this...\n");

Don't break up the long kernel messages (checkpatch.pl should not complain about them).

[...]

MBR, Sergei



[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux