[fix] aarch64 中断状态查询

qclic · Feb 7, 2025 · 32133fa · 32133fa
1 parent 03c5f16
commit 32133fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ resolver = "2"
 members = ["app/*", "crates/*"]
 
 [workspace.package]
-version = "0.6.3"
+version = "0.6.4"
 edition = "2024"
 
 [workspace.dependencies]

diff --git a/crates/sparreal-kernel/src/irq/mod.rs b/crates/sparreal-kernel/src/irq/mod.rs
@@ -103,7 +103,6 @@ impl IrqRegister {
     pub fn register(self) {
         let irq = self.param.cfg.irq;
         let irq_parent = self.param.irq_chip;
-        debug!("Enable irq {:?} on chip {:?}", irq, irq_parent);
 
         let chip = chip(irq_parent);
         chip.register_handle(irq, self.handler);
@@ -121,6 +120,7 @@ impl IrqRegister {
 
         c.set_trigger(irq, self.param.cfg.trigger);
         c.irq_enable(irq);
+        debug!("Enable irq {:?} on chip {:?}", irq, irq_parent);
     }
 
     pub fn priority(mut self, priority: usize) -> Self {

diff --git a/crates/sparreal-rt/src/arch/aarch64/mod.rs b/crates/sparreal-rt/src/arch/aarch64/mod.rs
@@ -104,8 +104,7 @@ impl Platform for PlatformImpl {
         unsafe { asm!("msr daifset, #2") };
     }
     fn irq_all_is_enabled() -> bool {
-        let c = DAIF.read(DAIF::I);
-        c > 0
+        !DAIF.is_set(DAIF::I)
     }
 
     fn on_boot_success() {