svn commit: r230880 - stable/9/sys/dev/ata/chipsets

[Marius Strobl]

Author: marius
Date: Wed Feb  1 21:08:33 2012
New Revision: 230880
URL: http://svn.freebsd.org/changeset/base/230880

Log:
  MFC: r230627
  
  Using ATA_CAM along with ATAPI DMA causes data corruption with ALI_NEW
  and CMD controllers for reasons unknown so disable it.
  
  PR:	164226

Modified:
  stable/9/sys/dev/ata/chipsets/ata-acerlabs.c
  stable/9/sys/dev/ata/chipsets/ata-siliconimage.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-acerlabs.c	Wed Feb  1 20:19:33 2012	(r230879)
+++ stable/9/sys/dev/ata/chipsets/ata-acerlabs.c	Wed Feb  1 21:08:33 2012	(r230880)
@@ -213,6 +213,10 @@ ata_ali_ch_attach(device_t dev)
 	if (ch->dma.max_iosize > 256 * 512)
 		ch->dma.max_iosize = 256 * 512;
     }
+#ifdef ATA_CAM
+	if (ctlr->chip->cfg2 & ALI_NEW)
+		ch->flags |= ATA_NO_ATAPI_DMA;
+#endif
 
     return 0;
 }

Modified: stable/9/sys/dev/ata/chipsets/ata-siliconimage.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-siliconimage.c	Wed Feb  1 20:19:33 2012	(r230879)
+++ stable/9/sys/dev/ata/chipsets/ata-siliconimage.c	Wed Feb  1 21:08:33 2012	(r230880)
@@ -240,6 +240,10 @@ ata_cmd_ch_attach(device_t dev)
     if (ctlr->chip->cfg2 & SII_INTR)
 	ch->hw.status = ata_cmd_status;
 
+#ifdef ATA_CAM
+	ch->flags |= ATA_NO_ATAPI_DMA;
+#endif
+
     return 0;
 }