From 717ee5c2e97593f955a26652602421f230a23fd8 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 4 Feb 2020 12:30:14 +0000 Subject: fix for firmware recovery on certain RPi4 HW revs --- kernel.spec | 2 + ...xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch | 91 ++++++++++++++++++++++ 2 files changed, 93 insertions(+) create mode 100644 usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch diff --git a/kernel.spec b/kernel.spec index ae4a7ca60..1716bb1e0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -826,6 +826,8 @@ Patch311: ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch Patch312: bcm283x-gpu-drm-v3d-Add-ARCH_BCM2835-to-DRM_V3D-Kconfig.patch # https://patchwork.kernel.org/cover/11353083/ Patch313: arm64-pinctrl-bcm2835-Add-support-for-all-BCM2711-GPIOs.patch +# https://github.com/raspberrypi/linux/commit/c74b1b53254016fd83b580b8d49bb02d72ce4836 +Patch314: usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch # Tegra bits Patch320: arm64-tegra-jetson-tx1-fixes.patch diff --git a/usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch b/usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch new file mode 100644 index 000000000..7bf875c6d --- /dev/null +++ b/usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch @@ -0,0 +1,91 @@ +From eb05efbfe58a7815957844e6dbe28735e85393cf Mon Sep 17 00:00:00 2001 +From: Tim Gover <990920+timg236@users.noreply.github.com> +Date: Wed, 15 Jan 2020 11:26:19 +0000 +Subject: [PATCH] usb: xhci: Raspberry Pi FW loader for VIA VL805 + +The VL805 FW may either be loaded from an SPI EEPROM or alternatively +loaded directly by the VideoCore firmware. A PCI reset will reset +the VL805 XHCI controller on the Raspberry Pi4 requiring the firmware +to be reloaded if an SPI EEPROM is not present. + +Use a VideoCore mailbox to trigger the loading of the VL805 +firmware (if necessary) after a PCI reset. + +Signed-off-by: Tim Gover +--- + drivers/usb/host/pci-quirks.c | 31 +++++++++++++++++++++- + include/soc/bcm2835/raspberrypi-firmware.h | 2 +- + 2 files changed, 31 insertions(+), 2 deletions(-) + +diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c +index 6c7f0a876b96..c3367b053044 100644 +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -18,7 +18,7 @@ + #include + #include "pci-quirks.h" + #include "xhci-ext-caps.h" +- ++#include + + #define UHCI_USBLEGSUP 0xc0 /* legacy support */ + #define UHCI_USBCMD 0 /* command register */ +@@ -630,6 +630,32 @@ bool usb_amd_pt_check_port(struct device *device, int port) + } + EXPORT_SYMBOL_GPL(usb_amd_pt_check_port); + ++/* The VL805 firmware may either be loaded from an EEPROM or by the BIOS into ++ * memory. If run from memory it must be reloaded after a PCI fundmental reset. ++ * The Raspberry Pi firmware acts as the BIOS in this case. ++ */ ++static void usb_vl805_init(struct pci_dev *pdev) ++{ ++#if IS_ENABLED(CONFIG_RASPBERRYPI_FIRMWARE) ++ struct rpi_firmware *fw; ++ struct { ++ u32 dev_addr; ++ } packet; ++ int ret; ++ ++ fw = rpi_firmware_get(NULL); ++ if (!fw) ++ return; ++ ++ packet.dev_addr = (pdev->bus->number << 20) | ++ (PCI_SLOT(pdev->devfn) << 15) | (PCI_FUNC(pdev->devfn) << 12); ++ ++ dev_dbg(&pdev->dev, "RPI_FIRMWARE_NOTIFY_XHCI_RESET %x", packet.dev_addr); ++ ret = rpi_firmware_property(fw, RPI_FIRMWARE_NOTIFY_XHCI_RESET, ++ &packet, sizeof(packet)); ++#endif ++} ++ + /* + * Make sure the controller is completely inactive, unable to + * generate interrupts or do DMA. +@@ -1207,6 +1233,9 @@ static void quirk_usb_handoff_xhci(struct pci_dev *pdev) + if (pdev->vendor == PCI_VENDOR_ID_INTEL) + usb_enable_intel_xhci_ports(pdev); + ++ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) ++ usb_vl805_init(pdev); ++ + op_reg_base = base + XHCI_HC_LENGTH(readl(base)); + + /* Wait for the host controller to be ready before writing any +diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h +index 7800e12ee042..cc9cdbc66403 100644 +--- a/include/soc/bcm2835/raspberrypi-firmware.h ++++ b/include/soc/bcm2835/raspberrypi-firmware.h +@@ -90,7 +90,7 @@ enum rpi_firmware_property_tag { + RPI_FIRMWARE_SET_PERIPH_REG = 0x00038045, + RPI_FIRMWARE_GET_POE_HAT_VAL = 0x00030049, + RPI_FIRMWARE_SET_POE_HAT_VAL = 0x00030050, +- ++ RPI_FIRMWARE_NOTIFY_XHCI_RESET = 0x00030058, + + /* Dispmanx TAGS */ + RPI_FIRMWARE_FRAMEBUFFER_ALLOCATE = 0x00040001, +-- +2.24.1 + -- cgit From 438e701b23e98287d917ac9a8d824630e40ebc70 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 4 Feb 2020 11:21:27 -0600 Subject: Enable CONFIG_CAN_UCAN as a module --- configs/fedora/generic/CONFIG_CAN_UCAN | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/fedora/generic/CONFIG_CAN_UCAN b/configs/fedora/generic/CONFIG_CAN_UCAN index ec2185e3a..80c32eda8 100644 --- a/configs/fedora/generic/CONFIG_CAN_UCAN +++ b/configs/fedora/generic/CONFIG_CAN_UCAN @@ -1 +1 @@ -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 5bc7a715b..c681f3f10 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -836,7 +836,7 @@ CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 08366d190..e2bc69d20 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -836,7 +836,7 @@ CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 505e98d6c..e1e621c5f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -843,7 +843,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m # CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 4cd667f57..9f73cf01b 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -843,7 +843,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m # CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 135da760a..226f63be3 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -821,7 +821,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m # CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 0df618da6..a37946c7c 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -821,7 +821,7 @@ CONFIG_CAN_SLCAN=m CONFIG_CAN_SOFTING=m CONFIG_CAN_SUN4I=m # CONFIG_CAN_TI_HECC is not set -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAN_XILINXCAN=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 6e4799561..042328859 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -678,7 +678,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 30da20b1a..17df9d882 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -677,7 +677,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index b91d4b399..3b2aac398 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -615,7 +615,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 0700e9cc6..6e393a711 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -614,7 +614,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index ce7278908..f4ef8e9a7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -618,7 +618,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index ad17f09f9..35de780b8 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -617,7 +617,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 0cd38f7ed..f820243ec 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -686,7 +686,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 289d38d7d..775e76815 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -685,7 +685,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_SLCAN=m # CONFIG_CAN_SOFTING_CS is not set CONFIG_CAN_SOFTING=m -# CONFIG_CAN_UCAN is not set +CONFIG_CAN_UCAN=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m CONFIG_CAPI_AVM=y -- cgit