From owner-svn-src-head@FreeBSD.ORG  Sun Nov 14 05:05:42 2010
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 55840106566B;
	Sun, 14 Nov 2010 05:05:42 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 43D208FC18;
	Sun, 14 Nov 2010 05:05:42 +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 oAE55gHx070919;
	Sun, 14 Nov 2010 05:05:42 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAE55glh070917;
	Sun, 14 Nov 2010 05:05:42 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201011140505.oAE55glh070917@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 14 Nov 2010 05:05:42 +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: r215280 - head/sys/dev/arcmsr
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: Sun, 14 Nov 2010 05:05:42 -0000

Author: delphij
Date: Sun Nov 14 05:05:41 2010
New Revision: 215280
URL: http://svn.freebsd.org/changeset/base/215280

Log:
  Workaround build for PAE case for now - revert the PHYS
  case to previous panic behavior.
  
  I have a real fix that changes the sg dma tag allocation
  to be limited to the under 4GB address space but would
  prefer to have review before committing.

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

Modified: head/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- head/sys/dev/arcmsr/arcmsr.c	Sun Nov 14 05:01:40 2010	(r215279)
+++ head/sys/dev/arcmsr/arcmsr.c	Sun Nov 14 05:05:41 2010	(r215280)
@@ -2470,11 +2470,15 @@ static void arcmsr_action(struct cam_sim
 						splx(s);
 					}
 					else {		/* Buffer is physical */
+#ifdef	PAE
+						panic("arcmsr: CAM_DATA_PHYS not supported");
+#else
 						struct bus_dma_segment seg;
 						
 						seg.ds_addr = (bus_addr_t)pccb->csio.data_ptr;
 						seg.ds_len = pccb->csio.dxfer_len;
 						arcmsr_execute_srb(srb, &seg, 1, 0);
+#endif
 					}
 				} else { 
 					/* Scatter/gather list */