From owner-svn-src-all@FreeBSD.ORG Sat Aug 17 18:51:41 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 32605A6C; Sat, 17 Aug 2013 18:51:41 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D9DB6261D; Sat, 17 Aug 2013 18:51:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7HIpeAM070257; Sat, 17 Aug 2013 18:51:40 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7HIpcPV070242; Sat, 17 Aug 2013 18:51:38 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201308171851.r7HIpcPV070242@svn.freebsd.org> From: Andrew Turner Date: Sat, 17 Aug 2013 18:51:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254461 - in head/sys: arm/arm arm/conf arm/include conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Aug 2013 18:51:41 -0000 Author: andrew Date: Sat Aug 17 18:51:38 2013 New Revision: 254461 URL: http://svnweb.freebsd.org/changeset/base/254461 Log: Rename device vfp to option VFP and retire the ARM_VFP_SUPPORT option. This simplifies enabling as previously both options were required to be enabled, now we only need a single option. While here enable VFP on the PandaBoard. Modified: head/sys/arm/arm/genassym.c head/sys/arm/arm/machdep.c head/sys/arm/arm/mp_machdep.c head/sys/arm/arm/swtch.S head/sys/arm/arm/undefined.c head/sys/arm/arm/vfp.c head/sys/arm/conf/PANDABOARD head/sys/arm/conf/RPI-B head/sys/arm/include/pcpu.h head/sys/conf/files.arm head/sys/conf/options.arm Modified: head/sys/arm/arm/genassym.c ============================================================================== --- head/sys/arm/arm/genassym.c Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/genassym.c Sat Aug 17 18:51:38 2013 (r254461) @@ -113,7 +113,7 @@ ASSYM(ARM_RAS_START, ARM_RAS_START); ASSYM(ARM_RAS_END, ARM_RAS_END); #endif -#ifdef ARM_VFP_SUPPORT +#ifdef VFP ASSYM(PCB_VFPSTATE, offsetof(struct pcb, pcb_vfpstate)); ASSYM(PCB_VFPCPU, offsetof(struct pcb, pcb_vfpcpu)); Modified: head/sys/arm/arm/machdep.c ============================================================================== --- head/sys/arm/arm/machdep.c Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/machdep.c Sat Aug 17 18:51:38 2013 (r254461) @@ -875,7 +875,7 @@ pcpu0_init(void) #endif pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); -#ifdef ARM_VFP_SUPPORT +#ifdef VFP PCPU_SET(cpu, 0); #endif } Modified: head/sys/arm/arm/mp_machdep.c ============================================================================== --- head/sys/arm/arm/mp_machdep.c Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/mp_machdep.c Sat Aug 17 18:51:38 2013 (r254461) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#ifdef ARM_VFP_SUPPORT +#ifdef VFP #include #endif @@ -199,7 +199,7 @@ init_secondary(int cpu) KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); pc->pc_curthread = pc->pc_idlethread; pc->pc_curpcb = pc->pc_idlethread->td_pcb; -#ifdef ARM_VFP_SUPPORT +#ifdef VFP pc->pc_cpu = cpu; vfp_init(); Modified: head/sys/arm/arm/swtch.S ============================================================================== --- head/sys/arm/arm/swtch.S Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/swtch.S Sat Aug 17 18:51:38 2013 (r254461) @@ -114,7 +114,7 @@ ENTRY(cpu_throw) GET_PCPU(r7) -#ifdef ARM_VFP_SUPPORT +#ifdef VFP /* * vfp_discard will clear pcpu->pc_vfpcthread, and modify * and modify the control as needed. @@ -124,7 +124,7 @@ ENTRY(cpu_throw) bne 3f bl _C_LABEL(vfp_discard) /* yes, shut down vfp */ 3: -#endif /* ARM_VFP_SUPPORT */ +#endif /* VFP */ ldr r7, [r5, #(TD_PCB)] /* r7 = new thread's PCB */ @@ -303,7 +303,7 @@ ENTRY(cpu_switch) /* rem: r9 = new PCB */ /* rem: interrupts are enabled */ -#ifdef ARM_VFP_SUPPORT +#ifdef VFP /* * vfp_store will clear pcpu->pc_vfpcthread, save * registers and state, and modify the control as needed. @@ -325,7 +325,7 @@ ENTRY(cpu_switch) add r0, r2, #(PCB_VFPSTATE) bl _C_LABEL(vfp_store) 1: -#endif /* ARM_VFP_SUPPORT */ +#endif /* VFP */ /* r1 now free! */ @@ -505,7 +505,7 @@ ENTRY(savectx) /* Store all the registers in the process's pcb */ add r2, r0, #(PCB_R8) stmia r2, {r8-r13} -#ifdef ARM_VFP_SUPPORT +#ifdef VFP /* * vfp_store will clear pcpu->pc_vfpcthread, save * registers and state, and modify the control as needed. @@ -525,7 +525,7 @@ ENTRY(savectx) add r0, r0, #(PCB_VFPSTATE) bl _C_LABEL(vfp_store) 1: -#endif /* ARM_VFP_SUPPORT */ +#endif /* VFP */ add sp, sp, #4; ldmfd sp!, {r4-r7, pc} END(savectx) Modified: head/sys/arm/arm/undefined.c ============================================================================== --- head/sys/arm/arm/undefined.c Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/undefined.c Sat Aug 17 18:51:38 2013 (r254461) @@ -234,13 +234,13 @@ undefinedinstruction(trapframe_t *frame) coprocessor = 0; if ((fault_instruction & (1 << 27)) != 0) coprocessor = (fault_instruction >> 8) & 0x0f; -#ifdef ARM_VFP_SUPPORT +#ifdef VFP else { /* check for special instructions */ if (((fault_instruction & 0xfe000000) == 0xf2000000) || ((fault_instruction & 0xff100000) == 0xf4000000)) coprocessor = 10; /* vfp / simd */ } -#endif /* ARM_VFP_SUPPORT */ +#endif /* VFP */ if ((frame->tf_spsr & PSR_MODE) == PSR_USR32_MODE) { /* Modified: head/sys/arm/arm/vfp.c ============================================================================== --- head/sys/arm/arm/vfp.c Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/arm/vfp.c Sat Aug 17 18:51:38 2013 (r254461) @@ -24,10 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include __FBSDID("$FreeBSD$"); - +#ifdef VFP #include #include #include @@ -281,3 +282,5 @@ vfp_enable() tmp |= VFPEXC_EN; fmxr(VFPEXC, tmp); } +#endif + Modified: head/sys/arm/conf/PANDABOARD ============================================================================== --- head/sys/arm/conf/PANDABOARD Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/conf/PANDABOARD Sat Aug 17 18:51:38 2013 (r254461) @@ -140,5 +140,4 @@ options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=pandaboard.dts -#device vfp # vfp/neon -#options ARM_VFP_SUPPORT # vfp/neon +options VFP # vfp/neon Modified: head/sys/arm/conf/RPI-B ============================================================================== --- head/sys/arm/conf/RPI-B Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/conf/RPI-B Sat Aug 17 18:51:38 2013 (r254461) @@ -109,5 +109,4 @@ options FDT #options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=rpi.dts -device vfp # vfp/neon -options ARM_VFP_SUPPORT # vfp/neon +options VFP # vfp/neon Modified: head/sys/arm/include/pcpu.h ============================================================================== --- head/sys/arm/include/pcpu.h Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/arm/include/pcpu.h Sat Aug 17 18:51:38 2013 (r254461) @@ -41,7 +41,7 @@ struct vmspace; #endif /* _KERNEL */ -#ifdef ARM_VFP_SUPPORT +#ifdef VFP #define PCPU_MD_FIELDS \ unsigned int pc_cpu; \ unsigned int pc_vfpsid; \ Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/conf/files.arm Sat Aug 17 18:51:38 2013 (r254461) @@ -50,7 +50,7 @@ arm/arm/uio_machdep.c standard arm/arm/undefined.c standard arm/arm/vectors.S standard arm/arm/vm_machdep.c standard -arm/arm/vfp.c optional vfp +arm/arm/vfp.c standard board_id.h standard \ dependency "$S/arm/conf/genboardid.awk $S/arm/conf/mach-types" \ compile-with "${AWK} -f $S/arm/conf/genboardid.awk $S/arm/conf/mach-types > board_id.h" \ Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Sat Aug 17 18:38:00 2013 (r254460) +++ head/sys/conf/options.arm Sat Aug 17 18:51:38 2013 (r254461) @@ -60,3 +60,4 @@ GFB_DEBUG opt_gfb.h GFB_NO_FONT_LOADING opt_gfb.h GFB_NO_MODE_CHANGE opt_gfb.h AT91C_MAIN_CLOCK opt_at91.h +VFP opt_global.h