From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 54A04455AD
for <public@inbox.dpdk.org>; Mon, 15 Jul 2024 17:29:55 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4FF3C40DD6;
Mon, 15 Jul 2024 17:29:55 +0200 (CEST)
Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com
[209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 44F2A40DD6
for <stable@dpdk.org>; Mon, 15 Jul 2024 17:29:54 +0200 (CEST)
Received: by mail-wm1-f42.google.com with SMTP id
5b1f17b1804b1-42660b8dd27so29852555e9.3
for <stable@dpdk.org>; Mon, 15 Jul 2024 08:29:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1721057394; x=1721662194; darn=dpdk.org;
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=OEZqtUJcMZUPcgwYkLDB5vWIrDH69+HWtrja3FpmFLc=;
b=cZNdT8iKK9ixgsD8Jbn06JjvjEdM8MJVkmsGHkaE8ehaZlOzztOENf8tsmGooI92ZD
PuHsW2IoGMqJ84/xl7bgtQTzFdDXAjTmrszRNvz1eeBKUcUM46HUMeo9tYZqw5YZVzwr
4ncQy/9w8rIYeYqYZ7TvIQSwEQg4HzUEF4GtlFATjWxxp2SMOernIk/6gJp05hgFm12o
cxMgc07leYxZvwqNL8JBzxXBIk7ZMzD6lcH2CgjWWDgvpJjpQf8apVtL9oKrp5kaVsE2
yHJd538gewwoIWWFhx2aG2TWqQ5nDl29azF9XN/K0vHzxo0oz7oEEjpzE5RKXgxC8ett
IaZw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1721057394; x=1721662194;
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=OEZqtUJcMZUPcgwYkLDB5vWIrDH69+HWtrja3FpmFLc=;
b=ETZaiF/2WaQsiyAIHtU+U+Tuz2j+R8vrlqIw7D3Cvgd+wZM9bbs0DdcACSIoi5kHEI
M1nVQ9JnwQrMLvqChA1CsVz42FQLXR/rjpOXYVL/JoLmW/EFqfkebercL7s/KkkNUjUb
7+vftoQAplgA/ZwYJ9NaPpqCs3pCYwR7pLhKG4AYJtNdSaUk01bKRE2BG3/ismrcjFM4
5uJGbSI/7ZabkZ4kwy7mZ4zU3WOolSOMU8/iUMk7BppqCtfTjelfPsx7/DbWDrZ8buGQ
ftlaOPX7GoH+fduWWZPDWlJ2GhZIaP62ePRXxRUQy9r+GqilhvTrFna25ngWP78fgYDN
To4A==
X-Forwarded-Encrypted: i=1;
AJvYcCUnC/FNs02ApV/3UH8zEp2eNChTUK0vDAdDrg3zCgzaBHns3IKXGpl6LqeMDE7HUKcdBft4nyHb1MNPcnJl1ao=
X-Gm-Message-State: AOJu0Yx4BYXEWjo4WGg7vieiIX31c6wf61/GEBIiS04TJywi9/OZLmrD
28LDW+q0hhnHxJugp/MIR3G9q6fP1tgYFyaOq5bzyUkRGnnw/7kY
X-Google-Smtp-Source: AGHT+IFZuYKKP3XSLD++3wLj/M/kwPxCXZ+yB+aa6iloUhwJinq2Km+xHk/fiIeA3RhAnl5K3fT5WA==
X-Received: by 2002:a05:6000:178c:b0:367:8f29:f7b8 with SMTP id
ffacd0b85a97d-368240cea3amr46339f8f.51.1721057393929;
Mon, 15 Jul 2024 08:29:53 -0700 (PDT)
Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3680dafbea9sm6762252f8f.82.2024.07.15.08.29.53
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 15 Jul 2024 08:29:53 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Waldemar Dworakowski <waldemar.dworakowski@intel.com>
Cc: Ian Stokes <ian.stokes@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/ice/base: fix board type definition' has been queued to
stable release 22.11.6
Date: Mon, 15 Jul 2024 16:26:30 +0100
Message-Id: <20240715152704.2229503-52-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com>
References: <20240624235907.885628-81-luca.boccassi@gmail.com>
<20240715152704.2229503-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 22.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/17/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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8719d11e4bc983a71b4a9dd89681faaa9dff493d
Thanks.
Luca Boccassi
---
>From 8719d11e4bc983a71b4a9dd89681faaa9dff493d Mon Sep 17 00:00:00 2001
From: Waldemar Dworakowski <waldemar.dworakowski@intel.com>
Date: Wed, 26 Jun 2024 12:41:38 +0100
Subject: [PATCH] net/ice/base: fix board type definition
[ upstream commit ee7419d85e4c55559002fdb57ec6dc4959155b2f ]
The new version is compliant with implementation and documentation.
Fixes: f4f79aa849b5 ("net/ice/base: add AQC get link topology handle support")
Signed-off-by: Waldemar Dworakowski <waldemar.dworakowski@intel.com>
Signed-off-by: Ian Stokes <ian.stokes@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/ice/base/ice_adminq_cmd.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h
index 93a3a6007f..534649802f 100644
--- a/drivers/net/ice/base/ice_adminq_cmd.h
+++ b/drivers/net/ice/base/ice_adminq_cmd.h
@@ -1702,8 +1702,8 @@ struct ice_aqc_link_topo_addr {
#define ICE_AQC_LINK_TOPO_HANDLE_M (0x3FF << ICE_AQC_LINK_TOPO_HANDLE_S)
/* Used to decode the handle field */
#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_M BIT(9)
-#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_LOM BIT(9)
-#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_MEZZ 0
+#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_LOM 0
+#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_MEZZ BIT(9)
#define ICE_AQC_LINK_TOPO_HANDLE_NODE_S 0
/* In case of a Mezzanine type */
#define ICE_AQC_LINK_TOPO_HANDLE_MEZZ_NODE_M \
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-07-15 16:19:37.254153299 +0100
+++ 0052-net-ice-base-fix-board-type-definition.patch 2024-07-15 16:19:34.612207403 +0100
@@ -1 +1 @@
-From ee7419d85e4c55559002fdb57ec6dc4959155b2f Mon Sep 17 00:00:00 2001
+From 8719d11e4bc983a71b4a9dd89681faaa9dff493d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ee7419d85e4c55559002fdb57ec6dc4959155b2f ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index c431b82784..d90a5b0d34 100644
+index 93a3a6007f..534649802f 100644
@@ -22 +23 @@
-@@ -1746,8 +1746,8 @@ struct ice_aqc_link_topo_addr {
+@@ -1702,8 +1702,8 @@ struct ice_aqc_link_topo_addr {