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 8AD6045E41 for ; Sat, 7 Dec 2024 09:09:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84CE140281; Sat, 7 Dec 2024 09:09:02 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2088.outbound.protection.outlook.com [40.107.236.88]) by mails.dpdk.org (Postfix) with ESMTP id CB7A940281 for ; Sat, 7 Dec 2024 09:09:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vKdW3pcooSVuz2DOL8v5PuOs1NsUkA9K2UkwdtWnBna1PbpAZT8GQp+X8tuM0o4XLj8+5/Jypt+pYCLaCYEE+ozLNcvE1ZbQrMH34BIVfKxf2hZp4adNft/aZ3W9jJAt4l+4Zy1iCDb2YUPkN/pvSigEiOLa+z3Olue3Q4HbWO97ElaMN7bi6EsNhGCgYCwRFO4bElds4rlGh3iEaMlXECxFbkYeNfqwDXbhZzHbhnhjgwzUCJ55x3o7k3iq6YqmNOTeHkPfGE0vghwfkrn2v9ZUuWN9vyDSIK9z8FOzkzaJ4oOaN0unxYDHQXVjWSbE9XGipuQXi0XuHIwmQcJKEg== 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=W+P/etTSoCIeBdGhou95EZ+WmLySnYPv+Vdq2+OnNUM=; b=zBjFLC/ysZZ0G1OZg8M2eydMAyJG9mTubwSAfx75xnV/jM1Gn3CMIr1uiRvzPrQ/uRzI8SJhyQmm5mXw2AGBALpATKIPn41/ReFYAMc41LvA3ad04sZSLsCw+1HYE9D2dBGqd4rzPS3aXxhIZn40rcP8jTwo2Nmdklwghxf3+bVrAJtSXlYJACSSKmytDymz0CY+3NxhqnaYopNwlT9wja6Kd/SbaQq2ouo+vu6j4uXhflVmy0DCObCcKI66PXTPkPTaEGlCiaAfL+S8SRrgBYxAIMRrdB9CZkcepYwAJdk9OVBP5yDszhG62MUaJxKzyR1bqutVUnbxc1GYVgYQ5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=W+P/etTSoCIeBdGhou95EZ+WmLySnYPv+Vdq2+OnNUM=; b=rE43IciuQkRj89Nzg9weqHzx/c2Id+4/bMoK+ISsLf90AEBL1l+vaX5LgB3ltuhJWeJjqAISpb/ncSudmry+8Quo/jLfppi9lcjxpTWB11XNYK7042TH4SNk+/ZwKGI0bRNJ5r3yO9wC6XZazDFcKwvfboD+HIcafhFZG2623VghCSjInoWtPuvP7T0tjVrrxPw7vaK4LAPYXGY06rq6WwvBEjt4yq4Z5y9UasBM66E+s2VdHDWa88+fYiHSiWSZnGn6OfYUWjOd91cQ4sYLcZACGvI2rplrOYmhD2UqgadybnHMzuEE6S8gD1qXxXJ+4iUddZ12QP682ha0xbyRsw== Received: from BN9PR03CA0281.namprd03.prod.outlook.com (2603:10b6:408:f5::16) by DM4PR12MB6543.namprd12.prod.outlook.com (2603:10b6:8:8c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.17; Sat, 7 Dec 2024 08:08:56 +0000 Received: from BL02EPF00021F6C.namprd02.prod.outlook.com (2603:10b6:408:f5:cafe::56) by BN9PR03CA0281.outlook.office365.com (2603:10b6:408:f5::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8182.17 via Frontend Transport; Sat, 7 Dec 2024 08:08:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF00021F6C.mail.protection.outlook.com (10.167.249.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:08:56 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:08:47 -0800 Received: from nvidia.com (10.126.231.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.4; Sat, 7 Dec 2024 00:08:46 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , Bruce Richardson , dpdk stable Subject: patch 'net/e1000/base: fix fallthrough in switch' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:38 +0800 Message-ID: <20241207080055.488538-81-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: BL02EPF00021F6C:EE_|DM4PR12MB6543:EE_ X-MS-Office365-Filtering-Correlation-Id: e0ae82c5-117d-4f2e-ab39-08dd169665ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?nOX7WudxccPMr0HowWpIXcaH/Wd44r7NXw6UxA3wNb0gyi5+6d2MNBZExqlR?= =?us-ascii?Q?lun0CR8bNAmnxsAj2JBlify1JT+otlBzncpHYhVJkYfTV6QyUyvSz0BGdEfE?= =?us-ascii?Q?gQPCWrmWEWG3yhWBCSceTBBaNztel9+/ndEu46TSttlf+AJYxSM2MKnzz45X?= =?us-ascii?Q?f0MfndW1FS4Dc2UOjDXY8uLLn1IO9mf0Hg0wgEBCPI3C0dgEpQz+Cwtg/UNU?= =?us-ascii?Q?8PIPtrZp/CSIr54MGX2QfI0d6fJB5JXYZQAgYaZTqaP3rcq8DeU2jYZp5hfw?= =?us-ascii?Q?2vlPH11O+9ZUeyfpbFkQGpf3qJsErsWFrtPPYzUgWmjnvYm3pPW/OwY5BI26?= =?us-ascii?Q?OnJa6Jb8mSvQR7SyIYPbOtqqzIB6EGTEVdFiXbnIc+XTlwtop8Srdpv4NPeF?= =?us-ascii?Q?oLNLrv/6W12FmmR118S0JQtd3QhRgMUPfKGTiljKmOoYbchhbRRGlQCqPQCH?= =?us-ascii?Q?b6Rs1evznQcMZzNtvOUXzlPrwjlNFACVeK4os89q74rM8vzER3IUhumTo8Ba?= =?us-ascii?Q?2WVflDIO7oJbLUFtJ4IcBs2bGyskkB2k+HWS3bk86gpx7+564fvOErKwzWjF?= =?us-ascii?Q?jDtG1OLu5GzFSizmmAykS6tYJtjLlKgelPB8n0B34BFRlYqI6oGC6ChAzI69?= =?us-ascii?Q?bzQMtDr8F04D3gMNQ/Bamt2csbiMQPIWiZF21NJhwWrsxOGsXJejzQmOTUL7?= =?us-ascii?Q?LNzDhjQ4By6j1vGpYknTO592PZ90FyuN1DddtPebKX61RMCN1Q8lAZS7QwVH?= =?us-ascii?Q?PNpNTtJ5Tq3EFz0lR5pYK/gMkKA745oaI4b3VKOY6+7UqFQXuHB5BtqEUtNm?= =?us-ascii?Q?n/yGSwnOMVKyoclSeNBTcvKE4BXd8qJPX/y55xS8HDEE5LPNYKhyGY+zJftY?= =?us-ascii?Q?+6hfkxCPuMyyVwQDZ4xcXmL+6jDd+XcSK7CuYJxiQJuJ+RbysUftyF39mZVT?= =?us-ascii?Q?a0abdt5FK4KJWkKG63e1Ik3kD3hZdyjXjGsUoiM7Rj0Seuj9fdkI8X2snooi?= =?us-ascii?Q?3sl1K3yYcdQ/bpJs1mdyrcmtguHM+sah6R+YU+4fgv459kqycbKQ0CcD7ij9?= =?us-ascii?Q?bTb/XjrzB+fKInHVWp0TTvnHWh29wcIuqCmzscZ1l3KWBGaAFJpR0CbsQIu6?= =?us-ascii?Q?yi0MOSskpZ5TafyC+/dELsWViwBo5BglHpP+qQgGOwTv51gDypX/oTOQVbX/?= =?us-ascii?Q?q6LjRvQY1rFJ/onqNdAj38WBlOrE0nRqTIJSTNZJEoLUC8tfVf52RhOJf96a?= =?us-ascii?Q?djWJgbE6BHEMkue2YFNSMJ9Z0M4AuPoVB4DuteyxpeXAdpG06TYIh7kCNaRw?= =?us-ascii?Q?LIyjPDJYv/9TnkN0HvMovrIumumbqMxRWeRa35r8hrDBv6nMdplIcCEW9jXt?= =?us-ascii?Q?NQJ0OZqRGIhdK9Hq4glTcEl/MoqE1QMWGyby/Kl3gUCRjo/KUv4PtCJX03nA?= =?us-ascii?Q?TEZI6b8T/Gz25D9Sjc+Cfm3yC1MCibqc?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:08:56.6763 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0ae82c5-117d-4f2e-ab39-08dd169665ff 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00021F6C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6543 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/24. 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://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=9a80a0abaf4df9facbefdded1635cbccdab353ac Thanks. Xueming Li --- >From 9a80a0abaf4df9facbefdded1635cbccdab353ac Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 14 Nov 2024 09:11:55 -0800 Subject: [PATCH] net/e1000/base: fix fallthrough in switch Cc: Xueming Li [ upstream commit 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f ] There is an incorrect fallthrough identified by PVS studio. Even though this is in base code it should be fixed, and the warning should be re-enabled to prevent future bugs. Link: https://pvs-studio.com/en/blog/posts/cpp/1183/ Fixes: f2553cb9eba6 ("net/e1000/base: add new I219 devices") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- drivers/net/e1000/base/e1000_82575.c | 1 + drivers/net/e1000/base/e1000_api.c | 1 + drivers/net/e1000/base/meson.build | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c index 7c78649393..53900cf8f1 100644 --- a/drivers/net/e1000/base/e1000_82575.c +++ b/drivers/net/e1000/base/e1000_82575.c @@ -1722,6 +1722,7 @@ STATIC s32 e1000_get_media_type_82575(struct e1000_hw *hw) break; } /* Fall through for I2C based SGMII */ + /* Fall through */ case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES: /* read media type from SFP EEPROM */ ret_val = e1000_set_sfp_media_type_82575(hw); diff --git a/drivers/net/e1000/base/e1000_api.c b/drivers/net/e1000/base/e1000_api.c index 0f6e5afa3b..6697b4b64f 100644 --- a/drivers/net/e1000/base/e1000_api.c +++ b/drivers/net/e1000/base/e1000_api.c @@ -295,6 +295,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_PCH_RPL_I219_LM23: case E1000_DEV_ID_PCH_RPL_I219_V23: mac->type = e1000_pch_tgp; + break; case E1000_DEV_ID_PCH_ADL_I219_LM17: case E1000_DEV_ID_PCH_ADL_I219_V17: case E1000_DEV_ID_PCH_RPL_I219_LM22: diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build index 528a33f958..5a7a87f8a7 100644 --- a/drivers/net/e1000/base/meson.build +++ b/drivers/net/e1000/base/meson.build @@ -23,8 +23,7 @@ sources = [ ] error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter', - '-Wno-unused-variable', '-Wno-misleading-indentation', - '-Wno-implicit-fallthrough'] + '-Wno-unused-variable', '-Wno-misleading-indentation'] c_args = cflags foreach flag: error_cflags if cc.has_argument(flag) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.770313904 +0800 +++ 0080-net-e1000-base-fix-fallthrough-in-switch.patch 2024-12-06 23:26:44.083044826 +0800 @@ -1 +1 @@ -From 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f Mon Sep 17 00:00:00 2001 +From 9a80a0abaf4df9facbefdded1635cbccdab353ac Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -19,2 +21,2 @@ - drivers/net/e1000/base/meson.build | 1 - - 3 files changed, 2 insertions(+), 1 deletion(-) + drivers/net/e1000/base/meson.build | 3 +-- + 3 files changed, 3 insertions(+), 2 deletions(-) @@ -47 +49 @@ -index 6d6048488f..e73f3d6d55 100644 +index 528a33f958..5a7a87f8a7 100644 @@ -50,5 +52 @@ -@@ -24,7 +24,6 @@ sources = [ - - error_cflags = [ - '-Wno-unused-parameter', -- '-Wno-implicit-fallthrough', +@@ -23,8 +23,7 @@ sources = [ @@ -55,0 +54,5 @@ + + error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter', +- '-Wno-unused-variable', '-Wno-misleading-indentation', +- '-Wno-implicit-fallthrough'] ++ '-Wno-unused-variable', '-Wno-misleading-indentation'] @@ -57,0 +61 @@ + if cc.has_argument(flag)