Changeset 7dd1787 in mainline

Timestamp:

2006-05-01T21:06:25Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e499a30

Parents:

9a68b34d

Message:

page index and VSID fixes

Location:

arch/ppc32

Files:

• include/mm/page.h (modified) (2 diffs)
• src/mm/tlb.c (modified) (1 diff)

arch/ppc32/include/mm/page.h

@@ -68 +68 @@
 #define PTL3_INDEX_ARCH(vaddr)  (((vaddr) >> 12) & 0x3ff)
 
-#define SET_PTL0_ADDRESS_ARCH(ptl0)
-
 #define GET_PTL1_ADDRESS_ARCH(ptl0, i)          (((pte_t *) (ptl0))[(i)].pfn << 12)
 #define GET_PTL2_ADDRESS_ARCH(ptl1, i)          (ptl1)
@@ -75 +73 @@
 #define GET_FRAME_ADDRESS_ARCH(ptl3, i)         (((pte_t *) (ptl3))[(i)].pfn << 12)
 
+#define SET_PTL0_ADDRESS_ARCH(ptl0)
 #define SET_PTL1_ADDRESS_ARCH(ptl0, i, a)       (((pte_t *) (ptl0))[(i)].pfn = (a) >> 12)
 #define SET_PTL2_ADDRESS_ARCH(ptl1, i, a)

arch/ppc32/src/mm/tlb.c

@@ -162 +162 @@
         pte->a = 1;
         
-        page = ADDR2PFN(badvaddr);
+        page = (badvaddr >> 12) & 0xffff;
         api = (badvaddr >> 22) & 0x3f;
         asm volatile (
                 "mfsrin %0, %1\n"
                 : "=r" (vsid)
-                : "r" (badvaddr >> 28)
+                : "r" (badvaddr)
         );