Commit e28c190d authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu

csrypto: ccp - Expand RSA support for a v5 ccp

A version 5 CCP can handle an RSA modulus up to 16k bits.
Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ceeec0af
...@@ -60,7 +60,10 @@ static int ccp_rsa_complete(struct crypto_async_request *async_req, int ret) ...@@ -60,7 +60,10 @@ static int ccp_rsa_complete(struct crypto_async_request *async_req, int ret)
static unsigned int ccp_rsa_maxsize(struct crypto_akcipher *tfm) static unsigned int ccp_rsa_maxsize(struct crypto_akcipher *tfm)
{ {
return CCP_RSA_MAXMOD; if (ccp_version() > CCP_VERSION(3, 0))
return CCP5_RSA_MAXMOD;
else
return CCP_RSA_MAXMOD;
} }
static int ccp_rsa_crypt(struct akcipher_request *req, bool encrypt) static int ccp_rsa_crypt(struct akcipher_request *req, bool encrypt)
......
...@@ -255,6 +255,7 @@ struct ccp_rsa_req_ctx { ...@@ -255,6 +255,7 @@ struct ccp_rsa_req_ctx {
}; };
#define CCP_RSA_MAXMOD (4 * 1024 / 8) #define CCP_RSA_MAXMOD (4 * 1024 / 8)
#define CCP5_RSA_MAXMOD (16 * 1024 / 8)
/***** Common Context Structure *****/ /***** Common Context Structure *****/
struct ccp_ctx { struct ccp_ctx {
......
...@@ -597,4 +597,5 @@ const struct ccp_vdata ccpv3 = { ...@@ -597,4 +597,5 @@ const struct ccp_vdata ccpv3 = {
.setup = NULL, .setup = NULL,
.perform = &ccp3_actions, .perform = &ccp3_actions,
.offset = 0x20000, .offset = 0x20000,
.rsamax = CCP_RSA_MAX_WIDTH,
}; };
...@@ -1112,6 +1112,7 @@ const struct ccp_vdata ccpv5a = { ...@@ -1112,6 +1112,7 @@ const struct ccp_vdata ccpv5a = {
.setup = ccp5_config, .setup = ccp5_config,
.perform = &ccp5_actions, .perform = &ccp5_actions,
.offset = 0x0, .offset = 0x0,
.rsamax = CCP5_RSA_MAX_WIDTH,
}; };
const struct ccp_vdata ccpv5b = { const struct ccp_vdata ccpv5b = {
...@@ -1120,4 +1121,5 @@ const struct ccp_vdata ccpv5b = { ...@@ -1120,4 +1121,5 @@ const struct ccp_vdata ccpv5b = {
.setup = ccp5other_config, .setup = ccp5other_config,
.perform = &ccp5_actions, .perform = &ccp5_actions,
.offset = 0x0, .offset = 0x0,
.rsamax = CCP5_RSA_MAX_WIDTH,
}; };
...@@ -202,6 +202,7 @@ ...@@ -202,6 +202,7 @@
#define CCP_SHA_SB_COUNT 1 #define CCP_SHA_SB_COUNT 1
#define CCP_RSA_MAX_WIDTH 4096 #define CCP_RSA_MAX_WIDTH 4096
#define CCP5_RSA_MAX_WIDTH 16384
#define CCP_PASSTHRU_BLOCKSIZE 256 #define CCP_PASSTHRU_BLOCKSIZE 256
#define CCP_PASSTHRU_MASKSIZE 32 #define CCP_PASSTHRU_MASKSIZE 32
......
...@@ -1736,7 +1736,8 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) ...@@ -1736,7 +1736,8 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
unsigned int sb_count, i_len, o_len; unsigned int sb_count, i_len, o_len;
int ret; int ret;
if (rsa->key_size > CCP_RSA_MAX_WIDTH) /* Check against the maximum allowable size, in bits */
if (rsa->key_size > cmd_q->ccp->vdata->rsamax)
return -EINVAL; return -EINVAL;
if (!rsa->exp || !rsa->mod || !rsa->src || !rsa->dst) if (!rsa->exp || !rsa->mod || !rsa->src || !rsa->dst)
......
...@@ -40,6 +40,7 @@ struct ccp_vdata { ...@@ -40,6 +40,7 @@ struct ccp_vdata {
void (*setup)(struct ccp_device *); void (*setup)(struct ccp_device *);
const struct ccp_actions *perform; const struct ccp_actions *perform;
const unsigned int offset; const unsigned int offset;
const unsigned int rsamax;
}; };
/* Structure to hold SP device data */ /* Structure to hold SP device data */
struct sp_dev_vdata { struct sp_dev_vdata {
......
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