Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 05:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

USB: pci-quirks: Add Raspberry Pi 4 quirk

Browse Source 
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
VideoCore. Inform VideoCore that VL805 was just reset.

Also, as this creates a dependency between USB_PCI and VideoCore's
firmware interface, and since USB_PCI can't be set as a module neither
this can. Reflect that on the firmware interface Kconfg.

Link: https://lore.kernel.org/r/20200505161318.26200-5-nsaenzjulienne@suse.de
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
This commit is contained in:
Nicolas Saenz Julienne 2020-05-05 18:13:17 +02:00 committed by Lorenzo Pieralisi
parent 44331189f9
commit c65822fef4
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/firmware/Kconfig
View File

@ -178,8 +178,9 @@ config ISCSI_IBFT
Otherwise, say N. Otherwise, say N.
config RASPBERRYPI_FIRMWARE config RASPBERRYPI_FIRMWARE
tristate "Raspberry Pi Firmware Driver" bool "Raspberry Pi Firmware Driver"
depends on BCM2835_MBOX depends on BCM2835_MBOX
default USB_PCI
help help
This option enables support for communicating with the firmware on the This option enables support for communicating with the firmware on the
Raspberry Pi. Raspberry Pi.

16
drivers/usb/host/pci-quirks.c
View File

@ -16,6 +16,9 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <soc/bcm2835/raspberrypi-firmware.h>
#include "pci-quirks.h" #include "pci-quirks.h"
#include "xhci-ext-caps.h" #include "xhci-ext-caps.h"
@ -1243,11 +1246,24 @@ iounmap:
static void quirk_usb_early_handoff(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. /* Skip Netlogic mips SoC's internal PCI USB controller.
* This device does not need/support EHCI/OHCI handoff * This device does not need/support EHCI/OHCI handoff
*/ */
if (pdev->vendor == 0x184e) /* vendor Netlogic */ if (pdev->vendor == 0x184e) /* vendor Netlogic */
return; 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. Will continue to attempt to work, but bad things might happen. You should fix this...\n",
ret);
}
}
if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI && if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_OHCI && pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
pdev->class != PCI_CLASS_SERIAL_USB_EHCI && pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&