111c122751
- Add qemu-riscv64spl Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2021.01 * Patches added: 0031-efi_loader-Avoid-emitting-efi_var_b.patch - Drop pcm051rev3 for Phytec Wega board - Fix binary extension for sunxi based boards - Add Pinephone - Fix documentation location Update to v2021.01. Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2021.01 * Patches dropped: 0028-usb-xhci-xhci_bulk_tx-Don-t-BUG-whe.patch 0029-Revert-Fix-data-abort-caused-by-mis.patch 0030-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch 0031-pci-brcmstb-Cleanup-controller-stat.patch * Patches added: 0028-usb-xhci-pci-Add-DM_FLAG_OS_PREPARE.patch 0029-pci-brcmstb-Cleanup-controller-stat.patch 0030-fs-btrfs-Select-SHA256-in-Kconfig.patch OBS-URL: https://build.opensuse.org/request/show/872955 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=127
121 lines
4.0 KiB
Diff
121 lines
4.0 KiB
Diff
From 763aa398ef98782c2801611b9918ea84375b2b79 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Date: Tue, 12 Jan 2021 13:55:25 +0100
|
|
Subject: [PATCH] dm: test: Add test case for dev->dma_offset
|
|
|
|
Add test to validate dev->dma_offset is properly set on devices.
|
|
|
|
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Reviewed-by: Simon Glass <sjg@chromium.org>
|
|
Tested-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
arch/sandbox/dts/test.dts | 4 ++++
|
|
configs/sandbox64_defconfig | 1 +
|
|
configs/sandbox_defconfig | 1 +
|
|
configs/sandbox_flattree_defconfig | 1 +
|
|
configs/sandbox_spl_defconfig | 1 +
|
|
test/dm/core.c | 30 ++++++++++++++++++++++++++++++
|
|
6 files changed, 38 insertions(+)
|
|
|
|
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
|
|
index 3a3b51f83b..78f0100282 100644
|
|
--- a/arch/sandbox/dts/test.dts
|
|
+++ b/arch/sandbox/dts/test.dts
|
|
@@ -307,6 +307,10 @@
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
compatible = "denx,u-boot-test-bus";
|
|
+
|
|
+ subnode@0 {
|
|
+ compatible = "denx,u-boot-fdt-test";
|
|
+ };
|
|
};
|
|
|
|
acpi_test1: acpi-test {
|
|
diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
|
|
index 1afe9a4665..f250723827 100644
|
|
--- a/configs/sandbox64_defconfig
|
|
+++ b/configs/sandbox64_defconfig
|
|
@@ -93,6 +93,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|
CONFIG_BOOTP_SEND_HOSTNAME=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_IP_DEFRAG=y
|
|
+CONFIG_DM_DMA=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
CONFIG_DEVRES=y
|
|
diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
|
|
index 5bc9186d6e..e40f619e75 100644
|
|
--- a/configs/sandbox_defconfig
|
|
+++ b/configs/sandbox_defconfig
|
|
@@ -107,6 +107,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|
CONFIG_BOOTP_SEND_HOSTNAME=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_IP_DEFRAG=y
|
|
+CONFIG_DM_DMA=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
CONFIG_DEVRES=y
|
|
diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
|
|
index edca7f1808..f5923bf713 100644
|
|
--- a/configs/sandbox_flattree_defconfig
|
|
+++ b/configs/sandbox_flattree_defconfig
|
|
@@ -75,6 +75,7 @@ CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
|
|
CONFIG_BOOTP_SEND_HOSTNAME=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_IP_DEFRAG=y
|
|
+CONFIG_DM_DMA=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
CONFIG_DEVRES=y
|
|
diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
|
|
index 479f0226e3..0a4815770c 100644
|
|
--- a/configs/sandbox_spl_defconfig
|
|
+++ b/configs/sandbox_spl_defconfig
|
|
@@ -94,6 +94,7 @@ CONFIG_BOOTP_SEND_HOSTNAME=y
|
|
CONFIG_NETCONSOLE=y
|
|
CONFIG_IP_DEFRAG=y
|
|
CONFIG_SPL_DM=y
|
|
+CONFIG_DM_DMA=y
|
|
CONFIG_REGMAP=y
|
|
CONFIG_SPL_REGMAP=y
|
|
CONFIG_SYSCON=y
|
|
diff --git a/test/dm/core.c b/test/dm/core.c
|
|
index 6f380a574c..8ca49d09ee 100644
|
|
--- a/test/dm/core.c
|
|
+++ b/test/dm/core.c
|
|
@@ -1066,3 +1066,33 @@ static int dm_test_inactive_child(struct unit_test_state *uts)
|
|
return 0;
|
|
}
|
|
DM_TEST(dm_test_inactive_child, UT_TESTF_SCAN_PDATA);
|
|
+
|
|
+static int dm_test_dma_offset(struct unit_test_state *uts)
|
|
+{
|
|
+ struct udevice *dev;
|
|
+ ofnode node;
|
|
+
|
|
+ /* Make sure the bus's dma-ranges aren't taken into account here */
|
|
+ node = ofnode_path("/mmio-bus@0");
|
|
+ ut_assert(ofnode_valid(node));
|
|
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_BUS, node, &dev));
|
|
+ ut_asserteq_64(0, dev->dma_offset);
|
|
+
|
|
+ /* Device behind a bus with dma-ranges */
|
|
+ node = ofnode_path("/mmio-bus@0/subnode@0");
|
|
+ ut_assert(ofnode_valid(node));
|
|
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_FDT, node, &dev));
|
|
+ ut_asserteq_64(-0x10000000ULL, dev->dma_offset);
|
|
+
|
|
+ /* This one has no dma-ranges */
|
|
+ node = ofnode_path("/mmio-bus@1");
|
|
+ ut_assert(ofnode_valid(node));
|
|
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_BUS, node, &dev));
|
|
+ node = ofnode_path("/mmio-bus@1/subnode@0");
|
|
+ ut_assert(ofnode_valid(node));
|
|
+ ut_assertok(uclass_get_device_by_ofnode(UCLASS_TEST_FDT, node, &dev));
|
|
+ ut_asserteq_64(0, dev->dma_offset);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+DM_TEST(dm_test_dma_offset, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
|