From owner-svn-src-head@FreeBSD.ORG  Thu Jun 14 22:19:24 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 88948106564A;
	Thu, 14 Jun 2012 22:19:24 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 747848FC0A;
	Thu, 14 Jun 2012 22:19:24 +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 q5EMJOZN024473;
	Thu, 14 Jun 2012 22:19:24 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5EMJOvx024471;
	Thu, 14 Jun 2012 22:19:24 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206142219.q5EMJOvx024471@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 14 Jun 2012 22:19:24 +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: r237107 - head/sys/dev/ata/chipsets
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: Thu, 14 Jun 2012 22:19:24 -0000

Author: marius
Date: Thu Jun 14 22:19:23 2012
New Revision: 237107
URL: http://svn.freebsd.org/changeset/base/237107

Log:
  - As a baind-aid, disable ATAPI DMA when using ATA_CAM for these controllers
    as well as it causes the kernel to hang during boot.
    Reported and tested by: Kevin Oberman
  - Use NULL instead of 0 for a pointer.
  
  MFC after:	3 days

Modified:
  head/sys/dev/ata/chipsets/ata-ite.c

Modified: head/sys/dev/ata/chipsets/ata-ite.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ite.c	Thu Jun 14 21:48:14 2012	(r237106)
+++ head/sys/dev/ata/chipsets/ata-ite.c	Thu Jun 14 22:19:23 2012	(r237107)
@@ -105,10 +105,10 @@ ata_ite_chipinit(device_t dev)
 
 	ctlr->setmode = ata_ite_821x_setmode;
 	/* No timing restrictions initally. */
-	ctlr->chipset_data = (void *)0;
+	ctlr->chipset_data = NULL;
     }
     ctlr->ch_attach = ata_ite_ch_attach;
-    return 0;
+    return (0);
 }
 
 static int
@@ -119,6 +119,9 @@ ata_ite_ch_attach(device_t dev)
  
 	error = ata_pci_ch_attach(dev);
 	ch->flags |= ATA_CHECKS_CABLE;
+#ifdef ATA_CAM
+	ch->flags |= ATA_NO_ATAPI_DMA;
+#endif
 	return (error);
 }