| Message ID | 20200920094914.3.Ia5660394c5732506673bfe5de470c85746ea9cce@changeid |
|---|---|
| State | Superseded |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: Updates to some commands | expand |
On Sun, Sep 20, 2020 at 11:49 PM Simon Glass <sjg@chromium.org> wrote: > > Some HOBs include information that can be decoded. Add a -v option to the > hob command, to allow this to be displayed. Add the ability to decode a > resource descriptor. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > cmd/x86/hob.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 45 insertions(+), 4 deletions(-) > > diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c > index bbe38bbf20e..2933bc08c76 100644 > --- a/cmd/x86/hob.c > +++ b/cmd/x86/hob.c > @@ -27,6 +27,16 @@ static char *hob_type[] = { > "Capsule", > }; > > +static char *res_type[] = { > + "system", nits: System > + "Memory-mapped I/O", > + "I/O", > + "Firmware device", > + "Memory-mapped I/O port", > + "Reserved", > + "I/O reserved", > +}; > + > static struct guid_name { > efi_guid_t guid; > const char *name; > @@ -58,6 +68,26 @@ static const char *guid_to_name(const efi_guid_t *guid) > return NULL; > } > > +static void show_hob_details(const struct hob_header *hdr) > +{ > + const void *ptr = hdr; > + > + switch (hdr->type) { > + case HOB_TYPE_RES_DESC: { > + const struct hob_res_desc *res = ptr; > + const char *typename; > + > + typename = res->type > 0 && res->type <= RES_MAX_MEM_TYPE ? > + res_type[res->type] : "unknown"; > + > + printf(" base = %08llx, len = %08llx, end = %08llx, type = %d (%s)\n\n", > + res->phys_start, res->len, res->phys_start + res->len, > + res->type, typename); > + break; > + } > + } > +} > + > static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > { > const struct hob_header *hdr; > @@ -66,12 +96,20 @@ static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > int i = 0; > efi_guid_t *guid; > char uuid[UUID_STR_LEN + 1]; > + bool verbose = false; > int seq = -1; /* Show all by default */ > > argc--; > argv++; > - if (argc) > - seq = simple_strtol(*argv, NULL, 16); > + if (argc) { > + if (!strcmp("-v", *argv)) { > + verbose = true; > + argc--; > + argv++; > + } > + if (argc) > + seq = simple_strtol(*argv, NULL, 16); > + } > hdr = gd->arch.hob_list; > > printf("HOB list address: 0x%08x\n\n", (unsigned int)hdr); > @@ -111,13 +149,16 @@ static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > printf("%36s", "Not Available"); > } > printf("\n"); > + if (verbose) > + show_hob_details(hdr); > } > > return 0; > } > > -U_BOOT_CMD(hob, 2, 1, do_hob, > - "[seq] Print Hand-Off Block (HOB) information" > +U_BOOT_CMD(hob, 3, 1, do_hob, > + "[-v] [seq] Print Hand-Off Block (HOB) information" > + " -v - Show detailed HOB information where available" > " seq - Record # to show (all by default)", > "" > ); Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c index bbe38bbf20e..2933bc08c76 100644 --- a/cmd/x86/hob.c +++ b/cmd/x86/hob.c @@ -27,6 +27,16 @@ static char *hob_type[] = { "Capsule", }; +static char *res_type[] = { + "system", + "Memory-mapped I/O", + "I/O", + "Firmware device", + "Memory-mapped I/O port", + "Reserved", + "I/O reserved", +}; + static struct guid_name { efi_guid_t guid; const char *name; @@ -58,6 +68,26 @@ static const char *guid_to_name(const efi_guid_t *guid) return NULL; } +static void show_hob_details(const struct hob_header *hdr) +{ + const void *ptr = hdr; + + switch (hdr->type) { + case HOB_TYPE_RES_DESC: { + const struct hob_res_desc *res = ptr; + const char *typename; + + typename = res->type > 0 && res->type <= RES_MAX_MEM_TYPE ? + res_type[res->type] : "unknown"; + + printf(" base = %08llx, len = %08llx, end = %08llx, type = %d (%s)\n\n", + res->phys_start, res->len, res->phys_start + res->len, + res->type, typename); + break; + } + } +} + static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { const struct hob_header *hdr; @@ -66,12 +96,20 @@ static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) int i = 0; efi_guid_t *guid; char uuid[UUID_STR_LEN + 1]; + bool verbose = false; int seq = -1; /* Show all by default */ argc--; argv++; - if (argc) - seq = simple_strtol(*argv, NULL, 16); + if (argc) { + if (!strcmp("-v", *argv)) { + verbose = true; + argc--; + argv++; + } + if (argc) + seq = simple_strtol(*argv, NULL, 16); + } hdr = gd->arch.hob_list; printf("HOB list address: 0x%08x\n\n", (unsigned int)hdr); @@ -111,13 +149,16 @@ static int do_hob(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) printf("%36s", "Not Available"); } printf("\n"); + if (verbose) + show_hob_details(hdr); } return 0; } -U_BOOT_CMD(hob, 2, 1, do_hob, - "[seq] Print Hand-Off Block (HOB) information" +U_BOOT_CMD(hob, 3, 1, do_hob, + "[-v] [seq] Print Hand-Off Block (HOB) information" + " -v - Show detailed HOB information where available" " seq - Record # to show (all by default)", "" );
Some HOBs include information that can be decoded. Add a -v option to the hob command, to allow this to be displayed. Add the ability to decode a resource descriptor. Signed-off-by: Simon Glass <sjg@chromium.org> --- cmd/x86/hob.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-)