upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Follow up to r287014

Browse source 
Missed these files, from the original diff.
Sponsored by:	Alex Perez/Inertial Computing
Differential Revision:	https://reviews.freebsd.org/D3027
This commit is contained in:
Justin Hibbits 2015-08-22 07:27:06 +00:00
parent b239c24baa
commit 92f6e93414
5 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/powerpc/booke/trap_subr.S
View file

@ -697,8 +697,10 @@ tlb_fill_entry:
/* Setup MAS3 value in r23. */
lwz %r23, PTE_RPN(%r25) /* get pte->rpn */
rlwinm %r22, %r23, 12, 0, 20 /* extract MAS3 portion of RPN */
rlwimi %r23, %r21, 24, 26, 31 /* insert protection bits from pte */
rlwimi %r22, %r21, 24, 26, 31 /* insert protection bits from pte */
rlwinm %r23, %r23, 12, 28, 31 /* MAS7 portion of RPN */
/* Load MAS registers. */
mtspr SPR_MAS0, %r29
@ -707,7 +709,9 @@ tlb_fill_entry:
isync
mtspr SPR_MAS2, %r27
isync
mtspr SPR_MAS3, %r23
mtspr SPR_MAS3, %r22
isync
mtspr SPR_MAS7, %r23
isync
tlbwe

4
sys/powerpc/include/_types.h
View file

@ -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;

9
sys/powerpc/include/pte.h
View file

@ -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)

3
sys/powerpc/include/tlb.h
View file

@ -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);

9
sys/powerpc/powerpc/uma_machdep.c
View file

@ -53,6 +53,7 @@ void *
uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait)
{
void *va;
vm_paddr_t pa;
vm_page_t m;
int pflags;
@ -69,7 +70,13 @@ uma_small_alloc(uma_zone_t zone, vm_size_t bytes, u_int8_t *flags, int wait)
break;
}
va = (void *) VM_PAGE_TO_PHYS(m);
pa = VM_PAGE_TO_PHYS(m);
/* On book-e sizeof(void *) < sizeof(vm_paddr_t) */
if ((vm_offset_t)pa != pa)
return (NULL);
va = (void *)(vm_offset_t)pa;
if (!hw_direct_map)
pmap_kenter((vm_offset_t)va, VM_PAGE_TO_PHYS(m));