Module Name: src
Committed By: matt
Date: Wed Jun 29 23:15:55 UTC 2011
Modified Files:
src/sys/arch/powerpc/booke: e500_tlb.c
Log Message:
Don't use TLB1 entries for device access if they are writethrough or not
cache-inhibited.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/e500_tlb.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/arch/powerpc/booke/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.5 src/sys/arch/powerpc/booke/e500_tlb.c:1.6
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.5 Thu Jun 23 05:42:27 2011
+++ src/sys/arch/powerpc/booke/e500_tlb.c Wed Jun 29 23:15:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.5 2011/06/23 05:42:27 matt Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.6 2011/06/29 23:15:55 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.5 2011/06/23 05:42:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.6 2011/06/29 23:15:55 matt Exp $");
#include <sys/param.h>
@@ -689,9 +689,13 @@
/*
* See if we have a TLB entry for the pa. If completely falls within
- * mark the reference and return the pa.
+ * mark the reference and return the pa. But only if the tlb entry
+ * is not cacheable.
*/
- if (xtlb && pa + len <= xtlb->e_tlb.tlb_va + xtlb->e_tlb.tlb_size) {
+ if (xtlb
+ && pa + len <= xtlb->e_tlb.tlb_va + xtlb->e_tlb.tlb_size
+ && ((xtlb->e_tlb.tlb_pte & PTE_W) == 0
+ || (xtlb->e_tlb.tlb_pte & PTE_I) == PTE_I)) {
xtlb->e_refcnt++;
return (void *) pa;
}
