dm: test: Add test code for new uclasses

We should guide people more strongly towards device tree to avoid the proliferation of platform data structures. Add documentation to the driver model README, and also the platform data header file.

Signed-off-by Simon Glass <[email protected]>

---

 doc/driver-model/README.txt | 17 +++++++++++++++--
 include/dm/platdata.h       |  9 +++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

All driver model tests have a dm_test_ prefix. Ignore it when matching a test name. This makes it easier to run individual tests, like this:

   ./sandbox/u-boot -d ./sandbox/arch/sandbox/dts/test.dtb \
        -c "ut dm clk_periph"

We can use 'clk_periph' instead of 'dm_test_clk_periph'.

Also print a message if the requested test is not found.

Signed-off-by Simon Glass <[email protected]>

---

 test/dm/test-main.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

Add tests of each API call using a sandbox clock device.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts       |  4 ++
 arch/sandbox/include/asm/test.h | 11 ++++++
 configs/sandbox_defconfig       |  1 +
 drivers/clk/Makefile            |  1 +
 drivers/clk/clk_sandbox.c       | 85 +++++++++++++++++++++++++++++++++++++++++
 test/dm/Makefile                |  1 +
 test/dm/clk.c                   | 59 ++++++++++++++++++++++++++++
 7 files changed, 162 insertions(+)
 create mode 100644 drivers/clk/clk_sandbox.c
 create mode 100644 test/dm/clk.c

Add tests of each API call using a sandbox pinctrl device.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts               | 11 ++++-
 configs/sandbox_defconfig               |  1 +
 drivers/pinctrl/Makefile                |  1 +
 drivers/pinctrl/pinctrl_sandbox.c       | 80 +++++++++++++++++++++++++++++++++
 include/dt-bindings/clock/sandbox-clk.h | 10 +++++
 test/dm/Makefile                        |  1 +
 test/dm/pinctrl.c                       | 63 ++++++++++++++++++++++++++
 7 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 drivers/pinctrl/pinctrl_sandbox.c
 create mode 100644 include/dt-bindings/clock/sandbox-clk.h
 create mode 100644 test/dm/pinctrl.c

Add settings for the last reset generated, and the types of resets which are permitted. This will be used for testing.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/cpu/state.c         | 4 ++++
 arch/sandbox/include/asm/state.h | 3 +++
 2 files changed, 7 insertions(+)

Add a new reset_walk_halt() function to cause a reset and then halt on failure. The reset_walk() function returns an error code.

This is needed for testing since otherwise U-Boot will halt in the middle of a test.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/misc/reset-uclass.c | 31 +++++++++++++++++++++++++------
 include/reset.h             | 11 ++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

Add drivers for sandbox. One can only perform a warm reset (which does nothing). The other can perform a cold reset or a power reset (the latter will quit U-Boot). These can be used for testing the reset uclass.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/misc/Makefile        |   1 +
 drivers/misc/reset_sandbox.c | 100 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 drivers/misc/reset_sandbox.c

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Quoted 6 lines · Simon Glass

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 5 lines

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Applied to u-boot-dm.

Quoted 7 lines · Simon Glass

Quoted 6 lines · Simon Glass

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 7 lines

Quoted 5 lines

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Applied to u-boot-dm.

This patch causes the reset command to stop working in sandbox. It now prints:

=> reset
Reset not supported on this platform
### ERROR ### Please RESET the board ###

Among other things, this causes ./test/fs/fs-test.sh to hang without any particular indication why. (In that test, running under expect/pyexpect might be nicer, so the user could see progress; the error above doesn't even show up in the test log files).

Hi Stephen,

Quoted 19 lines · Stephen Warren

Quoted 7 lines · Simon Glass

Quoted 6 lines · Simon Glass

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 7 lines

Quoted 5 lines

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Applied to u-boot-dm.

This patch causes the reset command to stop working in sandbox. It now prints:

Quoted 8 lines

=> reset
Reset not supported on this platform
### ERROR ### Please RESET the board ###

Among other things, this causes ./test/fs/fs-test.sh to hang without any particular indication why. (In that test, running under expect/pyexpect might be nicer, so the user could see progress; the error above doesn't even show up in the test log files).

Yes I noticed the reset problem recently but haven't got back to it yet sorry. Ctrl-C works if you are at the command line, but will not fix the test.

One problem is that sandbox.dts needs a reset node, one of the ones from test.dts. Then at least 'u-boot -D' will work.

The other is that we need a U_BOOT_DEVICE() declaration for the reset controller. This is how drivers/serial/sandbox.c gets around this problem.

It would be good if we could run all the tests easily. At present it involves lots of steps and the method used to run each is different.

Quoted 42 lines · Simon Glass

Hi Stephen,

Quoted 19 lines · Stephen Warren

Quoted 7 lines · Simon Glass

Quoted 6 lines · Simon Glass

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 7 lines

Quoted 5 lines

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Applied to u-boot-dm.

This patch causes the reset command to stop working in sandbox. It now prints:

Quoted 8 lines

=> reset
Reset not supported on this platform
### ERROR ### Please RESET the board ###

Among other things, this causes ./test/fs/fs-test.sh to hang without any particular indication why. (In that test, running under expect/pyexpect might be nicer, so the user could see progress; the error above doesn't even show up in the test log files).

Yes I noticed the reset problem recently but haven't got back to it yet sorry. Ctrl-C works if you are at the command line, but will not fix the test.

One problem is that sandbox.dts needs a reset node, one of the ones from test.dts. Then at least 'u-boot -D' will work.

The other is that we need a U_BOOT_DEVICE() declaration for the reset controller. This is how drivers/serial/sandbox.c gets around this problem.

Quoted 2 lines

It would be good if we could run all the tests easily. At present it involves lots of steps and the method used to run each is different.

Any update on this? I had forgotten about this issue and just debugged the exact same problem again. Unfortunately, reverting this commit seems to make U-Boot hang() at early init time now, so I can't work around the issue either (unless I made a mistake implementing the revert; I'll try again).

https://github.com/swarren/u-boot/commit/2e41c317516e414326620374725a25b7b531d2e2

drivers/misc/reset_sandbox.c +2 -0

index 917121bc5e80..0208e11dbf3a 100644
@@ -40,8 +40,10 @@ static int sandbox_reset_request(struct udevice *dev, enum reset_t type)
         * (see the U_BOOT_DEVICE() declaration below) should not do anything.
         * If we are that device, return an error.
         */
+#if 0
        if (gd->fdt_blob && dev->of_offset == -1)
                return -ENODEV;
+#endif
 
        switch (type) {
        case RESET_COLD:

Quoted 43 lines · Stephen Warren

Quoted 42 lines · Simon Glass

Hi Stephen,

Quoted 19 lines · Stephen Warren

Quoted 7 lines · Simon Glass

Quoted 6 lines · Simon Glass

Move sandbox over to use the reset uclass for reset, instead of a direct call to do_reset(). This allows us to add tests.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 7 lines

Quoted 5 lines

 arch/sandbox/cpu/cpu.c                    | 9 +--------
 arch/sandbox/dts/test.dts                 | 8 ++++++++
 arch/sandbox/include/asm/u-boot-sandbox.h | 3 +++
 configs/sandbox_defconfig                 | 1 +
 4 files changed, 13 insertions(+), 8 deletions(-)

Applied to u-boot-dm.

This patch causes the reset command to stop working in sandbox. It now prints:

Quoted 8 lines

=> reset
Reset not supported on this platform
### ERROR ### Please RESET the board ###

Among other things, this causes ./test/fs/fs-test.sh to hang without any particular indication why. (In that test, running under expect/pyexpect might be nicer, so the user could see progress; the error above doesn't even show up in the test log files).

Yes I noticed the reset problem recently but haven't got back to it yet sorry. Ctrl-C works if you are at the command line, but will not fix the test.

One problem is that sandbox.dts needs a reset node, one of the ones from test.dts. Then at least 'u-boot -D' will work.

The other is that we need a U_BOOT_DEVICE() declaration for the reset controller. This is how drivers/serial/sandbox.c gets around this problem.

Quoted 8 lines

Quoted 2 lines

It would be good if we could run all the tests easily. At present it involves lots of steps and the method used to run each is different.

Any update on this? I had forgotten about this issue and just debugged the exact same problem again. Unfortunately, reverting this commit seems to make U-Boot hang() at early init time now, so I can't work around the issue either (unless I made a mistake implementing the revert; I'll try again).

The following hack makes reset work again. This sounds like something other than the issues you mentioned above?

Quoted 15 lines

https://github.com/swarren/u-boot/commit/2e41c317516e414326620374725a25b7b531d2e2

drivers/misc/reset_sandbox.c +2 -0

index 917121bc5e80..0208e11dbf3a 100644
@@ -40,8 +40,10 @@ static int sandbox_reset_request(struct udevice *dev, enum reset_t type)
         * (see the U_BOOT_DEVICE() declaration below) should not do anything.
         * If we are that device, return an error.
         */
+#if 0
        if (gd->fdt_blob && dev->of_offset == -1)
                return -ENODEV;
+#endif
 

drivers/misc/reset_sandbox.c static int sandbox_reset_request(struct udevice *dev, enum reset_t type) · line 49

Quoted 2 lines

drivers/misc/reset_sandbox.c +0 -0

        switch (type) {
        case RESET_COLD:

Add tests that confirm that the drivers work as expected, and we can walk through the available reset types trying to reset the board.

Signed-off-by Simon Glass <[email protected]>

---

 test/dm/Makefile |  1 +
 test/dm/reset.c  | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 test/dm/reset.c

Add a test to confirm that we can probe this device and get information on the available RAM.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts |  4 ++++
 configs/sandbox_defconfig |  1 +
 drivers/ram/Makefile      |  1 +
 drivers/ram/sandbox_ram.c | 38 ++++++++++++++++++++++++++++++++++++++
 test/dm/Makefile          |  1 +
 test/dm/ram.c             | 28 ++++++++++++++++++++++++++++
 6 files changed, 73 insertions(+)
 create mode 100644 drivers/ram/sandbox_ram.c
 create mode 100644 test/dm/ram.c

Add a test to confirm that we can probe this device. Since there is no MMC stack support in sandbox at present, this is as far as the test goes.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts |  4 ++++
 configs/sandbox_defconfig |  1 +
 drivers/mmc/Makefile      |  1 +
 drivers/mmc/sandbox_mmc.c | 25 +++++++++++++++++++++++++
 test/dm/Makefile          |  1 +
 test/dm/mmc.c             | 27 +++++++++++++++++++++++++++
 6 files changed, 59 insertions(+)
 create mode 100644 drivers/mmc/sandbox_mmc.c
 create mode 100644 test/dm/mmc.c

We normally use -ENODEV for a missing device, rather than -ENOENT. The latter is reserved for when we have a device but cannot find something within it.

Also avoid looking at the root LED device since it is only a container.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/led/led-uclass.c | 5 +++--
 include/led.h            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

Add a test to confirm that we can adjust LEDs using the led_gpio driver.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts | 14 +++++++++
 configs/sandbox_defconfig |  2 ++
 drivers/led/led_gpio.c    |  6 ++++
 test/dm/Makefile          |  1 +
 test/dm/led.c             | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+)
 create mode 100644 test/dm/led.c

Add a test to confirm that we can access system controllers and find their driver data.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts       | 10 ++++++++++
 arch/sandbox/include/asm/test.h |  8 ++++++++
 configs/sandbox_defconfig       |  1 +
 drivers/misc/Makefile           |  1 +
 drivers/misc/syscon_sandbox.c   | 27 +++++++++++++++++++++++++++
 test/dm/Makefile                |  1 +
 test/dm/syscon.c                | 31 +++++++++++++++++++++++++++++++
 7 files changed, 79 insertions(+)
 create mode 100644 drivers/misc/syscon_sandbox.c
 create mode 100644 test/dm/syscon.c

Each sandbox peripheral should have a size as well as a base address. This is required for regmaps to work, so make this change for all nodes that have an address.

Signed-off-by Simon Glass <[email protected]>

---

 arch/sandbox/dts/test.dts | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

Some functions can return ERR_PTR(errval). Add a unit test macro to check that no error is returned in a pointer.

Signed-off-by Simon Glass <[email protected]>

---

 include/test/ut.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

This function can only handle a syscon device. It is possible that someone will make a mistake, so add a check for this.

Also we should return -ENODEV when a device cannot be found, so update the syscon_get_regmap_by_driver_data() to follow this convention.

Signed-off-by Simon Glass <[email protected]>

---

 drivers/core/syscon-uclass.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

We use syscon to test that the regmap functions work as expected.

Signed-off-by Simon Glass <[email protected]>

---

 test/dm/Makefile |  1 +
 test/dm/regmap.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 test/dm/regmap.c