sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

smp/spinlock: Do not define barrier() globally

Browse Source 
It's not stricly related to spinlocks. If defined, a better
location should be found and the name collisions with other
barrier() defined in nb/intel solved.

Change-Id: Iae187b5bcc249c2a4bc7bee80d37e34c13d9e63d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43810
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2020-07-19 22:24:17 +03:00
committed by Patrick Georgi
parent 0199d3bd7f
commit eb8bfd0828
4 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/arch/arm/include/armv4/arch/smp/spinlock.h
View File

@@ -4,7 +4,6 @@
#define _ARCH_SMP_SPINLOCK_H #define _ARCH_SMP_SPINLOCK_H
#define DECLARE_SPIN_LOCK(x) #define DECLARE_SPIN_LOCK(x)
#define barrier() do {} while (0)
#define spin_is_locked(lock) 0 #define spin_is_locked(lock) 0
#define spin_unlock_wait(lock) do {} while (0) #define spin_unlock_wait(lock) do {} while (0)
#define spin_lock(lock) do {} while (0) #define spin_lock(lock) do {} while (0)

2
src/arch/x86/include/arch/smp/spinlock.h
View File

@@ -29,6 +29,7 @@ typedef struct {
#define barrier() __asm__ __volatile__("" : : : "memory") #define barrier() __asm__ __volatile__("" : : : "memory")
#define spin_is_locked(x) (*(volatile char *)(&(x)->lock) <= 0) #define spin_is_locked(x) (*(volatile char *)(&(x)->lock) <= 0)
#define spin_unlock_wait(x) do { barrier(); } while (spin_is_locked(x)) #define spin_unlock_wait(x) do { barrier(); } while (spin_is_locked(x))
#undef barrier
#define spin_lock_string \ #define spin_lock_string \
"\n1:\t" \ "\n1:\t" \
@@ -65,7 +66,6 @@ static __always_inline void spin_unlock(spinlock_t *lock)
#else #else
#define DECLARE_SPIN_LOCK(x) #define DECLARE_SPIN_LOCK(x)
#define barrier() do {} while (0)
#define spin_is_locked(lock) 0 #define spin_is_locked(lock) 0
#define spin_unlock_wait(lock) do {} while (0) #define spin_unlock_wait(lock) do {} while (0)
#define spin_lock(lock) do {} while (0) #define spin_lock(lock) do {} while (0)

1
src/include/smp/spinlock.h
View File

@@ -6,7 +6,6 @@
#else /* !CONFIG_SMP */ #else /* !CONFIG_SMP */
#define DECLARE_SPIN_LOCK(x) #define DECLARE_SPIN_LOCK(x)
#define barrier() do {} while (0)
#define spin_is_locked(lock) 0 #define spin_is_locked(lock) 0
#define spin_unlock_wait(lock) do {} while (0) #define spin_unlock_wait(lock) do {} while (0)
#define spin_lock(lock) do {} while (0) #define spin_lock(lock) do {} while (0)

1
src/soc/amd/picasso/psp_verstage/include/arch/smp/spinlock.h
View File

@@ -4,7 +4,6 @@
#define _ARCH_SMP_SPINLOCK_H #define _ARCH_SMP_SPINLOCK_H
#define DECLARE_SPIN_LOCK(x) #define DECLARE_SPIN_LOCK(x)
#define barrier() do {} while (0)
#define spin_is_locked(lock) 0 #define spin_is_locked(lock) 0
#define spin_unlock_wait(lock) do {} while (0) #define spin_unlock_wait(lock) do {} while (0)
#define spin_lock(lock) do {} while (0) #define spin_lock(lock) do {} while (0)