Author: ian
Date: Thu Nov 21 01:08:10 2013
New Revision: 258412
URL: http://svnweb.freebsd.org/changeset/base/258412
Log:
Call cpu_setup() from the initarm() routine on platforms that don't use
the common FDT-aware initarm() in arm/machdep.c.
Pointed out by: cognet
Pointy hat to: ian
Modified:
head/sys/arm/at91/at91_machdep.c
head/sys/arm/econa/econa_machdep.c
head/sys/arm/s3c2xx0/s3c24x0_machdep.c
head/sys/arm/sa11x0/assabet_machdep.c
head/sys/arm/xscale/i80321/ep80219_machdep.c
head/sys/arm/xscale/i80321/iq31244_machdep.c
head/sys/arm/xscale/i8134x/crb_machdep.c
head/sys/arm/xscale/ixp425/avila_machdep.c
head/sys/arm/xscale/pxa/pxa_machdep.c
Modified: head/sys/arm/at91/at91_machdep.c
==============================================================================
--- head/sys/arm/at91/at91_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/at91/at91_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -604,6 +604,7 @@ initarm(struct arm_boot_params *abp)
* of the stack memory.
*/
cpu_control(CPU_CONTROL_MMU_ENABLE, CPU_CONTROL_MMU_ENABLE);
+ cpu_setup("");
set_stackptrs(0);
Modified: head/sys/arm/econa/econa_machdep.c
==============================================================================
--- head/sys/arm/econa/econa_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/econa/econa_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -309,6 +309,7 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
Modified: head/sys/arm/s3c2xx0/s3c24x0_machdep.c
==============================================================================
--- head/sys/arm/s3c2xx0/s3c24x0_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/s3c2xx0/s3c24x0_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -355,6 +355,7 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
/* Disable all peripheral interrupts */
ioreg_write32(S3C24X0_INTCTL_BASE + INTCTL_INTMSK, ~0);
Modified: head/sys/arm/sa11x0/assabet_machdep.c
==============================================================================
--- head/sys/arm/sa11x0/assabet_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/sa11x0/assabet_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -371,6 +371,7 @@ initarm(struct arm_boot_params *abp)
cpufunc_control(0x337f, 0x107d);
arm_vector_init(ARM_VECTORS_LOW, ARM_VEC_ALL);
+ cpu_setup("");
pmap_curmaxkvaddr = freemempos + KERNEL_PT_VMDATA_NUM * 0x400000;
Modified: head/sys/arm/xscale/i80321/ep80219_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/ep80219_machdep.c Thu Nov 21 00:54:26
2013 (r258411)
+++ head/sys/arm/xscale/i80321/ep80219_machdep.c Thu Nov 21 01:08:10
2013 (r258412)
@@ -334,6 +334,8 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
+
/*
* Fetch the SDRAM start/size from the i80321 SDRAM configration
* registers.
Modified: head/sys/arm/xscale/i80321/iq31244_machdep.c
==============================================================================
--- head/sys/arm/xscale/i80321/iq31244_machdep.c Thu Nov 21 00:54:26
2013 (r258411)
+++ head/sys/arm/xscale/i80321/iq31244_machdep.c Thu Nov 21 01:08:10
2013 (r258412)
@@ -335,6 +335,8 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
+
/*
* Fetch the SDRAM start/size from the i80321 SDRAM configration
* registers.
Modified: head/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- head/sys/arm/xscale/i8134x/crb_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/xscale/i8134x/crb_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -320,6 +320,8 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
+
i80321_calibrate_delay();
i81342_sdram_bounds(&obio_bs_tag, IOP34X_VADDR, &memstart, &memsize);
physmem = memsize / PAGE_SIZE;
Modified: head/sys/arm/xscale/ixp425/avila_machdep.c
==============================================================================
--- head/sys/arm/xscale/ixp425/avila_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/xscale/ixp425/avila_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -405,6 +405,8 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
+
/* ready to setup the console (XXX move earlier if possible) */
cninit();
/*
Modified: head/sys/arm/xscale/pxa/pxa_machdep.c
==============================================================================
--- head/sys/arm/xscale/pxa/pxa_machdep.c Thu Nov 21 00:54:26 2013
(r258411)
+++ head/sys/arm/xscale/pxa/pxa_machdep.c Thu Nov 21 01:08:10 2013
(r258412)
@@ -317,6 +317,7 @@ initarm(struct arm_boot_params *abp)
* this problem will not occur after initarm().
*/
cpu_idcache_wbinv_all();
+ cpu_setup("");
/*
* Sort out bus_space for on-board devices.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
