Changeset 544a2e4 in mainline for kernel/arch/ppc32/include

Timestamp:

2011-05-30T21:37:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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 mainline changes.

Location:

kernel/arch/ppc32/include

Files:

• boot/boot.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)
• istate.h (modified) (2 diffs)
• mm/as.h (modified) (2 diffs)
• mm/pht.h (added)
• mm/tlb.h (modified) (2 diffs)
• types.h (modified) (1 diff)

kernel/arch/ppc32/include/boot/boot.h

@@ -37 +37 @@
 
 #define BOOT_OFFSET  0x8000
-
-/* Temporary stack size for boot process */
-#define TEMP_STACK_SIZE  0x1000
 
 #define TASKMAP_MAX_RECORDS        32

kernel/arch/ppc32/include/interrupt.h

@@ -45 +45 @@
 #define VECTOR_EXTERNAL             4
 #define VECTOR_DECREMENTER          8
+#define VECTOR_ITLB_MISS            13
+#define VECTOR_DTLB_MISS_LOAD       14
+#define VECTOR_DTLB_MISS_STORE      15
 
 extern void start_decrementer(void);

kernel/arch/ppc32/include/istate.h

@@ -73 +73 @@
         uint32_t cr;
         uint32_t pc;
-        uint32_t srr1;
+        uint32_t msr;
         uint32_t lr;
         uint32_t ctr;
@@ -90 +90 @@
 /** Return true if exception happened while in userspace
  *
- * The contexts of MSR register was stored in SRR1.
- *
  */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->srr1 & MSR_PR) != 0;
+        return (istate->msr & MSR_PR) != 0;
 }
 

kernel/arch/ppc32/include/mm/as.h

@@ -36 +36 @@
 #define KERN_ppc32_AS_H_
 
+#include <arch/mm/pht.h>
+
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  ((unsigned long) 0x80000000)
-#define KERNEL_ADDRESS_SPACE_END_ARCH    ((unsigned long) 0xffffffff)
-#define USER_ADDRESS_SPACE_START_ARCH    ((unsigned long) 0x00000000)
-#define USER_ADDRESS_SPACE_END_ARCH      ((unsigned long) 0x7fffffff)
-
-#define USTACK_ADDRESS_ARCH  (0x7fffffff - (PAGE_SIZE - 1))
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {
@@ -54 +54 @@
 #define as_create_arch(as, flags)       (as != as)
 #define as_deinstall_arch(as)
-#define as_invalidate_translation_cache(as, page, cnt)
+
+#define as_invalidate_translation_cache(as, page, cnt) \
+        pht_invalidate((as), (page), (cnt))
 
 extern void as_arch_init(void);

kernel/arch/ppc32/include/mm/tlb.h

@@ -37 +37 @@
 
 #include <arch/interrupt.h>
-#include <typedefs.h>
 
 #define WIMG_GUARDED    0x01
@@ -75 +74 @@
 } ptelo_t;
 
-extern void pht_init(void);
-extern void pht_refill(unsigned int, istate_t *);
-
-extern bool pht_refill_real(unsigned int, istate_t *)
-    __attribute__ ((section("K_UNMAPPED_TEXT_START")));
-extern void tlb_refill_real(unsigned int, uint32_t, ptehi_t, ptelo_t,
-    istate_t *) __attribute__ ((section("K_UNMAPPED_TEXT_START")));
+extern void tlb_refill(unsigned int, istate_t *);
 
 #endif

kernel/arch/ppc32/include/types.h

@@ -37 +37 @@
 
 typedef uint32_t size_t;
+typedef int32_t ssize_t;
 
 typedef uint32_t uintptr_t;