From cb343bfe5941ec361bd8ac4b2b3a5e97c9219976 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 19 Jun 2019 08:58:06 -0500 Subject: [PATCH] nvme: Fix nvme driver build on non-x86 Change-Id: Ia7a1dc56bcec69678e1fc2d8a427c24a32215bb8 --- src/add-ons/kernel/drivers/disk/nvme/compat/nvme_arch.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_arch.h b/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_arch.h index d06d2c34e8..d4d3a3e7fc 100644 --- a/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_arch.h +++ b/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_arch.h @@ -21,7 +21,14 @@ #define asm __asm__ #endif +#if defined(__i386__) || defined(__amd64__) #define nvme_wmb() __asm__ volatile("sfence" ::: "memory") +#elif defined(__ARM__) +#define nvme_wmb() __asm__ volatile("mcr p15, 0, %0, c7, c10, 5" :: "r" (0) : "memory") +#else +#warning Implement nvme memory barrier for arch! +#define nvme_wmb() __asm__ volatile("" ::: "memory") +#endif typedef uint8 __u8;