From owner-svn-src-all@FreeBSD.ORG  Tue Jun  8 17:26:18 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA85E106567C;
	Tue,  8 Jun 2010 17:26:18 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D8BC88FC1D;
	Tue,  8 Jun 2010 17:26:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o58HQITo065402;
	Tue, 8 Jun 2010 17:26:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o58HQItr065400;
	Tue, 8 Jun 2010 17:26:18 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006081726.o58HQItr065400@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 8 Jun 2010 17:26:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208916 - stable/8/sys/powerpc/powermac
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 08 Jun 2010 17:26:19 -0000

Author: nwhitehorn
Date: Tue Jun  8 17:26:18 2010
New Revision: 208916
URL: http://svn.freebsd.org/changeset/base/208916

Log:
  MFC r208168:
  It is not necessary (and in some cases harmful) to hardcode ata_kauai's
  IRQ to 39 on K2 devices, as well as Shasta ones.
  
  Reported by:	Andreas Tobler
  Approved by:	re (kib)

Modified:
  stable/8/sys/powerpc/powermac/ata_kauai.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- stable/8/sys/powerpc/powermac/ata_kauai.c	Tue Jun  8 17:08:13 2010	(r208915)
+++ stable/8/sys/powerpc/powermac/ata_kauai.c	Tue Jun  8 17:26:18 2010	(r208916)
@@ -220,8 +220,9 @@ ata_kauai_probe(device_t dev)
 	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
 		sc->shasta = 1;
 
-	/* Regular Kauai controllers apparently need this hack */
-	if (!sc->shasta)
+	/* Pre-K2 controllers apparently need this hack */
+	if (!sc->shasta &&
+	    (compatstring == NULL || strcmp(compatstring, "K2-UATA") != 0))
 		bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1);
 
         rid = PCIR_BARS;