mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
add code to implement irq trigger edge updating
also improve comments so I can remember how this actually works.
This commit is contained in:
parent
245040cfb9
commit
6b0972a551
1 changed files with 57 additions and 8 deletions
|
|
@ -34,7 +34,7 @@ bitfield! {
|
||||||
fn irq_select_from_port(port: IoxPort, pin: u8) -> u32 { (port as u32) * 16 + pin as u32 }
|
fn irq_select_from_port(port: IoxPort, pin: u8) -> u32 { (port as u32) * 16 + pin as u32 }
|
||||||
fn find_first_none<T>(arr: &[Option<T>]) -> Option<usize> { arr.iter().position(|item| item.is_none()) }
|
fn find_first_none<T>(arr: &[Option<T>]) -> Option<usize> { arr.iter().position(|item| item.is_none()) }
|
||||||
|
|
||||||
#[derive(Debug, Copy, Clone)]
|
#[derive(Debug)]
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
struct IrqLocalRegistration {
|
struct IrqLocalRegistration {
|
||||||
pub cid: xous::CID,
|
pub cid: xous::CID,
|
||||||
|
|
@ -42,6 +42,7 @@ struct IrqLocalRegistration {
|
||||||
pub port: IoxPort,
|
pub port: IoxPort,
|
||||||
pub pin: u8,
|
pub pin: u8,
|
||||||
pub active: IoxValue,
|
pub active: IoxValue,
|
||||||
|
pub server: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct IrqHandler {
|
struct IrqHandler {
|
||||||
|
|
@ -274,9 +275,12 @@ fn main() {
|
||||||
.expect("couldn't claim Iox interrupt");
|
.expect("couldn't claim Iox interrupt");
|
||||||
irq.irq_csr.wo(utralib::utra::irqarray10::EV_PENDING, 0xFFFF_FFFF);
|
irq.irq_csr.wo(utralib::utra::irqarray10::EV_PENDING, 0xFFFF_FFFF);
|
||||||
irq.irq_csr.wfo(utralib::utra::irqarray10::EV_ENABLE_IOXIRQ, 1);
|
irq.irq_csr.wfo(utralib::utra::irqarray10::EV_ENABLE_IOXIRQ, 1);
|
||||||
// Up to 8 slots where we can populate interrupt mappings in the hardware
|
// This is an [Option; 8] instead of a Vec because in hardware we have only
|
||||||
// The index of the array corresponds to the slot.
|
// 8 slots where we can populate interrupt mappings in the hardware. Each slot's
|
||||||
let mut irq_table: [Option<IrqLocalRegistration>; 8] = [None; 8];
|
// index maps 1:1 to a hardware register offset. Thus as interrupts are de-allocated,
|
||||||
|
// we don't want the indices to change - in this case, Vec is not the right object,
|
||||||
|
// we want a static array defined like this.
|
||||||
|
let mut irq_table: [Option<IrqLocalRegistration>; 8] = [const { None }; 8];
|
||||||
|
|
||||||
let mut msg_opt = None;
|
let mut msg_opt = None;
|
||||||
log::debug!("Starting main loop");
|
log::debug!("Starting main loop");
|
||||||
|
|
@ -399,12 +403,12 @@ fn main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
HalOpcode::ConfigureIoxIrq => {
|
HalOpcode::ConfigureIoxIrq => {
|
||||||
let buf = unsafe {
|
let mut buf = unsafe {
|
||||||
xous_ipc::Buffer::from_memory_message(
|
xous_ipc::Buffer::from_memory_message(
|
||||||
msg_opt.as_mut().unwrap().body.memory_message().unwrap(),
|
msg_opt.as_mut().unwrap().body.memory_message_mut().unwrap(),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
let registration = buf.to_original::<IoxIrqRegistration, _>().unwrap();
|
let mut registration = buf.to_original::<IoxIrqRegistration, _>().unwrap();
|
||||||
log::info!("Got registration request: {:?}", registration);
|
log::info!("Got registration request: {:?}", registration);
|
||||||
if let Some(index) = find_first_none(&irq_table) {
|
if let Some(index) = find_first_none(&irq_table) {
|
||||||
// create the reverse-lookup registration
|
// create the reverse-lookup registration
|
||||||
|
|
@ -417,6 +421,7 @@ fn main() {
|
||||||
port: registration.port,
|
port: registration.port,
|
||||||
pin: registration.pin,
|
pin: registration.pin,
|
||||||
active: registration.active,
|
active: registration.active,
|
||||||
|
server: registration.server.to_owned(),
|
||||||
};
|
};
|
||||||
irq_table[index] = Some(local_reg);
|
irq_table[index] = Some(local_reg);
|
||||||
|
|
||||||
|
|
@ -429,6 +434,7 @@ fn main() {
|
||||||
IoxValue::High => int_cr.set_mode(IntMode::RisingEdge as u32),
|
IoxValue::High => int_cr.set_mode(IntMode::RisingEdge as u32),
|
||||||
}
|
}
|
||||||
int_cr.set_enable(true);
|
int_cr.set_enable(true);
|
||||||
|
int_cr.set_wakeup(true);
|
||||||
// safety: the index and offset are mapped to the intended range because the index is
|
// safety: the index and offset are mapped to the intended range because the index is
|
||||||
// bounded by the size of irq_table, and the offset comes from the generated header
|
// bounded by the size of irq_table, and the offset comes from the generated header
|
||||||
// file.
|
// file.
|
||||||
|
|
@ -448,10 +454,53 @@ fn main() {
|
||||||
.add(index)
|
.add(index)
|
||||||
.write_volatile(int_cr.0);
|
.write_volatile(int_cr.0);
|
||||||
}
|
}
|
||||||
|
registration.index = Some(index);
|
||||||
|
|
||||||
|
buf.replace(registration).unwrap();
|
||||||
} else {
|
} else {
|
||||||
panic!("Ran out of Iox interrupt slots: maximum 8 available");
|
panic!("Ran out of Iox interrupt slots: maximum 8 available");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
HalOpcode::UpdateIoxIrq => {
|
||||||
|
let buf = unsafe {
|
||||||
|
xous_ipc::Buffer::from_memory_message(
|
||||||
|
msg_opt.as_ref().unwrap().body.memory_message().unwrap(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
let update = buf.to_original::<IoxIrqUpdate, _>().unwrap();
|
||||||
|
log::debug!("Got IRQ update request: {:?}", update);
|
||||||
|
if let Some(Some(reg)) = irq_table.get_mut(update.index) {
|
||||||
|
if reg.server == update.server {
|
||||||
|
if let Some(active) = update.active {
|
||||||
|
reg.active = active;
|
||||||
|
// fetch the interrupt control register value
|
||||||
|
let mut int_cr = IntCr(unsafe {
|
||||||
|
iox.csr
|
||||||
|
.base()
|
||||||
|
.add(utralib::utra::iox::SFR_INTCR_CRINT0.offset())
|
||||||
|
.add(update.index)
|
||||||
|
.read_volatile()
|
||||||
|
});
|
||||||
|
// update the edge option
|
||||||
|
match active {
|
||||||
|
IoxValue::Low => int_cr.set_mode(IntMode::FallingEdge as u32),
|
||||||
|
IoxValue::High => int_cr.set_mode(IntMode::RisingEdge as u32),
|
||||||
|
}
|
||||||
|
// commit
|
||||||
|
unsafe {
|
||||||
|
iox.csr
|
||||||
|
.base()
|
||||||
|
.add(utralib::utra::iox::SFR_INTCR_CRINT0.offset())
|
||||||
|
.add(update.index)
|
||||||
|
.write_volatile(int_cr.0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if let Some(opcode) = update.opcode {
|
||||||
|
reg.opcode = opcode;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
HalOpcode::IrqLocalHandler => {
|
HalOpcode::IrqLocalHandler => {
|
||||||
if let Some(scalar) = msg_opt.as_mut().unwrap().body.scalar_message() {
|
if let Some(scalar) = msg_opt.as_mut().unwrap().body.scalar_message() {
|
||||||
// Figure out which port(s) caused the IRQ
|
// Figure out which port(s) caused the IRQ
|
||||||
|
|
@ -462,7 +511,7 @@ fn main() {
|
||||||
for bitpos in 0..8 {
|
for bitpos in 0..8 {
|
||||||
// the bit position is flipped versus register order in memory
|
// the bit position is flipped versus register order in memory
|
||||||
if ((irq_flag << (bitpos as u32)) & 0x80) != 0 {
|
if ((irq_flag << (bitpos as u32)) & 0x80) != 0 {
|
||||||
if let Some(local_reg) = irq_table[bitpos] {
|
if let Some(local_reg) = &irq_table[bitpos] {
|
||||||
found = true;
|
found = true;
|
||||||
// interrupts are "Best effort" and can gracefully fail if the receiver
|
// interrupts are "Best effort" and can gracefully fail if the receiver
|
||||||
// has been overwhelmed by too many
|
// has been overwhelmed by too many
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue