svn commit: r207502 - stable/8/sys/dev/ata/chipsets

[Alexander Motin]

Author: mav
Date: Sun May  2 12:39:29 2010
New Revision: 207502
URL: http://svn.freebsd.org/changeset/base/207502

Log:
  MFC r206604:
  For early ALI chips do not announce I/O sizes that require unsupported
  48bit DMA commands.

Modified:
  stable/8/sys/dev/ata/chipsets/ata-acerlabs.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/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Sun May  2 12:38:59 2010	(r207501)
+++ stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Sun May  2 12:39:29 2010	(r207502)
@@ -184,8 +184,11 @@ ata_ali_ch_attach(device_t dev)
     if (ctlr->chip->cfg2 & ALI_NEW && ctlr->chip->chiprev < 0xc7)
 	ch->flags |= ATA_CHECKS_CABLE;
     /* older chips can't do 48bit DMA transfers */
-    if (ctlr->chip->chiprev <= 0xc4)
+    if (ctlr->chip->chiprev <= 0xc4) {
 	ch->flags |= ATA_NO_48BIT_DMA;
+	if (ch->dma.max_iosize > 256 * 512)
+		ch->dma.max_iosize = 256 * 512;
+    }
 
     return 0;
 }