Merge branch '2022-10-12-additional-fixes'

[J-u-boot.git] / cmd / dm.c

diff --git a/cmd/dm.c b/cmd/dm.c
index 1dd19fe45b5490c9ef58dec2c11d72609a5c3ebe..218be85795d4d736ade291d922473fac044cb086 100644 (file)
--- a/cmd/dm.c
+++ b/cmd/dm.c
@@ -8,26 +8,13 @@
 
 #include <common.h>
 #include <command.h>
-#include <dm.h>
-#include <malloc.h>
-#include <mapmem.h>
-#include <errno.h>
-#include <asm/io.h>
 #include <dm/root.h>
 #include <dm/util.h>
 
-static int do_dm_dump_all(struct cmd_tbl *cmdtp, int flag, int argc,
-                         char *const argv[])
-{
-       dm_dump_all();
-
-       return 0;
-}
-
-static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc,
-                            char *const argv[])
+static int do_dm_dump_driver_compat(struct cmd_tbl *cmdtp, int flag, int argc,
+                                   char * const argv[])
 {
-       dm_dump_uclass();
+       dm_dump_driver_compat();
 
        return 0;
 }
@@ -48,71 +35,68 @@ static int do_dm_dump_drivers(struct cmd_tbl *cmdtp, int flag, int argc,
        return 0;
 }
 
-static int do_dm_dump_driver_compat(struct cmd_tbl *cmdtp, int flag, int argc,
-                                   char * const argv[])
+#if CONFIG_IS_ENABLED(DM_STATS)
+static int do_dm_dump_mem(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
-       dm_dump_driver_compat();
+       struct dm_stats mem;
+
+       dm_get_mem(&mem);
+       dm_dump_mem(&mem);
 
        return 0;
 }
+#endif /* DM_STATS */
 
-static int do_dm_dump_static_driver_info(struct cmd_tbl *cmdtp, int flag, int argc,
-                                        char * const argv[])
+static int do_dm_dump_static_driver_info(struct cmd_tbl *cmdtp, int flag,
+                                        int argc, char * const argv[])
 {
        dm_dump_static_driver_info();
 
        return 0;
 }
 
-static struct cmd_tbl 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)
+static int do_dm_dump_tree(struct cmd_tbl *cmdtp, int flag, int argc,
+                          char *const argv[])
 {
-       static int relocated;
+       dm_dump_tree();
 
-       if (!relocated) {
-               fixup_cmdtable(test_commands, ARRAY_SIZE(test_commands));
-               relocated = 1;
-       }
+       return 0;
 }
 
-static int do_dm(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
+static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc,
+                            char *const argv[])
 {
-       struct cmd_tbl *test_cmd;
-       int ret;
-
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-       dm_reloc();
-#endif
-
-       if (argc < 2)
-               return CMD_RET_USAGE;
-       test_cmd = find_cmd_tbl(argv[1], test_commands,
-                               ARRAY_SIZE(test_commands));
-       argc -= 2;
-       argv += 2;
-       if (!test_cmd || argc > test_cmd->maxargs)
-               return CMD_RET_USAGE;
-
-       ret = test_cmd->cmd(test_cmd, flag, argc, argv);
+       dm_dump_uclass();
 
-       return cmd_process_error(test_cmd, ret);
+       return 0;
 }
 
-U_BOOT_CMD(
-       dm,     3,      1,      do_dm,
-       "Driver model low level access",
-       "tree          Dump driver model tree ('*' = activated)\n"
-       "dm uclass        Dump list of instances for each uclass\n"
+#if CONFIG_IS_ENABLED(DM_STATS)
+#define DM_MEM_HELP    "dm mem           Provide a summary of memory usage\n"
+#define DM_MEM         U_BOOT_SUBCMD_MKENT(mem, 1, 1, do_dm_dump_mem),
+#else
+#define DM_MEM_HELP
+#define DM_MEM
+#endif
+
+#if CONFIG_IS_ENABLED(SYS_LONGHELP)
+static char dm_help_text[] =
+       "compat        Dump list of drivers with compatibility strings\n"
        "dm devres        Dump list of device resources for each device\n"
        "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"
-);
+       DM_MEM_HELP
+       "dm static        Dump list of drivers with static platform data\n"
+       "dm tree          Dump tree of driver model devices ('*' = activated)\n"
+       "dm uclass        Dump list of instances for each uclass"
+       ;
+#endif
+
+U_BOOT_CMD_WITH_SUBCMDS(dm, "Driver model low level access", dm_help_text,
+       U_BOOT_SUBCMD_MKENT(compat, 1, 1, do_dm_dump_driver_compat),
+       U_BOOT_SUBCMD_MKENT(devres, 1, 1, do_dm_dump_devres),
+       U_BOOT_SUBCMD_MKENT(drivers, 1, 1, do_dm_dump_drivers),
+       DM_MEM
+       U_BOOT_SUBCMD_MKENT(static, 1, 1, do_dm_dump_static_driver_info),
+       U_BOOT_SUBCMD_MKENT(tree, 1, 1, do_dm_dump_tree),
+       U_BOOT_SUBCMD_MKENT(uclass, 1, 1, do_dm_dump_uclass));