smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2022-09-19 13:19:39 -04:00
parent b6c50e5831 f76f3e3b44
commit e9a1ff9724
340 changed files with 13232 additions and 2087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/mvebu/Kconfig
View File

@@ -5,6 +5,7 @@ config CMD_MVEBU_BUBT
bool "bubt"
select SHA256 if ARMADA_3700
select SHA512 if ARMADA_3700
select MVEBU_EFUSE if ARMADA_38X || ARMADA_3700
help
bubt - Burn a u-boot image to flash
For details about bubt command please see the documentation

174
cmd/mvebu/bubt.c
View File

@@ -13,6 +13,8 @@
#include <vsprintf.h>
#include <errno.h>
#include <dm.h>
#include <fuse.h>
#include <mach/efuse.h>
#include <spi_flash.h>
#include <spi.h>
@@ -121,6 +123,17 @@ struct a38x_main_hdr_v1 {
u8 checksum; /* 0x1F */
};
/*
* Header for the optional headers, version 1 (Armada 370/XP/375/38x/39x)
*/
struct a38x_opt_hdr_v1 {
u8 headertype;
u8 headersz_msb;
u16 headersz_lsb;
u8 data[0];
};
#define A38X_OPT_HDR_V1_SECURE_TYPE 0x1
struct a38x_boot_mode {
unsigned int id;
const char *name;
@@ -688,9 +701,25 @@ static uint8_t image_checksum8(const void *start, size_t len)
return csum;
}
static uint32_t image_checksum32(const void *start, size_t len)
{
u32 csum = 0;
const u32 *p = start;
while (len) {
csum += *p;
++p;
len -= sizeof(u32);
}
return csum;
}
static int check_image_header(void)
{
u8 checksum;
u32 checksum32, exp_checksum32;
u32 offset, size;
const struct a38x_main_hdr_v1 *hdr =
(struct a38x_main_hdr_v1 *)get_load_addr();
const size_t image_size = a38x_header_size(hdr);
@@ -701,14 +730,74 @@ static int check_image_header(void)
checksum = image_checksum8(hdr, image_size);
checksum -= hdr->checksum;
if (checksum != hdr->checksum) {
printf("Error: Bad A38x image checksum. 0x%x != 0x%x\n",
printf("Error: Bad A38x image header checksum. 0x%x != 0x%x\n",
checksum, hdr->checksum);
return -ENOEXEC;
}
offset = le32_to_cpu(hdr->srcaddr);
size = le32_to_cpu(hdr->blocksize);
if (hdr->blockid == 0x78) { /* SATA id */
if (offset < 1) {
printf("Error: Bad A38x image srcaddr.\n");
return -ENOEXEC;
}
offset -= 1;
offset *= 512;
}
if (hdr->blockid == 0xAE) /* SDIO id */
offset *= 512;
if (offset % 4 != 0 || size < 4 || size % 4 != 0) {
printf("Error: Bad A38x image blocksize.\n");
return -ENOEXEC;
}
checksum32 = image_checksum32((u8 *)hdr + offset, size - 4);
exp_checksum32 = *(u32 *)((u8 *)hdr + offset + size - 4);
if (checksum32 != exp_checksum32) {
printf("Error: Bad A38x image data checksum. 0x%08x != 0x%08x\n",
checksum32, exp_checksum32);
return -ENOEXEC;
}
printf("Image checksum...OK!\n");
return 0;
}
#if defined(CONFIG_ARMADA_38X)
static int a38x_image_is_secure(const struct a38x_main_hdr_v1 *hdr)
{
u32 image_size = a38x_header_size(hdr);
struct a38x_opt_hdr_v1 *ohdr;
u32 ohdr_size;
if (hdr->version != 1)
return 0;
if (!hdr->ext)
return 0;
ohdr = (struct a38x_opt_hdr_v1 *)(hdr + 1);
do {
if (ohdr->headertype == A38X_OPT_HDR_V1_SECURE_TYPE)
return 1;
ohdr_size = (ohdr->headersz_msb << 16) | le16_to_cpu(ohdr->headersz_lsb);
if (!*((u8 *)ohdr + ohdr_size - 4))
break;
ohdr = (struct a38x_opt_hdr_v1 *)((u8 *)ohdr + ohdr_size);
if ((u8 *)ohdr >= (u8 *)hdr + image_size)
break;
} while (1);
return 0;
}
#endif
#else /* Not ARMADA? */
static int check_image_header(void)
{
@@ -717,20 +806,60 @@ static int check_image_header(void)
}
#endif
#if defined(CONFIG_ARMADA_3700) || defined(CONFIG_ARMADA_32BIT)
static u64 fuse_read_u64(u32 bank)
{
u32 val[2];
int ret;
ret = fuse_read(bank, 0, &val[0]);
if (ret < 0)
return -1;
ret = fuse_read(bank, 1, &val[1]);
if (ret < 0)
return -1;
return ((u64)val[1] << 32) | val[0];
}
#endif
#if defined(CONFIG_ARMADA_3700)
static inline u8 maj3(u8 val)
{
/* return majority vote of 3 bits */
return ((val & 0x7) == 3 || (val & 0x7) > 4) ? 1 : 0;
}
#endif
static int bubt_check_boot_mode(const struct bubt_dev *dst)
{
#if defined(CONFIG_ARMADA_3700) || defined(CONFIG_ARMADA_32BIT)
int mode;
int mode, secure_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;
int is_secure = hdr->trusted != 0;
u64 otp_secure_bits = fuse_read_u64(1);
int otp_secure_boot = ((maj3(otp_secure_bits >> 0) << 0) |
(maj3(otp_secure_bits >> 4) << 1)) == 2;
unsigned int otp_boot_device = (maj3(otp_secure_bits >> 48) << 0) |
(maj3(otp_secure_bits >> 52) << 1) |
(maj3(otp_secure_bits >> 56) << 2) |
(maj3(otp_secure_bits >> 60) << 3);
#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;
#if defined(CONFIG_ARMADA_38X)
int is_secure = a38x_image_is_secure(hdr);
u64 otp_secure_bits = fuse_read_u64(EFUSE_LINE_SECURE_BOOT);
int otp_secure_boot = otp_secure_bits & 0x1;
unsigned int otp_boot_device = (otp_secure_bits >> 8) & 0x7;
#endif
#endif
for (mode = 0; boot_modes[mode].name; mode++) {
@@ -743,15 +872,42 @@ static int bubt_check_boot_mode(const struct bubt_dev *dst)
return -ENOEXEC;
}
if (strcmp(boot_modes[mode].name, dst->name) == 0)
return 0;
if (strcmp(boot_modes[mode].name, dst->name) != 0) {
printf("Error: image meant to be booted from \"%s\", not \"%s\"!\n",
boot_modes[mode].name, dst->name);
return -ENOEXEC;
}
printf("Error: image meant to be booted from \"%s\", not \"%s\"!\n",
boot_modes[mode].name, dst->name);
return -ENOEXEC;
#else
return 0;
#if defined(CONFIG_ARMADA_38X) || defined(CONFIG_ARMADA_3700)
if (otp_secure_bits == (u64)-1) {
printf("Error: cannot read OTP secure bits\n");
return -ENOEXEC;
} else {
if (otp_secure_boot && !is_secure) {
printf("Error: secure boot is enabled in OTP but image does not have secure boot header!\n");
return -ENOEXEC;
} else if (!otp_secure_boot && is_secure) {
#if defined(CONFIG_ARMADA_3700)
/*
* Armada 3700 BootROM rejects trusted image when secure boot is not enabled.
* Armada 385 BootROM accepts image with secure boot header also when secure boot is not enabled.
*/
printf("Error: secure boot is disabled in OTP but image has secure boot header!\n");
return -ENOEXEC;
#endif
} else if (otp_boot_device && otp_boot_device != id) {
for (secure_mode = 0; boot_modes[secure_mode].name; secure_mode++) {
if (boot_modes[secure_mode].id == otp_boot_device)
break;
}
printf("Error: boot source is set to \"%s\" in OTP but image is for \"%s\"!\n",
boot_modes[secure_mode].name ?: "unknown", dst->name);
return -ENOEXEC;
}
}
#endif
#endif
return 0;
}
static int bubt_verify(const struct bubt_dev *dst)