From nobody Thu Sep 4 16:28:51 2025 X-Original-To: dev-commits-src-main@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 4cHlKb42vDz66NMv; Thu, 04 Sep 2025 16:28:51 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHlKb3DrYz40pG; Thu, 04 Sep 2025 16:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003331; 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=g6I3H5ZpNT4qni5EDTg5i7Mi6e7dMh96osQMbbQWDZ0=; b=XyRRdGrofMmWz75/g1HisQl7ACHrcpBDZSnQgcUFvPPCAPcl/O8F5RR6KQmTt3JhZj6FQh P11vu/x1f4EGWc3mHwn1DjFs/pQg5gDzFtjso6mMCctStirR1AzMaSvb2j4tQbo5hqhKhm p6u6Q76UZhfhtmiMuhW9KBrrkb8xb0Wdl8xxZbBydZD3N3XR4E2aJlbWPT6jBPH/T5NwjO ZdbQ9EdcLirIaSaGASReSiuE57ummqKAHNTxc0SxTI3FAGBMtH7mcwRV8OuddBO889ImGJ 4uyvQ2Xl+UoBqZTjgTdCw6HyNNJQjWEnRDVkM/JPDdgVXSrkfAebimcDo9GcZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003331; 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=g6I3H5ZpNT4qni5EDTg5i7Mi6e7dMh96osQMbbQWDZ0=; b=c7MdyHI4/pnpmus4fSi8R61hu/t7Kwbei017TVPjYUd1Oz9T9ZRnHHr/2KwU/7tniMZiMw b4sFsinwvHa/t9UzaSZoy+U8y4qLMoIjy5EEEyiwsoydBCBElBovRlXE/49ffjxZ/4SsH/ dDbBCwvn2t2QcMOmt77TGJ8ySitdXNr/XkSVbLRUz3/AakW8W54D7/Yq/aPNugVpNVrxbe Kxbu5o4QZmG9P9PbfNb3dJfzA6fYDy1Y0I21h2QzTpgG3P3nubD3tAyAbkOZ1dclrnZw9y A+d8BdZDvIi7obyDosMha1AWt3DZ47thKVdNGf73x4G4//6J2yiyJu1KTbW9xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757003331; a=rsa-sha256; cv=none; b=BjCWVWt6HKT+4MRcRRGEI6wys+bbNIDhyDYK0r/T0+jt9RIk3DjBFRmLlTJ96Ls0e2sHBt GvOs7g/l1RpvzSBz+Hy4IlqZkJEFbMACLbXjreOl1WwuPq6jO0TJUXAp6lW9CeWgSRfJ3C FRqqYggv1eLrKy3eRnkpWYimTyaF6ivtSEawG32lktZKIMeVXIPMR1BSXgvqhr+sX8FMzu EcAlYqR9CwaK/8TUTQ/KjzBP2UO7qEXI1IfIwPDBNr/TQY8NUuX7hnxemmmI7h7241ijQ+ awJI9+0mXzZEOwOOKkPiTigo25nKPZ9bY2ilEDl3PbuQp1ch0oyooNuc5gm9YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cHlKb2ZxCz18xY; Thu, 04 Sep 2025 16:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584GSpiP033174; Thu, 4 Sep 2025 16:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584GSpmR033171; Thu, 4 Sep 2025 16:28:51 GMT (envelope-from git) Date: Thu, 4 Sep 2025 16:28:51 GMT Message-Id: <202509041628.584GSpmR033171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1ae3694edb8b - main - arm64: Clean up HW DBM errata detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1ae3694edb8bb5f4d4831a18878677eb491861fb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1ae3694edb8bb5f4d4831a18878677eb491861fb commit 1ae3694edb8bb5f4d4831a18878677eb491861fb Author: Andrew Turner AuthorDate: 2025-09-04 14:56:04 +0000 Commit: Andrew Turner CommitDate: 2025-09-04 14:58:25 +0000 arm64: Clean up HW DBM errata detection - Use the passed in midr rather than reading from pcpu - Use the new midr_check_var_part_range function to check if the midr is within the range of affected CPUs Reviewed by: alc Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52188 --- sys/arm64/arm64/pmap.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 0ef23edbc0bf..48b62442e68f 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1674,8 +1674,8 @@ pmap_dbm_has_errata(const struct cpu_feat *feat __unused, u_int midr, u_int **errata_list, u_int *errata_count) { /* Disable on Cortex-A55 for erratum 1024718 - all revisions */ - if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, CPU_IMPL_ARM, - CPU_PART_CORTEX_A55, 0, 0)) { + if (CPU_IMPL(midr) == CPU_IMPL_ARM && + CPU_PART(midr) == CPU_PART_CORTEX_A55) { static u_int errata_id = 1024718; *errata_list = &errata_id; @@ -1684,15 +1684,13 @@ pmap_dbm_has_errata(const struct cpu_feat *feat __unused, u_int midr, } /* Disable on Cortex-A510 for erratum 2051678 - r0p0 to r0p2 */ - if (CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK | CPU_VAR_MASK, - CPU_IMPL_ARM, CPU_PART_CORTEX_A510, 0, 0)) { - if (CPU_REV(PCPU_GET(midr)) < 3) { - static u_int errata_id = 2051678; + if (midr_check_var_part_range(midr, CPU_IMPL_ARM, CPU_PART_CORTEX_A510, + 0, 0, 0, 2)) { + static u_int errata_id = 2051678; - *errata_list = &errata_id; - *errata_count = 1; - return (true); - } + *errata_list = &errata_id; + *errata_count = 1; + return (true); } return (false);