From 78b456d05c36db60fd7753469b9a5278c1503d81 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 4 Dec 2020 20:54:49 +0100 Subject: [PATCH] Fix U-Boot crash seen on RPi400 (#1057) (#1058) --- ...FIG_OF_BOARD-instead-of-CONFIG_EMBED.patch | 4 +- ...i-Disable-simple-framebuffer-support.patch | 8 ++-- ...rpi-force-a-smaller-amount-of-memory.patch | 8 ++-- .../0004-usb-xhci-convert-to-TRB_TYPE.patch | 8 ++-- ...cros-with-parameter-to-fill-ep_info2.patch | 8 ++-- ...lk_tx-Don-t-BUG-when-comparing-addre.patch | 40 +++++++++++++++++++ ...-xhci-avoid-type-conversion-of-void.patch} | 10 ++--- ...e-ADMA2-table-handling-into-own-mod.patch} | 10 ++--- ...i-Add-identifier-for-the-new-RPi400.patch} | 10 ++--- ...-rpi-Add-identifier-for-the-new-CM4.patch} | 10 ++--- ...b-Fix-inbound-window-configurations.patch} | 10 ++--- ...0012-dm-Introduce-xxx_get_dma_range.patch} | 10 ++--- ...constraints-into-the-core-device-mo.patch} | 10 ++--- ...uce-dev_phys_to_bus-dev_bus_to_phys.patch} | 10 ++--- ...rtual-addresses-into-the-bus-s-addr.patch} | 14 +++---- ...uce-mmc_phys_to_bus-mmc_bus_to_phys.patch} | 10 ++--- 16 files changed, 110 insertions(+), 70 deletions(-) create mode 100644 buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-xhci_bulk_tx-Don-t-BUG-when-comparing-addre.patch rename buildroot-external/board/raspberrypi/patches/uboot/{0006-usb-xhci-avoid-type-conversion-of-void.patch => 0007-usb-xhci-avoid-type-conversion-of-void.patch} (89%) rename buildroot-external/board/raspberrypi/patches/uboot/{0007-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch => 0008-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch} (95%) rename buildroot-external/board/raspberrypi/patches/uboot/{0008-rpi-Add-identifier-for-the-new-RPi400.patch => 0009-rpi-Add-identifier-for-the-new-RPi400.patch} (75%) rename buildroot-external/board/raspberrypi/patches/uboot/{0009-rpi-Add-identifier-for-the-new-CM4.patch => 0010-rpi-Add-identifier-for-the-new-CM4.patch} (75%) rename buildroot-external/board/raspberrypi/patches/uboot/{0010-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch => 0011-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch} (86%) rename buildroot-external/board/raspberrypi/patches/uboot/{0011-dm-Introduce-xxx_get_dma_range.patch => 0012-dm-Introduce-xxx_get_dma_range.patch} (96%) rename buildroot-external/board/raspberrypi/patches/uboot/{0012-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch => 0013-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch} (84%) rename buildroot-external/board/raspberrypi/patches/uboot/{0013-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch => 0014-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch} (75%) rename buildroot-external/board/raspberrypi/patches/uboot/{0014-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch => 0015-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch} (96%) rename buildroot-external/board/raspberrypi/patches/uboot/{0015-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch => 0016-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch} (86%) diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch index 9435c5378..adb348e5c 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch @@ -1,8 +1,8 @@ From a04331a6ba7334282836bbaa76e979c4e6be3900 Mon Sep 17 00:00:00 2001 -Message-Id: +Message-Id: From: Pascal Vizeli Date: Tue, 10 Dec 2019 09:48:46 +0000 -Subject: [PATCH 01/15] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED +Subject: [PATCH 01/16] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED Signed-off-by: Pascal Vizeli --- diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch index 09a78954f..1fe95fc6e 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-raspberrypi-Disable-simple-framebuffer-support.patch @@ -1,10 +1,10 @@ From cc40a554b003df9b07f8a55f69a94d7393d81cbc Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +Message-Id: +In-Reply-To: +References: From: Florin Sarbu Date: Thu, 12 Sep 2019 12:31:31 +0200 -Subject: [PATCH 02/15] raspberrypi: Disable simple framebuffer support +Subject: [PATCH 02/16] raspberrypi: Disable simple framebuffer support On 4.19 kernels this u-boot driver clashes with bcm2708_fb. So let's disable it from here so that we have bcm2708_fb diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-force-a-smaller-amount-of-memory.patch b/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-force-a-smaller-amount-of-memory.patch index dbef8a146..4c1d87250 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-force-a-smaller-amount-of-memory.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0003-rpi-force-a-smaller-amount-of-memory.patch @@ -1,10 +1,10 @@ From b0895f2384712f3d0d89405c06519da195e9ccc9 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +Message-Id: +In-Reply-To: +References: From: Stefan Agner Date: Thu, 26 Nov 2020 17:56:01 +0100 -Subject: [PATCH 03/15] rpi: force a smaller amount of memory +Subject: [PATCH 03/16] rpi: force a smaller amount of memory This fixes booting from USB on 32-bit installations. It seems not to affect the detected memory or SD card boot negatively. diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-convert-to-TRB_TYPE.patch b/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-convert-to-TRB_TYPE.patch index ecc2a7b9b..0d983d46a 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-convert-to-TRB_TYPE.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-convert-to-TRB_TYPE.patch @@ -1,10 +1,10 @@ From 000f636c9ea4909a23119ba65d3a3847687c8c6b Mon Sep 17 00:00:00 2001 -Message-Id: <000f636c9ea4909a23119ba65d3a3847687c8c6b.1606428503.git.stefan@agner.ch> -In-Reply-To: -References: +Message-Id: <000f636c9ea4909a23119ba65d3a3847687c8c6b.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: From: Chunfeng Yun Date: Tue, 8 Sep 2020 18:59:59 +0200 -Subject: [PATCH 04/15] usb: xhci: convert to TRB_TYPE() +Subject: [PATCH 04/16] usb: xhci: convert to TRB_TYPE() Use TRB_TYPE(p) instead of ((p) << TRB_TYPE_SHIFT) diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-use-macros-with-parameter-to-fill-ep_info2.patch b/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-use-macros-with-parameter-to-fill-ep_info2.patch index df75b05a7..e067afb18 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-use-macros-with-parameter-to-fill-ep_info2.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0005-usb-xhci-use-macros-with-parameter-to-fill-ep_info2.patch @@ -1,10 +1,10 @@ From bab3fd38c8eec5f3d12e41e706c02c79b4c4a21e Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +Message-Id: +In-Reply-To: +References: From: Chunfeng Yun Date: Tue, 8 Sep 2020 19:00:02 +0200 -Subject: [PATCH 05/15] usb: xhci: use macros with parameter to fill ep_info2 +Subject: [PATCH 05/16] usb: xhci: use macros with parameter to fill ep_info2 Use macros with parameter to fill ep_info2, then some macros for MASK and SHIFT can be removed diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-xhci_bulk_tx-Don-t-BUG-when-comparing-addre.patch b/buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-xhci_bulk_tx-Don-t-BUG-when-comparing-addre.patch new file mode 100644 index 000000000..299a10869 --- /dev/null +++ b/buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-xhci_bulk_tx-Don-t-BUG-when-comparing-addre.patch @@ -0,0 +1,40 @@ +From 0c4bf0c18097807364ee302effc0d0c7a32e4364 Mon Sep 17 00:00:00 2001 +Message-Id: <0c4bf0c18097807364ee302effc0d0c7a32e4364.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: +From: Stefan Roese +Date: Mon, 24 Aug 2020 13:04:37 +0200 +Subject: [PATCH 06/16] usb: xhci: xhci_bulk_tx: Don't "BUG" when comparing + addresses + +Octeon uses mapped addresses for virtual and physical memory. It's not +that easy to calculate the resulting addresses here. So let's remove +this BUG_ON() completely, as it's not really helpful. + +Please also note, that BUG_ON() is not recommended any more in the Linux +kernel. + +Signed-off-by: Stefan Roese +Reviewed-by: Bin Meng +Cc: Bin Meng +Cc: Marek Vasut +--- + drivers/usb/host/xhci-ring.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c +index a893277c75..d912cba2f4 100644 +--- a/drivers/usb/host/xhci-ring.c ++++ b/drivers/usb/host/xhci-ring.c +@@ -726,8 +726,6 @@ int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe, + + BUG_ON(TRB_TO_SLOT_ID(field) != slot_id); + BUG_ON(TRB_TO_EP_INDEX(field) != ep_index); +- BUG_ON(*(void **)(uintptr_t)le64_to_cpu(event->trans_event.buffer) - +- buffer > (size_t)length); + + record_transfer_result(udev, event, length); + xhci_acknowledge_event(ctrl); +-- +2.29.2 + diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-avoid-type-conversion-of-void.patch b/buildroot-external/board/raspberrypi/patches/uboot/0007-usb-xhci-avoid-type-conversion-of-void.patch similarity index 89% rename from buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-avoid-type-conversion-of-void.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0007-usb-xhci-avoid-type-conversion-of-void.patch index 1e6b7b30c..eb35bcfe1 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0006-usb-xhci-avoid-type-conversion-of-void.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0007-usb-xhci-avoid-type-conversion-of-void.patch @@ -1,10 +1,10 @@ -From 8591faf0da31be68ea45fdc8a0485c0163a3eb52 Mon Sep 17 00:00:00 2001 -Message-Id: <8591faf0da31be68ea45fdc8a0485c0163a3eb52.1606428503.git.stefan@agner.ch> -In-Reply-To: -References: +From 99d6472fd9105c821582f069dfd151466bb5d263 Mon Sep 17 00:00:00 2001 +Message-Id: <99d6472fd9105c821582f069dfd151466bb5d263.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: From: Heinrich Schuchardt Date: Tue, 29 Sep 2020 22:03:01 +0200 -Subject: [PATCH 06/15] usb: xhci: avoid type conversion of void * +Subject: [PATCH 07/16] usb: xhci: avoid type conversion of void * void * can be assigned to any pointer variable. Avoid unnecessary conversions. diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0007-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch b/buildroot-external/board/raspberrypi/patches/uboot/0008-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch similarity index 95% rename from buildroot-external/board/raspberrypi/patches/uboot/0007-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0008-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch index 9eba7daea..d3763e1b1 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0007-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0008-mmc-sdhci-move-the-ADMA2-table-handling-into-own-mod.patch @@ -1,10 +1,10 @@ -From f12d0a67a79679641299b1b923883e62332ee6d4 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 361a81dd4eb8c508c882484a69bf85c00570cfe8 Mon Sep 17 00:00:00 2001 +Message-Id: <361a81dd4eb8c508c882484a69bf85c00570cfe8.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: From: Michael Walle Date: Wed, 23 Sep 2020 12:42:51 +0200 -Subject: [PATCH 07/15] mmc: sdhci: move the ADMA2 table handling into own +Subject: [PATCH 08/16] mmc: sdhci: move the ADMA2 table handling into own module There are other (non-SDHCI) controllers which supports ADMA2 descriptor diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0008-rpi-Add-identifier-for-the-new-RPi400.patch b/buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-RPi400.patch similarity index 75% rename from buildroot-external/board/raspberrypi/patches/uboot/0008-rpi-Add-identifier-for-the-new-RPi400.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-RPi400.patch index 171ff4677..988fc3810 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0008-rpi-Add-identifier-for-the-new-RPi400.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-RPi400.patch @@ -1,10 +1,10 @@ -From 0ad1fdab7a52554d1da758b36917c09965495dd9 Mon Sep 17 00:00:00 2001 -Message-Id: <0ad1fdab7a52554d1da758b36917c09965495dd9.1606428503.git.stefan@agner.ch> -In-Reply-To: -References: +From 47206784cfd0100ea48b8ede65119687a4af8f09 Mon Sep 17 00:00:00 2001 +Message-Id: <47206784cfd0100ea48b8ede65119687a4af8f09.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:15 +0100 -Subject: [PATCH 08/15] rpi: Add identifier for the new RPi400 +Subject: [PATCH 09/16] rpi: Add identifier for the new RPi400 The Raspberry Pi Foundation released the new RPi400 which we want to detect, so we can enable Ethernet on it and know the correct device tree diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-CM4.patch b/buildroot-external/board/raspberrypi/patches/uboot/0010-rpi-Add-identifier-for-the-new-CM4.patch similarity index 75% rename from buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-CM4.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0010-rpi-Add-identifier-for-the-new-CM4.patch index 2aa1eec54..63b21666c 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0009-rpi-Add-identifier-for-the-new-CM4.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0010-rpi-Add-identifier-for-the-new-CM4.patch @@ -1,10 +1,10 @@ -From f9cb12f4cf902797987fea885fa186ba7d676aa0 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From aad1a59f4c8929f46b715e023aa19a224844c3a0 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:16 +0100 -Subject: [PATCH 09/15] rpi: Add identifier for the new CM4 +Subject: [PATCH 10/16] rpi: Add identifier for the new CM4 The Raspberry Pi Foundation released the new Compute Module 4which we want to detect, so we can enable Ethernet on it and know the correct diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0010-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch b/buildroot-external/board/raspberrypi/patches/uboot/0011-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch similarity index 86% rename from buildroot-external/board/raspberrypi/patches/uboot/0010-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0011-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch index c007f53f0..8275b2a80 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0010-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0011-pci-pcie-brcmstb-Fix-inbound-window-configurations.patch @@ -1,10 +1,10 @@ -From c576988161912dfcb1bcd8b87640f5f998a87bf3 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From ed5a66c3f22d0f01c4f71371714af4180e65b37d Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:17 +0100 -Subject: [PATCH 10/15] pci: pcie-brcmstb: Fix inbound window configurations +Subject: [PATCH 11/16] pci: pcie-brcmstb: Fix inbound window configurations So far we've assumed a fixed configuration for inbound windows as we had a single user for this controller. But the controller's DMA constraints diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0011-dm-Introduce-xxx_get_dma_range.patch b/buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-xxx_get_dma_range.patch similarity index 96% rename from buildroot-external/board/raspberrypi/patches/uboot/0011-dm-Introduce-xxx_get_dma_range.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-xxx_get_dma_range.patch index 73b7b5bc7..8b4176b29 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0011-dm-Introduce-xxx_get_dma_range.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-xxx_get_dma_range.patch @@ -1,10 +1,10 @@ -From a2052b8361818ec5acb04e5d0c1d229083dfbeb6 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 754d53fbedf5f97384f473f6f5a831aecae687f6 Mon Sep 17 00:00:00 2001 +Message-Id: <754d53fbedf5f97384f473f6f5a831aecae687f6.1607085588.git.stefan@agner.ch> +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:18 +0100 -Subject: [PATCH 11/15] dm: Introduce xxx_get_dma_range() +Subject: [PATCH 12/16] dm: Introduce xxx_get_dma_range() Add the follwing functions to get a specific device's DMA ranges: - dev_get_dma_range() diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch b/buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch similarity index 84% rename from buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch index 0f7f79f4d..756ec639d 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0012-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-DMA-constraints-into-the-core-device-mo.patch @@ -1,10 +1,10 @@ -From ea24a497a84cf0d1efb9c4f285d4d29bd69f3ebb Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From e286d6acbf158bc385d702aafcf1caa8da9ab8ee Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:19 +0100 -Subject: [PATCH 12/15] dm: Introduce DMA constraints into the core device +Subject: [PATCH 13/16] dm: Introduce DMA constraints into the core device model Calculating the DMA offset between a bus address space and CPU's every diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch b/buildroot-external/board/raspberrypi/patches/uboot/0014-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch similarity index 75% rename from buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0014-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch index 01dc4c9c1..e7b47aca2 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0013-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0014-dm-Introduce-dev_phys_to_bus-dev_bus_to_phys.patch @@ -1,10 +1,10 @@ -From 3f75e2303ddb7fa6eed6dc288880f613329ce3bb Mon Sep 17 00:00:00 2001 -Message-Id: <3f75e2303ddb7fa6eed6dc288880f613329ce3bb.1606428503.git.stefan@agner.ch> -In-Reply-To: -References: +From c5d66c3defc09d5dba273f430d871dd8f7ab6352 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:20 +0100 -Subject: [PATCH 13/15] dm: Introduce dev_phys_to_bus()/dev_bus_to_phys() +Subject: [PATCH 14/16] dm: Introduce dev_phys_to_bus()/dev_bus_to_phys() These functions, instead of relying on hard-coded platform-specific address translations, make use of the DMA constraints provided by the DM diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0014-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch b/buildroot-external/board/raspberrypi/patches/uboot/0015-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch similarity index 96% rename from buildroot-external/board/raspberrypi/patches/uboot/0014-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0015-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch index e1e9efe85..f1ff72831 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0014-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0015-xhci-translate-virtual-addresses-into-the-bus-s-addr.patch @@ -1,10 +1,10 @@ -From e3c96fd50787aa9ea2e5136593166cc49696d7ea Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From edbdacb93fb0372ba456d84dc760314ed7757f86 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:21 +0100 -Subject: [PATCH 14/15] xhci: translate virtual addresses into the bus's +Subject: [PATCH 15/16] xhci: translate virtual addresses into the bus's address space So far we've been content with passing physical addresses when @@ -191,7 +191,7 @@ index b002d6f166..e8d435d644 100644 /* diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index a893277c75..74deaabb9b 100644 +index d912cba2f4..3d4b84f9a1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -275,10 +275,13 @@ void xhci_queue_command(struct xhci_ctrl *ctrl, u8 *ptr, u32 slot_id, @@ -227,7 +227,7 @@ index a893277c75..74deaabb9b 100644 debug("dev=%p, pipe=%lx, buffer=%p, length=%d\n", udev, pipe, buffer, length); -@@ -876,7 +879,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, +@@ -874,7 +877,7 @@ int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, if (length > 0) { if (req->requesttype & USB_DIR_IN) field |= TRB_DIR_IN; diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0015-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch b/buildroot-external/board/raspberrypi/patches/uboot/0016-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch similarity index 86% rename from buildroot-external/board/raspberrypi/patches/uboot/0015-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch rename to buildroot-external/board/raspberrypi/patches/uboot/0016-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch index 59d656588..c7cdb42a9 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0015-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0016-mmc-Introduce-mmc_phys_to_bus-mmc_bus_to_phys.patch @@ -1,10 +1,10 @@ -From de9f878b9cc4ab665c6aa4e6bb14193c66f78816 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From a92d8e7740d65859f5e08abe110fd9d37aebf4cd Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Nicolas Saenz Julienne Date: Thu, 19 Nov 2020 18:48:22 +0100 -Subject: [PATCH 15/15] mmc: Introduce mmc_phys_to_bus()/mmc_bus_to_phys() +Subject: [PATCH 16/16] mmc: Introduce mmc_phys_to_bus()/mmc_bus_to_phys() This will allow us to use DM variants of phys_to_bus()/bus_to_phys() when relevant.