From owner-svn-src-all@FreeBSD.ORG  Fri Nov  2 14:38:58 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 85760ED1;
 Fri,  2 Nov 2012 14:38:58 +0000 (UTC)
 (envelope-from mjacob@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 6D8CD8FC16;
 Fri,  2 Nov 2012 14:38:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA2EcwRf041010;
 Fri, 2 Nov 2012 14:38:58 GMT (envelope-from mjacob@svn.freebsd.org)
Received: (from mjacob@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA2Ecw51041008;
 Fri, 2 Nov 2012 14:38:58 GMT (envelope-from mjacob@svn.freebsd.org)
Message-Id: <201211021438.qA2Ecw51041008@svn.freebsd.org>
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Fri, 2 Nov 2012 14:38:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242480 - head/sys/dev/isp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 02 Nov 2012 14:38:58 -0000

Author: mjacob
Date: Fri Nov  2 14:38:57 2012
New Revision: 242480
URL: http://svn.freebsd.org/changeset/base/242480

Log:
  Don't allow for more than one segment for the control space since
  we're not set up to deal with that.
  
  X-MFC:	242479
  MFC after:	1 week

Modified:
  head/sys/dev/isp/isp_sbus.c

Modified: head/sys/dev/isp/isp_sbus.c
==============================================================================
--- head/sys/dev/isp/isp_sbus.c	Fri Nov  2 14:37:21 2012	(r242479)
+++ head/sys/dev/isp/isp_sbus.c	Fri Nov  2 14:38:57 2012	(r242480)
@@ -460,7 +460,7 @@ isp_sbus_mbxdma(ispsoftc_t *isp)
 {
 	caddr_t base;
 	uint32_t len;
-	int i, error, ns;
+	int i, error;
 	struct imush im;
 
 	/*
@@ -511,10 +511,9 @@ isp_sbus_mbxdma(ispsoftc_t *isp)
 	len = ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp));
 	len += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp));
 
-	ns = (len / PAGE_SIZE) + 1;
 	if (isp_dma_tag_create(isp->isp_osinfo.dmat, QENTRY_LEN,
 	    BUS_SPACE_MAXADDR_24BIT+1, BUS_SPACE_MAXADDR_32BIT,
-	    BUS_SPACE_MAXADDR_32BIT, NULL, NULL, len, ns,
+	    BUS_SPACE_MAXADDR_32BIT, NULL, NULL, len, 1,
 	    BUS_SPACE_MAXADDR_24BIT, 0, &isp->isp_osinfo.cdmat)) {
 		isp_prt(isp, ISP_LOGERR,
 		    "cannot create a dma tag for control spaces");