From nobody Thu Sep 4 16:28:52 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 4cHlKc5Zgtz66NC1; Thu, 04 Sep 2025 16:28:52 +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 4cHlKc46d1z40kH; Thu, 04 Sep 2025 16:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003332; 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=IxPCJbjrITQWLVoOTN1tDq0EfBSWECIX8/rT8365rHA=; b=nYHYwCt6dirgTjZOaYG2nRpPJ6WPLsp4FXy1KvBF0aM/uQYfj1NE2jNBcAZ0jOszruwYbZ JVm8Ld2VZ8KRCYmFJfAR4zrcnpZywU1vEENSJ0YhP3My3BROAArE4tuvYal8gR3Y8BHwAm uFAz+auZ0VmhTcZlPWEof8hvsdhabCDqKiAdIxW+cJFMKYA5YqS1dDezuo37TNcOZI1Pzk wNBIDDpSCd/rMK5EQWZe5Hou3FD7/3GGZz1aBNPKtcjqVxxkpYlCZkZBq5q15T6vL5yMI1 KLeiApsF/evYTbp+QwySy9VIDjxqYD80tfH9nMVpkT3XEWdhDijn5WgL2adVag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757003332; 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=IxPCJbjrITQWLVoOTN1tDq0EfBSWECIX8/rT8365rHA=; b=OJW1W53bfH88SilaY9MZcW0/HUIev6U45c0FdAsU6foCsDu6vUGGek/JePpm2x9XxMEvtE VZMOy8QhBPx0bihij85SZ0umMmauckbNqJqfQ7Hl12annroeal/3zrNc6dufSLMTHWmv91 QrWOcSJPZCX7za1W2zxT2fS3/qhpePB8ZqlI+YONR1k258xYsr5lzocZNoHeXLOrEu3mZN OW0pj74uXOso4y/0nx4xpwne1RM6lR1JsblYEYfRSFAuCwcFwYt/UeSgxdUwVVL5rksQDo jXUFEjpFla90O48tMKNm3kwb3bSmVW9LHR2woSTCARjBjFpY8gguqf2OQE+tIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757003332; a=rsa-sha256; cv=none; b=PLap6TzCk/unlDu+e2gal9f9kXiWQ2QQKVgFZ6V0QY6WFB5oRNws1n2R2aoKuBxvA5S63k utFT8HcSvBmUeUdlBuiws2+DGv+IWaiVrY41MfA6fQiueLW9Dzp9FmOreHWRrCKCIVhTaZ ZaKTfYVDW1nOxyCulVLuktLHJ7t8EQSQ9xMvKk86gybwXpG6VYczicaX8NUa4piqWgCafC zURJhs4Nqk9LCkBCodzfDYhR8kjwzqoU3nXdHqiisC31dewh0BMMY/ViY2fdNpGkcW8Tvr /hQ2lS9jkWhKojPPWwExOMIHHkoHcF/8QUGtzcaIfcuAuVLR90kOqxh0/IJUBg== 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 4cHlKc3W3Nz197F; Thu, 04 Sep 2025 16:28:52 +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 584GSqJV033209; Thu, 4 Sep 2025 16:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584GSque033206; Thu, 4 Sep 2025 16:28:52 GMT (envelope-from git) Date: Thu, 4 Sep 2025 16:28:52 GMT Message-Id: <202509041628.584GSque033206@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: efb1c4bac122 - main - arm64: Update the Neoverse-N1 1542419 errata check 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: efb1c4bac122e7acb6aa4e180db66e14cfd19810 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=efb1c4bac122e7acb6aa4e180db66e14cfd19810 commit efb1c4bac122e7acb6aa4e180db66e14cfd19810 Author: Andrew Turner AuthorDate: 2025-09-04 14:58:54 +0000 Commit: Andrew Turner CommitDate: 2025-09-04 14:58:54 +0000 arm64: Update the Neoverse-N1 1542419 errata check Use the new midr_check_var_part_range function to check if running on an affected Neoverse-N1 CPU. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52189 --- sys/arm64/arm64/identcpu.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index f271891f423d..a001be200518 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2272,25 +2272,13 @@ static const struct mrs_user_reg user_regs[] = { static bool user_ctr_has_neoverse_n1_1542419(uint32_t midr, uint64_t ctr) { - /* Skip non-Neoverse-N1 */ - if (!CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, CPU_IMPL_ARM, - CPU_PART_NEOVERSE_N1, 0, 0)) - return (false); - - switch (CPU_VAR(midr)) { - default: - break; - case 4: - /* Fixed in r4p1 */ - if (CPU_REV(midr) > 0) - break; - /* FALLTHROUGH */ - case 3: - /* If DIC is enabled (coherent icache) then we are affected */ - return (CTR_DIC_VAL(ctr) != 0); - } - - return (false); + /* + * Neoverse-N1 erratum 1542419 + * Present in r3p0 - r4p0 + * Fixed in r4p1 + */ + return (midr_check_var_part_range(midr, CPU_IMPL_ARM, + CPU_PART_NEOVERSE_N1, 3, 0, 4, 0) && CTR_DIC_VAL(ctr) != 0); } static cpu_feat_en