svn commit: r200409 - stable/8/sys/dev/ata

Alexander Motin mav at FreeBSD.org
Fri Dec 11 04:44:45 PST 2009


Author: mav
Date: Fri Dec 11 12:44:44 2009
New Revision: 200409
URL: http://svn.freebsd.org/changeset/base/200409

Log:
  MFC r200353:
  Limit maximum I/O size, depending on command set supported by device.
  It is required to suppot non-LBA48 devices with MAXPHYS above 128K.
  Same is done in ada(4).

Modified:
  stable/8/sys/dev/ata/ata-disk.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)

Modified: stable/8/sys/dev/ata/ata-disk.c
==============================================================================
--- stable/8/sys/dev/ata/ata-disk.c	Fri Dec 11 12:38:15 2009	(r200408)
+++ stable/8/sys/dev/ata/ata-disk.c	Fri Dec 11 12:44:44 2009	(r200409)
@@ -126,6 +126,10 @@ ad_attach(device_t dev)
     adp->disk->d_name = "ad";
     adp->disk->d_drv1 = dev;
     adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS;
+    if (atadev->param.support.command2 & ATA_SUPPORT_ADDRESS48)
+	adp->disk->d_maxsize = min(adp->disk->d_maxsize, 65536 * DEV_BSIZE);
+    else					/* 28bit ATA command limit */
+	adp->disk->d_maxsize = min(adp->disk->d_maxsize, 256 * DEV_BSIZE);
     adp->disk->d_sectorsize = DEV_BSIZE;
     adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs;
     adp->disk->d_fwsectors = adp->sectors;


More information about the svn-src-stable-8 mailing list