[src/trunk]: src/sys/arch/mips/cavium mips/cavium: Insert appropriate membars...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ef89f164c616
branches:  trunk
changeset: 365146:ef89f164c616
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Apr 09 23:34:40 2022 +0000

description:
mips/cavium: Insert appropriate membars around IPIs.

diffstat:

 sys/arch/mips/cavium/octeon_intr.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 34439c114539 -r ef89f164c616 sys/arch/mips/cavium/octeon_intr.c
--- a/sys/arch/mips/cavium/octeon_intr.c        Sat Apr 09 23:34:30 2022 +0000
+++ b/sys/arch/mips/cavium/octeon_intr.c        Sat Apr 09 23:34:40 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: octeon_intr.c,v 1.26 2022/03/26 19:38:00 riastradh Exp $       */
+/*     $NetBSD: octeon_intr.c,v 1.27 2022/04/09 23:34:40 riastradh Exp $       */
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
@@ -44,7 +44,7 @@
 #define __INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.26 2022/03/26 19:38:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.27 2022/04/09 23:34:40 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -548,6 +548,7 @@
        ipi_mask &= mips3_ld(cpu->cpu_mbox_set);
        if (ipi_mask == 0)
                return 0;
+       membar_acquire();
 
        mips3_sd(cpu->cpu_mbox_clr, ipi_mask);
 
@@ -566,8 +567,9 @@
 #endif
 
        /* if the request is clear, it was previously processed */
-       if ((ci->ci_request_ipis & ipi_mask) == 0)
+       if ((atomic_load_relaxed(&ci->ci_request_ipis) & ipi_mask) == 0)
                return 0;
+       membar_acquire();
 
        atomic_or_64(&ci->ci_active_ipis, ipi_mask);
        atomic_and_64(&ci->ci_request_ipis, ~ipi_mask);
@@ -600,8 +602,10 @@
        const u_int ipi_shift = ipi_prio[req] == IPL_SCHED ? 16 : 0;
        const uint32_t ipi_mask = __BIT(req + ipi_shift);
 
+       membar_release();
        atomic_or_64(&ci->ci_request_ipis, ipi_mask);
 
+       membar_release();
        mips3_sd(cpu->cpu_mbox_set, ipi_mask);
 
        return 0;