diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-09-13 12:05:24 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-09-13 12:05:24 +0000 |
| commit | fe1a0483d4e358a4a690619ee769e61720dedd6f (patch) | |
| tree | b695ab7634c09b1150ddaffffb88a588c77899cf /sys/arch/i386 | |
| parent | cf193fd435855f9aab1436e076c849d160181754 (diff) | |
change pmap wbinvd use to wbinvd_on_all_cpus
with this we can revert the recent coherency workaround in mesa
ok deraadt@ kettenis@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/pmap.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/pmapae.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c index 2bc422f769a..5fa18738474 100644 --- a/sys/arch/i386/i386/pmap.c +++ b/sys/arch/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.205 2019/12/19 17:46:32 mpi Exp $ */ +/* $OpenBSD: pmap.c,v 1.206 2020/09/13 12:05:23 jsg Exp $ */ /* $NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $ */ /* @@ -846,7 +846,7 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot) ((pa & PMAP_WC) ? pmap_pg_wc : 0)); if (pmap_valid_entry(bits)) { if (pa & PMAP_NOCACHE && (bits & PG_N) == 0) - wbinvd(); + wbinvd_on_all_cpus(); /* NB. - this should not happen. */ pmap_tlb_shootpage(pmap_kernel(), va); pmap_tlb_shootwait(); @@ -1625,7 +1625,7 @@ pmap_flush_cache(vaddr_t addr, vsize_t len) vaddr_t i; if (curcpu()->ci_cflushsz == 0) { - wbinvd(); + wbinvd_on_all_cpus(); return; } @@ -2464,7 +2464,7 @@ enter_now: if (pmap_valid_entry(opte)) { if (nocache && (opte & PG_N) == 0) - wbinvd(); /* XXX clflush before we enter? */ + wbinvd_on_all_cpus(); /* XXX clflush before we enter? */ pmap_tlb_shootpage(pmap, va); } diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c index bbc1d700d6b..ee08e9f8368 100644 --- a/sys/arch/i386/i386/pmapae.c +++ b/sys/arch/i386/i386/pmapae.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmapae.c,v 1.58 2019/12/19 17:46:32 mpi Exp $ */ +/* $OpenBSD: pmapae.c,v 1.59 2020/09/13 12:05:23 jsg Exp $ */ /* * Copyright (c) 2006-2008 Michael Shalayeff @@ -1888,7 +1888,7 @@ enter_now: if (pmap_valid_entry(opte)) { if (nocache && (opte & PG_N) == 0) - wbinvd(); /* XXX clflush before we enter? */ + wbinvd_on_all_cpus(); /* XXX clflush before we enter? */ pmap_tlb_shootpage(pmap, va); } |