Skip to content

Add Support for Multiple IRQs in IrqDescriptor #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
newcomb-luke wants to merge 1 commit into from
+32 −13
Closed

Add Support for Multiple IRQs in IrqDescriptor #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions aml/src/pci_routing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
namespace::AmlName,
resource::{self, InterruptPolarity, InterruptTrigger, Resource},
resource::{self, InterruptPolarity, InterruptTrigger, Irq, Resource},
value::Args,
AmlContext,
AmlError,
Expand Down Expand Up @@ -169,7 +169,7 @@ impl PciRoutingTable {
polarity: InterruptPolarity::ActiveLow,
is_shared: true,
is_wake_capable: false,
irq: gsi,
irq: Irq::Single(gsi),
}),
PciRouteType::LinkObject(ref name) => {
let path = AmlName::from_str("_CRS").unwrap().resolve(name)?;
Expand Down
41 changes: 30 additions & 11 deletions aml/src/resource.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,18 +317,20 @@ fn address_space_descriptor<T>(bytes: &[u8]) -> Result<Resource, AmlError> {
}))
}

#[derive(Debug, PartialEq, Eq, Clone)]
pub enum Irq {
Single(u32),
Multiple(Vec<u32>)
}

#[derive(Debug, PartialEq, Eq, Clone)]
pub struct IrqDescriptor {
pub is_consumer: bool,
pub trigger: InterruptTrigger,
pub polarity: InterruptPolarity,
pub is_shared: bool,
pub is_wake_capable: bool,
/*
* NOTE: We currently only support the cases where a descriptor only contains a single interrupt
* number.
*/
pub irq: u32,
pub irq: Irq,
}

fn irq_format_descriptor(bytes: &[u8]) -> Result<Resource, AmlError> {
Expand Down Expand Up @@ -369,7 +371,7 @@ fn irq_format_descriptor(bytes: &[u8]) -> Result<Resource, AmlError> {
let irq = LittleEndian::read_u16(&bytes[1..=2]);

Ok(Resource::Irq(IrqDescriptor {
irq: irq as u32,
irq: Irq::Single(irq as u32),

@ChocolateLoverRaj ChocolateLoverRaj Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This assumes the irq is encoded as a single number when it is actually encoded as a bit mask. See #330 and https://uefi.org/htmlspecs/ACPI_Spec_6_4_html/06_Device_Configuration/Device_Configuration.html#irq-descriptor.

@ChocolateLoverRaj ChocolateLoverRaj Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am working on a fix to this. I will fork your branch.

is_wake_capable: false,
is_shared: false,
polarity: InterruptPolarity::ActiveHigh,
Expand All @@ -395,7 +397,7 @@ fn irq_format_descriptor(bytes: &[u8]) -> Result<Resource, AmlError> {
};

Ok(Resource::Irq(IrqDescriptor {
irq: irq as u32,
irq: Irq::Single(irq as u32),

@ChocolateLoverRaj ChocolateLoverRaj Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same incorrect here.

is_wake_capable,
is_shared,
polarity,
Expand Down Expand Up @@ -551,8 +553,25 @@ fn extended_interrupt_descriptor(bytes: &[u8]) -> Result<Resource, AmlError> {
}

let number_of_interrupts = bytes[4] as usize;
assert_eq!(number_of_interrupts, 1);
let irq = LittleEndian::read_u32(&[bytes[5], bytes[6], bytes[7], bytes[8]]);

let irq = if number_of_interrupts == 1 {
let irq = LittleEndian::read_u32( &bytes[5..9]);

Irq::Single(irq)
} else {
let mut irqs = Vec::with_capacity(number_of_interrupts);

for i in 0..number_of_interrupts {
let start = 5 + i * size_of::<u32>();
let end = start + 4;

let irq = LittleEndian::read_u32(&bytes[start..end]);

irqs.push(irq);
}

Irq::Multiple(irqs)
};

Ok(Resource::Irq(IrqDescriptor {
is_consumer: bytes[3].get_bit(0),
Expand Down Expand Up @@ -625,7 +644,7 @@ mod tests {
polarity: InterruptPolarity::ActiveHigh,
is_shared: false,
is_wake_capable: false,
irq: (1 << 1)
irq: Irq::Single(1 << 1)
})
])
);
Expand Down Expand Up @@ -836,7 +855,7 @@ mod tests {
polarity: InterruptPolarity::ActiveHigh,
is_shared: false,
is_wake_capable: false,
irq: (1 << 6)
irq: Irq::Single(1 << 6)
}),
Resource::Dma(DMADescriptor {
channel_mask: 1 << 2,
Expand Down