From owner-svn-src-head@FreeBSD.ORG  Fri May  4 23:16:30 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 45C97106564A;
	Fri,  4 May 2012 23:16:30 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 30F2E8FC1B;
	Fri,  4 May 2012 23:16:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q44NGUmF027295;
	Fri, 4 May 2012 23:16:30 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q44NGTUM027293;
	Fri, 4 May 2012 23:16:30 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201205042316.q44NGTUM027293@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 4 May 2012 23:16:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235041 - head/sys/ia64/ia64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 04 May 2012 23:16:30 -0000

Author: marcel
Date: Fri May  4 23:16:29 2012
New Revision: 235041
URL: http://svn.freebsd.org/changeset/base/235041

Log:
  Don't assume we have legacy PICs (i.e. 8259A in cascade) at the legacy
  I/O port addresses. Even if we do, this is hardly the place to mask
  interrupts. It's not clear that this was at all needed. The code came
  with CVS revision 1.2 of nexus.c when interrupt support was first added.
  What is known is that ia64 has always been designed around the IOSAPIC,
  and that doing I/O like this prevents Altix from booting.

Modified:
  head/sys/ia64/ia64/nexus.c

Modified: head/sys/ia64/ia64/nexus.c
==============================================================================
--- head/sys/ia64/ia64/nexus.c	Fri May  4 22:54:54 2012	(r235040)
+++ head/sys/ia64/ia64/nexus.c	Fri May  4 23:16:29 2012	(r235041)
@@ -65,9 +65,6 @@
 
 #include <dev/acpica/acpivar.h>
 
-#include <isa/isareg.h>
-#include <sys/rtprio.h>
-
 #include "clock_if.h"
 
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
@@ -191,12 +188,6 @@ static int
 nexus_attach(device_t dev)
 {
 
-	/*
-	 * Mask the legacy PICs - we will use the I/O SAPIC for interrupt.
-	 */
-	outb(IO_ICU1+1, 0xff);
-	outb(IO_ICU2+1, 0xff);
-
 	if (acpi_identify() == 0)
 		BUS_ADD_CHILD(dev, 10, "acpi", 0);
 	clock_register(dev, 1000);