[PATCH 23.11] net/ionic: fix build with Fedora Rawhide

[PATCH 23.11] net/ionic: fix build with Fedora Rawhide

[Timothy Redaelli]

Currently, a number of integer types are typedef'd to their corresponding
userspace or RTE values. This can be problematic if these types are
already defined somewhere else, as it would cause type collisions.
This patch changes the typedefs to #define macros which are only defined
if the types are not defined already.

Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter")

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
Backport of f0d9e787747d ("net/gve/base: fix build with Fedora Rawhide")
is also needed on stable branches. My commit is not needed on
main since it was fixed silently in 484027bf9452 ("common/ionic: create common
code library").
---
 drivers/net/ionic/ionic_osdep.h | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h
index 68f767b920..97188dfd59 100644
--- a/drivers/net/ionic/ionic_osdep.h
+++ b/drivers/net/ionic/ionic_osdep.h
@@ -30,14 +30,28 @@
 
 #define __iomem
 
-typedef uint8_t	 u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-
-typedef uint16_t __le16;
-typedef uint32_t __le32;
-typedef uint64_t __le64;
+#ifndef u8
+#define u8 uint8_t
+#endif
+#ifndef u16
+#define u16 uint16_t
+#endif
+#ifndef u32
+#define u32 uint32_t
+#endif
+#ifndef u64
+#define u64 uint64_t
+#endif
+
+#ifndef __le16
+#define __le16 rte_le16_t
+#endif
+#ifndef __le32
+#define __le32 rte_le32_t
+#endif
+#ifndef __le64
+#define __le64 rte_le64_t
+#endif
 
 #define ioread8(reg)		rte_read8(reg)
 #define ioread32(reg)		rte_read32(rte_le_to_cpu_32(reg))
-- 
2.47.0

Re: [PATCH 23.11] net/ionic: fix build with Fedora Rawhide

[David Marchand]

On Thu, Oct 24, 2024 at 11:30 AM Timothy Redaelli <tredaelli@redhat.com> wrote:
>
> Currently, a number of integer types are typedef'd to their corresponding
> userspace or RTE values. This can be problematic if these types are
> already defined somewhere else, as it would cause type collisions.
> This patch changes the typedefs to #define macros which are only defined
> if the types are not defined already.
>
> Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter")
>
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>

Copying driver maintainer.
The patch lgtm on the principle.


> ---
> Backport of f0d9e787747d ("net/gve/base: fix build with Fedora Rawhide")
> is also needed on stable branches. My commit is not needed on
> main since it was fixed silently in 484027bf9452 ("common/ionic: create common
> code library").
> ---

Indeed, it is a pity this got mixed in the mentionned commit.

This may be needed in others LTS.
Copying Luca and Kevin.


-- 
David Marchand

Re: [PATCH 23.11] net/ionic: fix build with Fedora Rawhide

[Xueming Li]

[-- Attachment #1: Type: text/plain, Size: 1526 bytes --]

Hi Timothy,

Thanks for taking care of this, patch applied to 23.11.3 LTS queue.

Regards,
Xueming
________________________________
From: David Marchand <david.marchand@redhat.com>
Sent: Thursday, October 24, 2024 6:12 PM
To: Timothy Redaelli <tredaelli@redhat.com>
Cc: stable@dpdk.org <stable@dpdk.org>; Andrew Boyer <andrew.boyer@amd.com>; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com>
Subject: Re: [PATCH 23.11] net/ionic: fix build with Fedora Rawhide

On Thu, Oct 24, 2024 at 11:30 AM Timothy Redaelli <tredaelli@redhat.com> wrote:
>
> Currently, a number of integer types are typedef'd to their corresponding
> userspace or RTE values. This can be problematic if these types are
> already defined somewhere else, as it would cause type collisions.
> This patch changes the typedefs to #define macros which are only defined
> if the types are not defined already.
>
> Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter")
>
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>

Copying driver maintainer.
The patch lgtm on the principle.


> ---
> Backport of f0d9e787747d ("net/gve/base: fix build with Fedora Rawhide")
> is also needed on stable branches. My commit is not needed on
> main since it was fixed silently in 484027bf9452 ("common/ionic: create common
> code library").
> ---

Indeed, it is a pity this got mixed in the mentionned commit.

This may be needed in others LTS.
Copying Luca and Kevin.


--
David Marchand


[-- Attachment #2: Type: text/html, Size: 3439 bytes --]