Module Name: src
Committed By: riastradh
Date: Wed Mar 4 18:19:27 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/drm: drm_cache.c
Log Message:
CLFLUSH needs to be surrounded by membars.
While here, round everything to a multiple of the cache line size.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/drm/drm_cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/drm_cache.c
diff -u src/sys/external/bsd/drm2/drm/drm_cache.c:1.3 src/sys/external/bsd/drm2/drm/drm_cache.c:1.4
--- src/sys/external/bsd/drm2/drm/drm_cache.c:1.3 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_cache.c Wed Mar 4 18:19:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_cache.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: drm_cache.c,v 1.4 2015/03/04 18:19:27 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.3 2014/07/16 20:56:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_cache.c,v 1.4 2015/03/04 18:19:27 riastradh Exp $");
#include <sys/types.h>
#include <sys/xcall.h>
@@ -146,15 +146,19 @@ drm_md_clflush_page(struct page *page)
static void
drm_md_clflush_virt_range(const void *vaddr, size_t nbytes)
-
{
- const char *const start = vaddr, *const end = (start + nbytes);
+ const unsigned clflush_size = drm_x86_clflush_size();
+ const vaddr_t va = (vaddr_t)vaddr;
+ const char *const start = (const void *)rounddown(va, clflush_size);
+ const char *const end = (const void *)roundup(va + nbytes,
+ clflush_size);
const char *p;
- const unsigned int clflush_size = drm_x86_clflush_size();
KASSERT(drm_md_clflush_finegrained_p());
+ membar_sync();
for (p = start; p < end; p += clflush_size)
drm_x86_clflush(p);
+ membar_sync();
}
#endif /* defined(__i386__) || defined(__x86_64__) */
