git: b7c23efd7428 - stable/13 - Stop reading the arm64 domain when it's known

From: Andrew Turner <andrew_at_FreeBSD.org>
Date: Tue, 14 Dec 2021 11:07:21 UTC
The branch stable/13 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=b7c23efd7428256f69ccfd65a9c5e9f50585bf66

commit b7c23efd7428256f69ccfd65a9c5e9f50585bf66
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2021-10-12 11:39:14 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2021-12-14 10:58:01 +0000

    Stop reading the arm64 domain when it's known
    
    There is no need to read the domain on arm64 when there is only one
    in the ACPI tables. This can also happen when the table is missing
    as it is unneeded.
    
    Reported by:    dch
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 0906563718d35643789fc2b3c4cf1fc6884755e5)
---
 sys/arm64/arm64/mp_machdep.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c
index 7ce758ae897a..67542bbb9e4a 100644
--- a/sys/arm64/arm64/mp_machdep.c
+++ b/sys/arm64/arm64/mp_machdep.c
@@ -567,10 +567,10 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg)
 		else
 			id = *cpuid;
 
-#ifdef NUMA
-		domain = acpi_pxm_get_cpu_locality(*cpuid);
-#else
 		domain = 0;
+#ifdef NUMA
+		if (vm_ndomains > 1)
+			domain = acpi_pxm_get_cpu_locality(*cpuid);
 #endif
 		if (start_cpu(id, intr->ArmMpidr, domain)) {
 			MPASS(cpuid_to_pcpu[id] != NULL);