From 65062406421baea266924826ebcc49f1fae07bfa Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Thu, 9 Jan 2020 13:46:01 +0100 Subject: [PATCH] dde_linux: add dma_wmb/rmb barriers for arm_v7 and remove re-defined dma_wmb in fec driver --- repos/dde_linux/src/drivers/nic/fec/lx_emul.h | 2 -- repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/repos/dde_linux/src/drivers/nic/fec/lx_emul.h b/repos/dde_linux/src/drivers/nic/fec/lx_emul.h index 0b3b85b30..a515f1b1a 100644 --- a/repos/dde_linux/src/drivers/nic/fec/lx_emul.h +++ b/repos/dde_linux/src/drivers/nic/fec/lx_emul.h @@ -1933,8 +1933,6 @@ void *devm_kzalloc(struct device *dev, size_t size, gfp_t gfp); struct pm_qos_request {}; -#define dma_wmb() __asm__ __volatile__ ("dmb oshst" : : : "memory") - #include #endif /* _SRC__DRIVERS__NIC__FEC__LX_EMUL_H_ */ diff --git a/repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h b/repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h index ccc7957f0..43ce0cb73 100644 --- a/repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h +++ b/repos/dde_linux/src/include/spec/arm_v7/lx_emul/barrier.h @@ -19,8 +19,8 @@ #define rmb() mb() #define wmb() asm volatile ("dsb st": : :"memory") -#define dma_wmb() barrier() -#define dma_rmb() barrier() +#define dma_wmb() asm volatile ("dmb oshst": : : "memory") +#define dma_rmb() asm volatile ("dmb osh": : : "memory") /* * This is the "safe" implementation as needed for a configuration