From 2f529f9b558ca1c1bd74be7437a84e4711743404 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 01 Nov 2024 02:11:33 +0000
Subject: [PATCH] add xenomai
---
kernel/arch/arm/include/asm/irqflags.h | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/kernel/arch/arm/include/asm/irqflags.h b/kernel/arch/arm/include/asm/irqflags.h
index aeec7f2..3c67ce2 100644
--- a/kernel/arch/arm/include/asm/irqflags.h
+++ b/kernel/arch/arm/include/asm/irqflags.h
@@ -5,6 +5,7 @@
#ifdef __KERNEL__
#include <asm/ptrace.h>
+#include <asm/barrier.h>
/*
* CPU interrupt mask handling.
@@ -13,41 +14,44 @@
#define IRQMASK_REG_NAME_R "primask"
#define IRQMASK_REG_NAME_W "primask"
#define IRQMASK_I_BIT 1
+#define IRQMASK_I_POS 0
#else
#define IRQMASK_REG_NAME_R "cpsr"
#define IRQMASK_REG_NAME_W "cpsr_c"
#define IRQMASK_I_BIT PSR_I_BIT
+#define IRQMASK_I_POS 7
#endif
+#define IRQMASK_i_POS 31
#if __LINUX_ARM_ARCH__ >= 6
#define arch_local_irq_save arch_local_irq_save
-static inline unsigned long arch_local_irq_save(void)
+static inline unsigned long native_irq_save(void)
{
unsigned long flags;
asm volatile(
- " mrs %0, " IRQMASK_REG_NAME_R " @ arch_local_irq_save\n"
+ " mrs %0, " IRQMASK_REG_NAME_R " @ native_irq_save\n"
" cpsid i"
: "=r" (flags) : : "memory", "cc");
return flags;
}
#define arch_local_irq_enable arch_local_irq_enable
-static inline void arch_local_irq_enable(void)
+static inline void native_irq_enable(void)
{
asm volatile(
- " cpsie i @ arch_local_irq_enable"
+ " cpsie i @ native_irq_enable"
:
:
: "memory", "cc");
}
#define arch_local_irq_disable arch_local_irq_disable
-static inline void arch_local_irq_disable(void)
+static inline void native_irq_disable(void)
{
asm volatile(
- " cpsid i @ arch_local_irq_disable"
+ " cpsid i @ native_irq_disable"
:
:
: "memory", "cc");
@@ -69,12 +73,12 @@
* Save the current interrupt enable state & disable IRQs
*/
#define arch_local_irq_save arch_local_irq_save
-static inline unsigned long arch_local_irq_save(void)
+static inline unsigned long native_irq_save(void)
{
unsigned long flags, temp;
asm volatile(
- " mrs %0, cpsr @ arch_local_irq_save\n"
+ " mrs %0, cpsr @ native_irq_save\n"
" orr %1, %0, #128\n"
" msr cpsr_c, %1"
: "=r" (flags), "=r" (temp)
@@ -87,11 +91,11 @@
* Enable IRQs
*/
#define arch_local_irq_enable arch_local_irq_enable
-static inline void arch_local_irq_enable(void)
+static inline void native_irq_enable(void)
{
unsigned long temp;
asm volatile(
- " mrs %0, cpsr @ arch_local_irq_enable\n"
+ " mrs %0, cpsr @ native_irq_enable\n"
" bic %0, %0, #128\n"
" msr cpsr_c, %0"
: "=r" (temp)
@@ -103,11 +107,11 @@
* Disable IRQs
*/
#define arch_local_irq_disable arch_local_irq_disable
-static inline void arch_local_irq_disable(void)
+static inline void native_irq_disable(void)
{
unsigned long temp;
asm volatile(
- " mrs %0, cpsr @ arch_local_irq_disable\n"
+ " mrs %0, cpsr @ native_irq_disable\n"
" orr %0, %0, #128\n"
" msr cpsr_c, %0"
: "=r" (temp)
@@ -149,15 +153,22 @@
#define local_abt_disable() do { } while (0)
#endif
+static inline void native_irq_sync(void)
+{
+ native_irq_enable();
+ isb();
+ native_irq_disable();
+}
+
/*
* Save the current interrupt enable state.
*/
#define arch_local_save_flags arch_local_save_flags
-static inline unsigned long arch_local_save_flags(void)
+static inline unsigned long native_save_flags(void)
{
unsigned long flags;
asm volatile(
- " mrs %0, " IRQMASK_REG_NAME_R " @ local_save_flags"
+ " mrs %0, " IRQMASK_REG_NAME_R " @ native_save_flags"
: "=r" (flags) : : "memory", "cc");
return flags;
}
@@ -166,21 +177,28 @@
* restore saved IRQ & FIQ state
*/
#define arch_local_irq_restore arch_local_irq_restore
-static inline void arch_local_irq_restore(unsigned long flags)
+static inline void native_irq_restore(unsigned long flags)
{
asm volatile(
- " msr " IRQMASK_REG_NAME_W ", %0 @ local_irq_restore"
+ " msr " IRQMASK_REG_NAME_W ", %0 @ native_irq_restore"
:
: "r" (flags)
: "memory", "cc");
}
#define arch_irqs_disabled_flags arch_irqs_disabled_flags
-static inline int arch_irqs_disabled_flags(unsigned long flags)
+static inline int native_irqs_disabled_flags(unsigned long flags)
{
return flags & IRQMASK_I_BIT;
}
+static inline bool native_irqs_disabled(void)
+{
+ unsigned long flags = native_save_flags();
+ return native_irqs_disabled_flags(flags);
+}
+
+#include <asm/irq_pipeline.h>
#include <asm-generic/irqflags.h>
#endif /* ifdef __KERNEL__ */
--
Gitblit v1.6.2