From e07ab36984e95fa9aae74c09aa72f9fa7bc8eadf Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Sun, 22 Dec 2024 00:30:27 +0800
Subject: [PATCH] fixup IRQ handling

- disable IRQs on departure
- put EV enable outside of the HAL function
this is necessary because we need all HAL calls to be finished
before an interrupt happens to avoid locking problems
---
 loader/src/platform/cramium/update.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/loader/src/platform/cramium/update.rs b/loader/src/platform/cramium/update.rs
index 6543cd6fa..0fa2638b4 100644
--- a/loader/src/platform/cramium/update.rs
+++ b/loader/src/platform/cramium/update.rs
@@ -21,8 +21,7 @@ use utralib::generated::*;
 use crate::SIGBLOCK_SIZE;
 use crate::platform::cramium::gfx;
 use crate::platform::cramium::sha512_digest::Sha512Prehash;
-use crate::platform::cramium::usb;
-use crate::platform::cramium::usb::SliceCursor;
+use crate::platform::cramium::usb::{self, SliceCursor, disable_all_irqs};
 use crate::platform::delay;
 
 // TODO:
@@ -163,6 +162,9 @@ pub fn process_update(perclk: u32) {
                 usb.init();
                 usb.start();
                 usb.update_current_speed();
+                // IRQ enable must happen without dependency on the hardware lock
+                usb.irq_csr.wo(utralib::utra::irqarray1::EV_PENDING, 0xffff_ffff); // blanket clear
+                usb.irq_csr.wfo(utralib::utra::irqarray1::EV_ENABLE_USBC_DUPE, 1);
 
                 let mut last_usb_state = usb.get_device_state();
                 let mut portsc = usb.portsc_val();
@@ -472,6 +474,9 @@ pub fn process_update(perclk: u32) {
                         crate::println!("Couldn't list dir: {:?}", e);
                     }
                 }
+                // unmap IRQs
+                disable_all_irqs();
+                usb.stop();
             } else {
                 crate::println!("USB core not allocated, can't do update!");
             }