Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44644/?format=api
{ "id": 44644, "url": "http://patches.dpdk.org/api/patches/44644/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180913060846.29930-9-g.singh@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180913060846.29930-9-g.singh@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180913060846.29930-9-g.singh@nxp.com", "date": "2018-09-13T06:08:44", "name": "[08/10] crypto/caam_jr: add auth cipher and aead session support", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7c5954b0b837c65c76e87c513a10b975d71fb365", "submitter": { "id": 1068, "url": "http://patches.dpdk.org/api/people/1068/?format=api", "name": "Gagandeep Singh", "email": "g.singh@nxp.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180913060846.29930-9-g.singh@nxp.com/mbox/", "series": [ { "id": 1300, "url": "http://patches.dpdk.org/api/series/1300/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1300", "date": "2018-09-13T06:08:36", "name": "Introducing the NXP CAAM job ring driver", "version": 1, "mbox": "http://patches.dpdk.org/series/1300/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/44644/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/44644/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9E2B35F1A;\n\tThu, 13 Sep 2018 08:09:47 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n\t(mail-eopbgr20076.outbound.protection.outlook.com [40.107.2.76])\n\tby dpdk.org (Postfix) with ESMTP id 2474B58CB\n\tfor <dev@dpdk.org>; Thu, 13 Sep 2018 08:09:38 +0200 (CEST)", "from Tophie.ap.freescale.net (14.142.187.166) by\n\tHE1PR04MB1529.eurprd04.prod.outlook.com (2a01:111:e400:59a8::19) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15;\n\tThu, 13 Sep 2018 06:09:34 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=2dUBZ8AVMbIbhd+ZqNVstCyjeutCh0vkpYY/XA1e7OA=;\n\tb=QPI0M924FPdaH7VAIZ1EoR0bzopihukD1a9rsdMad77Etdca0xNFukRqiVe2CW/kml9/VtIBIENYdZU/1L0fgRL+8r55HzdAoMhlBoHJ7mR/gCnWN3LhvdNQc5XS/IQfuYvffG8QmZqsX/Iz0gaGutJFzN4Cbh+iXBAyPufbJeE=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=G.Singh@nxp.com; ", "From": "Gagandeep Singh <g.singh@nxp.com>", "To": "dev@dpdk.org,\n\takhil.goyal@nxp.com", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>,\n\tGagandeep Singh <g.singh@nxp.com>", "Date": "Thu, 13 Sep 2018 11:38:44 +0530", "Message-Id": "<20180913060846.29930-9-g.singh@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20180913060846.29930-1-g.singh@nxp.com>", "References": "<20180913060846.29930-1-g.singh@nxp.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[14.142.187.166]", "X-ClientProxiedBy": "BM1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM\n\t(2603:1096:b00::11)\n\tTo HE1PR04MB1529.eurprd04.prod.outlook.com\n\t(2a01:111:e400:59a8::19)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "3888705f-f368-43be-20ec-08d6193f7b1b", "X-MS-Office365-Filtering-HT": "Tenant", "X-Microsoft-Antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989137)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:HE1PR04MB1529; ", "X-Microsoft-Exchange-Diagnostics": [ "1; HE1PR04MB1529;\n\t3:puaDeqrzj/Au1S/o2li1oNSg4dl4Sf2QflkVHN5m4OqF4Vt+nZlE792fi7ZV7sjTY6Z9iRAYLv94gh9o72oSwhVaU0K2ePGDDYJAQl4V3TIpnhVd07kv6kcwHoGt2xc4+LV2XvnFdQM/2nnrFCaDg6t/ajWEk0NAjakKF0DZz7zx96DGY9zKQ8vjgQtyLqyJCKqNRoyALM+2MnqjuBZdnsiaiwwJuNbB6Rq5CRqBlZL3GJMWXYdbm/u0E82z+bUc;\n\t25:UpPI2qU5bibnduekbY/tIuXATczDSyqBfTDuBEZQYmeC6lYS7FlHYN9ip9ougf9fe6gtTaG9dygclyDI35FgOuF+kUuR4y/qe2Ay2pnw9oeobXvg6IxxipvmHbYcWGisyCk/vEJudeK/9OwzccqztvyVjTo+XDdCIBWoIbkVwiJRlrEvsP0uGf4A4yf1q0e7hvQyp0v/vSM2fatG792iRyiR0np/I/mWcXEX5hYE8Ah2CmHsNpl6+gkXoHDJ+7am5tLOre49hUJlx1o5oVWSkJEiO2x0gydBlWrQIlQo7yetiox3mwoIG49BYI9Ua36ziOcdS/MLslexnCvf8hCYig==;\n\t31:I2orOn0f+AzQiK19udMJ3h00caG1ZFgYU9iNFV5LfNUUHWmjT33ZzwHFwRasHDPzAt+NSmkyS24KpRiNG9vkx3SFO2+Ao/TPrRVswnVWhXiMZUx2OhNl9UboSLHhBIeDTar/hmK5Z/b2vN0WXFfdNiI0aLXVO7w0tJQWw3qm8rOKS5KdpBOytHPLe9xy01pGXvsgGsnA0Md+EW4fIyBypeK92sEX0FdtxguKSFoIDPw=", "1; HE1PR04MB1529;\n\t20:oU79fACEjjyEyLKwG7dnl0hQlNp2Yq81SzTXBpgmdAYsxYX9gWJdY5qcUKnxulprpQASq03rNG8SzeJKMeLBsiTgKabVFE2v7VzL4Qp7TVkP5T83QE0wqwyCWbBeGQ68qprpqtZ5eij1x0nGOVwG36sdhv7JJo9xf/ojgUoeIlI9ZMEQYFeXKCMnLtUABxZORAtZl7Iy7w+pgYJaoXzUiQR+cFY9WdMzwZaU4sOiCoGvKse2cQkeoNsTIAv8hnEVW0mMq+DXf/wnY/TLuFaG8kGBQ9U4i4hTIazTvxLUzOFz63q4vsSrtzGm7p/NmBMEo+9GGyVqXf2NizHcCtz4r97c/tj6zqK66QC8KJl7oqAyz7kfONHQjVWo85Zv3WeNh0hJ4nR2T530GqFWdSZCMTwMySwaQJ/wBzKo7V1Fr19FZ3sbRQr1c7chRGMYAavK/APop+AW6Pzt5BoxxuN/ZPSqSb11opJWuDK5KT5HxUE6+anzfwY5S163hgJUPVA8;\n\t4:/rfAlu9+5JyG2zBzLCna+GdgKAHSDrA5zykN01mZdXsbx8bEAuylZSg9kK0flrHzfeEXVhTQluoUXkq+Y80rVYQ2rW+uj6tDMASl9FHaYSdLjvbyjnNKJi/LdEWSXjXE8CwMLpEF9/W8i/xOfp1bXuI19LecVV71FPBrlaXqGbjwVYRY+FQr8QNhR1hgDF4GHrF7fUaUI0Q48soHIdZmr5V4ZNAzAuMwpXpC5BpxrW+YV9UodyAAIUiyjaN8qzoLQjJ+ecadY27605yjmTi88hs4RLCXOOyQBN1Wucd3bJPNBy8WNWIXd84NooecGll0", "=?us-ascii?Q?1; HE1PR04MB1529;\n\t23:fVhscXPDbv5O+Mv3yUl0OHWJs4LaxWNUHlrNVYB2Y?=\n\tTgPXo8Cw1kWqxzpGf76lnKWgkpMEGcFdMhtJSOx82PemahktFEG9A34JprDnhQByip9cUMIfshev2rMOkn5qNWopHAxjT6q/bjAAgSZAjPTVRYPaB12kMWjwa8Qj1jwOXt3M46nADRdeZBV1D64iogTf5bl/jWYWIV+ZDZqr5UcVh1y7G43JB0Hk5+RmlJLAhtkbB3lAJlPxfwQx7yAcrbt1EW066DP6imZr6e9p+DY1Vn7UY0RPZtc+S0/o5uXqrDNWh2MaqaZjbEvJqe342JTIbvh3QCThI2UcnCGVOLaxb0C/JRCCHW9qGYMW1XWTCR+7sjvbgyRbaokv19hFDxpO5mHsOHSoJsqlz3fNOl2EuOcIpzQfPd/czpNiBXPPzjbgEgcPh3n8jgabr745eCerlbzAaXUufpTp1b3iK4YNk8Z3SZCcd/NS2XPFT0DzYFuoBnwoTyqocdXBKDmrgc0Jsjunl5oK54MM6dKQeTnJfdBcsbEp5+to/oUpGOwo08Gwi0dnmYNu+s5mYP/PsCSl94TLz1GEF6dE4tArqIWQtuUoJRpCLFWqaJZrUwy+biFADz0lW/Qypa9qCx6n6HkQp1yEqBeUz88FIH6DO+6NyRG+Cw66UG957/k8CxSgu0Zoz8rhCkZaXScch0kFYDJzzZ0LG5xw5GaMN+nv+BsfY852+sDplxHhTq/ZrOMSUzYHlPVxDsHTCYrV22EbWlJt9DlVxjcLSmziyibm6YCyS9d8kvO3K4YFY4yL7ShOKemuda+Cdbfe0doF2CsJ5FUgO8b1b285GBDvHcRZkFMTqpOvKm1f2dG0CDGNDXgwj30YlBsTDGYCAbQMXDU3YKgROHlnkr17MfbGnrRpvcJ2LseLsq3CfAGO1UjxJfLWXpxyUgEhfkt39MiKwTsxbID/bLVY7dAczkCCZMVYrmeuIwI8vd6Pj7gsMKrjWD267DJgOX4aly61sAF4lAte4m1p1CXfqNRFQqKC8Cqr1fVGovTYHXlaZp+j7f7J6v5iG9XOr96k7Nyf49B+jfBOGxbd6AfjLmFaMkMIR3Dmt9Ai0Sjr6fUEulgV4h7kCwblf7srT9mt3Efvc8jJTmcmUW4lu6piW3lodVrGF6Kgfr+DyNURhawDVrra1a6BFBUkKdfUPByIKA/gx1/puKUPDumtuXNMxVWsUY+bP6oBe1QQhUXtip2s1AQqYduw/fagmDf9/eB3tYmIDB9DXPsY76FPDLX7NMDJYd+8slOLnIP6Poiu+0s2GKYeUYusEAQ6iNDtHWe9m8thM0rChaOYcMq", "1; HE1PR04MB1529;\n\t6:DSlpbr7t2DGCZJxq6nvvunBNa9BxnpZFctiu2IMu3oFSCniNNcr01m2CqFuGw3Vl30iIZW0vASwPKlsWxv1ha2I06xQgDYWgPxKcljfF0p5p/e9TKffSpGVd4HnxiHYvyFyKgj52QGS2741G0aIrc9sp+Ft/U3+W5vJ74Syp5bNvaH2+4lJ4UzrxqabSt1sFy+ZHYsA1KjcvQzbcTyKC2kjQIhY56Wpgc0N/46tfKZYsgU17brI+wzl5jixGnoEAihnZZvMYrAciWbV3OVncGI0opXyTuzbfRmK/Y+Ge3ds4LnTm2fgBY9TfEIeQTuI9kOhlwCmdP8nuggOnHHTyXMj3VfBWnjj7n4H+24B90KAlT/wYt5P7wWY/k4VtHsx7Q/qpPz9mXpk+GVZga6wSiZ4cT1u6tkmt2/FodT88U6714hlwfCTCkfnHuurTeJBNMI3B/g+g5fWM/Wllqf69fg==;\n\t5:CETsjxPH0ddxpR8mN5SpKPxLn6QU6iuiQq5S6fDsfCUw733ppqFXpRHqtsxm04rAG8mMDCgsz6W+GxdL/BgIZtay8Ft7Im5sJscEGKAhb8qNJhZBX0GY+8e/XN/UfTwIspbg+cPSDreLUoszH4NX5bEWlq1eVoIINr0Ll3wpOrU=;\n\t7:fujeWX6xOvw8cnaUJ3+unoXgwBqC0naKS0Tv8YFhwme9kJhms2hqX+sTa1fqXegh27L3Y2TA0PKYaOTl8pgjsdNvRzngJpZLCGs2CPFSf89ZH6CpvDFcXMBTS0bFkUulifoaUvPeHFuc1oQFf4y88lDCWVxns+JEBtSMRU3WvXfkml79moRGXOnStERT/ntxQh6CxbwM8/TAPqVH0OLJAuiFf4SGRIcyRqE9w4I5ca7twTLVbe1BQgATiW881r6L" ], "X-MS-TrafficTypeDiagnostic": "HE1PR04MB1529:", "X-Microsoft-Antispam-PRVS": "<HE1PR04MB152902CED01E0F022C4808E9E11A0@HE1PR04MB1529.eurprd04.prod.outlook.com>", "X-Exchange-Antispam-Report-Test": "UriScan:(185117386973197);", "X-MS-Exchange-SenderADCheck": "1", "X-Exchange-Antispam-Report-CFA-Test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(823301075)(3231311)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050);\n\tSRVR:HE1PR04MB1529; BCL:0; PCL:0; RULEID:; SRVR:HE1PR04MB1529; ", "X-Forefront-PRVS": "07943272E1", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(366004)(376002)(39860400002)(136003)(346002)(396003)(189003)(199004)(2906002)(6506007)(386003)(5009440100003)(6486002)(51416003)(6512007)(52116002)(486006)(2616005)(68736007)(956004)(53936002)(476003)(446003)(11346002)(305945005)(26005)(7736002)(55236004)(76176011)(186003)(16526019)(50226002)(478600001)(47776003)(1076002)(3846002)(6116002)(48376002)(105586002)(106356001)(25786009)(14444005)(50466002)(5660300001)(36756003)(72206003)(66066001)(316002)(97736004)(8936002)(81166006)(4326008)(8676002)(86362001)(6636002)(6666003)(54906003)(81156014)(16586007)(110426005);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR04MB1529;\n\tH:Tophie.ap.freescale.net; FPR:; \n\tSPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; ", "Received-SPF": "None (protection.outlook.com: nxp.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "XSdI/dFkXVfUqgtopnEzriVzuJE2Dpq8KB7aZKeNytIKG1qE37yeyyzEjdlUD+/IH1/JVO8l0vcckP+DgPJzNpI9T4fFJ9l7b+3jdrjKcteeBCIUTpVSoqX1+/CAip7h19IBMJcEx+CH84nDba016UhwB5inVyxKmK6zCR7u3AYOvTM96R7rm9r/2VoFa0JKZrmxusxBFD6j9OXHKarn2PIdH3nR4+MWytZYJldu4shTmMzgdq4fKW9N6lBVq5ujWfs3UCJRaue4F3Ujoy9RuY7HgXFjXlaRzn3XcvSyc79SviEd7trFfzU7cPWqaod5nCIBAIrvBRjhnIaoj2LHpE1STfI3UclqYRdWmjJH/5o=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "13 Sep 2018 06:09:34.6950\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "3888705f-f368-43be-20ec-08d6193f7b1b", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "HE1PR04MB1529", "Subject": "[dpdk-dev] [PATCH 08/10] crypto/caam_jr: add auth cipher and aead\n\tsession support", "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://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Hemant Agrawal <hemant.agrawal@nxp.com>\n\nSigned-off-by: Gagandeep Singh <g.singh@nxp.com>\nSigned-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>\n---\n drivers/crypto/caam_jr/caam_jr.c | 710 ++++++++++++++++++++++++++++++-\n 1 file changed, 707 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c\nindex 6d30c4f4d..d582b2fcb 100644\n--- a/drivers/crypto/caam_jr/caam_jr.c\n+++ b/drivers/crypto/caam_jr/caam_jr.c\n@@ -21,7 +21,9 @@\n /* RTA header files */\n #include <hw/desc/common.h>\n #include <hw/desc/algo.h>\n+#include <hw/desc/ipsec.h>\n #include <of.h>\n+\n #include <caam_jr_hw_specific.h>\n #include <caam_jr.h>\n #include <caam_jr_pvt.h>\n@@ -103,6 +105,71 @@ static inline int is_cipher_only(struct caam_jr_session *ses)\n \t\t(ses->auth_alg == RTE_CRYPTO_AUTH_NULL));\n }\n \n+static inline int is_auth_only(struct caam_jr_session *ses)\n+{\n+\treturn ((ses->cipher_alg == RTE_CRYPTO_CIPHER_NULL) &&\n+\t\t(ses->auth_alg != RTE_CRYPTO_AUTH_NULL));\n+}\n+\n+static inline int is_aead(struct caam_jr_session *ses)\n+{\n+\treturn ((ses->cipher_alg == 0) &&\n+\t\t(ses->auth_alg == 0) &&\n+\t\t(ses->aead_alg != 0));\n+}\n+\n+static inline int is_auth_cipher(struct caam_jr_session *ses)\n+{\n+\treturn ((ses->cipher_alg != RTE_CRYPTO_CIPHER_NULL) &&\n+\t\t(ses->auth_alg != RTE_CRYPTO_AUTH_NULL));\n+}\n+\n+static inline int is_encode(struct caam_jr_session *ses)\n+{\n+\treturn ses->dir == DIR_ENC;\n+}\n+\n+static inline int is_decode(struct caam_jr_session *ses)\n+{\n+\treturn ses->dir == DIR_DEC;\n+}\n+\n+static inline void\n+caam_auth_alg(struct caam_jr_session *ses, struct alginfo *alginfo_a)\n+{\n+\tswitch (ses->auth_alg) {\n+\tcase RTE_CRYPTO_AUTH_NULL:\n+\t\tses->digest_length = 0;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_MD5_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_MD5;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA1_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA1;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA224_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA224;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA256_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA256;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA384_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA384;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tcase RTE_CRYPTO_AUTH_SHA512_HMAC:\n+\t\talginfo_a->algtype = OP_ALG_ALGSEL_SHA512;\n+\t\talginfo_a->algmode = OP_ALG_AAI_HMAC;\n+\t\tbreak;\n+\tdefault:\n+\t\tCAAM_JR_DEBUG(\"unsupported auth alg %u\", ses->auth_alg);\n+\t}\n+}\n+\n static inline void\n caam_cipher_alg(struct caam_jr_session *ses, struct alginfo *alginfo_c)\n {\n@@ -126,13 +193,27 @@ caam_cipher_alg(struct caam_jr_session *ses, struct alginfo *alginfo_c)\n \t}\n }\n \n+static inline void\n+caam_aead_alg(struct caam_jr_session *ses, struct alginfo *alginfo)\n+{\n+\tswitch (ses->aead_alg) {\n+\tcase RTE_CRYPTO_AEAD_AES_GCM:\n+\t\talginfo->algtype = OP_ALG_ALGSEL_AES;\n+\t\talginfo->algmode = OP_ALG_AAI_GCM;\n+\t\tbreak;\n+\tdefault:\n+\t\tCAAM_JR_DEBUG(\"unsupported AEAD alg %d\", ses->aead_alg);\n+\t}\n+}\n+\n /* prepare command block of the session */\n static int\n caam_jr_prep_cdb(struct caam_jr_session *ses)\n {\n-\tstruct alginfo alginfo_c = {0};\n+\tstruct alginfo alginfo_c = {0}, alginfo_a = {0}, alginfo = {0};\n \tint32_t shared_desc_len = 0;\n \tstruct sec_cdb *cdb;\n+\tint err;\n #if RTE_BYTE_ORDER == RTE_BIG_ENDIAN\n \tint swap = false;\n #else\n@@ -171,6 +252,108 @@ caam_jr_prep_cdb(struct caam_jr_session *ses)\n \t\t\t\t\t\tNULL,\n \t\t\t\t\t\tses->iv.length,\n \t\t\t\t\t\tses->dir);\n+\t} else if (is_auth_only(ses)) {\n+\t\tcaam_auth_alg(ses, &alginfo_a);\n+\t\tif (alginfo_a.algtype == (unsigned int)CAAM_JR_ALG_UNSUPPORT) {\n+\t\t\tCAAM_JR_ERR(\"not supported auth alg\");\n+\t\t\trte_free(cdb);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\n+\t\talginfo_a.key = (size_t)ses->auth_key.data;\n+\t\talginfo_a.keylen = ses->auth_key.length;\n+\t\talginfo_a.key_enc_flags = 0;\n+\t\talginfo_a.key_type = RTA_DATA_IMM;\n+\n+\t\tshared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,\n+\t\t\t\t\t\t swap, &alginfo_a,\n+\t\t\t\t\t\t !ses->dir,\n+\t\t\t\t\t\t ses->digest_length);\n+\t} else if (is_aead(ses)) {\n+\t\tcaam_aead_alg(ses, &alginfo);\n+\t\tif (alginfo.algtype == (unsigned int)CAAM_JR_ALG_UNSUPPORT) {\n+\t\t\tCAAM_JR_ERR(\"not supported aead alg\");\n+\t\t\trte_free(cdb);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t\talginfo.key = (size_t)ses->aead_key.data;\n+\t\talginfo.keylen = ses->aead_key.length;\n+\t\talginfo.key_enc_flags = 0;\n+\t\talginfo.key_type = RTA_DATA_IMM;\n+\n+\t\tif (ses->dir == DIR_ENC)\n+\t\t\tshared_desc_len = cnstr_shdsc_gcm_encap(\n+\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t&alginfo,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->digest_length);\n+\t\telse\n+\t\t\tshared_desc_len = cnstr_shdsc_gcm_decap(\n+\t\t\t\t\tcdb->sh_desc, true, swap,\n+\t\t\t\t\t&alginfo,\n+\t\t\t\t\tses->iv.length,\n+\t\t\t\t\tses->digest_length);\n+\t} else {\n+\t\tcaam_cipher_alg(ses, &alginfo_c);\n+\t\tif (alginfo_c.algtype == (unsigned int)CAAM_JR_ALG_UNSUPPORT) {\n+\t\t\tCAAM_JR_ERR(\"not supported cipher alg\");\n+\t\t\trte_free(cdb);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\n+\t\talginfo_c.key = (size_t)ses->cipher_key.data;\n+\t\talginfo_c.keylen = ses->cipher_key.length;\n+\t\talginfo_c.key_enc_flags = 0;\n+\t\talginfo_c.key_type = RTA_DATA_IMM;\n+\n+\t\tcaam_auth_alg(ses, &alginfo_a);\n+\t\tif (alginfo_a.algtype == (unsigned int)CAAM_JR_ALG_UNSUPPORT) {\n+\t\t\tCAAM_JR_ERR(\"not supported auth alg\");\n+\t\t\trte_free(cdb);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\n+\t\talginfo_a.key = (size_t)ses->auth_key.data;\n+\t\talginfo_a.keylen = ses->auth_key.length;\n+\t\talginfo_a.key_enc_flags = 0;\n+\t\talginfo_a.key_type = RTA_DATA_IMM;\n+\n+\t\tcdb->sh_desc[0] = alginfo_c.keylen;\n+\t\tcdb->sh_desc[1] = alginfo_a.keylen;\n+\t\terr = rta_inline_query(IPSEC_AUTH_VAR_AES_DEC_BASE_DESC_LEN,\n+\t\t\t\t MIN_JOB_DESC_SIZE,\n+\t\t\t\t (unsigned int *)cdb->sh_desc,\n+\t\t\t\t &cdb->sh_desc[2], 2);\n+\n+\t\tif (err < 0) {\n+\t\t\tCAAM_JR_ERR(\"Crypto: Incorrect key lengths\");\n+\t\t\trte_free(cdb);\n+\t\t\treturn err;\n+\t\t}\n+\t\tif (cdb->sh_desc[2] & 1)\n+\t\t\talginfo_c.key_type = RTA_DATA_IMM;\n+\t\telse {\n+\t\t\talginfo_c.key = (size_t)caam_jr_mem_vtop(\n+\t\t\t\t\t\t(void *)(size_t)alginfo_c.key);\n+\t\t\talginfo_c.key_type = RTA_DATA_PTR;\n+\t\t}\n+\t\tif (cdb->sh_desc[2] & (1<<1))\n+\t\t\talginfo_a.key_type = RTA_DATA_IMM;\n+\t\telse {\n+\t\t\talginfo_a.key = (size_t)caam_jr_mem_vtop(\n+\t\t\t\t\t\t(void *)(size_t)alginfo_a.key);\n+\t\t\talginfo_a.key_type = RTA_DATA_PTR;\n+\t\t}\n+\t\tcdb->sh_desc[0] = 0;\n+\t\tcdb->sh_desc[1] = 0;\n+\t\tcdb->sh_desc[2] = 0;\n+\t\t\t/* Auth_only_len is set as 0 here and it will be\n+\t\t\t * overwritten in fd for each packet.\n+\t\t\t */\n+\t\t\tshared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,\n+\t\t\t\t\ttrue, swap, &alginfo_c, &alginfo_a,\n+\t\t\t\t\tses->iv.length, 0,\n+\t\t\t\t\tses->digest_length, ses->dir);\n \t}\n \n \tif (shared_desc_len < 0) {\n@@ -422,6 +605,163 @@ caam_jr_dequeue_burst(void *qp, struct rte_crypto_op **ops,\n \treturn num_rx;\n }\n \n+/**\n+ * packet looks like:\n+ *\t\t|<----data_len------->|\n+ * |ip_header|ah_header|icv|payload|\n+ * ^\n+ *\t\t|\n+ *\t mbuf->pkt.data\n+ */\n+static inline struct caam_jr_op_ctx *\n+build_auth_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct rte_mbuf *mbuf = sym->m_src;\n+\tstruct caam_jr_op_ctx *ctx;\n+\tstruct sec4_sg_entry *sg;\n+\tint\tlength;\n+\tstruct sec_cdb *cdb;\n+\tuint64_t sdesc_offset;\n+\tstruct sec_job_descriptor_t *jobdescr;\n+\tuint8_t extra_segs;\n+\n+\tif (is_decode(ses))\n+\t\textra_segs = 2;\n+\telse\n+\t\textra_segs = 1;\n+\n+\tif ((mbuf->nb_segs + extra_segs) > MAX_SG_ENTRIES) {\n+\t\tCAAM_JR_DP_ERR(\"Auth: Max sec segs supported is %d\",\n+\t\t\t\tMAX_SG_ENTRIES);\n+\t\treturn NULL;\n+\t}\n+\n+\tctx = caam_jr_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\n+\tctx->op = op;\n+\n+\tcdb = ses->cdb;\n+\tsdesc_offset = (size_t) ((char *)&cdb->sh_desc - (char *)cdb);\n+\n+\tjobdescr = (struct sec_job_descriptor_t *) ctx->jobdes.desc;\n+\n+\tSEC_JD_INIT(jobdescr);\n+\tSEC_JD_SET_SD(jobdescr,\n+\t\t(phys_addr_t)(caam_jr_dma_vtop(cdb)) + sdesc_offset,\n+\t\tcdb->sh_hdr.hi.field.idlen);\n+\n+\t/* output */\n+\tSEC_JD_SET_OUT_PTR(jobdescr, (uint64_t)sym->auth.digest.phys_addr,\n+\t\t\t0, ses->digest_length);\n+\n+\t/*input */\n+\tsg = &ctx->sg[0];\n+\tlength = sym->auth.data.length;\n+\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf) + sym->auth.data.offset);\n+\tsg->len = cpu_to_caam32(mbuf->data_len - sym->auth.data.offset);\n+\n+\t/* Successive segs */\n+\tmbuf = mbuf->next;\n+\twhile (mbuf) {\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf));\n+\t\tsg->len = cpu_to_caam32(mbuf->data_len);\n+\t\tmbuf = mbuf->next;\n+\t}\n+\n+\tif (is_decode(ses)) {\n+\t\t/* digest verification case */\n+\t\tsg++;\n+\t\t/* hash result or digest, save digest first */\n+\t\trte_memcpy(ctx->digest, sym->auth.digest.data,\n+\t\t\t ses->digest_length);\n+#ifdef RTE_LIBRTE_PMD_CAAM_JR_DEBUG\n+\t\trte_hexdump(stdout, \"ICV\", ctx->digest, ses->digest_length);\n+#endif\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_vtop_ctx(ctx, ctx->digest));\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t\tlength += ses->digest_length;\n+\t} else {\n+\t\tlength -= ses->digest_length;\n+\t}\n+\n+\t/* last element*/\n+\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\n+\tSEC_JD_SET_IN_PTR(jobdescr,\n+\t\t(uint64_t)caam_jr_vtop_ctx(ctx, &ctx->sg[0]), 0, length);\n+\t/* enabling sg list */\n+\t(jobdescr)->seq_in.command.word |= 0x01000000;\n+\n+\treturn ctx;\n+}\n+\n+static inline struct caam_jr_op_ctx *\n+build_auth_only(struct rte_crypto_op *op, struct caam_jr_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct caam_jr_op_ctx *ctx;\n+\tstruct sec4_sg_entry *sg;\n+\trte_iova_t start_addr;\n+\tstruct sec_cdb *cdb;\n+\tuint64_t sdesc_offset;\n+\tstruct sec_job_descriptor_t *jobdescr;\n+\n+\tctx = caam_jr_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\n+\tctx->op = op;\n+\n+\tcdb = ses->cdb;\n+\tsdesc_offset = (size_t) ((char *)&cdb->sh_desc - (char *)cdb);\n+\n+\tstart_addr = rte_pktmbuf_iova(sym->m_src);\n+\n+\tjobdescr = (struct sec_job_descriptor_t *) ctx->jobdes.desc;\n+\n+\tSEC_JD_INIT(jobdescr);\n+\tSEC_JD_SET_SD(jobdescr,\n+\t\t(phys_addr_t)(caam_jr_dma_vtop(cdb)) + sdesc_offset,\n+\t\tcdb->sh_hdr.hi.field.idlen);\n+\n+\t/* output */\n+\tSEC_JD_SET_OUT_PTR(jobdescr, (uint64_t)sym->auth.digest.phys_addr,\n+\t\t\t0, ses->digest_length);\n+\n+\t/*input */\n+\tif (is_decode(ses)) {\n+\t\tsg = &ctx->sg[0];\n+\t\tSEC_JD_SET_IN_PTR(jobdescr,\n+\t\t\t(uint64_t)caam_jr_vtop_ctx(ctx, sg), 0,\n+\t\t\t(sym->auth.data.length + ses->digest_length));\n+\t\t/* enabling sg list */\n+\t\t(jobdescr)->seq_in.command.word |= 0x01000000;\n+\n+\t\t/* hash result or digest, save digest first */\n+\t\trte_memcpy(ctx->digest, sym->auth.digest.data,\n+\t\t\t ses->digest_length);\n+\t\tsg->ptr = cpu_to_caam64(start_addr + sym->auth.data.offset);\n+\t\tsg->len = cpu_to_caam32(sym->auth.data.length);\n+\n+#ifdef RTE_LIBRTE_PMD_CAAM_JR_DEBUG\n+\t\trte_hexdump(stdout, \"ICV\", ctx->digest, ses->digest_length);\n+#endif\n+\t\t/* let's check digest by hw */\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_vtop_ctx(ctx, ctx->digest));\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t\t/* last element*/\n+\t\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\t} else {\n+\t\tSEC_JD_SET_IN_PTR(jobdescr, (uint64_t)start_addr,\n+\t\t\tsym->auth.data.offset, sym->auth.data.length);\n+\t}\n+\treturn ctx;\n+}\n \n static inline struct caam_jr_op_ctx *\n build_cipher_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)\n@@ -602,6 +942,269 @@ build_cipher_only(struct rte_crypto_op *op, struct caam_jr_session *ses)\n \treturn ctx;\n }\n \n+/* For decapsulation:\n+ * Input:\n+ * +----+----------------+--------------------------------+-----+\n+ * | IV | Auth-only data | Authenticated & Encrypted data | ICV |\n+ * +----+----------------+--------------------------------+-----+\n+ * Output:\n+ * +----+--------------------------+\n+ * | Decrypted & authenticated data |\n+ * +----+--------------------------+\n+ */\n+\n+static inline struct caam_jr_op_ctx *\n+build_cipher_auth_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct caam_jr_op_ctx *ctx;\n+\tstruct sec4_sg_entry *sg, *out_sg, *in_sg;\n+\tstruct rte_mbuf *mbuf;\n+\tuint32_t length = 0;\n+\tstruct sec_cdb *cdb;\n+\tuint64_t sdesc_offset;\n+\tuint8_t req_segs;\n+\tuint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n+\t\t\tses->iv.offset);\n+\tstruct sec_job_descriptor_t *jobdescr;\n+\tuint32_t auth_only_len;\n+\n+\tauth_only_len = op->sym->auth.data.length -\n+\t\t\t\top->sym->cipher.data.length;\n+\n+\tif (sym->m_dst) {\n+\t\tmbuf = sym->m_dst;\n+\t\treq_segs = mbuf->nb_segs + sym->m_src->nb_segs + 3;\n+\t} else {\n+\t\tmbuf = sym->m_src;\n+\t\treq_segs = mbuf->nb_segs * 2 + 3;\n+\t}\n+\n+\tif (req_segs > MAX_SG_ENTRIES) {\n+\t\tCAAM_JR_DP_ERR(\"Cipher-Auth: Max sec segs supported is %d\",\n+\t\t\t\tMAX_SG_ENTRIES);\n+\t\treturn NULL;\n+\t}\n+\n+\tctx = caam_jr_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\n+\tctx->op = op;\n+\tcdb = ses->cdb;\n+\tsdesc_offset = (size_t) ((char *)&cdb->sh_desc - (char *)cdb);\n+\n+\tjobdescr = (struct sec_job_descriptor_t *) ctx->jobdes.desc;\n+\n+\tSEC_JD_INIT(jobdescr);\n+\tSEC_JD_SET_SD(jobdescr,\n+\t\t(phys_addr_t)(caam_jr_dma_vtop(cdb)) + sdesc_offset,\n+\t\tcdb->sh_hdr.hi.field.idlen);\n+\n+\t/* output */\n+\tif (sym->m_dst)\n+\t\tmbuf = sym->m_dst;\n+\telse\n+\t\tmbuf = sym->m_src;\n+\n+\tout_sg = &ctx->sg[0];\n+\tif (is_encode(ses))\n+\t\tlength = sym->auth.data.length + ses->digest_length;\n+\telse\n+\t\tlength = sym->auth.data.length;\n+\n+\tsg = &ctx->sg[0];\n+\n+\t/* 1st seg */\n+\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf)\n+\t\t+ sym->auth.data.offset);\n+\tsg->len = cpu_to_caam32(mbuf->data_len - sym->auth.data.offset);\n+\n+\t/* Successive segs */\n+\tmbuf = mbuf->next;\n+\twhile (mbuf) {\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf));\n+\t\tsg->len = cpu_to_caam32(mbuf->data_len);\n+\t\tmbuf = mbuf->next;\n+\t}\n+\n+\tif (is_encode(ses)) {\n+\t\t/* set auth output */\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(sym->auth.digest.phys_addr);\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t}\n+\t/* last element*/\n+\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\n+\tSEC_JD_SET_OUT_PTR(jobdescr,\n+\t\t\t (uint64_t)caam_jr_dma_vtop(out_sg), 0, length);\n+\t/* set sg bit */\n+\t(jobdescr)->seq_out.command.word |= 0x01000000;\n+\n+\t/* input */\n+\tsg++;\n+\tmbuf = sym->m_src;\n+\tin_sg = sg;\n+\tif (is_encode(ses))\n+\t\tlength = ses->iv.length + sym->auth.data.length;\n+\telse\n+\t\tlength = ses->iv.length + sym->auth.data.length\n+\t\t\t\t\t\t+ ses->digest_length;\n+\n+\tsg->ptr = cpu_to_caam64(caam_jr_dma_vtop(IV_ptr));\n+\tsg->len = cpu_to_caam32(ses->iv.length);\n+\n+\tsg++;\n+\t/* 1st seg */\n+\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf)\n+\t\t+ sym->auth.data.offset);\n+\tsg->len = cpu_to_caam32(mbuf->data_len - sym->auth.data.offset);\n+\n+\t/* Successive segs */\n+\tmbuf = mbuf->next;\n+\twhile (mbuf) {\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(rte_pktmbuf_iova(mbuf));\n+\t\tsg->len = cpu_to_caam32(mbuf->data_len);\n+\t\tmbuf = mbuf->next;\n+\t}\n+\n+\tif (is_decode(ses)) {\n+\t\tsg++;\n+\t\trte_memcpy(ctx->digest, sym->auth.digest.data,\n+\t\t ses->digest_length);\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_dma_vtop(ctx->digest));\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t}\n+\t/* last element*/\n+\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\n+\tSEC_JD_SET_IN_PTR(jobdescr, (uint64_t)caam_jr_dma_vtop(in_sg), 0,\n+\t\t\t\tlength);\n+\t/* set sg bit */\n+\t(jobdescr)->seq_in.command.word |= 0x01000000;\n+\t/* Auth_only_len is set as 0 in descriptor and it is\n+\t * overwritten here in the jd which will update\n+\t * the DPOVRD reg.\n+\t */\n+\tif (auth_only_len)\n+\t\t/* set sg bit */\n+\t\t(jobdescr)->dpovrd = 0x80000000 | auth_only_len;\n+\n+\treturn ctx;\n+}\n+\n+static inline struct caam_jr_op_ctx *\n+build_cipher_auth(struct rte_crypto_op *op, struct caam_jr_session *ses)\n+{\n+\tstruct rte_crypto_sym_op *sym = op->sym;\n+\tstruct caam_jr_op_ctx *ctx;\n+\tstruct sec4_sg_entry *sg;\n+\trte_iova_t src_start_addr, dst_start_addr;\n+\tuint32_t length = 0;\n+\tstruct sec_cdb *cdb;\n+\tuint64_t sdesc_offset;\n+\tuint8_t *IV_ptr = rte_crypto_op_ctod_offset(op, uint8_t *,\n+\t\t\tses->iv.offset);\n+\tstruct sec_job_descriptor_t *jobdescr;\n+\tuint32_t auth_only_len;\n+\n+\tauth_only_len = op->sym->auth.data.length -\n+\t\t\t\top->sym->cipher.data.length;\n+\n+\tsrc_start_addr = rte_pktmbuf_iova(sym->m_src);\n+\tif (sym->m_dst)\n+\t\tdst_start_addr = rte_pktmbuf_iova(sym->m_dst);\n+\telse\n+\t\tdst_start_addr = src_start_addr;\n+\n+\tctx = caam_jr_alloc_ctx(ses);\n+\tif (!ctx)\n+\t\treturn NULL;\n+\n+\tctx->op = op;\n+\tcdb = ses->cdb;\n+\tsdesc_offset = (size_t) ((char *)&cdb->sh_desc - (char *)cdb);\n+\n+\tjobdescr = (struct sec_job_descriptor_t *) ctx->jobdes.desc;\n+\n+\tSEC_JD_INIT(jobdescr);\n+\tSEC_JD_SET_SD(jobdescr,\n+\t\t(phys_addr_t)(caam_jr_dma_vtop(cdb)) + sdesc_offset,\n+\t\tcdb->sh_hdr.hi.field.idlen);\n+\n+\t/* input */\n+\tsg = &ctx->sg[0];\n+\tif (is_encode(ses)) {\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_dma_vtop(IV_ptr));\n+\t\tsg->len = cpu_to_caam32(ses->iv.length);\n+\t\tlength += ses->iv.length;\n+\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(src_start_addr + sym->auth.data.offset);\n+\t\tsg->len = cpu_to_caam32(sym->auth.data.length);\n+\t\tlength += sym->auth.data.length;\n+\t\t/* last element*/\n+\t\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\t} else {\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_dma_vtop(IV_ptr));\n+\t\tsg->len = cpu_to_caam32(ses->iv.length);\n+\t\tlength += ses->iv.length;\n+\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(src_start_addr + sym->auth.data.offset);\n+\t\tsg->len = cpu_to_caam32(sym->auth.data.length);\n+\t\tlength += sym->auth.data.length;\n+\n+\t\trte_memcpy(ctx->digest, sym->auth.digest.data,\n+\t\t ses->digest_length);\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(caam_jr_dma_vtop(ctx->digest));\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t\tlength += ses->digest_length;\n+\t\t/* last element*/\n+\t\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\t}\n+\n+\tSEC_JD_SET_IN_PTR(jobdescr, (uint64_t)caam_jr_dma_vtop(&ctx->sg[0]), 0,\n+\t\t\t\tlength);\n+\t/* set sg bit */\n+\t(jobdescr)->seq_in.command.word |= 0x01000000;\n+\n+\t/* output */\n+\tsg = &ctx->sg[6];\n+\n+\tsg->ptr = cpu_to_caam64(dst_start_addr + sym->cipher.data.offset);\n+\tsg->len = cpu_to_caam32(sym->cipher.data.length);\n+\tlength = sym->cipher.data.length;\n+\n+\tif (is_encode(ses)) {\n+\t\t/* set auth output */\n+\t\tsg++;\n+\t\tsg->ptr = cpu_to_caam64(sym->auth.digest.phys_addr);\n+\t\tsg->len = cpu_to_caam32(ses->digest_length);\n+\t\tlength += ses->digest_length;\n+\t}\n+\t/* last element*/\n+\tsg->len |= cpu_to_caam32(SEC4_SG_LEN_FIN);\n+\n+\tSEC_JD_SET_OUT_PTR(jobdescr,\n+\t\t\t (uint64_t)caam_jr_dma_vtop(&ctx->sg[6]), 0, length);\n+\t/* set sg bit */\n+\t(jobdescr)->seq_out.command.word |= 0x01000000;\n+\n+\t/* Auth_only_len is set as 0 in descriptor and it is\n+\t * overwritten here in the jd which will update\n+\t * the DPOVRD reg.\n+\t */\n+\tif (auth_only_len)\n+\t\t/* set sg bit */\n+\t\t(jobdescr)->dpovrd = 0x80000000 | auth_only_len;\n+\n+\treturn ctx;\n+}\n static int\n caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)\n {\n@@ -629,12 +1232,25 @@ caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)\n \t}\n \n \tif (rte_pktmbuf_is_contiguous(op->sym->m_src)) {\n-\t\tif (is_cipher_only(ses))\n+\t\tif (is_auth_cipher(ses))\n+\t\t\tctx = build_cipher_auth(op, ses);\n+\t\telse if (is_aead(ses))\n+\t\t\tgoto err1;\n+\t\telse if (is_auth_only(ses))\n+\t\t\tctx = build_auth_only(op, ses);\n+\t\telse if (is_cipher_only(ses))\n \t\t\tctx = build_cipher_only(op, ses);\n \t} else {\n-\t\tif (is_cipher_only(ses))\n+\t\tif (is_auth_cipher(ses))\n+\t\t\tctx = build_cipher_auth_sg(op, ses);\n+\t\telse if (is_aead(ses))\n+\t\t\tgoto err1;\n+\t\telse if (is_auth_only(ses))\n+\t\t\tctx = build_auth_only_sg(op, ses);\n+\t\telse if (is_cipher_only(ses))\n \t\t\tctx = build_cipher_only_sg(op, ses);\n \t}\n+err1:\n \tif (unlikely(!ctx)) {\n \t\tqp->tx_errs++;\n \t\tCAAM_JR_ERR(\"not supported sec op\");\n@@ -817,6 +1433,54 @@ caam_jr_cipher_init(struct rte_cryptodev *dev __rte_unused,\n \treturn 0;\n }\n \n+static int\n+caam_jr_auth_init(struct rte_cryptodev *dev __rte_unused,\n+\t\t struct rte_crypto_sym_xform *xform,\n+\t\t struct caam_jr_session *session)\n+{\n+\tsession->auth_alg = xform->auth.algo;\n+\tsession->auth_key.data = rte_zmalloc(NULL, xform->auth.key.length,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n+\tif (session->auth_key.data == NULL && xform->auth.key.length > 0) {\n+\t\tCAAM_JR_ERR(\"No Memory for auth key\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\tsession->auth_key.length = xform->auth.key.length;\n+\tsession->digest_length = xform->auth.digest_length;\n+\n+\tmemcpy(session->auth_key.data, xform->auth.key.data,\n+\t xform->auth.key.length);\n+\tsession->dir = (xform->auth.op == RTE_CRYPTO_AUTH_OP_GENERATE) ?\n+\t\t\tDIR_ENC : DIR_DEC;\n+\n+\treturn 0;\n+}\n+\n+static int\n+caam_jr_aead_init(struct rte_cryptodev *dev __rte_unused,\n+\t\t struct rte_crypto_sym_xform *xform,\n+\t\t struct caam_jr_session *session)\n+{\n+\tsession->aead_alg = xform->aead.algo;\n+\tsession->iv.length = xform->aead.iv.length;\n+\tsession->iv.offset = xform->aead.iv.offset;\n+\tsession->auth_only_len = xform->aead.aad_length;\n+\tsession->aead_key.data = rte_zmalloc(NULL, xform->aead.key.length,\n+\t\t\t\t\t RTE_CACHE_LINE_SIZE);\n+\tif (session->aead_key.data == NULL && xform->aead.key.length > 0) {\n+\t\tCAAM_JR_ERR(\"No Memory for aead key\\n\");\n+\t\treturn -ENOMEM;\n+\t}\n+\tsession->aead_key.length = xform->aead.key.length;\n+\tsession->digest_length = xform->aead.digest_length;\n+\n+\tmemcpy(session->aead_key.data, xform->aead.key.data,\n+\t xform->aead.key.length);\n+\tsession->dir = (xform->aead.op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?\n+\t\t\tDIR_ENC : DIR_DEC;\n+\n+\treturn 0;\n+}\n \n static int\n caam_jr_set_session_parameters(struct rte_cryptodev *dev,\n@@ -840,6 +1504,39 @@ caam_jr_set_session_parameters(struct rte_cryptodev *dev,\n \t\tsession->auth_alg = RTE_CRYPTO_AUTH_NULL;\n \t\tcaam_jr_cipher_init(dev, xform, session);\n \n+\t/* Authentication Only */\n+\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n+\t\t xform->next == NULL) {\n+\t\tsession->cipher_alg = RTE_CRYPTO_CIPHER_NULL;\n+\t\tcaam_jr_auth_init(dev, xform, session);\n+\n+\t/* Cipher then Authenticate */\n+\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&\n+\t\t xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) {\n+\t\tif (xform->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {\n+\t\t\tcaam_jr_cipher_init(dev, xform, session);\n+\t\t\tcaam_jr_auth_init(dev, xform->next, session);\n+\t\t} else {\n+\t\t\tCAAM_JR_ERR(\"Not supported: Auth then Cipher\");\n+\t\t\tgoto err1;\n+\t\t}\n+\n+\t/* Authenticate then Cipher */\n+\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&\n+\t\t xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {\n+\t\tif (xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {\n+\t\t\tcaam_jr_auth_init(dev, xform, session);\n+\t\t\tcaam_jr_cipher_init(dev, xform->next, session);\n+\t\t} else {\n+\t\t\tCAAM_JR_ERR(\"Not supported: Auth then Cipher\");\n+\t\t\tgoto err1;\n+\t\t}\n+\n+\t/* AEAD operation for AES-GCM kind of Algorithms */\n+\t} else if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD &&\n+\t\t xform->next == NULL) {\n+\t\tcaam_jr_aead_init(dev, xform, session);\n+\n \t} else {\n \t\tCAAM_JR_ERR(\"Invalid crypto type\");\n \t\treturn -EINVAL;\n@@ -847,6 +1544,13 @@ caam_jr_set_session_parameters(struct rte_cryptodev *dev,\n \tsession->ctx_pool = internals->ctx_pool;\n \n \treturn 0;\n+\n+err1:\n+\trte_free(session->cipher_key.data);\n+\trte_free(session->auth_key.data);\n+\tmemset(session, 0, sizeof(struct caam_jr_session));\n+\n+\treturn -EINVAL;\n }\n \n static int\n", "prefixes": [ "08/10" ] }