net/mlx5: fix flex item availability

[dpdk.git] / drivers / common / dpaax / compat.h

diff --git a/drivers/common/dpaax/compat.h b/drivers/common/dpaax/compat.h
index 5b11c2d..cbabc15 100644 (file)
--- a/drivers/common/dpaax/compat.h
+++ b/drivers/common/dpaax/compat.h
@@ -2,7 +2,7 @@
  *
  * Copyright 2011 Freescale Semiconductor, Inc.
  * All rights reserved.
- * Copyright 2019 NXP
+ * Copyright 2019-2020 NXP
  *
  */
 
@@ -10,10 +10,6 @@
 #define __COMPAT_H
 
 #include <sched.h>
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <stdint.h>
 #include <stdlib.h>
 #include <stddef.h>
@@ -34,7 +30,6 @@
 #include <assert.h>
 #include <dirent.h>
 #include <inttypes.h>
-#include <error.h>
 #include <rte_byteorder.h>
 #include <rte_atomic.h>
 #include <rte_spinlock.h>
@@ -60,7 +55,7 @@
 #define __packed       __rte_packed
 #endif
 #ifndef noinline
-#define noinline       __attribute__((noinline))
+#define noinline       __rte_noinline
 #endif
 #define L1_CACHE_BYTES 64
 #define ____cacheline_aligned __rte_aligned(L1_CACHE_BYTES)
@@ -150,7 +145,8 @@ static inline void out_be32(volatile void *__p, u32 val)
 #define dcbt_ro(p) __builtin_prefetch(p, 0)
 #define dcbt_rw(p) __builtin_prefetch(p, 1)
 
-#if defined(RTE_ARCH_ARM64)
+#if defined(RTE_ARCH_ARM)
+#if defined(RTE_ARCH_64)
 #define dcbz(p) { asm volatile("dc zva, %0" : : "r" (p) : "memory"); }
 #define dcbz_64(p) dcbz(p)
 #define dcbf(p) { asm volatile("dc cvac, %0" : : "r"(p) : "memory"); }
@@ -163,13 +159,14 @@ static inline void out_be32(volatile void *__p, u32 val)
                asm volatile("prfm pldl1keep, [%0, #64]" : : "r" (p));  \
        } while (0)
 
-#elif defined(RTE_ARCH_ARM)
+#else /* RTE_ARCH_32 */
 #define dcbz(p) memset((p), 0, 32)
 #define dcbz_64(p) memset((p), 0, 64)
 #define dcbf(p)        RTE_SET_USED(p)
 #define dcbf_64(p) dcbf(p)
 #define dccivac(p)     RTE_SET_USED(p)
 #define dcbit_ro(p)    RTE_SET_USED(p)
+#endif
 
 #else
 #define dcbz(p)        RTE_SET_USED(p)
@@ -342,16 +339,9 @@ static inline void copy_bytes(void *dest, const void *src, size_t sz)
 
 /* Allocator stuff */
 #define kmalloc(sz, t) rte_malloc(NULL, sz, 0)
+#define kzalloc(sz, t)  rte_zmalloc(NULL, sz, 0)
 #define vmalloc(sz)    rte_malloc(NULL, sz, 0)
-#define kfree(p)       { if (p) rte_free(p); }
-static inline void *kzalloc(size_t sz, gfp_t __foo __rte_unused)
-{
-       void *ptr = rte_malloc(NULL, sz, 0);
-
-       if (ptr)
-               memset(ptr, 0, sz);
-       return ptr;
-}
+#define kfree(p)       rte_free(p)
 
 static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)
 {
@@ -390,4 +380,7 @@ static inline unsigned long get_zeroed_page(gfp_t __foo __rte_unused)
 #define atomic_dec_return(v)    rte_atomic32_sub_return(v, 1)
 #define atomic_sub_and_test(i, v) (rte_atomic32_sub_return(v, i) == 0)
 
+/* Interface name len*/
+#define IF_NAME_MAX_LEN 16
+
 #endif /* __COMPAT_H */