From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0B37A034F for ; Wed, 10 Nov 2021 07:34:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB07640142; Wed, 10 Nov 2021 07:34:29 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2075.outbound.protection.outlook.com [40.107.212.75]) by mails.dpdk.org (Postfix) with ESMTP id 5C28740142 for ; Wed, 10 Nov 2021 07:34:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A/SWZxZvWlDnlLe2w58Mjbusq8Add/H6E5OmKErZM4N7E5X32uHmrOrD/Xh6LXJ24QVLDDO+k6e9FSaY9zKCiK/jmrgsvHFufe+Krkv03fisnYanminVNrjFNA+2Pm2VW6rQA6RuB5zv1nr08r8k5wqPjJ3cZ6YzUVG7B6i1MP99oHYnV950iZAwt9V/DlTPm8D2mgE7hmLbaPL7NQFg4Mxpmar+JrFxZqA1G4fuNxULoW3WV5fQDkwJ1WZc1EGv3/338shKKhVjhanDes7qGQVr9gHXJbmhDclFPc+0q2b9gt5bTEWjP+m5XhizaZu4nTJpR8kUpif0HWT+gvKz/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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; bh=v/V6/cqQ0MCTTAb56hxLdmmlTeSgG/q2BEhT/CIuBQE=; b=WMeawLNGp037hU8S132XsViDtXhsHkkmUYDJCXaFDjhHOwd1NVAHrnSogmGwWmc4EQv8XXVL1eyxGN7QFVPbObvOeXDw5DrAJxQGNw5/APYwaPZsTYSCzBYW37IhPFj1Zwza7HugY3IMJBCz6NJVD2FGXKKOFqpGjuJlZl+A2aZmagPu04JE7//7VltUrP5xxTffzsqjoyCaBt2yilZzGRassc+63dZ2fiQ3zx0/t3T51bKeQsCfCPVWrdSP6DIkF32OlTqJoXl2U4HaqEC0X+7VKQkiVsldzRWC2V70umG+bQB+gWVyYrgVakrPmkGUyxy8ipapIArPDG7o0HMBqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v/V6/cqQ0MCTTAb56hxLdmmlTeSgG/q2BEhT/CIuBQE=; b=QDMax11MNhWfVHfyww1GLicQbzQiADBTaZssLhASdnnE7vhhRspRCW5aRA421usg9OdRhSIIMCd1x1NHP8b1MqFaS/l7DMhCBy6g+wMsyabcwJObQOcGCsTltf8titlO27kobCyZApC1FLs+aA2BaXrJ0lI1qTRzLesFZBR22ooeo/ECiVUop+fQuk5SDdbU61JKwjeSzKTbUZFTVWXj4wlJaOgdBJwy5yOGGv7AiHUKdP9QeM1qIdHaT/sAkigacFwURWI8dYpBNqGrYMQ2OHUJchx91sLCZQG0JXASFLbwR9MX5EgltQjd1gek745kIgyAGOMiMju74igdQW3+SQ== Received: from DM6PR02CA0147.namprd02.prod.outlook.com (2603:10b6:5:332::14) by MW2PR12MB4668.namprd12.prod.outlook.com (2603:10b6:302:e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:34:25 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::dc) by DM6PR02CA0147.outlook.office365.com (2603:10b6:5:332::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:34:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:34:25 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:34:22 +0000 From: Xueming Li To: Gagandeep Singh CC: Luca Boccassi , Akhil Goyal , dpdk stable Date: Wed, 10 Nov 2021 14:28:23 +0800 Message-ID: <20211110063216.2744012-20-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a35cb295-67b4-4e11-26f6-08d9a41423a0 X-MS-TrafficTypeDiagnostic: MW2PR12MB4668: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uVaUqrRVjGo4OFRoVUZ8dFxlA4+xhuKIvvpyi2ARVKJQjjQ83wmjAoK56v2AZthmzoHwTdc+1WAuJe5AUuy5gYJgEHPE555a9eFo8athdLrsXAmKinwv3ZEFxZH0yq4zotiQX4xQ2PYzujUH2dxNsTuvwnFRj9Ma5fKtyzLBtDa4hXIO3SQE+uzc1S93jWHodu/RCAQinzuqHCihKiBgQS5Q2W3kVE5D/pyO3RMt/1pG4Ftgf5OhjBNJDp0DWbOOu46ppN7mZ8U0JDKt+tJx/n15YWK+VJDBkETT/hQFGgBMAeS6uo4oCPKbg6RqdajRQixgzhJg76/QtObAnoziKKDvTpmTU4Z3FFOZGNce0uDbXl6VDYJRoggAoJuDbn89LJyUmFu1fKNRw/o7OoOwGas8t0fkoCTzaD0cU+YiJuAc6uoWBcc7elGtAXlrxcyMaC3Zxnj57RMX02CBRLMU1TAKmt6xvsB6L79JqCM9w+mJPaswNpBjvgsptWA5U7HOIK+MKcPuuSwSYYfChxTpek1WMoNtq8TwiNx4t3wooygT6byVB23Lw4M1ZOt7z8WEdntEKI05Xe+vBzDd+Wut6l4h+L50NK+FFV/fTCjU5Sp/f7E80VZq8K+itAl2pJg5RYp7uAvY/fR7FI3o8posmxOs5GpRrRSDMex5vq9mFH+FwSaw8LCAdZpuaSDuAvd2kbDbuEhVwimQqVKSyyyXVU/xyE67sDXZcIG1vXmbaTu5k2zhyj4WIQMQeJa0uEco1Fh6iqDDeS9FDpDmpTQRIEU4AeDgj8jLYjlieSQcVH4ETk84Dk8SK2i1qTI3zHBZjSsFPUl+9tsOasbW3wsPgkJySN+9zAs2TFJJbSMDJcg= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(86362001)(36756003)(8676002)(6286002)(36906005)(54906003)(316002)(55016002)(4326008)(7636003)(336012)(70206006)(4001150100001)(2906002)(70586007)(1076003)(6916009)(2616005)(36860700001)(508600001)(5660300002)(26005)(82310400003)(186003)(53546011)(47076005)(7696005)(356005)(426003)(83380400001)(966005)(16526019)(8936002)(32563001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:34:25.2216 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a35cb295-67b4-4e11-26f6-08d9a41423a0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB4668 Subject: [dpdk-stable] patch 'common/dpaax/caamflib: fix IV for short MAC-I in SNOW3G' has been queued to stable release 20.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/1f83882dacc679ecc49453e8332f3b499f4a630f Thanks. Xueming Li --- >From 1f83882dacc679ecc49453e8332f3b499f4a630f Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 8 Sep 2021 12:29:51 +0530 Subject: [PATCH] common/dpaax/caamflib: fix IV for short MAC-I in SNOW3G Cc: Xueming Li [ upstream commit c0182d6b752e3fe320f8f8e3db6256cd21234d9a ] The logic was incorrectly doing conditional swap. It need to be bit swap always. Fixes: 73a24060cd70 ("crypto/dpaa2_sec: add sample PDCP descriptor APIs") Signed-off-by: Gagandeep Singh Acked-by: Akhil Goyal --- drivers/common/dpaax/caamflib/desc/pdcp.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index f084cf1de0..51d40b5dd9 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #ifndef __DESC_PDCP_H__ @@ -3710,9 +3710,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, break; case PDCP_AUTH_TYPE_SNOW: + /* IV calculation based on 3GPP specs. 36331, section:5.3.7.4 */ iv[0] = 0xFFFFFFFF; - iv[1] = swap ? swab32(0x04000000) : 0x04000000; - iv[2] = swap ? swab32(0xF8000000) : 0xF8000000; + iv[1] = swab32(0x04000000); + iv[2] = swab32(0xF8000000); KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, INLINE_KEY(authdata)); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:02.970575592 +0800 +++ 0019-common-dpaax-caamflib-fix-IV-for-short-MAC-I-in-SNOW.patch 2021-11-10 14:17:01.757413685 +0800 @@ -1 +1 @@ -From c0182d6b752e3fe320f8f8e3db6256cd21234d9a Mon Sep 17 00:00:00 2001 +From 1f83882dacc679ecc49453e8332f3b499f4a630f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c0182d6b752e3fe320f8f8e3db6256cd21234d9a ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 5b3d846099..8e8daf5ba8 100644 +index f084cf1de0..51d40b5dd9 100644 @@ -30 +32 @@ -@@ -3715,9 +3715,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, +@@ -3710,9 +3710,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf,