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

Add back support for cached DVMA on SuperSPARC (sun4m) machines that was lost

Browse Source 
during merge
This commit is contained in:
abrown 1996-04-04 23:05:22 +00:00
parent b0fd2dabcb
commit 1068aa5751
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/sparc/sparc/iommu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iommu.c,v 1.1 1996/03/31 23:09:32 pk Exp $ */
/* $NetBSD: iommu.c,v 1.2 1996/04/04 23:05:22 abrown Exp $ */
/*
* Copyright (c) 1996
@ -269,7 +269,7 @@ iommu_enter(va, pa)
pte = atop(pa) << IOPTE_PPNSHFT;
pte &= IOPTE_PPN;
pte |= IOPTE_V | IOPTE_W;
pte |= IOPTE_V | IOPTE_W | (has_iocache ? IOPTE_C : 0);
sc->sc_ptes[atop(va - sc->sc_dvmabase)] = pte;
IOMMU_FLUSHPAGE(sc, va);
}

14
sys/arch/sparc/sparc/vm_machdep.c
View File

@ -1,6 +1,8 @@
/* $NetBSD: vm_machdep.c,v 1.24 1996/03/31 23:45:46 pk Exp $ */
/* $NetBSD: vm_machdep.c,v 1.25 1996/04/04 23:05:25 abrown Exp $ */
/*
* Copyright (c) 1996
* The President and Fellows of Harvard University. All rights reserved.
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
*
@ -12,6 +14,7 @@
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Lawrence Berkeley Laboratory.
* This product includes software developed by Harvard University.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -23,6 +26,7 @@
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Harvard University.
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
@ -152,13 +156,19 @@ dvma_mapin(map, va, len, canwait)
register int npf, s;
register vm_offset_t pa;
long off, pn;
#if defined(SUN4M)
extern int has_iocache;
#endif
off = (int)va & PGOFSET;
va -= off;
len = round_page(len + off);
npf = btoc(len);
kvm_uncache((caddr_t)va, len >> PGSHIFT);
#if defined(SUN4M)
if (!has_iocache)
kvm_uncache((caddr_t)va, len >> PGSHIFT);
#endif
s = splimp();
for (;;) {