From nobody Tue Dec 14 11:07:22 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5C5A218DD8AB; Tue, 14 Dec 2021 11:07:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCwZL6vyCz3NsW; Tue, 14 Dec 2021 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C39AC26D61; Tue, 14 Dec 2021 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BEB7M2E040250; Tue, 14 Dec 2021 11:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEB7MPp040249; Tue, 14 Dec 2021 11:07:22 GMT (envelope-from git) Date: Tue, 14 Dec 2021 11:07:22 GMT Message-Id: <202112141107.1BEB7MPp040249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: aa3b5d79b2ac - stable/13 - Pass the ACPI ID when reading the ACPI domain List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa3b5d79b2acc508cca63c24251d65f4d2d76fa5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639480043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JytSZ2xIgJrcgSyq0a6/Q+7TgU/4558kmACCZBav4uo=; b=NrcKcSXwOhvZCccYtpISrTZL/67y4+2kRJqP4NAoKuiPePI7+oMgrUU8id20u7zeZFsMbE 4+nR7HTsxB2IdQ1Nz9x3udPPsBAEbPGi9OlPIXggIyZnI/BSuamOJ4uGwSIBeOx+h1L2cF +NsM8eZdSk4tIZoFoIvd1h1C3NtHoiK2GdWMMgBlXMV2wZdi5+nebsFOLZFcF47M54eFc2 5w2pPFcEMgJk4koiC3e9e7sokM/MIjenVMFu/+fXUWWIpdKRl5dfxLAMqUmXZEDxEldMw3 jRtHPOV8fdSXRPmQLbzsIwFZhShd0ZMU8rX5v9OLCx6hRWz1uyOBc7aAjWt9JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639480043; a=rsa-sha256; cv=none; b=wSoR22jo36f0dfWcRZ8CEyrvtWy1zWnE7eMEgF+K/51m4dePbY957QIy6ZnEDdcqg2uq2z Qs6FeoOOv3hDx/oeymYOmBFp7qdA1qgkJVPlADAU/SgXiHMDy4PkzCIj8WdbBIGZl/7lUv WsG5YxtW75FtnU37Cxx/O/GO3hYeuqa9UG/WP8QjeroJctn3oHXrkAyTcYLZZ29krcYuIf Ttz2VK9HwWixEPG2mBE+alvBahXu6epHvawc8mzzdBoUSWq2yy+TUCFuKK9i3fW9h1IA9P qsteoVZKw8xcZGU0RSCfoqYh3Xlva78Zt6+vtuB1RuY+2PNKImbQkFgTTiUdYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aa3b5d79b2acc508cca63c24251d65f4d2d76fa5 commit aa3b5d79b2acc508cca63c24251d65f4d2d76fa5 Author: Andrew Turner AuthorDate: 2021-10-18 09:04:06 +0000 Commit: Andrew Turner CommitDate: 2021-12-14 10:58:01 +0000 Pass the ACPI ID when reading the ACPI domain The ACPI ID may not be the same as the FreeBSD CPU id. Use the former when finding the CPU domain as there is no requirement for it to be identical to the latter. Reported by: dch, kevans Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32546 (cherry picked from commit 4fb002805e0dc0d08825bce65a0f4e533c53ec54) --- sys/arm64/arm64/mp_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index 67542bbb9e4a..cfd5da3118c1 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -570,7 +570,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) domain = 0; #ifdef NUMA if (vm_ndomains > 1) - domain = acpi_pxm_get_cpu_locality(*cpuid); + domain = acpi_pxm_get_cpu_locality(intr->Uid); #endif if (start_cpu(id, intr->ArmMpidr, domain)) { MPASS(cpuid_to_pcpu[id] != NULL);