[src/trunk]: src/sys/arch/arm/acpi Fix primary CPU detection in cpu_acpi_tpro...

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

details:   https://anonhg.NetBSD.org/src/rev/58bbd8abf913
branches:  trunk
changeset: 989862:58bbd8abf913
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Oct 17 12:41:05 2021 +0000

description:
Fix primary CPU detection in cpu_acpi_tprof_intr_establish

diffstat:

 sys/arch/arm/acpi/cpu_acpi.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ad0d2386f014 -r 58bbd8abf913 sys/arch/arm/acpi/cpu_acpi.c
--- a/sys/arch/arm/acpi/cpu_acpi.c      Sun Oct 17 10:44:21 2021 +0000
+++ b/sys/arch/arm/acpi/cpu_acpi.c      Sun Oct 17 12:41:05 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_acpi.c,v 1.10 2021/01/23 12:34:19 jmcneill Exp $ */
+/* $NetBSD: cpu_acpi.c,v 1.11 2021/10/17 12:41:05 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_acpi.c,v 1.10 2021/01/23 12:34:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_acpi.c,v 1.11 2021/10/17 12:41:05 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -168,7 +168,7 @@
        if ((gicc->Flags & ACPI_MADT_ENABLED) == 0)
                return AE_OK;
 
-       const bool cpu_primary_p = cpu_mpidr_aff_read() == gicc->ArmMpidr;
+       const bool cpu_primary_p = cpu_info_store[0].ci_cpuid == gicc->ArmMpidr;
        const bool intr_ppi_p = gicc->PerformanceInterrupt < 32;
        const int type = (gicc->Flags & ACPI_MADT_PERFORMANCE_IRQ_MODE) ?
            IST_EDGE : IST_LEVEL;