File ipxe.28cf9806d1632d378485005babec295da0c77fcf.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.28cf9806d1632d378485005babec295da0c77fcf.patch of Package xen (Revision f7307eb872017eecc0468286f683be74)

Currently displaying revision f7307eb872017eecc0468286f683be74 , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Sat, 27 Jun 2020 20:21:11 +0100
Subject: 28cf9806d1632d378485005babec295da0c77fcf

[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>
---
 src/drivers/net/intelvf.c | 18 ++++++++++--------
 src/drivers/net/intelvf.h |  8 +++++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

--- a/src/drivers/net/intelvf.c
+++ b/src/drivers/net/intelvf.c
@@ -43,52 +43,54 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  *
  ******************************************************************************
  */
 
 /**
  * Write message to mailbox
  *
  * @v intel		Intel device
  * @v msg		Message
  */
 static void intelvf_mbox_write ( struct intel_nic *intel,
 				 const union intelvf_msg *msg ) {
+	const struct intelvf_msg_raw *raw = &msg->raw;
 	unsigned int i;
 
 	/* Write message */
 	DBGC2 ( intel, "INTEL %p sending message", intel );
-	for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( msg->dword[0] ) ) ; i++){
-		DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), msg->dword[i] );
-		writel ( msg->dword[i], ( intel->regs + intel->mbox.mem +
-					  ( i * sizeof ( msg->dword[0] ) ) ) );
+	for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( raw->dword[0] ) ) ; i++){
+		DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), raw->dword[i] );
+		writel ( raw->dword[i], ( intel->regs + intel->mbox.mem +
+					  ( i * sizeof ( raw->dword[0] ) ) ) );
 	}
 	DBGC2 ( intel, "\n" );
 }
 
 /**
  * Read message from mailbox
  *
  * @v intel		Intel device
  * @v msg		Message
  */
 static void intelvf_mbox_read ( struct intel_nic *intel,
 				union intelvf_msg *msg ) {
+	struct intelvf_msg_raw *raw = &msg->raw;
 	unsigned int i;
 
 	/* Read message */
 	DBGC2 ( intel, "INTEL %p received message", intel );
-	for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( msg->dword[0] ) ) ; i++){
-		msg->dword[i] = readl ( intel->regs + intel->mbox.mem +
-					( i * sizeof ( msg->dword[0] ) ) );
-		DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), msg->dword[i] );
+	for ( i = 0 ; i < ( sizeof ( *msg ) / sizeof ( raw->dword[0] ) ) ; i++){
+		raw->dword[i] = readl ( intel->regs + intel->mbox.mem +
+					( i * sizeof ( raw->dword[0] ) ) );
+		DBGC2 ( intel, "%c%08x", ( i ? ':' : ' ' ), raw->dword[i] );
 	}
 	DBGC2 ( intel, "\n" );
 }
 
 /**
  * Poll mailbox
  *
  * @v intel		Intel device
  * @ret rc		Return status code
  *
  * Note that polling the mailbox may fail if the underlying PF is
  * reset.
--- a/src/drivers/net/intelvf.h
+++ b/src/drivers/net/intelvf.h
@@ -110,38 +110,44 @@ struct intelvf_msg_queues {
 	 * still be visible in received packets.  The Linux VF driver
 	 * handles this unexpected VLAN tag by simply ignoring any
 	 * unrecognised VLAN tags.
 	 *
 	 * We choose to strip and ignore the VLAN tag if this field
 	 * has a non-zero value.
 	 */
 	uint32_t vlan_thing;
 	/** Default queue */
 	uint32_t dflt;
 } __attribute__ (( packed ));
 
+/** Raw mailbox message */
+struct intelvf_msg_raw {
+	/** Raw dwords */
+	uint32_t dword[0];
+} __attribute__ (( packed ));
+
 /** Mailbox message */
 union intelvf_msg {
 	/** Message header */
 	uint32_t hdr;
 	/** MAC address message */
 	struct intelvf_msg_mac mac;
 	/** Version number message */
 	struct intelvf_msg_version version;
 	/** MTU message */
 	struct intelvf_msg_mtu mtu;
 	/** Queue configuration message */
 	struct intelvf_msg_queues queues;
 	/** Raw dwords */
-	uint32_t dword[0];
+	struct intelvf_msg_raw raw;
 };
 
 /** Maximum time to wait for mailbox message
  *
  * This is a policy decision.
  */
 #define INTELVF_MBOX_MAX_WAIT_MS 500
 
 extern int intelvf_mbox_msg ( struct intel_nic *intel, union intelvf_msg *msg );
 extern int intelvf_mbox_poll ( struct intel_nic *intel );
 extern int intelvf_mbox_wait ( struct intel_nic *intel );
 extern int intelvf_mbox_reset ( struct intel_nic *intel, uint8_t *hw_addr );

Places

File ipxe.28cf9806d1632d378485005babec295da0c77fcf.patch of Package xen (Revision f7307eb872017eecc0468286f683be74)

Places