narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[intel] Avoid spurious compiler warning on GCC 10 

GCC 10 produces a spurious warning about an out-of-bounds array access
for the unsized raw dword array in union intelvf_msg.

Avoid the warning by embedding the zero-length array within a struct.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/117/head
Michael Brown 2020-06-27 20:21:11 +01:00
parent f982a71297
commit 28cf9806d1
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/drivers/net/intelvf.c
View File

@ -52,14 +52,15 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
*/ */
static void intelvf_mbox_write ( struct intel_nic *intel, static void intelvf_mbox_write ( struct intel_nic *intel,
const union intelvf_msg *msg ) { const union intelvf_msg *msg ) {
const struct intelvf_msg_raw *raw = &msg->raw;
unsigned int i; unsigned int i;
/* Write message */ /* Write message */
DBGC2 ( intel, "INTEL %p sending message", intel ); DBGC2 ( intel, "INTEL %p sending message", intel );
for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( msg->dword[0] ) ) ; i++){ for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( raw->dword[0] ) ) ; i++){
DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), msg->dword[i] ); DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), raw->dword[i] );
writel ( msg->dword[i], ( intel->regs + intel->mbox.mem + writel ( raw->dword[i], ( intel->regs + intel->mbox.mem +
( i * sizeof ( msg->dword[0] ) ) ) ); ( i * sizeof ( raw->dword[0] ) ) ) );
} }
DBGC2 ( intel, "\n" ); DBGC2 ( intel, "\n" );
} }
@ -72,14 +73,15 @@ static void intelvf_mbox_write ( struct intel_nic *intel,
*/ */
static void intelvf_mbox_read ( struct intel_nic *intel, static void intelvf_mbox_read ( struct intel_nic *intel,
union intelvf_msg *msg ) { union intelvf_msg *msg ) {
struct intelvf_msg_raw *raw = &msg->raw;
unsigned int i; unsigned int i;
/* Read message */ /* Read message */
DBGC2 ( intel, "INTEL %p received message", intel ); DBGC2 ( intel, "INTEL %p received message", intel );
for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( msg->dword[0] ) ) ; i++){ for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( raw->dword[0] ) ) ; i++){
msg->dword[i] = readl ( intel->regs + intel->mbox.mem + raw->dword[i] = readl ( intel->regs + intel->mbox.mem +
( i * sizeof ( msg->dword[0] ) ) ); ( i * sizeof ( raw->dword[0] ) ) );
DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), msg->dword[i] ); DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), raw->dword[i] );
} }
DBGC2 ( intel, "\n" ); DBGC2 ( intel, "\n" );
} }

8
src/drivers/net/intelvf.h
View File

@ -119,6 +119,12 @@ struct intelvf_msg_queues {
uint32_t dflt; uint32_t dflt;
} __attribute__ (( packed )); } __attribute__ (( packed ));
/** Raw mailbox message */
struct intelvf_msg_raw {
/** Raw dwords */
uint32_t dword[0];
} __attribute__ (( packed ));
/** Mailbox message */ /** Mailbox message */
union intelvf_msg { union intelvf_msg {
/** Message header */ /** Message header */
@ -132,7 +138,7 @@ union intelvf_msg {
/** Queue configuration message */ /** Queue configuration message */
struct intelvf_msg_queues queues; struct intelvf_msg_queues queues;
/** Raw dwords */ /** Raw dwords */
uint32_t dword[0]; struct intelvf_msg_raw raw;
}; };
/** Maximum time to wait for mailbox message /** Maximum time to wait for mailbox message