[PATCH 1/4] cmd: mvebu/bubt: Verify image type for all 32-bit Aramda SoCs and Armada 3700

[Stefan Roese]

On 26.07.22 16:11, Pali Rohár wrote:
> Current image type verification code is specific to 32-bit Armada SoCs but
> used only for Armada 38x. Implement image type verification for Armada 3700
> and enable Armada 38x image verification for all 32-bit Armada SoCs.
> 
> Signed-off-by: Pali Rohár <pali at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   cmd/mvebu/bubt.c | 74 +++++++++++++++++++++++++++++++-----------------
>   1 file changed, 48 insertions(+), 26 deletions(-)
> 
> diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c
> index 1362c03bcee5..a05e22a5479c 100644
> --- a/cmd/mvebu/bubt.c
> +++ b/cmd/mvebu/bubt.c
> @@ -56,6 +56,21 @@ struct mvebu_image_header {
>   #define IMAGE_VERSION_3_6_0	0x030600
>   #define IMAGE_VERSION_3_5_0	0x030500
>   
> +struct tim_boot_flash_sign {
> +	unsigned int id;
> +	const char *name;
> +};
> +
> +struct tim_boot_flash_sign tim_boot_flash_signs[] = {
> +	{ 0x454d4d08, "mmc"  },
> +	{ 0x454d4d0b, "mmc"  },
> +	{ 0x5350490a, "spi"  },
> +	{ 0x5350491a, "nand" },
> +	{ 0x55415223, "uart" },
> +	{ 0x53415432, "sata" },
> +	{},
> +};
> +
>   struct common_tim_data {
>   	u32	version;
>   	u32	identifier;
> @@ -83,7 +98,7 @@ struct mvebu_image_info {
>   	u32	encrypt_start_offset;
>   	u32	encrypt_size;
>   };
> -#endif
> +#elif defined(CONFIG_ARMADA_32BIT)
>   
>   /* Structure of the main header, version 1 (Armada 370/XP/375/38x/39x) */
>   struct a38x_main_hdr_v1 {
> @@ -123,6 +138,8 @@ struct a38x_boot_mode a38x_boot_modes[] = {
>   	{},
>   };
>   
> +#endif
> +
>   struct bubt_dev {
>   	char name[8];
>   	size_t (*read)(const char *file_name);
> @@ -635,7 +652,7 @@ static int check_image_header(void)
>   
>   	return 0;
>   }
> -#elif defined(CONFIG_ARMADA_38X)
> +#elif defined(CONFIG_ARMADA_32BIT)
>   static size_t a38x_header_size(const struct a38x_main_hdr_v1 *h)
>   {
>   	if (h->version == 1)
> @@ -691,34 +708,39 @@ static int check_image_header(void)
>   
>   static int bubt_check_boot_mode(const struct bubt_dev *dst)
>   {
> -	if (IS_ENABLED(CONFIG_ARMADA_38X)) {
> -		int mode;
> -		const struct a38x_main_hdr_v1 *hdr =
> -			(struct a38x_main_hdr_v1 *)get_load_addr();
> -
> -		for (mode = 0; mode < ARRAY_SIZE(a38x_boot_modes); mode++) {
> -			if (strcmp(a38x_boot_modes[mode].name, dst->name) == 0)
> -				break;
> -		}
> -
> -		if (a38x_boot_modes[mode].id == hdr->blockid)
> -			return 0;
> +#if defined(CONFIG_ARMADA_3700) || defined(CONFIG_ARMADA_32BIT)
> +	int mode;
> +#if defined(CONFIG_ARMADA_3700)
> +	const struct tim_boot_flash_sign *boot_modes = tim_boot_flash_signs;
> +	const struct common_tim_data *hdr =
> +		(struct common_tim_data *)get_load_addr();
> +	u32 id = hdr->boot_flash_sign;
> +#elif defined(CONFIG_ARMADA_32BIT)
> +	const struct a38x_boot_mode *boot_modes = a38x_boot_modes;
> +	const struct a38x_main_hdr_v1 *hdr =
> +		(struct a38x_main_hdr_v1 *)get_load_addr();
> +	u32 id = hdr->blockid;
> +#endif
>   
> -		for (int i = 0; i < ARRAY_SIZE(a38x_boot_modes); i++) {
> -			if (a38x_boot_modes[i].id == hdr->blockid) {
> -				printf("Error: A38x image meant to be booted from "
> -				       "\"%s\", not \"%s\"!\n",
> -				       a38x_boot_modes[i].name, dst->name);
> -				return -ENOEXEC;
> -			}
> -		}
> +	for (mode = 0; boot_modes[mode].name; mode++) {
> +		if (boot_modes[mode].id == id)
> +			break;
> +	}
>   
> -		printf("Error: unknown boot device in A38x image header: "
> -		       "0x%x\n", hdr->blockid);
> +	if (!boot_modes[mode].name) {
> +		printf("Error: unknown boot device in image header: 0x%x\n", id);
>   		return -ENOEXEC;
> -	} else {
> -		return 0;
>   	}
> +
> +	if (strcmp(boot_modes[mode].name, dst->name) == 0)
> +		return 0;
> +
> +	printf("Error: image meant to be booted from \"%s\", not \"%s\"!\n",
> +	       boot_modes[mode].name, dst->name);
> +	return -ENOEXEC;
> +#else
> +	return 0;
> +#endif
>   }
>   
>   static int bubt_verify(const struct bubt_dev *dst)

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de