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 C6166A0C45 for ; Thu, 10 Jun 2021 14:07:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BCA134003C; Thu, 10 Jun 2021 14:07:36 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id C387E4069B for ; Thu, 10 Jun 2021 14:07:35 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJTB-00006q-S0; Thu, 10 Jun 2021 12:07:33 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: Kevin Traynor , dpdk stable Date: Thu, 10 Jun 2021 14:06:12 +0200 Message-Id: <20210610120641.885862-24-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnx2x: fix build with GCC 11' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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/12/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/aecd308c092378ae627a795f9e8c3e65595d4384 Thanks. Christian Ehrhardt --- >From aecd308c092378ae627a795f9e8c3e65595d4384 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 11 May 2021 14:14:32 +0100 Subject: [PATCH] net/bnx2x: fix build with GCC 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit b3c740e03751215ab01841975b8f5764023f953b ] Reproduced with '--buildtype=debugoptimized' config, compiler version: gcc (GCC) 12.0.0 20210509 (experimental) Build error: In file included from ../drivers/net/bnx2x/bnx2x_rxtx.c:8: ../drivers/net/bnx2x/bnx2x_rxtx.c: In function ‘bnx2x_upd_rx_prod_fast’: ../drivers/net/bnx2x/bnx2x.h:1528:35: warning: ‘rx_prods’ is used uninitialized [-Wuninitialized] #define REG_WR32(sc, offset, val) bnx2x_reg_write32(sc, (offset), val) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/bnx2x/bnx2x.h:1531:33: note: in expansion of macro ‘REG_WR32’ 1531 | #define REG_WR(sc, offset, val) REG_WR32(sc, offset, val) | ^~~~~~~~ ../drivers/net/bnx2x/bnx2x_rxtx.c:331:9: note: in expansion of macro ‘REG_WR’ 331 | REG_WR(sc, fp->ustorm_rx_prods_offset, val[0]); | ^~~~~~ ../drivers/net/bnx2x/bnx2x_rxtx.c:324:40: note: ‘rx_prods’ declared here 324 | struct ustorm_eth_rx_producers rx_prods = { 0 }; | ^~~~~~~~ REG_WR32 requires 'uint32_t', use union instead of cast to 'uint32_t'. Bugzilla ID: 692 Fixes: 38dff79ba736 ("net/bnx2x: update HSI") Signed-off-by: Ferruh Yigit Acked-by: Kevin Traynor --- drivers/net/bnx2x/bnx2x_rxtx.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c index e201b68db8..db4654dd51 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.c +++ b/drivers/net/bnx2x/bnx2x_rxtx.c @@ -321,14 +321,15 @@ static inline void bnx2x_upd_rx_prod_fast(struct bnx2x_softc *sc, struct bnx2x_fastpath *fp, uint16_t rx_bd_prod, uint16_t rx_cq_prod) { - struct ustorm_eth_rx_producers rx_prods = { 0 }; - uint32_t *val = NULL; + union { + struct ustorm_eth_rx_producers rx_prods; + uint32_t val; + } val = { {0} }; - rx_prods.bd_prod = rx_bd_prod; - rx_prods.cqe_prod = rx_cq_prod; + val.rx_prods.bd_prod = rx_bd_prod; + val.rx_prods.cqe_prod = rx_cq_prod; - val = (uint32_t *)&rx_prods; - REG_WR(sc, fp->ustorm_rx_prods_offset, val[0]); + REG_WR(sc, fp->ustorm_rx_prods_offset, val.val); } static uint16_t -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.216615114 +0200 +++ 0024-net-bnx2x-fix-build-with-GCC-11.patch 2021-06-10 14:04:58.050024525 +0200 @@ -1 +1 @@ -From b3c740e03751215ab01841975b8f5764023f953b Mon Sep 17 00:00:00 2001 +From aecd308c092378ae627a795f9e8c3e65595d4384 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit b3c740e03751215ab01841975b8f5764023f953b ] + @@ -35 +36,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 57e2ce5045..2b17602290 100644 +index e201b68db8..db4654dd51 100644