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 3AFED433D8 for ; Mon, 11 Dec 2023 11:15:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3691A411F3; Mon, 11 Dec 2023 11:15:15 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2078.outbound.protection.outlook.com [40.107.220.78]) by mails.dpdk.org (Postfix) with ESMTP id 30F9841151 for ; Mon, 11 Dec 2023 11:15:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TQtHVBzeZXDopCQjO0DiYdUiGdJjJor0t+fhTRx3FtuFv0SqcoJuYpjTPLQF4Cq2YoOw8gYbyMsk1K9Zy3Z7fDuAvO1QMU6Lttgvivj74f/FoEUZJaEWxFaHe+wscfPtImuJo6mkQCirM5RsnmP4QDZM8KxUaGEo/WjrmzEaF1n1Cdv1GfoQpvQZRkjaegin1czTIs1CAiLvAD6iRIRZbijVCbPSkHne2sa3NZ3DFN8rqYfd0NwOn2Blt2id8jvwgk6jbljXRh10sSRUDVBxh4UowyJoZteMxgdaKNh5E8Luag8ALcuvKR1IoMcka8PSrKlsQxU5t0tF6FX3zzDJyg== 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=+w1P/sgCbktHAIK250Ulk036UXHpFdF27v2YL2A6qrc=; b=MIQ8IdlZiVn8T9ArPSUbq+vETH4wsbbB2mq38Il5u8gtGJLIk+TjWHDHoiIFxupi3buIM9RQyxDjcHgzT2UoeMaxzl2k5ZZJJRl9d2xEOGNOg9LrN0w5CZs3AdufYZ0VlSU+LS3KTH7DsSPAKG1H59mhnYHD8+seHTwP52k/QuHhrUBvUYWPl0kI/yTyDWvfa9LpY9zpJXr+dQ8YePgrByOUd96kxRgMoPHEAs+SHDGxuw4mEBL5TSfZTE2n2X752DU4ZTyRqsFJX0Xz5zbnSGzK/M65muZH8dZZspRIkuqL/qW1zGcUWExKCvFQqdBZAoVDaCAVk4G8cULiG3c+rA== 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=+w1P/sgCbktHAIK250Ulk036UXHpFdF27v2YL2A6qrc=; b=IIPzryyQ3CP5/I2k/IKM29hHU7F8ki6DWTWNkfeOFr0s47cTXwWJcuc91s2518Li+UvvVCDh4jIfL4ykFbsumPu9CaFvV6xxtRmkoxRwi6C3BI4ifVt19x62tcwSvgmZj/dGPN30stUWAttfAFnZCxLYzsWqG0g5JIrI5B0Ac/Bn7LqEm6JAqrLZ9epnH+f/drUImYqX2qcKtDS3ziR88dKmKzrUKyw/8a2eyptmiL9k1/wUpKX7xqyewAv7TEHde3DNC3rCUGFuVlfftPoe8PgQDtpAGXA7hqngfHGLy95altXAiWlYnCv68rmw/CAbmfWP5YfxIlE5s32jZcLaGA== Received: from MN2PR20CA0052.namprd20.prod.outlook.com (2603:10b6:208:235::21) by SJ1PR12MB6050.namprd12.prod.outlook.com (2603:10b6:a03:48b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:15:09 +0000 Received: from MN1PEPF0000ECD4.namprd02.prod.outlook.com (2603:10b6:208:235:cafe::78) by MN2PR20CA0052.outlook.office365.com (2603:10b6:208:235::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:15:08 +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 MN1PEPF0000ECD4.mail.protection.outlook.com (10.167.242.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:15:08 +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; Mon, 11 Dec 2023 02:14:53 -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.986.41; Mon, 11 Dec 2023 02:14:51 -0800 From: Xueming Li To: Chaoyong He CC: Long Wu , Peng Zhang , "dpdk stable" Subject: patch 'net/nfp: fix reconfigure logic in PF initialization' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:51 +0800 Message-ID: <20231211101226.2122-27-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: MN1PEPF0000ECD4:EE_|SJ1PR12MB6050:EE_ X-MS-Office365-Filtering-Correlation-Id: b93c85e1-3066-4b65-e748-08dbfa320d8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Btp9aWzs+8r6sNC7kePb8os8DS/9yHOdN3ZxWSfkkKLaDDpjkBs9SpJ3qvjrlau4gdMCSgi5KjWAXZ68tDAloWhQfTFVzH4esTV4j+ebEVw7AH9g9Ewe57GvJM3VNjYl8QQqJVlQ5RX3pH84mbNJL7+ofA0Jf/DTpi9pcCVrmLq9132k6uv4HDYd+uBz8+Ju3OdPCCVjaRTMcE0jWToNf3HiSZBiPJoe0xGkUM+YeIcjKRSzfQV15I6ibmKLcpTEt+4A0gL4quA4KheRgB5JMxgKPD9ZuD6oInVNyFq2pJ7u2Iw154ofXSw8PGwGhosNvIxORMC7P3iSJ65e+jFWvhwmNsiOAeuvZ6EQ58JMKv61nIMqa4yrhWcqgt8lclSgazXqXS2ld0UE2y/X1wTw0j6IBCLQ2gSen6zOfxCsWRbDPZL3lekatiDOf4KyR1xgSJQsEhf6qbd9vPuS211GQXZIyaA5Ve2L1d4DEFoMq3RJXeu7KIRz2KWf6iCPqQO9BP6UypqxiFmW3wiuDkpcSoKaa56BJy0xR5neVE9hgBRSGjEzUNmOKoGHgEUhlAuRGOZvHzqNKXgdklI6UDNC3ZmmBUiHCcLVpe8cpi8W0do6lyARhP8h0X/V5reP2N7V7NnznlA7n5njtod9oufYI52/wEMQ5kmcdMZedRtqKkhdhnGbAnD5xbhmOLfEoXCP6i1mMbfTkSlB1L6Pkj8Y4Qsvzp+Pb26ZVHVUTaIRbv3jkMKltB1orfYY+hmBcGqcjCD/9xWLJcydGoERJPgamMVpZfIby2+R2yJ1TfvHvr8= 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)(4636009)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(82310400011)(46966006)(40470700004)(36840700001)(40460700003)(40480700001)(55016003)(53546011)(1076003)(336012)(16526019)(6286002)(26005)(2616005)(7696005)(47076005)(966005)(478600001)(7636003)(82740400003)(356005)(86362001)(36756003)(41300700001)(5660300002)(70206006)(54906003)(6916009)(70586007)(2906002)(426003)(36860700001)(83380400001)(4001150100001)(8936002)(8676002)(316002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:15:08.3385 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b93c85e1-3066-4b65-e748-08dbfa320d8a 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: MN1PEPF0000ECD4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6050 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.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 12/13/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=cb30eb9a1176718cb8b963361c5daf1700a22de9 Thanks. Xueming Li --- >From cb30eb9a1176718cb8b963361c5daf1700a22de9 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Sat, 28 Oct 2023 14:23:13 +0800 Subject: [PATCH] net/nfp: fix reconfigure logic in PF initialization Cc: Xueming Li [ upstream commit 1e80c07472aeed5669c79c0430b8aeece5129a20 ] There exists exit point between the reconfigure logic and the store logic of the PF initialization, this may lead one situation that value in the config bar is not same with the value stored in the data structure. Fix this by move up the store statement. Fixes: b812daadad0d ("nfp: add Rx and Tx") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 71832bfa23..a780887868 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -155,6 +155,8 @@ nfp_net_start(struct rte_eth_dev *dev) nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); if (nfp_net_reconfig(hw, new_ctrl, update) < 0) + hw->ctrl = new_ctrl; + return -EIO; /* @@ -173,8 +175,6 @@ nfp_net_start(struct rte_eth_dev *dev) nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1); - hw->ctrl = new_ctrl; - for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; for (i = 0; i < dev->data->nb_tx_queues; i++) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.032035500 +0800 +++ 0026-net-nfp-fix-reconfigure-logic-in-PF-initialization.patch 2023-12-11 17:56:22.927652300 +0800 @@ -1 +1 @@ -From 1e80c07472aeed5669c79c0430b8aeece5129a20 Mon Sep 17 00:00:00 2001 +From cb30eb9a1176718cb8b963361c5daf1700a22de9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1e80c07472aeed5669c79c0430b8aeece5129a20 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 76317925ec..0a0e3d6375 100644 +index 71832bfa23..a780887868 100644 @@ -27,3 +29 @@ -@@ -141,6 +141,8 @@ nfp_net_start(struct rte_eth_dev *dev) - if (nfp_reconfig(hw, new_ctrl, update) != 0) - return -EIO; +@@ -155,6 +155,8 @@ nfp_net_start(struct rte_eth_dev *dev) @@ -30,0 +31,2 @@ + nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); + if (nfp_net_reconfig(hw, new_ctrl, update) < 0) @@ -33,6 +35,6 @@ - /* Enable packet type offload by extend ctrl word1. */ - cap_extend = hw->cap_ext; - if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0) -@@ -171,8 +173,6 @@ nfp_net_start(struct rte_eth_dev *dev) - else - nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 1); + return -EIO; + + /* +@@ -173,8 +175,6 @@ nfp_net_start(struct rte_eth_dev *dev) + nfp_eth_set_configured(dev->process_private, + hw->nfp_idx, 1);