[U-Boot] [PATCH v3 066/108] x86: Update the fsp command for FSP2

[Bin Meng]

Hi Simon,

On Mon, Oct 21, 2019 at 11:40 AM Simon Glass <sjg at chromium.org> wrote:
>
> The current 'fsp' command only works with FSP1. Update it to handle FSP2
> as well. Convert everything to hex which is what U-Boot uses.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> Changes in v3:
> - Convert code to use hex increased of decimal
> - Update the 'fsp' command for FSP2, instead of disabling it
>
> Changes in v2: None
>
>  cmd/x86/fsp.c | 59 ++++++++++++++++++++++++++++++++++-----------------
>  1 file changed, 39 insertions(+), 20 deletions(-)
>
> diff --git a/cmd/x86/fsp.c b/cmd/x86/fsp.c
> index b3b663021bc..fd5328db181 100644
> --- a/cmd/x86/fsp.c
> +++ b/cmd/x86/fsp.c
> @@ -5,19 +5,30 @@
>
>  #include <common.h>
>  #include <command.h>
> -#include <asm/fsp1/fsp_support.h>
> +#include <asm/fsp/fsp_support.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
>
>  static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
>  {
> -       struct fsp_header *hdr = fsp_find_header();
> -       u32 img_addr = hdr->img_base;
> -       char *sign = (char *)&hdr->sign;
> +       struct fsp_header *hdr;
> +       u32 img_addr;
> +       char *sign;
> +       uint addr;
>         int i;
>
> -       printf("FSP    : binary 0x%08x, header 0x%08x\n",
> -              CONFIG_FSP_ADDR, (int)hdr);
> +#ifdef CONFIG_FSP_VERSION2
> +       hdr = gd->arch.fsp_s_hdr;

Only FSP-S is displayed?

> +       img_addr = hdr->img_base;
> +       addr = img_addr;
> +#else
> +       addr = CONFIG_FSP_ADDR;
> +       hdr = fsp_find_header();
> +       img_addr = hdr->img_base;
> +#endif
> +       sign = (char *)&hdr->sign;
> +
> +       printf("FSP    : binary %08x, header %08x\n", addr, (int)hdr);
>         printf("Header : sign ");
>         for (i = 0; i < sizeof(hdr->sign); i++)
>                 printf("%c", *sign++);
> @@ -34,24 +45,32 @@ static int do_hdr(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
>         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(", addr %08x, size %d\n", img_addr, hdr->img_size);

size %x? since commit message says: "Convert everything to hex"

> +       if (hdr->hdr_rev >= FSP_HEADER_REVISION_1) {
>                 printf("GFX    :%ssupported\n",
>                        hdr->img_attr & FSP_ATTR_GRAPHICS_SUPPORT ? " " : " un");
>         }
> -       printf("VPD    : addr 0x%08x, size %d\n",
> +       printf("VPD    : addr %08x, size %x\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);
> +       if (hdr->hdr_rev <= FSP_HEADER_REVISION_2)
> +               printf("\nNumber of APIs Supported : %d\n", hdr->api_num);
> +       if (hdr->fsp_tempram_init)
> +               printf("\tTempRamInit : %08x\n",
> +                      hdr->fsp_tempram_init + img_addr);
> +       if (hdr->fsp_init)
> +               printf("\tFspInit     : %08x\n", hdr->fsp_init + img_addr);
> +       if (hdr->fsp_notify)
> +               printf("\tFspNotify   : %08x\n", hdr->fsp_notify + img_addr);
> +       if (hdr->hdr_rev >= FSP_HEADER_REVISION_1) {
> +               if (hdr->fsp_mem_init)
> +                       printf("\tMemoryInit  : %08x\n",
> +                              hdr->fsp_mem_init + img_addr);
> +               if (hdr->fsp_tempram_exit)
> +                       printf("\tTempRamExit : %08x\n",
> +                              hdr->fsp_tempram_exit + img_addr);
> +               if (hdr->fsp_silicon_init)
> +                       printf("\tSiliconInit : %08x\n",
> +                              hdr->fsp_silicon_init + img_addr);
>         }
>
>         return 0;
> --

Regards,
Bin