Date: Sat, 3 Mar 2012 01:17:14 +0000 (UTC) From: Olivier Houchard <cognet@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232421 - projects/armv6/sys/arm/arm Message-ID: <201203030117.q231HEVq056101@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cognet Date: Sat Mar 3 01:17:13 2012 New Revision: 232421 URL: http://svn.freebsd.org/changeset/base/232421 Log: Implement workarounds for arm errata. Wait and sync the cache where we should. Modified: projects/armv6/sys/arm/arm/pl310.c Modified: projects/armv6/sys/arm/arm/pl310.c ============================================================================== --- projects/armv6/sys/arm/arm/pl310.c Sat Mar 3 01:06:54 2012 (r232420) +++ projects/armv6/sys/arm/arm/pl310.c Sat Mar 3 01:17:13 2012 (r232421) @@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$"); #include <sys/kernel.h> #include <sys/rman.h> #include <sys/module.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <machine/intr.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -162,8 +164,16 @@ pl310_cache_sync(void) static void pl310_wbinv_all(void) { +#if 1 + pl310_write4(PL310_DEBUG_CTRL, 3); +#endif pl310_write4(PL310_CLEAN_INV_WAY, g_l2cache_way_mask); pl310_wait_background_op(PL310_CLEAN_INV_WAY, g_l2cache_way_mask); + pl310_cache_sync(); +#if 1 + pl310_write4(PL310_DEBUG_CTRL, 0); +#endif + } static void @@ -174,11 +184,33 @@ pl310_wbinv_range(vm_paddr_t start, vm_s size &= ~g_l2cache_align_mask; size += g_l2cache_line_size; } +#if 1 + + pl310_write4(PL310_DEBUG_CTRL, 3); +#endif while (size > 0) { +#if 1 + /* + * Errata 588369 says that clean + inv may keep the + * cache line if it was clean, the recommanded workaround + * is to clean then invalidate the cache line, with + * write-back and cache linefill disabled + */ + + pl310_write4(PL310_CLEAN_LINE_PA, start); + pl310_write4(PL310_INV_LINE_PA, start); +#else pl310_write4(PL310_CLEAN_INV_LINE_PA, start); +#endif start += g_l2cache_line_size; size -= g_l2cache_line_size; } +#if 1 + pl310_write4(PL310_DEBUG_CTRL, 0); +#endif + pl310_wait_background_op(PL310_CLEAN_INV_LINE_PA, 1); + pl310_cache_sync(); + } static void @@ -194,6 +226,8 @@ pl310_wb_range(vm_paddr_t start, vm_size start += g_l2cache_line_size; size -= g_l2cache_line_size; } + pl310_cache_sync(); + pl310_wait_background_op(PL310_CLEAN_LINE_PA, 1); } @@ -210,6 +244,8 @@ pl310_inv_range(vm_paddr_t start, vm_siz start += g_l2cache_line_size; size -= g_l2cache_line_size; } + pl310_cache_sync(); + pl310_wait_background_op(PL310_INV_LINE_PA, 1); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203030117.q231HEVq056101>