summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-11-02 17:43:30 +0000
committerPeter Robinson <pbrobinson@gmail.com>2019-11-02 17:43:30 +0000
commit721a1be308c64ac99a734507ff0bfd7830edebf8 (patch)
tree5d730680d67830eda54a52c6a5f630dc0631b93b
parent84e5b0ab61a2aae1a91bd565a54cc71880f09698 (diff)
downloadkernel-721a1be308c64ac99a734507ff0bfd7830edebf8.tar.gz
kernel-721a1be308c64ac99a734507ff0bfd7830edebf8.tar.xz
kernel-721a1be308c64ac99a734507ff0bfd7830edebf8.zip
fix usb on JetsonTX2
-rw-r--r--arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch36
-rw-r--r--kernel.spec2
2 files changed, 38 insertions, 0 deletions
diff --git a/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
new file mode 100644
index 000000000..b55daaaeb
--- /dev/null
+++ b/arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
@@ -0,0 +1,36 @@
+From 5a39c1ffc4e18603f2c9af3c0a556e2db6e70705 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sat, 2 Nov 2019 16:52:15 +0000
+Subject: [PATCH 1/2] usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186
+
+Set the MODULE_FIRMWARE for tegra186, it's registered for 124/210 and
+ensures the firmware is available at the appropriate time such as in
+the initrd, else if the firmware is unavailable the driver fails with
+the following errors:
+
+tegra-xusb 3530000.usb: Direct firmware load for nvidia/tegra186/xusb.bin failed with error -2
+tegra-xusb 3530000.usb: failed to request firmware: -2
+tegra-xusb 3530000.usb: failed to load firmware: -2
+tegra-xusb: probe of 3530000.usb failed with error -2
+
+Fixes: 5f9be5f3f899 ("usb: host: xhci-tegra: Add Tegra186 XUSB support")
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ drivers/usb/host/xhci-tegra.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
+index 2ff7c911fbd0..d25aba8fa219 100644
+--- a/drivers/usb/host/xhci-tegra.c
++++ b/drivers/usb/host/xhci-tegra.c
+@@ -1433,6 +1433,7 @@ static const struct tegra_xusb_soc tegra186_soc = {
+ .scale_ss_clock = false,
+ .has_ipfs = false,
+ };
++MODULE_FIRMWARE("nvidia/tegra186/xusb.bin");
+
+ static const struct of_device_id tegra_xusb_of_match[] = {
+ { .compatible = "nvidia,tegra124-xusb", .data = &tegra124_soc },
+--
+2.23.0
+
diff --git a/kernel.spec b/kernel.spec
index f965b8672..7148e933e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -693,6 +693,8 @@ Patch322: mfd-max77620-Do-not-allocate-IRQs-upfront.patch
Patch323: gpio-max77620-Use-correct-unit-for-debounce-times.patch
# https://www.spinics.net/lists/linux-tegra/msg44216.html
Patch324: arm64-tegra186-enable-USB-on-Jetson-TX2.patch
+# https://patchwork.kernel.org/patch/11224177/
+Patch325: arm64-usb-host-xhci-tegra-set-MODULE_FIRMWARE-for-tegra186.patch
# https://www.spinics.net/lists/arm-kernel/msg761152.html
Patch342: efi-libstub-arm-account-for-firmware-reserved-memory-at-the-base-of-RAM.patch