redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

MLK-19219-3 imx8qm/qxp: Modify AHAB codes to reuse structures 

Update AHAB codes to use container image related structures in image.h

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
zero-sugar
Ye Li 2018-08-14 03:59:45 -07:00
parent 02b9874427
commit a63a239cc7
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/mach-imx/imx8/ahab.c
View File

@ -13,41 +13,16 @@
#include <asm/arch-imx/cpu.h>
#include <asm/arch/sys_proto.h>
#include <asm/arch/cpu.h>
#include <asm/arch/image.h>
DECLARE_GLOBAL_DATA_PTR;
#define IV_MAX_LEN 32
#define HASH_MAX_LEN 64
#define SEC_SECURE_RAM_BASE (0x31800000UL)
#define SEC_SECURE_RAM_END_BASE (SEC_SECURE_RAM_BASE + 0xFFFFUL)
#define SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE (0x60000000UL)
#define SECO_PT 2U
struct container_hdr {
uint8_t version;
uint16_t length;
uint8_t tag;
uint32_t flags;
uint16_t sw_version;
uint8_t fuse_version;
uint8_t num_images;
uint16_t sig_blk_offset;
uint16_t reserved;
} __attribute__((packed));
struct boot_img_t{
uint32_t offset;
uint32_t size;
uint64_t dst;
uint64_t entry;
uint32_t hab_flags;
uint32_t meta;
uint8_t hash[HASH_MAX_LEN];
uint8_t iv[IV_MAX_LEN];
}__attribute__((packed));
int authenticate_os_container(ulong addr)
{
struct container_hdr *phdr;
@ -56,6 +31,7 @@ int authenticate_os_container(ulong addr)
sc_err_t err;
sc_rm_mr_t mr;
sc_faddr_t start, end;
uint16_t length;
if (addr % 4)
return -EINVAL;
@ -71,8 +47,10 @@ int authenticate_os_container(ulong addr)
return -EFAULT;
}
debug("container length %u\n", phdr->length);
memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr, ALIGN(phdr->length, CONFIG_SYS_CACHELINE_SIZE));
length = phdr->length_lsb + (phdr->length_msb << 8);
debug("container length %u\n", length);
memcpy((void *)SEC_SECURE_RAM_BASE, (const void *)addr, ALIGN(length, CONFIG_SYS_CACHELINE_SIZE));
err = sc_misc_seco_authenticate(ipcHndl, SC_MISC_AUTH_CONTAINER, SECO_LOCAL_SEC_SEC_SECURE_RAM_BASE);
if (err) {