Skip to contentSkip to conversation

cmd: add driver, fs and part type listing commands

PATCH New Niel Fourie 4 participants 10 messages Mar 24, 2020 – Jul 8, 2020 VFS

lore
Share & tools
lore
#0 lore raw

v3 cover cmd: add driver, fs and part type listing commands

This series adds commands for listing the supported partition tables, listing supported filesystems and expands Driver Model listing commands.

The existing "dm drivers" command, which lists the DM drivers and their compatibility strings, segmentation faulted on drivers for which of_match was unpopulated (which appears to not be uncommon). This was fixed, and the command was renamed "dm compat", and a new more extensive "dm drivers" command was added, which list all DM drivers and for each, their uclass id, uclass driver and the device names for active driver instances. The purpose is show available drivers, but also to highlight unused drivers or drivers with uclass ids without uclass drivers, etc.

The following commands were added:
-"part types", lists partition tables supported
-"fstypes", lists filesystem types supported
-"dm compat", lists drivers and their compatibility strings (equivalent
to existing "dm drivers" command)
-"dm drivers", lists all DM drivers, and for each their uclass id,
uclass driver and the device names for active driver instances.
-"dm static", lists all DM drivers which use static platform data
(instead of the device tree).

These patches were tested in the Sandbox and on the Wandboard i.MX6Quad Board rev B1.

Changes in v2:
- Rebased on https://patchwork.ozlabs.org/patch/1234460/
- Added Python tests
- Fixed minor typographical errors
Changes in v3:
- Rewrote comment for do_fs_types() in fs.h

Niel Fourie (3):
cmd: part: Add subcommand to list supported partition tables
cmd: fs: Add command to list supported fs types
cmd: dm: Fixed/Added DM driver listing subcommands

 cmd/dm.c                             | 22 ++++++++++-
 cmd/fs.c                             | 11 ++++++
 cmd/part.c                           | 27 +++++++++++++-
 drivers/core/dump.c                  | 55 +++++++++++++++++++++++++++-
 fs/fs.c                              | 20 ++++++++++
 include/dm/util.h                    |  6 +++
 include/fs.h                         | 11 ++++++
 test/py/tests/test_dm.py             | 22 ++++++++++-
 test/py/tests/test_fs/test_fs_cmd.py | 12 ++++++
 test/py/tests/test_part.py           | 14 +++++++
 10 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 test/py/tests/test_fs/test_fs_cmd.py
 create mode 100644 test/py/tests/test_part.py
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 1/3 cmd: part: Add subcommand to list supported partition tables

Add a subcommand "types" to the part command, which lists the supported partition table types.

---
Changes in v2:
- Add Python test
Changes in v3:
- none

 cmd/part.c                 | 27 +++++++++++++++++++++++++--
 test/py/tests/test_part.py | 14 ++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 test/py/tests/test_part.py
cmd/part.c +25 -2
index 5e4e45ca6d..fae5df7b71 100644
@@ -182,6 +182,26 @@ static int do_part_number(int argc, char * const argv[])
 	return do_part_info(argc, argv, CMD_PART_INFO_NUMBER);
 }
 
+static int do_part_types(int argc, char * const argv[])
+{
+	struct part_driver *drv = ll_entry_start(struct part_driver,
+						 part_driver);
+	const int n_ents = ll_entry_count(struct part_driver, part_driver);
+	struct part_driver *entry;
+	int i = 0;
+
+	puts("Supported partition tables");
+
+	for (entry = drv; entry != drv + n_ents; entry++) {
+		printf("%c %s", i ? ',' : ':', entry->name);
+		i++;
+	}
+	if (!i)
+		puts(": <none>");
+	puts("\n");
+	return CMD_RET_SUCCESS;
+}
+
 static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	if (argc < 2)
@@ -197,7 +217,8 @@ static int do_part(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		return do_part_size(argc - 2, argv + 2);
 	else if (!strcmp(argv[1], "number"))
 		return do_part_number(argc - 2, argv + 2);
-
+	else if (!strcmp(argv[1], "types"))
+		return do_part_types(argc - 2, argv + 2);
 	return CMD_RET_USAGE;
 }
 
@@ -221,5 +242,7 @@ U_BOOT_CMD(
 	"      part can be either partition number or partition name\n"
 	"part number <interface> <dev> <part> <varname>\n"
 	"    - set environment variable to the partition number using the partition name\n"
-	"      part must be specified as partition name"
+	"      part must be specified as partition name\n"
+	"part types\n"
+	"    - list supported partition table types"
 );
test/py/tests/test_part.py new file +14 -0
new file mode 100644
index 0000000000..cba9804510
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020
+# Niel Fourie, DENX Software Engineering, lusus at denx.de
+
+import pytest
+
+ at pytest.mark.buildconfigspec('cmd_part')
+ at pytest.mark.buildconfigspec('partitions')
+ at pytest.mark.buildconfigspec('efi_partition')
+def test_dm_compat(u_boot_console):
+    """Test that `part types` prints a result which includes `EFI`."""
+    output = u_boot_console.run_command('part types')
+    assert "Supported partition tables:" in output
+    assert "EFI" in output
Signature · 1 line
2.25.1
#2 lore raw

PATCH v3 1/3 cmd: part: Add subcommand to list supported partition tables

Quoted 6 lines · Niel Fourie

Add a subcommand "types" to the part command, which lists the supported partition table types.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/2956b14b/attachment.sig>
#3 lore raw

PATCH v3 2/3 cmd: fs: Add command to list supported fs types

In reply to Niel Fourie

Added command "fstypes" to list supported/included filesystems.

---
Changes in v2:
- Add Python test
Changes in v3:
- Rewrote comment for do_fs_types() in fs.h

 cmd/fs.c                             | 11 +++++++++++
 fs/fs.c                              | 20 ++++++++++++++++++++
 include/fs.h                         | 11 +++++++++++
 test/py/tests/test_fs/test_fs_cmd.py | 12 ++++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 test/py/tests/test_fs/test_fs_cmd.py
cmd/fs.c +11 -0
index db74767b7b..26b47bd001 100644
@@ -99,3 +99,14 @@ U_BOOT_CMD(
 	"fstype <interface> <dev>:<part> <varname>\n"
 	"- set environment variable to filesystem type\n"
 );
+
+static int do_fstypes_wrapper(cmd_tbl_t *cmdtp, int flag, int argc,
+			      char * const argv[])
+{
+	return do_fs_types(cmdtp, flag, argc, argv);
+}
+
+U_BOOT_CMD(
+	fstypes, 1, 1, do_fstypes_wrapper,
+	"List supported filesystem types", ""
+);
fs/fs.c +20 -0
index 0c66d60477..3e38b2e27a 100644
@@ -900,3 +900,23 @@ int do_ln(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 
 	return 0;
 }
+
+int do_fs_types(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	struct fstype_info *drv = fstypes;
+	const int n_ents = ARRAY_SIZE(fstypes);
+	struct fstype_info *entry;
+	int i = 0;
+
+	puts("Supported filesystems");
+	for (entry = drv; entry != drv + n_ents; entry++) {
+		if (entry->fstype != FS_TYPE_ANY) {
+			printf("%c %s", i ? ',' : ':', entry->name);
+			i++;
+		}
+	}
+	if (!i)
+		puts(": <none>");
+	puts("\n");
+	return CMD_RET_SUCCESS;
+}
include/fs.h +11 -0
index 37e35c2120..514c248e50 100644
@@ -254,4 +254,15 @@ int do_fs_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
  */
 int do_fs_type(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
+/**
+ * do_fs_types - List supported filesystems.
+ *
+ * @cmdtp: Command information for fstypes
+ * @flag: Command flags (CMD_FLAG_...)
+ * @argc: Number of arguments
+ * @argv: List of arguments
+ * @return result (see enum command_ret_t)
+ */
+int do_fs_types(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+
 #endif /* _FS_H */
test/py/tests/test_fs/test_fs_cmd.py new file +12 -0
new file mode 100644
index 0000000000..86ba92e025
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020
+# Niel Fourie, DENX Software Engineering, lusus at denx.de
+
+import pytest
+
+ at pytest.mark.buildconfigspec('cmd_fs_generic')
+def test_dm_compat(u_boot_console):
+    """Test that `fstypes` prints a result which includes `sandbox`."""
+    output = u_boot_console.run_command('fstypes')
+    assert "Supported filesystems:" in output
+    assert "sandbox" in output
Signature · 1 line
2.25.1
#4 lore raw

PATCH v3 2/3 cmd: fs: Add command to list supported fs types

Quoted 5 lines · Niel Fourie

Added command "fstypes" to list supported/included filesystems.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/9336c9c3/attachment.sig>
#5 lore raw

PATCH v3 3/3 cmd: dm: Fixed/Added DM driver listing subcommands

In reply to Niel Fourie

Renamed dm "drivers" subcommand to "compat" (as it listed compatibility strings) and prevent it from segfaulting when drivers have no of_match populated.

Added a new "drivers" subcommand to dump a list of all known DM drivers and for each, their uclass id, uclass driver and names of attached devices.

Added a new "static" subcommand to dump a list of DM drivers with statically defined platform data.

---
Depends on: https://patchwork.ozlabs.org/patch/1234460/

Changes in v2:
- Add/extend Python tests
- Fixed minor formatting/typographical errors
Changes in v3:
- none

 cmd/dm.c                 | 22 +++++++++++++++-
 drivers/core/dump.c      | 55 +++++++++++++++++++++++++++++++++++++++-
 include/dm/util.h        |  6 +++++
 test/py/tests/test_dm.py | 22 ++++++++++++++--
 4 files changed, 101 insertions(+), 4 deletions(-)
cmd/dm.c +21 -1
index 7a90685f8b..fa7eba6a17 100644
@@ -48,11 +48,29 @@ static int do_dm_dump_drivers(cmd_tbl_t *cmdtp, int flag, int argc,
 	return 0;
 }
 
+static int do_dm_dump_driver_compat(cmd_tbl_t *cmdtp, int flag, int argc,
+				    char * const argv[])
+{
+	dm_dump_driver_compat();
+
+	return 0;
+}
+
+static int do_dm_dump_static_driver_info(cmd_tbl_t *cmdtp, int flag, int argc,
+					 char * const argv[])
+{
+	dm_dump_static_driver_info();
+
+	return 0;
+}
+
 static cmd_tbl_t test_commands[] = {
 	U_BOOT_CMD_MKENT(tree, 0, 1, do_dm_dump_all, "", ""),
 	U_BOOT_CMD_MKENT(uclass, 1, 1, do_dm_dump_uclass, "", ""),
 	U_BOOT_CMD_MKENT(devres, 1, 1, do_dm_dump_devres, "", ""),
 	U_BOOT_CMD_MKENT(drivers, 1, 1, do_dm_dump_drivers, "", ""),
+	U_BOOT_CMD_MKENT(compat, 1, 1, do_dm_dump_driver_compat, "", ""),
+	U_BOOT_CMD_MKENT(static, 1, 1, do_dm_dump_static_driver_info, "", ""),
 };
 
 static __maybe_unused void dm_reloc(void)
@@ -94,5 +112,7 @@ U_BOOT_CMD(
 	"tree          Dump driver model tree ('*' = activated)\n"
 	"dm uclass        Dump list of instances for each uclass\n"
 	"dm devres        Dump list of device resources for each device\n"
-	"dm drivers       Dump list of drivers and their compatible strings"
+	"dm drivers       Dump list of drivers with uclass and instances\n"
+	"dm compat        Dump list of drivers with compatibility strings\n"
+	"dm static        Dump list of drivers with static platform data"
 );
drivers/core/dump.c +54 -1

64 lines not on this page · raw message

include/dm/util.h +6 -0
index 0ccb3fbadf..974347ce0b 100644
@@ -42,6 +42,12 @@ static inline void dm_dump_devres(void)
 /* Dump out a list of drivers */
 void dm_dump_drivers(void);
 
+/* Dump out a list with each driver's compatibility strings */
+void dm_dump_driver_compat(void);
+
+/* Dump out a list of drivers with static platform data */
+void dm_dump_static_driver_info(void);
+
 /**
  * Check if an of node should be or was bound before relocation.
  *
test/py/tests/test_dm.py +20 -2
index f6fbf8ba4c..97203b536e 100644
@@ -4,14 +4,32 @@
 import pytest
 
 @pytest.mark.buildconfigspec('cmd_dm')
-def test_dm_drivers(u_boot_console):
-    """Test that each driver in `dm tree` is also listed in `dm drivers`."""
+def test_dm_compat(u_boot_console):
+    """Test that each driver in `dm tree` is also listed in `dm compat`."""
     response = u_boot_console.run_command('dm tree')
     driver_index = response.find('Driver')
     assert driver_index != -1
     drivers = (line[driver_index:].split()[0]
                for line in response[:-1].split('\n')[2:])
 
+    response = u_boot_console.run_command('dm compat')
+    for driver in drivers:
+        assert driver in response
+
+ at pytest.mark.buildconfigspec('cmd_dm')
+def test_dm_drivers(u_boot_console):
+    """Test that each driver in `dm compat` is also listed in `dm drivers`."""
+    response = u_boot_console.run_command('dm compat')
+    drivers = (line[:20].rstrip() for line in response[:-1].split('\n')[2:])
+    response = u_boot_console.run_command('dm drivers')
+    for driver in drivers:
+        assert driver in response
+
+ at pytest.mark.buildconfigspec('cmd_dm')
+def test_dm_static(u_boot_console):
+    """Test that each driver in `dm static` is also listed in `dm drivers`."""
+    response = u_boot_console.run_command('dm static')
+    drivers = (line[:25].rstrip() for line in response[:-1].split('\n')[2:])
     response = u_boot_console.run_command('dm drivers')
     for driver in drivers:
         assert driver in response
Signature · 1 line
2.25.1
#6 lore raw

PATCH v3 3/3 cmd: dm: Fixed/Added DM driver listing subcommands

Quoted 8 lines · Niel Fourie

Renamed dm "drivers" subcommand to "compat" (as it listed compatibility strings) and prevent it from segfaulting when drivers have no of_match populated.

Added a new "drivers" subcommand to dump a list of all known DM drivers and for each, their uclass id, uclass driver and names of attached devices.

Quoted 7 lines

Added a new "static" subcommand to dump a list of DM drivers with statically defined platform data.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200707/c93b4a4d/attachment.sig>
#7 lore raw

v3 cover cmd: add driver, fs and part type listing commands

In reply to Niel Fourie

Dear Tom,

for patch series all review comments have been resolved, and the latest version has seen no further comments, but it has not been pulled either.

Is any further action required to get this into mainline?

Quoted 37 lines

This series adds commands for listing the supported partition tables, listing supported filesystems and expands Driver Model listing commands.

The existing "dm drivers" command, which lists the DM drivers and their compatibility strings, segmentation faulted on drivers for which of_match was unpopulated (which appears to not be uncommon). This was fixed, and the command was renamed "dm compat", and a new more extensive "dm drivers" command was added, which list all DM drivers and for each, their uclass id, uclass driver and the device names for active driver instances. The purpose is show available drivers, but also to highlight unused drivers or drivers with uclass ids without uclass drivers, etc.

The following commands were added:
-"part types", lists partition tables supported
-"fstypes", lists filesystem types supported
-"dm compat", lists drivers and their compatibility strings (equivalent
to existing "dm drivers" command)
-"dm drivers", lists all DM drivers, and for each their uclass id,
uclass driver and the device names for active driver instances.
-"dm static", lists all DM drivers which use static platform data
(instead of the device tree).

These patches were tested in the Sandbox and on the Wandboard i.MX6Quad Board rev B1.

Changes in v2:
- Rebased on https://patchwork.ozlabs.org/patch/1234460/
- Added Python tests
- Fixed minor typographical errors
Changes in v3:
- Rewrote comment for do_fs_types() in fs.h

Niel Fourie (3):
cmd: part: Add subcommand to list supported partition tables
cmd: fs: Add command to list supported fs types
cmd: dm: Fixed/Added DM driver listing subcommands

Quoted 13 lines
 cmd/dm.c                             | 22 ++++++++++-
 cmd/fs.c                             | 11 ++++++
 cmd/part.c                           | 27 +++++++++++++-
 drivers/core/dump.c                  | 55 +++++++++++++++++++++++++++-
 fs/fs.c                              | 20 ++++++++++
 include/dm/util.h                    |  6 +++
 include/fs.h                         | 11 ++++++
 test/py/tests/test_dm.py             | 22 ++++++++++-
 test/py/tests/test_fs/test_fs_cmd.py | 12 ++++++
 test/py/tests/test_part.py           | 14 +++++++
 10 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 test/py/tests/test_fs/test_fs_cmd.py
 create mode 100644 test/py/tests/test_part.py

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
People seldom know what they want until you give them what  they  ask
for.
#8 lore raw

v3 cover cmd: add driver, fs and part type listing commands

Quoted 7 lines · Wolfgang Denk

Dear Tom,

for patch series all review comments have been resolved, and the latest version has seen no further comments, but it has not been pulled either.

Is any further action required to get this into mainline?

Ah, sorry. It's on my list to grab and see what the size growth is, since there's new features in generic code. I'll try and get to that soon.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200526/c2d954fe/attachment.sig>
#9 lore raw

v3 cover cmd: add driver, fs and part type listing commands

Hi Tom,

Quoted 9 lines · Tom Rini
Quoted 6 lines · Wolfgang Denk

Dear Tom,

for patch series all review comments have been resolved, and the latest version has seen no further comments, but it has not been pulled either.

Quoted 5 lines
Quoted 1 line

Is any further action required to get this into mainline?

Ah, sorry. It's on my list to grab and see what the size growth is, since there's new features in generic code. I'll try and get to that soon.

I pushed a rebased tree to u-boot-dm/try-fs (due to cmd_tbl_t change).

Size growth on firefly-rk3288 is:

04: cmd: dm: Fixed/Added DM driver listing subcommands

       arm: (for 1/1 boards) all +1434.0 bss +20.0 data +84.0 rodata

+468.0 text +862.0

Regards,
Simon