Module: xenomai-jki
Branch: for-upstream
Commit: fa54cac4be49f7050388f5f50d4a3adafbc8d38c
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=fa54cac4be49f7050388f5f50d4a3adafbc8d38c
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Tue Nov 10 00:19:05 2009 +0100
hal: Ensure atomicity of rthal_local_irq_disabled
ipipe_test_pipeline_from is not atomic /wrt reading the current cpu
number (or an offset for the per-cpu area) and actually reading the
virtualized interrupt state. Work around this by disabling hard IRQs
while accessing this service on SMP hosts.
This fixes false-positives of RTDM driver debug checks.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
include/asm-generic/hal.h | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/hal.h b/include/asm-generic/hal.h
index 97c549e..f42095c 100644
--- a/include/asm-generic/hal.h
+++ b/include/asm-generic/hal.h
@@ -98,6 +98,16 @@ typedef spinlock_t rthal_spinlock_t;
#define rthal_cpudata_irq_hits(ipd,cpu,irq)
__ipipe_cpudata_irq_hits(ipd,cpu,irq)
+#ifndef local_irq_save_hw_smp
+#ifdef CONFIG_SMP
+#define local_irq_save_hw_smp(flags) local_irq_save_hw(flags)
+#define local_irq_restore_hw_smp(flags) local_irq_restore_hw(flags)
+#else /* !CONFIG_SMP */
+#define local_irq_save_hw_smp(flags) do { (void)(flags); } while (0)
+#define local_irq_restore_hw_smp(flags) do { } while (0)
+#endif /* !CONFIG_SMP */
+#endif /* !local_irq_save_hw_smp */
+
/* I-pipe domain priorities and virtual interrupt mask handling. If
the invariant pipeline head feature is enabled for Xenomai, use
it. */
@@ -117,7 +127,14 @@ typedef spinlock_t rthal_spinlock_t;
#endif /* !CONFIG_XENO_OPT_PIPELINE_HEAD */
#define rthal_local_irq_flags(x) ((x) =
ipipe_test_pipeline_from(&rthal_domain) & 1)
#define rthal_local_irq_test() ipipe_test_pipeline_from(&rthal_domain)
-#define rthal_local_irq_disabled() ipipe_test_pipeline_from(&rthal_domain)
+#define rthal_local_irq_disabled() \
+({ \
+ unsigned long __flags, __ret; \
+ local_irq_save_hw_smp(__flags); \
+ __ret = ipipe_test_pipeline_from(&rthal_domain); \
+ local_irq_restore_hw_smp(__flags); \
+ __ret; \
+})
#define rthal_stage_irq_enable(dom) ipipe_unstall_pipeline_from(dom)
#define rthal_local_irq_save_hw(x) local_irq_save_hw(x)
#define rthal_local_irq_restore_hw(x) local_irq_restore_hw(x)
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
