Merge tag 'for-v2020.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-i2c

[oweals/u-boot.git] / test / dm / sf.c

diff --git a/test/dm/sf.c b/test/dm/sf.c
index b23e7f8edd469c3e5a38a50352f47917e334e67f..7805af740ed5032f38c95dda016eb2c92858e897 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -4,6 +4,7 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <dm.h>
 #include <fdtdec.h>
 #include <mapmem.h>
@@ -11,6 +12,7 @@
 #include <spi.h>
 #include <spi_flash.h>
 #include <asm/state.h>
+#include <asm/test.h>
 #include <dm/test.h>
 #include <dm/util.h>
 #include <test/ut.h>
@@ -22,6 +24,9 @@ static int dm_test_spi_flash(struct unit_test_state *uts)
        int full_size = 0x200000;
        int size = 0x10000;
        u8 *src, *dst;
+       uint map_size;
+       ulong map_base;
+       uint offset;
        int i;
 
        src = map_sysmem(0x20000, full_size);
@@ -45,6 +50,20 @@ static int dm_test_spi_flash(struct unit_test_state *uts)
        ut_assertok(spi_flash_read_dm(dev, 0, size, dst));
        ut_assertok(memcmp(src, dst, size));
 
+       /* Try the write-protect stuff */
+       ut_assertok(uclass_first_device_err(UCLASS_SPI_EMUL, &emul));
+       ut_asserteq(0, spl_flash_get_sw_write_prot(dev));
+       sandbox_sf_set_block_protect(emul, 1);
+       ut_asserteq(1, spl_flash_get_sw_write_prot(dev));
+       sandbox_sf_set_block_protect(emul, 0);
+       ut_asserteq(0, spl_flash_get_sw_write_prot(dev));
+
+       /* Check mapping */
+       ut_assertok(dm_spi_get_mmap(dev, &map_base, &map_size, &offset));
+       ut_asserteq(0x1000, map_base);
+       ut_asserteq(0x2000, map_size);
+       ut_asserteq(0x100, offset);
+
        /*
         * Since we are about to destroy all devices, we must tell sandbox
         * to forget the emulation device
@@ -70,7 +89,7 @@ static int dm_test_spi_flash_func(struct unit_test_state *uts)
         * benefit is worth the extra complexity.
         */
        ut_asserteq(0, run_command_list(
-               "sb save hostfs - 0 spi.bin 200000;"
+               "host save hostfs - 0 spi.bin 200000;"
                "sf probe;"
                "sf test 0 10000", -1,  0));
        /*