net/bnx2x: fix meson build failure
PATCH 1/1 net/bnx2x: fix meson build failure
Use kernel headers for __le* types to avoid potential conflicts resulting in redefinition errors during Linux builds. Add check for BSD builds.
--- drivers/net/bnx2x/bnx2x_osal.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/bnx2x/bnx2x_osal.h +6 -0
@@ -8,7 +8,11 @@#ifndef BNX2X_OSAL_H #define BNX2X_OSAL_H +#ifdef __FreeBSD__#include <sys/stat.h> +#else +#include <linux/types.h> +#endif #if RTE_BYTE_ORDER ==RTE_LITTLE_ENDIAN #ifndef __LITTLE_ENDIAN
@@ -22,8 +26,10 @@#undef __LITTLE_ENDIAN#endif +#ifdef __FreeBSD__#define __le16 uint16_t#define __le32 uint32_t#define __le64 uint64_t +#endif #endif /* BNX2X_OSAL_H */
Signature · 1 line
2.18.0
01/11/2019 07:02, Rasesh Mody:
Quoted 3 lines
Use kernel headers for __le* types to avoid potential conflicts resulting in redefinition errors during Linux builds. Add check for BSD builds.
I don't see the error with my test builds. Please could you describe a case where it happens? And please provide an error log.
Quoted 7 lines
Fixes 38dff79ba736 ("net/bnx2x: update HSI")Signed-off-by Rasesh Mody <[email protected]>Tested-by Dharmik Thakkar <[email protected]>Tested-by Gavin Hu <[email protected]>---
+#ifdef__FreeBSD__
Please prefer RTE_EXEC_ENV_FREEBSD
PATCH v2 1/1 net/bnx2x: fix meson build failure
In reply to Rasesh ModyUse kernel headers for __le* types to avoid potential conflicts resulting in redefinition errors for Linux build environments. Add check for FreeBSD execution environments.
Without this fix, aarch64 builds can fail with error [1] below.
[1]
In file included from ../drivers/net/bnx2x/bnx2x.h:22,
from ../drivers/net/bnx2x/bnx2x_ethdev.c:8:
../drivers/net/bnx2x/bnx2x_osal.h:27:17: error: conflicting types for
‘uint64_t’
#define __le64 uint64_t
^~~~~~~~In file included from /usr/include/stdint.h:37,
from/usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9,
from../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16,
from ../drivers/net/bnx2x/bnx2x.h:17,
from ../drivers/net/bnx2x/bnx2x_ethdev.c:8:
/usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous
declaration of ‘uint64_t’ was here
typedef __uint64_t uint64_t;
^~~~~~~~v2:
Use RTE_EXEC_ENV_FREEBSD in place of __FreeBSD__
--- drivers/net/bnx2x/bnx2x.c | 4 ++-- drivers/net/bnx2x/bnx2x.h | 4 ++-- drivers/net/bnx2x/bnx2x_osal.h | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-)
drivers/net/bnx2x/bnx2x.c +2 -2
@@ -9581,7 +9581,7 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc)return -ENOMEM ; } -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_FREEBSD pci_read (sc,PCI_STATUS , &status,2 );if (!(status &PCI_STATUS_CAP_LIST )) {#else
@@ -9592,7 +9592,7 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc)return -1 ; } -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_FREEBSD pci_read (sc,PCI_CAPABILITY_LIST , &pci_cap.next,1 );#else pci_read (sc,PCIR_CAP_PTR , &pci_cap.next,1 );
drivers/net/bnx2x/bnx2x.h +2 -2
@@ -30,7 +30,7 @@#include "elink.h" -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_FREEBSD #include <linux/pci_regs.h> #define PCIY_PMG PCI_CAP_ID_PM
@@ -60,7 +60,7 @@#define IFM_10G_TWINAX 22/* 10GBase Twinax copper */ #define IFM_10G_T 26/* 10GBase-T - RJ45 */ -#ifndef __FreeBSD__ +#ifndef RTE_EXEC_ENV_FREEBSD #define PCIR_EXPRESS_DEVICE_STA PCI_EXP_TYPE_RC_EC#define PCIM_EXP_STA_TRANSACTION_PND PCI_EXP_DEVSTA_TRPND#define PCIR_EXPRESS_LINK_STA PCI_EXP_LNKSTA
drivers/net/bnx2x/bnx2x_osal.h +6 -0
@@ -8,7 +8,11 @@#ifndef BNX2X_OSAL_H #define BNX2X_OSAL_H +#ifdef RTE_EXEC_ENV_FREEBSD #include <sys/stat.h> +#else +#include <linux/types.h> +#endif #if RTE_BYTE_ORDER ==RTE_LITTLE_ENDIAN #ifndef __LITTLE_ENDIAN
@@ -22,8 +26,10 @@#undef __LITTLE_ENDIAN#endif +#ifdef RTE_EXEC_ENV_FREEBSD #define __le16 uint16_t#define __le32 uint32_t#define __le64 uint64_t +#endif #endif /* BNX2X_OSAL_H */
Signature · 1 line
2.18.0
Thomas Monjalon
Applied06/11/2019 06:45, Rasesh Mody:
Quoted 2 lines
Use kernel headers for __le* types to avoid potential conflicts resulting in redefinition errors for Linux build environments.
Errors happen only with "some" Linux environments.
Quoted 23 lines
Add check for FreeBSD execution environments.
Without this fix, aarch64 builds can fail with error [1] below.
[1]
In file included from../drivers/net/bnx2x/bnx2x.h:22,from ../drivers/net/bnx2x/bnx2x_ethdev.c:8: ../drivers/net/bnx2x/bnx2x_osal.h:27:17: error: conflicting types for ‘uint64_t’ #define __le64 uint64_t ^~~~~~~~In file included from
/usr/include/stdint.h:37,
from/usr/lib/gcc/aarch64-linux-gnu/8/include/stdint.h:9,
from../lib/librte_eal/common/include/arch/arm/rte_byteorder.h:16,from ../drivers/net/bnx2x/bnx2x.h:17, from ../drivers/net/bnx2x/bnx2x_ethdev.c:8: /usr/include/aarch64-linux-gnu/bits/stdint-uintn.h:27:20: note: previous declaration of ‘uint64_t’ was here typedef __uint64_t uint64_t; ^~~~~~~~
Quoted 4 lines
Fixes 38dff79ba736 ("net/bnx2x: update HSI")v2:
UseRTE_EXEC_ENV_FREEBSDin place of__FreeBSD__
It's a bit strange to change the existing __FreeBSD__ in this patch. I'll add a note to mention this change in the commit.
Quoted 3 lines
Signed-off-by Rasesh Mody <[email protected]>Tested-by Dharmik Thakkar <[email protected]>Tested-by Gavin Hu <[email protected]>
Applied, thanks