From owner-svn-src-all@FreeBSD.ORG  Fri Oct 18 20:52:43 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 ESMTP id 74B6C40C;
 Fri, 18 Oct 2013 20:52:43 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
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 610432D32;
 Fri, 18 Oct 2013 20:52:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IKqhD6005005;
 Fri, 18 Oct 2013 20:52:43 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9IKqh0c005003;
 Fri, 18 Oct 2013 20:52:43 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201310182052.r9IKqh0c005003@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 18 Oct 2013 20:52:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r256753 - in head/sys: conf dev/cfi
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, 18 Oct 2013 20:52:43 -0000

Author: brooks
Date: Fri Oct 18 20:52:42 2013
New Revision: 256753
URL: http://svnweb.freebsd.org/changeset/base/256753

Log:
  MFP4: 1136252
  
  Add an option ATSE_CFI_HACK to allow memory mapped CFI devices to have
  their address range allocated sharable so that atse(4) can find it's
  Ethernet address in the expected location.
  
  We intend to remove this hack once the BERI platform has a loader.

Modified:
  head/sys/conf/options
  head/sys/dev/cfi/cfi_core.c

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Fri Oct 18 20:44:19 2013	(r256752)
+++ head/sys/conf/options	Fri Oct 18 20:52:42 2013	(r256753)
@@ -69,6 +69,7 @@ TEXTDUMP_VERBOSE	opt_ddb.h
 ADAPTIVE_LOCKMGRS
 ALQ
 ALTERA_SDCARD_FAST_SIM	opt_altera_sdcard.h
+ATSE_CFI_HACK	opt_cfi.h
 AUDIT		opt_global.h
 BOOTHOWTO	opt_global.h
 BOOTVERBOSE	opt_global.h

Modified: head/sys/dev/cfi/cfi_core.c
==============================================================================
--- head/sys/dev/cfi/cfi_core.c	Fri Oct 18 20:44:19 2013	(r256752)
+++ head/sys/dev/cfi/cfi_core.c	Fri Oct 18 20:52:42 2013	(r256753)
@@ -281,7 +281,11 @@ cfi_attach(device_t dev) 
 
 	sc->sc_rid = 0;
 	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid,
+#ifndef ATSE_CFI_HACK
 	    RF_ACTIVE);
+#else
+	    RF_ACTIVE | RF_SHAREABLE);
+#endif
 	if (sc->sc_res == NULL)
 		return (ENXIO);