Changeset da1bafb in mainline for kernel/arch/ppc32/include/asm.h

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

• kernel/arch/ppc32/include/asm.h (modified) (2 diffs)

kernel/arch/ppc32/include/asm.h

@@ -39 +39 @@
 #include <config.h>
 #include <arch/cpu.h>
+#include <arch/mm/asid.h>
 
 static inline uint32_t msr_read(void)
@@ -58 +59 @@
                 :: [msr] "r" (msr)
         );
+}
+
+static inline void sr_set(uint32_t flags, asid_t asid, uint32_t sr)
+{
+        asm volatile (
+                "mtsrin %[value], %[sr]\n"
+                :: [value] "r" ((flags << 16) + (asid << 4) + sr),
+                   [sr] "r" (sr << 28)
+        );
+}
+
+static inline uint32_t sr_get(uint32_t vaddr)
+{
+        uint32_t vsid;
+        
+        asm volatile (
+                "mfsrin %[vsid], %[vaddr]\n"
+                : [vsid] "=r" (vsid)
+                : [vaddr] "r" (vaddr)
+        );
+        
+        return vsid;
+}
+
+static inline uint32_t sdr1_get(void)
+{
+        uint32_t sdr1;
+        
+        asm volatile (
+                "mfsdr1 %[sdr1]\n"
+                : [sdr1] "=r" (sdr1)
+        );
+        
+        return sdr1;
 }