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

Use pmap_kenter() rather than vtopte() and bashing the page tables

Browse Source 
directly.
This commit is contained in:
Peter Wemm 2002-07-18 00:42:53 +00:00
parent e257592281
commit a9aa1a970f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=100275
4 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/amd64/amd64/machdep.c
View File

@ -1284,10 +1284,8 @@ getmemsize(int first)
* allocated we simply change the mapping.
*/
for (pa = trunc_page(basemem * 1024);
pa < ISA_HOLE_START; pa += PAGE_SIZE) {
pte = vtopte(pa + KERNBASE);
*pte = pa | PG_RW | PG_V;
}
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* if basemem != 640, map pages r/w into vm86 page table so
@ -1301,8 +1299,7 @@ getmemsize(int first)
* map page 1 R/W into the kernel page table so we can use it
* as a buffer. The kernel will unmap this page later.
*/
pte = vtopte(KERNBASE + (1 << PAGE_SHIFT));
*pte = (1 << PAGE_SHIFT) | PG_RW | PG_V;
pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1);
/*
* get memory map with INT 15:E820
@ -1486,11 +1483,7 @@ next_run: ;
pa_indx = 0;
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
#if 0
pte = vtopte(KERNBASE);
#else
pte = CMAP1;
#endif
/*
* physmap is in bytes, so when converting to page boundaries,
@ -1504,11 +1497,7 @@ next_run: ;
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad;
#if 0
int *ptr = 0;
#else
int *ptr = (int *)CADDR1;
#endif
/*
* block out kernel memory as not available.

17
sys/i386/i386/machdep.c
View File

@ -1284,10 +1284,8 @@ getmemsize(int first)
* allocated we simply change the mapping.
*/
for (pa = trunc_page(basemem * 1024);
pa < ISA_HOLE_START; pa += PAGE_SIZE) {
pte = vtopte(pa + KERNBASE);
*pte = pa | PG_RW | PG_V;
}
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* if basemem != 640, map pages r/w into vm86 page table so
@ -1301,8 +1299,7 @@ getmemsize(int first)
* map page 1 R/W into the kernel page table so we can use it
* as a buffer. The kernel will unmap this page later.
*/
pte = vtopte(KERNBASE + (1 << PAGE_SHIFT));
*pte = (1 << PAGE_SHIFT) | PG_RW | PG_V;
pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1);
/*
* get memory map with INT 15:E820
@ -1486,11 +1483,7 @@ next_run: ;
pa_indx = 0;
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
#if 0
pte = vtopte(KERNBASE);
#else
pte = CMAP1;
#endif
/*
* physmap is in bytes, so when converting to page boundaries,
@ -1504,11 +1497,7 @@ next_run: ;
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad;
#if 0
int *ptr = 0;
#else
int *ptr = (int *)CADDR1;
#endif
/*
* block out kernel memory as not available.

17
sys/pc98/i386/machdep.c
View File

@ -1332,10 +1332,8 @@ getmemsize(int first)
* allocated we simply change the mapping.
*/
for (pa = trunc_page(basemem * 1024);
pa < ISA_HOLE_START; pa += PAGE_SIZE) {
pte = vtopte(pa + KERNBASE);
*pte = pa | PG_RW | PG_V;
}
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* if basemem != 640, map pages r/w into vm86 page table so
@ -1350,8 +1348,7 @@ getmemsize(int first)
* map page 1 R/W into the kernel page table so we can use it
* as a buffer. The kernel will unmap this page later.
*/
pte = vtopte(KERNBASE + (1 << PAGE_SHIFT));
*pte = (1 << PAGE_SHIFT) | PG_RW | PG_V;
pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1);
/*
* get memory map with INT 15:E820
@ -1546,11 +1543,7 @@ next_run: ;
pa_indx = 0;
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
#if 0
pte = vtopte(KERNBASE);
#else
pte = CMAP1;
#endif
/*
* physmap is in bytes, so when converting to page boundaries,
@ -1564,11 +1557,7 @@ next_run: ;
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad;
#if 0
int *ptr = 0;
#else
int *ptr = (int *)CADDR1;
#endif
/*
* block out kernel memory as not available.

17
sys/pc98/pc98/machdep.c
View File

@ -1332,10 +1332,8 @@ getmemsize(int first)
* allocated we simply change the mapping.
*/
for (pa = trunc_page(basemem * 1024);
pa < ISA_HOLE_START; pa += PAGE_SIZE) {
pte = vtopte(pa + KERNBASE);
*pte = pa | PG_RW | PG_V;
}
pa < ISA_HOLE_START; pa += PAGE_SIZE)
pmap_kenter(KERNBASE + pa, pa);
/*
* if basemem != 640, map pages r/w into vm86 page table so
@ -1350,8 +1348,7 @@ getmemsize(int first)
* map page 1 R/W into the kernel page table so we can use it
* as a buffer. The kernel will unmap this page later.
*/
pte = vtopte(KERNBASE + (1 << PAGE_SHIFT));
*pte = (1 << PAGE_SHIFT) | PG_RW | PG_V;
pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1);
/*
* get memory map with INT 15:E820
@ -1546,11 +1543,7 @@ next_run: ;
pa_indx = 0;
phys_avail[pa_indx++] = physmap[0];
phys_avail[pa_indx] = physmap[0];
#if 0
pte = vtopte(KERNBASE);
#else
pte = CMAP1;
#endif
/*
* physmap is in bytes, so when converting to page boundaries,
@ -1564,11 +1557,7 @@ next_run: ;
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
int tmp, page_bad;
#if 0
int *ptr = 0;
#else
int *ptr = (int *)CADDR1;
#endif
/*
* block out kernel memory as not available.