From owner-svn-src-all@FreeBSD.ORG  Fri Feb  5 17:20:48 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4A8A1065670;
	Fri,  5 Feb 2010 17:20:48 +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 D48E48FC1D;
	Fri,  5 Feb 2010 17:20:48 +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 o15HKmpx002901;
	Fri, 5 Feb 2010 17:20:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o15HKmRA002899;
	Fri, 5 Feb 2010 17:20:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201002051720.o15HKmRA002899@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 5 Feb 2010 17:20:48 +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: r203529 - head/sys/dev/siis
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Feb 2010 17:20:49 -0000

Author: mav
Date: Fri Feb  5 17:20:48 2010
New Revision: 203529
URL: http://svn.freebsd.org/changeset/base/203529

Log:
  Use new helper functions to set PCIe max read request size.

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

Modified: head/sys/dev/siis/siis.c
==============================================================================
--- head/sys/dev/siis/siis.c	Fri Feb  5 17:18:48 2010	(r203528)
+++ head/sys/dev/siis/siis.c	Fri Feb  5 17:20:48 2010	(r203529)
@@ -230,20 +230,10 @@ static int
 siis_resume(device_t dev)
 {
 	struct siis_controller *ctlr = device_get_softc(dev);
-	int cap;
-	uint16_t val;
 
 	/* Set PCIe max read request size to at least 1024 bytes */
-	if (pci_find_extcap(dev, PCIY_EXPRESS, &cap) == 0) {
-		val = pci_read_config(dev,
-		    cap + PCIR_EXPRESS_DEVICE_CTL, 2);
-		if ((val & PCIM_EXP_CTL_MAX_READ_REQUEST) < 0x3000) {
-			val &= ~PCIM_EXP_CTL_MAX_READ_REQUEST;
-			val |= 0x3000;
-			pci_write_config(dev,
-			    cap + PCIR_EXPRESS_DEVICE_CTL, val, 2);
-		}
-	}
+	if (pci_get_max_read_req(dev) < 1024)
+		pci_set_max_read_req(dev, 1024);
 	/* Put controller into reset state. */
 	ctlr->gctl |= SIIS_GCTL_GRESET;
 	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);