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 13EECA034F for ; Wed, 10 Nov 2021 07:48:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D32F40142; Wed, 10 Nov 2021 07:48:48 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2055.outbound.protection.outlook.com [40.107.236.55]) by mails.dpdk.org (Postfix) with ESMTP id 2CFBB40142 for ; Wed, 10 Nov 2021 07:48:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bkIMunhapgdrHrbN3+xXnZXAkEWDIDJUh6g055qP17wNMjOzpESOMNSre+v3OUP1nuRA2ojymlauWdktqXwtlK3zDnCKQ7DcT8tzeAbPSojhc5nMM4CcCcb/KQFmF0TdGpUx2eSAdrjLKDMSLGASVS/kaj+j3Ftr+EOsvUWOl8DI4q+vT9oqiCT5j5SgZvhE030sOrDfJget8ZpykpCrkkw9MJVaGxYV5Njc0YktcnVHvM4ZbnChEc1D3Sq5lgxSfUxL/Qo8A/lMVF45IB3ED02TWEtlK5zCz7g0PLvAMWX/Zyxz4EJCpWnl+ASuAf9sE+GS4HymuZcWMV/uLOeajQ== 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=WeUuGH4NdFHN2JE+QkoNwtWACDaXE1rQBTmYGmtemJc=; b=SOg2xsWbp/upBDDH5McMsBDXXsghGTB4iJqCY3h8qMnFlFvuQVRrjvn4m1fHp77k/Wdrs1zdvxDQYyUvTLOZbcCXi8rXFKoOvBSicxBGh6h01ow4Q05RnHQ+ARFvOVv/oZ7fPM0t+L36cs1hUVh7pcOLZVXWl5g6hIIgsHU98VhaomzskjtkuOu9iu9VTQzKlD4CjwVudxcXU/QVZUiSBBHFRjb4A1UFdad4UGG7sRE8R0hDsoQqMCYafVLqcsCzg7NL2YqwZxcOpi059OjEE0pJKZBX+6Hfg7uE4o1qGHU8y0ykuFKVKIE5XphsmHUiylaPkE6MTdtgd2zqYrskZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=WeUuGH4NdFHN2JE+QkoNwtWACDaXE1rQBTmYGmtemJc=; b=dQ+HENHmprxJu1QLCPSooReVoyIwLob4apbLOwJghYC66VtHmuQ9c7lDHzmPJ0kq01i9mJvpmZJT8MsOn7D3rV5KqgsXGbkrV+Mz+FRQovy5YpgFTqgBV72GCofDf8OKhX7TR6tGGEzMgcdfBk3X41bly6YEwF6QmTTpV6K8BQUylbGrd/gZ/XvF7T5riBWVGYIMmvqcttOmBJ3DUukB/+LhZHI05RhQTPPTnfHOJCRzldECWAHRxNIFi9woT7vluDiexIjfIMsS/ekoa1oGRYoD4MtX2NYblrGOeQkmEcZPoEF8692IzccfSgPNtbs/dN1+1CZEL6Fo/7akguHTRw== Received: from BN9P221CA0021.NAMP221.PROD.OUTLOOK.COM (2603:10b6:408:10a::15) by MN2PR12MB3197.namprd12.prod.outlook.com (2603:10b6:208:107::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 06:48:44 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10a:cafe::dc) by BN9P221CA0021.outlook.office365.com (2603:10b6:408:10a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.16 via Frontend Transport; Wed, 10 Nov 2021 06:48:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) 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:48:43 +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:48:41 +0000 From: Xueming Li To: Robin Zhang CC: Luca Boccassi , Dawid Lukwinski , Beilei Xing , dpdk stable Date: Wed, 10 Nov 2021 14:30:29 +0800 Message-ID: <20211110063216.2744012-146-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: a5ad88ff-443c-4bce-f181-08d9a416236e X-MS-TrafficTypeDiagnostic: MN2PR12MB3197: 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: DXvFFNHIC63CouYvXeZclHseskq6Z8pe68A7o8kGUbTfbJCAQFsMEvFlFGyJ23EbGh0vB1m1n4xm5xTh1P9SKm09A8z4rTkC6qyHvcOgMfL4LUWlkroUpVvYTyNqVsJAYikG4VB097Tuptqy3XJM7swTQUCIW3MHwUoWCB4W/KgSSC6twim9ijEk8UwMSLHRpBTbwjJ5HAADoonnDfhFiT9ORcvIdvkhCAtIzugjG4G75pITR5km42+6D7v/Qae5szAR92tLVR42YWmMwu8iyPmqnTaVP3xVt+iooAbnaFjqLUt8pMznhot7u9nit+vvzDQ6kHGbUfWLUJPZ274sad6uFruD7MXgSFBK++HNrjzAhy0l2/3OSq35KPWLrHX93RJamLNnPzaDEPEPA1nYNAmp+LcWbJluf/R8s11BaL2YyAk0N6sD0YNZaukP+xO+jCcGn9bSkF7CVukLS5Sab0ErJNfixyjzIvNhheZNtZE23toRuhv7mee1w8qO5dNK0xEwChFJK3QWNvMc6hwiaSZt2KyhIQc48uur0kkWzxKiaNbxuzt836BxYpamR02aZLAXVGSmDT9e4QdLN0ApA8bkbUoQ+FUX2KIUcUzZBw63NmM7K3B1W5141UdQI4VA5A2I3G2vdVcXc5V/yKzdxMsdZlN1OTB5KKllgF14MhYo2PD/FMAbxNA8i5j/4+Xlz88KJPWHylUSx22cAAIjxa9ZTJofD8ozGO02WE6+CpuZIx0AzZIVlwC+nTwILOiYM4TcSdwkQvCMKTJcOyXerYYSkM40NZGpH3vBewbmYGk3odkbT/crTruqB73k5uMJD5XeqUxc/E4dLkDxQgXtMw== 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)(54906003)(4001150100001)(5660300002)(7696005)(8676002)(356005)(966005)(316002)(70586007)(70206006)(4326008)(7636003)(36756003)(6286002)(36906005)(426003)(47076005)(16526019)(26005)(186003)(86362001)(336012)(508600001)(6666004)(83380400001)(2906002)(1076003)(36860700001)(55016002)(6916009)(8936002)(2616005)(82310400003)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:48:43.8755 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a5ad88ff-443c-4bce-f181-08d9a416236e 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: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3197 Subject: [dpdk-stable] patch 'net/i40e/base: fix AOC media type' 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/88c923917d74ef01ab50e6c9a8ab389fdcd20895 Thanks. Xueming Li --- >From 88c923917d74ef01ab50e6c9a8ab389fdcd20895 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Sat, 9 Oct 2021 01:39:47 +0000 Subject: [PATCH] net/i40e/base: fix AOC media type Cc: Xueming Li [ upstream commit 6acdc4263c53078b562c94745ad158291299a31c ] For Active Optical Cable (AOC) the correct media type is "Fibre", not "Direct Attach Copper". Fixes: d749d4d89969 ("i40e/base: add AOC PHY types") Fixes: aa153cc89ff0 ("net/i40e/base: add new PHY types for 25G AOC and ACC") Signed-off-by: Dawid Lukwinski Signed-off-by: Robin Zhang Acked-by: Beilei Xing --- drivers/net/i40e/base/i40e_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 9ae632c1b6..657695c5d8 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1276,6 +1276,9 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) case I40E_PHY_TYPE_40GBASE_LR4: case I40E_PHY_TYPE_25GBASE_LR: case I40E_PHY_TYPE_25GBASE_SR: + case I40E_PHY_TYPE_10GBASE_AOC: + case I40E_PHY_TYPE_25GBASE_AOC: + case I40E_PHY_TYPE_40GBASE_AOC: media = I40E_MEDIA_TYPE_FIBER; break; case I40E_PHY_TYPE_100BASE_TX: @@ -1290,10 +1293,7 @@ STATIC enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw) case I40E_PHY_TYPE_10GBASE_CR1: case I40E_PHY_TYPE_40GBASE_CR4: case I40E_PHY_TYPE_10GBASE_SFPP_CU: - case I40E_PHY_TYPE_40GBASE_AOC: - case I40E_PHY_TYPE_10GBASE_AOC: case I40E_PHY_TYPE_25GBASE_CR: - case I40E_PHY_TYPE_25GBASE_AOC: case I40E_PHY_TYPE_25GBASE_ACC: media = I40E_MEDIA_TYPE_DA; break; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.386913485 +0800 +++ 0145-net-i40e-base-fix-AOC-media-type.patch 2021-11-10 14:17:01.927412294 +0800 @@ -1 +1 @@ -From 6acdc4263c53078b562c94745ad158291299a31c Mon Sep 17 00:00:00 2001 +From 88c923917d74ef01ab50e6c9a8ab389fdcd20895 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6acdc4263c53078b562c94745ad158291299a31c ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index ef061a6b63..2ca6a13e79 100644 +index 9ae632c1b6..657695c5d8 100644