git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/sfc: unify power of 2 alignment check macro
[dpdk.git] / drivers / net / sfc / efsys.h
diff --git a/drivers/net/sfc/efsys.h b/drivers/net/sfc/efsys.h
index fcc4f5f..eab5479 100644 (file)
--- a/drivers/net/sfc/efsys.h
+++ b/drivers/net/sfc/efsys.h
@@ -26,6 +26,7 @@
 #include <rte_io.h>
 
 #include "sfc_debug.h"
+#include "sfc_log.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,10 +48,6 @@ extern "C" {
 #include "efx_types.h"
 
 
-#ifndef _NOTE
-#define _NOTE(s)
-#endif
-
 typedef bool boolean_t;
 
 #ifndef B_FALSE
@@ -72,22 +69,7 @@ typedef bool boolean_t;
 #define MIN(v1, v2)    ((v1) < (v2) ? (v1) : (v2))
 #endif
 
-/* There are macros for alignment in DPDK, but we need to make a proper
- * correspondence here, if we want to re-use them at all
- */
-#ifndef IS_P2ALIGNED
-#define IS_P2ALIGNED(v, a)     ((((uintptr_t)(v)) & ((uintptr_t)(a) - 1)) == 0)
-#endif
-
-#ifndef P2ROUNDUP
-#define P2ROUNDUP(x, align)    (-(-(x) & -(align)))
-#endif
-
-#ifndef P2ALIGN
-#define P2ALIGN(_x, _a)                ((_x) & -(_a))
-#endif
-
-#ifndef IS2P
+#ifndef ISP2
 #define ISP2(x)                        rte_is_power_of_2(x)
 #endif
 
@@ -105,40 +87,6 @@ prefetch_read_once(const volatile void *addr)
        rte_prefetch_non_temporal(addr);
 }
 
-/* Modifiers used for Windows builds */
-#define __in
-#define __in_opt
-#define __in_ecount(_n)
-#define __in_ecount_opt(_n)
-#define __in_bcount(_n)
-#define __in_bcount_opt(_n)
-
-#define __out
-#define __out_opt
-#define __out_ecount(_n)
-#define __out_ecount_opt(_n)
-#define __out_bcount(_n)
-#define __out_bcount_opt(_n)
-#define __out_bcount_part(_n, _l)
-#define __out_bcount_part_opt(_n, _l)
-
-#define __deref_out
-
-#define __inout
-#define __inout_opt
-#define __inout_ecount(_n)
-#define __inout_ecount_opt(_n)
-#define __inout_bcount(_n)
-#define __inout_bcount_opt(_n)
-#define __inout_bcount_full_opt(_n)
-
-#define __deref_out_bcount_opt(n)
-
-#define __checkReturn
-#define __success(_x)
-
-#define __drv_when(_p, _c)
-
 /* Code inclusion options */
 
 
@@ -150,8 +98,8 @@ prefetch_read_once(const volatile void *addr)
 #define EFSYS_OPT_HUNTINGTON 1
 /* Enable SFN8xxx support */
 #define EFSYS_OPT_MEDFORD 1
-/* Disable SFN2xxx support (not supported yet) */
-#define EFSYS_OPT_MEDFORD2 0
+/* Enable SFN2xxx support */
+#define EFSYS_OPT_MEDFORD2 1
 #ifdef RTE_LIBRTE_SFC_EFX_DEBUG
 #define EFSYS_OPT_CHECK_REG 1
 #else
@@ -165,7 +113,7 @@ prefetch_read_once(const volatile void *addr)
 
 #define EFSYS_OPT_MAC_STATS 1
 
-#define EFSYS_OPT_LOOPBACK 0
+#define EFSYS_OPT_LOOPBACK 1
 
 #define EFSYS_OPT_MON_MCDI 0
 #define EFSYS_OPT_MON_STATS 0
@@ -178,6 +126,7 @@ prefetch_read_once(const volatile void *addr)
 #define EFSYS_OPT_VPD 0
 #define EFSYS_OPT_NVRAM 0
 #define EFSYS_OPT_BOOTCFG 0
+#define EFSYS_OPT_IMAGE_LAYOUT 0
 
 #define EFSYS_OPT_DIAG 0
 #define EFSYS_OPT_RX_SCALE 1
@@ -196,8 +145,16 @@ prefetch_read_once(const volatile void *addr)
 
 #define EFSYS_OPT_RX_PACKED_STREAM 0
 
+#define EFSYS_OPT_RX_ES_SUPER_BUFFER 1
+
 #define EFSYS_OPT_TUNNEL 1
 
+#define EFSYS_OPT_FW_SUBVARIANT_AWARE 1
+
+#define EFSYS_OPT_EVB 0
+
+#define EFSYS_OPT_MCDI_PROXY_AUTH_SERVER 0
+
 /* ID */
 
 typedef struct __efsys_identifier_s efsys_identifier_t;
@@ -267,7 +224,8 @@ typedef struct efsys_mem_s {
                volatile uint32_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_dword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_dword_t)));      \
                                                                        \
                _addr = (volatile uint32_t *)(_base + (_offset));       \
                (_edp)->ed_u32[0] = _addr[0];                           \
@@ -284,7 +242,8 @@ typedef struct efsys_mem_s {
                volatile uint64_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_qword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_qword_t)));      \
                                                                        \
                _addr = (volatile uint64_t *)(_base + (_offset));       \
                (_eqp)->eq_u64[0] = _addr[0];                           \
@@ -302,7 +261,8 @@ typedef struct efsys_mem_s {
                volatile __m128i *_addr;                                \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_oword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_oword_t)));      \
                                                                        \
                _addr = (volatile __m128i *)(_base + (_offset));        \
                (_eop)->eo_u128[0] = _addr[0];                          \
@@ -323,7 +283,8 @@ typedef struct efsys_mem_s {
                volatile uint32_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_dword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_dword_t)));      \
                                                                        \
                EFSYS_PROBE2(mem_writed, unsigned int, (_offset),       \
                                         uint32_t, (_edp)->ed_u32[0]);  \
@@ -340,7 +301,8 @@ typedef struct efsys_mem_s {
                volatile uint64_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_qword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_qword_t)));      \
                                                                        \
                EFSYS_PROBE3(mem_writeq, unsigned int, (_offset),       \
                                         uint32_t, (_eqp)->eq_u32[1],   \
@@ -358,7 +320,8 @@ typedef struct efsys_mem_s {
                volatile __m128i *_addr;                                \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_oword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_oword_t)));      \
                                                                        \
                                                                        \
                EFSYS_PROBE5(mem_writeo, unsigned int, (_offset),       \
@@ -374,6 +337,9 @@ typedef struct efsys_mem_s {
        } while (B_FALSE)
 
 
+#define        EFSYS_MEM_SIZE(_esmp)                                           \
+       ((_esmp)->esm_mz->len)
+
 #define EFSYS_MEM_ADDR(_esmp)                                          \
        ((_esmp)->esm_addr)
 
@@ -420,7 +386,8 @@ typedef struct efsys_bar_s {
                volatile uint32_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_dword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_dword_t)));      \
                _NOTE(CONSTANTCONDITION);                               \
                if (_lock)                                              \
                        SFC_BAR_LOCK(_esbp);                            \
@@ -444,7 +411,8 @@ typedef struct efsys_bar_s {
                volatile uint64_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_qword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_qword_t)));      \
                                                                        \
                SFC_BAR_LOCK(_esbp);                                    \
                                                                        \
@@ -466,7 +434,8 @@ typedef struct efsys_bar_s {
                volatile __m128i *_addr;                                \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_oword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_oword_t)));      \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
                if (_lock)                                              \
@@ -496,7 +465,8 @@ typedef struct efsys_bar_s {
                volatile uint32_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_dword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_dword_t)));      \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
                if (_lock)                                              \
@@ -521,7 +491,8 @@ typedef struct efsys_bar_s {
                volatile uint64_t *_addr;                               \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_qword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_qword_t)));      \
                                                                        \
                SFC_BAR_LOCK(_esbp);                                    \
                                                                        \
@@ -555,7 +526,8 @@ typedef struct efsys_bar_s {
                volatile __m128i *_addr;                                \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
-               SFC_ASSERT(IS_P2ALIGNED(_offset, sizeof(efx_oword_t))); \
+               SFC_ASSERT(EFX_IS_P2ALIGNED(size_t, _offset,            \
+                                           sizeof(efx_oword_t)));      \
                                                                        \
                _NOTE(CONSTANTCONDITION);                               \
                if (_lock)                                              \
@@ -725,7 +697,7 @@ typedef uint64_t    efsys_stat_t;
 #define EFSYS_ERR(_esip, _code, _dword0, _dword1)                      \
        do {                                                            \
                (void)(_esip);                                          \
-               RTE_LOG(ERR, PMD, "FATAL ERROR #%u (0x%08x%08x)\n",     \
+               SFC_GENERIC_LOG(ERR, "FATAL ERROR #%u (0x%08x%08x)",    \
                        (_code), (_dword0), (_dword1));                 \
                _NOTE(CONSTANTCONDITION);                               \
        } while (B_FALSE)
DPDK repo used for reviews