d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: unify power of 2 alignment check macro

Browse Source 
Substitute driver-defined IS_P2ALIGNED() with EFX_IS_P2ALIGNED()
defined in libefx.

Add type argument and cast value and alignment to one specified type.

Fixes: e1b944598579 ("net/sfc: build libefx")
Cc: stable@dpdk.org

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Andrew Rybchenko 2019-07-24 14:16:34 +01:00 committed by Ferruh Yigit
parent 827ad8232c
commit 0270853d94
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/sfc/base/ef10_rx.c
View File

@ -1119,12 +1119,12 @@ ef10_rx_qcreate(
rc = ENOTSUP;
goto fail9;
}
if (!IS_P2ALIGNED(es_max_dma_len,
if (!EFX_IS_P2ALIGNED(uint32_t, es_max_dma_len,
EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {
rc = EINVAL;
goto fail10;
}
if (!IS_P2ALIGNED(es_buf_stride,
if (!EFX_IS_P2ALIGNED(uint32_t, es_buf_stride,
EFX_RX_ES_SUPER_BUFFER_BUF_ALIGNMENT)) {
rc = EINVAL;
goto fail11;

4
drivers/net/sfc/base/efx.h
View File

@ -37,6 +37,10 @@ extern "C" {
#define EFX_P2ALIGN(_type, _value, _align) \
((_type)(_value) & -(_type)(_align))
/* Test if value is power of 2 aligned. */
#define EFX_IS_P2ALIGNED(_type, _value, _align) \
((((_type)(_value)) & ((_type)(_align) - 1)) == 0)
/* Return codes */
typedef __success(return == 0) int efx_rc_t;

43
drivers/net/sfc/efsys.h
View File

@ -69,13 +69,6 @@ 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 ISP2
#define ISP2(x) rte_is_power_of_2(x)
#endif
@ -231,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]; \
@ -248,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]; \
@ -266,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]; \
@ -287,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]); \
@ -304,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], \
@ -322,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), \
@ -387,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); \
@ -411,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); \
\
@ -433,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) \
@ -463,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) \
@ -488,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); \
\
@ -522,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) \