Date: Tue, 10 Jul 2012 00:14:42 +0000 (UTC) From: Jakub Wojciech Klama <jceel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r238319 - in user/jceel/soc2012_armv6/sys/arm: at91 econa mv s3c2xx0 sa11x0 xscale/i80321 xscale/i8134x xscale/ixp425 xscale/pxa Message-ID: <201207100014.q6A0Egkj048104@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jceel Date: Tue Jul 10 00:14:42 2012 New Revision: 238319 URL: http://svn.freebsd.org/changeset/base/238319 Log: Integrate Andrew's Turner proc0 patch. Modified: user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c user/jceel/soc2012_armv6/sys/arm/mv/mv_machdep.c user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/i8134x/crb_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Modified: user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/at91/at91_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -132,8 +132,6 @@ struct pv_addr kernelstack; static void *boot_arg1; static void *boot_arg2; -static struct trapframe proc0_tf; - /* Static device mappings. */ const struct pmap_devmap at91_devmap[] = { /* @@ -401,13 +399,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/econa/econa_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -123,8 +123,6 @@ struct pv_addr kernelstack; static void *boot_arg1; static void *boot_arg2; -static struct trapframe proc0_tf; - /* Static device mappings. */ static const struct pmap_devmap econa_devmap[] = { { @@ -343,13 +341,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/mv/mv_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/mv/mv_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/mv/mv_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -145,8 +145,6 @@ struct pv_addr kernelstack; void set_stackptrs(int cpu); -static struct trapframe proc0_tf; - static struct mem_region availmem_regions[FDT_MEM_REGIONS]; static int availmem_regions_sz; @@ -571,14 +569,7 @@ initarm(void *mdp, void *unused __unused undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_kstack_pages = KSTACK_PAGES; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/s3c2xx0/s3c24x0_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -135,8 +135,6 @@ struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -static struct trapframe proc0_tf; - #define _A(a) ((a) & ~L1_S_OFFSET) #define _S(s) (((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1)) @@ -402,14 +400,8 @@ initarm(void *arg, void *arg2) prefetch_abort_handler_address = (u_int)prefetch_abort_handler; undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/sa11x0/assabet_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -144,7 +144,6 @@ struct pv_addr irqstack; struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -static struct trapframe proc0_tf; /* Static device mappings. */ static const struct pmap_devmap assabet_devmap[] = { @@ -381,12 +380,7 @@ initarm(void *arg, void *arg2) /* Set stack for exception handlers */ - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; + init_proc0(kernelstack.pv_va); /* Enable MMU, I-cache, D-cache, write buffer. */ Modified: user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/xscale/i80321/ep80219_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -133,8 +133,6 @@ struct pv_addr abtstack; struct pv_addr kernelstack; struct pv_addr minidataclean; -static struct trapframe proc0_tf; - /* #define IQ80321_OBIO_BASE 0xfe800000UL */ /* #define IQ80321_OBIO_SIZE 0x00100000UL */ @@ -375,13 +373,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); /* Enable MMU, I-cache, D-cache, write buffer. */ Modified: user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/xscale/i80321/iq31244_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -133,8 +133,6 @@ struct pv_addr abtstack; struct pv_addr kernelstack; struct pv_addr minidataclean; -static struct trapframe proc0_tf; - #define IQ80321_OBIO_BASE 0xfe800000UL #define IQ80321_OBIO_SIZE 0x00100000UL /* Static device mappings. */ @@ -373,13 +371,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); /* Enable MMU, I-cache, D-cache, write buffer. */ Modified: user/jceel/soc2012_armv6/sys/arm/xscale/i8134x/crb_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/i8134x/crb_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/xscale/i8134x/crb_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -132,8 +132,6 @@ struct pv_addr undstack; struct pv_addr abtstack; struct pv_addr kernelstack; -static struct trapframe proc0_tf; - /* Static device mappings. */ static const struct pmap_devmap iq81342_devmap[] = { { @@ -349,13 +347,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/xscale/ixp425/avila_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -137,8 +137,6 @@ struct pv_addr abtstack; struct pv_addr kernelstack; struct pv_addr minidataclean; -static struct trapframe proc0_tf; - /* Static device mappings. */ static const struct pmap_devmap ixp425_devmap[] = { /* Physical/Virtual address for I/O space */ @@ -439,13 +437,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup0(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); Modified: user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c ============================================================================== --- user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Tue Jul 10 00:13:04 2012 (r238318) +++ user/jceel/soc2012_armv6/sys/arm/xscale/pxa/pxa_machdep.c Tue Jul 10 00:14:42 2012 (r238319) @@ -133,8 +133,6 @@ struct pv_addr abtstack; struct pv_addr kernelstack; struct pv_addr minidataclean; -static struct trapframe proc0_tf; - static void pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t, uint32_t *, uint32_t *); @@ -363,13 +361,7 @@ initarm(void *arg, void *arg2) undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - proc_linkup(&proc0, &thread0); - thread0.td_kstack = kernelstack.pv_va; - thread0.td_pcb = (struct pcb *) - (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - thread0.td_pcb->pcb_flags = 0; - thread0.td_frame = &proc0_tf; - pcpup->pc_curpcb = thread0.td_pcb; + init_proc0(kernelstack.pv_va); /* Enable MMU, I-cache, D-cache, write buffer. */ arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207100014.q6A0Egkj048104>