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 867E145CE3 for ; Mon, 11 Nov 2024 07:34:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A62B40E09; Mon, 11 Nov 2024 07:34:15 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2067.outbound.protection.outlook.com [40.107.244.67]) by mails.dpdk.org (Postfix) with ESMTP id B83D840E0C for ; Mon, 11 Nov 2024 07:34:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UoirMPazhti/qX7xgV6ezpOqdXCwICAb7/bvrwebEPXdNELVDXD2G5ZnJHp5HHQOpBk/oGke0n+ZgoWk1mYkYUgKwYF4ViKep7wQFJI9Vu542yh1kMWH+6/GjhuAmkdPha5StIjTlbsW9Yegxx9GxPjQMRHmgQwgTf+GPe7QVATZNxpJOpI5gp52oaVV8eOCRoq//Pbo43kLyL2VeEWVuE1wNNftnQcGUSUzVP67/3qY3n6cOPK1xaSoHjyJOTLcT15ZxhVvULo3sYeJh3Wwz1zPB2OmESJ304W+zOCtPPyLWxQv8/LdkIYZSBWznL/V7j5vFdSfeyPBT7pQH7KxqQ== 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=DZeeFv/gLL+phS6Zk+eg7p9pq/bKydC+IKGCklSW64Q=; b=LbJaecngwbOjBfA+e+yDb1eJ17IGq0A9m9BKZ4BcZoSPMtytpq4lzS+MQIwIyArgfz8jzDM1kXrHw37OqqD5wghVQpBKTUTuBPQ5wK5Y6WzWDtPf2wlZ3xwMOq1QYWPnGN7e3gfqrr8s7nZr0CUrVSfmCMs0QFWbE1WzCxlDHl7x9esgUhXexGgTJ3a4m9ZmYbqfbALfHviW/cBLoQyKgvwpWG6P0cIta/FvNRZIfR7YdMwROfmzo594/JNG+5F3UxYhmhi8VSNiNyGSQqr7nGF+5v6NVjqrUsj27YBiF3uBsDBQwyRxj1zdwOeWtieaqzOzgS9PrNWb1APOICFJug== 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=DZeeFv/gLL+phS6Zk+eg7p9pq/bKydC+IKGCklSW64Q=; b=uJu3XgSOi/M9GXxNljlQgBGDFUe4TMTxEqC7QEERhmVGOoe7pp9CmP5wnafjCGoLZoUvILR3yTYhgrHc6FGpizVURoQB3mKJHab6rfLJWF5N8NgCFotZAKlO/bypOxwBxl8pT1vm+4bSj6DG4EOFWmvk2uSWFLXzj9TXpOVT0xtHs+kdqMGi3hpg3rMVjQkS+qq3mqCu/PYPDRF0ahFL+d5LdMq04Yp1DVMnjBcEz1+1Gt5XJopmutEv36pkb8Jgh0Eo6gbpoSFKqFFfowuyK10ogNEkv0LbEzgiqxc5k3rKQ4+gBWjc3UMvVgb1wjLw9RSVpKEj/51yNAxk1j6grA== Received: from BN9PR03CA0655.namprd03.prod.outlook.com (2603:10b6:408:13b::30) by SJ2PR12MB8160.namprd12.prod.outlook.com (2603:10b6:a03:4af::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.26; Mon, 11 Nov 2024 06:34:08 +0000 Received: from BN2PEPF000055DA.namprd21.prod.outlook.com (2603:10b6:408:13b:cafe::aa) by BN9PR03CA0655.outlook.office365.com (2603:10b6:408:13b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:34:07 +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 BN2PEPF000055DA.mail.protection.outlook.com (10.167.245.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8182.1 via Frontend Transport; Mon, 11 Nov 2024 06:34:07 +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; Sun, 10 Nov 2024 22:33:55 -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; Sun, 10 Nov 2024 22:33:52 -0800 From: Xueming Li To: Xinying Yu CC: , Chaoyong He , Long Wu , Peng Zhang , Maxime Coquelin , dpdk stable Subject: patch 'vdpa/nfp: fix hardware initialization' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:27:34 +0800 Message-ID: <20241111062847.216344-49-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: 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: BN2PEPF000055DA:EE_|SJ2PR12MB8160:EE_ X-MS-Office365-Filtering-Correlation-Id: 32e59e35-9b78-45ef-f199-08dd021ad839 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1xRW8pxqeSvHY0pifolpFUiNd31BV0dMzn2bEzq385597AiBm4cznVrCLAQl?= =?us-ascii?Q?yE/jAH0+Cr4p/aOyGFWP8ocYyC3nTqAFRgfNJ8nXAdkBAwVSru/EPl9lUKFp?= =?us-ascii?Q?kvTR+gWXXqOyBBgCcMoR/I8PwcPCiMzAN5tHh8j237bq8sgLNsci50BX7zaU?= =?us-ascii?Q?Hh/ctYJoh23z4e7oAVFXdrOKOXF86EePcfnKlbkYR0nSK5EABcCWtGvGehdo?= =?us-ascii?Q?LtQ3C6Ku36ZnYBvYtU9SXOWZCoI+RK83UVsGgbuXGPK610gVz14YhwRsgrKB?= =?us-ascii?Q?vK/7thw9z5zutRqJ1NuRmSqIukwbUVTRfmZOcZ0lL9GWawFviG11zn48QD/U?= =?us-ascii?Q?otFszYeMvyWs2JrFLqCf6cJR9Vg01IUSfxpHfhoISwCD0wmKpnlk4E3nhDQ6?= =?us-ascii?Q?uHojsbdppezH5k1wHZPnyZwQbGNGgXYo+D4cF+8YGuwKbwp6iTkk5YzphFpO?= =?us-ascii?Q?Ak9zVgbu2xh+WfNVUznY1CqocFx8R5Fxf6DNmeu/KOnSU6AP4ZO2OQUcQPrY?= =?us-ascii?Q?75XvieXQ/YKER5vj9Ql94Vy+TAatP5HRJ9VRTFnOMnEZkioBX3NcOOWe8uc8?= =?us-ascii?Q?WAfVtjWfor+5rF/X9Z5Y2xJu7LEPDFaTX6cm5Fz9Ud92lJyK6orksecRtgux?= =?us-ascii?Q?iWqyu/ouQbtW8c6KSZz30gqhTDuex5dexr17/R80AysL1RVwuVCN4O0m+6Dw?= =?us-ascii?Q?5v7NVr4f6LWFUpZbFbUvWArsNM+kkfieCE6JadynR/kmX6bJqdEtGi9xEGEN?= =?us-ascii?Q?NkFkZm5trD9x8LgBEPg+sdApWABWgfZKSKEJJnMt7LKt5QUwP6mNPx42BNUx?= =?us-ascii?Q?E7I8n/ukw+pcvRuD5nbwzk5ZcO2H2ZMPts8YR53qjVw9yjpEZCLijyCoWcnq?= =?us-ascii?Q?CCCpk/Xux8E2G3ZOtObnwp+teI9nXajZGsH0eZ4T6gV1q8tsYi6Me8q6gFyq?= =?us-ascii?Q?7pSK2GMEF3MGhizLwTxw6w9y5gGZImkO6pfaMf8P2RBth5nFDc4i4z+fS4LO?= =?us-ascii?Q?PXtMgn6mk3BcaYdY8B/IYh+fwcp3MgqWo+x25o8ef6w6cavhV2GIYE1SFUxb?= =?us-ascii?Q?qNjaMi84pPZ1sxUcAKN6TxiFF4JRNnblUuRzMMm6Vt6sfrYKI2af4UBxSygu?= =?us-ascii?Q?hmdG4k45F8SQowttq5ECaKHO78sHt6GH+caLahcnNk6XCAFepWAIy1rktnZM?= =?us-ascii?Q?8gctzmjx0hEYloXycbW760nvLYOCxWl2U7aMZ02OcOvtze8TyzE5Ezm+q3W0?= =?us-ascii?Q?uHZMGJN0eXojtU+ioku91R3M4BnxkmRlSqqMqxKAnzqtROH3TK5snZ4jN3Ye?= =?us-ascii?Q?TGK8P8wqC31jsno2/WS5Icrl4MhuKSGNYcoW5vI2ur6fGuilTDAqCvi61QOx?= =?us-ascii?Q?HFEF/+OHw5umfa4rOxDnfolGjW+higjRcLR9iBvV8mBUIQ9EwA=3D=3D?= 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)(36860700013)(82310400026)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:34:07.4575 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32e59e35-9b78-45ef-f199-08dd021ad839 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: BN2PEPF000055DA.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8160 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 11/30/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=d0688a90529e682fd211f991e7a0b7ceb899993e Thanks. Xueming Li --- >From d0688a90529e682fd211f991e7a0b7ceb899993e Mon Sep 17 00:00:00 2001 From: Xinying Yu Date: Mon, 5 Aug 2024 10:12:39 +0800 Subject: [PATCH] vdpa/nfp: fix hardware initialization Cc: Xueming Li [ upstream commit fc470d5e88f848957b8f6d2089210254525e9e13 ] Reconfigure the NIC will fail because lack of the initialization logic of queue configuration pointer. Fix this by adding the correct initialization logic. Fixes: d89f4990c14e ("vdpa/nfp: add hardware init") Signed-off-by: Xinying Yu Reviewed-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang Reviewed-by: Maxime Coquelin --- .mailmap | 1 + drivers/vdpa/nfp/nfp_vdpa_core.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.mailmap b/.mailmap index f4d2a72009..a72dce1a61 100644 --- a/.mailmap +++ b/.mailmap @@ -1601,6 +1601,7 @@ Xieming Katty Xinfeng Zhao Xingguang He Xingyou Chen +Xinying Yu Xin Long Xi Zhang Xuan Ding diff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c index 7b877605e4..291798196c 100644 --- a/drivers/vdpa/nfp/nfp_vdpa_core.c +++ b/drivers/vdpa/nfp/nfp_vdpa_core.c @@ -55,7 +55,10 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, struct rte_pci_device *pci_dev) { uint32_t queue; + uint8_t *tx_bar; + uint32_t start_q; struct nfp_hw *hw; + uint32_t tx_bar_off; uint8_t *notify_base; hw = &vdpa_hw->super; @@ -82,6 +85,12 @@ nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw, idx + 1, vdpa_hw->notify_addr[idx + 1]); } + /* NFP vDPA cfg queue setup */ + start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ); + tx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ; + tx_bar = (uint8_t *)pci_dev->mem_resource[2].addr + tx_bar_off; + hw->qcp_cfg = tx_bar + NFP_QCP_QUEUE_ADDR_SZ; + vdpa_hw->features = (1ULL << VIRTIO_F_VERSION_1) | (1ULL << VIRTIO_F_IN_ORDER) | (1ULL << VHOST_USER_F_PROTOCOL_FEATURES); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:07.394025494 +0800 +++ 0048-vdpa-nfp-fix-hardware-initialization.patch 2024-11-11 14:23:05.122192840 +0800 @@ -1 +1 @@ -From fc470d5e88f848957b8f6d2089210254525e9e13 Mon Sep 17 00:00:00 2001 +From d0688a90529e682fd211f991e7a0b7ceb899993e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fc470d5e88f848957b8f6d2089210254525e9e13 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 544e62df7d..f51b1dda5d 100644 +index f4d2a72009..a72dce1a61 100644 @@ -27 +29 @@ -@@ -1655,6 +1655,7 @@ Xieming Katty +@@ -1601,6 +1601,7 @@ Xieming Katty