svn commit: r218082 - stable/8/sys/powerpc/powermac

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sun Jan 30 02:17:47 2011
New Revision: 218082
URL: http://svn.freebsd.org/changeset/base/218082

Log:
  MFC r217756:
  Disable ATAPI DMA unconditionally on Apple Kauai ATA controllers, like it
  is on the MacIO ones. It appears to be unreliable on all DBDMA-based
  controllers for unknown reasons, which should be figured out eventually.

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)

Modified: stable/8/sys/powerpc/powermac/ata_kauai.c
==============================================================================
--- stable/8/sys/powerpc/powermac/ata_kauai.c	Sat Jan 29 23:26:28 2011	(r218081)
+++ stable/8/sys/powerpc/powermac/ata_kauai.c	Sun Jan 30 02:17:47 2011	(r218082)
@@ -244,8 +244,11 @@ ata_kauai_probe(device_t dev)
         ch->r_io[ATA_CONTROL].offset = ATA_KAUAI_ALTOFFSET;
 	ata_default_registers(dev);
 
-        ch->unit = 0;
-        ch->flags |= ATA_USE_16BIT;
+	ch->unit = 0;
+	ch->flags |= ATA_USE_16BIT;
+	
+	/* XXX: ATAPI DMA is unreliable. We should find out why. */
+	ch->flags |= ATA_NO_ATAPI_DMA;
 	ata_generic_hw(dev);
 
         return (ata_probe(dev));