MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-09-03 10:33:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

MLK-9769-11 Add SM register defs, and expanded driver-private storage.

Browse Source 
These add changes to the driver private areas for the CAAM
controller and CAAM Secure Memory subsystems, and expand register
definitions to include the Secure Memory subsystems as reflected
in multiple areas (controller, rings, secure memory itself).

[<vicki.milhoan@freescale.com>: Edited to apply to 3.14]
Signed-off-by: Steve Cornelius <steve.cornelius@freescale.com>
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com>
Signed-off-by: Dan Douglass <dan.douglass@freescale.com>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
This commit is contained in:
Steve Cornelius 2012-10-19 14:43:41 -07:00 committed by Leonard Crestez
parent ae8175a3f1
commit 9512280d06
1 changed files with 139 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
drivers/crypto/caam/regs.h
View File

@ -269,6 +269,13 @@ struct jr_outentry {
#define CHA_ID_MS_JR_SHIFT 28
#define CHA_ID_MS_JR_MASK (0xfull << CHA_ID_MS_JR_SHIFT)
/*
* caam_perfmon - Performance Monitor/Secure Memory Status/
* CAAM Global Status/Component Version IDs
*
* Spans f00-fff wherever instantiated
*/
struct sec_vid {
u16 ip_id;
u8 maj_rev;
@ -298,17 +305,22 @@ struct caam_perfmon {
#define CTPR_MS_PG_SZ_SHIFT 4
u32 comp_parms_ms; /* CTPR - Compile Parameters Register */
u32 comp_parms_ls; /* CTPR - Compile Parameters Register */
u64 rsvd1[2];
/* Secure Memory State Visibility */
u32 rsvd1;
u32 smstatus; /* Secure memory status */
u32 rsvd2;
u32 smpartown; /* Secure memory partition owner */
/* CAAM Global Status fc0-fdf */
u64 faultaddr; /* FAR - Fault Address */
u32 faultliodn; /* FALR - Fault Address LIODN */
u32 faultdetail; /* FADR - Fault Addr Detail */
u32 rsvd2;
#define CSTA_PLEND BIT(10)
#define CSTA_ALT_PLEND BIT(18)
u32 rsvd3;
u32 status; /* CSTA - CAAM Status */
u64 rsvd3;
u32 smpart; /* Secure Memory Partition Parameters */
u32 smvid; /* Secure Memory Version ID */
/* Component Instantiation Parameters fe0-fff */
u32 rtic_id; /* RVID - RTIC Version ID */
@ -327,6 +339,62 @@ struct caam_perfmon {
u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */
};
#define SMSTATUS_PART_SHIFT 28
#define SMSTATUS_PART_MASK (0xf << SMSTATUS_PART_SHIFT)
#define SMSTATUS_PAGE_SHIFT 16
#define SMSTATUS_PAGE_MASK (0x7ff << SMSTATUS_PAGE_SHIFT)
#define SMSTATUS_MID_SHIFT 8
#define SMSTATUS_MID_MASK (0x3f << SMSTATUS_MID_SHIFT)
#define SMSTATUS_ACCERR_SHIFT 4
#define SMSTATUS_ACCERR_MASK (0xf << SMSTATUS_ACCERR_SHIFT)
#define SMSTATUS_ACCERR_NONE 0
#define SMSTATUS_ACCERR_ALLOC 1 /* Page not allocated */
#define SMSTATUS_ACCESS_ID 2 /* Not granted by ID */
#define SMSTATUS_ACCESS_WRITE 3 /* Writes not allowed */
#define SMSTATUS_ACCESS_READ 4 /* Reads not allowed */
#define SMSTATUS_ACCESS_NONKEY 6 /* Non-key reads not allowed */
#define SMSTATUS_ACCESS_BLOB 9 /* Blob access not allowed */
#define SMSTATUS_ACCESS_DESCB 10 /* Descriptor Blob access spans pages */
#define SMSTATUS_ACCESS_NON_SM 11 /* Outside Secure Memory range */
#define SMSTATUS_ACCESS_XPAGE 12 /* Access crosses pages */
#define SMSTATUS_ACCESS_INITPG 13 /* Page still initializing */
#define SMSTATUS_STATE_SHIFT 0
#define SMSTATUS_STATE_MASK (0xf << SMSTATUS_STATE_SHIFT)
#define SMSTATUS_STATE_RESET 0
#define SMSTATUS_STATE_INIT 1
#define SMSTATUS_STATE_NORMAL 2
#define SMSTATUS_STATE_FAIL 3
/* up to 15 rings, 2 bits shifted by ring number */
#define SMPARTOWN_RING_SHIFT 2
#define SMPARTOWN_RING_MASK 3
#define SMPARTOWN_AVAILABLE 0
#define SMPARTOWN_NOEXIST 1
#define SMPARTOWN_UNAVAILABLE 2
#define SMPARTOWN_OURS 3
/* Maximum number of pages possible */
#define SMPART_MAX_NUMPG_SHIFT 16
#define SMPART_MAX_NUMPG_MASK (0x3f << SMPART_MAX_NUMPG_SHIFT)
/* Maximum partition number */
#define SMPART_MAX_PNUM_SHIFT 12
#define SMPART_MAX_PNUM_MASK (0xf << SMPART_MAX_PNUM_SHIFT)
/* Highest possible page number */
#define SMPART_MAX_PG_SHIFT 0
#define SMPART_MAX_PG_MASK (0x3f << SMPART_MAX_PG_SHIFT)
/* Max size of a page */
#define SMVID_PG_SIZE_SHIFT 16
#define SMVID_PG_SIZE_MASK (0x7 << SMVID_PG_SIZE_SHIFT)
/* Major/Minor Version ID */
#define SMVID_MAJ_VERS_SHIFT 8
#define SMVID_MAJ_VERS (0xf << SMVID_MAJ_VERS_SHIFT)
#define SMVID_MIN_VERS_SHIFT 0
#define SMVID_MIN_VERS (0xf << SMVID_MIN_VERS_SHIFT)
/* LIODN programming for DMA configuration */
#define MSTRID_LOCK_LIODN 0x80000000
#define MSTRID_LOCK_MAKETRUSTED 0x00010000 /* only for JR masterid */
@ -570,7 +638,18 @@ struct caam_job_ring {
u32 rsvd11;
u32 jrcommand; /* JRCRx - JobR command */
u32 rsvd12[932];
u32 rsvd12[33];
/* Secure Memory Configuration - if you have it */
u32 sm_cmd; /* SMCJRx - Secure memory command */
u32 rsvd13;
u32 sm_status; /* SMCSJRx - Secure memory status */
u32 rsvd14;
u32 sm_perm; /* SMAPJRx - Secure memory access perms */
u32 sm_group2; /* SMAP2JRx - Secure memory access group 2 */
u32 sm_group1; /* SMAP1JRx - Secure memory access group 1 */
u32 rsvd15[891];
/* Performance Monitor f00-fff */
struct caam_perfmon perfmon;
@ -693,6 +772,62 @@ struct caam_job_ring {
#define JRCR_RESET 0x01
/* secure memory command */
#define SMC_PAGE_SHIFT 16
#define SMC_PAGE_MASK (0xffff << SMC_PAGE_SHIFT)
#define SMC_PART_SHIFT 8
#define SMC_PART_MASK (0x0f << SMC_PART_SHIFT)
#define SMC_CMD_SHIFT 0
#define SMC_CMD_MASK (0x0f << SMC_CMD_SHIFT)
#define SMC_CMD_ALLOC_PAGE 0x01 /* allocate page to this partition */
#define SMC_CMD_DEALLOC_PAGE 0x02 /* deallocate page from partition */
#define SMC_CMD_DEALLOC_PART 0x03 /* deallocate partition */
#define SMC_CMD_PAGE_INQUIRY 0x05 /* find partition associate with page */
/* secure memory (command) status */
#define SMCS_PAGE_SHIFT 16
#define SMCS_PAGE_MASK (0x0fff << SMCS_PAGE_SHIFT)
#define SMCS_CMDERR_SHIFT 14
#define SMCS_CMDERR_MASK (3 << SMCS_CMDERR_SHIFT)
#define SMCS_ALCERR_SHIFT 12
#define SMCS_ALCERR_MASK (3 << SMCS_ALCERR_SHIFT)
#define SMCS_PGOWN_SHIFT 6
#define SMCS_PGWON_MASK (3 << SMCS_PGOWN_SHIFT)
#define SMCS_PART_SHIFT 0
#define SMCS_PART_MASK (0xf << SMCS_PART_SHIFT)
#define SMCS_CMDERR_NONE 0
#define SMCS_CMDERR_INCOMP 1 /* Command not yet complete */
#define SMCS_CMDERR_SECFAIL 2 /* Security failure occurred */
#define SMCS_CMDERR_OVERFLOW 3 /* Command overflow */
#define SMCS_ALCERR_NONE 0
#define SMCS_ALCERR_PSPERR 1 /* Partion marked PSP (dealloc only) */
#define SMCS_ALCERR_PAGEAVAIL 2 /* Page not available */
#define SMCS_ALCERR_PARTOWN 3 /* Partition ownership error */
#define SMCS_PGOWN_AVAIL 0 /* Page is available */
#define SMCS_PGOWN_NOEXIST 1 /* Page initializing or nonexistent */
#define SMCS_PGOWN_NOOWN 2 /* Page owned by another processor */
#define SMCS_PGOWN_OWNED 3 /* Page belongs to this processor */
/* secure memory access permissions */
#define SMCS_PERM_KEYMOD_SHIFT 16
#define SMCA_PERM_KEYMOD_MASK (0xff << SMCS_PERM_KEYMOD_SHIFT)
#define SMCA_PERM_CSP_ZERO 0x8000 /* Zero when deallocated or released */
#define SMCA_PERM_PSP_LOCK 0x4000 /* Part./pages can't be deallocated */
#define SMCA_PERM_PERM_LOCK 0x2000 /* Lock permissions */
#define SMCA_PERM_GRP_LOCK 0x1000 /* Lock access groups */
#define SMCA_PERM_RINGID_SHIFT 10
#define SMCA_PERM_RINGID_MASK (3 << SMCA_PERM_RINGID_SHIFT)
#define SMCA_PERM_G2_BLOB 0x0080 /* Group 2 blob import/export */
#define SMCA_PERM_G2_WRITE 0x0020 /* Group 2 write */
#define SMCA_PERM_G2_READ 0x0010 /* Group 2 read */
#define SMCA_PERM_G1_BLOB 0x0008 /* Group 1... */
#define SMCA_PERM_G1_WRITE 0x0002
#define SMCA_PERM_G1_READ 0x0001
/*
* caam_assurance - Assurance Controller View
* base + 0x6000 padded out to 0x1000