From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Ravi1.Kumar@amd.com>
Received: from NAM01-BN3-obe.outbound.protection.outlook.com
(mail-bn3nam01on0054.outbound.protection.outlook.com [104.47.33.54])
by dpdk.org (Postfix) with ESMTP id 115EFAAEC
for <dev@dpdk.org>; Mon, 19 Mar 2018 13:24:37 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=amdcloud.onmicrosoft.com; s=selector1-amd-com;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version;
bh=Cd2NrHASw7nRRAun9WLWKHsPFsWmDYJSw6fK9UzHxZs=;
b=GZiEJGpfyb6h3OcvofzUEH2WfHeL0kyBVv18Mr/ryVH+Tn+Ds1oUTkhP4KaReR0dTDuCcVm/pXdjIPey/F8guYbMvHsQVwjJ7y8FgVZZRG7Ja1c9loE2M5nr8o4ufHIP5qGVhl4eXo7RKSzKim1QMFGIsAU7d2W8SlFHnBF3QjY=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Ravi1.Kumar@amd.com;
Received: from wallaby-smavila.amd.com (202.56.249.162) by
BN6PR12MB1505.namprd12.prod.outlook.com (10.172.24.146) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.588.14; Mon, 19 Mar 2018 12:24:34 +0000
From: Ravi Kumar <Ravi1.kumar@amd.com>
To: dev@dpdk.org
Cc: pablo.de.lara.guarch@intel.com,
hemant.agrawal@nxp.com
Date: Mon, 19 Mar 2018 08:23:44 -0400
Message-Id: <1521462233-13590-10-git-send-email-Ravi1.kumar@amd.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1521462233-13590-1-git-send-email-Ravi1.kumar@amd.com>
References: <1520584520-130522-1-git-send-email-Ravi1.kumar@amd.com>
<1521462233-13590-1-git-send-email-Ravi1.kumar@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [202.56.249.162]
X-ClientProxiedBy: MAXPR0101CA0025.INDPRD01.PROD.OUTLOOK.COM (10.174.62.139)
To BN6PR12MB1505.namprd12.prod.outlook.com (10.172.24.146)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 8f989be9-0a55-4ab6-a692-08d58d946054
X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0;
RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020);
SRVR:BN6PR12MB1505;
X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505;
3:AJB/oG9cwB6MTpYNH3yqpDHsvNP6pcvvDl/GRWpPb9zQuD5BFA0J/xrTV1iDsAxf8/V7A1Uh/nP4dFIcuRrjIIcyDJu5GE/ZBt5uyMi0+6HS3CIn+28mqtdaUbw8tPkPIOpD4KHcDMJtAJ7/HgyxPOvZfpizpY+8Nc01BODLzOMZRHe8foCcBWPg9xq4wn/UhH3mwjWnsxSmZoPbAIPj8LLATHJ3tGWgVjo7wMVtwxIq7Cvqu5e6aC+Vsmuyk2VH;
25:sAb50f+gL/KGX0ROep/E5gbRpAHLwvi/RCF5GvqJYXQWfFO1N1FXXNPmvndhIhnhJrSixkb3KJUgLRT3ptW1ziGQ5ERy8g159Ly0LnQU91IybC7Wkf0tyf9bGxk06xZLhaWaTr6mh6R4Z+LPFtB/R0hGZPFbRiqTeq9V3ti4Yx/1uZeFriSQ9+s/YVz2Nd0mPIMQTP3HovUlGziN6nBTjo6a/SxOvE977ok0J1rPMr/UqJnGTE9rtjhZUbOd+j9V0yD2bVnKIapUIli9l5CBTOu9nJ8EvWxypd3tRS6G46hIj3pH8+B9rfTD0hiynw3p8+LlkvoP7OqucTdEhysxgw==;
31:1r0HVNdoP2NAGCWzQgUi0lVqTZBcxpPnvc3uHC3a/Amy3bzYVuQE7uDo3QHZWVwJQznVavRiKN/q5HxAqLbdk3P64MijaI9a2NBqd27VPnUIiub7bKmOMnHixi0WLkZYtfwbbbV1L8jxz3XHU8A/K3CichGHoPfBY8bCC+zoocHlPE5Ygms7Sdc+kMnznO7BcmU8E1PxUhMKnAAJfEFZWKxZob2ZeIXEVDwlXBJZxqI=
X-MS-TrafficTypeDiagnostic: BN6PR12MB1505:
X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505;
20:KANtz9s+VVXOcqz+JEstVFYeDO4nf+d86TRJN+g8MUM7xgfR1fSPcA3salAWFywDf4HQECKkQ7VNNDPPn+BT7pHXTJiqN8lU69O0cF9o7nCIxARLmAFmEyNQC2mVTS6lYoyzSYdGUyS7/Q7KzruzJT/tPu/8qUSEQM/hEdzcUmNQlZG0MD2vwpXtB6O7M4NOe/x7yHC9xAXQ2Fjc6zEZ5cyjfJ5gpMmHC+/LpBNf/pPQbSWB5rH9Cn/XVUEPhIJKc0Qq/fSORZbmP+zgISmr7c8jY09n8Da+p2e/COHxC4oupxd6mfwt4cncgz8VgQgavyMUMI9otC+BIFMEBgDgrncG3cH7EdfoSf5ED3jPw/7MjYRz3Xoqth2D0lEW7JGIlvaPYHJClzboEwi+khsAp9K6TElowwgmZM5qaQkIjAUlOrFPO3EZM16c2PdvCCMi0LXwIYNVwf7IbvppG01EDdC5MCJsg5XWQ4XK/f5GW9BBV4fSEUYEHMK+LxxXBG1i;
4:RMNYAZqLDqTE+QP/+WX1zGVzppR8bIaRdl83z0o3gmLiVLwKGB2MeEU6JSWtYCAsgyOme7BjdcgqX0LpBD/71qKQqtfidCWTFC1v14mWAoLSQ09AoTOdXl/93zOIZ+PWP+BrOd/hvB3v5GsR+z+HeUgtpIu99KNLvEs2C+17JUAntxNwxOhH/74Yy85U+/rzisYwrDS8vkhO6Sd5ISKts7JjJLhtvfM6BK6nZFs6eFMi1f/4Gp5miIjNvOCP4nFMkHK1KJCFlhR3H0n2lBc99RIG6f39rhkYw2VUElfwTrKBpAcI0b6jjyt6HO9tdYVI
X-Microsoft-Antispam-PRVS: <BN6PR12MB15052A30456B08EC82EA4B5CAED40@BN6PR12MB1505.namprd12.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:(767451399110);
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(6072148)(201708071742011);
SRVR:BN6PR12MB1505; BCL:0; PCL:0; RULEID:; SRVR:BN6PR12MB1505;
X-Forefront-PRVS: 06167FAD59
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(396003)(39380400002)(39860400002)(346002)(376002)(366004)(199004)(189003)(97736004)(105586002)(2361001)(2351001)(72206003)(48376002)(4326008)(50226002)(76176011)(59450400001)(8676002)(26005)(316002)(8936002)(53936002)(106356001)(16586007)(186003)(7696005)(51416003)(16526019)(52116002)(386003)(81166006)(81156014)(8656006)(25786009)(66066001)(68736007)(86362001)(47776003)(6486002)(5660300001)(6666003)(7736002)(53416004)(6116002)(305945005)(3846002)(478600001)(2950100002)(36756003)(6916009)(2906002)(50466002);
DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR12MB1505; H:wallaby-smavila.amd.com; FPR:;
SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en;
Received-SPF: None (protection.outlook.com: amd.com does not designate
permitted sender hosts)
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR12MB1505;
23:NUKEQrwiEHDE1uItqX1SGNelh+aCU0vFgqIOvJFsi?=
=?us-ascii?Q?WgeAVX3nb8h7ZY5m+pmRE2GeiQ/Pj07Ob1LTpw07Z9mk7jnbjN9qivJwfeah?=
=?us-ascii?Q?QDSCNRTbOLWXGYFmm5h+eRdIAbB7tln9MLtDJQyw4l/8ONJLJuetR4QGAQlG?=
=?us-ascii?Q?bcv0qNqBRvXYzcAANCDs1Mon5osR8gGfdNg3w1oNzykN/EY8zV+SfJYYrBL0?=
=?us-ascii?Q?JJK3WqAAkvRuB/3Gw0Jnoo2YJIcWvP2Vf8C2d1gEENtqG2ML2IoRvK6kcKQo?=
=?us-ascii?Q?ExpePo5RHM2ULmg0KlwHExPKbAx8pWIOyZlAf6fNMcetU2DVUEkMGy3ZJSgh?=
=?us-ascii?Q?KLSwG1O1n2TxCBDWlGdDYEixHGVMy3Z29AaGM//s2Dzys4uJdPKmvbxh+KBD?=
=?us-ascii?Q?CR6/uNflCvpoU8iHu3wj7HlPTf92LchexpybhuVfppznEyFR4Ggw0SkX1bQt?=
=?us-ascii?Q?azC8E3lUBZewH3leI5imSAJgxrYdxG1D05PJEU86f6xYZ3s3iwP+d2FuE4Sc?=
=?us-ascii?Q?sS9nPP6UaCNHYVxDkKCdGsV8gJjLJhRhCvhTrUx35YyPR1C4iBCME4krNkNO?=
=?us-ascii?Q?PsmZsgYImw+fDi8f4enrDHI1txqIvLE1i757ZCysidZ7aRRRlkJAUo0/9fFq?=
=?us-ascii?Q?SfBy84WygOTPl+SFH4Clqxya3/nZ+TrhrFZyyLnQvtontrczk0uMb/ytsscI?=
=?us-ascii?Q?kdVIPr7ZuRksCiHuT8u5aoWDq4AN4z3zM8+LrvsVn2UEOwYiPA/OTp0QWjp6?=
=?us-ascii?Q?JdwLVPVZty7pq7qdSbf3maPxg8EyvtwnEGmcWWPavrscu2BTf2tGlgJGBBo4?=
=?us-ascii?Q?/5xEkO4kZF0H+sbQpCmj+xQamFKRmRxMl33Pc+L0f3E9cYQtqPD7m4BR9vNP?=
=?us-ascii?Q?+KigsWbxbdUL+dW0np2DRVyV9Rca64k87KDdO+Vy2gFqP9+cDaf5NhA3/gMD?=
=?us-ascii?Q?EgbYOx1YTufCRU3V+yE9UB5y+vwWrjfj9UDCzAM2Bi+4KCLKE8UwXDKqxpwG?=
=?us-ascii?Q?QY9WxbYJXgu6OW+Qjm2aP8YrdoMNvH+wFRYJYTNUTnhp9ozZjTCBFdpkVMuo?=
=?us-ascii?Q?kn2tw9L7YIujMKZtwF1PqldGI7b5qrewSq93P49d+oK+OiH6QPv8CTgdk944?=
=?us-ascii?Q?2tQx2vaF2ppzvjsKcL1reU/+YjjhWh4XyuPJ7EPMhqwD3imBPWXX84rGXoGv?=
=?us-ascii?Q?GKog23ctxyxa21bglz+gzb31mLR3qCDBKOH?=
X-Microsoft-Antispam-Message-Info: LxfDOn7H73rgRR772iJKPR5MP7qIuUM+0j5IBq688FPQvocwpZGyfUWL0nqoiSsaNEaImOE7XFwfhySQxTNgHc+3SgA1YrI8rHjNu1t+GFdL/4cDrF7lsjqJzNNXAW2r4Bsssy/0qGM688pkOFfOrBMI9+FKCBOcxGoWttzvjqdh+rNVL91FoHqyVjCjDh95
X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505;
6:CQczpk1k2MfYvbPcM0CVComEmx+i2W+M9BsfTDa8UmWBDjzLSIx2qqdaDSpwcreVsJDg5AKsFpOSKf9L8PoRFgm1Tv8gTZKZCIaeEedUKejCulqrYHzz03UrTlNdsW8JANaYhR6pli2AWFyY3ecVZWe9u/kxCBA1pcehEVmgbocNRzUB9YXRqhFk0N6eo21/aUkAysCbm1cTAOzHydaAXGZy/BC23NXdzZWSI7O24xvs6ZAb/D2tuyGwojq22PGEYiGBT8VhNHsCC7r8icM2rkHeJlxK6a6B3RG/AICnN87b6DX/ZfTi35KD0wzys1qkyO2uLboDZLdREFFreq8KV+lqzSeJAR55yC3MTllx500=;
5:quHLhsqfgUoOO95AFH1yRe5o14Djx80IYsM8CrR4rlJfZoPWePIzl/YndKcYRb8yzWhXCuLHKkbwFXvTgKXhU1Q5rJbH9/wNG26OqCrGPqHbBcLeEPElufvAkCVUXtK+Bd+TIkH7irmKQSXDMwwVG4Hf0lElkT6qjVzhHw8LhgA=;
24:cw8T33b4wmHhZHFC+AEr/2jdIwfcMyK9xl0LWP/ESTpTllXiB4tzyvRlqlIwQeTmtJZdtmpYVwWmNx7vcy5U8zZ86lR8e2ZkGvXsh+4FD6k=;
7:4wrk16EnCDaqO2Iqb+BZ5apqYc46scLbnltspWPBAAqH+S2oxLNeWsMZ8hciyRZ8GQp2tfHBFsfBP3P05cKLCwGSKWXyLkQnzj1OTWI+5bF8cO3fkxavMupkZmFUTxb43zZB98aVYRW+Sy+ADoefNiF45SlM2Aow11KCYLDmmRWVfJfE2FHe0hoHcXswbYmuLy/6FhkAUb7TX0l//GhDHDoipvwkhy+ex9iHy9rgCHPHUCJLCJy/9lIYlgbPA5D1
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-Microsoft-Exchange-Diagnostics: 1; BN6PR12MB1505;
20:ZOttYlRR7U2/sajqZ/HB3RRCf+QRR6c78e5xh4I3bOeVMiiLEkkr9CqlFdrfWySM7PzUUuKJqCldT3yhlg6E2sjm2smIbrRunrECx1fJb6NWEN0YZ3676zZVlJVOlzzMZXGXqRv79Fv9Nxjowhs5lP/6adlf+cZnYgKfQrcZ5V27mAq4VoDndloJgj6Ge6LjMl5G9+KG0cb/20ommqv/uylGN9KYQ28K3ehck32VKoq+rgsEOEhppueXVzDFAVNV
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2018 12:24:34.0848 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 8f989be9-0a55-4ab6-a692-08d58d946054
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1505
Subject: [dpdk-dev] [PATCH v5 10/19] crypto/ccp: support aes cipher algo
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2018 12:24:37 -0000
Signed-off-by: Ravi Kumar <Ravi1.kumar@amd.com>
---
drivers/crypto/ccp/ccp_crypto.c | 197 ++++++++++++++++++++++++++++++++++++++-
drivers/crypto/ccp/ccp_crypto.h | 13 +++
drivers/crypto/ccp/ccp_dev.h | 53 +++++++++++
drivers/crypto/ccp/ccp_pmd_ops.c | 60 ++++++++++++
4 files changed, 321 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/ccp/ccp_crypto.c b/drivers/crypto/ccp/ccp_crypto.c
index 7ced435..3c46ac3 100644
--- a/drivers/crypto/ccp/ccp_crypto.c
+++ b/drivers/crypto/ccp/ccp_crypto.c
@@ -54,6 +54,7 @@ ccp_configure_session_cipher(struct ccp_session *sess,
const struct rte_crypto_sym_xform *xform)
{
const struct rte_crypto_cipher_xform *cipher_xform = NULL;
+ size_t i;
cipher_xform = &xform->cipher;
@@ -73,6 +74,21 @@ ccp_configure_session_cipher(struct ccp_session *sess,
sess->iv.length = cipher_xform->iv.length;
switch (cipher_xform->algo) {
+ case RTE_CRYPTO_CIPHER_AES_CTR:
+ sess->cipher.algo = CCP_CIPHER_ALGO_AES_CTR;
+ sess->cipher.um.aes_mode = CCP_AES_MODE_CTR;
+ sess->cipher.engine = CCP_ENGINE_AES;
+ break;
+ case RTE_CRYPTO_CIPHER_AES_ECB:
+ sess->cipher.algo = CCP_CIPHER_ALGO_AES_CBC;
+ sess->cipher.um.aes_mode = CCP_AES_MODE_ECB;
+ sess->cipher.engine = CCP_ENGINE_AES;
+ break;
+ case RTE_CRYPTO_CIPHER_AES_CBC:
+ sess->cipher.algo = CCP_CIPHER_ALGO_AES_CBC;
+ sess->cipher.um.aes_mode = CCP_AES_MODE_CBC;
+ sess->cipher.engine = CCP_ENGINE_AES;
+ break;
default:
CCP_LOG_ERR("Unsupported cipher algo");
return -1;
@@ -80,10 +96,27 @@ ccp_configure_session_cipher(struct ccp_session *sess,
switch (sess->cipher.engine) {
+ case CCP_ENGINE_AES:
+ if (sess->cipher.key_length == 16)
+ sess->cipher.ut.aes_type = CCP_AES_TYPE_128;
+ else if (sess->cipher.key_length == 24)
+ sess->cipher.ut.aes_type = CCP_AES_TYPE_192;
+ else if (sess->cipher.key_length == 32)
+ sess->cipher.ut.aes_type = CCP_AES_TYPE_256;
+ else {
+ CCP_LOG_ERR("Invalid cipher key length");
+ return -1;
+ }
+ for (i = 0; i < sess->cipher.key_length ; i++)
+ sess->cipher.key_ccp[sess->cipher.key_length - i - 1] =
+ sess->cipher.key[i];
+ break;
default:
CCP_LOG_ERR("Invalid CCP Engine");
return -ENOTSUP;
}
+ sess->cipher.nonce_phys = rte_mem_virt2phy(sess->cipher.nonce);
+ sess->cipher.key_phys = rte_mem_virt2phy(sess->cipher.key_ccp);
return 0;
}
@@ -209,6 +242,18 @@ ccp_cipher_slot(struct ccp_session *session)
int count = 0;
switch (session->cipher.algo) {
+ case CCP_CIPHER_ALGO_AES_CBC:
+ count = 2;
+ /**< op + passthrough for iv */
+ break;
+ case CCP_CIPHER_ALGO_AES_ECB:
+ count = 1;
+ /**<only op*/
+ break;
+ case CCP_CIPHER_ALGO_AES_CTR:
+ count = 2;
+ /**< op + passthrough for iv */
+ break;
default:
CCP_LOG_ERR("Unsupported cipher algo %d",
session->cipher.algo);
@@ -271,10 +316,146 @@ ccp_compute_slot_count(struct ccp_session *session)
return count;
}
+static void
+ccp_perform_passthru(struct ccp_passthru *pst,
+ struct ccp_queue *cmd_q)
+{
+ struct ccp_desc *desc;
+ union ccp_function function;
+
+ desc = &cmd_q->qbase_desc[cmd_q->qidx];
+
+ CCP_CMD_ENGINE(desc) = CCP_ENGINE_PASSTHRU;
+
+ CCP_CMD_SOC(desc) = 0;
+ CCP_CMD_IOC(desc) = 0;
+ CCP_CMD_INIT(desc) = 0;
+ CCP_CMD_EOM(desc) = 0;
+ CCP_CMD_PROT(desc) = 0;
+
+ function.raw = 0;
+ CCP_PT_BYTESWAP(&function) = pst->byte_swap;
+ CCP_PT_BITWISE(&function) = pst->bit_mod;
+ CCP_CMD_FUNCTION(desc) = function.raw;
+
+ CCP_CMD_LEN(desc) = pst->len;
+
+ if (pst->dir) {
+ CCP_CMD_SRC_LO(desc) = (uint32_t)(pst->src_addr);
+ CCP_CMD_SRC_HI(desc) = high32_value(pst->src_addr);
+ CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SYSTEM;
+
+ CCP_CMD_DST_LO(desc) = (uint32_t)(pst->dest_addr);
+ CCP_CMD_DST_HI(desc) = 0;
+ CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SB;
+
+ if (pst->bit_mod != CCP_PASSTHRU_BITWISE_NOOP)
+ CCP_CMD_LSB_ID(desc) = cmd_q->sb_key;
+ } else {
+
+ CCP_CMD_SRC_LO(desc) = (uint32_t)(pst->src_addr);
+ CCP_CMD_SRC_HI(desc) = 0;
+ CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SB;
+
+ CCP_CMD_DST_LO(desc) = (uint32_t)(pst->dest_addr);
+ CCP_CMD_DST_HI(desc) = high32_value(pst->dest_addr);
+ CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SYSTEM;
+ }
+
+ cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE;
+}
+
+static int
+ccp_perform_aes(struct rte_crypto_op *op,
+ struct ccp_queue *cmd_q,
+ struct ccp_batch_info *b_info)
+{
+ struct ccp_session *session;
+ union ccp_function function;
+ uint8_t *lsb_buf;
+ struct ccp_passthru pst = {0};
+ struct ccp_desc *desc;
+ phys_addr_t src_addr, dest_addr, key_addr;
+ uint8_t *iv;
+
+ session = (struct ccp_session *)get_session_private_data(
+ op->sym->session,
+ ccp_cryptodev_driver_id);
+ function.raw = 0;
+
+ iv = rte_crypto_op_ctod_offset(op, uint8_t *, session->iv.offset);
+ if (session->cipher.um.aes_mode != CCP_AES_MODE_ECB) {
+ if (session->cipher.um.aes_mode == CCP_AES_MODE_CTR) {
+ rte_memcpy(session->cipher.nonce + AES_BLOCK_SIZE,
+ iv, session->iv.length);
+ pst.src_addr = (phys_addr_t)session->cipher.nonce_phys;
+ CCP_AES_SIZE(&function) = 0x1F;
+ } else {
+ lsb_buf =
+ &(b_info->lsb_buf[b_info->lsb_buf_idx*CCP_SB_BYTES]);
+ rte_memcpy(lsb_buf +
+ (CCP_SB_BYTES - session->iv.length),
+ iv, session->iv.length);
+ pst.src_addr = b_info->lsb_buf_phys +
+ (b_info->lsb_buf_idx * CCP_SB_BYTES);
+ b_info->lsb_buf_idx++;
+ }
+
+ pst.dest_addr = (phys_addr_t)(cmd_q->sb_iv * CCP_SB_BYTES);
+ pst.len = CCP_SB_BYTES;
+ pst.dir = 1;
+ pst.bit_mod = CCP_PASSTHRU_BITWISE_NOOP;
+ pst.byte_swap = CCP_PASSTHRU_BYTESWAP_256BIT;
+ ccp_perform_passthru(&pst, cmd_q);
+ }
+
+ desc = &cmd_q->qbase_desc[cmd_q->qidx];
+
+ src_addr = rte_pktmbuf_mtophys_offset(op->sym->m_src,
+ op->sym->cipher.data.offset);
+ if (likely(op->sym->m_dst != NULL))
+ dest_addr = rte_pktmbuf_mtophys_offset(op->sym->m_dst,
+ op->sym->cipher.data.offset);
+ else
+ dest_addr = src_addr;
+ key_addr = session->cipher.key_phys;
+
+ /* prepare desc for aes command */
+ CCP_CMD_ENGINE(desc) = CCP_ENGINE_AES;
+ CCP_CMD_INIT(desc) = 1;
+ CCP_CMD_EOM(desc) = 1;
+
+ CCP_AES_ENCRYPT(&function) = session->cipher.dir;
+ CCP_AES_MODE(&function) = session->cipher.um.aes_mode;
+ CCP_AES_TYPE(&function) = session->cipher.ut.aes_type;
+ CCP_CMD_FUNCTION(desc) = function.raw;
+
+ CCP_CMD_LEN(desc) = op->sym->cipher.data.length;
+
+ CCP_CMD_SRC_LO(desc) = ((uint32_t)src_addr);
+ CCP_CMD_SRC_HI(desc) = high32_value(src_addr);
+ CCP_CMD_SRC_MEM(desc) = CCP_MEMTYPE_SYSTEM;
+
+ CCP_CMD_DST_LO(desc) = ((uint32_t)dest_addr);
+ CCP_CMD_DST_HI(desc) = high32_value(dest_addr);
+ CCP_CMD_DST_MEM(desc) = CCP_MEMTYPE_SYSTEM;
+
+ CCP_CMD_KEY_LO(desc) = ((uint32_t)key_addr);
+ CCP_CMD_KEY_HI(desc) = high32_value(key_addr);
+ CCP_CMD_KEY_MEM(desc) = CCP_MEMTYPE_SYSTEM;
+
+ if (session->cipher.um.aes_mode != CCP_AES_MODE_ECB)
+ CCP_CMD_LSB_ID(desc) = cmd_q->sb_iv;
+
+ cmd_q->qidx = (cmd_q->qidx + 1) % COMMANDS_PER_QUEUE;
+ op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+ return 0;
+}
+
static inline int
ccp_crypto_cipher(struct rte_crypto_op *op,
- struct ccp_queue *cmd_q __rte_unused,
- struct ccp_batch_info *b_info __rte_unused)
+ struct ccp_queue *cmd_q,
+ struct ccp_batch_info *b_info)
{
int result = 0;
struct ccp_session *session;
@@ -284,6 +465,18 @@ ccp_crypto_cipher(struct rte_crypto_op *op,
ccp_cryptodev_driver_id);
switch (session->cipher.algo) {
+ case CCP_CIPHER_ALGO_AES_CBC:
+ result = ccp_perform_aes(op, cmd_q, b_info);
+ b_info->desccnt += 2;
+ break;
+ case CCP_CIPHER_ALGO_AES_CTR:
+ result = ccp_perform_aes(op, cmd_q, b_info);
+ b_info->desccnt += 2;
+ break;
+ case CCP_CIPHER_ALGO_AES_ECB:
+ result = ccp_perform_aes(op, cmd_q, b_info);
+ b_info->desccnt += 1;
+ break;
default:
CCP_LOG_ERR("Unsupported cipher algo %d",
session->cipher.algo);
diff --git a/drivers/crypto/ccp/ccp_crypto.h b/drivers/crypto/ccp/ccp_crypto.h
index c2fce1d..13cdb6e 100644
--- a/drivers/crypto/ccp/ccp_crypto.h
+++ b/drivers/crypto/ccp/ccp_crypto.h
@@ -20,7 +20,20 @@
#include "ccp_dev.h"
+#define AES_BLOCK_SIZE 16
+#define CMAC_PAD_VALUE 0x80
+#define CTR_NONCE_SIZE 4
+#define CTR_IV_SIZE 8
#define CCP_SHA3_CTX_SIZE 200
+
+/**Macro helpers for CCP command creation*/
+#define CCP_AES_SIZE(p) ((p)->aes.size)
+#define CCP_AES_ENCRYPT(p) ((p)->aes.encrypt)
+#define CCP_AES_MODE(p) ((p)->aes.mode)
+#define CCP_AES_TYPE(p) ((p)->aes.type)
+#define CCP_PT_BYTESWAP(p) ((p)->pt.byteswap)
+#define CCP_PT_BITWISE(p) ((p)->pt.bitwise)
+
/**
* CCP supported AES modes
*/
diff --git a/drivers/crypto/ccp/ccp_dev.h b/drivers/crypto/ccp/ccp_dev.h
index de375ee..de3e4bc 100644
--- a/drivers/crypto/ccp/ccp_dev.h
+++ b/drivers/crypto/ccp/ccp_dev.h
@@ -22,6 +22,7 @@
/**< CCP sspecific */
#define MAX_HW_QUEUES 5
#define CCP_MAX_TRNG_RETRIES 10
+#define CCP_ALIGN(x, y) ((((x) + (y - 1)) / y) * y)
/**< CCP Register Mappings */
#define Q_MASK_REG 0x000
@@ -78,10 +79,52 @@
#define LSB_SIZE 16
#define LSB_ITEM_SIZE 32
#define SLSB_MAP_SIZE (MAX_LSB_CNT * LSB_SIZE)
+#define LSB_ENTRY_NUMBER(LSB_ADDR) (LSB_ADDR / LSB_ITEM_SIZE)
/* General CCP Defines */
#define CCP_SB_BYTES 32
+/* Word 0 */
+#define CCP_CMD_DW0(p) ((p)->dw0)
+#define CCP_CMD_SOC(p) (CCP_CMD_DW0(p).soc)
+#define CCP_CMD_IOC(p) (CCP_CMD_DW0(p).ioc)
+#define CCP_CMD_INIT(p) (CCP_CMD_DW0(p).init)
+#define CCP_CMD_EOM(p) (CCP_CMD_DW0(p).eom)
+#define CCP_CMD_FUNCTION(p) (CCP_CMD_DW0(p).function)
+#define CCP_CMD_ENGINE(p) (CCP_CMD_DW0(p).engine)
+#define CCP_CMD_PROT(p) (CCP_CMD_DW0(p).prot)
+
+/* Word 1 */
+#define CCP_CMD_DW1(p) ((p)->length)
+#define CCP_CMD_LEN(p) (CCP_CMD_DW1(p))
+
+/* Word 2 */
+#define CCP_CMD_DW2(p) ((p)->src_lo)
+#define CCP_CMD_SRC_LO(p) (CCP_CMD_DW2(p))
+
+/* Word 3 */
+#define CCP_CMD_DW3(p) ((p)->dw3)
+#define CCP_CMD_SRC_MEM(p) ((p)->dw3.src_mem)
+#define CCP_CMD_SRC_HI(p) ((p)->dw3.src_hi)
+#define CCP_CMD_LSB_ID(p) ((p)->dw3.lsb_cxt_id)
+#define CCP_CMD_FIX_SRC(p) ((p)->dw3.fixed)
+
+/* Words 4/5 */
+#define CCP_CMD_DW4(p) ((p)->dw4)
+#define CCP_CMD_DST_LO(p) (CCP_CMD_DW4(p).dst_lo)
+#define CCP_CMD_DW5(p) ((p)->dw5.fields.dst_hi)
+#define CCP_CMD_DST_HI(p) (CCP_CMD_DW5(p))
+#define CCP_CMD_DST_MEM(p) ((p)->dw5.fields.dst_mem)
+#define CCP_CMD_FIX_DST(p) ((p)->dw5.fields.fixed)
+#define CCP_CMD_SHA_LO(p) ((p)->dw4.sha_len_lo)
+#define CCP_CMD_SHA_HI(p) ((p)->dw5.sha_len_hi)
+
+/* Word 6/7 */
+#define CCP_CMD_DW6(p) ((p)->key_lo)
+#define CCP_CMD_KEY_LO(p) (CCP_CMD_DW6(p))
+#define CCP_CMD_DW7(p) ((p)->dw7)
+#define CCP_CMD_KEY_HI(p) ((p)->dw7.key_hi)
+#define CCP_CMD_KEY_MEM(p) ((p)->dw7.key_mem)
/* bitmap */
enum {
@@ -386,6 +429,16 @@ struct ccp_desc {
};
/**
+ * ccp memory type
+ */
+enum ccp_memtype {
+ CCP_MEMTYPE_SYSTEM = 0,
+ CCP_MEMTYPE_SB,
+ CCP_MEMTYPE_LOCAL,
+ CCP_MEMTYPE_LAST,
+};
+
+/**
* cmd id to follow order
*/
enum ccp_cmd_order {
diff --git a/drivers/crypto/ccp/ccp_pmd_ops.c b/drivers/crypto/ccp/ccp_pmd_ops.c
index d3708f4..a6e777a 100644
--- a/drivers/crypto/ccp/ccp_pmd_ops.c
+++ b/drivers/crypto/ccp/ccp_pmd_ops.c
@@ -13,6 +13,66 @@
#include "ccp_crypto.h"
static const struct rte_cryptodev_capabilities ccp_pmd_capabilities[] = {
+ { /* AES ECB */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_ECB,
+ .block_size = 16,
+ .key_size = {
+ .min = 16,
+ .max = 32,
+ .increment = 8
+ },
+ .iv_size = {
+ .min = 0,
+ .max = 0,
+ .increment = 0
+ }
+ }, }
+ }, }
+ },
+ { /* AES CBC */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_CBC,
+ .block_size = 16,
+ .key_size = {
+ .min = 16,
+ .max = 32,
+ .increment = 8
+ },
+ .iv_size = {
+ .min = 16,
+ .max = 16,
+ .increment = 0
+ }
+ }, }
+ }, }
+ },
+ { /* AES CTR */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_CTR,
+ .block_size = 16,
+ .key_size = {
+ .min = 16,
+ .max = 32,
+ .increment = 8
+ },
+ .iv_size = {
+ .min = 16,
+ .max = 16,
+ .increment = 0
+ }
+ }, }
+ }, }
+ },
RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
};
--
2.7.4