On Tue, May 05, 2020 at 06:13:17PM +0200, 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
> 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.
>
> Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@xxxxxxx>
> ---
>
> Changes since v5:
> - Fix Kconfig issue with allmodconfig
>
> Changes since v4:
> - Do not split up error message
>
> Changes since v3:
> - Add more complete error message
>
> Changes since v1:
> - Make RASPBERRYPI_FIRMWARE dependent on this quirk to make sure it
> gets compiled when needed.
>
> drivers/firmware/Kconfig | 3 ++-
> drivers/usb/host/pci-quirks.c | 16 ++++++++++++++++
> 2 files changed, 18 insertions(+), 1 deletion(-)
Hi Mathias,
I would need your ACK to merge this series, thanks.
Lorenzo
> diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
> index 8007d4aa76dc..b42140cff8ac 100644
> --- a/drivers/firmware/Kconfig
> +++ b/drivers/firmware/Kconfig
> @@ -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.
> diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
> index 92150ecdb036..0b949acfa258 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. 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 &&
> --
> 2.26.2
>
