From owner-svn-src-head@FreeBSD.ORG  Wed Jan  1 20:26:08 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9F0C5FE3;
 Wed,  1 Jan 2014 20:26:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B63F1290;
 Wed,  1 Jan 2014 20:26:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s01KQ8oZ017950;
 Wed, 1 Jan 2014 20:26:08 GMT (envelope-from zbb@svn.freebsd.org)
Received: (from zbb@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s01KQ8KU017949;
 Wed, 1 Jan 2014 20:26:08 GMT (envelope-from zbb@svn.freebsd.org)
Message-Id: <201401012026.s01KQ8KU017949@svn.freebsd.org>
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Wed, 1 Jan 2014 20:26:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260165 - head/sys/dev/ahci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Wed, 01 Jan 2014 20:26:08 -0000

Author: zbb
Date: Wed Jan  1 20:26:08 2014
New Revision: 260165
URL: http://svnweb.freebsd.org/changeset/base/260165

Log:
  Use only mapped BIOs on ARM
  
  Using unmapped BIOs causes failure inside bus_dmamap_sync, since
  this function requires valid MVA address, which is not present
  if mapping is not set up.
  
  Submitted by:	Wojciech Macek <wma@semihalf.com>
  Obtained from:	Semihalf

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

Modified: head/sys/dev/ahci/ahci.c
==============================================================================
--- head/sys/dev/ahci/ahci.c	Wed Jan  1 20:22:29 2014	(r260164)
+++ head/sys/dev/ahci/ahci.c	Wed Jan  1 20:26:08 2014	(r260165)
@@ -3066,7 +3066,15 @@ ahciaction(struct cam_sim *sim, union cc
 		if (ch->caps & AHCI_CAP_SPM)
 			cpi->hba_inquiry |= PI_SATAPM;
 		cpi->target_sprt = 0;
+#ifdef __arm__
+		/*
+		 * Do not use unmapped buffers on ARM. Doing so will cause
+		 * failure inside bus_dmamap_sync due to lack of VA.
+		 */
+		cpi->hba_misc = PIM_SEQSCAN;
+#else
 		cpi->hba_misc = PIM_SEQSCAN | PIM_UNMAPPED;
+#endif
 		cpi->hba_eng_cnt = 0;
 		if (ch->caps & AHCI_CAP_SPM)
 			cpi->max_target = 15;