Changeset 235d31d in mainline for kernel/arch/arm32

Timestamp:

2014-12-22T17:47:40Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

8c7d5ad

Parents:

eae91e0 (diff), 759ea0d (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 the CHT pre-integration branch

This branch contains:

• the merge of lp:~adam-hraska+lp/helenos/rcu, which brings:

• a new preemptible kernel RCU variant called A-RCU,
• a preemptible variant of Podzimek's non-preemptible kernel RCU and
• a new variant of usersace RCU,
• a new concurrent hash table (CHT) implementation based on RCU,
• a deployment of CHT in kernel futex handling,
• a deployment of the userspace RCU in the implementation of upgradable futexes,

all described in Adam Hraska's master thesis named Read-Copy-Update
for HelenOS, defended in 2013 at MFF UK; furthemore, the branch
fixes two synchronization bugs in condvars and waitq, respectively:

• revid:adam.hraska+hos@gmail.com-20121116144921-3to9u1tn1sg07rg7
• revid:adam.hraska+hos@gmail.com-20121116173623-km7gwtqixwudpe66

• build fixes required to pass make check
• overhaul of ia64 and sparc64 trap handling, to allow exc_dispatch() to be used now when the kernel is more picky about CPU state accounting
• an important fix of the sparc64/sun4v preemptible trap handler
• various other fixes of issues discovered on non-x86 architectures

Location:

kernel/arch/arm32

Files:

• Makefile.inc (modified) (1 diff)
• include/arch/cp15.h (modified) (1 diff)
• src/atomic.c (added)
• src/cpu/cpu.c (modified) (2 diffs)
• src/exception.c (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -65 +65 @@
         arch/$(KARCH)/src/mm/tlb.c \
         arch/$(KARCH)/src/mm/page_fault.c \
+        arch/$(KARCH)/src/atomic.c \
         arch/$(KARCH)/src/ras.c
 

kernel/arch/arm32/include/arch/cp15.h

@@ -37 +37 @@
 #define KERN_arm32_CP15_H_
 
+#if defined(KERNEL) || defined(BOOT)
+#include <typedefs.h>
+#else
+#include <sys/types.h>
+#endif
 
 /** See ARM Architecture reference manual ch. B3.17.1 page B3-1456

kernel/arch/arm32/src/cpu/cpu.c

@@ -41 +41 @@
 #include <print.h>
 
+#ifdef CONFIG_FPU
+#include <arch/fpu_context.h>
+#endif
+
 static inline unsigned log2(unsigned val)
 {
@@ -60 +64 @@
 static const char * implementer(unsigned id)
 {
-        switch (id)
-        {
+        switch (id) {
         case 0x41: return "ARM Limited";
         case 0x44: return "Digital Equipment Corporation";

kernel/arch/arm32/src/exception.c

@@ -88 +88 @@
 static void swi_exception(unsigned int exc_no, istate_t *istate)
 {
+        interrupts_enable();
         istate->r0 = syscall_handler(istate->r0, istate->r1, istate->r2,
             istate->r3, istate->r4, istate->r5, istate->r6);
+        interrupts_disable();
 }