Skip to contentSkip to conversation

cmd: mvebu: bubt: add A38x support

PATCH New Joel Johnson 2 participants 6 messages Apr 17, 2020 – Apr 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v6 1/5 cmd: mvebu: bubt: add A38x support

Add support for Armada 38x devices in bubt flashing utility. This is based on (and streamlined from) the support in the SolidRun master-a38x vendor fork.

---

v2 changes
- none
v3 changes
- none
v4 changes
- none
v5 changes
- none
v6 changes
- none

---
 cmd/mvebu/bubt.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)
cmd/mvebu/bubt.c +68 -1
index 2041a7a29a..d399fb6da4 100644
@@ -85,7 +85,29 @@ struct mvebu_image_info {
 	u32	encrypt_start_offset;
 	u32	encrypt_size;
 };
-#endif /* CONFIG_ARMADA_XXX */
+#elif defined(CONFIG_ARMADA_38X)	/* A38X */
+
+/* Structure of the main header, version 1 (Armada 370/38x/XP) */
+struct a38x_main_hdr_v1 {
+	u8  blockid;               /* 0x0       */
+	u8  flags;                 /* 0x1       */
+	u16 reserved2;             /* 0x2-0x3   */
+	u32 blocksize;             /* 0x4-0x7   */
+	u8  version;               /* 0x8       */
+	u8  headersz_msb;          /* 0x9       */
+	u16 headersz_lsb;          /* 0xA-0xB   */
+	u32 srcaddr;               /* 0xC-0xF   */
+	u32 destaddr;              /* 0x10-0x13 */
+	u32 execaddr;              /* 0x14-0x17 */
+	u8  options;               /* 0x18      */
+	u8  nandblocksize;         /* 0x19      */
+	u8  nandbadblklocation;    /* 0x1A      */
+	u8  reserved4;             /* 0x1B      */
+	u16 reserved5;             /* 0x1C-0x1D */
+	u8  ext;                   /* 0x1E      */
+	u8  checksum;              /* 0x1F      */
+};
+#endif
 
 struct bubt_dev {
 	char name[8];
@@ -621,7 +643,52 @@ static int check_image_header(void)
 
 	return 0;
 }
+#elif defined(CONFIG_ARMADA_38X)
+static size_t a38x_header_size(const struct a38x_main_hdr_v1 *h)
+{
+	if (h->version == 1)
+		return (h->headersz_msb << 16) | le16_to_cpu(h->headersz_lsb);
+
+	printf("Error: Invalid A38x image (header version 0x%x unknown)!\n",
+	       h->version);
+	return 0;
+}
+
+static uint8_t image_checksum8(const void *start, size_t len)
+{
+	u8 csum = 0;
+	const u8 *p = start;
+
+	while (len) {
+		csum += *p;
+		++p;
+		--len;
+	}
+
+	return csum;
+}
 
+static int check_image_header(void)
+{
+	u8 checksum;
+	const struct a38x_main_hdr_v1 *hdr =
+		(struct a38x_main_hdr_v1 *)get_load_addr();
+	const size_t image_size = a38x_header_size(hdr);
+
+	if (!image_size)
+		return -ENOEXEC;
+
+	checksum = image_checksum8(hdr, image_size);
+	checksum -= hdr->checksum;
+	if (checksum != hdr->checksum) {
+		printf("Error: Bad A38x image checksum. 0x%x != 0x%x\n",
+		       checksum, hdr->checksum);
+		return -ENOEXEC;
+	}
+
+	printf("Image checksum...OK!\n");
+	return 0;
+}
 #else /* Not ARMADA? */
 static int check_image_header(void)
 {
Signature · 1 line
2.26.1
#1 lore raw

PATCH v6 2/5 cmd: mvebu: bubt: correct U-Boot spelling

Replace "U-BOOT" text with correct spelling

---

v2 changes:
- none
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none

---
 cmd/mvebu/bubt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
cmd/mvebu/bubt.c +3 -3
index d399fb6da4..b80b81c82a 100644
@@ -346,7 +346,7 @@ static int nand_burn_image(size_t image_size)
 	/* Align U-Boot size to currently used blocksize */
 	image_size = ((image_size + (block_size - 1)) & (~(block_size - 1)));
 
-	/* Erase the U-BOOT image space */
+	/* Erase the U-Boot image space */
 	printf("Erasing 0x%x - 0x%x:...", 0, (int)image_size);
 	ret = nand_erase(mtd, 0, image_size);
 	if (ret) {
@@ -734,7 +734,7 @@ static int bubt_read_file(struct bubt_dev *src)
 static int bubt_is_dev_active(struct bubt_dev *dev)
 {
 	if (!dev->active) {
-		printf("Device \"%s\" not supported by U-BOOT image\n",
+		printf("Device \"%s\" not supported by U-Boot image\n",
 		       dev->name);
 		return 0;
 	}
@@ -822,7 +822,7 @@ int do_bubt_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (!bubt_is_dev_active(src))
 		return -ENODEV;
 
-	printf("Burning U-BOOT image \"%s\" from \"%s\" to \"%s\"\n",
+	printf("Burning U-Boot image \"%s\" from \"%s\" to \"%s\"\n",
 	       net_boot_file_name, src->name, dst->name);
 
 	image_size = bubt_read_file(src);
Signature · 1 line
2.26.1
#2 lore raw

PATCH v6 3/5 cmd: mvebu: bubt: verify A38x target device type

In reply to Joel Johnson

Ensure that the device to which an image is being written includes header information indicating boot support for the destination device.

This is derived from the support in the SolidRun master-a38x vendor fork.

---

v2 changes:
- none
v3 changes:
- use ARRAY_SIZE instead of #define size
v4 changes:
- none
v5 changes:
- use if(IS_ENABLED()) for inline check instead of ifdef
v6 changes:
- reduce #ifdef usages at the tradeoff of otherwise unneccessarily exposing A38x internal structs to more than A38x builds.
- since state is exposed anyway, rename a38x_check_boot_mode to bubt_check_boot_mode with provision for per-target customization

This fixes building across all mvebu targets. Exposing the needed a38x_* structs isn't something I'm hugely excited about, but it does get the build working and avoids inline #ifdefs as requested. In cases where the target being built (all but A38x) doesn't support checking the boot mode, rely on the compiler to [mostly] optimize the function usage away. Local tests show an increase of only 4 bytes of rodata in such cases.

---
 cmd/mvebu/bubt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)
cmd/mvebu/bubt.c +48 -4
index b80b81c82a..be6c5869a9 100644
@@ -85,7 +85,7 @@ struct mvebu_image_info {
 	u32	encrypt_start_offset;
 	u32	encrypt_size;
 };
-#elif defined(CONFIG_ARMADA_38X)	/* A38X */
+#endif
 
 /* Structure of the main header, version 1 (Armada 370/38x/XP) */
 struct a38x_main_hdr_v1 {
@@ -107,7 +107,23 @@ struct a38x_main_hdr_v1 {
 	u8  ext;                   /* 0x1E      */
 	u8  checksum;              /* 0x1F      */
 };
-#endif
+
+struct a38x_boot_mode {
+	unsigned int id;
+	const char *name;
+};
+
+/* The blockid header field values used to indicate boot device of image */
+struct a38x_boot_mode a38x_boot_modes[] = {
+	{ 0x4D, "i2c"  },
+	{ 0x5A, "spi"  },
+	{ 0x69, "uart" },
+	{ 0x78, "sata" },
+	{ 0x8B, "nand" },
+	{ 0x9C, "pex"  },
+	{ 0xAE, "mmc"  },
+	{},
+};
 
 struct bubt_dev {
 	char name[8];
@@ -697,7 +713,29 @@ static int check_image_header(void)
 }
 #endif
 
-static int bubt_verify(size_t image_size)
+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;
+
+		puts("Error: A38x image not built for destination device!\n");
+		return -ENOEXEC;
+	} else {
+		return 0;
+	}
+}
+
+static int bubt_verify(const struct bubt_dev *dst)
 {
 	int err;
 
@@ -708,6 +746,12 @@ static int bubt_verify(size_t image_size)
 		return err;
 	}
 
+	err = bubt_check_boot_mode(dst);
+	if (err) {
+		printf("Error: Image boot mode verification failed\n");
+		return err;
+	}
+
 	return 0;
 }
 
@@ -829,7 +873,7 @@ int do_bubt_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (!image_size)
 		return -EIO;
 
-	err = bubt_verify(image_size);
+	err = bubt_verify(dst);
 	if (err)
 		return err;
 
Signature · 1 line
2.26.1
#3 lore raw

PATCH v6 3/5 cmd: mvebu: bubt: verify A38x target device type

Quoted 8 lines · Joel Johnson

Ensure that the device to which an image is being written includes header information indicating boot support for the destination device.

This is derived from the support in the SolidRun master-a38x vendor fork.

Thanks,
Stefan

Quoted 112 lines

---

v2 changes:
- none
v3 changes:
- use ARRAY_SIZE instead of #define size
v4 changes:
- none
v5 changes:
- use if(IS_ENABLED()) for inline check instead of ifdef
v6 changes:
- reduce #ifdef usages at the tradeoff of otherwise unneccessarily exposing A38x internal structs to more than A38x builds.
- since state is exposed anyway, rename a38x_check_boot_mode to bubt_check_boot_mode with provision for per-target customization

This fixes building across all mvebu targets. Exposing the needed a38x_* structs isn't something I'm hugely excited about, but it does get the build working and avoids inline #ifdefs as requested. In cases where the target being built (all but A38x) doesn't support checking the boot mode, rely on the compiler to [mostly] optimize the function usage away. Local tests show an increase of only 4 bytes of rodata in such cases.

---
  cmd/mvebu/bubt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----
  1 file changed, 48 insertions(+), 4 deletions(-)
cmd/mvebu/bubt.c +47 -3
index b80b81c82a..be6c5869a9 100644
@@ -85,7 +85,7 @@ struct mvebu_image_info {
  	u32	encrypt_start_offset;
  	u32	encrypt_size;
  };
-#elif defined(CONFIG_ARMADA_38X)	/* A38X */
+#endif
 
  /* Structure of the main header, version 1 (Armada 370/38x/XP) */
  struct a38x_main_hdr_v1 {
@@ -107,7 +107,23 @@ struct a38x_main_hdr_v1 {
  	u8  ext;                   /* 0x1E      */
  	u8  checksum;              /* 0x1F      */
  };
-#endif
+
+struct a38x_boot_mode {
+	unsigned int id;
+	const char *name;
+};
+
+/* The blockid header field values used to indicate boot device of image */
+struct a38x_boot_mode a38x_boot_modes[] = {
+	{ 0x4D, "i2c"  },
+	{ 0x5A, "spi"  },
+	{ 0x69, "uart" },
+	{ 0x78, "sata" },
+	{ 0x8B, "nand" },
+	{ 0x9C, "pex"  },
+	{ 0xAE, "mmc"  },
+	{},
+};
 
  struct bubt_dev {
  	char name[8];
@@ -697,7 +713,29 @@ static int check_image_header(void)
  }
  #endif
 
-static int bubt_verify(size_t image_size)
+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;
+
+		puts("Error: A38x image not built for destination device!\n");
+		return -ENOEXEC;
+	} else {
+		return 0;
+	}
+}
+
+static int bubt_verify(const struct bubt_dev *dst)
  {
  	int err;
 
@@ -708,6 +746,12 @@ static int bubt_verify(size_t image_size)
  		return err;
  	}
 
+	err = bubt_check_boot_mode(dst);
+	if (err) {
+		printf("Error: Image boot mode verification failed\n");
+		return err;
+	}
+
  	return 0;
  }
 

cmd/mvebu/bubt.c int do_bubt_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) · line 879

Quoted 8 lines
cmd/mvebu/bubt.c +1 -1
@@ -829,7 +873,7 @@ int do_bubt_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
  	if (!image_size)
  		return -EIO;
 
-	err = bubt_verify(image_size);
+	err = bubt_verify(dst);
  	if (err)
  		return err;
 

Viele Gr??e,
Stefan

Signature · 3 lines
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
#4 lore raw

PATCH v6 4/5 arm: mvebu: clearfog: enable bubt command

In reply to Joel Johnson

With support added for Armada 38x, include the bubt command in ClearFog defconfig.

---

v2 changes:
- none
v3 changes:
- none
v4 changes:
- none
v5 changes:
- none
v6 changes:
- none

---
 configs/clearfog_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/clearfog_defconfig +1 -0
index 6db8b8acf6..0f2ae1ccec 100644
@@ -33,6 +33,7 @@ CONFIG_SPL_CMD_TLV_EEPROM=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_MVEBU_BUBT=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
Signature · 1 line
2.26.1
#5 lore raw

PATCH v6 5/5 cmd: mvebu: bubt: show image boot device

In reply to Joel Johnson

When a mismatch is found trying to write an image for one boot method to a different boot device, print an error message including the image header marked target boot device type.

---

v2 changes:
- newly added in v2 series
v3 changes:
- none
v4 changes:
- adjust to ARRAY_SIZE usage
v5 changes:
- remove double space (one each line) in error message
v6 changes:
- rebased on different location/naming from patch 3 of the bubt_check_boot_mode function

---
 cmd/mvebu/bubt.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
cmd/mvebu/bubt.c +11 -1
index be6c5869a9..dc0ce01c35 100644
@@ -728,7 +728,17 @@ static int bubt_check_boot_mode(const struct bubt_dev *dst)
 		if (a38x_boot_modes[mode].id == hdr->blockid)
 			return 0;
 
-		puts("Error: A38x image not built for destination device!\n");
+		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;
+			}
+		}
+
+		printf("Error: unknown boot device in A38x image header: "
+		       "0x%x\n", hdr->blockid);
 		return -ENOEXEC;
 	} else {
 		return 0;
Signature · 1 line
2.26.1