From owner-svn-src-stable-10@FreeBSD.ORG  Fri Nov  1 20:33:31 2013
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 15D70D7D;
 Fri,  1 Nov 2013 20:33:31 +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 01E7E26BC;
 Fri,  1 Nov 2013 20:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1KXUJm041494;
 Fri, 1 Nov 2013 20:33:30 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA1KXU4C041492;
 Fri, 1 Nov 2013 20:33:30 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201311012033.rA1KXU4C041492@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 1 Nov 2013 20:33:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r257524 - in stable/10/sys: conf dev/cfi
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Nov 2013 20:33:31 -0000

Author: brooks
Date: Fri Nov  1 20:33:30 2013
New Revision: 257524
URL: http://svnweb.freebsd.org/changeset/base/257524

Log:
  MFC r256753
  
  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.
  
  Sponsored by:	DARPA/AFRL
  Approved by:	re (gjb)

Modified:
  stable/10/sys/conf/options
  stable/10/sys/dev/cfi/cfi_core.c
Directory Properties:
  stable/10/sys/   (props changed)
  stable/10/sys/conf/   (props changed)

Modified: stable/10/sys/conf/options
==============================================================================
--- stable/10/sys/conf/options	Fri Nov  1 20:30:19 2013	(r257523)
+++ stable/10/sys/conf/options	Fri Nov  1 20:33:30 2013	(r257524)
@@ -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: stable/10/sys/dev/cfi/cfi_core.c
==============================================================================
--- stable/10/sys/dev/cfi/cfi_core.c	Fri Nov  1 20:30:19 2013	(r257523)
+++ stable/10/sys/dev/cfi/cfi_core.c	Fri Nov  1 20:33:30 2013	(r257524)
@@ -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);