From nobody Tue Dec 14 11:07:21 2021 X-Original-To: dev-commits-src-branches@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 3C76118DD7CB; Tue, 14 Dec 2021 11:07:22 +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 4JCwZK5wjyz3Npk; Tue, 14 Dec 2021 11:07:21 +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 AA39A26D60; Tue, 14 Dec 2021 11:07:21 +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 1BEB7LGZ040226; Tue, 14 Dec 2021 11:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BEB7L3V040225; Tue, 14 Dec 2021 11:07:21 GMT (envelope-from git) Date: Tue, 14 Dec 2021 11:07:21 GMT Message-Id: <202112141107.1BEB7L3V040225@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: b7c23efd7428 - stable/13 - Stop reading the arm64 domain when it's known List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: b7c23efd7428256f69ccfd65a9c5e9f50585bf66 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639480041; 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=U+0bI7mi978y/ZoK/2L2+CDljVR2MghdeKp5ypjRP6o=; b=Q0iMXzdY0EnfTqN5BKobqFce2qO3dUynxsbbv0wDlLD+h5z39Lt/kVTWHvXshoduwiTwMO slxoNaSItGxvXA/qiBL+d5urwzvckeXct5QypiFPBN1859Jofvt085rsdObhPNbKVl3aGJ xnC3sm1kpYta2Yeqyn+EdUUOBaIrGlBd0xBTwh5QdS/Xze9XEjbS7wR/KZkEdP9+ITMNLi 4P32qqQci7FpJoG+DKdJ8K7RBJJTsAR+qkSGdVXSGwofq79U0VRt6MDvve2++3+xg2FSun d2sWWWSm9zpGF+yi6EOT9ZlFnbHh6ONqrg5glWbSFFsoACEMvXttziIkjyAsyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639480041; a=rsa-sha256; cv=none; b=iL9n9VlXk2nTihVrcYH/KNoAxHFveCuVf9ho7SHaB1+0bRbElQXueOdgf+q86iUisCaKjX mLIQNi5heIUtD9SObJ8SIw5LQmusPvxHyaxxQX6IQ4ekCEGOSKqNeq8kMLh/0eq/m6QmVR nRKV8GYbWsHFi/A/aMCgw9hEEsalU9oPtFjElnQuylJ2gNauUXZ8KnRpna+0FBZIVYiAD5 tOYUanXhChiHCD8naBWFLzjzLq7xwUBzvkhVHOi5UhyXGVNawsYJkUO+MrmnzIDllb3iMD 8sAH2+EJoZ1/kYv7zMuglUV7dXt0QVjPx4n2wFZt4nbcHedtHiw+bZ0kIVho4Q== 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=b7c23efd7428256f69ccfd65a9c5e9f50585bf66 commit b7c23efd7428256f69ccfd65a9c5e9f50585bf66 Author: Andrew Turner AuthorDate: 2021-10-12 11:39:14 +0000 Commit: Andrew Turner 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);