Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure pmap_kenter_pa(9) handles uncached mappings properly. 

Fixes "cgfour(4) is mis-probed as bwtwo(4)" problem on 3/80
that has been broken since NetBSD 1.6.
Now Xorg 1.20 based Xsun 8bpp color server is confirmed working
on the cgfour(4).

Should be pulled up to netbsd-9.

XXX: all MD PMAP_NC flags should be replaced with MI PMAP_NOCACHE flag.
This commit is contained in:
tsutsui 2020-08-19 13:11:42 +00:00
parent 17537a36ef
commit dd79f1e46f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/sun3/sun3x/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.116 2020/03/05 15:56:20 msaitoh Exp $ */ /* $NetBSD: pmap.c,v 1.117 2020/08/19 13:11:42 tsutsui Exp $ */
/*- /*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -105,7 +105,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.116 2020/03/05 15:56:20 msaitoh Exp $"); __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.117 2020/08/19 13:11:42 tsutsui Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
#include "opt_pmap_debug.h" #include "opt_pmap_debug.h"
@ -2145,6 +2145,12 @@ void
pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags) pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{ {
mmu_short_pte_t *pte; mmu_short_pte_t *pte;
u_int mapflags;
/* XXX: MD PMAP_NC should be replaced by MI PMAP_NOCACHE in flags. */
mapflags = (pa & ~MMU_PAGE_MASK);
if ((mapflags & PMAP_NC) != 0)
flags |= PMAP_NOCACHE;
/* This array is traditionally named "Sysmap" */ /* This array is traditionally named "Sysmap" */
pte = &kernCbase[(u_long)m68k_btop(va - KERNBASE3X)]; pte = &kernCbase[(u_long)m68k_btop(va - KERNBASE3X)];
@ -2153,6 +2159,8 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
pte->attr.raw = MMU_DT_INVALID | MMU_DT_PAGE | (pa & MMU_PAGE_MASK); pte->attr.raw = MMU_DT_INVALID | MMU_DT_PAGE | (pa & MMU_PAGE_MASK);
if (!(prot & VM_PROT_WRITE)) if (!(prot & VM_PROT_WRITE))
pte->attr.raw |= MMU_SHORT_PTE_WP; pte->attr.raw |= MMU_SHORT_PTE_WP;
if ((flags & PMAP_NOCACHE) != 0)
pte->attr.raw |= MMU_SHORT_PTE_CI;
} }
void void