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

Revert rev 1.356 and 1.352 (pmap_mapdev hacks). It wasn't worth the

Browse Source 
pain.
This commit is contained in:
peter 2002-08-05 06:10:03 +00:00
parent 833ff4f082
commit e75e6bd4b1
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/amd64/amd64/pmap.c
View File

@ -3277,28 +3277,27 @@ pmap_mapdev(pa, size)
vm_size_t size;
{
vm_offset_t va, tmpva, offset;
pt_entry_t *pte;
offset = pa & PAGE_MASK;
size = round_page(offset + size);
pa = trunc_page(pa);
/* We have a 1MB direct mapped region at KERNBASE */
if (pa < 0x00100000 && pa + size <= 0x00100000)
return (void *)(pa + offset + KERNBASE);
size = roundup(offset + size, PAGE_SIZE);
GIANT_REQUIRED;
va = kmem_alloc_pageable(kernel_map, size);
if (!va)
panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
pa = pa & PG_FRAME;
for (tmpva = va; size > 0; ) {
pmap_kenter(tmpva, pa);
pte = vtopte(tmpva);
*pte = pa | PG_RW | PG_V | pgeflag;
size -= PAGE_SIZE;
tmpva += PAGE_SIZE;
pa += PAGE_SIZE;
}
pmap_invalidate_range(kernel_pmap, va, tmpva);
return (void *)(va + offset);
return ((void *)(va + offset));
}
void
@ -3311,9 +3310,7 @@ pmap_unmapdev(va, size)
base = va & PG_FRAME;
offset = va & PAGE_MASK;
size = round_page(offset + size);
if (base >= KERNBASE && va + size <= KERNBASE + 0x00100000)
return; /* direct mapped */
size = roundup(offset + size, PAGE_SIZE);
for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) {
pte = vtopte(tmpva);
*pte = 0;

19
sys/i386/i386/pmap.c
View File

@ -3277,28 +3277,27 @@ pmap_mapdev(pa, size)
vm_size_t size;
{
vm_offset_t va, tmpva, offset;
pt_entry_t *pte;
offset = pa & PAGE_MASK;
size = round_page(offset + size);
pa = trunc_page(pa);
/* We have a 1MB direct mapped region at KERNBASE */
if (pa < 0x00100000 && pa + size <= 0x00100000)
return (void *)(pa + offset + KERNBASE);
size = roundup(offset + size, PAGE_SIZE);
GIANT_REQUIRED;
va = kmem_alloc_pageable(kernel_map, size);
if (!va)
panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
pa = pa & PG_FRAME;
for (tmpva = va; size > 0; ) {
pmap_kenter(tmpva, pa);
pte = vtopte(tmpva);
*pte = pa | PG_RW | PG_V | pgeflag;
size -= PAGE_SIZE;
tmpva += PAGE_SIZE;
pa += PAGE_SIZE;
}
pmap_invalidate_range(kernel_pmap, va, tmpva);
return (void *)(va + offset);
return ((void *)(va + offset));
}
void
@ -3311,9 +3310,7 @@ pmap_unmapdev(va, size)
base = va & PG_FRAME;
offset = va & PAGE_MASK;
size = round_page(offset + size);
if (base >= KERNBASE && va + size <= KERNBASE + 0x00100000)
return; /* direct mapped */
size = roundup(offset + size, PAGE_SIZE);
for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) {
pte = vtopte(tmpva);
*pte = 0;