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 2891C4301E for ; Thu, 10 Aug 2023 01:54:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23803410FD; Thu, 10 Aug 2023 01:54:04 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) by mails.dpdk.org (Postfix) with ESMTP id 154C8406B6 for ; Thu, 10 Aug 2023 01:54:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BE+WkiJVJ7oRTNufuVkVkoU1r6YNxHfFDwJ0PWUwL1jMxhkiTGRwP+/tXs6lD0xt3dyF+S7h9XH/OvlWoj3hMiwiauyCSHWkYHWAxcsNvlevlcgCi1hCSex9Co85x0Vav5yDxIfBrOTmmOU7Q9TxbAMa/pV+1Cy6ao5gy/+MOcSo6xy4vvpBcjYWwvTD4LSxi5+2UQH9IffPg7XmVCQisJHVvf61eRijOlAKnxV25FychI7tovMljWs3RVtqSpDf/4OzaRNfmLQEb8iLAARYpzuhjLdACvZzLrz4iM/wLg63ZIl1jptlvnPhQ7cqS6FTArSmxuBeYFq1KshbAsBn2w== 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=fzs7+Z3t9xNMYNXzGG3StisuG4b2dno9JsLQOZh8UJ4=; b=kKvta07P5XK7DfnqCjSQLEMfTazj5/2tp7Wmn0o6pqV41f/XOg83+D1t5cElpnCDKZPr+wMjyqqKB85Ku/ZqmHymW1HDYfOQ1VryF+G7H+HYWpRitLW9UoX2CPcHRZly88tJBaWBaF2UI8AJCtl9UYtpSquChUjR5BsyaXQxn610QMsjoWpzVl0mCNAvPdUFL0e3ZR3Sr9vuUYOinOWK0S5KlokQN/qrZBbk5YPbhyTP4WmO97/ArR15Qvcf1roMzWnROv9iel8kolkCRIfrMPFogBA43LGgI5B344pEjRpdgbCF+Kr35a3QpBGsksLbeM1UpofjWGaPBBj0WjXO8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=fzs7+Z3t9xNMYNXzGG3StisuG4b2dno9JsLQOZh8UJ4=; b=iB1HfCXeWu5Ux3xM05A+hUsGknd+VNvyo+XkQwuEQzEJSdlChprvNDsoXtwu2A8uAOoKsnEj3vqnt+KkH1Jdlx4s7FoC4D/fUx8+TimXmbcG5p/6EIGxoBZlnYaVDHosXKXDO26qO0dZc1IozyH3plOqUWVzlKqXrOyf0TdlxvrZltquoTI+Ik6eoLPoQML/6/81f4S5v2ZLabai0Tkf7VsGCwDqfYFs5c18ftDGuZQ90I1OenlDWv3Qk5EuNWcu/25FsnHl18EEkEJt53lVjYrflzPiOVjsTzeIwRtFnJHicQ68CZoN1qaA9ya2PvsPKDjbGcjLYvsO8g14AzCiQg== Received: from DM6PR05CA0054.namprd05.prod.outlook.com (2603:10b6:5:335::23) by CY8PR12MB8216.namprd12.prod.outlook.com (2603:10b6:930:78::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 23:54:00 +0000 Received: from CY4PEPF0000E9DC.namprd05.prod.outlook.com (2603:10b6:5:335:cafe::dd) by DM6PR05CA0054.outlook.office365.com (2603:10b6:5:335::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.7 via Frontend Transport; Wed, 9 Aug 2023 23:54:00 +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 CY4PEPF0000E9DC.mail.protection.outlook.com (10.167.241.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:54:00 +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.5; Wed, 9 Aug 2023 16:53:48 -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:46 -0700 From: Xueming Li To: Qiming Yang CC: Qi Zhang , dpdk stable Subject: patch 'net/e1000: fix queue number initialization' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:03 +0800 Message-ID: <20230809234930.32424-42-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: CY4PEPF0000E9DC:EE_|CY8PR12MB8216:EE_ X-MS-Office365-Filtering-Correlation-Id: d22aa145-bc17-450f-e28a-08db9933e732 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v8CwmSp02Fmg7NSHp0WyCA9WOZBdnQCuJ2uLHUEBD28tcdj2Nnp0LaxYArytynUAaiccYWm7MOfp/yk17XMc+VpmOawc2MsViXhWmKMzlCnHF/iLQqwgx0fmR7HaaOpP2ht0gaFcBo/3hUeaU6lp/sRwRpEYVqvK36NhrO6OzVNt7WaHpPrqCf7WukNRutNet9Vkv9ca61dRfZLRLk5bTti7WK3gAizTk21dimFF3Eb+GEdFQL414M/QDMGjvYT98eimoTfp5L9+FxrFNAcUf0XxsR1TZn3raLy09nh+FdKiimulBsYU0hqxTfwQSwn0Hjq6yKCTWio4+BgNDHBLAGOkkgoiZgDhSmOaItVeoiTHr91VMys+lONRQCgSxVkC6HgJ/UNUEVR2fpgrgfXlliRfnIqntJD8LSd1cYlj1TKn1QHtJ/uJQGr002oKhuMQwRLSje/qYM4vEirUTkCWteca8aDZyLRp6bCilANPO/mmeeHVQjNycyp9UNHzXpgx/9PbVqW4pllrd9fOhrl+9O3ganQEBuTzwbfi+tH0TkHM/UKncryqTPTRvR0fwPmPSiFAv+HUxVOdW8gxu+yIHBozfMpGcwTM65K+aicJU1is3H2HSanQPPAZIhGwcFRy0Nst2T7eeDrzpLFpL3nuu9duOMyBZhCrArE2WfFo74Yt7h3UHCrIzR4rUTdDAn9gyoBG7ubt7lHWg5nUbANq5Fi2yqTzQbzOi+UOBpAY95Boe9WqWYocCz6ycEzP5WZH4lRu6Ed6a+iPJ2URFsKgmA== 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:(13230028)(4636009)(136003)(346002)(376002)(39860400002)(396003)(451199021)(186006)(1800799006)(82310400008)(46966006)(36840700001)(40470700004)(53546011)(26005)(7636003)(1076003)(478600001)(40460700003)(6666004)(8676002)(5660300002)(70206006)(55016003)(4326008)(54906003)(40480700001)(966005)(316002)(70586007)(41300700001)(7696005)(8936002)(86362001)(6916009)(2616005)(426003)(336012)(16526019)(82740400003)(356005)(6286002)(2906002)(36756003)(47076005)(83380400001)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:54:00.3060 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d22aa145-bc17-450f-e28a-08db9933e732 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: CY4PEPF0000E9DC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8216 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=a45102d3246d85f3fdd39105aab7d8a3649bb35f Thanks. Xueming Li --- >From a45102d3246d85f3fdd39105aab7d8a3649bb35f Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Tue, 13 Jun 2023 07:51:51 +0000 Subject: [PATCH] net/e1000: fix queue number initialization Cc: Xueming Li [ upstream commit c1a42d646472fd3477429bf016f682e0865b77f0 ] The initialized queue number is not match the description in HW datasheet. Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)") Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- drivers/net/e1000/em_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 8ee9be12ad..18efa78ac3 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1073,8 +1073,8 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) * To avoid it we support just one RX queue for now (no RSS). */ - dev_info->max_rx_queues = 1; - dev_info->max_tx_queues = 1; + dev_info->max_rx_queues = 2; + dev_info->max_tx_queues = 2; dev_info->rx_queue_offload_capa = em_get_rx_queue_offloads_capa(); dev_info->rx_offload_capa = em_get_rx_port_offloads_capa() | -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.299255800 +0800 +++ 0041-net-e1000-fix-queue-number-initialization.patch 2023-08-09 21:51:18.184352000 +0800 @@ -1 +1 @@ -From c1a42d646472fd3477429bf016f682e0865b77f0 Mon Sep 17 00:00:00 2001 +From a45102d3246d85f3fdd39105aab7d8a3649bb35f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c1a42d646472fd3477429bf016f682e0865b77f0 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 0afedcd00c..c5a4dec693 100644 +index 8ee9be12ad..18efa78ac3 100644 @@ -22 +24 @@ -@@ -1088,8 +1088,8 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -1073,8 +1073,8 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)