Revert rev 1.356 and 1.352 (pmap_mapdev hacks). It wasn't worth the
pain.
This commit is contained in:
parent
a4be7ce2dd
commit
c679b309f1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=101352
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user