diff options
| author | jhibbits <jhibbits@FreeBSD.org> | 2015-08-22 07:27:06 +0000 |
|---|---|---|
| committer | jhibbits <jhibbits@FreeBSD.org> | 2015-08-22 07:27:06 +0000 |
| commit | 518b52117aaf0455bc1c41305c2d98602e184a6b (patch) | |
| tree | c10d3f5b6564f6cf555f4321b9548227cc23cb82 /sys/powerpc/include | |
| parent | 83ce86ca5489fc4358f2d347d7f100ac6146d227 (diff) | |
| download | FreeBSD-src-518b52117aaf0455bc1c41305c2d98602e184a6b.zip FreeBSD-src-518b52117aaf0455bc1c41305c2d98602e184a6b.tar.gz | |
Follow up to r287014
Missed these files, from the original diff.
Sponsored by: Alex Perez/Inertial Computing
Differential Revision: https://reviews.freebsd.org/D3027
Diffstat (limited to 'sys/powerpc/include')
| -rw-r--r-- | sys/powerpc/include/_types.h | 4 | ||||
| -rw-r--r-- | sys/powerpc/include/pte.h | 9 | ||||
| -rw-r--r-- | sys/powerpc/include/tlb.h | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index 2c5e274..2c92afc 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -128,7 +128,11 @@ typedef __uint64_t __vm_size_t; #else typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; +#ifdef BOOKE +typedef __uint64_t __vm_paddr_t; +#else typedef __uint32_t __vm_paddr_t; +#endif typedef __uint32_t __vm_size_t; #endif typedef __int64_t __vm_ooffset_t; diff --git a/sys/powerpc/include/pte.h b/sys/powerpc/include/pte.h index b3e103a..3a27929 100644 --- a/sys/powerpc/include/pte.h +++ b/sys/powerpc/include/pte.h @@ -207,10 +207,13 @@ typedef struct lpte lpte_t; /* * Page Table Entry definitions and macros. + * + * RPN need only be 32-bit because Book-E has 36-bit addresses, and the smallest + * page size is 4k (12-bit mask), so RPN can really fit into 24 bits. */ #ifndef LOCORE struct pte { - vm_paddr_t rpn; + vm_offset_t rpn; uint32_t flags; }; typedef struct pte pte_t; @@ -266,7 +269,9 @@ typedef struct pte pte_t; #define PTE_REFERENCED 0x04000000 /* Referenced */ /* Macro argument must of pte_t type. */ -#define PTE_PA(pte) ((pte)->rpn & ~PTE_PA_MASK) +#define PTE_PA_SHIFT 12 +#define PTE_RPN_FROM_PA(pa) ((pa) >> PTE_PA_SHIFT) +#define PTE_PA(pte) ((vm_paddr_t)((pte)->rpn) << PTE_PA_SHIFT) #define PTE_ISVALID(pte) ((pte)->flags & PTE_VALID) #define PTE_ISWIRED(pte) ((pte)->flags & PTE_WIRED) #define PTE_ISMANAGED(pte) ((pte)->flags & PTE_MANAGED) diff --git a/sys/powerpc/include/tlb.h b/sys/powerpc/include/tlb.h index 58a1a01..47f2af2 100644 --- a/sys/powerpc/include/tlb.h +++ b/sys/powerpc/include/tlb.h @@ -106,6 +106,8 @@ #define MAS6_SPID0_SHIFT 16 #define MAS6_SAS 0x00000001 +#define MAS7_RPN 0x0000000F + #define MAS1_GETTID(mas1) (((mas1) & MAS1_TID_MASK) >> MAS1_TID_SHIFT) #define MAS2_TLB0_ENTRY_IDX_MASK 0x0007f000 @@ -132,6 +134,7 @@ typedef struct tlb_entry { uint32_t mas1; uint32_t mas2; uint32_t mas3; + uint32_t mas7; } tlb_entry_t; void tlb0_print_tlbentries(void); |
