x86: fsp: Update fsp command to show spec 1.1 header

FSP spec 1.1 adds 3 new APIs and their offsets are in the header.
Update the 'fsp hdr' command to show these new entries.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/include/asm/fsp/fsp_infoheader.h b/arch/x86/include/asm/fsp/fsp_infoheader.h
index 4a4d627b2819e5aa0d196d7d1c8112272e252a22..60ce61d1902a499f0a3990e9299374aee460d372 100644 (file)
--- a/arch/x86/include/asm/fsp/fsp_infoheader.h
+++ b/arch/x86/include/asm/fsp/fsp_infoheader.h
@@ -26,7 +26,14 @@ struct __packed fsp_header {
        u32     fsp_tempram_init;       /* tempram_init offset */
        u32     fsp_init;               /* fsp_init offset */
        u32     fsp_notify;             /* fsp_notify offset */
-       u32     reserved2;
+       u32     fsp_mem_init;           /* fsp_mem_init offset */
+       u32     fsp_tempram_exit;       /* fsp_tempram_exit offset */
+       u32     fsp_silicon_init;       /* fsp_silicon_init offset */
 };
 
+#define FSP_HEADER_REVISION_1          1
+#define FSP_HEADER_REVISION_2          2
+
+#define FSP_ATTR_GRAPHICS_SUPPORT      (1 << 0)
+
 #endif

diff --git a/arch/x86/lib/fsp/cmd_fsp.c b/arch/x86/lib/fsp/cmd_fsp.c
index 25546638cf6e4b9e7f7a3d9ffe76db17ab9a7e1b..2a99cfe0d034417798f48761a25a0c740774b027 100644 (file)
--- a/arch/x86/lib/fsp/cmd_fsp.c
+++ b/arch/x86/lib/fsp/cmd_fsp.c
@@ -38,17 +38,37 @@ static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        for (i = 0; i < sizeof(hdr->sign); i++)
                printf("%c", *sign++);
        printf(", size %d, rev %d\n", hdr->hdr_len, hdr->hdr_rev);
-       printf("Image  : rev %d.%d, id ",
-              (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);
+       printf("Image  : rev ");
+       if (hdr->hdr_rev == FSP_HEADER_REVISION_1) {
+               printf("%d.%d",
+                      (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);
+       } else {
+               printf("%d.%d.%d.%d",
+                      (hdr->img_rev >> 24) & 0xff, (hdr->img_rev >> 16) & 0xff,
+                      (hdr->img_rev >> 8) & 0xff, hdr->img_rev & 0xff);
+       }
+       printf(", id ");
        for (i = 0; i < ARRAY_SIZE(hdr->img_id); i++)
                printf("%c", hdr->img_id[i]);
        printf(", addr 0x%08x, size %d\n", img_addr, hdr->img_size);
+       if (hdr->hdr_rev == FSP_HEADER_REVISION_2) {
+               printf("GFX    :%ssupported\n",
+                      hdr->img_attr & FSP_ATTR_GRAPHICS_SUPPORT ? " " : " un");
+       }
        printf("VPD    : addr 0x%08x, size %d\n",
               hdr->cfg_region_off + img_addr, hdr->cfg_region_size);
        printf("\nNumber of APIs Supported : %d\n", hdr->api_num);
        printf("\tTempRamInit : 0x%08x\n", hdr->fsp_tempram_init + img_addr);
        printf("\tFspInit     : 0x%08x\n", hdr->fsp_init + img_addr);
        printf("\tFspNotify   : 0x%08x\n", hdr->fsp_notify + img_addr);
+       if (hdr->hdr_rev == FSP_HEADER_REVISION_2) {
+               printf("\tMemoryInit  : 0x%08x\n",
+                      hdr->fsp_mem_init + img_addr);
+               printf("\tTempRamExit : 0x%08x\n",
+                      hdr->fsp_tempram_exit + img_addr);
+               printf("\tSiliconInit : 0x%08x\n",
+                      hdr->fsp_silicon_init + img_addr);
+       }
 
        return 0;
 }