Changeset 64e9cf4 in mainline for kernel/arch

Timestamp:

2023-02-02T22:23:23Z (3 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8addb24a

Parents:

f114d40 (diff), b076dfb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge a few changes to spinlock code

Changed organization of the code a little bit, so that less of
the implementation is crammed in the header.
Also made all functions proper functions instead of macros.

Added a bit of debugging code for checking that we own the spinlock
we're unlocking. Also directly detects recursive locks.

Location:

kernel/arch

Files:

• amd64/include/arch/asm.h (modified) (1 diff)
• arm32/include/arch/asm.h (modified) (1 diff)
• arm64/include/arch/asm.h (modified) (1 diff)
• ia32/include/arch/asm.h (modified) (1 diff)
• mips32/src/mips32.c (modified) (1 diff)
• ppc32/src/mm/frame.c (modified) (1 diff)

kernel/arch/amd64/include/arch/asm.h

@@ -58 +58 @@
         }
 }
+
+#define ARCH_SPIN_HINT() asm volatile ("pause\n")
 
 /** Byte from port

kernel/arch/arm32/include/arch/asm.h

@@ -65 +65 @@
 }
 
+#ifdef PROCESSOR_ARCH_armv7_a
+#define ARCH_SPIN_HINT() asm volatile ("yield")
+#endif
+
 _NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
 {

kernel/arch/arm64/include/arch/asm.h

@@ -60 +60 @@
                 ;
 }
+
+#define ARCH_SPIN_HINT() asm volatile ("yield")
 
 /** Output byte to port.

kernel/arch/ia32/include/arch/asm.h

@@ -63 +63 @@
         );
 }
+
+#define ARCH_SPIN_HINT() asm volatile ("pause\n")
 
 #define GEN_READ_REG(reg) _NO_TRACE static inline sysarg_t read_ ##reg (void) \

kernel/arch/mips32/src/mips32.c

@@ -41 +41 @@
 #include <str.h>
 #include <mem.h>
+#include <preemption.h>
 #include <userspace.h>
 #include <stdbool.h>

kernel/arch/ppc32/src/mm/frame.c

@@ -33 +33 @@
  */
 
+#include <arch/asm.h>
 #include <arch/boot/boot.h>
 #include <arch/mm/frame.h>