net/thunderx: use I/O device memory read/write API

Replace the raw I/O device memory read/write access with eal
abstraction for I/O device memory read/write access to fix portability
issues across different architectures.

Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
This commit is contained in:
Jerin Jacob 2017-01-18 06:51:40 +05:30 committed by Thomas Monjalon
parent fcbf1e14de
commit 88b2ced404

View File

@ -69,31 +69,15 @@
#include <rte_ether.h>
#define NICVF_MAC_ADDR_SIZE ETHER_ADDR_LEN
#include <rte_io.h>
#define nicvf_addr_write(addr, val) rte_write64_relaxed((val), (void *)(addr))
#define nicvf_addr_read(addr) rte_read64_relaxed((void *)(addr))
/* ARM64 specific functions */
#if defined(RTE_ARCH_ARM64)
#define nicvf_prefetch_store_keep(_ptr) ({\
asm volatile("prfm pstl1keep, %a0\n" : : "p" (_ptr)); })
static inline void __attribute__((always_inline))
nicvf_addr_write(uintptr_t addr, uint64_t val)
{
asm volatile(
"str %x[val], [%x[addr]]"
:
: [val] "r" (val), [addr] "r" (addr));
}
static inline uint64_t __attribute__((always_inline))
nicvf_addr_read(uintptr_t addr)
{
uint64_t val;
asm volatile(
"ldr %x[val], [%x[addr]]"
: [val] "=r" (val)
: [addr] "r" (addr));
return val;
}
#define NICVF_LOAD_PAIR(reg1, reg2, addr) ({ \
asm volatile( \
@ -106,18 +90,6 @@ nicvf_addr_read(uintptr_t addr)
#define nicvf_prefetch_store_keep(_ptr) do {} while (0)
static inline void __attribute__((always_inline))
nicvf_addr_write(uintptr_t addr, uint64_t val)
{
*(volatile uint64_t *)addr = val;
}
static inline uint64_t __attribute__((always_inline))
nicvf_addr_read(uintptr_t addr)
{
return *(volatile uint64_t *)addr;
}
#define NICVF_LOAD_PAIR(reg1, reg2, addr) \
do { \
reg1 = nicvf_addr_read((uintptr_t)addr); \