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 3192242D83 for ; Wed, 28 Jun 2023 16:11:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C79642D2D; Wed, 28 Jun 2023 16:11:56 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 62FE9400EF for ; Wed, 28 Jun 2023 16:11:53 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-311099fac92so7197723f8f.0 for ; Wed, 28 Jun 2023 07:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961513; x=1690553513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pMcWCxMSwaCOCx4aTBcxjxj+i3ItoITZYpKSNVVFyZ4=; b=fe2acbG7j6OysjXsOGsM8g4JtMBNfO91eURmt3bTtj0MgrHivhpUS6Dn7wCmXCUfSd cfYGJm8e1k18ELg9x84drZqtFKXFMkAMo6nlaMm8xAPPewKgRZ40djpukBj3ybXawY4A sjZDrIgVlLPLXb0u5pVtmhJurXKxDG9iTB06o0D32C6PJBw2nYuUNvxFj+iHxjbE1Q9v hz4krJy4syqeBQA0VgCwu7q1Hzk/MCH6qp5q5gyikVJf9KHe56lowBSAGCrFQMYmitl/ 4fCDV88FnVu4tBu4lq8RQEcfjNXJ29vikXj2j+7Gwjcojx0ZH6pfBaPcXtR1gOTbNcJE uvXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961513; x=1690553513; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pMcWCxMSwaCOCx4aTBcxjxj+i3ItoITZYpKSNVVFyZ4=; b=iwxfPWxBZcf2YNSkjYgSnmp5BlLojsh2w6+7d54z1cinPVDI2WD/L1E4das9ctQ/CK tAmK9kUQCFN7sgjmFWAF3ULTcGIEY7cAlBv22qceHQpqwV7dnVtVHV5NQSUPLr7/5EV7 YbE4e/d8I2ZBWYlkE17rrTiFa+0KteYXpnJCbBFoFNWcqxyScxafRex3pXyN3SCuQgAa PMJB2z+2ygPFSx72Z1H9H/ktKQaQ7r4FZP6stD+E3tyUBaDn7r3zrowLNF0uD6fk8g+A C/2oHwbJmPw4K59s329p5vtVUGISH1hYkA+78o3VfOvt2zB9z5wIeSPiliRaY0fxYgGm 1JGg== X-Gm-Message-State: AC+VfDySLgFUDqBpmSirCEMOD65bmUWvW74bSgVNycblbnzSkFRhbRrA LOyZxuCVBa9d4RrOQInz+fc= X-Google-Smtp-Source: ACHHUZ5CaoLdNxRdeT3K4HE4qlfk9WJGPKV6+YnXKhx7WU5IuwEWjChyaULfxDP8OfGsU2/UgbWkGg== X-Received: by 2002:adf:d4c9:0:b0:313:e3d0:dd40 with SMTP id w9-20020adfd4c9000000b00313e3d0dd40mr11415106wrk.32.1687961512985; Wed, 28 Jun 2023 07:11:52 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id r15-20020adfe68f000000b003111025ec67sm13362799wrm.25.2023.06.28.07.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:52 -0700 (PDT) From: luca.boccassi@gmail.com To: Qiming Yang Cc: Qi Zhang , dpdk stable Subject: patch 'net/e1000: fix queue number initialization' has been queued to stable release 20.11.9 Date: Wed, 28 Jun 2023 15:10:43 +0100 Message-Id: <20230628141046.2145871-19-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7af73606af78be574bc2533cb9258ec13c884fa2 Thanks. Luca Boccassi --- >From 7af73606af78be574bc2533cb9258ec13c884fa2 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 [ 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 ef482bdde4..0ef6bee86c 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1079,8 +1079,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); dev_info->rx_offload_capa = em_get_rx_port_offloads_capa(dev) | -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.876658953 +0100 +++ 0019-net-e1000-fix-queue-number-initialization.patch 2023-06-28 11:40:08.084028083 +0100 @@ -1 +1 @@ -From c1a42d646472fd3477429bf016f682e0865b77f0 Mon Sep 17 00:00:00 2001 +From 7af73606af78be574bc2533cb9258ec13c884fa2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c1a42d646472fd3477429bf016f682e0865b77f0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0afedcd00c..c5a4dec693 100644 +index ef482bdde4..0ef6bee86c 100644 @@ -22 +23 @@ -@@ -1088,8 +1088,8 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) +@@ -1079,8 +1079,8 @@ eth_em_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) @@ -31,2 +32,2 @@ - dev_info->rx_queue_offload_capa = em_get_rx_queue_offloads_capa(); - dev_info->rx_offload_capa = em_get_rx_port_offloads_capa() | + dev_info->rx_queue_offload_capa = em_get_rx_queue_offloads_capa(dev); + dev_info->rx_offload_capa = em_get_rx_port_offloads_capa(dev) |