From cda4688c5eec7ccd3a978092fbed9bd0b9f941e1 Mon Sep 17 00:00:00 2001 From: Mario Six Date: Mon, 6 Aug 2018 10:23:33 +0200 Subject: test: Add tests for sysreset_get_status Add some tests for sysreset_get_status. Reviewed-by: Simon Glass Signed-off-by: Mario Six --- test/dm/sysreset.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'test') diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 33a8bfb33c4..04d4621d9e1 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -45,6 +45,26 @@ static int dm_test_sysreset_base(struct unit_test_state *uts) } DM_TEST(dm_test_sysreset_base, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); +static int dm_test_sysreset_get_status(struct unit_test_state *uts) +{ + struct udevice *dev; + char msg[64]; + + /* Device 1 is the warm sysreset device */ + ut_assertok(uclass_get_device(UCLASS_SYSRESET, 1, &dev)); + ut_assertok(sysreset_get_status(dev, msg, sizeof(msg))); + ut_asserteq_str("Reset Status: WARM", msg); + + /* Device 2 is the cold sysreset device */ + ut_assertok(uclass_get_device(UCLASS_SYSRESET, 2, &dev)); + ut_assertok(sysreset_get_status(dev, msg, sizeof(msg))); + ut_asserteq_str("Reset Status: COLD", msg); + + return 0; +} + +DM_TEST(dm_test_sysreset_get_status, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); + /* Test that we can walk through the sysreset devices */ static int dm_test_sysreset_walk(struct unit_test_state *uts) { -- cgit v1.3.1 From fa44b53398d3a7f5ed28cb83493a70cde11f8188 Mon Sep 17 00:00:00 2001 From: Mario Six Date: Mon, 6 Aug 2018 10:23:44 +0200 Subject: test: Add tests for CPU uclass Add a sandbox CPU driver, and some tests for the CPU uclass. Signed-off-by: Mario Six --- arch/sandbox/dts/test.dts | 12 ++++++++++ drivers/cpu/Makefile | 1 + drivers/cpu/cpu_sandbox.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++ test/dm/Makefile | 1 + test/dm/cpu.c | 45 ++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 drivers/cpu/cpu_sandbox.c create mode 100644 test/dm/cpu.c (limited to 'test') diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 36682633318..b8524e3b7d6 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -297,6 +297,18 @@ mbox-names = "other", "test"; }; + cpu-test1 { + compatible = "sandbox,cpu_sandbox"; + }; + + cpu-test2 { + compatible = "sandbox,cpu_sandbox"; + }; + + cpu-test3 { + compatible = "sandbox,cpu_sandbox"; + }; + misc-test { compatible = "sandbox,misc_sandbox"; }; diff --git a/drivers/cpu/Makefile b/drivers/cpu/Makefile index db515f6f177..980c68f44d0 100644 --- a/drivers/cpu/Makefile +++ b/drivers/cpu/Makefile @@ -7,3 +7,4 @@ obj-$(CONFIG_CPU) += cpu-uclass.o obj-$(CONFIG_ARCH_BMIPS) += bmips_cpu.o +obj-$(CONFIG_SANDBOX) += cpu_sandbox.o diff --git a/drivers/cpu/cpu_sandbox.c b/drivers/cpu/cpu_sandbox.c new file mode 100644 index 00000000000..ff87e8adca3 --- /dev/null +++ b/drivers/cpu/cpu_sandbox.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018 + * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc + */ + +#include +#include +#include + +int cpu_sandbox_get_desc(struct udevice *dev, char *buf, int size) +{ + snprintf(buf, size, "LEG Inc. SuperMegaUltraTurbo CPU No. 1"); + + return 0; +} + +int cpu_sandbox_get_info(struct udevice *dev, struct cpu_info *info) +{ + info->cpu_freq = 42 * 42 * 42 * 42 * 42; + info->features = 0x42424242; + + return 0; +} + +int cpu_sandbox_get_count(struct udevice *dev) +{ + return 42; +} + +int cpu_sandbox_get_vendor(struct udevice *dev, char *buf, int size) +{ + snprintf(buf, size, "Languid Example Garbage Inc."); + + return 0; +} + +static const struct cpu_ops cpu_sandbox_ops = { + .get_desc = cpu_sandbox_get_desc, + .get_info = cpu_sandbox_get_info, + .get_count = cpu_sandbox_get_count, + .get_vendor = cpu_sandbox_get_vendor, +}; + +int cpu_sandbox_probe(struct udevice *dev) +{ + return 0; +} + +static const struct udevice_id cpu_sandbox_ids[] = { + { .compatible = "sandbox,cpu_sandbox" }, + { } +}; + +U_BOOT_DRIVER(cpu_sandbox) = { + .name = "cpu_sandbox", + .id = UCLASS_CPU, + .ops = &cpu_sandbox_ops, + .of_match = cpu_sandbox_ids, + .probe = cpu_sandbox_probe, +}; diff --git a/test/dm/Makefile b/test/dm/Makefile index 3f5a634afd5..8b1ba915d01 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -47,4 +47,5 @@ obj-$(CONFIG_WDT) += wdt.o obj-$(CONFIG_AXI) += axi.o obj-$(CONFIG_MISC) += misc.o obj-$(CONFIG_DM_SERIAL) += serial.o +obj-$(CONFIG_CPU) += cpu.o endif diff --git a/test/dm/cpu.c b/test/dm/cpu.c new file mode 100644 index 00000000000..f5f1caef716 --- /dev/null +++ b/test/dm/cpu.c @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018 + * Mario Six, Guntermann & Drunck GmbH, mario.six@gdsys.cc + */ + +#include +#include +#include +#include +#include +#include + +static int dm_test_cpu(struct unit_test_state *uts) +{ + struct udevice *dev; + char text[128]; + struct cpu_info info; + + ut_assertok(cpu_probe_all()); + + /* Check that cpu_probe_all really activated all CPUs */ + for (uclass_find_first_device(UCLASS_CPU, &dev); + dev; + uclass_find_next_device(&dev)) + ut_assert(dev->flags & DM_FLAG_ACTIVATED); + + ut_assertok(uclass_get_device_by_name(UCLASS_CPU, "cpu-test1", &dev)); + + ut_assertok(cpu_get_desc(dev, text, sizeof(text))); + ut_assertok(strcmp(text, "LEG Inc. SuperMegaUltraTurbo CPU No. 1")); + + ut_assertok(cpu_get_info(dev, &info)); + ut_asserteq(info.cpu_freq, 42 * 42 * 42 * 42 * 42); + ut_asserteq(info.features, 0x42424242); + + ut_asserteq(cpu_get_count(dev), 42); + + ut_assertok(cpu_get_vendor(dev, text, sizeof(text))); + ut_assertok(strcmp(text, "Languid Example Garbage Inc.")); + + return 0; +} + +DM_TEST(dm_test_cpu, DM_TESTF_SCAN_FDT); -- cgit v1.3.1 From 9bc7e96a7d918286ddf4502b7dab0c7f43ddc3d3 Mon Sep 17 00:00:00 2001 From: Jens Wiklander Date: Mon, 20 Aug 2018 11:10:00 +0200 Subject: test: ofnode: test ofnode_by_prop_value() Test ofnode_by_prop_value() Signed-off-by: Jens Wiklander Reviewed-by: Simon Glass --- test/dm/ofnode.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'test') diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 8db1f9857f7..907d1ddbdb6 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -15,3 +15,30 @@ static int dm_test_ofnode_compatible(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_ofnode_compatible, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); + +static int dm_test_ofnode_by_prop_value(struct unit_test_state *uts) +{ + const char propname[] = "compatible"; + const char propval[] = "denx,u-boot-fdt-test"; + const char *str; + ofnode node = ofnode_null(); + + /* Find first matching node, there should be at least one */ + node = ofnode_by_prop_value(node, propname, propval, sizeof(propval)); + ut_assert(ofnode_valid(node)); + str = ofnode_read_string(node, propname); + ut_assert(str && !strcmp(str, propval)); + + /* Find the rest of the matching nodes */ + while (true) { + node = ofnode_by_prop_value(node, propname, propval, + sizeof(propval)); + if (!ofnode_valid(node)) + break; + str = ofnode_read_string(node, propname); + ut_assert(str && !strcmp(str, propval)); + } + + return 0; +} +DM_TEST(dm_test_ofnode_by_prop_value, DM_TESTF_SCAN_FDT); -- cgit v1.3.1 From 138c8a75620702ff0a7bb08147d5b98c0ddb5d1b Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 7 Sep 2018 20:31:21 +0900 Subject: dm: fix alignment of help message of "dm" command Currently, "help dm" shows as follows: => help dm dm - Driver model low level access Usage: dm tree Dump driver model tree ('*' = activated) dm uclass Dump list of instances for each uclass dm devres Dump list of device resources for each device Signed-off-by: Masahiro Yamada Reviewed-by: Bin Meng Tested-by: Bin Meng --- test/dm/cmd_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/dm/cmd_dm.c b/test/dm/cmd_dm.c index 624fc829d8b..7b271db0bbe 100644 --- a/test/dm/cmd_dm.c +++ b/test/dm/cmd_dm.c @@ -82,7 +82,7 @@ static int do_dm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( dm, 3, 1, do_dm, "Driver model low level access", - "tree Dump driver model tree ('*' = activated)\n" + "tree Dump driver model tree ('*' = activated)\n" "dm uclass Dump list of instances for each uclass\n" "dm devres Dump list of device resources for each device" ); -- cgit v1.3.1