From owner-svn-src-head@FreeBSD.ORG  Thu Sep  3 12:37:18 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56117106566C;
	Thu,  3 Sep 2009 12:37:18 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 45C128FC0C;
	Thu,  3 Sep 2009 12:37:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n83CbIL1032553;
	Thu, 3 Sep 2009 12:37:18 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n83CbIgk032551;
	Thu, 3 Sep 2009 12:37:18 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200909031237.n83CbIgk032551@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 3 Sep 2009 12:37:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196777 - head/sys/dev/ahci
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Sep 2009 12:37:18 -0000

Author: mav
Date: Thu Sep  3 12:37:17 2009
New Revision: 196777
URL: http://svn.freebsd.org/changeset/base/196777

Log:
  ATI SB600 can't handle 256 sectors transfers with FPDMA (NCQ).
  
  MFC after:	3 days

Modified:
  head/sys/dev/ahci/ahci.c

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Thu Sep  3 10:06:37 2009	(r196776)
+++ head/sys/dev/ahci/ahci.c	Thu Sep  3 12:37:17 2009	(r196777)
@@ -1942,6 +1942,9 @@ ahciaction(struct cam_sim *sim, union cc
 		cpi->protocol = PROTO_ATA;
 		cpi->protocol_version = PROTO_VERSION_UNSPECIFIED;
 		cpi->maxio = MAXPHYS;
+		/* ATI SB600 can't handle 256 sectors with FPDMA (NCQ). */
+		if (pci_get_devid(device_get_parent(dev)) == 0x43801002)
+			cpi->maxio = min(cpi->maxio, 255 * 512);
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;