From owner-svn-src-head@FreeBSD.ORG  Tue Dec  9 11:12:25 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C31D4446;
 Tue,  9 Dec 2014 11:12:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AFAD53A6;
 Tue,  9 Dec 2014 11:12:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9BCP0x093840;
 Tue, 9 Dec 2014 11:12:25 GMT (envelope-from royger@FreeBSD.org)
Received: (from royger@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9BCPfT093839;
 Tue, 9 Dec 2014 11:12:25 GMT (envelope-from royger@FreeBSD.org)
Message-Id: <201412091112.sB9BCPfT093839@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: royger set sender to
 royger@FreeBSD.org using -f
From: Roger Pau Monné <royger@FreeBSD.org>
Date: Tue, 9 Dec 2014 11:12:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275641 - head/sys/x86/xen
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Dec 2014 11:12:25 -0000

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@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);
 }