Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[GSoC] [ARM] Patch by Johannes Wischert.

Browse Source 
- don't panic on missing page table, just add it,
- less debug output,
- include PXA LCD regs in hw memory map.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32406 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol 2009-08-15 02:13:39 +00:00
parent bb7479a182
commit 12f64a3b27
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/boot/platform/u-boot/mmu.cpp
View File

@ -25,7 +25,7 @@
#define TRACE_MMU //#define TRACE_MMU
#ifdef TRACE_MMU #ifdef TRACE_MMU
# define TRACE(x) dprintf x # define TRACE(x) dprintf x
#else #else
@ -150,7 +150,7 @@ static struct memblock LOADER_MEMORYMAP[] = {
{ {
"devices\0", "devices\0",
0x40000000, 0x40000000,
0x40FFFFFF, 0x44FFFFFF,
MMU_L2_FLAG_B, MMU_L2_FLAG_B,
}, },
/* { /* {
@ -483,12 +483,11 @@ map_page(addr_t virtualAddress, addr_t physicalAddress, uint32 flags)
TRACE(("map_page: pageTable 0x%lx\n", (sPageDirectory[virtualAddress TRACE(("map_page: pageTable 0x%lx\n", (sPageDirectory[virtualAddress
/ (1024 * 1024)] & 0xfffffc00) )); / (1024 * 1024)] & 0xfffffc00) ));
if(pageTable == NULL){ if(pageTable == NULL){
TRACE(("panic")); // TRACE(("panic"));
panic("map:page no page_directory entry!!!"); // panic("map:page no page_directory entry!!!");
/* add_page_table(virtualAddress); add_page_table(virtualAddress);
pageTable = (uint32 *)(sPageDirectory[virtualAddress pageTable = (uint32 *)(sPageDirectory[virtualAddress
/ (1024 * 1024)] & 0xfffffc00); / (1024 * 1024)] & 0xfffffc00);
*/
} }
uint32 tableEntry = (virtualAddress % (B_PAGE_SIZE * 256)) / B_PAGE_SIZE; uint32 tableEntry = (virtualAddress % (B_PAGE_SIZE * 256)) / B_PAGE_SIZE;
@ -570,9 +569,11 @@ mmu_allocate(void *virtualAddress, size_t size)
// is the address within the valid range? // is the address within the valid range?
if (address < KERNEL_BASE if (address < KERNEL_BASE
|| address + size >= KERNEL_BASE + kMaxKernelSize) || address + size >= KERNEL_BASE + kMaxKernelSize){
TRACE(("mmu_allocate in illegal range\n address: %lx KERNELBASE: %lx KERNEL_BASE + kMaxKernelSize: %lx address + size : %lx \n ", (uint32)address , KERNEL_BASE, KERNEL_BASE
+ kMaxKernelSize,(uint32)(address + size) ));
return NULL; return NULL;
}
for (uint32 i = 0; i < size; i++) { for (uint32 i = 0; i < size; i++) {
map_page(address, get_next_physical_page(B_PAGE_SIZE), kDefaultPageFlags); map_page(address, get_next_physical_page(B_PAGE_SIZE), kDefaultPageFlags);
address += B_PAGE_SIZE; address += B_PAGE_SIZE;