Module Name: src
Committed By: rin
Date: Wed Jan 6 07:56:20 UTC 2021
Modified Files:
src/sys/arch/powerpc/booke: booke_pmap.c
Log Message:
Fix pmap_procwr() for powerpc/booke:
- Use PAGE_MASK, not PAGE_SIZE, to calculate page offset.
- Do not drop page offset of target address.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/booke/booke_pmap.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/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.30 src/sys/arch/powerpc/booke/booke_pmap.c:1.31
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.30 Sun Dec 20 16:38:25 2020
+++ src/sys/arch/powerpc/booke/booke_pmap.c Wed Jan 6 07:56:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.30 2020/12/20 16:38:25 skrll Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.31 2021/01/06 07:56:19 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#define __PMAP_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.30 2020/12/20 16:38:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.31 2021/01/06 07:56:19 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
@@ -62,7 +62,7 @@ void
pmap_procwr(struct proc *p, vaddr_t va, size_t len)
{
struct pmap * const pmap = p->p_vmspace->vm_map.pmap;
- vsize_t off = va & PAGE_SIZE;
+ vsize_t off = va & PAGE_MASK;
kpreempt_disable();
for (const vaddr_t eva = va + len; va < eva; off = 0) {
@@ -78,8 +78,8 @@ pmap_procwr(struct proc *p, vaddr_t va,
continue;
}
kpreempt_enable();
- dcache_wb(pte_to_paddr(pt_entry), segeva - va);
- icache_inv(pte_to_paddr(pt_entry), segeva - va);
+ dcache_wb(pte_to_paddr(pt_entry) + off, segeva - va);
+ icache_inv(pte_to_paddr(pt_entry) + off, segeva - va);
kpreempt_disable();
va = segeva;
}
