cmd: host: Print out the block size of the host device

It's useful if we can print out the block size of the host device
in the "host info" command.

Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/host.c b/cmd/host.c
index 2334ccd9bcbd01f5a63a44728ed1e466176bfba0..c33c2a9787eb36562c66d9267d1d9eea22ba5d93 100644 (file)
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -160,8 +160,8 @@ static void show_host_dev(struct udevice *dev)
                return;
 
        desc = dev_get_uclass_plat(blk);
-       printf("%12lu %-15s %s\n", (unsigned long)desc->lba, plat->label,
-              plat->filename);
+       printf("%12lu %6lu %-15s %s\n", (unsigned long)desc->lba, desc->blksz,
+              plat->label, plat->filename);
 }
 
 static int do_host_info(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -179,7 +179,8 @@ static int do_host_info(struct cmd_tbl *cmdtp, int flag, int argc,
                        return CMD_RET_FAILURE;
        }
 
-       printf("%3s %12s %-15s %s\n", "dev", "blocks", "label", "path");
+       printf("%3s %12s %6s %-15s %s\n",
+              "dev", "blocks", "blksz", "label", "path");
        if (dev) {
                show_host_dev(dev);
        } else {

diff --git a/test/dm/host.c b/test/dm/host.c
index 4f623d9b0404fb57e80311b7cb47385aece6932c..ca05a36b3136fbb6e6edb8a40b2b1bec6cfb3e5d 100644 (file)
--- a/test/dm/host.c
+++ b/test/dm/host.c
@@ -120,7 +120,7 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
 
        /* first check 'host info' with binding */
        ut_assertok(run_command("host info", 0));
-       ut_assert_nextline("dev       blocks label           path");
+       ut_assert_nextline("dev       blocks  blksz label           path");
        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "2MB.ext2.img"));
@@ -133,8 +133,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_asserteq(true, desc->removable);
 
        ut_assertok(run_command("host info", 0));
-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  0         4096 test2");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  0         4096    512 test2");
        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "1MB.fat32.img"));
@@ -147,9 +147,9 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_asserteq(false, desc->removable);
 
        ut_assertok(run_command("host info", 0));
-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  0         4096 test2");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  0         4096    512 test2");
+       ut_assert_nextlinen("  1         2048    512 fat");
        ut_assert_console_end();
 
        ut_asserteq(1, run_command("host info test", 0));
@@ -157,8 +157,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_assert_console_end();
 
        ut_assertok(run_command("host info fat", 0));
-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  1         2048    512 fat");
        ut_assert_console_end();
 
        /* check 'host dev' */
@@ -194,8 +194,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_assert_console_end();
 
        ut_assertok(run_command("host info", 0));
-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  1         2048    512 fat");
        ut_assert_console_end();
 
        return 0;