From owner-svn-src-head@FreeBSD.ORG Sun Mar 29 18:59:07 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D718719B; Sun, 29 Mar 2015 18:59:06 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7831947; Sun, 29 Mar 2015 18:59:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2TIx6ak073882; Sun, 29 Mar 2015 18:59:06 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2TIx5t3073875; Sun, 29 Mar 2015 18:59:05 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201503291859.t2TIx5t3073875@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sun, 29 Mar 2015 18:59:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280817 - in head/sys: arm/arm 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2015 18:59:07 -0000 Author: andrew Date: Sun Mar 29 18:59:04 2015 New Revision: 280817 URL: https://svnweb.freebsd.org/changeset/base/280817 Log: Remove ARM9_CACHE_WRITE_THROUGH, none of our configs define it. Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/arm/pmap.c head/sys/arm/include/pmap.h head/sys/conf/options.arm Modified: head/sys/arm/arm/cpufunc.c ============================================================================== --- head/sys/arm/arm/cpufunc.c Sun Mar 29 18:53:21 2015 (r280816) +++ head/sys/arm/arm/cpufunc.c Sun Mar 29 18:59:04 2015 (r280817) @@ -924,11 +924,7 @@ set_cpufuncs() arm_dcache_l2_nsets)) - arm9_dcache_sets_inc; arm9_dcache_index_inc = 1U << (32 - arm_dcache_l2_assoc); arm9_dcache_index_max = 0U - arm9_dcache_index_inc; -#ifdef ARM9_CACHE_WRITE_THROUGH - pmap_pte_init_arm9(); -#else pmap_pte_init_generic(); -#endif goto out; } #endif /* CPU_ARM9 */ Modified: head/sys/arm/arm/pmap.c ============================================================================== --- head/sys/arm/arm/pmap.c Sun Mar 29 18:53:21 2015 (r280816) +++ head/sys/arm/arm/pmap.c Sun Mar 29 18:59:04 2015 (r280817) @@ -500,26 +500,6 @@ pmap_pte_init_generic(void) pmap_zero_page_func = pmap_zero_page_generic; } -#if defined(CPU_ARM9) && defined(ARM9_CACHE_WRITE_THROUGH) -void -pmap_pte_init_arm9(void) -{ - - /* - * ARM9 is compatible with generic, but we want to use - * write-through caching for now. - */ - pmap_pte_init_generic(); - - pte_l1_s_cache_mode = L1_S_C; - pte_l2_l_cache_mode = L2_C; - pte_l2_s_cache_mode = L2_C; - - pte_l1_s_cache_mode_pt = L1_S_C; - pte_l2_l_cache_mode_pt = L2_C; - pte_l2_s_cache_mode_pt = L2_C; -} -#endif /* CPU_ARM9 */ #endif /* ARM_MMU_GENERIC != 0 */ #if ARM_MMU_XSCALE == 1 Modified: head/sys/arm/include/pmap.h ============================================================================== --- head/sys/arm/include/pmap.h Sun Mar 29 18:53:21 2015 (r280816) +++ head/sys/arm/include/pmap.h Sun Mar 29 18:59:04 2015 (r280817) @@ -622,9 +622,6 @@ void pmap_copy_page_generic(vm_paddr_t, void pmap_zero_page_generic(vm_paddr_t, int, int); void pmap_pte_init_generic(void); -#if defined(CPU_ARM9) -void pmap_pte_init_arm9(void); -#endif /* CPU_ARM9 */ #if (ARM_MMU_V6 + ARM_MMU_V7) != 0 void pmap_pte_init_mmu_v6(void); #endif /* (ARM_MMU_V6 + ARM_MMU_V7) != 0 */ @@ -706,4 +703,4 @@ extern vm_paddr_t dump_avail[]; #endif /* !LOCORE */ #endif /* !_MACHINE_PMAP_H_ */ -#endif /* !ARM_NEW_PMAP */ \ No newline at end of file +#endif /* !ARM_NEW_PMAP */ Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Sun Mar 29 18:53:21 2015 (r280816) +++ head/sys/conf/options.arm Sun Mar 29 18:59:04 2015 (r280817) @@ -1,5 +1,4 @@ #$FreeBSD$ -ARM9_CACHE_WRITE_THROUGH opt_global.h ARMV6 opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARM_KERN_DIRECTMAP opt_vm.h