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 DA76443E57 for ; Sat, 13 Apr 2024 14:57:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2E99402CB; Sat, 13 Apr 2024 14:57:47 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2050.outbound.protection.outlook.com [40.107.96.50]) by mails.dpdk.org (Postfix) with ESMTP id 4CA8F400D6 for ; Sat, 13 Apr 2024 14:57:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=URU5E1p0SC0CfT0yRwN7jWpGWO7YMCAEE0cnw2b6HoBculWAC/LNX+YX/es1OM+ZkOMBZ9HW6q/KdPo4ywZ0+pRsrAOPF31BHUQkqUVaJ2OLQ4qXr2qH/pXan5s7fdTzMqnOBpKZLEPlax9Wtma4YPbTYh61FrH75p46w+1ATXiZEjPkrQitjCNw/6NfSQYyz4mHLyDX+mJ6K2u+ELY0x2ld3eFzUyncaEenRmBGF7iDcUC04B6W8TShnXaLpc19qeMk6wR77NvqcoC2r+lzZJ4DTjKd/ZnzP8ewTVDUBVr4knhlhz0euHnOBU5s0SAutalJ05tr4CQqHeeHba3Puw== 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=J2k16QA9CrUDgVux3mgAhEw+rm2bisM8BtIcI1LE46Y=; b=ThBJ8IjRvaqoOL9AXDXrMNcKROceLCM0PaRTj3LpfVAqEclcPka+zR1fQac8cx+MhoWhmBpfGrpkc76WBMEVoFW1m2NhVzdA19bHtVmWeDNHrU1MI19e5EF1/X3cVe3iukQaR0m2lBk/PdYKVraHg3Y429iGdj5k9P3Usm6t75vf6o2sEFnL+6Zh2GPfoehC5izK4kGNbkmAdKK3/Ug/r/C5a+sz5aL8qAfINuspZJymYfzAuRV8aq7fCbqKL/ZMiZSnZpfZrHtzhL59Vgmn1vLRxpuxQViU+RLt6rh9uCfCX3YpcmrvJnp8/EWt7FBzdyG57u+5BPG4d25L41zyhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.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=J2k16QA9CrUDgVux3mgAhEw+rm2bisM8BtIcI1LE46Y=; b=emZAPSOqRzz68twpbWxdrNgW3zx28+fc9lGo4iKEEqABDkZ0atyvt7JWtDCmEuZxZ7fj23SNZBxNefwUiLMbby5gDSQu9IJfJDGcgI/vcP93GalqdlhNgdH51JH6iHYBvjX+F0QcWGn8YKXF8wTUC55cVYCEEQExYnMlM4+eJXIcUVsmVkaTIPft+yuTtXv/OwLPjsMkPquK6mL+0NcAJNNeLtIUcBbuOIKtsTcLhGKG4TheeUmwB6wEVafHPnHZPp0tLbj/kOvESAVCv6HlTZj3HCX7gUFw3R1SQ7p1/PwAhqAoqtIBJQfVBCAmSR5I7QXIhKhZbxNGL4dPLgt5EA== Received: from BYAPR05CA0032.namprd05.prod.outlook.com (2603:10b6:a03:c0::45) by DM6PR12MB4370.namprd12.prod.outlook.com (2603:10b6:5:2aa::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:57:44 +0000 Received: from MWH0EPF000A672F.namprd04.prod.outlook.com (2603:10b6:a03:c0:cafe::9d) by BYAPR05CA0032.outlook.office365.com (2603:10b6:a03:c0::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.16 via Frontend Transport; Sat, 13 Apr 2024 12:57:44 +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 MWH0EPF000A672F.mail.protection.outlook.com (10.167.249.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:57:43 +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.986.41; Sat, 13 Apr 2024 05:57:34 -0700 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.1258.12; Sat, 13 Apr 2024 05:57:32 -0700 From: Xueming Li To: Qin Ke CC: Chaoyong He , Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: fix getting firmware VNIC version' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:21 +0800 Message-ID: <20240413125005.725659-81-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: MWH0EPF000A672F:EE_|DM6PR12MB4370:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b828399-990e-4302-d1d6-08dc5bb94f81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VROMrzCG2nMmm2e61D+Wli39m1Ow2s2eecrxxJ5mJ06+94e2l1OQG99k3c6NOEHagB3SSrach4Fef5m67n4iViP+L920p/V3/317bYK3mU+fG+wGsY4rurDWcN6PIeyoYbuoZnUdAMZZ0sZwKy2KKpmMBZYdazzkcwdee5XojCfbccoqNkD/8zMF5LTU51BaEERY+WWVrb6qdBrl9+XBSXCk8HBDt0X9wvCVy6I2iOCqktFcyZsR5dx9GfA/9FP8PHr9wt8rHNNvoCrNunWDlPeWYVPRmaBKrgxiiI3xYmqRcqzfP9VTWz37npxDdgHoB6rZAs1xaS8zrCRqAiLr9plr5m3YgXVW/igufCwXAaUFlVk6T3APWRmjxB56F69R3MCDMOuCn4xBqRxVsD3CydaswkQhUmx1JWJLeIWGUkRHX4l75fsAXOlTZ//m/0YBSqLL33z4QuNGhiRLc8jIiiXtRnQj75lTTz8Aklp4xqEhZh4ewoHwsZ/wwtKWfji1Jy+bVX7dqbl/2klH4GyYJ+uI2G5/yRrW5z7GzX5t6iA2jtZJ1sEFgl5PxYpVaD427bZu1nT2wS6AoSJstcYoItgIHdeI1/DgjZz5VFKJTJ9f/0MmlREHmfq9K033QU4GAMnHzng/ymdFE+NISX6o8SojLtZQH/uKR0IzOEVmy7kSDtsZKTXxvXyzUc3BXSby4JxxWhjyFsaGhoyMuKIoXrqI9Njl2o0htn5moTzEHpwh++36DDAABkvGcfWCCe36 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:(13230031)(1800799015)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:57:43.9815 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4b828399-990e-4302-d1d6-08dc5bb94f81 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: MWH0EPF000A672F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4370 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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=bec3117648637d45e894bde55adea7c2be1a9851 Thanks. Xueming Li --- >From bec3117648637d45e894bde55adea7c2be1a9851 Mon Sep 17 00:00:00 2001 From: Qin Ke Date: Mon, 11 Mar 2024 09:54:14 +0800 Subject: [PATCH] net/nfp: fix getting firmware VNIC version Cc: Xueming Li [ upstream commit e72d6053a945b71348f5874cca6cd0be89eed8e0 ] When getting firmware VNIC version, the logic for representor ports and other ports is inverse, fix it. Fixes: c4de52eca76c ("net/nfp: remove redundancy for representor port") Signed-off-by: Qin Ke Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index 46d0e07850..10732f459c 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -2073,7 +2073,7 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, hw = nfp_net_get_hw(dev); - if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) { + if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) { snprintf(vnic_version, FW_VER_LEN, "%d.%d.%d.%d", hw->ver.extend, hw->ver.class, hw->ver.major, hw->ver.minor); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.484163284 +0800 +++ 0081-net-nfp-fix-getting-firmware-VNIC-version.patch 2024-04-13 20:43:05.037753879 +0800 @@ -1 +1 @@ -From e72d6053a945b71348f5874cca6cd0be89eed8e0 Mon Sep 17 00:00:00 2001 +From bec3117648637d45e894bde55adea7c2be1a9851 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e72d6053a945b71348f5874cca6cd0be89eed8e0 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 20e628bfd1..bd43925960 100644 +index 46d0e07850..10732f459c 100644 @@ -24 +26 @@ -@@ -2155,7 +2155,7 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, +@@ -2073,7 +2073,7 @@ nfp_net_firmware_version_get(struct rte_eth_dev *dev, @@ -28,2 +30,2 @@ -- if (rte_eth_dev_is_repr(dev)) { -+ if (!rte_eth_dev_is_repr(dev)) { +- if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0) { ++ if ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) {