svn commit: r291131 - in head/sys/arm: arm include versatile

[Andrew Turner]

Author: andrew
Date: Sat Nov 21 13:02:34 2015
New Revision: 291131
URL: https://svnweb.freebsd.org/changeset/base/291131

Log:
  Limit arm_base_bs_tag to ARMv4 and ARMv5, we only used it in one place in
  armv6 and that can use fdtbus_bs_tag.

Modified:
  head/sys/arm/arm/bus_space_base.c
  head/sys/arm/include/bus.h
  head/sys/arm/versatile/versatile_pci.c

Modified: head/sys/arm/arm/bus_space_base.c
==============================================================================
--- head/sys/arm/arm/bus_space_base.c	Sat Nov 21 12:53:44 2015	(r291130)
+++ head/sys/arm/arm/bus_space_base.c	Sat Nov 21 13:02:34 2015	(r291131)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <machine/bus.h>
+#include <machine/acle-compat.h>
 
 #include "opt_platform.h"
 
@@ -156,4 +157,6 @@ static struct bus_space arm_base_bus_spa
 bus_space_tag_t fdtbus_bs_tag = &arm_base_bus_space;
 #endif
 
+#if __ARM_ARCH < 6
 bus_space_tag_t arm_base_bs_tag = &arm_base_bus_space;
+#endif

Modified: head/sys/arm/include/bus.h
==============================================================================
--- head/sys/arm/include/bus.h	Sat Nov 21 12:53:44 2015	(r291130)
+++ head/sys/arm/include/bus.h	Sat Nov 21 13:02:34 2015	(r291131)
@@ -67,6 +67,7 @@
 #define _MACHINE_BUS_H_
 
 #include <machine/_bus.h>
+#include <machine/acle-compat.h>
 
 /*
  *	int bus_space_map  (bus_space_tag_t t, bus_addr_t addr,
@@ -252,7 +253,9 @@ struct bus_space {
 			    bus_size_t, const uint64_t *, bus_size_t);
 };
 
+#if __ARM_ARCH < 6
 extern bus_space_tag_t arm_base_bs_tag;
+#endif
 
 /*
  * Utility macros; INTERNAL USE ONLY.

Modified: head/sys/arm/versatile/versatile_pci.c
==============================================================================
--- head/sys/arm/versatile/versatile_pci.c	Sat Nov 21 12:53:44 2015	(r291130)
+++ head/sys/arm/versatile/versatile_pci.c	Sat Nov 21 13:02:34 2015	(r291131)
@@ -357,7 +357,7 @@ versatile_pci_activate_resource(device_t
 		vaddr = (vm_offset_t)pmap_mapdev(rman_get_start(r),
 				rman_get_size(r));
 		rman_set_bushandle(r, vaddr);
-		rman_set_bustag(r, arm_base_bs_tag);
+		rman_set_bustag(r, fdtbus_bs_tag);
 		res = rman_activate_resource(r);
 		break;
 	case SYS_RES_IRQ: