cmd: blkls: Add blkls command
PATCH 1/1 cmd: blkls: Add blkls command
Add a command to print a list of available block device drivers, and for each, the list of known block devices.
--- cmd/Kconfig | 8 ++++ cmd/Makefile | 1 + cmd/lsblk.c | 83 +++++++++++++++++++++++++++++++++++++ test/py/tests/test_lsblk.py | 23 ++++++++++ 4 files changed, 115 insertions(+) create mode 100644 cmd/lsblk.c create mode 100644 test/py/tests/test_lsblk.py
cmd/Kconfig +8 -0
@@ -1047,6 +1047,14 @@ config CMD_LOADS help Load an S-Record file over serial line +config CMD_LSBLK + depends on HAVE_BLOCK_DEVICE + bool "lsblk - list block drivers and devices" + default n + help + Print list of available block device drivers, and for each, the list + of known block devices. + config CMD_MMC bool "mmc" help
cmd/Makefile +1 -0
@@ -83,6 +83,7 @@ obj-$(CONFIG_CMD_LED) += led.o obj-$(CONFIG_CMD_LICENSE) += license.o obj-y += load.o obj-$(CONFIG_CMD_LOG) += log.o +obj-$(CONFIG_CMD_LSBLK) += lsblk.o obj-$(CONFIG_ID_EEPROM) += mac.o obj-$(CONFIG_CMD_MD5SUM) += md5sum.o obj-$(CONFIG_CMD_MEMORY) += mem.o
cmd/lsblk.c new file +83 -0
83 lines not on this page · raw message
test/py/tests/test_lsblk.py new file +23 -0
@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 +# Niel Fourie, DENX Software Engineering, lusus at denx.de + +import pytest + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.buildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output + assert "sandbox_host_blk" in output + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.notbuildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk_legacy(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output + assert "host" in output
Signature · 1 line
2.25.1
PATCH 1/1 cmd: blkls: Add blkls command
Hi Niel,
Quoted 18 lines · Niel Fourie
Add a command to print a list of available block device drivers, and for each, the list of known block devices.
Signed-off-by Niel Fourie <[email protected]>--- cmd/Kconfig | 8 ++++ cmd/Makefile | 1 + cmd/lsblk.c | 83 +++++++++++++++++++++++++++++++++++++ test/py/tests/test_lsblk.py | 23 ++++++++++ 4 files changed, 115 insertions(+)create mode 100644
cmd/lsblk.c
create mode 100644test/py/tests/test_lsblk.pycmd/Kconfig +0
-0
cmd/Kconfig config CMD_LOADS · line 1051
Quoted 5 lines
cmd/Kconfig +2
-0@@ -1047,6 +1047,14 @@ config CMD_LOADS help Load an S-Record file over serial line +config CMD_LSBLK + depends on HAVE_BLOCK_DEVICE
You depend on CONFIG_HAVE_BLOCK_DEVICE here...
Quoted 29 lines
cmd/Kconfig +6
-0+ bool "lsblk - list block drivers and devices" + default n + help + Print list of available block device drivers, and for each, the list + of known block devices. + config CMD_MMC bool "mmc" helpcmd/Makefile +1
-0@@ -83,6 +83,7 @@ obj-$(CONFIG_CMD_LED) += led.o obj-$(CONFIG_CMD_LICENSE) += license.o obj-y += load.o obj-$(CONFIG_CMD_LOG) += log.o +obj-$(CONFIG_CMD_LSBLK) += lsblk.o obj-$(CONFIG_ID_EEPROM) += mac.o obj-$(CONFIG_CMD_MD5SUM) += md5sum.o obj-$(CONFIG_CMD_MEMORY) += mem.ocmd/lsblk.c new file +2
-0@@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
cmd/lsblk.c line 12
Quoted 10 lines
cmd/lsblk.c new file +10
-0+* (C) Copyright 2020 +* Niel Fourie, DENX Software Engineering, lusus at denx.de. +*/ + +#include <config.h> +#include <common.h> +#include <dm/uclass.h> +#include <dm/device.h> + +#if CONFIG_IS_ENABLED (HAVE_BLOCK_DEVICE )
... so this #ifdef should not be necessary, right?
Thanks,
Stefan
Quoted 101 lines
cmd/lsblk.c new file +71
-0+#if CONFIG_IS_ENABLED (BLK ) +static int do_lsblk (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ + struct driver *d = ll_entry_start(struct driver, driver); + const int n_ents = ll_entry_count(struct driver, driver); +struct driver *entry; +struct udevice *udev; +struct uclass *uc; +struct blk_desc *desc; +int i; + +puts ("Block Driver Devices\n" ); +puts ("-----------------------------\n" ); +uclass_get (UCLASS_BLK , &uc); +for (entry = d; entry < d + n_ents; entry++) { +if (entry->id !=UCLASS_BLK ) +continue ; + i =0 ; +printf ("%-20.20s" , entry->name); + uclass_foreach_dev(udev, uc) { +if (udev->driver != entry) +continue ; + desc =dev_get_uclass_platdata (udev); +printf ("%c %s %u" , i ?',' :':' , +blk_get_if_type_name (desc->if_type), + desc->devnum); + i++; + } +if (!i) +puts (": <none>" ); +puts ("\n" ); + } +return CMD_RET_SUCCESS ; +} +#else +static int do_lsblk (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ + struct blk_driver *drv = ll_entry_start(struct blk_driver, blk_driver); + const int n_ents = ll_entry_count(struct blk_driver, blk_driver); +struct blk_driver *entry; +struct blk_desc *desc; +int i, j; + +puts ("Block Driver Devices\n" ); +puts ("-----------------------------\n" ); +for (entry = drv; entry != drv + n_ents; entry++) { + i =0 ; +printf ("%-20.20s" , entry->if_typename); +for (j =0 ; j < entry->max_devs; j++) { + desc = &entry->desc[j]; +if (!entry->get_dev) +continue ; +if (entry->get_dev (j, &desc)) +continue ; +if (desc->type ==DEV_TYPE_UNKNOWN ) +continue ; +printf ("%c %s %u" , i ?',' :':' , entry->if_typename, + desc->devnum); + i++; + } +if (!i) +puts (": <none>" ); +puts ("\n" ); + } +return CMD_RET_SUCCESS ; +} +#endif /* CONFIG_IS_ENABLED(BLK) */ +U_BOOT_CMD (lsblk,1 ,0 , do_lsblk,"list block drivers and devices" , +"- display list of block device drivers and attached block devices" +); +#endif /* CONFIG_IS_ENABLED(HAVE_BLOCK_DEVICE) */ test/py/tests/test_lsblk.py new file +23
-0@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 +# Niel Fourie, DENX Software Engineering, lusus at denx.de + +import pytest + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.buildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output + assert "sandbox_host_blk" in output + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.notbuildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk_legacy(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output + assert "host" in output
PATCH 1/1 cmd: blkls: Add blkls command
Hi Stefan,
Quoted 9 lines · Stefan Roese
Quoted 2 lines
+config
CMD_LSBLK
+??? depends onHAVE_BLOCK_DEVICEYou depend on
CONFIG_HAVE_BLOCK_DEVICEhere...Review
Quoted 2 lines
(quoted diff) +2
-0+ +#if CONFIG_IS_ENABLED(HAVE_BLOCK_DEVICE)... so this #ifdef should not be necessary, right?
Oops, you are right... I forgot to take out the #ifdef after adding the Kconfig dependency. Will fix. Well spotted, thanks!
Best regards,
Niel Fourie
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-21 Fax: +49-8142-66989-80 Email: lusus at denx.de
PATCH 1/1 cmd: blkls: Add blkls command
In reply to Niel FourieHi Niel,
Quoted 19 lines · Niel Fourie
Add a command to print a list of available block device drivers, and for each, the list of known block devices.
Signed-off-by Niel Fourie <[email protected]>--- cmd/Kconfig | 8 ++++ cmd/Makefile | 1 + cmd/lsblk.c | 83 +++++++++++++++++++++++++++++++++++++ test/py/tests/test_lsblk.py | 23 ++++++++++ 4 files changed, 115 insertions(+) create mode 100644 cmd/lsblk.c create mode 100644 test/py/tests/test_lsblk.pycmd/Kconfig +0
-0
cmd/Kconfig config CMD_LOADS · line 1051
Quoted 5 lines
cmd/Kconfig +2
-0@@ -1047,6 +1047,14 @@ config CMD_LOADS help Load an S-Record file over serial line +config CMD_LSBLK + depends on HAVE_BLOCK_DEVICE
depends on BLK
(the migration date has passed so we MUST NOT add new features that don't use BLK)
Quoted 30 lines
cmd/Kconfig +6
-0+ bool "lsblk - list block drivers and devices" + default n + help + Print list of available block device drivers, and for each, the list + of known block devices. + config CMD_MMC bool "mmc" helpcmd/Makefile +1
-0@@ -83,6 +83,7 @@ obj-$(CONFIG_CMD_LED) += led.o obj-$(CONFIG_CMD_LICENSE) += license.o obj-y += load.o obj-$(CONFIG_CMD_LOG) += log.o +obj-$(CONFIG_CMD_LSBLK) += lsblk.o obj-$(CONFIG_ID_EEPROM) += mac.o obj-$(CONFIG_CMD_MD5SUM) += md5sum.o obj-$(CONFIG_CMD_MEMORY) += mem.ocmd/lsblk.c new file +3
-0@@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2020
cmd/lsblk.c line 13
Quoted 10 lines
cmd/lsblk.c new file +10
-0+* Niel Fourie, DENX Software Engineering, lusus at denx.de. +*/ + +#include <config.h> +#include <common.h> +#include <dm/uclass.h> +#include <dm/device.h> + +#if CONFIG_IS_ENABLED (HAVE_BLOCK_DEVICE ) +#if CONFIG_IS_ENABLED (BLK )
drop these I think
cmd/lsblk.c line 26
Quoted 13 lines
cmd/lsblk.c new file +13
-0+static int do_lsblk (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ + struct driver *d = ll_entry_start(struct driver, driver); + const int n_ents = ll_entry_count(struct driver, driver); +struct driver *entry; +struct udevice *udev; +struct uclass *uc; +struct blk_desc *desc; +int i; + +puts ("Block Driver Devices\n" ); +puts ("-----------------------------\n" ); +uclass_get (UCLASS_BLK , &uc);
Check return value
Quoted 12 lines
cmd/lsblk.c new file +12
-0+for (entry = d; entry < d + n_ents; entry++) { +if (entry->id !=UCLASS_BLK ) +continue ; + i =0 ; +printf ("%-20.20s" , entry->name); + uclass_foreach_dev(udev, uc) { +if (udev->driver != entry) +continue ; + desc =dev_get_uclass_platdata (udev); +printf ("%c %s %u" , i ?',' :':' , +blk_get_if_type_name (desc->if_type), + desc->devnum);
cmd/lsblk.c line 48
Quoted 10 lines
cmd/lsblk.c new file +10
-0+ i++; + } +if (!i) +puts (": <none>" ); +puts ("\n" ); + } +return CMD_RET_SUCCESS ; +} +#else +static int do_lsblk (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[])
Drop this function
Quoted 54 lines
cmd/lsblk.c new file +35
-0+{ + struct blk_driver *drv = ll_entry_start(struct blk_driver, blk_driver); + const int n_ents = ll_entry_count(struct blk_driver, blk_driver); +struct blk_driver *entry; +struct blk_desc *desc; +int i, j; + +puts ("Block Driver Devices\n" ); +puts ("-----------------------------\n" ); +for (entry = drv; entry != drv + n_ents; entry++) { + i =0 ; +printf ("%-20.20s" , entry->if_typename); +for (j =0 ; j < entry->max_devs; j++) { + desc = &entry->desc[j]; +if (!entry->get_dev) +continue ; +if (entry->get_dev (j, &desc)) +continue ; +if (desc->type ==DEV_TYPE_UNKNOWN ) +continue ; +printf ("%c %s %u" , i ?',' :':' , entry->if_typename, + desc->devnum); + i++; + } +if (!i) +puts (": <none>" ); +puts ("\n" ); + } +return CMD_RET_SUCCESS ; +} +#endif /* CONFIG_IS_ENABLED(BLK) */ +U_BOOT_CMD (lsblk,1 ,0 , do_lsblk,"list block drivers and devices" , +"- display list of block device drivers and attached block devices" +); +#endif /* CONFIG_IS_ENABLED(HAVE_BLOCK_DEVICE) */ test/py/tests/test_lsblk.py new file +13
-0@@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2020 +# Niel Fourie, DENX Software Engineering, lusus at denx.de + +import pytest + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.buildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output
test/py/tests/test_lsblk.py line 23
Quoted 10 lines
test/py/tests/test_lsblk.py new file +10
-0+ assert "sandbox_host_blk" in output + + at pytest.mark.buildconfigspec('have_block_device') + at pytest.mark.notbuildconfigspec('blk') + at pytest.mark.buildconfigspec('cmd_lsblk') +def test_lsblk_legacy(u_boot_console): + """Test that `lsblk` prints a result which includes `host`.""" + output = u_boot_console.run_command('lsblk') + assert "Block Driver" in output + assert "host" in output
Drop this test
Quoted 3 lines
--
2.25.1
Regards,
Simon