diff options
author | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-04-13 11:27:00 -0400 |
commit | 891483186052b259852f3f48926ff307763f4eb0 (patch) | |
tree | 019e4a490e40ad5459f7dd3d4129021be696c495 /arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h | |
parent | 36fec02b1f90b92cf51ec531564f9284eae27ab4 (diff) | |
parent | 67bbc1ecd311c78b06e845a3fd4e333806782367 (diff) |
Merge branch 'next'
Pull in changes that have been pending in our 'next' branch. This
includes:
- A large number of CI improvements including moving to gcc-9.2 for all
platforms.
- amlogic, xilinx, stm32, TI SoC updates
- USB and i2c subsystem updtaes
- Re-sync Kbuild/etc logic with v4.19 of the Linux kernel.
- RSA key handling improvements
Diffstat (limited to 'arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h')
-rw-r--r-- | arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h index 8130546b27..4ad14f963b 100644 --- a/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h +++ b/arch/arm/mach-stm32mp/include/mach/stm32mp1_smc.h @@ -27,6 +27,7 @@ #define STM32_SMC_READ_OTP 0x04 #define STM32_SMC_READ_ALL 0x05 #define STM32_SMC_WRITE_ALL 0x06 +#define STM32_SMC_WRLOCK_OTP 0x07 /* SMC error codes */ #define STM32_SMC_OK 0x0 @@ -45,8 +46,8 @@ static inline u32 stm32_smc(u32 svc, u8 op, u32 data1, u32 data2, u32 *result) arm_smccc_smc(svc, op, data1, data2, 0, 0, 0, 0, &res); if (res.a0) { - pr_err("%s: Failed to exec in secure mode (err = %ld)\n", - __func__, res.a0); + pr_err("%s: Failed to exec svc=%x op=%x in secure mode (err = %ld)\n", + __func__, svc, op, res.a0); return -EINVAL; } if (result) |