diff options
| author | Sumit Garg <sumit.garg@nxp.com> | 2016-08-31 08:54:15 -0400 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-10-06 09:54:14 -0700 |
| commit | b259732d36ccdc911e5b3ed83bd55aae90a43532 (patch) | |
| tree | 1e106f1096c880e7f401f06d35f358857b84bb9b /include/fsl_sec_mon.h | |
| parent | 4de6ce1594fcff6fa9e626d094fa922f4889e167 (diff) | |
| download | u-boot-b259732d36ccdc911e5b3ed83bd55aae90a43532.tar.gz u-boot-b259732d36ccdc911e5b3ed83bd55aae90a43532.tar.bz2 u-boot-b259732d36ccdc911e5b3ed83bd55aae90a43532.zip | |
fsl_sec_mon: Update driver for Security Monitor
Update the API's for transition of Security Monitor states. Instead
of providing both initial and final states for transition, just
provide final state for transition as Security Monitor driver will
take care of it internally.
Signed-off-by: Sumit Garg <sumit.garg@nxp.com>
[York Sun: Reformatted commit message slightly]
Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'include/fsl_sec_mon.h')
| -rw-r--r-- | include/fsl_sec_mon.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/fsl_sec_mon.h b/include/fsl_sec_mon.h index b6794cefcc..1f31f8865c 100644 --- a/include/fsl_sec_mon.h +++ b/include/fsl_sec_mon.h @@ -34,13 +34,16 @@ struct ccsr_sec_mon_regs { u32 hp_stat; /* 0x08 SEC_MON_HP Status Register */ }; -#define HPCOMR_SW_SV 0x100 /* Security Violation bit */ -#define HPCOMR_SW_FSV 0x200 /* Fatal Security Violation bit */ -#define HPCOMR_SSM_ST 0x1 /* SSM_ST field in SEC_MON command */ +#define HPCOMR_SW_SV 0x100 /* Security Violation bit */ +#define HPCOMR_SW_FSV 0x200 /* Fatal Security Violation bit */ +#define HPCOMR_SSM_ST 0x1 /* SSM_ST field in SEC_MON command */ +#define HPCOMR_SSM_ST_DIS 0x2 /* Disable Secure to Trusted State */ +#define HPCOMR_SSM_SFNS_DIS 0x4 /* Disable Soft Fail to Non-Secure */ #define HPSR_SSM_ST_CHECK 0x900 /* SEC_MON is in check state */ #define HPSR_SSM_ST_NON_SECURE 0xb00 /* SEC_MON is in non secure state */ #define HPSR_SSM_ST_TRUST 0xd00 /* SEC_MON is in trusted state */ #define HPSR_SSM_ST_SOFT_FAIL 0x300 /* SEC_MON is in soft fail state */ +#define HPSR_SSM_ST_SECURE 0xf00 /* SEC_MON is in secure state */ #define HPSR_SSM_ST_MASK 0xf00 /* Mask for SSM_ST field */ /* @@ -53,6 +56,7 @@ enum { SEC_MON_SW_SV, }; -int change_sec_mon_state(uint32_t initial_state, uint32_t final_state); +/* Transition SEC_MON state */ +int set_sec_mon_state(u32 state); #endif /* __FSL_SEC_MON_H */ |