mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 02:24:18 +00:00
feat(stm32mp1): update boot API for header v2.0
Add the new field for the new header v2.0. Force MP13 platform to use v2.0. Removing unused fields in boot_api_context_t for STM32MP13. Signed-off-by: Lionel Debieve <lionel.debieve@st.com> Change-Id: Iac81aad9a939c1f305184e335e0a907ac69071df
This commit is contained in:
Lionel Debieve
Yann Gautier
parent
52ac9983d6
commit
5f52eb1597
1 changed files with 94 additions and 6 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2017-2021, STMicroelectronics - All Rights Reserved
|
||||
* Copyright (c) 2017-2022, STMicroelectronics - All Rights Reserved
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -13,12 +13,22 @@
|
|||
/*
|
||||
* Possible value of boot context field 'auth_status'
|
||||
*/
|
||||
#if STM32MP13
|
||||
/* No authentication done */
|
||||
#define BOOT_API_CTX_AUTH_NO 0x7CFDD351U
|
||||
/* Authentication done and failed */
|
||||
#define BOOT_API_CTX_AUTH_FAILED 0x51330884U
|
||||
/* Authentication done and success */
|
||||
#define BOOT_API_CTX_AUTH_SUCCESS 0x67E8CAE1U
|
||||
#endif
|
||||
#if STM32MP15
|
||||
/* No authentication done */
|
||||
#define BOOT_API_CTX_AUTH_NO 0x0U
|
||||
/* Authentication done and failed */
|
||||
#define BOOT_API_CTX_AUTH_FAILED 0x1U
|
||||
/* Authentication done and succeeded */
|
||||
#define BOOT_API_CTX_AUTH_SUCCESS 0x2U
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Possible value of boot context field 'boot_interface_sel'
|
||||
|
|
@ -70,11 +80,17 @@
|
|||
#define BOOT_API_CTX_EMMC_ERROR_STATUS_HEADER_NOT_FOUND 0x5U
|
||||
#define BOOT_API_CTX_EMMC_ERROR_STATUS_HEADER_SIZE_ZERO 0x6U
|
||||
#define BOOT_API_CTX_EMMC_ERROR_STATUS_IMAGE_NOT_COMPLETE 0x7U
|
||||
#define BOOT_API_CTX_EMMC_ERROR_STATUS_ACK_ERROR 0x8U
|
||||
|
||||
/* Image Header related definitions */
|
||||
|
||||
/* Definition of header version */
|
||||
#if STM32MP13
|
||||
#define BOOT_API_HEADER_VERSION 0x00020000U
|
||||
#endif
|
||||
#if STM32MP15
|
||||
#define BOOT_API_HEADER_VERSION 0x00010000U
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Magic number used to detect header in memory
|
||||
|
|
@ -93,6 +109,49 @@
|
|||
#define BOOT_API_ECDSA_ALGO_TYPE_P256NIST 1
|
||||
#define BOOT_API_ECDSA_ALGO_TYPE_BRAINPOOL256 2
|
||||
|
||||
/*
|
||||
* Extension headers related definitions
|
||||
*/
|
||||
/* 'bootapi_image_header_t.extension_flag' used for authentication feature */
|
||||
#define BOOT_API_AUTHENTICATION_EXTENSION_BIT BIT(0)
|
||||
/* 'bootapi_image_header_t.extension_flag' used for FSBL decryption feature */
|
||||
#define BOOT_API_FSBL_DECRYPTION_EXTENSION_BIT BIT(1)
|
||||
/* 'bootapi_image_header_t.extension_flag' used for padding header feature */
|
||||
#define BOOT_API_PADDING_EXTENSION_BIT BIT(31)
|
||||
/*
|
||||
* mask of bits of field 'bootapi_image_header_t.extension_flag'
|
||||
* used for extension headers
|
||||
*/
|
||||
#define BOOT_API_ALL_EXTENSIONS_MASK \
|
||||
(BOOT_API_AUTHENTICATION_EXTENSION_BIT | \
|
||||
BOOT_API_FSBL_DECRYPTION_EXTENSION_BIT | \
|
||||
BOOT_API_PADDING_EXTENSION_BIT)
|
||||
/*
|
||||
* Magic number of FSBL decryption extension header
|
||||
* The value shall gives the four bytes 'S','T',0x00,0x01 in memory
|
||||
*/
|
||||
#define BOOT_API_FSBL_DECRYPTION_HEADER_MAGIC_NB 0x01005453U
|
||||
|
||||
/*
|
||||
* Magic number of PKH revocation extension header
|
||||
* The value shall gives the four bytes 'S','T',0x00,0x02 in memory
|
||||
*/
|
||||
#define BOOT_API_AUTHENTICATION_HEADER_MAGIC_NB 0x02005453U
|
||||
|
||||
/* Max number of ECDSA public key hash in table */
|
||||
#define BOOT_API_AUTHENTICATION_NB_PKH_MAX 8U
|
||||
|
||||
/* ECDSA public key hash table size in bytes */
|
||||
#define BOOT_API_AUTHENTICATION_TABLE_SIZE_BYTES \
|
||||
(BOOT_API_AUTHENTICATION_NB_PKH_MAX * \
|
||||
BOOT_API_SHA256_DIGEST_SIZE_IN_BYTES)
|
||||
|
||||
/*
|
||||
* Magic number of padding extension header
|
||||
* The value shall gives the four bytes 'S','T',0xFF,0xFF in memory
|
||||
*/
|
||||
#define BOOT_API_PADDING_HEADER_MAGIC_NB 0xFFFF5453U
|
||||
|
||||
/*
|
||||
* Cores secure magic numbers
|
||||
* Constant to be stored in bakcup register
|
||||
|
|
@ -157,11 +216,20 @@ typedef struct {
|
|||
*/
|
||||
uint16_t boot_interface_selected;
|
||||
uint16_t boot_interface_instance;
|
||||
#if STM32MP13
|
||||
uint32_t reserved1[12];
|
||||
#endif
|
||||
#if STM32MP15
|
||||
uint32_t reserved1[13];
|
||||
#endif
|
||||
uint32_t otp_afmux_values[3];
|
||||
uint32_t reserved[5];
|
||||
uint32_t reserved[3];
|
||||
#if STM32MP15
|
||||
uint32_t reserved2[2];
|
||||
#endif
|
||||
uint32_t auth_status;
|
||||
|
||||
#if STM32MP15
|
||||
/*
|
||||
* Pointers to bootROM External Secure Services
|
||||
* - ECDSA check key
|
||||
|
|
@ -179,7 +247,7 @@ typedef struct {
|
|||
uint8_t *signature,
|
||||
uint32_t ecc_algo,
|
||||
uint32_t *entry_in);
|
||||
|
||||
#endif
|
||||
/*
|
||||
* Information specific to an SD boot
|
||||
* Updated each time an SD boot is at least attempted,
|
||||
|
|
@ -227,10 +295,10 @@ typedef struct {
|
|||
uint8_t image_signature[BOOT_API_ECDSA_SIGNATURE_LEN_IN_BYTES];
|
||||
/*
|
||||
* Checksum of payload
|
||||
* 32-bit sum all all payload bytes considered as 8 bit unigned numbers,
|
||||
* discarding any overflow bits.
|
||||
* 32-bit sum all payload bytes considered as 8 bit unsigned
|
||||
* numbers, discarding any overflow bits.
|
||||
* Use to check UART/USB downloaded image integrity when signature
|
||||
* is not used (i.e bit 0 : 'No_sig_check' = 1 in option flags)
|
||||
* is not used
|
||||
*/
|
||||
uint32_t payload_checksum;
|
||||
/* Image header version : should have value BOOT_API_HEADER_VERSION */
|
||||
|
|
@ -255,6 +323,25 @@ typedef struct {
|
|||
* counter value in OTP_CFG4 prior executing the downloaded image
|
||||
*/
|
||||
uint32_t image_version;
|
||||
|
||||
#if STM32MP13
|
||||
/*
|
||||
* Extension flags :
|
||||
*
|
||||
* Bit 0 : Authentication extension header
|
||||
* value 0 : No signature check request
|
||||
* Bit 1 : Encryption extension header
|
||||
* Bit 2 : Padding extension header
|
||||
*/
|
||||
uint32_t extension_flags;
|
||||
/* Length in bytes of all extension headers */
|
||||
uint32_t extension_headers_length;
|
||||
/* Add binary type information */
|
||||
uint32_t binary_type;
|
||||
/* Pad up to 128 byte total size */
|
||||
uint8_t pad[16];
|
||||
#endif
|
||||
#if STM32MP15
|
||||
/*
|
||||
* Option flags:
|
||||
* Bit 0 : No signature check request : 'No_sig_check'
|
||||
|
|
@ -280,6 +367,7 @@ typedef struct {
|
|||
uint8_t pad[83];
|
||||
/* Add binary type information */
|
||||
uint8_t binary_type;
|
||||
#endif
|
||||
} __packed boot_api_image_header_t;
|
||||
|
||||
#endif /* BOOT_API_H */
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue