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 D634C468E4 for ; Thu, 12 Jun 2025 23:07:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0FC342DD9; Thu, 12 Jun 2025 23:07:44 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id C7CDC42E44 for ; Thu, 12 Jun 2025 23:07:43 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-45300c82c1cso5300095e9.3 for ; Thu, 12 Jun 2025 14:07:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762463; x=1750367263; 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=h3KZHlP6i8ce23jrKo9tYpCTRXZ7KOpzzdhOKlK7Oog=; b=dqQECMNK1TWMTPRf8o4wPNpFLg19jGDHvcOA4LX2+T7TCwZ39psO5GjpU3Y2cQRlK/ SIQPfw/sSdxd97aL96XLzp6ac+WUEB4ZwPqN5VoOouL0F49oBQCZV4+Z3ibxGT8p/a0+ yHdAl9FkMPtOzyLkT/meAZajvTtc88W4TA9xjAXhXEdTpiAdOa70oWSh5hyF2qzcRS2I gm2aZgrUEOyPQc1+J17BztDlnhnp+dEz33Bx4sk81EJ9XVUIUMzrVzkqy+AqNVL64SXh BlW0skSZ9vOOU8ARg1h4/CC3i1RTFjZSFigJCrfev0OxKnpWDRQZM1swIqVkiRRIAoP/ I/pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762463; x=1750367263; 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=h3KZHlP6i8ce23jrKo9tYpCTRXZ7KOpzzdhOKlK7Oog=; b=cBs5NPp/tpKluR5Lk97eQ7OCAQM6i+cg/r320Pctl18AkrhuzvwpZklULGA/eNYVVW PTCTaGF4+xOUbFo0mWkTT7WHibSuJwVCk0OF/rPlJdFRlxzSaJ1ony9nnSthBmyJUyM0 U15R2ucg+RzV4SZa06j2gLUWNLQIZkApuoKG1jaxLhIPX0f7S+x8e4rHhuBTmFQcTUet n9k5ID6sLcdddPWem2I5sRPUwjmhR5WGSKEiDn4OIwRj69zJOFaQv5FgNRhRPDHEhMVy upCvrMnGPA1IRnqxoVz9CreMGTcAWBWo8B9talDUPLgtcamCw91j7xZQHh0homkBIfTc hplw== X-Forwarded-Encrypted: i=1; AJvYcCWCR+LFYuIEsM473kAnNKy+SHbAWnSMzrLGDK5mUVPkU7E1sPfuiQ/pJckbXDqFozPrnaKC64w=@dpdk.org X-Gm-Message-State: AOJu0YxaM8SrHldFS5taFRiGEaPtzRj1xMgGjhid8XL7zjxYRQD4mvt9 /872KL6Flw37SF17NRrWYBXVPPbfK3EKUXr9GHSxmqigP3ArRYDUYEV61tzSHU6h X-Gm-Gg: ASbGnctUyCcvjLFO/fkWzcgKv2llA6ROPLLVjmh7SkY1TfrtrJ/K8iAvYA1UoyGMBAn t+to6JZ2NnJBE5eRgQ4SO/La3OdyiIK6HNVGE2LIJSiRDe33Odm5Uf3mTeh1PqiF1BolxCJ2JdG OLZVZPaMnBeRtJIarb0yi4xkUG8j+n5bXUIHUlWGnaJWRrw9XAsOD9lcotZ/ErF5Ox4g2TVLL85 y8fUw/x+7sO+Tt10x4uNFb+TBMwpvaXXUX9zM+WkkWAcsKWZuOGOrRCYEFxK2+L9gGkG15bxqIX MK+CzR51dTxWRA5KD37MrsxhNuOozfen3zZsB4Gf3+e+6gtD3lPjpUrELV+7aQ/qOBMl X-Google-Smtp-Source: AGHT+IE2f3LyD6UEcMNJbEXD8gg0rYDL48rJbKiwAoLNDxpkrsalxrWHxrIodzcjeb9jXaQZElNRJg== X-Received: by 2002:a05:600c:3496:b0:43d:4e9:27ff with SMTP id 5b1f17b1804b1-45334afa038mr4822615e9.7.1749762463231; Thu, 12 Jun 2025 14:07:43 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4532e13cfabsm31616705e9.19.2025.06.12.14.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:07:42 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Anatoly Burakov , dpdk stable Subject: patch 'net/ixgbe/base: correct definition of endianness macro' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:21 +0100 Message-ID: <20250612210733.2506558-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-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 22.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/14/25. 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/63a1721a1bf4f7fec378bbbd051f5f25f327e78d Thanks. Luca Boccassi --- >From 63a1721a1bf4f7fec378bbbd051f5f25f327e78d Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 28 Mar 2025 11:16:15 +0000 Subject: [PATCH] net/ixgbe/base: correct definition of endianness macro [ upstream commit 3e7ea9ad5162876583e72de6061752810bdde0fe ] The definition of IXGBE_LE32_TO_CPUS macro is meant to modify the value in place - similar to the le32_to_cpus() macro in kernel. Fixing the definition allows us to remove some warning flags, and removes the need for the uintptr_t typecasts. Fixes: aa4fc14d2cee ("ixgbe: update base driver") Signed-off-by: Bruce Richardson Reviewed-by: Anatoly Burakov --- drivers/net/ixgbe/base/ixgbe_common.c | 4 ++-- drivers/net/ixgbe/base/ixgbe_osdep.h | 14 +++++++------- drivers/net/ixgbe/base/meson.build | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index aa843bd5c4..8c2c69e58f 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -4586,7 +4586,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* first pull in the header so we know the buffer length */ for (bi = 0; bi < dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } /* @@ -4622,7 +4622,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* Pull in the rest of the buffer (bi is where we left off) */ for (; bi <= dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } rel_out: diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h index 6c25f608b1..09ea1e1e7e 100644 --- a/drivers/net/ixgbe/base/ixgbe_osdep.h +++ b/drivers/net/ixgbe/base/ixgbe_osdep.h @@ -49,19 +49,19 @@ #define false 0 #define true 1 #ifndef RTE_EXEC_ENV_WINDOWS -#define min(a,b) RTE_MIN(a,b) +#define min(a,b) RTE_MIN(a,b) #endif #define EWARN(hw, S, args...) DEBUGOUT1(S, ##args) /* Bunch of defines for shared code bogosity */ #ifndef UNREFERENCED_PARAMETER -#define UNREFERENCED_PARAMETER(_p) +#define UNREFERENCED_PARAMETER(_p) #endif -#define UNREFERENCED_1PARAMETER(_p) +#define UNREFERENCED_1PARAMETER(_p) #define UNREFERENCED_2PARAMETER(_p, _q) -#define UNREFERENCED_3PARAMETER(_p, _q, _r) -#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) +#define UNREFERENCED_3PARAMETER(_p, _q, _r) +#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) #define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) /* Shared code error reporting */ @@ -80,7 +80,7 @@ enum { #define IXGBE_CPU_TO_LE16(_i) rte_cpu_to_le_16(_i) #define IXGBE_CPU_TO_LE32(_i) rte_cpu_to_le_32(_i) #define IXGBE_LE32_TO_CPU(_i) rte_le_to_cpu_32(_i) -#define IXGBE_LE32_TO_CPUS(_i) rte_le_to_cpu_32(_i) +#define IXGBE_LE32_TO_CPUS(_i) do { *_i = rte_le_to_cpu_32(*_i); } while(0) #define IXGBE_CPU_TO_BE16(_i) rte_cpu_to_be_16(_i) #define IXGBE_CPU_TO_BE32(_i) rte_cpu_to_be_32(_i) #define IXGBE_BE32_TO_CPU(_i) rte_be_to_cpu_32(_i) @@ -127,7 +127,7 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr) IXGBE_PCI_REG_ADDR((hw), (reg) + ((index) << 2)) /* Not implemented !! */ -#define IXGBE_READ_PCIE_WORD(hw, reg) 0 +#define IXGBE_READ_PCIE_WORD(hw, reg) 0 #define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { } while(0) #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build index f6497014da..ab775d8c66 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -17,7 +17,7 @@ sources = [ 'ixgbe_x550.c', ] -error_cflags = ['-Wno-unused-value', +error_cflags = [ '-Wno-unused-but-set-variable', '-Wno-unused-parameter', ] -- 2.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:24.050988134 +0100 +++ 0004-net-ixgbe-base-correct-definition-of-endianness-macr.patch 2025-06-12 22:06:23.782042779 +0100 @@ -1 +1 @@ -From 3e7ea9ad5162876583e72de6061752810bdde0fe Mon Sep 17 00:00:00 2001 +From 63a1721a1bf4f7fec378bbbd051f5f25f327e78d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3e7ea9ad5162876583e72de6061752810bdde0fe ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,4 +18,4 @@ - drivers/net/intel/ixgbe/base/ixgbe_common.c | 4 ++-- - drivers/net/intel/ixgbe/base/ixgbe_osdep.h | 2 +- - drivers/net/intel/ixgbe/base/meson.build | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) + drivers/net/ixgbe/base/ixgbe_common.c | 4 ++-- + drivers/net/ixgbe/base/ixgbe_osdep.h | 14 +++++++------- + drivers/net/ixgbe/base/meson.build | 2 +- + 3 files changed, 10 insertions(+), 10 deletions(-) @@ -22,5 +23,5 @@ -diff --git a/drivers/net/intel/ixgbe/base/ixgbe_common.c b/drivers/net/intel/ixgbe/base/ixgbe_common.c -index d6425c5b78..fbc9605e4d 100644 ---- a/drivers/net/intel/ixgbe/base/ixgbe_common.c -+++ b/drivers/net/intel/ixgbe/base/ixgbe_common.c -@@ -4610,7 +4610,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, +diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c +index aa843bd5c4..8c2c69e58f 100644 +--- a/drivers/net/ixgbe/base/ixgbe_common.c ++++ b/drivers/net/ixgbe/base/ixgbe_common.c +@@ -4586,7 +4586,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, @@ -35 +36 @@ -@@ -4646,7 +4646,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, +@@ -4622,7 +4622,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, @@ -44,6 +45,32 @@ -diff --git a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h -index cffc6a4ce8..6e5f7b4ae8 100644 ---- a/drivers/net/intel/ixgbe/base/ixgbe_osdep.h -+++ b/drivers/net/intel/ixgbe/base/ixgbe_osdep.h -@@ -83,7 +83,7 @@ enum { - #define IXGBE_LE16_TO_CPU(_i) rte_le_to_cpu_16(_i) +diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h b/drivers/net/ixgbe/base/ixgbe_osdep.h +index 6c25f608b1..09ea1e1e7e 100644 +--- a/drivers/net/ixgbe/base/ixgbe_osdep.h ++++ b/drivers/net/ixgbe/base/ixgbe_osdep.h +@@ -49,19 +49,19 @@ + #define false 0 + #define true 1 + #ifndef RTE_EXEC_ENV_WINDOWS +-#define min(a,b) RTE_MIN(a,b) ++#define min(a,b) RTE_MIN(a,b) + #endif + + #define EWARN(hw, S, args...) DEBUGOUT1(S, ##args) + + /* Bunch of defines for shared code bogosity */ + #ifndef UNREFERENCED_PARAMETER +-#define UNREFERENCED_PARAMETER(_p) ++#define UNREFERENCED_PARAMETER(_p) + #endif +-#define UNREFERENCED_1PARAMETER(_p) ++#define UNREFERENCED_1PARAMETER(_p) + #define UNREFERENCED_2PARAMETER(_p, _q) +-#define UNREFERENCED_3PARAMETER(_p, _q, _r) +-#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) ++#define UNREFERENCED_3PARAMETER(_p, _q, _r) ++#define UNREFERENCED_4PARAMETER(_p, _q, _r, _s) + #define UNREFERENCED_5PARAMETER(_p, _q, _r, _s, _t) + + /* Shared code error reporting */ +@@ -80,7 +80,7 @@ enum { + #define IXGBE_CPU_TO_LE16(_i) rte_cpu_to_le_16(_i) + #define IXGBE_CPU_TO_LE32(_i) rte_cpu_to_le_32(_i) @@ -51 +77,0 @@ - #define IXGBE_LE64_TO_CPU(_i) rte_le_to_cpu_64(_i) @@ -57,5 +83,14 @@ -diff --git a/drivers/net/intel/ixgbe/base/meson.build b/drivers/net/intel/ixgbe/base/meson.build -index 7e4fbdfa0f..f8b2ee6341 100644 ---- a/drivers/net/intel/ixgbe/base/meson.build -+++ b/drivers/net/intel/ixgbe/base/meson.build -@@ -19,7 +19,7 @@ sources = [ +@@ -127,7 +127,7 @@ static inline uint32_t ixgbe_read_addr(volatile void* addr) + IXGBE_PCI_REG_ADDR((hw), (reg) + ((index) << 2)) + + /* Not implemented !! */ +-#define IXGBE_READ_PCIE_WORD(hw, reg) 0 ++#define IXGBE_READ_PCIE_WORD(hw, reg) 0 + #define IXGBE_WRITE_PCIE_WORD(hw, reg, value) do { } while(0) + + #define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS) +diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build +index f6497014da..ab775d8c66 100644 +--- a/drivers/net/ixgbe/base/meson.build ++++ b/drivers/net/ixgbe/base/meson.build +@@ -17,7 +17,7 @@ sources = [