From: Michael Brown <mcb30@ipxe.org>
Date: Sat, 13 Jun 2026 15:01:35 +0000 (+0100)
Subject: [build] Fix building for big-endian targets
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfdbd1c4e023afb1ca2dc1c65c2a82076a330c57;p=thirdparty%2Fipxe.git

[build] Fix building for big-endian targets

Fix build errors that arise when building for a big-endian target such
as s390x.  (Runtime endianness errors may remain: this fixes only
those errors that are detected at build time.)

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/bus/pcibridge.c b/src/drivers/bus/pcibridge.c
index 67c97589f..79e86f565 100644
--- a/src/drivers/bus/pcibridge.c
+++ b/src/drivers/bus/pcibridge.c
@@ -82,7 +82,7 @@ static int pcibridge_probe ( struct pci_device *pci ) {
 
 	/* Read bus configuration */
 	pci_read_config_dword ( pci, PCI_PRIMARY, &bridge->buses );
-	cpu_to_le32s ( &buses );
+	cpu_to_le32s ( &bridge->buses );
 
 	/* Read memory base and limit */
 	pci_read_config_word ( pci, PCI_MEM_BASE, &base );
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index 03b394e6b..87ca8b36a 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -380,7 +380,7 @@ epic100_poll(struct nic *nic, int retrieve)
     unsigned long status;
     entry = cur_rx % RX_RING_SIZE;
 
-    if ((rx_ring[entry].status & cpu_to_le32(RRING_OWN)) == RRING_OWN)
+    if (rx_ring[entry].status & cpu_to_le32(RRING_OWN))
 	return (0);
 
     if ( ! retrieve ) return 1;
diff --git a/src/drivers/net/vxge/vxge_config.c b/src/drivers/net/vxge/vxge_config.c
index 8c6ee9e96..3663e0d86 100644
--- a/src/drivers/net/vxge/vxge_config.c
+++ b/src/drivers/net/vxge/vxge_config.c
@@ -739,17 +739,16 @@ __vxge_hw_legacy_swapper_set(struct vxge_hw_legacy_reg __iomem *legacy_reg)
 enum vxge_hw_status
 __vxge_hw_vpath_swapper_set(struct vxge_hw_vpath_reg __iomem *vpath_reg)
 {
-	vxge_trace();
-
-#if (__BYTE_ORDER != __BIG_ENDIAN)
 	u64 val64;
+	vxge_trace();
 
-	val64 = readq(&vpath_reg->vpath_general_cfg1);
-	wmb();
-	val64 |= VXGE_HW_VPATH_GENERAL_CFG1_CTL_BYTE_SWAPEN;
-	writeq(val64, &vpath_reg->vpath_general_cfg1);
-	wmb();
-#endif
+	if (__BYTE_ORDER != __BIG_ENDIAN) {
+		val64 = readq(&vpath_reg->vpath_general_cfg1);
+		wmb();
+		val64 |= VXGE_HW_VPATH_GENERAL_CFG1_CTL_BYTE_SWAPEN;
+		writeq(val64, &vpath_reg->vpath_general_cfg1);
+		wmb();
+	}
 	return VXGE_HW_OK;
 }
 
@@ -1372,10 +1371,9 @@ __vxge_hw_vpath_kdfc_configure(struct __vxge_hw_device *hldev, u32 vp_id)
 
 	val64 |= VXGE_HW_KDFC_TRPL_FIFO_0_CTRL_MODE(
 		 VXGE_HW_KDFC_TRPL_FIFO_0_CTRL_MODE_NON_OFFLOAD_ONLY) |
-#if (__BYTE_ORDER != __BIG_ENDIAN)
-		 VXGE_HW_KDFC_TRPL_FIFO_0_CTRL_SWAP_EN |
-#endif
 		 VXGE_HW_KDFC_TRPL_FIFO_0_CTRL_SELECT(0);
+	if (__BYTE_ORDER != __BIG_ENDIAN)
+		val64 |= VXGE_HW_KDFC_TRPL_FIFO_0_CTRL_SWAP_EN;
 
 	writeq(val64, &vp_reg->kdfc_trpl_fifo_0_ctrl);
 	writeq((u64)0, &vp_reg->kdfc_trpl_fifo_0_wb_address);
diff --git a/src/include/ipxe/ieee80211.h b/src/include/ipxe/ieee80211.h
index 4e44f4349..0e3eeeeb8 100644
--- a/src/include/ipxe/ieee80211.h
+++ b/src/include/ipxe/ieee80211.h
@@ -849,7 +849,7 @@ static inline size_t ieee80211_rsn_size ( int npair, int nauth, int npmkid,
 /** Make OUI plus type byte into 32-bit integer for easy comparison */
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define _MKOUI( a, b, c, t )	\
-		( ( ( a ) << 24 ) | ( ( b ) << 16 ) | ( ( c ) << 8 ) | ( d ) )
+		( ( ( a ) << 24 ) | ( ( b ) << 16 ) | ( ( c ) << 8 ) | ( t ) )
 #define  OUI_ORG_MASK		0xFFFFFF00
 #define  OUI_TYPE_MASK		0x000000FF
 #else