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 4C42B4301E for ; Thu, 10 Aug 2023 01:54:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 465D7410EE; Thu, 10 Aug 2023 01:54:05 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 96BD5406B6 for ; Thu, 10 Aug 2023 01:54:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y7oWM7lOeVxkJNzWu4qa5nP8wBcxZpS6DSQksG5JWUV8Mfi3DQ1xT2DkwapPEfasPwQ8kBlIGYbANDiMm+pirJKjDJCUMtGXP/etH5huXOyilT4uRy5X5Y59R6I3oYaCz5OQRZ0JHBxAlP5Y0QenD37vnVOEFyrjIlws52lNVf9hzebL/hLLbTJmdEBsvTD0NiX9ffhdnee70bmc6UA4CLxC7+nnEy85VN6PFd686mBX7sQtdqR+iDNkZOLR2ayH9cXVdLn9t+eZsgzJg7M1UZ7D33dtKcUt1vAbqppe13tRA+ofPBbjSd1SPX9CFf0WkQ/jJHHoLjUd+JKtBxhpuQ== 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=IbogJH0RBSB/ukqsfPOD4CRTmkihxZvq3zz1odwUY0Q=; b=Hi0ncgbRYJax3OeSb13anol+i80UwL2sUu1tl84IMTrnBkS1AKn7fNHAHmF0/eCG8zxI+tSoszJoWtSa65LoyqXRs346Hfh5/u9mRhxcZXEGoqzekPNyerS6RmkeDlucPckqx3CYvoEmonQXlTTVnYUBfMYfEeMAe1vBZop+OHM/J2kudUw8axvV8FT/Z8vlGqdytdW2SaxA9CC4LPqzBOGzEFoL77jy4rQQKdY95A1OKEw70uXedy13JrRNKAerF4Xr1QfvmR4q/+7ccvxiHcIB4iVMQtZOk7JuZBHv7RPvkwMhQQ80KdrGoFv/6P16IuiC6rJ4FyjlQRE8W+gp+Q== 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 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=IbogJH0RBSB/ukqsfPOD4CRTmkihxZvq3zz1odwUY0Q=; b=IaP8TQ3XIUv4PdjdU6O0qzWNM1F6vkMNoV/HnzaIzPd60SX7GFipx249YwLFVzDBD38rS5CKaUiObkqUNClNCFzJjg2TqtqnwG0EwadxkLK1Y+PCBig3ol/87NSSuYeNS7jTN2pK+V7UkuUKHLSyQIfDTx456YzzKYfggcgNH7RZmOcB/9fYi2pb2F2Zlca1GibfDRPSzGSdxjvD9xoHEIKTgAoqkwBUZQ0rojcW91PvRIcam15iOkTSn5EpCEuSX3ZZyDMI7F3VWnuI6fLUm2YCSUvxIHNtl0hQo+u9OvZGUxV+Tkd4z2S6OQCzXp7QwfmODXuRLYRuYwxu1D1LRw== Received: from SN7PR04CA0204.namprd04.prod.outlook.com (2603:10b6:806:126::29) by BN9PR12MB5276.namprd12.prod.outlook.com (2603:10b6:408:101::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:54:03 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:806:126:cafe::f1) by SN7PR04CA0204.outlook.office365.com (2603:10b6:806:126::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:54:02 +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 SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Wed, 9 Aug 2023 23:54:02 +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.986.5; Wed, 9 Aug 2023 16:53:50 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Wed, 9 Aug 2023 16:53:48 -0700 From: Xueming Li To: Kaiwen Deng CC: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix MAC type of E822 and E823' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:04 +0800 Message-ID: <20230809234930.32424-43-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF000015CA:EE_|BN9PR12MB5276:EE_ X-MS-Office365-Filtering-Correlation-Id: addb3380-0e3c-4b3b-5e05-08db9933e89a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TF7sYJfRmFzezGAP5bp7otglN/CLxttoMd0jTQQZ+HvCHfNdzWXKVdTCr2dBTzFZmK8ffwg0+nwptpaGGKVcqd3nG0crm109DmrL5yiTCzuQNvE+SzNng7ZNhwni2keByTxSBYiDmVcoL/e/UkbswBFvPGwMz7aN2ec99SYljTn53RnxIdNFYDGJgWe0yIQBeXAbVGYXRvZoB0r0RcBBUlizIASZFCq0I8Md1aFRImFiEbbKE+Tm2Q3Y3+Q6tHbq5AxWn3OCZaJduNp1ZmU0Fg2U/J7c+AOjYzjiqDbDEw4KaD7RP+MBEjuMSN4PdU6NrgLAj5Tv6tHjUAWs1YvLG9hthIUglQF9I41W74r61/zxx5dEa2sUSJpaV+tb+LzF9Voxrx3PQqhOEc0appcAp3bDzaH1E70ZvC4XvKVu7xCnpTIvuWzKplYC1mxGafV0lCXD6p2eYF3utv6VA7NULhn3hA5JJFeUGmy4W4PCmVQWpk2wE/JbP0pMLoATYBhEo2ZEnod6X3i0Dz/4UkV1nlNy4FJBQ+2NshN298ecl1xZFw+aiYHqwrcqm0DrZFwZmWGoRqwQGV6MRbcQ9jRm2ELqn9K5Kot8WArqX7yww0d4wQu4CMZ3eo5vvmYhp04HWW+mEvBCAwq9Gf/yMl16g8W5FPOY5Dh0hnfQKt6VCtDEmfmimxlmcWpzK7C6nDsqroqQMnLsxitQfM7fGGg4C6WstJfz70qGPXGCSr/bw1owa8l0A4NdYFveRgogTZaRTaMEG+73UfdfqV1flWhh6g== 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:(13230028)(4636009)(396003)(376002)(346002)(39860400002)(136003)(451199021)(1800799006)(186006)(82310400008)(40470700004)(36840700001)(46966006)(2906002)(41300700001)(316002)(40460700003)(8676002)(8936002)(5660300002)(36756003)(40480700001)(86362001)(55016003)(82740400003)(356005)(7636003)(54906003)(478600001)(2616005)(1076003)(26005)(53546011)(7696005)(6666004)(16526019)(6286002)(336012)(966005)(36860700001)(47076005)(4326008)(6916009)(70586007)(70206006)(426003)(19627235002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:54:02.5994 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: addb3380-0e3c-4b3b-5e05-08db9933e89a 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: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5276 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 22.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 08/11/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=15b67727caa8f290b2ee4b6304628818a705c1c0 Thanks. Xueming Li --- >From 15b67727caa8f290b2ee4b6304628818a705c1c0 Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Fri, 16 Jun 2023 10:05:31 +0800 Subject: [PATCH] net/ice: fix MAC type of E822 and E823 Cc: Xueming Li [ upstream commit 9749dffe23c6d66e441daad1dab4f49a01ab5296 ] E822 and E823 get the wrong mac type, which prevents the ddp package from loading correctly. This commit fixes the mac type of E822 and E823. Fixes: 084e64e6b600 ("net/ice/base: set MAC type for E823C device") Signed-off-by: Kaiwen Deng Acked-by: Qi Zhang --- drivers/net/ice/base/ice_common.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ice/base/ice_common.c b/drivers/net/ice/base/ice_common.c index 1a02aad869..a327a4b374 100644 --- a/drivers/net/ice/base/ice_common.c +++ b/drivers/net/ice/base/ice_common.c @@ -167,6 +167,8 @@ static enum ice_status ice_set_mac_type(struct ice_hw *hw) case ICE_DEV_ID_E823C_QSFP: case ICE_DEV_ID_E823C_SFP: case ICE_DEV_ID_E823C_SGMII: + hw->mac_type = ICE_MAC_GENERIC; + break; case ICE_DEV_ID_E824S: case ICE_DEV_ID_E825C_BACKPLANE: case ICE_DEV_ID_E825C_QSFP: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.319491700 +0800 +++ 0042-net-ice-fix-MAC-type-of-E822-and-E823.patch 2023-08-09 21:51:18.184352000 +0800 @@ -1 +1 @@ -From 9749dffe23c6d66e441daad1dab4f49a01ab5296 Mon Sep 17 00:00:00 2001 +From 15b67727caa8f290b2ee4b6304628818a705c1c0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9749dffe23c6d66e441daad1dab4f49a01ab5296 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 0f26f1d854..8867279c28 100644 +index 1a02aad869..a327a4b374 100644