Re: [PATCH v3 07/12] dm: test: Add test case for dev->dma_offset

2020-12-21 Thread Nicolas Saenz Julienne 
On Fri, 2020-12-18 at 19:28 -0700, Simon Glass wrote:
> On Tue, 15 Dec 2020 at 10:23, Nicolas Saenz Julienne
>  wrote:
> > 
> > Add test to validate dev->dma_offset is properly set on devices.
> > 
> > Signed-off-by: Nicolas Saenz Julienne 
> > ---
> >  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(+)
> 
> Reviewed-by: Simon Glass 
> 
> We normally use ut_assertok() instead of ut_assert(!xxx), since 0 means OK.

Will fix this across all tests.



signature.asc
Description: This is a digitally signed message part

Re: [PATCH v3 07/12] dm: test: Add test case for dev->dma_offset

2020-12-18 Thread Simon Glass 
On Tue, 15 Dec 2020 at 10:23, Nicolas Saenz Julienne
 wrote:
>
> Add test to validate dev->dma_offset is properly set on devices.
>
> Signed-off-by: Nicolas Saenz Julienne 
> ---
>  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(+)

Reviewed-by: Simon Glass 

We normally use ut_assertok() instead of ut_assert(!xxx), since 0 means OK.

[PATCH v3 07/12] dm: test: Add test case for dev->dma_offset

2020-12-15 Thread Nicolas Saenz Julienne 
Add test to validate dev->dma_offset is properly set on devices.

Signed-off-by: Nicolas Saenz Julienne 
---
 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 5fbbfd7236..2c189a8a00 100644
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -94,6 +94,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 f1ec701a9f..ac97c16cef 100644
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -108,6 +108,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..998874ffee 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_assert(!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_assert(!uclass_get_device_by_ofnode(UCLASS_TEST_FDT, node, &dev));
+   ut_asserteq_64(-0x1000ULL, dev->dma_offset);
+
+   /* This one has no dma-ranges */
+   node = ofnode_path("/mmio-bus@1");
+   ut_assert(ofnode_valid(node));
+   ut_assert(!uclass_get_device_by_ofnode(UCLASS_TEST_BUS, node, &dev));
+   node = ofnode_path("/mmio-bus@1/subnode@0");
+   ut_assert(ofnode_valid(node));
+   ut_assert(!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);
-- 
2.29.2