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

Merge "feat(ethos-n): update npu error handling" into integration

Browse source
This commit is contained in:
Olivier Deprez 2023-09-19 18:15:12 +02:00 • committed by TrustedFirmware Code Review
commit 84de50c7d8
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/arm/ethosn/ethosn_big_fw.c
View file

@ -12,7 +12,7 @@
#define ETHOSN_BIG_FW_MAGIC ('E' | ('N' << 8) | ('F' << 16) | ('W' << 24)) #define ETHOSN_BIG_FW_MAGIC ('E' | ('N' << 8) | ('F' << 16) | ('W' << 24))
/* Supported big firmware version */ /* Supported big firmware version */
#define ETHOSN_BIG_FW_VERSION_MAJOR 12 #define ETHOSN_BIG_FW_VERSION_MAJOR 15
#define ETHOSN_ARCH_VER_MAJOR_MASK U(0xF000) #define ETHOSN_ARCH_VER_MAJOR_MASK U(0xF000)
#define ETHOSN_ARCH_VER_MAJOR_SHIFT U(0xC) #define ETHOSN_ARCH_VER_MAJOR_SHIFT U(0xC)

4
drivers/arm/ethosn/ethosn_smc.c
View file

@ -46,7 +46,7 @@
#define ETHOSN_AUX_FEAT_STASHING U(0x2) #define ETHOSN_AUX_FEAT_STASHING U(0x2)
#define SEC_AUXCTLR_REG U(0x0024) #define SEC_AUXCTLR_REG U(0x0024)
#define SEC_AUXCTLR_VAL U(0x80) #define SEC_AUXCTLR_VAL U(0x000ce080)
#define SEC_AUXCTLR_LEVEL_IRQ_VAL U(0x04) #define SEC_AUXCTLR_LEVEL_IRQ_VAL U(0x04)
#define SEC_AUXCTLR_STASHING_VAL U(0xA5000000) #define SEC_AUXCTLR_STASHING_VAL U(0xA5000000)
@ -73,7 +73,7 @@
#define SEC_SYSCTRL0_HARD_RESET U(1U << 31) #define SEC_SYSCTRL0_HARD_RESET U(1U << 31)
#define SEC_SYSCTRL1_REG U(0x001C) #define SEC_SYSCTRL1_REG U(0x001C)
#define SEC_SYSCTRL1_VAL U(0x180110) #define SEC_SYSCTRL1_VAL U(0xe0180110)
#define SEC_NSAID_REG_BASE U(0x3004) #define SEC_NSAID_REG_BASE U(0x3004)
#define SEC_NSAID_OFFSET U(0x1000) #define SEC_NSAID_OFFSET U(0x1000)

2
include/drivers/arm/ethosn.h
View file

@ -47,7 +47,7 @@
#define is_ethosn_fid(_fid) (((_fid) & ETHOSN_FID_MASK) == ETHOSN_FID_VALUE) #define is_ethosn_fid(_fid) (((_fid) & ETHOSN_FID_MASK) == ETHOSN_FID_VALUE)
/* Service version */ /* Service version */
#define ETHOSN_VERSION_MAJOR U(3) #define ETHOSN_VERSION_MAJOR U(4)
#define ETHOSN_VERSION_MINOR U(0) #define ETHOSN_VERSION_MINOR U(0)
/* Return codes for function calls */ /* Return codes for function calls */