Skip to contentSkip to conversation

lib: sbi: Have spinlock checks return bool

PATCH New Daniel Schaefer 2 participants 2 messages May 13, 2021 – May 14, 2021 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib: sbi: Have spinlock checks return bool

spin_lock_check already returned bool in the source file but not in the header. With some toolchains that causes an error, as it should.

Because it and related functions all essentially return a bool, we can use this opportunity to change them.

---
 include/sbi/riscv_locks.h | 4 ++--
 lib/sbi/riscv_locks.c     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
include/sbi/riscv_locks.h +2 -2
index 492935f5d60b..38d9cbeb7b2a 100644
@@ -34,9 +34,9 @@ typedef struct {
 #define DEFINE_SPIN_LOCK(x)	\
 	spinlock_t SPIN_LOCK_INIT(x)
 
-int spin_lock_check(spinlock_t *lock);
+bool spin_lock_check(spinlock_t *lock);
 
-int spin_trylock(spinlock_t *lock);
+bool spin_trylock(spinlock_t *lock);
 
 void spin_lock(spinlock_t *lock);
 
lib/sbi/riscv_locks.c +3 -3
index 75b443bd35b8..acab7769240b 100644
@@ -8,7 +8,7 @@
 #include <sbi/riscv_barrier.h>
 #include <sbi/riscv_locks.h>
 
-static inline int spin_lock_unlocked(spinlock_t lock)
+static inline bool spin_lock_unlocked(spinlock_t lock)
 {
 	return lock.owner == lock.next;
 }
@@ -19,7 +19,7 @@ bool spin_lock_check(spinlock_t *lock)
 	return !spin_lock_unlocked(*lock);
 }
 
-int spin_trylock(spinlock_t *lock)
+bool spin_trylock(spinlock_t *lock)
 {
 	unsigned long inc = 1u << TICKET_SHIFT;
 	unsigned long mask = 0xffffu << TICKET_SHIFT;
@@ -42,7 +42,7 @@ int spin_trylock(spinlock_t *lock)
 		: "r"(inc), "r"(mask), "I"(TICKET_SHIFT)
 		: "memory");
 
-	return !l0;
+	return l0 == 0;
 }
 
 void spin_lock(spinlock_t *lock)
Signature · 1 line
2.30.1
Applied
#1 lore raw

PATCH 1/1 lib: sbi: Have spinlock checks return bool

Quoted 14 lines

-----Original Message-----
From: opensbi <[email protected]> On Behalf Of Daniel Schaefer
Sent: 13 May 2021 10:23
To: opensbi at lists.infradead.org
Cc: Abner Chang <[email protected]>; Anup Patel <[email protected]>
Subject: [PATCH v1 1/1] lib: sbi: Have spinlock checks return bool

spin_lock_check already returned bool in the source file but not in the header. With some toolchains that causes an error, as it should.

Quoted 6 lines

Because it and related functions all essentially return a bool, we can use this opportunity to change them.

Looks good to me.

Applied this patch to the riscv/opensbi repo

Thanks,
Anup

Quoted 60 lines
---
 include/sbi/riscv_locks.h | 4 ++--
 lib/sbi/riscv_locks.c     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
include/sbi/riscv_locks.h index renamed from include/sbi/riscv_locks.h +0 -0

492935f5d60b..38d9cbeb7b2a 100644

include/sbi/riscv_locks.h +2 -2
@@ -34,9 +34,9 @@ typedef struct {
 #define DEFINE_SPIN_LOCK(x)	\
 	spinlock_t SPIN_LOCK_INIT(x)
 
-int spin_lock_check(spinlock_t *lock);
+bool spin_lock_check(spinlock_t *lock);
 
-int spin_trylock(spinlock_t *lock);
+bool spin_trylock(spinlock_t *lock);
 
 void spin_lock(spinlock_t *lock);
 
lib/sbi/riscv_locks.c index renamed from lib/sbi/riscv_locks.c +0 -0

75b443bd35b8..acab7769240b 100644

lib/sbi/riscv_locks.c +2 -2
@@ -8,7 +8,7 @@
 #include <sbi/riscv_barrier.h>
 #include <sbi/riscv_locks.h>
 
-static inline int spin_lock_unlocked(spinlock_t lock)
+static inline bool spin_lock_unlocked(spinlock_t lock)
 {
 	return lock.owner == lock.next;
 }
@@ -19,7 +19,7 @@ bool spin_lock_check(spinlock_t *lock)
 	return !spin_lock_unlocked(*lock);
 }
 
-int spin_trylock(spinlock_t *lock)
+bool spin_trylock(spinlock_t *lock)
 {
 	unsigned long inc = 1u << TICKET_SHIFT;
 	unsigned long mask = 0xffffu << TICKET_SHIFT; @@ -42,7 +42,7 @@

int spin_trylock(spinlock_t *lock)

lib/sbi/riscv_locks.c +1 -2
 		: "r"(inc), "r"(mask), "I"(TICKET_SHIFT)
 		: "memory");
 
-	return !l0;
+	return l0 == 0;
 }
 
 void spin_lock(spinlock_t *lock)
--

2.30.1

--
opensbi mailing list
opensbi at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/opensbi