Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2289 → Rev 2290

/branches/arm/kernel/arch/arm32/src/mm/page.c
56,35 → 56,22
 
flags = PAGE_CACHEABLE;
 
/* PA2KA(identity) mapping for all frames until last_frame */
// PA2KA(identity) mapping for all frames until last_frame
for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
}
// Create mapping for exception table at high offcet
// create mapping for exception table at high offset
#ifdef HIGH_EXCEPTION_VECTORS
/* Note: this mapping cann't be done by hw_map because fixed exception
vector is stored at fixed virtual address
*/
// reserve frame for exception table
void* virtaddr = frame_alloc( ONE_FRAME ,FRAME_KA);
page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr), flags );
// Note: this mapping cann't be done by hw_map because fixed exception
// vector is stored at fixed virtual address
// reserve frame for exception table
void* virtaddr = frame_alloc(ONE_FRAME, FRAME_KA);
page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr), flags);
#endif
// TODO: #else
 
// TODO: move to the kernel space
// page_mapping_insert(AS_KERNEL, 0xffff0000, 0x00000000, flags);
// TODO: remove when aux_printf not needed
// page_mapping_insert(AS_KERNEL, 0x0000000, 0x0000000, flags);
page_mapping_insert(AS_KERNEL, 0x1000000, 0x1000000, flags);
// page_mapping_insert(AS_KERNEL, 0x1100000, 0x1100000, flags);
// page_mapping_insert(AS_KERNEL, 0x1500000, 0x1500000, flags);
// page_mapping_insert(AS_KERNEL, 0x1600000, 0x1600000, flags);
 
// page_mapping_insert(AS_KERNEL, 0xffff0000, 0xffff0000, flags);
 
 
as_switch(NULL, AS_KERNEL);
 
}
 
/**
96,20 → 83,21
* \param physaddr Physical addres where device is connected
* \param size Length of area where device is present
* \return Virtual address where device will be accessable
* Note: This is copy of IA32 hw_map code
*/
uintptr_t hw_map(uintptr_t physaddr, size_t size)
{
if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
}
 
uintptr_t virtaddr = PA2KA(last_frame);
pfn_t i;
for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL);
for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i),
PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL);
}
 
last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
 
return virtaddr;
}