Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 19:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto/fsl: don't regenerate secure keys

Browse source 
The secure keys (TDKEK, JDKEK, TDSK) can only be generated once after a
POR. Otherwise the RNG4 will throw an error.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Michael Walle 2020-06-27 22:58:51 +02:00 • committed by Priyanka Jain
parent 0dc596127c
commit c269a970f2
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/crypto/fsl/jobdesc.c
View file

@ -258,7 +258,7 @@ void inline_cnstr_jobdesc_blob_decap(uint32_t *desc, uint8_t *key_idnfr,
* Descriptor to instantiate RNG State Handle 0 in normal mode and * Descriptor to instantiate RNG State Handle 0 in normal mode and
* load the JDKEK, TDKEK and TDSK registers * load the JDKEK, TDKEK and TDSK registers
*/ */
void inline_cnstr_jobdesc_rng_instantiation(uint32_t *desc, int handle) void inline_cnstr_jobdesc_rng_instantiation(u32 *desc, int handle, int do_sk)
{ {
u32 *jump_cmd; u32 *jump_cmd;
@ -269,7 +269,7 @@ void inline_cnstr_jobdesc_rng_instantiation(uint32_t *desc, int handle)
(handle << OP_ALG_AAI_SHIFT) | OP_ALG_AS_INIT); (handle << OP_ALG_AAI_SHIFT) | OP_ALG_AS_INIT);
/* For SH0, Secure Keys must be generated as well */ /* For SH0, Secure Keys must be generated as well */
if (handle == 0) { if (!handle && do_sk) {
/* wait for done */ /* wait for done */
jump_cmd = append_jump(desc, JUMP_CLASS_CLASS1); jump_cmd = append_jump(desc, JUMP_CLASS_CLASS1);
set_jump_tgt_here(desc, jump_cmd); set_jump_tgt_here(desc, jump_cmd);

2
drivers/crypto/fsl/jobdesc.h
View file

@ -39,7 +39,7 @@ void inline_cnstr_jobdesc_blob_decap(uint32_t *desc, uint8_t *key_idnfr,
uint8_t *enc_blob, uint8_t *plain_txt, uint8_t *enc_blob, uint8_t *plain_txt,
uint32_t out_sz); uint32_t out_sz);
void inline_cnstr_jobdesc_rng_instantiation(uint32_t *desc, int handle); void inline_cnstr_jobdesc_rng_instantiation(u32 *desc, int handle, int do_sk);
void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc, void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc,
struct pk_in_params *pkin, uint8_t *out, struct pk_in_params *pkin, uint8_t *out,

9
drivers/crypto/fsl/jr.c
View file

@ -446,7 +446,7 @@ int sec_reset(void)
return sec_reset_idx(0); return sec_reset_idx(0);
} }
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
static int instantiate_rng(uint8_t sec_idx) static int instantiate_rng(u8 sec_idx, int gen_sk)
{ {
u32 *desc; u32 *desc;
u32 rdsta_val; u32 rdsta_val;
@ -470,7 +470,7 @@ static int instantiate_rng(uint8_t sec_idx)
if (rdsta_val & (1 << sh_idx)) if (rdsta_val & (1 << sh_idx))
continue; continue;
inline_cnstr_jobdesc_rng_instantiation(desc, sh_idx); inline_cnstr_jobdesc_rng_instantiation(desc, sh_idx, gen_sk);
size = roundup(sizeof(uint32_t) * 6, ARCH_DMA_MINALIGN); size = roundup(sizeof(uint32_t) * 6, ARCH_DMA_MINALIGN);
flush_dcache_range((unsigned long)desc, flush_dcache_range((unsigned long)desc,
(unsigned long)desc + size); (unsigned long)desc + size);
@ -546,12 +546,13 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)
static int rng_init(uint8_t sec_idx) static int rng_init(uint8_t sec_idx)
{ {
int ret, ent_delay = RTSDCTL_ENT_DLY_MIN; int ret, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN;
ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx); ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);
struct rng4tst __iomem *rng = struct rng4tst __iomem *rng =
(struct rng4tst __iomem *)&sec->rng; (struct rng4tst __iomem *)&sec->rng;
u32 inst_handles; u32 inst_handles;
gen_sk = !(sec_in32(&rng->rdsta) & RDSTA_SKVN);
do { do {
inst_handles = sec_in32(&rng->rdsta) & RNG_STATE_HANDLE_MASK; inst_handles = sec_in32(&rng->rdsta) & RNG_STATE_HANDLE_MASK;
@ -574,7 +575,7 @@ static int rng_init(uint8_t sec_idx)
* interval, leading to a sucessful initialization of * interval, leading to a sucessful initialization of
* the RNG. * the RNG.
*/ */
ret = instantiate_rng(sec_idx); ret = instantiate_rng(sec_idx, gen_sk);
} while ((ret == -1) && (ent_delay < RTSDCTL_ENT_DLY_MAX)); } while ((ret == -1) && (ent_delay < RTSDCTL_ENT_DLY_MAX));
if (ret) { if (ret) {
printf("SEC%u: Failed to instantiate RNG\n", sec_idx); printf("SEC%u: Failed to instantiate RNG\n", sec_idx);

1
include/fsl_sec.h
View file

@ -69,6 +69,7 @@ struct rng4tst {
#define RNG_STATE1_HANDLE_INSTANTIATED 0x00000002 #define RNG_STATE1_HANDLE_INSTANTIATED 0x00000002
#define RNG_STATE_HANDLE_MASK \ #define RNG_STATE_HANDLE_MASK \
(RNG_STATE0_HANDLE_INSTANTIATED | RNG_STATE1_HANDLE_INSTANTIATED) (RNG_STATE0_HANDLE_INSTANTIATED | RNG_STATE1_HANDLE_INSTANTIATED)
#define RDSTA_SKVN 0x40000000
u32 rdsta; /*RNG DRNG Status Register*/ u32 rdsta; /*RNG DRNG Status Register*/
u32 rsvd2[15]; u32 rsvd2[15];
}; };