This patch defines the macro XNARCH_SHARED_HEAP_FLAGS to be set to
XNHEAP_GFP_NONCACHED on ARM with VIVT cache. I assumed that ARM with VIPT cache
would not need non-cached mappings when sharing memory between kernel and
user-space. Please correct me if I am wrong.
---
asm-arm/hal.h | 3 ++-
asm-generic/system.h | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
Index: include/asm-generic/system.h
===================================================================
--- include/asm-generic/system.h (revision 3718)
+++ include/asm-generic/system.h (working copy)
@@ -238,6 +238,12 @@ static inline int xnlock_dbg_release(xnl
#define xnarch_logerr(fmt, args...) printk(KERN_ERR XNARCH_PROMPT fmt,
##args)
#define xnarch_printf(fmt, args...) printk(KERN_INFO XNARCH_PROMPT fmt,
##args)
+#ifndef RTHAL_SHARED_HEAP_FLAGS
+#define XNARCH_SHARED_HEAP_FLAGS 0
+#else /* !RTHAL_SHARED_HEAP_FLAGS */
+#define XNARCH_SHARED_HEAP_FLAGS RTHAL_SHARED_HEAP_FLAGS
+#endif /* !RTHAL_SHARED_HEAP_FLAGS */
+
typedef cpumask_t xnarch_cpumask_t;
#ifdef CONFIG_SMP
Index: include/asm-arm/hal.h
===================================================================
--- include/asm-arm/hal.h (revision 3718)
+++ include/asm-arm/hal.h (working copy)
@@ -108,10 +108,11 @@ static inline __attribute_const__ unsign
#include <asm/processor.h>
#include <asm/ipipe.h>
#include <asm/mach/irq.h>
+#include <asm/cacheflush.h>
#define RTHAL_TIMER_IRQ __ipipe_mach_timerint
-#define RTHAL_SHARED_HEAP_FLAGS XNHEAP_GFP_NONCACHED
+#define RTHAL_SHARED_HEAP_FLAGS (cache_is_vivt() ? XNHEAP_GFP_NONCACHED : 0)
#define rthal_grab_control() do { } while(0)
#define rthal_release_control() do { } while(0)
--
Gilles.
_______________________________________________
Xenomai-core mailing list
Xenomai-core@gna.org
https://mail.gna.org/listinfo/xenomai-core
