svn commit: r291212 - in projects/powernv: amd64/amd64 amd64/linux arm/allwinner arm/allwinner/a20 arm/altera/socfpga arm/amlogic/aml8726 arm/annapurna/alpine arm/arm arm/at91 arm/broadcom/bcm2835 ...

Nathan Whitehorn nwhitehorn at FreeBSD.org
Mon Nov 23 17:09:44 UTC 2015 

Author: nwhitehorn
Date: Mon Nov 23 17:09:35 2015
New Revision: 291212
URL: https://svnweb.freebsd.org/changeset/base/291212

Log:
  Bring tree up to date.

Deleted:
  projects/powernv/boot/i386/boot0/boot0ext.S
  projects/powernv/boot/i386/boot0ext/
  projects/powernv/modules/ispfw/isp_1040_it/
  projects/powernv/modules/ispfw/isp_1080_it/
  projects/powernv/modules/ispfw/isp_12160_it/
Modified:
  projects/powernv/amd64/amd64/elf_machdep.c
  projects/powernv/amd64/linux/linux_dummy.c
  projects/powernv/arm/allwinner/a20/std.a20
  projects/powernv/arm/allwinner/files.allwinner
  projects/powernv/arm/allwinner/std.a10
  projects/powernv/arm/altera/socfpga/files.socfpga
  projects/powernv/arm/altera/socfpga/std.socfpga
  projects/powernv/arm/amlogic/aml8726/files.aml8726
  projects/powernv/arm/annapurna/alpine/files.alpine
  projects/powernv/arm/annapurna/alpine/std.alpine
  projects/powernv/arm/arm/bus_space_base.c
  projects/powernv/arm/arm/exception.S
  projects/powernv/arm/arm/pmap-v6-new.c
  projects/powernv/arm/arm/pmu.c
  projects/powernv/arm/arm/trap-v6.c
  projects/powernv/arm/at91/files.at91
  projects/powernv/arm/broadcom/bcm2835/files.bcm2836
  projects/powernv/arm/broadcom/bcm2835/files.bcm283x
  projects/powernv/arm/broadcom/bcm2835/std.rpi
  projects/powernv/arm/cavium/cns11xx/files.econa
  projects/powernv/arm/conf/AML8726
  projects/powernv/arm/conf/EXYNOS5.common
  projects/powernv/arm/conf/IMX6
  projects/powernv/arm/conf/PANDABOARD
  projects/powernv/arm/conf/RK3188
  projects/powernv/arm/conf/RPI2
  projects/powernv/arm/conf/SOCKIT.common
  projects/powernv/arm/conf/VERSATILEPB
  projects/powernv/arm/conf/VIRT
  projects/powernv/arm/conf/VYBRID
  projects/powernv/arm/conf/ZEDBOARD
  projects/powernv/arm/freescale/imx/files.imx5
  projects/powernv/arm/freescale/imx/files.imx6
  projects/powernv/arm/freescale/imx/imx_machdep.c
  projects/powernv/arm/freescale/imx/std.imx51
  projects/powernv/arm/freescale/imx/std.imx53
  projects/powernv/arm/freescale/imx/std.imx6
  projects/powernv/arm/freescale/vybrid/files.vybrid
  projects/powernv/arm/freescale/vybrid/std.vybrid
  projects/powernv/arm/include/bus.h
  projects/powernv/arm/lpc/files.lpc
  projects/powernv/arm/mv/armadaxp/std.armadaxp
  projects/powernv/arm/mv/files.mv
  projects/powernv/arm/qemu/files.qemu
  projects/powernv/arm/qemu/std.virt
  projects/powernv/arm/rockchip/files.rk30xx
  projects/powernv/arm/rockchip/std.rk30xx
  projects/powernv/arm/samsung/exynos/files.exynos5
  projects/powernv/arm/samsung/exynos/std.exynos5250
  projects/powernv/arm/samsung/exynos/std.exynos5420
  projects/powernv/arm/ti/am335x/files.am335x
  projects/powernv/arm/ti/am335x/std.am335x
  projects/powernv/arm/ti/files.ti
  projects/powernv/arm/ti/omap4/files.omap4
  projects/powernv/arm/ti/omap4/std.omap4
  projects/powernv/arm/versatile/files.versatile
  projects/powernv/arm/versatile/versatile_pci.c
  projects/powernv/arm/xilinx/files.zynq7
  projects/powernv/arm/xilinx/std.zynq7
  projects/powernv/arm/xscale/i80321/files.i80219
  projects/powernv/arm/xscale/i80321/files.i80321
  projects/powernv/arm/xscale/i8134x/files.i81342
  projects/powernv/arm/xscale/ixp425/files.ixp425
  projects/powernv/arm/xscale/pxa/files.pxa
  projects/powernv/arm64/arm64/busdma_bounce.c
  projects/powernv/boot/i386/Makefile
  projects/powernv/boot/i386/boot0/Makefile
  projects/powernv/boot/uboot/common/main.c
  projects/powernv/cam/scsi/scsi_enc.c
  projects/powernv/cam/scsi/scsi_enc.h
  projects/powernv/cam/scsi/scsi_enc_ses.c
  projects/powernv/cddl/dev/dtrace/amd64/dtrace_isa.c
  projects/powernv/compat/ia32/ia32_sysvec.c
  projects/powernv/conf/NOTES
  projects/powernv/conf/files
  projects/powernv/conf/files.arm
  projects/powernv/conf/kern.opts.mk
  projects/powernv/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
  projects/powernv/dev/de/if_de.c
  projects/powernv/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/powernv/dev/isp/isp.c
  projects/powernv/dev/isp/isp_freebsd.c
  projects/powernv/dev/isp/isp_freebsd.h
  projects/powernv/dev/isp/isp_library.c
  projects/powernv/dev/isp/isp_library.h
  projects/powernv/dev/isp/isp_pci.c
  projects/powernv/dev/isp/isp_sbus.c
  projects/powernv/dev/isp/isp_target.c
  projects/powernv/dev/isp/ispmbox.h
  projects/powernv/dev/isp/ispvar.h
  projects/powernv/dev/ispfw/asm_1040.h
  projects/powernv/dev/ispfw/asm_1080.h
  projects/powernv/dev/ispfw/asm_12160.h
  projects/powernv/dev/ispfw/asm_2200.h
  projects/powernv/dev/ispfw/asm_2300.h
  projects/powernv/dev/ispfw/asm_2322.h
  projects/powernv/dev/ispfw/ispfw.c
  projects/powernv/dev/mlx5/mlx5_en/en.h
  projects/powernv/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  projects/powernv/dev/mlx5/mlx5_en/mlx5_en_flow_table.c
  projects/powernv/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/powernv/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/powernv/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/powernv/dev/mlx5/mlx5_en/tcp_tlro.c
  projects/powernv/dev/mlx5/mlx5_en/tcp_tlro.h
  projects/powernv/dev/ntb/if_ntb/if_ntb.c
  projects/powernv/dev/ntb/ntb_hw/ntb_hw.h
  projects/powernv/dev/ntb/ntb_hw/ntb_regs.h
  projects/powernv/dev/usb/controller/uhci.h
  projects/powernv/dev/usb/input/ukbd.c
  projects/powernv/fs/nfs/nfs_var.h
  projects/powernv/fs/nfsclient/nfs_clrpcops.c
  projects/powernv/fs/nfsserver/nfs_nfsdkrpc.c
  projects/powernv/fs/nfsserver/nfs_nfsdstate.c
  projects/powernv/i386/i386/elf_machdep.c
  projects/powernv/kern/kern_malloc.c
  projects/powernv/kern/kern_sharedpage.c
  projects/powernv/kern/subr_prf.c
  projects/powernv/kern/subr_stack.c
  projects/powernv/kern/subr_witness.c
  projects/powernv/kern/vfs_subr.c
  projects/powernv/kern/vfs_syscalls.c
  projects/powernv/mips/malta/malta_machdep.c
  projects/powernv/modules/Makefile
  projects/powernv/modules/cryptodev/Makefile
  projects/powernv/modules/ipoib/Makefile
  projects/powernv/modules/ispfw/Makefile
  projects/powernv/modules/linux64/Makefile
  projects/powernv/netinet/sctp_pcb.c
  projects/powernv/netinet/sctp_usrreq.c
  projects/powernv/opencrypto/cryptodev.c
  projects/powernv/powerpc/booke/pmap.c
  projects/powernv/powerpc/include/asm.h
  projects/powernv/powerpc/include/bus.h
  projects/powernv/powerpc/include/md_var.h
  projects/powernv/powerpc/include/profile.h
  projects/powernv/powerpc/mpc85xx/pci_mpc85xx.c
  projects/powernv/powerpc/mpc85xx/pci_mpc85xx_pcib.c
  projects/powernv/powerpc/powerpc/elf64_machdep.c
  projects/powernv/powerpc/powerpc/exec_machdep.c
  projects/powernv/powerpc/powerpc/sigcode64.S
  projects/powernv/rpc/svc.c
  projects/powernv/sparc64/include/md_var.h
  projects/powernv/sparc64/sparc64/machdep.c
  projects/powernv/sparc64/sparc64/mp_machdep.c
  projects/powernv/sys/mount.h
  projects/powernv/sys/sysent.h
  projects/powernv/sys/systm.h
  projects/powernv/sys/vdso.h
  projects/powernv/vm/uma_core.c
  projects/powernv/vm/vm_pageout.c
  projects/powernv/vm/vnode_pager.c
  projects/powernv/x86/x86/busdma_bounce.c
Directory Properties:
  projects/powernv/   (props changed)
  projects/powernv/boot/   (props changed)
  projects/powernv/conf/   (props changed)
  projects/powernv/dev/hyperv/   (props changed)

Modified: projects/powernv/amd64/amd64/elf_machdep.c
==============================================================================
--- projects/powernv/amd64/amd64/elf_machdep.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/amd64/amd64/elf_machdep.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -75,7 +75,7 @@ struct sysentvec elf64_freebsd_sysvec = 
 	.sv_setregs	= exec_setregs,
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
-	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP,
+	.sv_flags	= SV_ABI_FREEBSD | SV_LP64 | SV_SHP | SV_TIMEKEEP,
 	.sv_set_syscall_retval = cpu_set_syscall_retval,
 	.sv_fetch_syscall_args = cpu_fetch_syscall_args,
 	.sv_syscallnames = syscallnames,

Modified: projects/powernv/amd64/linux/linux_dummy.c
==============================================================================
--- projects/powernv/amd64/linux/linux_dummy.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/amd64/linux/linux_dummy.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>

Modified: projects/powernv/arm/allwinner/a20/std.a20
==============================================================================
--- projects/powernv/arm/allwinner/a20/std.a20	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/allwinner/a20/std.a20	Mon Nov 23 17:09:35 2015	(r291212)
@@ -4,16 +4,7 @@
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x40200000.  We assume images are loaded at
-# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
-#
-#
-options 	PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40200000
-options 	KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 

Modified: projects/powernv/arm/allwinner/files.allwinner
==============================================================================
--- projects/powernv/arm/allwinner/files.allwinner	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/allwinner/files.allwinner	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,10 +1,6 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_asm_generic.S		standard
-arm/arm/bus_space_generic.c		standard
-
 arm/allwinner/a10_ahci.c		optional	ahci
 arm/allwinner/a10_clk.c			standard
 arm/allwinner/a10_common.c		standard

Modified: projects/powernv/arm/allwinner/std.a10
==============================================================================
--- projects/powernv/arm/allwinner/std.a10	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/allwinner/std.a10	Mon Nov 23 17:09:35 2015	(r291212)
@@ -4,16 +4,7 @@
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x40200000.  We assume images are loaded at
-# 0x40200000, e.g. from u-boot with 'fatload mmc 0 0x40200000 kernel'
-#
-#
-options 	PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40200000
-options 	KERNPHYSADDR=0x40200000
 makeoptions	KERNVIRTADDR=0xc0200000
 options 	KERNVIRTADDR=0xc0200000
 

Modified: projects/powernv/arm/altera/socfpga/files.socfpga
==============================================================================
--- projects/powernv/arm/altera/socfpga/files.socfpga	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/altera/socfpga/files.socfpga	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,12 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
-arm/arm/bus_space_base.c			standard
-arm/arm/mpcore_timer.c				standard
-
 arm/altera/socfpga/socfpga_common.c		standard
 arm/altera/socfpga/socfpga_machdep.c		standard
 arm/altera/socfpga/socfpga_manager.c		standard

Modified: projects/powernv/arm/altera/socfpga/std.socfpga
==============================================================================
--- projects/powernv/arm/altera/socfpga/std.socfpga	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/altera/socfpga/std.socfpga	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,16 +1,9 @@
 # $FreeBSD$
 
-makeoption	ARM_LITTLE_ENDIAN
-
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x00000000
-
-makeoptions	KERNPHYSADDR=0x00f00000
-options		KERNPHYSADDR=0x00f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 

Modified: projects/powernv/arm/amlogic/aml8726/files.aml8726
==============================================================================
--- projects/powernv/arm/amlogic/aml8726/files.aml8726	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/amlogic/aml8726/files.aml8726	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,10 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-
-arm/arm/pl310.c					standard
 arm/amlogic/aml8726/aml8726_l2cache.c		standard
 
 arm/amlogic/aml8726/aml8726_machdep.c		standard

Modified: projects/powernv/arm/annapurna/alpine/files.alpine
==============================================================================
--- projects/powernv/arm/annapurna/alpine/files.alpine	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/annapurna/alpine/files.alpine	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,10 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
 arm/versatile/sp804.c				standard
 arm/versatile/versatile_timer.c			standard
 dev/uart/uart_dev_ns8250.c			optional	uart

Modified: projects/powernv/arm/annapurna/alpine/std.alpine
==============================================================================
--- projects/powernv/arm/annapurna/alpine/std.alpine	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/annapurna/alpine/std.alpine	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,14 +1,9 @@
 # $FreeBSD$
 
-makeoption	ARM_LITTLE_ENDIAN
-
 cpu		CPU_CORTEXA
 machine 	arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a -DAL_HAVE_TYPES"
 
-makeoptions	KERNPHYSADDR=0x00200000
-options 	KERNPHYSADDR=0x00200000
-
 makeoptions	KERNVIRTADDR=0xa0200000
 options 	KERNVIRTADDR=0xa0200000
 

Modified: projects/powernv/arm/arm/bus_space_base.c
==============================================================================
--- projects/powernv/arm/arm/bus_space_base.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/arm/bus_space_base.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -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: projects/powernv/arm/arm/exception.S
==============================================================================
--- projects/powernv/arm/arm/exception.S	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/arm/exception.S	Mon Nov 23 17:09:35 2015	(r291212)
@@ -48,7 +48,6 @@
 
 #include "assym.s"
 
-#include "opt_kdtrace.h"
 #include <machine/acle-compat.h>
 #include <machine/asm.h>
 #include <machine/armreg.h>

Modified: projects/powernv/arm/arm/pmap-v6-new.c
==============================================================================
--- projects/powernv/arm/arm/pmap-v6-new.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/arm/pmap-v6-new.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -5475,7 +5475,8 @@ pmap_page_set_memattr(vm_page_t m, vm_me
 	oma = m->md.pat_mode;
 	m->md.pat_mode = ma;
 
-	CTR5(KTR_PMAP, "%s: page %p - 0x%08X oma: %d, ma: %d, phys: 0x%08X", __func__, m, VM_PAGE_TO_PHYS(m), oma, ma);
+	CTR5(KTR_PMAP, "%s: page %p - 0x%08X oma: %d, ma: %d", __func__, m,
+	    VM_PAGE_TO_PHYS(m), oma, ma);
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return;
 #if 0

Modified: projects/powernv/arm/arm/pmu.c
==============================================================================
--- projects/powernv/arm/arm/pmu.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/arm/pmu.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -58,7 +58,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/intr.h>
 
+#ifdef notyet
 #define	MAX_RLEN	8
+#else
+#define	MAX_RLEN	1
+#endif
 
 struct pmu_softc {
 	struct resource		*res[MAX_RLEN];
@@ -84,6 +88,8 @@ static struct ofw_compat_data compat_dat
 
 static struct resource_spec pmu_spec[] = {
 	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	/* We don't currently handle pmu events, other than on cpu 0 */
+#if notyet
 	{ SYS_RES_IRQ,		1,	RF_ACTIVE | RF_OPTIONAL },
 	{ SYS_RES_IRQ,		2,	RF_ACTIVE | RF_OPTIONAL },
 	{ SYS_RES_IRQ,		3,	RF_ACTIVE | RF_OPTIONAL },
@@ -91,6 +97,7 @@ static struct resource_spec pmu_spec[] =
 	{ SYS_RES_IRQ,		5,	RF_ACTIVE | RF_OPTIONAL },
 	{ SYS_RES_IRQ,		6,	RF_ACTIVE | RF_OPTIONAL },
 	{ SYS_RES_IRQ,		7,	RF_ACTIVE | RF_OPTIONAL },
+#endif
 	{ -1, 0 }
 };
 

Modified: projects/powernv/arm/arm/trap-v6.c
==============================================================================
--- projects/powernv/arm/arm/trap-v6.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/arm/trap-v6.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -302,8 +302,8 @@ abort_handler(struct trapframe *tf, int 
 	if (usermode)
 		td->td_frame = tf;
 
-	CTR4(KTR_TRAP, "abort_handler: fsr %#x (idx %u) far %#x prefetch %u",
-	fsr, idx, far, prefetch);
+	CTR6(KTR_TRAP, "%s: fsr %#x (idx %u) far %#x prefetch %u usermode %d",
+	    __func__, fsr, idx, far, prefetch, usermode);
 
 	/*
 	 * Firstly, handle aborts that are not directly related to mapping.

Modified: projects/powernv/arm/at91/files.at91
==============================================================================
--- projects/powernv/arm/at91/files.at91	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/at91/files.at91	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,5 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_generic.c	standard
 arm/at91/at91_machdep.c		standard
 arm/at91/at91_aic.c		standard
 arm/at91/at91.c			standard

Modified: projects/powernv/arm/broadcom/bcm2835/files.bcm2836
==============================================================================
--- projects/powernv/arm/broadcom/bcm2835/files.bcm2836	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/broadcom/bcm2835/files.bcm2836	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,4 @@
 # $FreeBSD$
 
-arm/arm/generic_timer.c				standard
-
 arm/broadcom/bcm2835/bcm2836.c			standard
 arm/broadcom/bcm2835/bcm2836_mp.c		optional smp

Modified: projects/powernv/arm/broadcom/bcm2835/files.bcm283x
==============================================================================
--- projects/powernv/arm/broadcom/bcm2835/files.bcm283x	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/broadcom/bcm2835/files.bcm283x	Mon Nov 23 17:09:35 2015	(r291212)
@@ -16,10 +16,6 @@ arm/broadcom/bcm2835/bcm2835_vcio.c		sta
 arm/broadcom/bcm2835/bcm2835_wdog.c		standard
 arm/broadcom/bcm2835/bcm283x_dwc_fdt.c		optional dwcotg fdt
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c                     standard
-arm/arm/bus_space_asm_generic.S                 standard
-
 kern/kern_clocksource.c                         standard
 
 dev/mbox/mbox_if.m				standard

Modified: projects/powernv/arm/broadcom/bcm2835/std.rpi
==============================================================================
--- projects/powernv/arm/broadcom/bcm2835/std.rpi	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/broadcom/bcm2835/std.rpi	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,8 +2,5 @@
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
-options		PHYSADDR=0x00000000
 options		FREEBSD_BOOT_LOADER
 options		LINUX_BOOT_ABI

Modified: projects/powernv/arm/cavium/cns11xx/files.econa
==============================================================================
--- projects/powernv/arm/cavium/cns11xx/files.econa	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/cavium/cns11xx/files.econa	Mon Nov 23 17:09:35 2015	(r291212)
@@ -6,7 +6,6 @@ arm/cavium/cns11xx/uart_bus_ec.c		option
 arm/cavium/cns11xx/uart_cpu_ec.c		optional	uart
 dev/uart/uart_dev_ns8250.c	optional	uart
 arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/cavium/cns11xx/ehci_ebus.c	optional	ehci
 arm/cavium/cns11xx/ohci_ec.c	optional	ohci
 arm/cavium/cns11xx/if_ece.c		standard

Modified: projects/powernv/arm/conf/AML8726
==============================================================================
--- projects/powernv/arm/conf/AML8726	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/AML8726	Mon Nov 23 17:09:35 2015	(r291212)
@@ -61,6 +61,8 @@ device		mmcsd			# mmc/sd flash cards
 # Boot device is 2nd slice on MMC/SD card
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
+device		pl310			# PL310 L2 cache controller
+
 # GPIO
 device		gpio
 device		gpioled

Modified: projects/powernv/arm/conf/EXYNOS5.common
==============================================================================
--- projects/powernv/arm/conf/EXYNOS5.common	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/EXYNOS5.common	Mon Nov 23 17:09:35 2015	(r291212)
@@ -87,6 +87,8 @@ device		dwmmc
 
 # Interrupt controller
 device		gic
+# ARM Generic Timer
+device		generic_timer
 
 # Pseudo devices
 

Modified: projects/powernv/arm/conf/IMX6
==============================================================================
--- projects/powernv/arm/conf/IMX6	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/IMX6	Mon Nov 23 17:09:35 2015	(r291212)
@@ -62,6 +62,10 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
+# Cache controller
+device		pl310			# PL310 L2 cache controller
+# ARM MPCore timer
+device		mpcore_timer
 
 # Pseudo devices.
 device		loop			# Network loopback

Modified: projects/powernv/arm/conf/PANDABOARD
==============================================================================
--- projects/powernv/arm/conf/PANDABOARD	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/PANDABOARD	Mon Nov 23 17:09:35 2015	(r291212)
@@ -62,6 +62,8 @@ options 	DDB			# Enable the kernel debug
 device		fdt_pinctrl
 # Interrupt controller
 device		gic
+# ARM MPCore timer
+device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus

Modified: projects/powernv/arm/conf/RK3188
==============================================================================
--- projects/powernv/arm/conf/RK3188	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/RK3188	Mon Nov 23 17:09:35 2015	(r291212)
@@ -47,6 +47,8 @@ options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0\"
 
 # Interrupt controller
 device		gic
+# ARM MPCore timer
+device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus

Modified: projects/powernv/arm/conf/RPI2
==============================================================================
--- projects/powernv/arm/conf/RPI2	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/RPI2	Mon Nov 23 17:09:35 2015	(r291212)
@@ -53,6 +53,9 @@ options 	INVARIANT_SUPPORT	# Extra sanit
 
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
+# ARM Generic Timer
+device		generic_timer
+
 device		bpf
 device		loop
 device		ether

Modified: projects/powernv/arm/conf/SOCKIT.common
==============================================================================
--- projects/powernv/arm/conf/SOCKIT.common	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/SOCKIT.common	Mon Nov 23 17:09:35 2015	(r291212)
@@ -53,6 +53,8 @@ options 	INVARIANT_SUPPORT	# Extra sanit
 
 # Interrupt controller
 device		gic
+# ARM MPCore timer
+device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus

Modified: projects/powernv/arm/conf/VERSATILEPB
==============================================================================
--- projects/powernv/arm/conf/VERSATILEPB	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/VERSATILEPB	Mon Nov 23 17:09:35 2015	(r291212)
@@ -28,9 +28,6 @@ makeoptions	MODULES_OVERRIDE=""
 
 options 	KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options 	KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
-options 	PHYSADDR=0x00000000
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler

Modified: projects/powernv/arm/conf/VIRT
==============================================================================
--- projects/powernv/arm/conf/VIRT	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/VIRT	Mon Nov 23 17:09:35 2015	(r291212)
@@ -46,6 +46,8 @@ options 	INVARIANT_SUPPORT	# Extra sanit
 
 # Interrupt controller
 device		gic
+# ARM Generic Timer
+device		generic_timer
 
 device		bpf
 device		loop

Modified: projects/powernv/arm/conf/VYBRID
==============================================================================
--- projects/powernv/arm/conf/VYBRID	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/VYBRID	Mon Nov 23 17:09:35 2015	(r291212)
@@ -62,6 +62,8 @@ options 	NO_SWAPPING
 
 # Interrupt controller
 device		gic
+# ARM MPCore timer
+device		mpcore_timer
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus

Modified: projects/powernv/arm/conf/ZEDBOARD
==============================================================================
--- projects/powernv/arm/conf/ZEDBOARD	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/conf/ZEDBOARD	Mon Nov 23 17:09:35 2015	(r291212)
@@ -52,6 +52,10 @@ options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # Interrupt controller
 device		gic
+# Cache controller
+device		pl310			# PL310 L2 cache controller
+# ARM MPCore timer
+device		mpcore_timer
 
 device		loop
 device		random

Modified: projects/powernv/arm/freescale/imx/files.imx5
==============================================================================
--- projects/powernv/arm/freescale/imx/files.imx5	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/files.imx5	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_asm_generic.S		standard
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 # Init
@@ -8,7 +6,6 @@ arm/freescale/imx/imx_common.c		standard
 arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx51_machdep.c	optional	soc_imx51
 arm/freescale/imx/imx53_machdep.c	optional	soc_imx53
-arm/arm/bus_space_base.c		standard
 
 # Special serial console for debuging early boot code
 #arm/freescale/imx/console.c		standard

Modified: projects/powernv/arm/freescale/imx/files.imx6
==============================================================================
--- projects/powernv/arm/freescale/imx/files.imx6	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/files.imx6	Mon Nov 23 17:09:35 2015	(r291212)
@@ -3,16 +3,11 @@
 #
 # Standard ARM support.
 #
-arm/arm/bus_space_asm_generic.S		standard
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 #
 # Standard imx6 devices and support.
 #
-arm/arm/pl310.c				standard
-arm/arm/bus_space_base.c		standard
-arm/arm/mpcore_timer.c			standard
 arm/freescale/fsl_ocotp.c		standard
 arm/freescale/imx/imx6_anatop.c		standard
 arm/freescale/imx/imx6_ccm.c		standard

Modified: projects/powernv/arm/freescale/imx/imx_machdep.c
==============================================================================
--- projects/powernv/arm/freescale/imx/imx_machdep.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/imx_machdep.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -72,16 +72,14 @@ imx_wdog_cpu_reset(vm_offset_t wdcr_phys
 	volatile uint16_t * pcr;
 
 	/*
-	 * The deceptively simple write of WDOG_CR_WDE enables the watchdog,
-	 * sets the timeout to its minimum value (half a second), and also
-	 * clears the SRS bit which results in the SFTW (software-requested
-	 * reset) bit being set in the watchdog status register after the reset.
-	 * This is how software can distinguish a reset from a wdog timeout.
+	 * Trigger an immediate reset by clearing the SRS bit in the watchdog
+	 * control register.  The reset happens on the next cycle of the wdog
+	 * 32KHz clock, so hang out in a spin loop until the reset takes effect.
 	 */
 	if ((pcr = arm_devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) {
 		printf("cpu_reset() can't find its control register... locking up now.");
 	} else {
-		*pcr = WDOG_CR_WDE;
+		*pcr &= ~WDOG_CR_SRS;
 	}
 	for (;;)
 		continue;

Modified: projects/powernv/arm/freescale/imx/std.imx51
==============================================================================
--- projects/powernv/arm/freescale/imx/std.imx51	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/std.imx51	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,14 +2,10 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x90100000
-makeoptions	KERNPHYSADDR=0x90100000
-options		PHYSADDR=0x90000000
 
 device  	fdt_pinctrl
 

Modified: projects/powernv/arm/freescale/imx/std.imx53
==============================================================================
--- projects/powernv/arm/freescale/imx/std.imx53	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/std.imx53	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,14 +2,10 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR=0xc0100000
 makeoptions	KERNVIRTADDR=0xc0100000
-options		KERNPHYSADDR=0x70100000
-makeoptions	KERNPHYSADDR=0x70100000
-options		PHYSADDR=0x70000000
 
 device  	fdt_pinctrl
 

Modified: projects/powernv/arm/freescale/imx/std.imx6
==============================================================================
--- projects/powernv/arm/freescale/imx/std.imx6	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/imx/std.imx6	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,14 +2,10 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options		KERNVIRTADDR		= 0xc2000000
 makeoptions	KERNVIRTADDR		= 0xc2000000
-options		KERNPHYSADDR		= 0x12000000
-makeoptions	KERNPHYSADDR		= 0x12000000
-options		PHYSADDR		= 0x10000000
 
 options		IPI_IRQ_START=0
 options		IPI_IRQ_END=15

Modified: projects/powernv/arm/freescale/vybrid/files.vybrid
==============================================================================
--- projects/powernv/arm/freescale/vybrid/files.vybrid	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/vybrid/files.vybrid	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,12 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
-arm/arm/bus_space_base.c			standard
-arm/arm/mpcore_timer.c				standard
-
 arm/freescale/vybrid/vf_machdep.c		standard
 arm/freescale/vybrid/vf_common.c		standard
 arm/freescale/vybrid/vf_ccm.c			standard

Modified: projects/powernv/arm/freescale/vybrid/std.vybrid
==============================================================================
--- projects/powernv/arm/freescale/vybrid/std.vybrid	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/freescale/vybrid/std.vybrid	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,16 +1,9 @@
 # $FreeBSD$
 
-makeoption	ARM_LITTLE_ENDIAN
-
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x80000000
-
-makeoptions	KERNPHYSADDR=0x80100000
-options		KERNPHYSADDR=0x80100000
-
 makeoptions	KERNVIRTADDR=0xc0100000
 options		KERNVIRTADDR=0xc0100000
 

Modified: projects/powernv/arm/include/bus.h
==============================================================================
--- projects/powernv/arm/include/bus.h	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/include/bus.h	Mon Nov 23 17:09:35 2015	(r291212)
@@ -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: projects/powernv/arm/lpc/files.lpc
==============================================================================
--- projects/powernv/arm/lpc/files.lpc	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/lpc/files.lpc	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,4 @@
 # $FreeBSD$
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/lpc/lpc_machdep.c			standard
 arm/lpc/lpc_pwr.c			standard
 arm/lpc/lpc_intc.c			standard

Modified: projects/powernv/arm/mv/armadaxp/std.armadaxp
==============================================================================
--- projects/powernv/arm/mv/armadaxp/std.armadaxp	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/mv/armadaxp/std.armadaxp	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,16 +1,6 @@
 # $FreeBSD$
 
-# kernel gets loaded at 0x00200000 by the loader, but runs at virtual address
-# 0xc0200000.  RAM starts at 0.  We put the pagetable at a reasonable place
-# in memory, but may need to bounce it higher if there's a problem with this.
-# We could paper over this by loading the kernel at 0xc0000000 virtual, but
-# that leads to other complications, so we'll just reclaim the lower region of
-# ram after we're loaded.  Put the page tables for startup at 1MB.
-makeoptions	KERNPHYSADDR=0x00200000
 makeoptions	KERNVIRTADDR=0xc0200000
-
-options		KERNPHYSADDR=0x00200000
 options		KERNVIRTADDR=0xc0200000
-options		PHYSADDR=0x00000000
 
 options		ARM_L2_PIPT

Modified: projects/powernv/arm/mv/files.mv
==============================================================================
--- projects/powernv/arm/mv/files.mv	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/mv/files.mv	Mon Nov 23 17:09:35 2015	(r291212)
@@ -12,9 +12,6 @@
 # - JTAG/ICE
 # - Vector Floating Point (VFP) unit
 #
-arm/arm/bus_space_base.c	standard
-arm/arm/bus_space_generic.c	standard
-
 arm/mv/gpio.c			standard
 arm/mv/mv_common.c		standard
 arm/mv/mv_localbus.c		standard

Modified: projects/powernv/arm/qemu/files.qemu
==============================================================================
--- projects/powernv/arm/qemu/files.qemu	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/qemu/files.qemu	Mon Nov 23 17:09:35 2015	(r291212)
@@ -3,14 +3,11 @@
 #
 # Standard ARM support.
 #
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 kern/kern_clocksource.c			standard
 
 #
 # Standard qemu virt devices and support.
 #
-arm/arm/generic_timer.c			standard
 arm/qemu/virt_common.c			standard
 arm/qemu/virt_machdep.c			standard
 arm/qemu/virt_mp.c			optional	smp

Modified: projects/powernv/arm/qemu/std.virt
==============================================================================
--- projects/powernv/arm/qemu/std.virt	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/qemu/std.virt	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,7 +2,6 @@
 machine		arm	armv6
 cpu 		CPU_CORTEXA
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoptions	ARM_LITTLE_ENDIAN
 options		ARM_L2_PIPT
 
 options 	KERNVIRTADDR		= 0xc1000000

Modified: projects/powernv/arm/rockchip/files.rk30xx
==============================================================================
--- projects/powernv/arm/rockchip/files.rk30xx	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/rockchip/files.rk30xx	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,12 +1,6 @@
 # $FreeBSD$
 kern/kern_clocksource.c			standard
 
-arm/arm/bus_space_asm_generic.S		standard
-arm/arm/bus_space_generic.c		standard
-
-arm/arm/mpcore_timer.c			standard
-
-arm/arm/bus_space_base.c		standard
 arm/rockchip/rk30xx_common.c		standard
 arm/rockchip/rk30xx_machdep.c		standard
 arm/rockchip/rk30xx_pmu.c		standard

Modified: projects/powernv/arm/rockchip/std.rk30xx
==============================================================================
--- projects/powernv/arm/rockchip/std.rk30xx	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/rockchip/std.rk30xx	Mon Nov 23 17:09:35 2015	(r291212)
@@ -4,16 +4,6 @@
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
-makeoption	ARM_LITTLE_ENDIAN
-
-# Physical memory starts at 0x60400000.  We assume images are loaded at
-# 0x60400000.
-#
-#
-options		PHYSADDR=0x60000000
-
-makeoptions	KERNPHYSADDR=0x60400000
-options		KERNPHYSADDR=0x60400000
 
 makeoptions	KERNVIRTADDR=0xc0400000
 options		KERNVIRTADDR=0xc0400000

Modified: projects/powernv/arm/samsung/exynos/files.exynos5
==============================================================================
--- projects/powernv/arm/samsung/exynos/files.exynos5	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/samsung/exynos/files.exynos5	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,12 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
-arm/arm/bus_space_base.c			standard
-arm/arm/generic_timer.c				standard
-
 arm/samsung/exynos/exynos5_mct.c		standard
 arm/samsung/exynos/exynos5_mp.c			optional	smp
 arm/samsung/exynos/exynos5_common.c		standard

Modified: projects/powernv/arm/samsung/exynos/std.exynos5250
==============================================================================
--- projects/powernv/arm/samsung/exynos/std.exynos5250	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/samsung/exynos/std.exynos5250	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,16 +1,9 @@
 # $FreeBSD$
 
-makeoption	ARM_LITTLE_ENDIAN
-
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x40000000
-
-makeoptions	KERNPHYSADDR=0x40f00000
-options		KERNPHYSADDR=0x40f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 

Modified: projects/powernv/arm/samsung/exynos/std.exynos5420
==============================================================================
--- projects/powernv/arm/samsung/exynos/std.exynos5420	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/samsung/exynos/std.exynos5420	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,16 +1,9 @@
 # $FreeBSD$
 
-makeoption	ARM_LITTLE_ENDIAN
-
 cpu		CPU_CORTEXA
 machine		arm armv6
 makeoptions	CONF_CFLAGS="-march=armv7a"
 
-options		PHYSADDR=0x20000000
-
-makeoptions	KERNPHYSADDR=0x20f00000
-options		KERNPHYSADDR=0x20f00000
-
 makeoptions	KERNVIRTADDR=0xc0f00000
 options		KERNVIRTADDR=0xc0f00000
 

Modified: projects/powernv/arm/ti/am335x/files.am335x
==============================================================================
--- projects/powernv/arm/ti/am335x/files.am335x	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/ti/am335x/files.am335x	Mon Nov 23 17:09:35 2015	(r291212)
@@ -17,7 +17,6 @@ arm/ti/am335x/am335x_scm_padconf.c	stand
 arm/ti/am335x/am335x_usbss.c		optional	musb fdt
 arm/ti/am335x/am335x_musb.c		optional	musb fdt
 
-arm/arm/hdmi_if.m			optional	hdmi
 arm/ti/am335x/tda19988.c		optional	hdmi
 
 arm/ti/ti_edma3.c			standard

Modified: projects/powernv/arm/ti/am335x/std.am335x
==============================================================================
--- projects/powernv/arm/ti/am335x/std.am335x	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/ti/am335x/std.am335x	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,15 +2,7 @@
 #$FreeBSD$
 files		"../ti/am335x/files.am335x"
 include		"../ti/std.ti"
-makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x80000000.  We assume images are loaded at
-# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin'
-#
-#
-options		PHYSADDR=0x80000000
-options		KERNPHYSADDR=0x80200000
-makeoptions	KERNPHYSADDR=0x80200000
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 

Modified: projects/powernv/arm/ti/files.ti
==============================================================================
--- projects/powernv/arm/ti/files.ti	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/ti/files.ti	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,10 +2,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
 arm/ti/ti_common.c				standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_hwmods.c				standard

Modified: projects/powernv/arm/ti/omap4/files.omap4
==============================================================================
--- projects/powernv/arm/ti/omap4/files.omap4	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/ti/omap4/files.omap4	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,5 @@
 #$FreeBSD$
 
-arm/arm/mpcore_timer.c				standard
 arm/ti/ti_smc.S					standard
 
 arm/ti/usb/omap_ehci.c				optional	usb ehci

Modified: projects/powernv/arm/ti/omap4/std.omap4
==============================================================================
--- projects/powernv/arm/ti/omap4/std.omap4	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/ti/omap4/std.omap4	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,15 +2,7 @@
 #$FreeBSD$
 files		"../ti/omap4/files.omap4"
 include		"../ti/std.ti"
-makeoption	ARM_LITTLE_ENDIAN
 
-# Physical memory starts at 0x80000000.  We assume images are loaded at
-# 0x80200000, e.g. from u-boot with 'fatload mmc 0 0x80200000 kernel.bin'
-#
-#
-options		PHYSADDR=0x80000000
-options		KERNPHYSADDR=0x80200000
-makeoptions	KERNPHYSADDR=0x80200000
 options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0200000
 

Modified: projects/powernv/arm/versatile/files.versatile
==============================================================================
--- projects/powernv/arm/versatile/files.versatile	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/versatile/files.versatile	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-arm/arm/bus_space_base.c 			standard
-arm/arm/bus_space_asm_generic.S			standard
-arm/arm/bus_space_generic.c                     standard
-
 arm/versatile/pl050.c				optional sc
 arm/versatile/sp804.c				standard
 arm/versatile/versatile_machdep.c		standard

Modified: projects/powernv/arm/versatile/versatile_pci.c
==============================================================================
--- projects/powernv/arm/versatile/versatile_pci.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/versatile/versatile_pci.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -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:

Modified: projects/powernv/arm/xilinx/files.zynq7
==============================================================================
--- projects/powernv/arm/xilinx/files.zynq7	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xilinx/files.zynq7	Mon Nov 23 17:09:35 2015	(r291212)
@@ -5,13 +5,6 @@
 
 kern/kern_clocksource.c				standard
 
-arm/arm/bus_space_base.c			standard
-arm/arm/bus_space_generic.c			standard
-arm/arm/bus_space_asm_generic.S			standard
-
-arm/arm/mpcore_timer.c				standard
-arm/arm/pl310.c					standard
-
 arm/xilinx/zy7_machdep.c			standard
 arm/xilinx/zy7_l2cache.c			standard
 arm/xilinx/zy7_slcr.c				standard

Modified: projects/powernv/arm/xilinx/std.zynq7
==============================================================================
--- projects/powernv/arm/xilinx/std.zynq7	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xilinx/std.zynq7	Mon Nov 23 17:09:35 2015	(r291212)
@@ -9,13 +9,6 @@ makeoptions	CONF_CFLAGS="-march=armv7a"
 
 files		"../xilinx/files.zynq7"
 
-# Physical memory starts at 0x00000000.  We assume images are loaded at
-# 0x00100000, e.g. from u-boot with 'fatload mmc 0 0x100000 kernel.bin'
-#
-#
-options		PHYSADDR=0x00000000
-options		KERNPHYSADDR=0x00100000
-makeoptions	KERNPHYSADDR=0x00100000
 options		KERNVIRTADDR=0xc0100000		# Used in ldscript.arm
 makeoptions	KERNVIRTADDR=0xc0100000
 

Modified: projects/powernv/arm/xscale/i80321/files.i80219
==============================================================================
--- projects/powernv/arm/xscale/i80321/files.i80219	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xscale/i80321/files.i80219	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,8 +2,6 @@
 #
 # IOP Specific
 # 
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_dma.c		optional	dma
 arm/xscale/i80321/i80321_mcu.c		standard

Modified: projects/powernv/arm/xscale/i80321/files.i80321
==============================================================================
--- projects/powernv/arm/xscale/i80321/files.i80321	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xscale/i80321/files.i80321	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,4 @@
 #$FreeBSD$
-arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321.c		standard
 arm/xscale/i80321/i80321_aau.c		optional	aau
 arm/xscale/i80321/i80321_dma.c		optional	dma

Modified: projects/powernv/arm/xscale/i8134x/files.i81342
==============================================================================
--- projects/powernv/arm/xscale/i8134x/files.i81342	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xscale/i8134x/files.i81342	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c		standard
-arm/arm/bus_space_generic.c		standard
 arm/xscale/i80321/i80321_timer.c	standard
 arm/xscale/i80321/i80321_wdog.c		optional	iopwdog
 arm/xscale/i8134x/i81342.c		standard

Modified: projects/powernv/arm/xscale/ixp425/files.ixp425
==============================================================================
--- projects/powernv/arm/xscale/ixp425/files.ixp425	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xscale/ixp425/files.ixp425	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,5 +1,4 @@
 #$FreeBSD$
-arm/arm/bus_space_generic.c		standard
 arm/xscale/ixp425/ixp425.c		standard
 arm/xscale/ixp425/ixp425_mem.c		standard
 arm/xscale/ixp425/ixp425_space.c	standard

Modified: projects/powernv/arm/xscale/pxa/files.pxa
==============================================================================
--- projects/powernv/arm/xscale/pxa/files.pxa	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm/xscale/pxa/files.pxa	Mon Nov 23 17:09:35 2015	(r291212)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-arm/arm/bus_space_generic.c		standard
-
 arm/xscale/pxa/pxa_gpio.c		standard
 arm/xscale/pxa/pxa_icu.c		standard
 arm/xscale/pxa/pxa_machdep.c		standard

Modified: projects/powernv/arm64/arm64/busdma_bounce.c
==============================================================================
--- projects/powernv/arm64/arm64/busdma_bounce.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/arm64/arm64/busdma_bounce.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -754,6 +754,9 @@ bounce_bus_dmamap_unload(bus_dma_tag_t d
 {
 	struct bounce_page *bpage;
 
+	if (map == NULL)
+		return;
+
 	while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
 		STAILQ_REMOVE_HEAD(&map->bpages, links);
 		free_bounce_page(dmat, bpage);
@@ -767,7 +770,7 @@ bounce_bus_dmamap_sync(bus_dma_tag_t dma
 	struct bounce_page *bpage;
 	vm_offset_t datavaddr, tempvaddr;
 
-	if ((bpage = STAILQ_FIRST(&map->bpages)) == NULL)
+	if (map == NULL || (bpage = STAILQ_FIRST(&map->bpages)) == NULL)
 		return;
 
 	/*
@@ -836,12 +839,14 @@ SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_AN
 static struct sysctl_ctx_list *
 busdma_sysctl_tree(struct bounce_zone *bz)
 {
+
 	return (&bz->sysctl_tree);
 }
 
 static struct sysctl_oid *
 busdma_sysctl_tree_top(struct bounce_zone *bz)
 {
+
 	return (bz->sysctl_tree_top);
 }
 

Modified: projects/powernv/boot/i386/Makefile
==============================================================================
--- projects/powernv/boot/i386/Makefile	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/boot/i386/Makefile	Mon Nov 23 17:09:35 2015	(r291212)
@@ -2,7 +2,7 @@
 
 .include <src.opts.mk>
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
+SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'

Modified: projects/powernv/boot/i386/boot0/Makefile
==============================================================================
--- projects/powernv/boot/i386/boot0/Makefile	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/boot/i386/boot0/Makefile	Mon Nov 23 17:09:35 2015	(r291212)
@@ -80,5 +80,4 @@ LDFLAGS=-e start -Ttext ${BOOT_BOOT0_ORG
 
 # XXX: clang integrated-as doesn't grok .codeNN directives yet
 CFLAGS.boot0.S=		${CLANG_NO_IAS}
-CFLAGS.boot0ext.S=	${CLANG_NO_IAS}
 CFLAGS+=		${CFLAGS.${.IMPSRC:T}}

Modified: projects/powernv/boot/uboot/common/main.c
==============================================================================
--- projects/powernv/boot/uboot/common/main.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/boot/uboot/common/main.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -315,7 +315,7 @@ print_disk_probe_info()
 	else
 		strcpy(slice, "<auto>");
 
-	if (currdev.d_disk.partition > 0)
+	if (currdev.d_disk.partition >= 0)
 		sprintf(partition, "%d", currdev.d_disk.partition);
 	else
 		strcpy(partition, "<auto>");
@@ -382,7 +382,7 @@ probe_disks(int devidx, int load_type, i
 		printf("\n");
 	}
 
-	printf("  Requested disk type/unit not found\n");
+	printf("  Requested disk type/unit/slice/partition not found\n");
 	return (-1);
 }
 
@@ -392,7 +392,7 @@ main(void)
 	struct api_signature *sig = NULL;
 	int load_type, load_unit, load_slice, load_partition;
 	int i;
-	const char * loaderdev;
+	const char *ldev;
 
 	/*
 	 * If we can't find the magic signature and related info, exit with a
@@ -485,10 +485,10 @@ main(void)
 		return (0xbadef1ce);
 	}
 
-	env_setenv("currdev", EV_VOLATILE, uboot_fmtdev(&currdev),
-	    uboot_setcurrdev, env_nounset);
-	env_setenv("loaddev", EV_VOLATILE, uboot_fmtdev(&currdev),
-	    env_noset, env_nounset);
+	ldev = uboot_fmtdev(&currdev);
+	env_setenv("currdev", EV_VOLATILE, ldev, uboot_setcurrdev, env_nounset);
+	env_setenv("loaddev", EV_VOLATILE, ldev, env_noset, env_nounset);
+	printf("Booting from %s %\n", ldev);
 
 	setenv("LINES", "24", 1);		/* optional */
 	setenv("prompt", "loader>", 1);

Modified: projects/powernv/cam/scsi/scsi_enc.c
==============================================================================
--- projects/powernv/cam/scsi/scsi_enc.c	Mon Nov 23 17:07:51 2015	(r291211)
+++ projects/powernv/cam/scsi/scsi_enc.c	Mon Nov 23 17:09:35 2015	(r291212)
@@ -407,6 +407,8 @@ enc_ioctl(struct cdev *dev, u_long cmd, 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list