github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-09 12:49:24 +00:00
Code Issues Projects Releases Wiki Activity

hv: mmu: rename PTT_HOST to PTT_PRIMARY

Browse Source 
Tracked-On: #1124

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Li, Fei1
2018-08-23 14:19:44 +08:00
committed by lijinxia
parent c102c44c16
commit 58fffcd3b9
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/arch/x86/mmu.c
View File

@@ -244,7 +244,7 @@ void init_paging(void)
/* Map all memory regions to UC attribute */
mmu_add((uint64_t *)mmu_pml4_addr, e820_mem.mem_bottom,
e820_mem.mem_bottom, e820_mem.mem_top - e820_mem.mem_bottom,
attr_uc, PTT_HOST);
attr_uc, PTT_PRIMARY);
/* Modify WB attribute for E820_TYPE_RAM */
for (i = 0U; i < e820_entries; i++) {
@@ -253,7 +253,7 @@ void init_paging(void)
mmu_modify_or_del((uint64_t *)mmu_pml4_addr,
entry->baseaddr, entry->length,
PAGE_CACHE_WB, PAGE_CACHE_MASK,
PTT_HOST, MR_MODIFY);
PTT_PRIMARY, MR_MODIFY);
}
}
@@ -263,7 +263,7 @@ void init_paging(void)
hv_hpa = get_hv_image_base();
mmu_modify_or_del((uint64_t *)mmu_pml4_addr, hv_hpa, CONFIG_RAM_SIZE,
PAGE_CACHE_WB, PAGE_CACHE_MASK | PAGE_USER,
PTT_HOST, MR_MODIFY);
PTT_PRIMARY, MR_MODIFY);
/* Enable paging */
enable_paging(HVA2HPA(mmu_pml4_addr));

4
hypervisor/arch/x86/pagetable.c
View File

@@ -48,7 +48,7 @@ static int split_large_page(uint64_t *pte,
paddr += paddrinc;
}
ref_prot = (ptt == PTT_HOST) ? PAGE_TABLE : EPT_RWX;
ref_prot = (ptt == PTT_PRIMARY) ? PAGE_TABLE : EPT_RWX;
set_pgentry(pte, HVA2HPA((void *)pbase) | ref_prot);
/* TODO: flush the TLB */
@@ -80,7 +80,7 @@ static inline int construct_pgentry(enum _page_table_type ptt, uint64_t *pde)
return -ENOMEM;
}
prot = (ptt == PTT_HOST) ? PAGE_TABLE: EPT_RWX;
prot = (ptt == PTT_PRIMARY) ? PAGE_TABLE: EPT_RWX;
set_pgentry(pde, HVA2HPA(pd_page) | prot);
return 0;
}