Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-21 12:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "bug-fix" into integration

Browse source 
* changes:
  fix(nxp-crypto): refine code to avoid hang issue for some of toolchain
  build(changelog): add new scope for nxp crypto
  fix(lx2): drop erratum A-009810
This commit is contained in:
Madhukar Pappireddy 2022-02-23 15:34:57 +01:00 • committed by TrustedFirmware Code Review
commit 176717989f
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog.yaml
View file

@ -738,6 +738,9 @@ subsections:
- title: QSPI - title: QSPI
scope: nxp-qspi scope: nxp-qspi
- title: NXP Crypto
scope: nxp-crypto
- title: Renesas - title: Renesas
scope: renesas-drivers scope: renesas-drivers

4
drivers/nxp/crypto/caam/src/jobdesc.c
View file

@ -60,8 +60,8 @@ void desc_add_ptr(uint32_t *desc, phys_addr_t *ptr)
#ifdef CONFIG_PHYS_64BIT #ifdef CONFIG_PHYS_64BIT
ptr_addr_t *ptr_addr = (ptr_addr_t *) last; ptr_addr_t *ptr_addr = (ptr_addr_t *) last;
ptr_addr->m_halves.high = PHYS_ADDR_HI(ptr); ptr_addr->high = PHYS_ADDR_HI(ptr);
ptr_addr->m_halves.low = PHYS_ADDR_LO(ptr); ptr_addr->low = PHYS_ADDR_LO(ptr);
#else #else
*last = ptr; *last = ptr;
#endif #endif

5
include/drivers/nxp/crypto/caam/sec_hw_specific.h
View file

@ -187,9 +187,7 @@ struct jobring_regs {
((value) & JRINT_JRE) ((value) & JRINT_JRE)
/* Macros for manipulating JR registers */ /* Macros for manipulating JR registers */
typedef union { typedef struct {
uint64_t m_whole;
struct {
#ifdef NXP_SEC_BE #ifdef NXP_SEC_BE
uint32_t high; uint32_t high;
uint32_t low; uint32_t low;
@ -197,7 +195,6 @@ typedef union {
uint32_t low; uint32_t low;
uint32_t high; uint32_t high;
#endif #endif
} m_halves;
} ptr_addr_t; } ptr_addr_t;
#if defined(CONFIG_PHYS_64BIT) #if defined(CONFIG_PHYS_64BIT)

8
plat/nxp/soc-lx2160a/aarch64/lx2160a.S
View file

@ -563,14 +563,6 @@ endfunc _soc_sys_reset
*/ */
func _soc_sys_off func _soc_sys_off
/* A-009810: LPM20 entry sequence might cause
* spurious timeout reset request
* workaround: MASK RESET REQ RPTOE
*/
ldr x0, =NXP_RESET_ADDR
ldr w1, =RSTRQMR_RPTOE_MASK
str w1, [x0, #RST_RSTRQMR1_OFFSET]
/* disable sec, QBman, spi and qspi */ /* disable sec, QBman, spi and qspi */
ldr x2, =NXP_DCFG_ADDR ldr x2, =NXP_DCFG_ADDR
ldr x0, =DCFG_DEVDISR1_OFFSET ldr x0, =DCFG_DEVDISR1_OFFSET