From b6a90ac0902ff64a5a1dabe69cf4b480ac34d69a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:40:58 +0200 Subject: cmd: bdinfo: Optionally use getopt and implement bdinfo -a Add optional support for getopt() and in case this is enabled via GETOPT configuration option, implement support for 'bdinfo -a'. The 'bdinfo -a' behaves exactly like bdinfo and prints 'all' the bdinfo information. This is implemented in preparation for other more fine-grained options. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- cmd/bdinfo.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 1fe13ca..2c0d5e9 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -133,10 +134,8 @@ static void print_serial(struct udevice *dev) bdinfo_print_num_l(" clock", info.clock); } -int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +static int bdinfo_print_all(struct bd_info *bd) { - struct bd_info *bd = gd->bd; - #ifdef DEBUG bdinfo_print_num_l("bd address", (ulong)bd); #endif @@ -184,8 +183,30 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return 0; } +int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) +{ + struct bd_info *bd = gd->bd; + struct getopt_state gs; + int opt; + + if (!CONFIG_IS_ENABLED(GETOPT) || argc == 1) + return bdinfo_print_all(bd); + + getopt_init_state(&gs); + while ((opt = getopt(&gs, argc, argv, "a")) > 0) { + switch (opt) { + case 'a': + return bdinfo_print_all(bd); + default: + return CMD_RET_USAGE; + } + } + + return CMD_RET_USAGE; +} + U_BOOT_CMD( - bdinfo, 1, 1, do_bdinfo, + bdinfo, 2, 1, do_bdinfo, "print Board Info structure", "" ); -- cgit v1.1 From f1774a80307c357ab26f8ee42c5b082a902393b6 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:40:59 +0200 Subject: cmd: bdinfo: Implement support for printing memory layout via bdinfo -m Add support for printing memory layout only via 'bdinfo -m' . Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- cmd/bdinfo.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index 2c0d5e9..c720ee6 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -193,10 +193,13 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return bdinfo_print_all(bd); getopt_init_state(&gs); - while ((opt = getopt(&gs, argc, argv, "a")) > 0) { + while ((opt = getopt(&gs, argc, argv, "am")) > 0) { switch (opt) { case 'a': return bdinfo_print_all(bd); + case 'm': + print_bi_dram(bd); + return CMD_RET_SUCCESS; default: return CMD_RET_USAGE; } -- cgit v1.1 From ea9637c92f3b698903ee3d76f0b57e1109b352b0 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:00 +0200 Subject: cmd: bdinfo: Implement support for printing ethernet settings via bdinfo -e Add support for printing ethernet settings only via 'bdinfo -e' . Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- cmd/bdinfo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index c720ee6..79106ca 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -193,10 +193,15 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return bdinfo_print_all(bd); getopt_init_state(&gs); - while ((opt = getopt(&gs, argc, argv, "am")) > 0) { + while ((opt = getopt(&gs, argc, argv, "aem")) > 0) { switch (opt) { case 'a': return bdinfo_print_all(bd); + case 'e': + if (!IS_ENABLED(CONFIG_CMD_NET)) + return CMD_RET_USAGE; + print_eth(); + return CMD_RET_SUCCESS; case 'm': print_bi_dram(bd); return CMD_RET_SUCCESS; -- cgit v1.1 From 3e4225aa91c2eabc71fd144be8a4a0359737d9d3 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:01 +0200 Subject: configs: sandbox: Enable GETOPT for sandbox and sandbox64 target Enable GETOPT so that 'bdinfo' command with getopt() support can be tested in CI. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index 1a033b2..e937ac6 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -262,6 +262,7 @@ CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_LZ4=y CONFIG_ERRNO_STR=y +CONFIG_GETOPT=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index 01830c7..019e415 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -338,6 +338,7 @@ CONFIG_ECDSA_VERIFY=y CONFIG_TPM=y CONFIG_SHA384=y CONFIG_ERRNO_STR=y +CONFIG_GETOPT=y CONFIG_EFI_RUNTIME_UPDATE_CAPSULE=y CONFIG_EFI_CAPSULE_ON_DISK=y CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y -- cgit v1.1 From 5bd32a96adec37811e8ba5f88a07b3908db14d5f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:02 +0200 Subject: test: bdinfo: Rename bdinfo_test_move() to bdinfo_test_full() Rename bdinfo_test_move() to bdinfo_test_full(). The former is a remnant of deriving this test from another test. No functional change. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- test/cmd/bdinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 8c09281..b2896e8 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,7 +130,7 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; } -static int bdinfo_test_move(struct unit_test_state *uts) +static int bdinfo_test_full(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i; @@ -217,7 +217,7 @@ static int bdinfo_test_move(struct unit_test_state *uts) return 0; } -BDINFO_TEST(bdinfo_test_move, UT_TESTF_CONSOLE_REC); +BDINFO_TEST(bdinfo_test_full, UT_TESTF_CONSOLE_REC); int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { -- cgit v1.1 From 4823b05f01873826f063848bcad3446025917de2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:03 +0200 Subject: test: bdinfo: Test both bdinfo and bdinfo -a Factor out the core of test for all bdinfo output into bdinfo_test_all() and then reuse it to verify that both 'bdinfo' and 'bdinfo -a' print all the bdinfo output. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- test/cmd/bdinfo.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index b2896e8..509a8b5 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,15 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; } -static int bdinfo_test_full(struct unit_test_state *uts) +static int bdinfo_test_all(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i; - /* Test moving the working BDINFO to a new location */ - ut_assertok(console_record_reset_enable()); - ut_assertok(run_commandf("bdinfo")); - ut_assertok(test_num_l(uts, "boot_params", 0)); for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { @@ -212,6 +208,17 @@ static int bdinfo_test_full(struct unit_test_state *uts) ut_assertok(test_num_l(uts, "malloc base", gd_malloc_start())); } + return 0; +} + +static int bdinfo_test_full(struct unit_test_state *uts) +{ + /* Test BDINFO full print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo")); + ut_assertok(bdinfo_test_all(uts)); + ut_assertok(run_commandf("bdinfo -a")); + ut_assertok(bdinfo_test_all(uts)); ut_assertok(ut_check_console_end(uts)); return 0; -- cgit v1.1 From 8827a38714526adcff95271bac6a9bb49b9c0b83 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:04 +0200 Subject: test: bdinfo: Test bdinfo -h The bdinfo -h should print error message that -h is an unknown parameter and then command help text. Test the expected output. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- test/cmd/bdinfo.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 509a8b5..2f34d87 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -226,6 +226,23 @@ static int bdinfo_test_full(struct unit_test_state *uts) BDINFO_TEST(bdinfo_test_full, UT_TESTF_CONSOLE_REC); +static int bdinfo_test_help(struct unit_test_state *uts) +{ + /* Test BDINFO unknown option help text print */ + ut_assertok(console_record_reset_enable()); + ut_asserteq(1, run_commandf("bdinfo -h")); + ut_assert_nextlinen("bdinfo: invalid option -- h"); + ut_assert_nextlinen("bdinfo - print Board Info structure"); + ut_assert_nextline_empty(); + ut_assert_nextlinen("Usage:"); + ut_assert_nextlinen("bdinfo"); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_help, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test); -- cgit v1.1 From 2696f3ab8101d0037b4fca9b982595b2f935946d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:05 +0200 Subject: test: bdinfo: Test bdinfo -m The bdinfo -m should print only the board memory layout. Test the expected output. Signed-off-by: Marek Vasut Reviewed-by: Simon Glass --- test/cmd/bdinfo.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 2f34d87..c9be182 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -130,13 +130,11 @@ static int lmb_test_dump_all(struct unit_test_state *uts, struct lmb *lmb) return 0; } -static int bdinfo_test_all(struct unit_test_state *uts) +static int bdinfo_check_mem(struct unit_test_state *uts) { struct bd_info *bd = gd->bd; int i; - ut_assertok(test_num_l(uts, "boot_params", 0)); - for (i = 0; i < CONFIG_NR_DRAM_BANKS; ++i) { if (bd->bi_dram[i].size) { ut_assertok(test_num_l(uts, "DRAM bank", i)); @@ -147,6 +145,15 @@ static int bdinfo_test_all(struct unit_test_state *uts) } } + return 0; +} + +static int bdinfo_test_all(struct unit_test_state *uts) +{ + ut_assertok(test_num_l(uts, "boot_params", 0)); + + ut_assertok(bdinfo_check_mem(uts)); + /* CONFIG_SYS_HAS_SRAM testing not supported */ ut_assertok(test_num_l(uts, "flashstart", 0)); ut_assertok(test_num_l(uts, "flashsize", 0)); @@ -243,6 +250,19 @@ static int bdinfo_test_help(struct unit_test_state *uts) BDINFO_TEST(bdinfo_test_help, UT_TESTF_CONSOLE_REC); +static int bdinfo_test_memory(struct unit_test_state *uts) +{ + /* Test BDINFO memory layout only print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo -m")); + ut_assertok(bdinfo_check_mem(uts)); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_memory, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test); -- cgit v1.1 From 3ff2d796a6f251637c3ee71bb7f1e3d6964dafa2 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 7 Oct 2023 23:41:06 +0200 Subject: test: bdinfo: Test bdinfo -e The bdinfo -e should print only the board ethernet settings. Test the expected output. Reviewed-by: Simon Glass Signed-off-by: Marek Vasut --- test/cmd/bdinfo.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index c9be182..9744bd1 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -263,6 +263,20 @@ static int bdinfo_test_memory(struct unit_test_state *uts) BDINFO_TEST(bdinfo_test_memory, UT_TESTF_CONSOLE_REC); +static int bdinfo_test_eth(struct unit_test_state *uts) +{ + /* Test BDINFO ethernet settings only print */ + ut_assertok(console_record_reset_enable()); + ut_assertok(run_commandf("bdinfo -e")); + if (IS_ENABLED(CONFIG_CMD_NET)) + ut_assertok(test_eth(uts)); + ut_assertok(ut_check_console_end(uts)); + + return 0; +} + +BDINFO_TEST(bdinfo_test_eth, UT_TESTF_CONSOLE_REC); + int do_ut_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct unit_test *tests = UNIT_TEST_SUITE_START(bdinfo_test); -- cgit v1.1