Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-28 03:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the system device's IO memory access

Browse Source
This commit is contained in:
Yuke Peng
2024-10-31 08:43:52 +08:00
committed by Tate, Hongliang Tian
parent 8a26b785a4
commit 05ec50def3
7 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ostd/src/arch/x86/kernel/apic/xapic.rs
View File

@ -23,7 +23,7 @@ impl XApic {
if !Self::has_xapic() {
return None;
}
let address = mm::paddr_to_vaddr(get_apic_base_address());
let address = mm::paddr_to_vaddr(get_xapic_base_address());
Some(Self {
mmio_start: address as *mut u32,
})
@ -47,7 +47,7 @@ impl XApic {
pub fn enable(&mut self) {
// Enable xAPIC
set_apic_base_address(get_apic_base_address());
set_apic_base_address(get_xapic_base_address());
// Set SVR, Enable APIC and set Spurious Vector to 15 (Reserved irq number)
let svr: u32 = (1 << 8) | 15;
@ -119,8 +119,8 @@ fn set_apic_base_address(address: usize) {
}
}
/// Gets APIC base address
fn get_apic_base_address() -> usize {
/// Gets xAPIC base address
pub(super) fn get_xapic_base_address() -> usize {
unsafe {
(x86_64::registers::model_specific::Msr::new(IA32_APIC_BASE_MSR).read() & 0xf_ffff_f000)
as usize