From nobody Tue Sep 22 14:29:08 2026 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 4hq2Xh5tscz6sHGV for ; Tue, 22 Sep 2026 14:29:08 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hq2Xh5C7Gz4cnt for ; Tue, 22 Sep 2026 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790087348; 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=r+pIFYtZhxZVPOvQ/RXlrwue9aKaPQrVsBheDhiYQG8=; b=czrbhGQrgcDF/C+03fBSNUNvneKPCgNmuKt6PBRmH0078Bwbm5x2itrFpuNzW/OAOWd184 PddV3etA860kLOq+07GVCDmYqchdKv7SAhenIJgZeubLrlAZdK0WPKYLRWWcKDTiA3QpS4 SynM+0wwTmbyAeVq/6iPlKG8R6zRz4cy1vO7IwgiL2lfCYTwp87pGULkBTRtje4n5EveHQ /IUiNf/bJMbYALY40WVj3/gM1oM6MKT0mqD7Gk4YM8Pa4p/0bFgRI41GUmH5chB3JLt3Sq ofVgSN/34SMvdF2fqRNmO0r8z5i0T/7FqWDmgrg8m0YeIrVY/ecLzPfixhcpjg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790087348; b=iunV0fPtV1Xy4kYe5h2x6tpIgqoFaSPpsOAHsWZSwn0jpBWg5xrN/DNrJTen8MyVOTHMEr 0nkYIETCr8b81lPD/zx7WwbfftNwn7VXDGkTMh9kbAzjgDPKLdn1Zm2W5qYNUXLbjTbOo5 uEgqmiNMGHK/xdcEZ/FpBYt/hESALlOIDdkphIMclLUuxw7GZUtAAxIAXhkKqmpGsoRVyy mYo8scavNcfWsoW+9ajkPnlABt6RK1sYtsjCimZJTATS/6hb4ZfcnWHTFqpPJ4JXzwxCZR 9gTdt3JGou6x17LU+zk4msXu13QjaYD/DfoNZ+8IPVcRkQ7Z6qq6zDzz4hDI6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790087348; 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=r+pIFYtZhxZVPOvQ/RXlrwue9aKaPQrVsBheDhiYQG8=; b=r8pH9/swBljSwdZOIsrosfBIXtt+U5VtGGeKb0Dmk1H+wmJLi0J6fMFubeM1SSA4CNdXv1 r6qKiCNomILEP8aD6sC/sL2ZgByOyGi3yqTtnGv6YTYKH8+dV8l4+Zm6p9fg6D8Thv6RCG PmMdbYJqcC3d8dTHCh6bCtaJ8s0XHw5trt26XtLSGkgXgKregCh0YqnNWbUpRDXHHHdJpz XwqAAbdzxHJA/vjecp64yLndgBYWF5+cicCWcC+wL1e4cegc7SfQ689Yy9GTbLh7yfIHF8 8vrZUB8lxa8ZXgfDBYc6I5V/Zo28dD8fkAyvs+GaCQEEPXmgRI9m0bj83ENOSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hq2Xh4GQSz19FH for ; Tue, 22 Sep 2026 14:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 248cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 14:29:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a856958cab80 - main - arm64/smmu: Fix the SMMU-600 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: a856958cab807699eada3e1ed2c46262a94a0aeb Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 14:29:08 +0000 Message-Id: <6ab290b4.248cb.5be16abc@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a856958cab807699eada3e1ed2c46262a94a0aeb commit a856958cab807699eada3e1ed2c46262a94a0aeb Author: Andrew Turner AuthorDate: 2026-09-22 14:11:23 +0000 Commit: Andrew Turner CommitDate: 2026-09-18 19:54:16 +0000 arm64/smmu: Fix the SMMU-600 errata check Fixes: 6dca6e2aa89d ("arm64/smmu: Start handling errata") Sponsored by: Arm Ltd --- sys/arm64/iommu/smmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 2b95d2f5fb3c..310f772f9b75 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1563,12 +1563,14 @@ smmu_check_errata(struct smmu_softc *sc) reg = bus_read_4(sc->res[0], SMMU_IIDR); variant = SMMU_Variant_GET(reg); - switch(SMMU_ProductID_GET(reg)) { + switch(SMMU_Implementer_GET(reg)) { case SMMU_Implementer_ARM: switch (SMMU_ProductID_GET(reg)) { - /* Arm erratum 1076982 */ - if (variant < 1) - sc->features &= ~SMMU_FEATURE_SEV; + case SMMU_ProductID_ARM_MMU_600: + /* Arm erratum 1076982 */ + if (variant < 1) + sc->features &= ~SMMU_FEATURE_SEV; + break; default: break; }