From 9357ceab6ac207498fc2cff4be70aa6975e9c79f Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 5 Oct 2018 11:29:33 -0700 Subject: [PATCH] mptable: mark PCI interrupts as edge triggered BUG=chromium:854766 TEST=Boot crosvm on an x86_64 platform (nami) Change-Id: Id55975a443a54e8b9c25616cd842507c57802af0 Signed-off-by: Daniel Verkamp Reviewed-on: https://chromium-review.googlesource.com/1265047 Reviewed-by: Dylan Reid --- x86_64/src/mptable.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x86_64/src/mptable.rs b/x86_64/src/mptable.rs index b7842b03e6..7587bb7a87 100644 --- a/x86_64/src/mptable.rs +++ b/x86_64/src/mptable.rs @@ -85,6 +85,7 @@ const CPU_STEPPING: u32 = 0x600; const CPU_FEATURE_APIC: u32 = 0x200; const CPU_FEATURE_FPU: u32 = 0x001; const MPTABLE_START: u64 = 0x400 * 639; // Last 1k of Linux's 640k base RAM. +const MP_IRQTRIG_EDGE: u16 = 4; fn compute_checksum(v: &T) -> u8 { // Safe because we are only reading the bytes within the size of the `T` reference `v`. @@ -250,7 +251,7 @@ pub fn setup_mptable( let mut mpc_intsrc = mpc_intsrc::default(); mpc_intsrc.type_ = MP_INTSRC as u8; mpc_intsrc.irqtype = mp_irq_source_types_mp_INT as u8; - mpc_intsrc.irqflag = MP_IRQDIR_DEFAULT as u16; + mpc_intsrc.irqflag = MP_IRQTRIG_EDGE | MP_IRQDIR_DEFAULT as u16; mpc_intsrc.srcbus = PCI_BUS_ID; mpc_intsrc.srcbusirq = (pci_irq.0 as u8 + 1) << 2 | pci_irq.1.to_mask() as u8; mpc_intsrc.dstapic = ioapicid;