Remove phys_first_addr and phys_last_addr global variables

The old assumption that all physical memory is directly mapped in
kernel space is about to go away. Those variables are directly linked
to that assumption.

* i386/i386/model_dep.h (phys_first_addr): Remove extern declaration.
(phys_last_addr): Likewise.
* i386/i386/phys.c (pmap_zero_page): Use VM_PAGE_DIRECTMAP_LIMIT
instead of phys_last_addr.
(pmap_copy_page, copy_to_phys, copy_from_phys): Likewise.
* i386/i386/trap.c (user_trap): Remove check against phys_last_addr.
* i386/i386at/biosmem.c (biosmem_bootstrap_common): Don't set
phys_last_addr.
* i386/i386at/mem.c (memmmap): Use vm_page_lookup_pa to determine if
a physical address references physical memory.
* i386/i386at/model_dep.c (phys_first_addr): Remove variable.
(phys_last_addr): Likewise.
(pmap_free_pages, pmap_valid_page): Remove functions.
* i386/intel/pmap.c: Include i386at/biosmem.h.
(pa_index): Turn into an alias for vm_page_table_index.
(pmap_bootstrap): Replace uses of phys_first_addr and phys_last_addr
as appropriate.
(pmap_virtual_space): Use vm_page_table_size instead of phys_first_addr
and phys_last_addr to obtain the number of physical pages.
(pmap_verify_free): Remove function.
(valid_page): Turn this macro into an inline function and rewrite
using vm_page_lookup_pa.
(pmap_page_table_page_alloc): Build the pmap VM object using
vm_page_table_size to determine its size.
(pmap_remove_range, pmap_page_protect, phys_attribute_clear,
phys_attribute_test): Turn page indexes into unsigned long integers.
(pmap_enter): Likewise. In addition, use either vm_page_lookup_pa or
biosmem_directmap_end to determine if a physical address references
physical memory.
* i386/xen/xen.c (hyp_p2m_init): Use vm_page_table_size instead of
phys_last_addr to obtain the number of physical pages.
* kern/startup.c (phys_first_addr): Remove extern declaration.
(phys_last_addr): Likewise.
* linux/dev/init/main.c (linux_init): Use vm_page_seg_end with the
appropriate segment selector instead of phys_last_addr to determine
where high memory starts.
* vm/pmap.h: Update requirements description.
(pmap_free_pages, pmap_valid_page): Remove declarations.
* vm/vm_page.c (vm_page_seg_end, vm_page_boot_table_size,
vm_page_table_size, vm_page_table_index): New functions.
* vm/vm_page.h (vm_page_seg_end, vm_page_table_size,
vm_page_table_index): New function declarations.
* vm/vm_resident.c (vm_page_bucket_count, vm_page_hash_mask): Define
as unsigned long integers.
(vm_page_bootstrap): Compute VP table size based on the page table
size instead of the value returned by pmap_free_pages.

1 files changed, 4 insertions, 11 deletions

diff --git a/i386/i386at/biosmem.c b/i386/i386at/biosmem.c
index 90ae54a9..62be567c 100644
--- a/i386/i386at/biosmem.c
+++ b/i386/i386at/biosmem.c
@@ -650,7 +650,7 @@ biosmem_setup_allocator(const struct multiboot_raw_info *mbi)
 static void __boot
 biosmem_bootstrap_common(void)
 {
-    phys_addr_t phys_start, phys_end, last_addr;
+    phys_addr_t phys_start, phys_end;
     int error;
 
     biosmem_map_adjust();
@@ -663,7 +663,6 @@ biosmem_bootstrap_common(void)
         boot_panic(biosmem_panic_noseg_msg);
 
     biosmem_set_segment(VM_PAGE_SEG_DMA, phys_start, phys_end);
-    last_addr = phys_end;
 
     phys_start = VM_PAGE_DMA_LIMIT;
 #ifdef VM_PAGE_DMA32_LIMIT
@@ -671,10 +670,9 @@ biosmem_bootstrap_common(void)
     error = biosmem_map_find_avail(&phys_start, &phys_end);
 
     if (error)
-        goto out;
+        return;
 
     biosmem_set_segment(VM_PAGE_SEG_DMA32, phys_start, phys_end);
-    last_addr = phys_end;
 
     phys_start = VM_PAGE_DMA32_LIMIT;
 #endif /* VM_PAGE_DMA32_LIMIT */
@@ -682,23 +680,18 @@ biosmem_bootstrap_common(void)
     error = biosmem_map_find_avail(&phys_start, &phys_end);
 
     if (error)
-        goto out;
+        return;
 
     biosmem_set_segment(VM_PAGE_SEG_DIRECTMAP, phys_start, phys_end);
-    last_addr = phys_end;
 
     phys_start = VM_PAGE_DIRECTMAP_LIMIT;
     phys_end = VM_PAGE_HIGHMEM_LIMIT;
     error = biosmem_map_find_avail(&phys_start, &phys_end);
 
     if (error)
-        goto out;
+        return;
 
     biosmem_set_segment(VM_PAGE_SEG_HIGHMEM, phys_start, phys_end);
-
-out:
-    /* XXX phys_last_addr must be part of the direct physical mapping */
-    phys_last_addr = last_addr;
 }
 
 #ifdef MACH_HYP