Date: Sat, 17 May 2014 21:28:49 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r266359 - stable/10/sys/arm/arm Message-ID: <201405172128.s4HLSnMS009870@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Sat May 17 21:28:49 2014 New Revision: 266359 URL: http://svnweb.freebsd.org/changeset/base/266359 Log: MFC 264160: Remove code under PMAP_CACHE_VIVT, not compiled on armv6. Modified: stable/10/sys/arm/arm/cpufunc_asm_arm11.S stable/10/sys/arm/arm/cpufunc_asm_arm11x6.S stable/10/sys/arm/arm/cpufunc_asm_armv6.S Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/arm/cpufunc_asm_arm11.S ============================================================================== --- stable/10/sys/arm/arm/cpufunc_asm_arm11.S Sat May 17 21:26:33 2014 (r266358) +++ stable/10/sys/arm/arm/cpufunc_asm_arm11.S Sat May 17 21:28:49 2014 (r266359) @@ -44,12 +44,6 @@ __FBSDID("$FreeBSD$"); * addresses that are about to change. */ ENTRY(arm11_setttb) -#ifdef PMAP_CACHE_VIVT - stmfd sp!, {r0, lr} - bl _C_LABEL(armv5_idcache_wbinv_all) - ldmfd sp!, {r0, lr} -#endif - mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ mcr p15, 0, r0, c8, c7, 0 /* invalidate I+D TLBs */ Modified: stable/10/sys/arm/arm/cpufunc_asm_arm11x6.S ============================================================================== --- stable/10/sys/arm/arm/cpufunc_asm_arm11x6.S Sat May 17 21:26:33 2014 (r266358) +++ stable/10/sys/arm/arm/cpufunc_asm_arm11x6.S Sat May 17 21:28:49 2014 (r266359) @@ -114,12 +114,7 @@ __FBSDID("$FreeBSD$"); #endif ENTRY(arm11x6_setttb) -#ifdef PMAP_CACHE_VIVT - Flush_D_cache(r1) - Invalidate_I_cache(r1, r2) -#else mov r1, #0 -#endif mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ mcr p15, 0, r1, c8, c7, 0 /* invalidate I+D TLBs */ mcr p15, 0, r1, c7, c10, 4 /* drain write buffer */ Modified: stable/10/sys/arm/arm/cpufunc_asm_armv6.S ============================================================================== --- stable/10/sys/arm/arm/cpufunc_asm_armv6.S Sat May 17 21:26:33 2014 (r266358) +++ stable/10/sys/arm/arm/cpufunc_asm_armv6.S Sat May 17 21:28:49 2014 (r266359) @@ -49,10 +49,6 @@ * addresses that are about to change. */ ENTRY(armv6_setttb) -#ifdef PMAP_CACHE_VIVT - mcr p15, 0, r0, c7, c5, 0 /* Flush I cache */ - mcr p15, 0, r0, c7, c14, 0 /* clean and invalidate D cache */ -#endif mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ mcr p15, 0, r0, c2, c0, 0 /* load new TTB */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405172128.s4HLSnMS009870>