Skip to content

L
linux
Commit 24a4f14f authored by Horia Geantă's avatar Horia Geantă Committed by Herbert Xu
Browse files
Options

crypto: caam - constify pointer to descriptor buffer 

The pointer to the descriptor buffer is not touched,
it always points to start of the descriptor buffer.
Thus, make it const.
Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e25ff92e
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 34 deletions
drivers/crypto/caam/desc_constr.h
View file @ 24a4f14f
...@@ -33,38 +33,39 @@ ...@@ -33,38 +33,39 @@
extern bool caam_little_end; extern bool caam_little_end;
static inline int desc_len(u32 *desc) static inline int desc_len(u32 * const desc)
{ {
return caam32_to_cpu(*desc) & HDR_DESCLEN_MASK; return caam32_to_cpu(*desc) & HDR_DESCLEN_MASK;
} }
static inline int desc_bytes(void *desc) static inline int desc_bytes(void * const desc)
{ {
return desc_len(desc) * CAAM_CMD_SZ; return desc_len(desc) * CAAM_CMD_SZ;
} }
static inline u32 *desc_end(u32 *desc) static inline u32 *desc_end(u32 * const desc)
{ {
return desc + desc_len(desc); return desc + desc_len(desc);
} }
static inline void *sh_desc_pdb(u32 *desc) static inline void *sh_desc_pdb(u32 * const desc)
{ {
return desc + 1; return desc + 1;
} }
static inline void init_desc(u32 *desc, u32 options) static inline void init_desc(u32 * const desc, u32 options)
{ {
*desc = cpu_to_caam32((options | HDR_ONE) + 1); *desc = cpu_to_caam32((options | HDR_ONE) + 1);
} }
static inline void init_sh_desc(u32 *desc, u32 options) static inline void init_sh_desc(u32 * const desc, u32 options)
{ {
PRINT_POS; PRINT_POS;
init_desc(desc, CMD_SHARED_DESC_HDR | options); init_desc(desc, CMD_SHARED_DESC_HDR | options);
} }
static inline void init_sh_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes) static inline void init_sh_desc_pdb(u32 * const desc, u32 options,
size_t pdb_bytes)
{ {
u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ; u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ;
...@@ -72,19 +73,20 @@ static inline void init_sh_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes) ...@@ -72,19 +73,20 @@ static inline void init_sh_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes)
options); options);
} }
static inline void init_job_desc(u32 *desc, u32 options) static inline void init_job_desc(u32 * const desc, u32 options)
{ {
init_desc(desc, CMD_DESC_HDR | options); init_desc(desc, CMD_DESC_HDR | options);
} }
static inline void init_job_desc_pdb(u32 *desc, u32 options, size_t pdb_bytes) static inline void init_job_desc_pdb(u32 * const desc, u32 options,
size_t pdb_bytes)
{ {
u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ; u32 pdb_len = (pdb_bytes + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ;
init_job_desc(desc, (((pdb_len + 1) << HDR_START_IDX_SHIFT)) | options); init_job_desc(desc, (((pdb_len + 1) << HDR_START_IDX_SHIFT)) | options);
} }
static inline void append_ptr(u32 *desc, dma_addr_t ptr) static inline void append_ptr(u32 * const desc, dma_addr_t ptr)
{ {
dma_addr_t *offset = (dma_addr_t *)desc_end(desc); dma_addr_t *offset = (dma_addr_t *)desc_end(desc);
...@@ -94,8 +96,8 @@ static inline void append_ptr(u32 *desc, dma_addr_t ptr) ...@@ -94,8 +96,8 @@ static inline void append_ptr(u32 *desc, dma_addr_t ptr)
CAAM_PTR_SZ / CAAM_CMD_SZ); CAAM_PTR_SZ / CAAM_CMD_SZ);
} }
static inline void init_job_desc_shared(u32 *desc, dma_addr_t ptr, int len, static inline void init_job_desc_shared(u32 * const desc, dma_addr_t ptr,
u32 options) int len, u32 options)
{ {
PRINT_POS; PRINT_POS;
init_job_desc(desc, HDR_SHARED | options | init_job_desc(desc, HDR_SHARED | options |
...@@ -103,7 +105,7 @@ static inline void init_job_desc_shared(u32 *desc, dma_addr_t ptr, int len, ...@@ -103,7 +105,7 @@ static inline void init_job_desc_shared(u32 *desc, dma_addr_t ptr, int len,
append_ptr(desc, ptr); append_ptr(desc, ptr);
} }
static inline void append_data(u32 *desc, void *data, int len) static inline void append_data(u32 * const desc, void *data, int len)
{ {
u32 *offset = desc_end(desc); u32 *offset = desc_end(desc);
...@@ -114,7 +116,7 @@ static inline void append_data(u32 *desc, void *data, int len) ...@@ -114,7 +116,7 @@ static inline void append_data(u32 *desc, void *data, int len)
(len + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ); (len + CAAM_CMD_SZ - 1) / CAAM_CMD_SZ);
} }
static inline void append_cmd(u32 *desc, u32 command) static inline void append_cmd(u32 * const desc, u32 command)
{ {
u32 *cmd = desc_end(desc); u32 *cmd = desc_end(desc);
...@@ -125,7 +127,7 @@ static inline void append_cmd(u32 *desc, u32 command) ...@@ -125,7 +127,7 @@ static inline void append_cmd(u32 *desc, u32 command)
#define append_u32 append_cmd #define append_u32 append_cmd
static inline void append_u64(u32 *desc, u64 data) static inline void append_u64(u32 * const desc, u64 data)
{ {
u32 *offset = desc_end(desc); u32 *offset = desc_end(desc);
...@@ -142,14 +144,14 @@ static inline void append_u64(u32 *desc, u64 data) ...@@ -142,14 +144,14 @@ static inline void append_u64(u32 *desc, u64 data)
} }
/* Write command without affecting header, and return pointer to next word */ /* Write command without affecting header, and return pointer to next word */
static inline u32 *write_cmd(u32 *desc, u32 command) static inline u32 *write_cmd(u32 * const desc, u32 command)
{ {
*desc = cpu_to_caam32(command); *desc = cpu_to_caam32(command);
return desc + 1; return desc + 1;
} }
static inline void append_cmd_ptr(u32 *desc, dma_addr_t ptr, int len, static inline void append_cmd_ptr(u32 * const desc, dma_addr_t ptr, int len,
u32 command) u32 command)
{ {
append_cmd(desc, command | len); append_cmd(desc, command | len);
...@@ -157,7 +159,7 @@ static inline void append_cmd_ptr(u32 *desc, dma_addr_t ptr, int len, ...@@ -157,7 +159,7 @@ static inline void append_cmd_ptr(u32 *desc, dma_addr_t ptr, int len,
} }
/* Write length after pointer, rather than inside command */ /* Write length after pointer, rather than inside command */
static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr, static inline void append_cmd_ptr_extlen(u32 * const desc, dma_addr_t ptr,
unsigned int len, u32 command) unsigned int len, u32 command)
{ {
append_cmd(desc, command); append_cmd(desc, command);
...@@ -166,7 +168,7 @@ static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr, ...@@ -166,7 +168,7 @@ static inline void append_cmd_ptr_extlen(u32 *desc, dma_addr_t ptr,
append_cmd(desc, len); append_cmd(desc, len);
} }
static inline void append_cmd_data(u32 *desc, void *data, int len, static inline void append_cmd_data(u32 * const desc, void *data, int len,
u32 command) u32 command)
{ {
append_cmd(desc, command | IMMEDIATE | len); append_cmd(desc, command | IMMEDIATE | len);
...@@ -174,7 +176,7 @@ static inline void append_cmd_data(u32 *desc, void *data, int len, ...@@ -174,7 +176,7 @@ static inline void append_cmd_data(u32 *desc, void *data, int len,
} }
#define APPEND_CMD_RET(cmd, op) \ #define APPEND_CMD_RET(cmd, op) \
static inline u32 *append_##cmd(u32 *desc, u32 options) \ static inline u32 *append_##cmd(u32 * const desc, u32 options) \
{ \ { \
u32 *cmd = desc_end(desc); \ u32 *cmd = desc_end(desc); \
PRINT_POS; \ PRINT_POS; \
...@@ -184,13 +186,13 @@ static inline u32 *append_##cmd(u32 *desc, u32 options) \ ...@@ -184,13 +186,13 @@ static inline u32 *append_##cmd(u32 *desc, u32 options) \
APPEND_CMD_RET(jump, JUMP) APPEND_CMD_RET(jump, JUMP)
APPEND_CMD_RET(move, MOVE) APPEND_CMD_RET(move, MOVE)
static inline void set_jump_tgt_here(u32 *desc, u32 *jump_cmd) static inline void set_jump_tgt_here(u32 * const desc, u32 *jump_cmd)
{ {
*jump_cmd = cpu_to_caam32(caam32_to_cpu(*jump_cmd) | *jump_cmd = cpu_to_caam32(caam32_to_cpu(*jump_cmd) |
(desc_len(desc) - (jump_cmd - desc))); (desc_len(desc) - (jump_cmd - desc)));
} }
static inline void set_move_tgt_here(u32 *desc, u32 *move_cmd) static inline void set_move_tgt_here(u32 * const desc, u32 *move_cmd)
{ {
u32 val = caam32_to_cpu(*move_cmd); u32 val = caam32_to_cpu(*move_cmd);
...@@ -200,7 +202,7 @@ static inline void set_move_tgt_here(u32 *desc, u32 *move_cmd) ...@@ -200,7 +202,7 @@ static inline void set_move_tgt_here(u32 *desc, u32 *move_cmd)
} }
#define APPEND_CMD(cmd, op) \ #define APPEND_CMD(cmd, op) \
static inline void append_##cmd(u32 *desc, u32 options) \ static inline void append_##cmd(u32 * const desc, u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
append_cmd(desc, CMD_##op | options); \ append_cmd(desc, CMD_##op | options); \
...@@ -208,7 +210,8 @@ static inline void append_##cmd(u32 *desc, u32 options) \ ...@@ -208,7 +210,8 @@ static inline void append_##cmd(u32 *desc, u32 options) \
APPEND_CMD(operation, OPERATION) APPEND_CMD(operation, OPERATION)
#define APPEND_CMD_LEN(cmd, op) \ #define APPEND_CMD_LEN(cmd, op) \
static inline void append_##cmd(u32 *desc, unsigned int len, u32 options) \ static inline void append_##cmd(u32 * const desc, unsigned int len, \
u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
append_cmd(desc, CMD_##op | len | options); \ append_cmd(desc, CMD_##op | len | options); \
...@@ -220,8 +223,8 @@ APPEND_CMD_LEN(seq_fifo_load, SEQ_FIFO_LOAD) ...@@ -220,8 +223,8 @@ APPEND_CMD_LEN(seq_fifo_load, SEQ_FIFO_LOAD)
APPEND_CMD_LEN(seq_fifo_store, SEQ_FIFO_STORE) APPEND_CMD_LEN(seq_fifo_store, SEQ_FIFO_STORE)
#define APPEND_CMD_PTR(cmd, op) \ #define APPEND_CMD_PTR(cmd, op) \
static inline void append_##cmd(u32 *desc, dma_addr_t ptr, unsigned int len, \ static inline void append_##cmd(u32 * const desc, dma_addr_t ptr, \
u32 options) \ unsigned int len, u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
append_cmd_ptr(desc, ptr, len, CMD_##op | options); \ append_cmd_ptr(desc, ptr, len, CMD_##op | options); \
...@@ -231,8 +234,8 @@ APPEND_CMD_PTR(load, LOAD) ...@@ -231,8 +234,8 @@ APPEND_CMD_PTR(load, LOAD)
APPEND_CMD_PTR(fifo_load, FIFO_LOAD) APPEND_CMD_PTR(fifo_load, FIFO_LOAD)
APPEND_CMD_PTR(fifo_store, FIFO_STORE) APPEND_CMD_PTR(fifo_store, FIFO_STORE)
static inline void append_store(u32 *desc, dma_addr_t ptr, unsigned int len, static inline void append_store(u32 * const desc, dma_addr_t ptr,
u32 options) unsigned int len, u32 options)
{ {
u32 cmd_src; u32 cmd_src;
...@@ -249,7 +252,8 @@ static inline void append_store(u32 *desc, dma_addr_t ptr, unsigned int len, ...@@ -249,7 +252,8 @@ static inline void append_store(u32 *desc, dma_addr_t ptr, unsigned int len,
} }
#define APPEND_SEQ_PTR_INTLEN(cmd, op) \ #define APPEND_SEQ_PTR_INTLEN(cmd, op) \
static inline void append_seq_##cmd##_ptr_intlen(u32 *desc, dma_addr_t ptr, \ static inline void append_seq_##cmd##_ptr_intlen(u32 * const desc, \
dma_addr_t ptr, \
unsigned int len, \ unsigned int len, \
u32 options) \ u32 options) \
{ \ { \
...@@ -263,7 +267,7 @@ APPEND_SEQ_PTR_INTLEN(in, IN) ...@@ -263,7 +267,7 @@ APPEND_SEQ_PTR_INTLEN(in, IN)
APPEND_SEQ_PTR_INTLEN(out, OUT) APPEND_SEQ_PTR_INTLEN(out, OUT)
#define APPEND_CMD_PTR_TO_IMM(cmd, op) \ #define APPEND_CMD_PTR_TO_IMM(cmd, op) \
static inline void append_##cmd##_as_imm(u32 *desc, void *data, \ static inline void append_##cmd##_as_imm(u32 * const desc, void *data, \
unsigned int len, u32 options) \ unsigned int len, u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
...@@ -273,7 +277,7 @@ APPEND_CMD_PTR_TO_IMM(load, LOAD); ...@@ -273,7 +277,7 @@ APPEND_CMD_PTR_TO_IMM(load, LOAD);
APPEND_CMD_PTR_TO_IMM(fifo_load, FIFO_LOAD); APPEND_CMD_PTR_TO_IMM(fifo_load, FIFO_LOAD);
#define APPEND_CMD_PTR_EXTLEN(cmd, op) \ #define APPEND_CMD_PTR_EXTLEN(cmd, op) \
static inline void append_##cmd##_extlen(u32 *desc, dma_addr_t ptr, \ static inline void append_##cmd##_extlen(u32 * const desc, dma_addr_t ptr, \
unsigned int len, u32 options) \ unsigned int len, u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
...@@ -287,7 +291,7 @@ APPEND_CMD_PTR_EXTLEN(seq_out_ptr, SEQ_OUT_PTR) ...@@ -287,7 +291,7 @@ APPEND_CMD_PTR_EXTLEN(seq_out_ptr, SEQ_OUT_PTR)
* the size of its type * the size of its type
*/ */
#define APPEND_CMD_PTR_LEN(cmd, op, type) \ #define APPEND_CMD_PTR_LEN(cmd, op, type) \
static inline void append_##cmd(u32 *desc, dma_addr_t ptr, \ static inline void append_##cmd(u32 * const desc, dma_addr_t ptr, \
type len, u32 options) \ type len, u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
...@@ -304,7 +308,7 @@ APPEND_CMD_PTR_LEN(seq_out_ptr, SEQ_OUT_PTR, u32) ...@@ -304,7 +308,7 @@ APPEND_CMD_PTR_LEN(seq_out_ptr, SEQ_OUT_PTR, u32)
* from length of immediate data provided, e.g., split keys * from length of immediate data provided, e.g., split keys
*/ */
#define APPEND_CMD_PTR_TO_IMM2(cmd, op) \ #define APPEND_CMD_PTR_TO_IMM2(cmd, op) \
static inline void append_##cmd##_as_imm(u32 *desc, void *data, \ static inline void append_##cmd##_as_imm(u32 * const desc, void *data, \
unsigned int data_len, \ unsigned int data_len, \
unsigned int len, u32 options) \ unsigned int len, u32 options) \
{ \ { \
...@@ -315,7 +319,7 @@ static inline void append_##cmd##_as_imm(u32 *desc, void *data, \ ...@@ -315,7 +319,7 @@ static inline void append_##cmd##_as_imm(u32 *desc, void *data, \
APPEND_CMD_PTR_TO_IMM2(key, KEY); APPEND_CMD_PTR_TO_IMM2(key, KEY);
#define APPEND_CMD_RAW_IMM(cmd, op, type) \ #define APPEND_CMD_RAW_IMM(cmd, op, type) \
static inline void append_##cmd##_imm_##type(u32 *desc, type immediate, \ static inline void append_##cmd##_imm_##type(u32 * const desc, type immediate, \
u32 options) \ u32 options) \
{ \ { \
PRINT_POS; \ PRINT_POS; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7