From owner-svn-src-all@FreeBSD.ORG  Tue Jun 24 20:35:20 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E260867F;
 Tue, 24 Jun 2014 20:35:20 +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 CF77F2AC6;
 Tue, 24 Jun 2014 20:35:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OKZKZF033507;
 Tue, 24 Jun 2014 20:35:20 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OKZKbD033506;
 Tue, 24 Jun 2014 20:35:20 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201406242035.s5OKZKbD033506@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 24 Jun 2014 20:35:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r267841 - releng/9.3/sys/dev/acpica
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jun 2014 20:35:21 -0000

Author: jhb
Date: Tue Jun 24 20:35:20 2014
New Revision: 267841
URL: http://svnweb.freebsd.org/changeset/base/267841

Log:
  MFC 253392:
  Workaround some broken BIOSes that specify edge-sensitive but active-low
  settings for ACPI-enumerated serial ports by forcing any IRQs that use
  an ISA IRQ value with these settings to active-high instead of active-low.
  
  This is known to occur with the BIOS on an Intel D2500CCE motherboard.
  
  Approved by:	re (gjb)

Modified:
  releng/9.3/sys/dev/acpica/acpi_resource.c
Directory Properties:
  releng/9.3/   (props changed)
  releng/9.3/sys/   (props changed)

Modified: releng/9.3/sys/dev/acpica/acpi_resource.c
==============================================================================
--- releng/9.3/sys/dev/acpica/acpi_resource.c	Tue Jun 24 20:23:18 2014	(r267840)
+++ releng/9.3/sys/dev/acpica/acpi_resource.c	Tue Jun 24 20:35:20 2014	(r267841)
@@ -135,6 +135,17 @@ acpi_config_intr(device_t dev, ACPI_RESO
     default:
 	panic("%s: bad resource type %u", __func__, res->Type);
     }
+
+#if defined(__amd64__) || defined(__i386__)
+    /*
+     * XXX: Certain BIOSes have buggy AML that specify an IRQ that is
+     * edge-sensitive and active-lo.  However, edge-sensitive IRQs
+     * should be active-hi.  Force IRQs with an ISA IRQ value to be
+     * active-hi instead.
+     */
+    if (irq < 16 && trig == ACPI_EDGE_SENSITIVE && pol == ACPI_ACTIVE_LOW)
+	pol = ACPI_ACTIVE_HIGH;
+#endif
     BUS_CONFIG_INTR(dev, irq, (trig == ACPI_EDGE_SENSITIVE) ?
 	INTR_TRIGGER_EDGE : INTR_TRIGGER_LEVEL, (pol == ACPI_ACTIVE_HIGH) ?
 	INTR_POLARITY_HIGH : INTR_POLARITY_LOW);