From 4eb14ff9f1a93927792c619e6a021b1c6841d403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szaknis?= <m.szaknis@samsung.com>
Date: Thu, 18 Jul 2024 14:09:21 +0200
Subject: [PATCH] Revert "Use DUCT-TAPE to fix irq test"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2e0f9ffa672f526c91b5a6128cb70df082f33fd4.

Signed-off-by: Michał Szaknis <m.szaknis@samsung.com>
---
 lib/armv9a/src/lib.rs | 13 -------------
 rmm/src/rsi/mod.rs    |  9 ---------
 2 files changed, 22 deletions(-)

diff --git a/lib/armv9a/src/lib.rs b/lib/armv9a/src/lib.rs
index e696f26384948..8f0c98b4c5b70 100644
--- a/lib/armv9a/src/lib.rs
+++ b/lib/armv9a/src/lib.rs
@@ -11,16 +11,3 @@ pub use regs::*;
 pub const fn bits_in_reg(mask: u64, val: u64) -> u64 {
     (val << (mask.trailing_zeros())) & mask
 }
-
-pub fn is_irq_pending() -> bool {
-    let val: u64;
-
-    unsafe {
-        core::arch::asm!(
-            "mrs {}, ISR_EL1",
-            out(reg) val
-        )
-    }
-
-    val != 0
-}
diff --git a/rmm/src/rsi/mod.rs b/rmm/src/rsi/mod.rs
index aa10384222b1d..2642b06924d50 100644
--- a/rmm/src/rsi/mod.rs
+++ b/rmm/src/rsi/mod.rs
@@ -8,7 +8,6 @@ pub mod ripas;
 pub mod version;
 
 use alloc::vec::Vec;
-use armv9a::is_irq_pending;
 
 use crate::define_interface;
 use crate::event::RsiHandle;
@@ -215,14 +214,6 @@ pub fn set_event_handler(rsi: &mut RsiHandle) {
         {
             let (token_part, token_left) = get_token_part(&rd, rec, buffer_size)?;
 
-            if is_irq_pending() {
-                error!("IRQ is pending while fetching token");
-                set_reg(rec, 0, INCOMPLETE)?;
-                set_reg(rec, 1, 0)?;
-                ret[0] = rmi::SUCCESS_REC_ENTER;
-                return Ok(());
-            }
-
             unsafe {
                 let pa_ptr = attest_pa as *mut u8;
                 core::ptr::copy(token_part.as_ptr(), pa_ptr.add(pa_offset), token_part.len());