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 E6050A0C45 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 DDA4A40FDF; 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 260F54003C for ; Thu, 10 Jun 2021 14:07:36 +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 1lrJTC-00006q-3m; Thu, 10 Jun 2021 12:07:34 +0000 From: Christian Ehrhardt To: Ferruh Yigit Cc: Kevin Traynor , dpdk stable Date: Thu, 10 Jun 2021 14:06:13 +0200 Message-Id: <20210610120641.885862-25-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/d1a3991251e3d6d826ae757ac48ac36b4c93d424 Thanks. Christian Ehrhardt --- >From d1a3991251e3d6d826ae757ac48ac36b4c93d424 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 11 May 2021 14:14:33 +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 ab70be7e2d971dd0238da10322ac19209917b8ca ] Reproduced with '--buildtype=debugoptimized' config, compiler version: gcc (GCC) 12.0.0 20210509 (experimental) Build error: In file included from ../drivers/net/bnx2x/bnx2x.c:16: ../drivers/net/bnx2x/bnx2x.c: In function ‘bnx2x_hc_ack_sb’: ../drivers/net/bnx2x/bnx2x.h:1528:35: warning: ‘igu_ack’ 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.h:1916:9: note: in expansion of macro ‘REG_WR’ 1916 | REG_WR(sc, hc_addr, *val); | ^~~~~~ ../drivers/net/bnx2x/bnx2x.h:1905:33: note: ‘igu_ack’ declared here 1905 | struct igu_ack_register igu_ack; | ^~~~~~~ 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.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 1dbc98197d..b6aa52a333 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -1902,18 +1902,19 @@ bnx2x_hc_ack_sb(struct bnx2x_softc *sc, uint8_t sb_id, uint8_t storm, { uint32_t hc_addr = (HC_REG_COMMAND_REG + SC_PORT(sc) * 32 + COMMAND_REG_INT_ACK); - struct igu_ack_register igu_ack; - uint32_t *val = NULL; + union { + struct igu_ack_register igu_ack; + uint32_t val; + } val; - igu_ack.status_block_index = index; - igu_ack.sb_id_and_flags = + val.igu_ack.status_block_index = index; + val.igu_ack.sb_id_and_flags = ((sb_id << IGU_ACK_REGISTER_STATUS_BLOCK_ID_SHIFT) | (storm << IGU_ACK_REGISTER_STORM_ID_SHIFT) | (update << IGU_ACK_REGISTER_UPDATE_INDEX_SHIFT) | (op << IGU_ACK_REGISTER_INTERRUPT_MODE_SHIFT)); - val = (uint32_t *)&igu_ack; - REG_WR(sc, hc_addr, *val); + REG_WR(sc, hc_addr, val.val); /* Make sure that ACK is written */ mb(); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:59.258377491 +0200 +++ 0025-net-bnx2x-fix-build-with-GCC-11.patch 2021-06-10 14:04:58.054024554 +0200 @@ -1 +1 @@ -From ab70be7e2d971dd0238da10322ac19209917b8ca Mon Sep 17 00:00:00 2001 +From d1a3991251e3d6d826ae757ac48ac36b4c93d424 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit ab70be7e2d971dd0238da10322ac19209917b8ca ] + @@ -34 +35,0 @@ -Cc: stable@dpdk.org @@ -43 +44 @@ -index e13ab15574..80d19cbfd6 100644 +index 1dbc98197d..b6aa52a333 100644