Re: [dpdk-dev] [PATCH] net/bnx2x: fix meson build failure

Re: [dpdk-dev] [PATCH] net/bnx2x: fix meson build failure

[Rasesh Mody]

>From: Thomas Monjalon <thomas@monjalon.net>
>Sent: Tuesday, November 05, 2019 10:15 AM
>
>01/11/2019 07:02, Rasesh Mody:
>> 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.
>
Without this change, the aarch64 build failed 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;
                    ^~~~~~~~
The details of build environment and complete error log can be found at
https://bugs.dpdk.org/show_bug.cgi?id=355

>> Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
>>
>> Signed-off-by: Rasesh Mody <rmody@marvell.com>
>> Tested-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
>> Tested-by: Gavin Hu <gavin.hu@arm.com>
>> ---
>> +#ifdef __FreeBSD__
>
>Please prefer RTE_EXEC_ENV_FREEBSD
>
I'll send v2 replacing all __FreeBSD__ with RTE_EXEC_ENV_FREEBSD.

Re: [dpdk-dev] [PATCH] net/bnx2x: fix meson build failure

[Thomas Monjalon]

01/11/2019 07:02, Rasesh Mody:
> 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.

> Fixes: 38dff79ba736 ("net/bnx2x: update HSI")
> 
> Signed-off-by: Rasesh Mody <rmody@marvell.com>
> Tested-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
> Tested-by: Gavin Hu <gavin.hu@arm.com>
> ---
> +#ifdef __FreeBSD__

Please prefer RTE_EXEC_ENV_FREEBSD

[dpdk-dev] [PATCH] net/bnx2x: fix meson build failure

[Rasesh Mody]

Use kernel headers for __le* types to avoid potential conflicts
resulting in redefinition errors during Linux builds. Add check
for BSD builds.

Fixes: 38dff79ba736 ("net/bnx2x: update HSI")

Signed-off-by: Rasesh Mody <rmody@marvell.com>
Tested-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Tested-by: Gavin Hu <gavin.hu@arm.com>
---
 drivers/net/bnx2x/bnx2x_osal.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/bnx2x/bnx2x_osal.h b/drivers/net/bnx2x/bnx2x_osal.h
index 7cd293259..72e4b6d6b 100644
--- a/drivers/net/bnx2x/bnx2x_osal.h
+++ b/drivers/net/bnx2x/bnx2x_osal.h
@@ -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 */
-- 
2.18.0