svn commit: r256753 - in head/sys: conf dev/cfi

[Brooks Davis]

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);