From: Andrew Rybchenko Date: Fri, 20 Jan 2017 13:53:50 +0000 (+0000) Subject: net/sfc: use eal I/O device memory read/write API X-Git-Tag: spdx-start~4616 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=c4378dacc426896a9108dcd3f891971749aebed2;p=dpdk.git net/sfc: use eal I/O device memory read/write API Use relaxed version of these functions to guarantee no changes on the step. Signed-off-by: Andrew Rybchenko --- diff --git a/drivers/net/sfc/efsys.h b/drivers/net/sfc/efsys.h index fb2f3b5960..a024b6c419 100644 --- a/drivers/net/sfc/efsys.h +++ b/drivers/net/sfc/efsys.h @@ -43,6 +43,7 @@ #include #include #include +#include #include "sfc_debug.h" @@ -440,7 +441,7 @@ typedef struct efsys_bar_s { \ _addr = (volatile uint32_t *)(_base + (_offset)); \ rte_rmb(); \ - (_edp)->ed_u32[0] = _addr[0]; \ + (_edp)->ed_u32[0] = rte_read32_relaxed(_addr); \ \ EFSYS_PROBE2(bar_readd, unsigned int, (_offset), \ uint32_t, (_edp)->ed_u32[0]); \ @@ -463,7 +464,7 @@ typedef struct efsys_bar_s { \ _addr = (volatile uint64_t *)(_base + (_offset)); \ rte_rmb(); \ - (_eqp)->eq_u64[0] = _addr[0]; \ + (_eqp)->eq_u64[0] = rte_read64_relaxed(_addr); \ \ EFSYS_PROBE3(bar_readq, unsigned int, (_offset), \ uint32_t, (_eqp)->eq_u32[1], \ @@ -487,6 +488,7 @@ typedef struct efsys_bar_s { \ _addr = (volatile __m128i *)(_base + (_offset)); \ rte_rmb(); \ + /* There is no rte_read128_relaxed() yet */ \ (_eop)->eo_u128[0] = _addr[0]; \ \ EFSYS_PROBE5(bar_reado, unsigned int, (_offset), \ @@ -518,7 +520,7 @@ typedef struct efsys_bar_s { uint32_t, (_edp)->ed_u32[0]); \ \ _addr = (volatile uint32_t *)(_base + (_offset)); \ - _addr[0] = (_edp)->ed_u32[0]; \ + rte_write32_relaxed((_edp)->ed_u32[0], _addr); \ rte_wmb(); \ \ _NOTE(CONSTANTCONDITION); \ @@ -542,7 +544,7 @@ typedef struct efsys_bar_s { uint32_t, (_eqp)->eq_u32[0]); \ \ _addr = (volatile uint64_t *)(_base + (_offset)); \ - _addr[0] = (_eqp)->eq_u64[0]; \ + rte_write64_relaxed((_eqp)->eq_u64[0], _addr); \ rte_wmb(); \ \ SFC_BAR_UNLOCK(_esbp); \ @@ -580,6 +582,7 @@ typedef struct efsys_bar_s { uint32_t, (_eop)->eo_u32[0]); \ \ _addr = (volatile __m128i *)(_base + (_offset)); \ + /* There is no rte_write128_relaxed() yet */ \ _addr[0] = (_eop)->eo_u128[0]; \ rte_wmb(); \ \