From 20ecd185ae53c07e7d317ebc43de6986628077b1 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Tue, 19 Jul 2022 22:07:04 +0000 Subject: [PATCH] mips: Fix cpuids synchronization at boot. --- sys/arch/mips/mips/cpu_subr.c | 6 ++++-- sys/arch/mips/mips/locore_octeon.S | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/arch/mips/mips/cpu_subr.c b/sys/arch/mips/mips/cpu_subr.c index 6ded272faf35..ddeb256a7b3f 100644 --- a/sys/arch/mips/mips/cpu_subr.c +++ b/sys/arch/mips/mips/cpu_subr.c @@ -273,10 +273,12 @@ cpu_attach_common(device_t self, struct cpu_info *ci) if (ci != &cpu_info_store) { /* * Tail insert this onto the list of cpu_info's. + * atomic_store_release matches PTR_L/SYNC_ACQ in + * locore_octeon.S (XXX what about non-Octeon?). */ KASSERT(cpuid_infos[ci->ci_cpuid] == NULL); - cpuid_infos[ci->ci_cpuid] = ci; - membar_producer(); + atomic_store_release(&cpuid_infos[ci->ci_cpuid], ci); + membar_producer(); /* Cavium sync plunger */ } KASSERT(cpuid_infos[ci->ci_cpuid] != NULL); evcnt_attach_dynamic(&ci->ci_evcnt_synci_activate_rqst, diff --git a/sys/arch/mips/mips/locore_octeon.S b/sys/arch/mips/mips/locore_octeon.S index 676360c23af9..404b040aab0e 100644 --- a/sys/arch/mips/mips/locore_octeon.S +++ b/sys/arch/mips/mips/locore_octeon.S @@ -141,8 +141,10 @@ NESTED_NOPROFILE(octeon_cpu_spinup, 0, ra) PTR_LA a1, _C_LABEL(cpuid_infos) dsll v0, s0, PTR_SCALESHIFT # cpunum -> array index PTR_ADD t0, a1, v0 # add to array start -1: sync - PTR_L a1, (t0) # get cpu_info pointer +1: PTR_L a1, (t0) # get cpu_info pointer + SYNC_ACQ # PTR_L/SYNC_ACQ matches + # atomic_store_release in + # cpu_attach_common beqz a1, 1b # loop until non-NULL nop