From 8d648cbb96115bd2372c082bd3509eb91c66986a Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Mon, 28 Jan 2019 17:09:03 +0800 Subject: [PATCH] Revert "scsi: mpt3sas: fix memory ordering on 64bit writes" euler inclusion category: feature Bugzilla: N/A CVE: N/A Using lts patch instead of this patch. ---------------------------------------- This reverts commit 8ed10888e6280e58452f5da15a3e99f11a373c45. Signed-off-by: Yang Yingliang --- drivers/scsi/mpt3sas/mpt3sas_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index b59bba3e6516..59d7844ee022 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.c +++ b/drivers/scsi/mpt3sas/mpt3sas_base.c @@ -3344,9 +3344,8 @@ _base_mpi_ep_writeq(__u64 b, volatile void __iomem *addr, static inline void _base_writeq(__u64 b, volatile void __iomem *addr, spinlock_t *writeq_lock) { - wmb(); __raw_writeq(b, addr); - barrier(); + mmiowb(); } #else static inline void -- GitLab