* [PATCH v2 1/1] cmd: blkls: Add blkls command
@ 2020-03-27 14:13 Niel Fourie
2020-03-27 19:44 ` Simon Glass
2020-03-30 9:09 ` Stefan Roese
0 siblings, 2 replies; 3+ messages in thread
From: Niel Fourie @ 2020-03-27 14:13 UTC (permalink / raw)
To: u-boot
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 <lusus@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
---
Changes in v2:
- Removed legacy block device variant of blkls and its test.
- Handle return value of uclass_get().
- Removed unnecessary ifdefs, fixed Kconfig depends.
cmd/Kconfig | 8 ++++++
cmd/Makefile | 1 +
cmd/lsblk.c | 52 +++++++++++++++++++++++++++++++++++++
test/py/tests/test_lsblk.py | 13 ++++++++++
4 files changed, 74 insertions(+)
create mode 100644 cmd/lsblk.c
create mode 100644 test/py/tests/test_lsblk.py
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 6403bc45a5..891299b9b6 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1047,6 +1047,14 @@ config CMD_LOADS
help
Load an S-Record file over serial line
+config CMD_LSBLK
+ depends on BLK
+ 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
diff --git a/cmd/Makefile b/cmd/Makefile
index f1dd513a4b..6f80974a55 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -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
diff --git a/cmd/lsblk.c b/cmd/lsblk.c
new file mode 100644
index 0000000000..3c1630710c
--- /dev/null
+++ b/cmd/lsblk.c
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.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>
+
+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 ret, i;
+
+ ret = uclass_get(UCLASS_BLK, &uc);
+ if (ret) {
+ puts("Could not get BLK uclass.\n");
+ return CMD_RET_FAILURE;
+ }
+ puts("Block Driver Devices\n");
+ puts("-----------------------------\n");
+ 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;
+}
+
+U_BOOT_CMD(lsblk, 1, 0, do_lsblk, "list block drivers and devices",
+ "- display list of block device drivers and attached block devices"
+);
diff --git a/test/py/tests/test_lsblk.py b/test/py/tests/test_lsblk.py
new file mode 100644
index 0000000000..80f43ff1ed
--- /dev/null
+++ b/test/py/tests/test_lsblk.py
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020
+# Niel Fourie, DENX Software Engineering, lusus at denx.de
+
+import pytest
+
+ 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
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 1/1] cmd: blkls: Add blkls command
2020-03-27 14:13 [PATCH v2 1/1] cmd: blkls: Add blkls command Niel Fourie
@ 2020-03-27 19:44 ` Simon Glass
2020-03-30 9:09 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2020-03-27 19:44 UTC (permalink / raw)
To: u-boot
On Fri, 27 Mar 2020 at 08:14, Niel Fourie <lusus@denx.de> wrote:
>
> 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 <lusus@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Stefan Roese <sr@denx.de>
> ---
> Changes in v2:
> - Removed legacy block device variant of blkls and its test.
> - Handle return value of uclass_get().
> - Removed unnecessary ifdefs, fixed Kconfig depends.
>
> cmd/Kconfig | 8 ++++++
> cmd/Makefile | 1 +
> cmd/lsblk.c | 52 +++++++++++++++++++++++++++++++++++++
> test/py/tests/test_lsblk.py | 13 ++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 cmd/lsblk.c
> create mode 100644 test/py/tests/test_lsblk.py
Reviewed-by: Simon Glass <sjg@chromium.org>
nits below
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 6403bc45a5..891299b9b6 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1047,6 +1047,14 @@ config CMD_LOADS
> help
> Load an S-Record file over serial line
>
> +config CMD_LSBLK
> + depends on BLK
> + bool "lsblk - list block drivers and devices"
> + default n
You can omit this since it is the default anyway.
> + help
> + Print list of available block device drivers, and for each, the list
> + of known block devices.
> +
> config CMD_MMC
> bool "mmc"
> help
> diff --git a/cmd/Makefile b/cmd/Makefile
> index f1dd513a4b..6f80974a55 100644
> --- a/cmd/Makefile
> +++ b/cmd/Makefile
> @@ -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
> diff --git a/cmd/lsblk.c b/cmd/lsblk.c
> new file mode 100644
> index 0000000000..3c1630710c
> --- /dev/null
> +++ b/cmd/lsblk.c
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * (C) Copyright 2020
> + * Niel Fourie, DENX Software Engineering, lusus at denx.de.
> + */
> +
> +#include <config.h>
You can drop this
> +#include <common.h>
> +#include <dm/uclass.h>
> +#include <dm/device.h>
You can replace both of these with <dm.h>
> +
> +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 ret, i;
> +
> + ret = uclass_get(UCLASS_BLK, &uc);
> + if (ret) {
> + puts("Could not get BLK uclass.\n");
> + return CMD_RET_FAILURE;
> + }
> + puts("Block Driver Devices\n");
> + puts("-----------------------------\n");
> + 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");
> + }
blank line before return
> + return CMD_RET_SUCCESS;
> +}
> +
> +U_BOOT_CMD(lsblk, 1, 0, do_lsblk, "list block drivers and devices",
> + "- display list of block device drivers and attached block devices"
> +);
> diff --git a/test/py/tests/test_lsblk.py b/test/py/tests/test_lsblk.py
> new file mode 100644
> index 0000000000..80f43ff1ed
> --- /dev/null
> +++ b/test/py/tests/test_lsblk.py
> @@ -0,0 +1,13 @@
> +# SPDX-License-Identifier: GPL-2.0
2.0+ ?
> +# Copyright (C) 2020
> +# Niel Fourie, DENX Software Engineering, lusus at denx.de
> +
> +import pytest
> +
> + 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
> --
> 2.25.1
>
Regards,
Simon
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v2 1/1] cmd: blkls: Add blkls command
2020-03-27 14:13 [PATCH v2 1/1] cmd: blkls: Add blkls command Niel Fourie
2020-03-27 19:44 ` Simon Glass
@ 2020-03-30 9:09 ` Stefan Roese
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2020-03-30 9:09 UTC (permalink / raw)
To: u-boot
Hi Niel,
On 27.03.20 15:13, Niel Fourie wrote:
> 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 <lusus@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Stefan Roese <sr@denx.de>
> ---
> Changes in v2:
> - Removed legacy block device variant of blkls and its test.
> - Handle return value of uclass_get().
> - Removed unnecessary ifdefs, fixed Kconfig depends.
After addressing Simons comments, feel free to add my:
Reviewed-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
> cmd/Kconfig | 8 ++++++
> cmd/Makefile | 1 +
> cmd/lsblk.c | 52 +++++++++++++++++++++++++++++++++++++
> test/py/tests/test_lsblk.py | 13 ++++++++++
> 4 files changed, 74 insertions(+)
> create mode 100644 cmd/lsblk.c
> create mode 100644 test/py/tests/test_lsblk.py
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 6403bc45a5..891299b9b6 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -1047,6 +1047,14 @@ config CMD_LOADS
> help
> Load an S-Record file over serial line
>
> +config CMD_LSBLK
> + depends on BLK
> + 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
> diff --git a/cmd/Makefile b/cmd/Makefile
> index f1dd513a4b..6f80974a55 100644
> --- a/cmd/Makefile
> +++ b/cmd/Makefile
> @@ -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
> diff --git a/cmd/lsblk.c b/cmd/lsblk.c
> new file mode 100644
> index 0000000000..3c1630710c
> --- /dev/null
> +++ b/cmd/lsblk.c
> @@ -0,0 +1,52 @@
> +// SPDX-License-Identifier: GPL-2.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>
> +
> +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 ret, i;
> +
> + ret = uclass_get(UCLASS_BLK, &uc);
> + if (ret) {
> + puts("Could not get BLK uclass.\n");
> + return CMD_RET_FAILURE;
> + }
> + puts("Block Driver Devices\n");
> + puts("-----------------------------\n");
> + 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;
> +}
> +
> +U_BOOT_CMD(lsblk, 1, 0, do_lsblk, "list block drivers and devices",
> + "- display list of block device drivers and attached block devices"
> +);
> diff --git a/test/py/tests/test_lsblk.py b/test/py/tests/test_lsblk.py
> new file mode 100644
> index 0000000000..80f43ff1ed
> --- /dev/null
> +++ b/test/py/tests/test_lsblk.py
> @@ -0,0 +1,13 @@
> +# SPDX-License-Identifier: GPL-2.0
> +# Copyright (C) 2020
> +# Niel Fourie, DENX Software Engineering, lusus at denx.de
> +
> +import pytest
> +
> + 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
>
Viele Gr??e,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-30 9:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-27 14:13 [PATCH v2 1/1] cmd: blkls: Add blkls command Niel Fourie
2020-03-27 19:44 ` Simon Glass
2020-03-30 9:09 ` Stefan Roese
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.