i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc: Support other memory types

Browse Source 
Let setting the memory type to B_MTR_UC succeed.

Add initial support for those memory types in the translation map,
pointed out by Ingo in ticket #5193.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38292 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Andreas Färber
2010-08-21 00:36:09 +00:00
parent 31bce16715
commit f290297bb6
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/ppc/arch_vm.cpp
+1 -1
View File
@@ -175,5 +175,5 @@ arch_vm_set_memory_type(VMArea *area, phys_addr_t physicalBase, uint32 type)
if (type == 0) if (type == 0)
return B_OK; return B_OK;
return B_ERROR; return B_OK;
} }
src/system/kernel/arch/ppc/arch_vm_translation_map.cpp
+9 -8
View File
@@ -201,15 +201,15 @@ ppc_translation_map_change_asid(VMTranslationMap *map)
static void static void
fill_page_table_entry(page_table_entry *entry, uint32 virtualSegmentID, fill_page_table_entry(page_table_entry *entry, uint32 virtualSegmentID,
addr_t virtualAddress, phys_addr_t physicalAddress, uint8 protection, addr_t virtualAddress, phys_addr_t physicalAddress, uint8 protection,
bool secondaryHash) uint32 memoryType, bool secondaryHash)
{ {
// lower 32 bit - set at once // lower 32 bit - set at once
entry->physical_page_number = physicalAddress / B_PAGE_SIZE; entry->physical_page_number = physicalAddress / B_PAGE_SIZE;
entry->_reserved0 = 0; entry->_reserved0 = 0;
entry->referenced = false; entry->referenced = false;
entry->changed = false; entry->changed = false;
entry->write_through = false; entry->write_through = (memoryType == B_MTR_UC) || (memoryType == B_MTR_WT);
entry->caching_inhibited = false; entry->caching_inhibited = (memoryType == B_MTR_UC);
entry->memory_coherent = false; entry->memory_coherent = false;
entry->guarded = false; entry->guarded = false;
entry->_reserved1 = 0; entry->_reserved1 = 0;
@@ -389,7 +389,6 @@ status_t
PPCVMTranslationMap::Map(addr_t virtualAddress, phys_addr_t physicalAddress, PPCVMTranslationMap::Map(addr_t virtualAddress, phys_addr_t physicalAddress,
uint32 attributes, uint32 memoryType, vm_page_reservation* reservation) uint32 attributes, uint32 memoryType, vm_page_reservation* reservation)
{ {
// TODO: Support memory types!
// lookup the vsid based off the va // lookup the vsid based off the va
uint32 virtualSegmentID = VADDR_TO_VSID(fVSIDBase, virtualAddress); uint32 virtualSegmentID = VADDR_TO_VSID(fVSIDBase, virtualAddress);
uint32 protection = 0; uint32 protection = 0;
@@ -413,7 +412,7 @@ PPCVMTranslationMap::Map(addr_t virtualAddress, phys_addr_t physicalAddress,
continue; continue;
fill_page_table_entry(entry, virtualSegmentID, virtualAddress, physicalAddress, fill_page_table_entry(entry, virtualSegmentID, virtualAddress, physicalAddress,
protection, false); protection, memoryType, false);
fMapCount++; fMapCount++;
return B_OK; return B_OK;
} }
@@ -430,7 +429,7 @@ PPCVMTranslationMap::Map(addr_t virtualAddress, phys_addr_t physicalAddress,
continue; continue;
fill_page_table_entry(entry, virtualSegmentID, virtualAddress, physicalAddress, fill_page_table_entry(entry, virtualSegmentID, virtualAddress, physicalAddress,
protection, false); protection, memoryType, false);
fMapCount++; fMapCount++;
return B_OK; return B_OK;
} }
@@ -767,7 +766,8 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress,
if (group->entry[i].valid) if (group->entry[i].valid)
continue; continue;
fill_page_table_entry(&group->entry[i], virtualSegmentID, virtualAddress, physicalAddress, PTE_READ_WRITE, false); fill_page_table_entry(&group->entry[i], virtualSegmentID,
virtualAddress, physicalAddress, PTE_READ_WRITE, 0, false);
return B_OK; return B_OK;
} }
@@ -778,7 +778,8 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress,
if (group->entry[i].valid) if (group->entry[i].valid)
continue; continue;
fill_page_table_entry(&group->entry[i], virtualSegmentID, virtualAddress, physicalAddress, PTE_READ_WRITE, true); fill_page_table_entry(&group->entry[i], virtualSegmentID,
virtualAddress, physicalAddress, PTE_READ_WRITE, 0, true);
return B_OK; return B_OK;
} }