svn commit: r212483 - head/sys/powerpc/powermac

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Sep 11 22:09:16 2010
New Revision: 212483
URL: http://svn.freebsd.org/changeset/base/212483

Log:
  ATAPI DMA does not seem to work completely reliably on Shasta controllers,
  especially in conjunction with ATA_CAM, so disable it for now.

Modified:
  head/sys/powerpc/powermac/ata_kauai.c

Modified: head/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- head/sys/powerpc/powermac/ata_kauai.c	Sat Sep 11 22:02:36 2010	(r212482)
+++ head/sys/powerpc/powermac/ata_kauai.c	Sat Sep 11 22:09:16 2010	(r212483)
@@ -217,8 +217,10 @@ ata_kauai_probe(device_t dev)
 	ch = &sc->sc_ch.sc_ch;
 
 	compatstring = ofw_bus_get_compat(dev);
-	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
+	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0) {
+		ch->flags |= ATA_NO_ATAPI_DMA;
 		sc->shasta = 1;
+	}
 
 	/* Pre-K2 controllers apparently need this hack */
 	if (!sc->shasta &&