github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-23 17:58:30 +00:00
Code Issues Projects Releases Wiki Activity

MMU: bug fix on operating va <=> pa convertion

Browse Source 
Before referencing to physical address of devs such as lapic, ioapic,
vtd, and uart, switch to virtual address.
Use a phisical address of pml4 to write CR3.

Signed-off-by: Zheng, Gen <gen.zheng@intel.com>
This commit is contained in:
Zheng, Gen
2018-04-16 12:07:42 +08:00
committed by lijinxia
parent bde415ec81
commit b6dd16b75e
7 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debug/uart16550.c
View File

@@ -93,7 +93,7 @@ static inline uint32_t uart16550_read_reg(uint64_t base, uint32_t reg_idx)
if (serial_port_mapped) {
return io_read_byte((uint16_t)base + reg_idx);
} else {
return mmio_read_long((void*)((uint32_t*)base + reg_idx));
return mmio_read_long((void*)((uint32_t*)HPA2HVA(base) + reg_idx));
}
}
@@ -103,7 +103,7 @@ static inline void uart16550_write_reg(uint64_t base,
if (serial_port_mapped) {
io_write_byte(val, (uint16_t)base + reg_idx);
} else {
mmio_write_long(val, (void*)((uint32_t*)base + reg_idx));
mmio_write_long(val, (void*)((uint32_t*)HPA2HVA(base) + reg_idx));
}
}
@@ -339,5 +339,5 @@ void uart16550_set_property(int enabled, int port_mapped, uint64_t base_addr)
{
uart_enabled = enabled;
serial_port_mapped = port_mapped;
Tgt_Uarts[0].base_address = (uint32_t) base_addr;
Tgt_Uarts[0].base_address = base_addr;
}