54 lines
2.1 KiB
Diff
54 lines
2.1 KiB
Diff
|
From 4d4b866a158e5079dcac3f6533c06c4acdf2dd69 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Amit Prakash Shukla <amitprakashs@marvell.com>
|
|||
|
|
Date: Wed, 24 Aug 2022 19:33:39 +0530
|
|||
|
|
Subject: [PATCH] net/qede/base: fix 32-bit build with GCC 12
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
[ upstream commit acc0ed087cd1ce6464f63489ab17eca52b0c94b2 ]
|
|||
|
|
|
|||
|
|
A pointer is passed to a macro and it seems mistakenly referenced.
|
|||
|
|
This issue is seen only when compiling with GCC 12 for 32-bit:
|
|||
|
|
|
|||
|
|
drivers/net/qede/base/ecore_init_fw_funcs.c:1418:25:
|
|||
|
|
error: array subscript 1 is outside array bounds of ‘u32[1]’
|
|||
|
|
{aka ‘unsigned int[1]’} [-Werror=array-bounds]
|
|||
|
|
1418 | ecore_wr(dev, ptt, ((addr) + (4 * i)), \
|
|||
|
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|||
|
|
1419 | ((u32 *)&(arr))[i]); \
|
|||
|
|
| ~~~~~~~~~~~~~~~~~~~
|
|||
|
|
drivers/net/qede/base/ecore_init_fw_funcs.c:1465:17:
|
|||
|
|
note: in expansion of macro ‘ARR_REG_WR’
|
|||
|
|
1465 | ARR_REG_WR(p_hwfn, p_ptt, addr, pData, len_in_dwords);
|
|||
|
|
| ^~~~~~~~~~
|
|||
|
|
drivers/net/qede/base/ecore_init_fw_funcs.c:1439:35:
|
|||
|
|
note: at offset 4 into object ‘pData’ of size 4
|
|||
|
|
1439 | u32 *pData,
|
|||
|
|
| ~~~~~^~~~~
|
|||
|
|
|
|||
|
|
Fixes: 3b307c55f2ac ("net/qede/base: update FW to 8.40.25.0")
|
|||
|
|
|
|||
|
|
Signed-off-by: Amit Prakash Shukla <amitprakashs@marvell.com>
|
|||
|
|
Acked-by: Thomas Monjalon <thomas@monjalon.net>
|
|||
|
|
---
|
|||
|
|
drivers/net/qede/base/ecore_init_fw_funcs.c | 2 +-
|
|||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|||
|
|
|
|||
|
|
diff --git a/drivers/net/qede/base/ecore_init_fw_funcs.c b/drivers/net/qede/base/ecore_init_fw_funcs.c
|
|||
|
|
index 6a52f32cc9..4e4d1dc374 100644
|
|||
|
|
--- a/drivers/net/qede/base/ecore_init_fw_funcs.c
|
|||
|
|
+++ b/drivers/net/qede/base/ecore_init_fw_funcs.c
|
|||
|
|
@@ -1416,7 +1416,7 @@ void ecore_init_brb_ram(struct ecore_hwfn *p_hwfn,
|
|||
|
|
u32 i; \
|
|||
|
|
for (i = 0; i < (arr_size); i++) \
|
|||
|
|
ecore_wr(dev, ptt, ((addr) + (4 * i)), \
|
|||
|
|
- ((u32 *)&(arr))[i]); \
|
|||
|
|
+ ((u32 *)(arr))[i]); \
|
|||
|
|
} while (0)
|
|||
|
|
|
|||
|
|
#ifndef DWORDS_TO_BYTES
|
|||
|
|
--
|
|||
|
|
2.23.0
|
|||
|
|
|