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 9128A4625C for ; Tue, 18 Feb 2025 13:42:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86D22402A0; Tue, 18 Feb 2025 13:42:39 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2068.outbound.protection.outlook.com [40.107.93.68]) by mails.dpdk.org (Postfix) with ESMTP id 55397402A0 for ; Tue, 18 Feb 2025 13:42:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nmv7fO56D7yqLSQaHhxJSYaSblfbYgay1cL7buMxdwH9/E7FREEVyIvOl7ShfrqvQqYUkeXDq3hCv3p4ZzhnebQAVbxD/VsnIFkT/b6cFUCUc5woQBEBQdkFOvq5bDIK9uTZRa9dHdfWnSyLJZ8yQh+mVHBuHo1aiZS8da1GkEAygxDDBOAIuggW9QnRRwjvUR+cogmKK+CHYLfuhaPy79SBLJ/mprSGquTUlSTowpzCd4Rpv5anzpFKQTEwKU1xrd1APLSZ9h4yV+P0uihk8xU4VkrTreQcW2cu8u4GYTEQHk5PwH1IkWU+Dstgd+ySleeo9hFTmT6TloZgUvz3Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=tiWOwpXBxUAGkTjvcTKOPCFRb+OEDZW8qACCBdC+cK0=; b=EqGMTbFaNqXKGXb9rNP88PSNJpbu+TsYCvhXQQ7/5iXy5gNAi5bX615eUksrBthJdHeSQubGQb6QCU5uC01GP5n6sdCgytszieOX0u/Gb40ys4FUbALk4OQEYg/G5JdAY8flvPUfstQlS/i3cKgN2KGeHuidyZHmU5o6PBFNoRooP9H6C/n3VvsNmlDK6u0NC3bmBr9cLlRmbS6X5LvgKHO/cykLYGC+LsAuYENYUfuK3JNUwIC+e0Pm0zDWN2A6Xrna52WGXHilr8m9fev/gvP0WTFTs3feLx7tY3XZ2hlEUbt0uLb9kgnJrUj5er6v0LqAeZuhMcmlQKVzAETRwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=tiWOwpXBxUAGkTjvcTKOPCFRb+OEDZW8qACCBdC+cK0=; b=CG3LWBQwQOLvaE6PbcKIydkJ4u+kULrpeLgNMn2qFMI4EKYj5qkykc4LDI8e5dHkI5hyfnmnEq4L7FWsmBl8MiI+6ZQuo6DLG3Ig34RxaA5/GyJ0v8yCtRm8kzEfTBG78dmAhu27jOImcgFuCqVfsbR5xobuB+BMFp2wJ0/Dyon+hEDrnOhXHtBUDxUsChMZEJzEAAfLWhcHhpEy8Dc0ak2wI4LrkluCOUPxa5VkAhDX6P13tC2wMs67pdgJMcv617eENsOWQsSfZ0D+UQeYEkUx4b33Ld0zOwXCvWfssE9W/D0MU5ZH/3EB5nGx5HMdQkIj2PYuz0qo6ohLIr9JzA== Received: from PH8PR05CA0004.namprd05.prod.outlook.com (2603:10b6:510:2cc::23) by SJ2PR12MB8980.namprd12.prod.outlook.com (2603:10b6:a03:542::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:42:33 +0000 Received: from SA2PEPF000015C7.namprd03.prod.outlook.com (2603:10b6:510:2cc:cafe::1b) by PH8PR05CA0004.outlook.office365.com (2603:10b6:510:2cc::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.12 via Frontend Transport; Tue, 18 Feb 2025 12:42:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015C7.mail.protection.outlook.com (10.167.241.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:42:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:42:21 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:42:19 -0800 From: Xueming Li To: Przemyslaw Ciesielski CC: , Anatoly Burakov , "Bruce Richardson" , dpdk stable Subject: patch 'net/e1000/base: fix NVM data type in bit shift' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:35:00 +0800 Message-ID: <20250218123523.36836-66-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015C7:EE_|SJ2PR12MB8980:EE_ X-MS-Office365-Filtering-Correlation-Id: 682b22a9-96b6-472b-54d6-08dd5019b6de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?R7Knki7OzBGLXh8KOIukec11xiL2mKndBc0ZZPJkT+0LMDXxaAhqaWIQiBdQ?= =?us-ascii?Q?A9dZjq0G6SufVmfaPqVV1EM7jT3uzBfYDruayMUZV97mDpiNmT7lipb/PxfA?= =?us-ascii?Q?67DDd0AqfZPJ/TdZVQzwTUBWwrKDoTr+VX5/rnDzjVth8BaVyiN4MFNJaYhM?= =?us-ascii?Q?r6adtrjDm8LTWWBgPLEzAkgWiOS3+OhkkxhW87ebpdIpoCPr3ciZYvQm4dr2?= =?us-ascii?Q?J0SC7GXMlnmDL5MA5Ompv1J3JeutWv+dNpseAuk/uuVtcvAs2R9pNlelZWvJ?= =?us-ascii?Q?bbJLETzbSH85GQwzAIB6HlN5GzCrebblo3rSMEYGSKaPTigJ90hofkxmeOre?= =?us-ascii?Q?ijDmV29xvFpYcO6zrXbpqI+XdgH5JulVv0eU2ZjfKn7HnrhaWTDGTYoK+DXs?= =?us-ascii?Q?1yKob+O0WYuYPmuCCE2cTslUNvP6GbKyIEoKC4bTcbMmHvv4WC06CmLJlqWD?= =?us-ascii?Q?CP/y7KIhugpRlgx2xaYLHHaRuXVfzTBvOPyumx1gxLCPoC0obcSk1xK5o++Z?= =?us-ascii?Q?GRjGNiGYeimGaWIOIAF4zpwpY+1lWaB0dQGrlawfDBnqoUAroSXvr43kq93R?= =?us-ascii?Q?GGoqAF2UUHxy7UPfPhP1agZdxwTBhXP1ziddc/O++pRB4dQJRBrTgQZKwriR?= =?us-ascii?Q?NGmErO3U8FWCbNIjfxA7kzQW2RuBp40RcdH0DJV1tFwwEMql1Fucr8FonIvq?= =?us-ascii?Q?jDNk2mTUs5fM/kjBmfx8IxRjMhO61DHjp8niXwBn+rHBtjp2imBmCISorE0n?= =?us-ascii?Q?aTpoi8FI0x2ncec2oob2hcAAV0zq+g5wnvpC5J5OJUeNbUFsP52UwmBmQO1Z?= =?us-ascii?Q?E/L3KjNodk1rYqHE+FO65+Kk4bXIE9MrwWRV56VUO3qLRH08mY8CNe+vwnFi?= =?us-ascii?Q?W5btJMqwFZlOFgGfC7u22X7r9UOqNohyyUVXIwdaMeJ+GiI2Hqw+8B+wlyrG?= =?us-ascii?Q?0jSjWeP81nKT98vu+Q/cyw1iN4dwrRNnrgLCJyTpJG7VTh0ZX1MAddbQ1ikY?= =?us-ascii?Q?AQGTqNUh7HNmsWZ6L0SJaDpyPHrVimsR2TBCuhDnHz8boxEsYQ1x4Fi9naYK?= =?us-ascii?Q?S6TU2OX1KFbtHGYPfK8D8QzqQxeesYjmhn/xG8/3k1oLt0S4kYOpUc+RCSHr?= =?us-ascii?Q?kyaichY1By1xsGLrYIHUlr6eFiOCyWvxQbDimsSKaRJAPrrtZZOzXoWCMPLW?= =?us-ascii?Q?6sJmuZQMZpE20Cf8WzPCebXGzeGam1X4b/XoP2ADNcQ37dLlblNMHAsCBWEx?= =?us-ascii?Q?fdVfMV1bVve6Qs/SJlYFyT+Obs2lAQouysGTCi0MQttnraBVeYOJpFCoutK4?= =?us-ascii?Q?l+4AEN5wI6wa6HQ/DL8DiuifDKyI1+ux8AUmYlAyUCxRffHw4X/3v+kcMfaq?= =?us-ascii?Q?lNm/8B6pAqI8qee9I7UcfQ3/ItEqOrSUlkRrsP2h0MOcdYNvakZFnZvIYtD4?= =?us-ascii?Q?MAK3KWs9d/ncre8N2e4jAKxnJuJPVDuifNZtszzay7hbR6PJQ3/BSfeG4CFP?= =?us-ascii?Q?ef0TIv27/LXlfUw=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:42:32.7500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 682b22a9-96b6-472b-54d6-08dd5019b6de X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015C7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8980 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 Hi, FYI, your patch has been queued to stable release 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=7b701f1df0774ec43b248b48c2f1d4cf99c596ff Thanks. Xueming Li --- >From 7b701f1df0774ec43b248b48c2f1d4cf99c596ff Mon Sep 17 00:00:00 2001 From: Przemyslaw Ciesielski Date: Thu, 6 Feb 2025 16:08:44 +0000 Subject: [PATCH] net/e1000/base: fix NVM data type in bit shift Cc: Xueming Li [ upstream commit b932270c66d0179824118afbfd7cfb347ddf07d2 ] There is a static analysis warning due to wrong data types being used for NVM read data shifts. Fix it via explicit type cast. Fixes: 38db3f7f50bd ("e1000: update base driver") Signed-off-by: Przemyslaw Ciesielski Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_nvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c index 430fecaf6d..d171bea649 100644 --- a/drivers/net/e1000/base/e1000_nvm.c +++ b/drivers/net/e1000/base/e1000_nvm.c @@ -935,14 +935,14 @@ s32 e1000_read_pba_num_generic(struct e1000_hw *hw, u32 *pba_num) DEBUGOUT("NVM Not Supported\n"); return -E1000_NOT_IMPLEMENTED; } - *pba_num = (u32)(nvm_data << 16); + *pba_num = ((u32)nvm_data << 16); ret_val = hw->nvm.ops.read(hw, NVM_PBA_OFFSET_1, 1, &nvm_data); if (ret_val) { DEBUGOUT("NVM Read Error\n"); return ret_val; } - *pba_num |= nvm_data; + *pba_num |= (u32)nvm_data; return E1000_SUCCESS; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.998587839 +0800 +++ 0065-net-e1000-base-fix-NVM-data-type-in-bit-shift.patch 2025-02-18 19:39:00.678244039 +0800 @@ -1 +1 @@ -From b932270c66d0179824118afbfd7cfb347ddf07d2 Mon Sep 17 00:00:00 2001 +From 7b701f1df0774ec43b248b48c2f1d4cf99c596ff Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b932270c66d0179824118afbfd7cfb347ddf07d2 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +18 @@ - drivers/net/intel/e1000/base/e1000_nvm.c | 4 ++-- + drivers/net/e1000/base/e1000_nvm.c | 4 ++-- @@ -19 +21 @@ -diff --git a/drivers/net/intel/e1000/base/e1000_nvm.c b/drivers/net/intel/e1000/base/e1000_nvm.c +diff --git a/drivers/net/e1000/base/e1000_nvm.c b/drivers/net/e1000/base/e1000_nvm.c @@ -21,2 +23,2 @@ ---- a/drivers/net/intel/e1000/base/e1000_nvm.c -+++ b/drivers/net/intel/e1000/base/e1000_nvm.c +--- a/drivers/net/e1000/base/e1000_nvm.c ++++ b/drivers/net/e1000/base/e1000_nvm.c