diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-09-03 20:02:02 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-09-03 20:02:02 +0000 |
| commit | 77005140f324594093b98eeb49671b97c2caa649 (patch) | |
| tree | ab4ccece222f55f5bd765505d94b4a8e391bf95f | |
| parent | Missed one case of errno not being set in previous. (diff) | |
| download | wireguard-openbsd-77005140f324594093b98eeb49671b97c2caa649.tar.xz wireguard-openbsd-77005140f324594093b98eeb49671b97c2caa649.zip | |
Sprinkle some more eieio(); seems to avoid triggering the KASSERT(new > old).
| -rw-r--r-- | sys/arch/powerpc64/dev/xive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/arch/powerpc64/dev/xive.c b/sys/arch/powerpc64/dev/xive.c index 0271b605f17..b6796f3addd 100644 --- a/sys/arch/powerpc64/dev/xive.c +++ b/sys/arch/powerpc64/dev/xive.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xive.c,v 1.11 2020/08/30 19:07:00 kettenis Exp $ */ +/* $OpenBSD: xive.c,v 1.12 2020/09/03 20:02:02 kettenis Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> * @@ -232,6 +232,7 @@ xive_attach(struct device *parent, struct device *self, void *aux) /* Synchronize hardware state to software state. */ xive_write_1(sc, XIVE_TM_CPPR_HV, xive_prio(curcpu()->ci_cpl)); + eieio(); } int @@ -355,8 +356,10 @@ xive_setipl(int new) msr = intr_disable(); ci->ci_cpl = new; - if (newprio != oldprio) + if (newprio != oldprio) { xive_write_1(sc, XIVE_TM_CPPR_HV, newprio); + eieio(); + } intr_restore(msr); } @@ -431,7 +434,6 @@ xive_hvi(struct trapframe *frame) ci->ci_cpl = old; xive_write_1(sc, XIVE_TM_CPPR_HV, xive_prio(old)); - eieio(); } } |