svn commit: r275641 - head/sys/x86/xen

[Roger Pau Monné]

Author: royger
Date: Tue Dec  9 11:12:24 2014
New Revision: 275641
URL: https://svnweb.freebsd.org/changeset/base/275641

Log:
  xen: notify ACPI about SCI override
  
  If the SCI is remapped to a non-ISA global interrupt notify the ACPI
  subsystem about the override.
  
  Reported by: David P. Discher <dpd at dpdtech.com>
  Sponsored by: Citrix Systems R&D

Modified:
  head/sys/x86/xen/pvcpu_enum.c

Modified: head/sys/x86/xen/pvcpu_enum.c
==============================================================================
--- head/sys/x86/xen/pvcpu_enum.c	Tue Dec  9 10:31:35 2014	(r275640)
+++ head/sys/x86/xen/pvcpu_enum.c	Tue Dec  9 11:12:24 2014	(r275641)
@@ -91,6 +91,15 @@ madt_parse_interrupt_override(ACPI_MADT_
 
 	madt_parse_interrupt_values(intr, &trig, &pol);
 
+	/* Remap the IRQ if it is mapped to a different interrupt vector. */
+	if (intr->SourceIrq != intr->GlobalIrq && intr->GlobalIrq > 15 &&
+	    intr->SourceIrq == AcpiGbl_FADT.SciInterrupt)
+		/*
+		 * If the SCI is remapped to a non-ISA global interrupt,
+		 * then override the vector we use to setup.
+		 */
+		acpi_OverrideInterruptLevel(intr->GlobalIrq);
+
 	/* Register the IRQ with the polarity and trigger mode found. */
 	xen_register_pirq(intr->GlobalIrq, trig, pol);
 }