mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
kernel: gdbuart: disable IRQs during destruction
Disable IRQs during destruction, but only if constructed with `GdbUart::new()`. This allows characters to buffer when the GDB bridge is destroyed while avoiding the double-free error we were getting from creating a new UART in the IRQ handler. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
3f2c4de163
commit
7b36f33ef9
1 changed files with 23 additions and 0 deletions
|
|
@ -12,6 +12,7 @@ use utralib::generated::*;
|
||||||
use xous_kernel::{MemoryFlags, MemoryType};
|
use xous_kernel::{MemoryFlags, MemoryType};
|
||||||
|
|
||||||
static UART_CALLBACK_POINTER: AtomicUsize = AtomicUsize::new(0);
|
static UART_CALLBACK_POINTER: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
static UART_COUNT: AtomicUsize = AtomicUsize::new(0);
|
||||||
static UART_ALLOCATED: AtomicBool = AtomicBool::new(false);
|
static UART_ALLOCATED: AtomicBool = AtomicBool::new(false);
|
||||||
|
|
||||||
/// UART virtual address.
|
/// UART virtual address.
|
||||||
|
|
@ -22,6 +23,7 @@ pub const APP_UART_ADDR: usize = 0xffcc_0000;
|
||||||
/// UART peripheral driver.
|
/// UART peripheral driver.
|
||||||
pub struct GdbUart {
|
pub struct GdbUart {
|
||||||
uart_csr: CSR<u32>,
|
uart_csr: CSR<u32>,
|
||||||
|
constructed: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn gdbuart_isr(_irq_no: usize, _arg: *mut usize) {
|
fn gdbuart_isr(_irq_no: usize, _arg: *mut usize) {
|
||||||
|
|
@ -34,15 +36,20 @@ fn gdbuart_isr(_irq_no: usize, _arg: *mut usize) {
|
||||||
let cb = unsafe { core::mem::transmute::<_, fn(&mut GdbUart)>(target) };
|
let cb = unsafe { core::mem::transmute::<_, fn(&mut GdbUart)>(target) };
|
||||||
cb(&mut GdbUart {
|
cb(&mut GdbUart {
|
||||||
uart_csr: CSR::new(APP_UART_ADDR as *mut u32),
|
uart_csr: CSR::new(APP_UART_ADDR as *mut u32),
|
||||||
|
constructed: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
impl GdbUart {
|
impl GdbUart {
|
||||||
pub fn new(callback: fn(&mut Self)) -> Option<GdbUart> {
|
pub fn new(callback: fn(&mut Self)) -> Option<GdbUart> {
|
||||||
UART_CALLBACK_POINTER.store(callback as usize, Ordering::Relaxed);
|
UART_CALLBACK_POINTER.store(callback as usize, Ordering::Relaxed);
|
||||||
|
if UART_COUNT.fetch_add(1, Ordering::Relaxed) != 0 {
|
||||||
|
panic!("UART has multiple consumers!");
|
||||||
|
}
|
||||||
|
|
||||||
Some(GdbUart {
|
Some(GdbUart {
|
||||||
uart_csr: CSR::new(APP_UART_ADDR as *mut u32),
|
uart_csr: CSR::new(APP_UART_ADDR as *mut u32),
|
||||||
|
constructed: true,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -107,6 +114,22 @@ impl GdbUart {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Drop for GdbUart {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
// Sometimes (e.g. during IRQs) we synthesize a GdbUart from nothing.
|
||||||
|
if !self.constructed {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if UART_COUNT.fetch_sub(1, Ordering::Relaxed) != 1 {
|
||||||
|
panic!("UART had multiple consumers!");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Disable the IRQ until we re-enable it again when the server is reconstituted
|
||||||
|
self.uart_csr.rmwf(utra::app_uart::EV_ENABLE_RX, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl SerialWrite for GdbUart {
|
impl SerialWrite for GdbUart {
|
||||||
fn putc(&mut self, c: u8) {
|
fn putc(&mut self, c: u8) {
|
||||||
// Wait until TXFULL is `0`
|
// Wait until TXFULL is `0`
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue