From owner-svn-src-projects@FreeBSD.ORG Mon Jan 2 09:51:13 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 02E21106564A; Mon, 2 Jan 2012 09:51:13 +0000 (UTC) (envelope-from gber@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBD338FC0C; Mon, 2 Jan 2012 09:51:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029pCE8058055; Mon, 2 Jan 2012 09:51:12 GMT (envelope-from gber@svn.freebsd.org) Received: (from gber@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029pCVa058052; Mon, 2 Jan 2012 09:51:12 GMT (envelope-from gber@svn.freebsd.org) Message-Id: <201201020951.q029pCVa058052@svn.freebsd.org> From: Grzegorz Bernacki Date: Mon, 2 Jan 2012 09:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r229268 - projects/armv6/sys/arm/arm X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jan 2012 09:51:13 -0000 Author: gber Date: Mon Jan 2 09:51:12 2012 New Revision: 229268 URL: http://svn.freebsd.org/changeset/base/229268 Log: Little cleanup. Obtained from: Marvell, Semihalf Modified: projects/armv6/sys/arm/arm/cpufunc.c projects/armv6/sys/arm/arm/mp_machdep.c Modified: projects/armv6/sys/arm/arm/cpufunc.c ============================================================================== --- projects/armv6/sys/arm/arm/cpufunc.c Mon Jan 2 09:48:46 2012 (r229267) +++ projects/armv6/sys/arm/arm/cpufunc.c Mon Jan 2 09:51:12 2012 (r229268) @@ -1352,14 +1352,12 @@ set_cpufuncs() else cpufuncs = pj4bv6_cpufuncs; - pj4b_config(); get_cachetype_cp15(); pmap_pte_init_mmu_v6(); goto out; } else if (cputype == CPU_ID_ARM_88SV584X || cputype == CPU_ID_MV88SV584X) { cpufuncs = pj4bv6_cpufuncs; - pj4b_config(); get_cachetype_cp15(); pmap_pte_init_mmu_v6(); goto out; @@ -2241,6 +2239,8 @@ pj4bv6_setup(char *args) { int cpuctrl; + pj4b_config(); + cpuctrl = CPU_CONTROL_MMU_ENABLE; #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS cpuctrl |= CPU_CONTROL_AFLT_ENABLE; @@ -2278,6 +2278,8 @@ pj4bv7_setup(args) { int cpuctrl; + pj4b_config(); + cpuctrl = CPU_CONTROL_MMU_ENABLE; #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS cpuctrl |= CPU_CONTROL_AFLT_ENABLE; Modified: projects/armv6/sys/arm/arm/mp_machdep.c ============================================================================== --- projects/armv6/sys/arm/arm/mp_machdep.c Mon Jan 2 09:48:46 2012 (r229267) +++ projects/armv6/sys/arm/arm/mp_machdep.c Mon Jan 2 09:51:12 2012 (r229268) @@ -130,9 +130,7 @@ init_secondary(int cpu) { struct pcpu *pc; - pj4b_config(); - - pj4bv6_setup(NULL); + cpu_setup(NULL); setttb(pmap_pa); cpu_tlb_flushID(); @@ -161,15 +159,11 @@ init_secondary(int cpu) mtx_lock_spin(&ap_boot_mtx); - cpu_dcache_wbinv_all(); - smp_cpus++; - cpu_dcache_wbinv_all(); + atomic_store_rel_int(&smp_cpus, 1); if (smp_cpus == mp_ncpus) { /* enable IPI's, tlb shootdown, freezes etc */ - cpu_dcache_wbinv_all(); atomic_store_rel_int(&smp_started, 1); - cpu_dcache_wbinv_all(); smp_active = 1; }