arch/riscv: Fix some SMP related headers

Change-Id: I58419450dbe34741b4f5b4920f435fdb91e9df22
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61143
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>

src/arch/riscv/include/arch/barrier.h

@@ -7,4 +7,6 @@ static inline void mb(void)  { asm volatile("fence"); }
 static inline void rmb(void) { asm volatile("fence"); }
 static inline void wmb(void) { asm volatile("fence"); }
 
+#define barrier() { asm volatile ("fence" ::: "memory"); }
+
 #endif /* __ARCH_BARRIER_H__ */

src/arch/riscv/include/arch/smp/spinlock.h

@@ -3,11 +3,9 @@
 #ifndef ARCH_SMP_SPINLOCK_H
 #define ARCH_SMP_SPINLOCK_H
 
-#include <arch/encoding.h>
+#include <arch/barrier.h>
 #include <arch/smp/atomic.h>
 
-#define barrier() { asm volatile ("fence" ::: "memory"); }
-
 typedef struct {
 	atomic_t lock;
 } spinlock_t;

src/arch/riscv/smp.c

@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <arch/barrier.h>
 #include <arch/encoding.h>
 #include <arch/smp/smp.h>
-#include <arch/smp/spinlock.h>
-#include <mcall.h>
+#include <arch/smp/atomic.h>
 #include <console/console.h>
+#include <mcall.h>
 
 void smp_pause(int working_hartid)
 {