Commit c65822fe authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Lorenzo Pieralisi
Browse files

USB: pci-quirks: Add Raspberry Pi 4 quirk 

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: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
parent 44331189

drivers/firmware/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -178,8 +178,9 @@ config ISCSI_IBFT 
	  Otherwise, say N.



config RASPBERRYPI_FIRMWARE

	tristate "Raspberry Pi Firmware Driver"

	bool "Raspberry Pi Firmware Driver"

	depends on BCM2835_MBOX

	default USB_PCI

	help

	  This option enables support for communicating with the firmware on the

	  Raspberry Pi.

drivers/usb/host/pci-quirks.c

+16 −0
Original line number Diff line number Diff line
@@ -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 @@ iounmap: 


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. 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 &&

			pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&

			pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE