Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/110065/?format=api
{ "id": 110065, "url": "http://patchwork.dpdk.org/api/patches/110065/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20220422035100.3180870-7-g.singh@nxp.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20220422035100.3180870-7-g.singh@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220422035100.3180870-7-g.singh@nxp.com", "date": "2022-04-22T03:50:53", "name": "[07/14] dpaax/caamflib: remove obsolete code", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5f07a5b645cbc1e2c55211cb15cbd40903e077f9", "submitter": { "id": 1068, "url": "http://patchwork.dpdk.org/api/people/1068/?format=api", "name": "Gagandeep Singh", "email": "g.singh@nxp.com" }, "delegate": { "id": 6690, "url": "http://patchwork.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20220422035100.3180870-7-g.singh@nxp.com/mbox/", "series": [ { "id": 22607, "url": "http://patchwork.dpdk.org/api/series/22607/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=22607", "date": "2022-04-22T03:50:47", "name": "[01/14] crypto/dpaa2_sec: fix fle buffer leak", "version": 1, "mbox": "http://patchwork.dpdk.org/series/22607/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/110065/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/110065/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8B173A0093;\n\tFri, 22 Apr 2022 05:52:19 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id D8F0842807;\n\tFri, 22 Apr 2022 05:51:48 +0200 (CEST)", "from EUR02-VE1-obe.outbound.protection.outlook.com\n (mail-eopbgr20078.outbound.protection.outlook.com [40.107.2.78])\n by mails.dpdk.org (Postfix) with ESMTP id 7173C4280E\n for <dev@dpdk.org>; Fri, 22 Apr 2022 05:51:47 +0200 (CEST)", "from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14)\n by DB7PR04MB4393.eurprd04.prod.outlook.com (2603:10a6:5:32::21) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Fri, 22 Apr\n 2022 03:51:46 +0000", "from AS8PR04MB8198.eurprd04.prod.outlook.com\n ([fe80::8cf1:93b:c340:3be2]) by AS8PR04MB8198.eurprd04.prod.outlook.com\n ([fe80::8cf1:93b:c340:3be2%7]) with mapi id 15.20.5186.015; Fri, 22 Apr 2022\n 03:51:46 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=KhZggIs4wf3S6FDsQ0La6sxnqAWzYaVrmpFiiLwbH2PSLYV8NBDLf/GpfbhUMAp/lytrQZn5iTW+/433WACgMgRrBcINq/OTHNK4f6In/SeglQEw4J8js6yRolVRowCXUPICXlZjm+xX5tTsrGyotHnG5Et6HBVnLFGsSRM1Lkf4E0JrButtDilIAWUrqpMTqbfQSYVm5EQZljNLXrwGYVAMRu3WJ3+OJHH0yV6iGBY3MAb4UhXUrTPusrfJz62OE2yDcyb0MXiyN3jOtLz/Cc4yMgW9tedLhqhMxixmDiJE9aQ+MNcUrvofZHXlfl0V9c5hPutl6nrQlP5N9PD32w==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=gh1P/DLnH9sjJu/kSGFhEpawSoKWTo95HhMLXQicCGQ=;\n b=KneDxkJyiv5RSvTRrhspuhOL29+nLxSB1NF3Q8xNyRscry3PSU6OajlwN8HAuPb8etYXWrUtKRP6LthQjQDcVke9ZkXM6Lj52cMNvbg5p96MS5lk7x1wlmoHhScEcS//knjPcOXN9br0B3YR6LUrwpUqbTOeRhU4ORfkj/Nur92Lln/GPrF8uORckZjfKLg0DHGr7A32Dam8teBuPEWX1d+sn64jIAjVcXIL56H+Swm2tTE0pAfVtdFcQn3UBKfMbS87BhTAXKClm3OKivAM0BpJ6HPyRlsP2RyrD2USXmzVgENexX+43ZespLM6ZDs/E5GgNOw1JETf7bGAVwA1Ew==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass\n header.d=nxp.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=gh1P/DLnH9sjJu/kSGFhEpawSoKWTo95HhMLXQicCGQ=;\n b=dgSljKFUzZjUjNYnIW8xPc6ZOhlnjf0VTdAJIoFJaM1SzcPyloHcOcWY02U4eVjoZhRIvVBUGlTdzYi31HHOtlJp1Hwfw6cRchfbyC2HN7iNtPivlyRQixnERC0NN26ojQGZpXjViLjdBz8+RoPbFIbaMA/J9by7w0O7BATwmLw=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=nxp.com;", "From": "Gagandeep Singh <g.singh@nxp.com>", "To": "gakhil@marvell.com,\n\tdev@dpdk.org", "Cc": "Gagandeep Singh <g.singh@nxp.com>", "Subject": "[PATCH 07/14] dpaax/caamflib: remove obsolete code", "Date": "Fri, 22 Apr 2022 09:20:53 +0530", "Message-Id": "<20220422035100.3180870-7-g.singh@nxp.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220422035100.3180870-1-g.singh@nxp.com>", "References": "<20220422035100.3180870-1-g.singh@nxp.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "SG2PR03CA0127.apcprd03.prod.outlook.com\n (2603:1096:4:91::31) To AS8PR04MB8198.eurprd04.prod.outlook.com\n (2603:10a6:20b:3b0::14)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "b3f0ba49-9e62-4bfe-1cae-08da24136ba7", "X-MS-TrafficTypeDiagnostic": "DB7PR04MB4393:EE_", "X-Microsoft-Antispam-PRVS": "\n <DB7PR04MB4393ABF36A5BCA19E0A6CD9EE1F79@DB7PR04MB4393.eurprd04.prod.outlook.com>", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n /tJwirlH8aGJZ/UC4uCYMHa4YMZ70nw6gN/vdEYqzXy6CPd+QBO/E0KkSH0TcsXbSg2H/dVMdIQQhyE2evLs+kbM1m0bnMU2lMi+6esGO2yp3T0fwgECw+fXlkAdp+EklcTe7rml6bft0NNZWhAM/pJyAOmC0i6+euPzshj1dvxVATsvlXCAyRkuKEyUZcMT8GQRoOtryVm8a/dnbnWl7cVR+tTJp2EwM53edKwFlPFYP7UlLmeGodc3u4TafDn9np/iFV+/TOlYWjFHgsUs/FMKhqCv2w5ZEDI87mNn9LG6/qNridmiYehQGB65c1Tj2naKClDO8nG6gRfcT1C3DqoJG08Ijk5oYtYwTlAF7Od5jeTV/ONN5faMnbMbQ0IGS9pL57uJeTFQDFU/ZRPYRDocvkH0R2jZX+RYvzMUTrPrFBPBSV4gV45S/nmhD2woR5RgZ7hX0ZcRqxrRO5e61+yL09gvhSr8wZmzTOsnEbA92CM+q/gdqH0lfmBA/MsaqiDq/2cQOHDHvXWDpeCT571CAc+4MKBnP4J7+03hoQVPMR+YgsNF8Zjil112OkBbDLrtZrkopGtGJCx+BjWoUda8+x/zRWSYURBU+JlPSNrAPtSOFANvN+UchVbNSMrDdvzPa23X2BS/JVpSlpXh9WIZO/VtyuXoGs8FgLFF/SC7cIqpfQgqsAj7jby8QaFP2B5iiqkaghCm7JmPrcB27A==", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230001)(4636009)(366004)(5660300002)(36756003)(2616005)(6486002)(30864003)(1076003)(8936002)(86362001)(316002)(52116002)(66946007)(26005)(6506007)(6512007)(186003)(66556008)(6666004)(66476007)(83380400001)(38350700002)(38100700002)(508600001)(4326008)(55236004)(2906002)(8676002);\n DIR:OUT; SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n b9rZ6JWvJuThLtw+pAh2C9jdCJkXdWMUvtJIQ0WjDmQo7+sUdzGTTR6tS8T4JqIzlumM4qYRlhKgsSlAmd4gnr8bGwzmfH7Jba88mKt4fabQ8llD3/sMnYSfQHrzgj/E1GzCnYhVai7qdlrKsvRLZNcfvCpJ5OGKbBVOSH/bj+hr6G8UDiwl50iVSVTo5LKB9+wiHLZ0tqOuSugzb+yr6GCLJaiRyiFlLp/kVJh3wRLaHojwi16syUwc1SAbticzL/S/yyhCOu5tyVuDcSqm2u/HXv0ArcfVj3IhRJG4UvqkXtbu3dpx3g9kvM7nEsy0B6RqYLbe2AUcOmc76zEQyhwZEbhModIKPGCmIB63rOHBXpiPfOO0HtLokzL4q5Y65JzJY13pXoT5VAmB++lH527RrDlzEecnb4X4PQY9lcQxTOt0z9En7WxwyKZEQT8etRVDyjvrra/V00teBx37X9AdNvkw4XkHeC2XuPQSf7tnjXrJjW9GvHMpsG4zQN1ke8sc7DD0x/pcIct2uwlnkl1IbmdYoVz2nxJP7Dv7yoOcGJPKZ1FJQJgOuhTHe9LFpDzy26NcCbtg1KB9upWqaLxBJDAcdqrGQfHZyLzG90Z9jszdKz975nE5jGgUw5vEzJMD++YUcXqm1RiACgk4Hm4OzRE2jMGGvjn/pSlXrQ/Lb5DFRlu1IMB5+q5qUQMWhuQm/QfvzfWeYx+Go+mLOhPm7WzrP8ZzKuZYLJQDOSt1ronfE7pzeH6wjA9rzDQf1SQT53zlI9cATN7iuWEK+aQyDMsPBudlcis0Bk0vxAqtrwk0a7sWnHvWBCv1Y7aR3UlBJ+6VjnDPQxJypueGbooESMTZRHJ85e4DgfThVHQKDJlDdNinkUi/xvYQjFcwFCaIYSgYDWTJeyPX5VsY8/eqiOYlIHwfDr1w/jJkZt66vZK2DXXMa+8vDqc9Yftcn7G1Y+UC9UTAfSU4/yROvx9qbn2p9HKkMLBZxZdfHxV8U8v/E8dFN1XTWvSa8S3vcNcS94gCwXR4sGKmL2TBh10WuQ+EGeCtwzF+8CEWufQ/pb+aNJHA2EkNAqKcb5suW/jsbH+vjay+/azerCGEtLtRrKqbGSCwVQ0kZC6FONfd2ptpEb4IyGn56wGrcVicmWYjmUhYqkC/c9d48kLjKce8BrnrVqABlf3m5/X5yEDLCOTncgQPm87fsAjoGiexubxA77WrRZSKA7HiwJZdE9Ghlcq22JivLjl9rET/dD2s8mKavwJzvMqGhRgA67MrnRl+j5sU20U7t+Smp6rJDF9EpU4hz6XrX+RPjfXevhhETTDuag1Z0aubomp9GjJqkJxo7vu5VR39vnGRJcwcE94I3avyM+pdsSWgb+OrDT3VulzB1tSC0OwK2LJmFSvaNwwfzS95Byw/Wz7I0G6b3LoJds6w1IbYc9bBCJe/Z7YdCDW0th128aV0D7uz1OPsq2lmWQmLh8mhSXjkYyS3t2e2lBPAgCR9ejUf61+Ka5k3GE3+1+/jaFH8ck5MebdqXbff/AmemH23qQDhNqaAU7HnqqI9of6lktXcZy5YNKJsW7gkzqSjQUw1KGIhTU03cdiVOJR/mN0b/RPkgOPnn/eM+KB15mxx0MzdgkJnIvnHl82ArMi5mWuXEOyBE3/Ymqsqeith4g4CiRAnoMIoX3MGMnhy7CDIGFflYcdqLcG10htvWYygn34JxbPaHrFcslcU+O+HdkikuPK8Szk/LA==", "X-OriginatorOrg": "nxp.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n b3f0ba49-9e62-4bfe-1cae-08da24136ba7", "X-MS-Exchange-CrossTenant-AuthSource": "AS8PR04MB8198.eurprd04.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "22 Apr 2022 03:51:45.9813 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "686ea1d3-bc2b-4c6f-a92c-d99c5c301635", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n l75Yd2LwVmUCOyt+uzIYfXoJ0MO0kFTvRiEVxlEG3igE1GyflbWZRzQQ/kfkkXx9", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DB7PR04MB4393", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Remove sec era 1 to 7 IPsec and caam operations code\nas none of the NXP platform use it.\n\nSigned-off-by: Gagandeep Singh <g.singh@nxp.com>\n---\n drivers/common/dpaax/caamflib/desc/ipsec.h | 34 +++-------------\n .../dpaax/caamflib/rta/fifo_load_store_cmd.h | 15 -------\n .../common/dpaax/caamflib/rta/header_cmd.h | 15 +------\n drivers/common/dpaax/caamflib/rta/jump_cmd.h | 16 --------\n drivers/common/dpaax/caamflib/rta/key_cmd.h | 12 ------\n drivers/common/dpaax/caamflib/rta/math_cmd.h | 29 --------------\n drivers/common/dpaax/caamflib/rta/move_cmd.h | 39 ++++---------------\n drivers/common/dpaax/caamflib/rta/nfifo_cmd.h | 6 ---\n .../common/dpaax/caamflib/rta/operation_cmd.h | 20 ----------\n .../common/dpaax/caamflib/rta/protocol_cmd.h | 29 --------------\n 10 files changed, 15 insertions(+), 200 deletions(-)", "diff": "diff --git a/drivers/common/dpaax/caamflib/desc/ipsec.h b/drivers/common/dpaax/caamflib/desc/ipsec.h\nindex 668d21649d..8ec6aac915 100644\n--- a/drivers/common/dpaax/caamflib/desc/ipsec.h\n+++ b/drivers/common/dpaax/caamflib/desc/ipsec.h\n@@ -774,14 +774,9 @@ cnstr_shdsc_ipsec_encap(uint32_t *descbuf, bool ps, bool swap,\n \tCOPY_DATA(p, pdb->ip_hdr, pdb->ip_hdr_len);\n \tSET_LABEL(p, hdr);\n \tpkeyjmp = JUMP(p, keyjmp, LOCAL_JUMP, ALL_TRUE, BOTH|SHRD);\n-\tif (authdata->keylen) {\n-\t\tif (rta_sec_era < RTA_SEC_ERA_6)\n-\t\t\tKEY(p, MDHA_SPLIT_KEY, authdata->key_enc_flags,\n-\t\t\t authdata->key, authdata->keylen,\n-\t\t\t INLINE_KEY(authdata));\n-\t\telse\n-\t\t\t__gen_auth_key(p, authdata);\n-\t}\n+\tif (authdata->keylen)\n+\t\t__gen_auth_key(p, authdata);\n+\n \tif (cipherdata->keylen)\n \t\tKEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key,\n \t\t cipherdata->keylen, INLINE_KEY(cipherdata));\n@@ -841,14 +836,9 @@ cnstr_shdsc_ipsec_decap(uint32_t *descbuf, bool ps, bool swap,\n \t__rta_copy_ipsec_decap_pdb(p, pdb, cipherdata->algtype);\n \tSET_LABEL(p, hdr);\n \tpkeyjmp = JUMP(p, keyjmp, LOCAL_JUMP, ALL_TRUE, BOTH|SHRD);\n-\tif (authdata->keylen) {\n-\t\tif (rta_sec_era < RTA_SEC_ERA_6)\n-\t\t\tKEY(p, MDHA_SPLIT_KEY, authdata->key_enc_flags,\n-\t\t\t authdata->key, authdata->keylen,\n-\t\t\t INLINE_KEY(authdata));\n-\t\telse\n-\t\t\t__gen_auth_key(p, authdata);\n-\t}\n+\tif (authdata->keylen)\n+\t\t__gen_auth_key(p, authdata);\n+\n \tif (cipherdata->keylen)\n \t\tKEY(p, KEY1, cipherdata->key_enc_flags, cipherdata->key,\n \t\t cipherdata->keylen, INLINE_KEY(cipherdata));\n@@ -1248,12 +1238,6 @@ cnstr_shdsc_ipsec_new_encap(uint32_t *descbuf, bool ps,\n \tLABEL(l2copy);\n \tREFERENCE(pl2copy);\n \n-\tif (rta_sec_era < RTA_SEC_ERA_8) {\n-\t\tpr_err(\"IPsec new mode encap: available only for Era %d or above\\n\",\n-\t\t USER_SEC_ERA(RTA_SEC_ERA_8));\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \tPROGRAM_CNTXT_INIT(p, descbuf, 0);\n \tif (swap)\n \t\tPROGRAM_SET_BSWAP(p);\n@@ -1363,12 +1347,6 @@ cnstr_shdsc_ipsec_new_decap(uint32_t *descbuf, bool ps,\n \tLABEL(hdr);\n \tREFERENCE(phdr);\n \n-\tif (rta_sec_era < RTA_SEC_ERA_8) {\n-\t\tpr_err(\"IPsec new mode decap: available only for Era %d or above\\n\",\n-\t\t USER_SEC_ERA(RTA_SEC_ERA_8));\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \tPROGRAM_CNTXT_INIT(p, descbuf, 0);\n \tif (swap)\n \t\tPROGRAM_SET_BSWAP(p);\ndiff --git a/drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h b/drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h\nindex 287e09cd75..51d54deb16 100644\n--- a/drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/fifo_load_store_cmd.h\n@@ -68,11 +68,6 @@ rta_fifo_load(struct program *program, uint32_t src,\n \t\t\tpr_err(\"SEQ FIFO LOAD: Invalid command\\n\");\n \t\t\tgoto err;\n \t\t}\n-\t\tif ((rta_sec_era <= RTA_SEC_ERA_5) && (flags & AIDF)) {\n-\t\t\tpr_err(\"SEQ FIFO LOAD: Flag(s) not supported by SEC Era %d\\n\",\n-\t\t\t USER_SEC_ERA(rta_sec_era));\n-\t\t\tgoto err;\n-\t\t}\n \t\tif ((flags & VLF) && ((flags & EXT) || (length >> 16))) {\n \t\t\tpr_err(\"SEQ FIFO LOAD: Invalid usage of VLF\\n\");\n \t\t\tgoto err;\n@@ -244,11 +239,6 @@ rta_fifo_store(struct program *program, uint32_t src,\n \t\t\tgoto err;\n \t\t}\n \t}\n-\tif ((rta_sec_era == RTA_SEC_ERA_7) && (src == AFHA_SBOX)) {\n-\t\tpr_err(\"FIFO STORE: AFHA S-box not supported by SEC Era %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era));\n-\t\tgoto err;\n-\t}\n \n \t/* write output data type field */\n \tret = __rta_map_opcode(src, fifo_store_table,\n@@ -263,11 +253,6 @@ rta_fifo_store(struct program *program, uint32_t src,\n \tif (encrypt_flags & TK)\n \t\topcode |= (0x1 << FIFOST_TYPE_SHIFT);\n \tif (encrypt_flags & EKT) {\n-\t\tif (rta_sec_era == RTA_SEC_ERA_1) {\n-\t\t\tpr_err(\"FIFO STORE: AES-CCM source types not supported\\n\");\n-\t\t\tret = -EINVAL;\n-\t\t\tgoto err;\n-\t\t}\n \t\topcode |= (0x10 << FIFOST_TYPE_SHIFT);\n \t\topcode &= (uint32_t)~(0x20 << FIFOST_TYPE_SHIFT);\n \t}\ndiff --git a/drivers/common/dpaax/caamflib/rta/header_cmd.h b/drivers/common/dpaax/caamflib/rta/header_cmd.h\nindex 45aefa04c1..779f84ebcb 100644\n--- a/drivers/common/dpaax/caamflib/rta/header_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/header_cmd.h\n@@ -155,12 +155,6 @@ rta_job_header(struct program *program,\n \t\tgoto err;\n \t}\n \n-\tif ((rta_sec_era < RTA_SEC_ERA_7) && (flags & MTD) && !(flags & TD)) {\n-\t\tpr_err(\"JOB_DESC: Trying to MTD a descriptor that is not a TD. SEC Program Line: %d\\n\",\n-\t\t program->current_pc);\n-\t\tgoto err;\n-\t}\n-\n \tif ((flags & EXT) && !(flags & SHR) && (start_idx < 2)) {\n \t\tpr_err(\"JOB_DESC: Start index must be >= 2 in case of no SHR and EXT. SEC Program Line: %d\\n\",\n \t\t program->current_pc);\n@@ -183,15 +177,8 @@ rta_job_header(struct program *program,\n \t\t\thdr_ext |= ext_flags & DSEL_MASK;\n \t\t}\n \n-\t\tif (ext_flags & FTD) {\n-\t\t\tif (rta_sec_era <= RTA_SEC_ERA_5) {\n-\t\t\t\tpr_err(\"JOB_DESC: Fake trusted descriptor not supported by SEC Era %d\\n\",\n-\t\t\t\t USER_SEC_ERA(rta_sec_era));\n-\t\t\t\tgoto err;\n-\t\t\t}\n-\n+\t\tif (ext_flags & FTD)\n \t\t\thdr_ext |= HDR_EXT_FTD;\n-\t\t}\n \t}\n \tif (flags & RSMS)\n \t\topcode |= HDR_RSLS;\ndiff --git a/drivers/common/dpaax/caamflib/rta/jump_cmd.h b/drivers/common/dpaax/caamflib/rta/jump_cmd.h\nindex 18f781e373..0ce5a3e7c6 100644\n--- a/drivers/common/dpaax/caamflib/rta/jump_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/jump_cmd.h\n@@ -7,8 +7,6 @@\n #ifndef __RTA_JUMP_CMD_H__\n #define __RTA_JUMP_CMD_H__\n \n-extern enum rta_sec_era rta_sec_era;\n-\n static const uint32_t jump_test_cond[][2] = {\n \t{ NIFP, JUMP_COND_NIFP },\n \t{ NIP, JUMP_COND_NIP },\n@@ -59,20 +57,6 @@ rta_jump(struct program *program, uint64_t address,\n \tunsigned int start_pc = program->current_pc;\n \tint ret = -EINVAL;\n \n-\tif (((jump_type == GOSUB) || (jump_type == RETURN)) &&\n-\t (rta_sec_era < RTA_SEC_ERA_4)) {\n-\t\tpr_err(\"JUMP: Jump type not supported by SEC Era %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era));\n-\t\tgoto err;\n-\t}\n-\n-\tif (((jump_type == LOCAL_JUMP_INC) || (jump_type == LOCAL_JUMP_DEC)) &&\n-\t (rta_sec_era <= RTA_SEC_ERA_5)) {\n-\t\tpr_err(\"JUMP_INCDEC: Jump type not supported by SEC Era %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era));\n-\t\tgoto err;\n-\t}\n-\n \tswitch (jump_type) {\n \tcase (LOCAL_JUMP):\n \t\t/*\ndiff --git a/drivers/common/dpaax/caamflib/rta/key_cmd.h b/drivers/common/dpaax/caamflib/rta/key_cmd.h\nindex ec3fbcaf61..714918e18b 100644\n--- a/drivers/common/dpaax/caamflib/rta/key_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/key_cmd.h\n@@ -54,12 +54,6 @@ rta_key(struct program *program, uint32_t key_dst,\n \t\t\t program->current_instruction);\n \t\t\tgoto err;\n \t\t}\n-\t\tif ((rta_sec_era <= RTA_SEC_ERA_5) &&\n-\t\t ((flags & VLF) || (flags & AIDF))) {\n-\t\t\tpr_err(\"SEQKEY: Flag(s) not supported by SEC Era %d\\n\",\n-\t\t\t USER_SEC_ERA(rta_sec_era));\n-\t\t\tgoto err;\n-\t\t}\n \t} else {\n \t\tif ((flags & AIDF) || (flags & VLF)) {\n \t\t\tpr_err(\"KEY: Invalid flag. SEC PC: %d; Instr: %d\\n\",\n@@ -84,12 +78,6 @@ rta_key(struct program *program, uint32_t key_dst,\n \t}\n \n \tif (key_dst == AFHA_SBOX) {\n-\t\tif (rta_sec_era == RTA_SEC_ERA_7) {\n-\t\t\tpr_err(\"KEY: AFHA S-box not supported by SEC Era %d\\n\",\n-\t\t\t USER_SEC_ERA(rta_sec_era));\n-\t\t\tgoto err;\n-\t\t}\n-\n \t\tif (flags & IMMED) {\n \t\t\tpr_err(\"KEY: Invalid flag. SEC PC: %d; Instr: %d\\n\",\n \t\t\t program->current_pc,\ndiff --git a/drivers/common/dpaax/caamflib/rta/math_cmd.h b/drivers/common/dpaax/caamflib/rta/math_cmd.h\nindex cca70f7e04..532c70c518 100644\n--- a/drivers/common/dpaax/caamflib/rta/math_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/math_cmd.h\n@@ -85,22 +85,7 @@ rta_math(struct program *program, uint64_t operand1,\n \tint ret = -EINVAL;\n \tunsigned int start_pc = program->current_pc;\n \n-\tif (((op == MATH_FUN_BSWAP) && (rta_sec_era < RTA_SEC_ERA_4)) ||\n-\t ((op == MATH_FUN_ZBYT) && (rta_sec_era < RTA_SEC_ERA_2))) {\n-\t\tpr_err(\"MATH: operation not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t program->current_instruction);\n-\t\tgoto err;\n-\t}\n-\n \tif (options & SWP) {\n-\t\tif (rta_sec_era < RTA_SEC_ERA_7) {\n-\t\t\tpr_err(\"MATH: operation not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t\t program->current_instruction);\n-\t\t\tgoto err;\n-\t\t}\n-\n \t\tif ((options & IFB) ||\n \t\t (!(options & IMMED) && !(options & IMMED2)) ||\n \t\t ((options & IMMED) && (options & IMMED2))) {\n@@ -258,26 +243,12 @@ rta_mathi(struct program *program, uint64_t operand,\n \tint ret = -EINVAL;\n \tunsigned int start_pc = program->current_pc;\n \n-\tif (rta_sec_era < RTA_SEC_ERA_6) {\n-\t\tpr_err(\"MATHI: Command not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t program->current_instruction);\n-\t\tgoto err;\n-\t}\n-\n \tif (((op == MATH_FUN_FBYT) && (options & SSEL))) {\n \t\tpr_err(\"MATHI: Illegal combination - FBYT and SSEL. SEC PC: %d; Instr: %d\\n\",\n \t\t program->current_pc, program->current_instruction);\n \t\tgoto err;\n \t}\n \n-\tif ((options & SWP) && (rta_sec_era < RTA_SEC_ERA_7)) {\n-\t\tpr_err(\"MATHI: SWP not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t program->current_instruction);\n-\t\tgoto err;\n-\t}\n-\n \t/* Write first operand field */\n \tif (!(options & SSEL))\n \t\tret = __rta_map_opcode((uint32_t)operand, math_op1,\ndiff --git a/drivers/common/dpaax/caamflib/rta/move_cmd.h b/drivers/common/dpaax/caamflib/rta/move_cmd.h\nindex d2151c6dd7..ac1280c23a 100644\n--- a/drivers/common/dpaax/caamflib/rta/move_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/move_cmd.h\n@@ -95,26 +95,12 @@ rta_move(struct program *program, int cmd_type, uint64_t src,\n \tbool is_move_len_cmd = false;\n \tunsigned int start_pc = program->current_pc;\n \n-\tif ((rta_sec_era < RTA_SEC_ERA_7) && (cmd_type != __MOVE)) {\n-\t\tpr_err(\"MOVE: MOVEB / MOVEDW not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t program->current_instruction);\n-\t\tgoto err;\n-\t}\n-\n \t/* write command type */\n \tif (cmd_type == __MOVEB) {\n \t\topcode = CMD_MOVEB;\n \t} else if (cmd_type == __MOVEDW) {\n \t\topcode = CMD_MOVEDW;\n \t} else if (!(flags & IMMED)) {\n-\t\tif (rta_sec_era < RTA_SEC_ERA_3) {\n-\t\t\tpr_err(\"MOVE: MOVE_LEN not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t\t USER_SEC_ERA(rta_sec_era), program->current_pc,\n-\t\t\t program->current_instruction);\n-\t\t\tgoto err;\n-\t\t}\n-\n \t\tif ((length != MATH0) && (length != MATH1) &&\n \t\t (length != MATH2) && (length != MATH3)) {\n \t\t\tpr_err(\"MOVE: MOVE_LEN length must be MATH[0-3]. SEC PC: %d; Instr: %d\\n\",\n@@ -153,24 +139,15 @@ rta_move(struct program *program, int cmd_type, uint64_t src,\n \t\telse\n \t\t\toffset = dst_offset;\n \n-\t\tif (rta_sec_era < RTA_SEC_ERA_6) {\n-\t\t\tif (offset)\n-\t\t\t\tpr_debug(\"MOVE: Offset not supported by SEC Era %d. SEC PC: %d; Instr: %d\\n\",\n-\t\t\t\t\t USER_SEC_ERA(rta_sec_era),\n-\t\t\t\t\t program->current_pc,\n-\t\t\t\t\t program->current_instruction);\n-\t\t\t/* nothing to do for offset = 0 */\n-\t\t} else {\n-\t\t\tret = math_offset(offset);\n-\t\t\tif (ret < 0) {\n-\t\t\t\tpr_err(\"MOVE: Invalid offset in MATH register. SEC PC: %d; Instr: %d\\n\",\n-\t\t\t\t program->current_pc,\n-\t\t\t\t program->current_instruction);\n-\t\t\t\tgoto err;\n-\t\t\t}\n-\n-\t\t\topcode |= (uint32_t)ret;\n+\t\tret = math_offset(offset);\n+\t\tif (ret < 0) {\n+\t\t\tpr_err(\"MOVE: Invalid offset in MATH register. SEC PC: %d; Instr: %d\\n\",\n+\t\t\t program->current_pc,\n+\t\t\t program->current_instruction);\n+\t\t\tgoto err;\n \t\t}\n+\n+\t\topcode |= (uint32_t)ret;\n \t}\n \n \t/* write source field */\ndiff --git a/drivers/common/dpaax/caamflib/rta/nfifo_cmd.h b/drivers/common/dpaax/caamflib/rta/nfifo_cmd.h\nindex 85092d9612..8131acd9e4 100644\n--- a/drivers/common/dpaax/caamflib/rta/nfifo_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/nfifo_cmd.h\n@@ -102,12 +102,6 @@ rta_nfifo_load(struct program *program, uint32_t src,\n \t\t\t LDST_SRCDST_WORD_INFO_FIFO;\n \tunsigned int start_pc = program->current_pc;\n \n-\tif ((data == AFHA_SBOX) && (rta_sec_era == RTA_SEC_ERA_7)) {\n-\t\tpr_err(\"NFIFO: AFHA S-box not supported by SEC Era %d\\n\",\n-\t\t USER_SEC_ERA(rta_sec_era));\n-\t\tgoto err;\n-\t}\n-\n \t/* write source field */\n \tret = __rta_map_opcode(src, nfifo_src, nfifo_src_sz[rta_sec_era], &val);\n \tif (ret < 0) {\ndiff --git a/drivers/common/dpaax/caamflib/rta/operation_cmd.h b/drivers/common/dpaax/caamflib/rta/operation_cmd.h\nindex 3d339cb0a0..fe1ac37ee8 100644\n--- a/drivers/common/dpaax/caamflib/rta/operation_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/operation_cmd.h\n@@ -19,8 +19,6 @@ __rta_alg_aai_aes(uint16_t aai)\n \tuint16_t aes_mode = aai & OP_ALG_AESA_MODE_MASK;\n \n \tif (aai & OP_ALG_AAI_C2K) {\n-\t\tif (rta_sec_era < RTA_SEC_ERA_5)\n-\t\t\treturn -1;\n \t\tif ((aes_mode != OP_ALG_AAI_CCM) &&\n \t\t (aes_mode != OP_ALG_AAI_GCM))\n \t\t\treturn -EINVAL;\n@@ -30,9 +28,6 @@ __rta_alg_aai_aes(uint16_t aai)\n \tcase OP_ALG_AAI_CBC_CMAC:\n \tcase OP_ALG_AAI_CTR_CMAC_LTE:\n \tcase OP_ALG_AAI_CTR_CMAC:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_2)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_ALG_AAI_CTR:\n \tcase OP_ALG_AAI_CBC:\n \tcase OP_ALG_AAI_ECB:\n@@ -72,9 +67,6 @@ __rta_alg_aai_md5(uint16_t aai)\n {\n \tswitch (aai) {\n \tcase OP_ALG_AAI_HMAC:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_2)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_ALG_AAI_SMAC:\n \tcase OP_ALG_AAI_HASH:\n \tcase OP_ALG_AAI_HMAC_PRECOMP:\n@@ -89,9 +81,6 @@ __rta_alg_aai_sha(uint16_t aai)\n {\n \tswitch (aai) {\n \tcase OP_ALG_AAI_HMAC:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_2)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_ALG_AAI_HASH:\n \tcase OP_ALG_AAI_HMAC_PRECOMP:\n \t\treturn 0;\n@@ -115,15 +104,6 @@ __rta_alg_aai_rng(uint16_t aai)\n \t\treturn -EINVAL;\n \t}\n \n-\t/* State Handle bits are valid only for SEC Era >= 5 */\n-\tif ((rta_sec_era < RTA_SEC_ERA_5) && rng_sh)\n-\t\treturn -EINVAL;\n-\n-\t/* PS, AI, SK bits are also valid only for SEC Era >= 5 */\n-\tif ((rta_sec_era < RTA_SEC_ERA_5) && (aai &\n-\t (OP_ALG_AAI_RNG4_PS | OP_ALG_AAI_RNG4_AI | OP_ALG_AAI_RNG4_SK)))\n-\t\treturn -EINVAL;\n-\n \tswitch (rng_sh) {\n \tcase OP_ALG_AAI_RNG4_SH_0:\n \tcase OP_ALG_AAI_RNG4_SH_1:\ndiff --git a/drivers/common/dpaax/caamflib/rta/protocol_cmd.h b/drivers/common/dpaax/caamflib/rta/protocol_cmd.h\nindex e9f20703f2..ac5c8af716 100644\n--- a/drivers/common/dpaax/caamflib/rta/protocol_cmd.h\n+++ b/drivers/common/dpaax/caamflib/rta/protocol_cmd.h\n@@ -32,9 +32,6 @@ __rta_ssl_proto(uint16_t protoinfo)\n \tcase OP_PCL_TLS_ECDHE_RSA_WITH_RC4_128_SHA:\n \tcase OP_PCL_TLS_ECDH_anon_WITH_RC4_128_SHA:\n \tcase OP_PCL_TLS_ECDHE_PSK_WITH_RC4_128_SHA:\n-\t\tif (rta_sec_era == RTA_SEC_ERA_7)\n-\t\t\treturn -EINVAL;\n-\t\t/* fall through if not Era 7 */\n \tcase OP_PCL_TLS_RSA_EXPORT_WITH_DES40_CBC_SHA:\n \tcase OP_PCL_TLS_RSA_WITH_DES_CBC_SHA:\n \tcase OP_PCL_TLS_RSA_WITH_3DES_EDE_CBC_SHA:\n@@ -215,9 +212,6 @@ __rta_ipsec_proto(uint16_t protoinfo)\n \n \tswitch (proto_cls1) {\n \tcase OP_PCL_IPSEC_AES_NULL_WITH_GMAC:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_2)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_PCL_IPSEC_AES_CCM8:\n \tcase OP_PCL_IPSEC_AES_CCM12:\n \tcase OP_PCL_IPSEC_AES_CCM16:\n@@ -229,9 +223,6 @@ __rta_ipsec_proto(uint16_t protoinfo)\n \t\t\treturn 0;\n \t\treturn -EINVAL;\n \tcase OP_PCL_IPSEC_NULL:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_2)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_PCL_IPSEC_DES_IV64:\n \tcase OP_PCL_IPSEC_DES:\n \tcase OP_PCL_IPSEC_3DES:\n@@ -351,9 +342,6 @@ __rta_blob_proto(uint16_t protoinfo)\n \n \tswitch (protoinfo & OP_PCL_BLOB_REG_MASK) {\n \tcase OP_PCL_BLOB_AFHA_SBOX:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_3)\n-\t\t\treturn -EINVAL;\n-\t\t/* no break */\n \tcase OP_PCL_BLOB_REG_MEMORY:\n \tcase OP_PCL_BLOB_REG_KEY1:\n \tcase OP_PCL_BLOB_REG_KEY2:\n@@ -368,12 +356,6 @@ __rta_blob_proto(uint16_t protoinfo)\n static inline int\n __rta_dlc_proto(uint16_t protoinfo)\n {\n-\tif ((rta_sec_era < RTA_SEC_ERA_2) &&\n-\t (protoinfo & (OP_PCL_PKPROT_DSA_MSG | OP_PCL_PKPROT_HASH_MASK |\n-\t OP_PCL_PKPROT_EKT_Z | OP_PCL_PKPROT_DECRYPT_Z |\n-\t OP_PCL_PKPROT_DECRYPT_PRI)))\n-\t\treturn -EINVAL;\n-\n \tswitch (protoinfo & OP_PCL_PKPROT_HASH_MASK) {\n \tcase OP_PCL_PKPROT_HASH_MD5:\n \tcase OP_PCL_PKPROT_HASH_SHA1:\n@@ -482,9 +464,6 @@ __rta_dkp_proto(uint16_t protoinfo)\n static inline int\n __rta_3g_dcrc_proto(uint16_t protoinfo)\n {\n-\tif (rta_sec_era == RTA_SEC_ERA_7)\n-\t\treturn -EINVAL;\n-\n \tswitch (protoinfo) {\n \tcase OP_PCL_3G_DCRC_CRC7:\n \tcase OP_PCL_3G_DCRC_CRC11:\n@@ -497,9 +476,6 @@ __rta_3g_dcrc_proto(uint16_t protoinfo)\n static inline int\n __rta_3g_rlc_proto(uint16_t protoinfo)\n {\n-\tif (rta_sec_era == RTA_SEC_ERA_7)\n-\t\treturn -EINVAL;\n-\n \tswitch (protoinfo) {\n \tcase OP_PCL_3G_RLC_NULL:\n \tcase OP_PCL_3G_RLC_KASUMI:\n@@ -513,13 +489,8 @@ __rta_3g_rlc_proto(uint16_t protoinfo)\n static inline int\n __rta_lte_pdcp_proto(uint16_t protoinfo)\n {\n-\tif (rta_sec_era == RTA_SEC_ERA_7)\n-\t\treturn -EINVAL;\n-\n \tswitch (protoinfo) {\n \tcase OP_PCL_LTE_ZUC:\n-\t\tif (rta_sec_era < RTA_SEC_ERA_5)\n-\t\t\tbreak;\n \tcase OP_PCL_LTE_NULL:\n \tcase OP_PCL_LTE_SNOW:\n \tcase OP_PCL_LTE_AES:\n", "prefixes": [ "07/14" ] }