d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Turn PBVM page table entries into PTEs so that they can be inserted

Browse Source 
into the TLB as-is.

While here, have ia64_platform_alloc() return ~0UL on failure.
This commit is contained in:
marcel 2011-04-30 20:16:49 +00:00
parent cbe6b32c84
commit 9a015a5a31
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/boot/ia64/common/copy.c
View File

@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$");
#include <stand.h>
#include <machine/param.h>
#include <machine/pte.h>
#include "libia64.h"
@ -40,6 +41,7 @@ uint32_t ia64_pgtblsz;
static int
pgtbl_extend(u_int idx)
{
vm_paddr_t pa;
uint64_t *pgtbl;
uint32_t pgtblsz;
u_int pot;
@ -65,9 +67,10 @@ pgtbl_extend(u_int idx)
pgtblsz <<= 1;
/* Allocate naturally aligned memory. */
pgtbl = (void *)ia64_platform_alloc(0, pgtblsz);
if (pgtbl == NULL)
pa = ia64_platform_alloc(0, pgtblsz);
if (pa == ~0UL)
return (ENOMEM);
pgtbl = (void *)pa;
/* Initialize new page table. */
if (ia64_pgtbl != NULL && ia64_pgtbl != pgtbl)
@ -85,7 +88,7 @@ pgtbl_extend(u_int idx)
void *
ia64_va2pa(vm_offset_t va, size_t *len)
{
uint64_t pa;
uint64_t pa, pte;
u_int idx, ofs;
int error;
@ -111,16 +114,18 @@ ia64_va2pa(vm_offset_t va, size_t *len)
}
ofs = va & IA64_PBVM_PAGE_MASK;
pa = ia64_pgtbl[idx];
if (pa == 0) {
pte = ia64_pgtbl[idx];
if ((pte & PTE_PRESENT) == 0) {
pa = ia64_platform_alloc(va - ofs, IA64_PBVM_PAGE_SIZE);
if (pa == 0) {
if (pa == ~0UL) {
error = ENOMEM;
goto fail;
}
ia64_pgtbl[idx] = pa;
pte = PTE_AR_RWX | PTE_DIRTY | PTE_ACCESSED | PTE_PRESENT;
pte |= (pa & PTE_PPN_MASK);
ia64_pgtbl[idx] = pte;
}
pa += ofs;
pa = (pte & PTE_PPN_MASK) + ofs;
/* We can not cross page boundaries (in general). */
if (*len + ofs > IA64_PBVM_PAGE_SIZE)

12
sys/boot/ia64/efi/efimd.c
View File

@ -90,6 +90,10 @@ ia64_efi_memmap_update(void)
return (TRUE);
}
/*
* Returns 0 on failure. Successful allocations return an address
* larger or equal to IA64_EFI_ALLOC_BOUNDARY.
*/
static vm_paddr_t
ia64_efi_alloc(vm_size_t sz)
{
@ -144,11 +148,12 @@ ia64_efi_alloc(vm_size_t sz)
vm_paddr_t
ia64_platform_alloc(vm_offset_t va, vm_size_t sz)
{
vm_paddr_t pa;
if (va == 0) {
/* Page table itself. */
if (sz > IA64_EFI_PGTBLSZ_MAX)
return (0);
return (~0UL);
if (ia64_efi_pgtbl == 0)
ia64_efi_pgtbl = ia64_efi_alloc(IA64_EFI_PGTBLSZ_MAX);
if (ia64_efi_pgtbl != 0)
@ -156,7 +161,7 @@ ia64_platform_alloc(vm_offset_t va, vm_size_t sz)
return (ia64_efi_pgtbl);
} else if (va < IA64_PBVM_BASE) {
/* Should not happen. */
return (0);
return (~0UL);
}
/* Loader virtual memory page. */
@ -169,7 +174,8 @@ ia64_platform_alloc(vm_offset_t va, vm_size_t sz)
return (ia64_efi_chunk + va);
/* Allocate a page at a time when we go beyond the chunk. */
return (ia64_efi_alloc(sz));
pa = ia64_efi_alloc(sz);
return ((pa == 0) ? ~0UL : pa);
}
void