From nobody Mon Feb 9 01:35:46 2026 Received: from zg8tmtyylji0my4xnjqumte4.icoremail.net (zg8tmtyylji0my4xnjqumte4.icoremail.net [162.243.164.118]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CFB1339B486 for ; Thu, 5 Feb 2026 09:34:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=162.243.164.118 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770284049; cv=none; b=dNXF30tPXkWagb3s/uR3NfMRNfLAKgy10Xq0hxCt+2Bz3hsfTSbLGd1hYNeXIiPi/XuTcE2bbqj3sd69O4mQO6TE3IdmJO/9TABHy0wUQ59wyZOQHf80KNhrUCeiJhAafxzsVDVK3g63Zj3Zw9jK16XPByH2FULnV9q4Qs8mCmc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770284049; c=relaxed/simple; bh=L8+8hHtf/3VrVO55nqtF5hrOPfzu68DB6z4ykUnqtcg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=RYcPlm8DOR6UrD32bU2j10XvPQqjhNRdDaYfjYXW0DmVqhRC7Ay3jkwkTQyj3t4fJBW+AqZt5RNVWMv7vAIUT+Q/SnddhniLV3io9elYN83sL8LlYw+1lEXBiJ9IYCoddKPpRyYReskrlRA5vhBiJjCr6XxBpeWiT7qNTK/XwKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=phytium.com.cn; spf=pass smtp.mailfrom=phytium.com.cn; arc=none smtp.client-ip=162.243.164.118 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=phytium.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=phytium.com.cn Received: from prodtpl.icoremail.net (unknown [10.12.1.20]) by hzbj-icmmx-7 (Coremail) with SMTP id AQAAfwCXn2MNZIRp+RfLBg--.105S2; Thu, 05 Feb 2026 17:34:05 +0800 (CST) Received: from localhost.localdomain (unknown [219.142.137.151]) by mail (Coremail) with SMTP id AQAAfwBXse4HZIRpuDMZAA--.29205S2; Thu, 05 Feb 2026 17:34:00 +0800 (CST) From: Zhiyuan Dai To: will@kernel.org, joro@8bytes.org Cc: robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Zhiyuan Dai Subject: [PATCH] iommu/arm-smmu-v3: Restrict MMU-700 errata 2268618 and 2812531 to affected Date: Thu, 5 Feb 2026 17:33:56 +0800 Message-ID: <20260205093356.4328-1-daizhiyuan@phytium.com.cn> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: AQAAfwBXse4HZIRpuDMZAA--.29205S2 X-CM-SenderInfo: hgdl6xpl1xt0o6sk53xlxphulrpou0/ Authentication-Results: hzbj-icmmx-7; spf=neutral smtp.mail=daizhiyuan @phytium.com.cn; X-Coremail-Antispam: 1Uk129KBjvJXoW7Kw4UAr47Kry3tw43tFW5KFg_yoW8GrW8p3 Z5G3sY93s8WF1fAa9rJ3yDZw15Gas5Aa15Jay5u390gryDKry5GryxKayjgF4kCrWUXF1f AF1vq3y5CF15ArJanT9S1TB71UUUUjUqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj DUYxn0WfASr-VFAU7a7-sFnT9fnUUIcSsGvfJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJUUU UUUUU Content-Type: text/plain; charset="utf-8" According to SDEN-1786925, Arm errata 2268618 and 2812531 are present in r0p0, r0p1, and r1p0, and fixed in r1p1. Introduce this patch to avoid performance degradation caused by restricting features on unaffected revisions. Signed-off-by: Zhiyuan Dai --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/ar= m/arm-smmu-v3/arm-smmu-v3.c index d16d35c78c06..7eadb27eb9be 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -4272,11 +4272,13 @@ static void arm_smmu_device_iidr_probe(struct arm_s= mmu_device *smmu) smmu->features &=3D ~ARM_SMMU_FEAT_NESTING; break; case IIDR_PRODUCTID_ARM_MMU_700: - /* Arm erratum 2812531 */ - smmu->features &=3D ~ARM_SMMU_FEAT_BTM; - smmu->options |=3D ARM_SMMU_OPT_CMDQ_FORCE_SYNC; - /* Arm errata 2268618, 2812531 */ - smmu->features &=3D ~ARM_SMMU_FEAT_NESTING; + if (variant <=3D 1 && revision < 0) { + /* Arm erratum 2812531 */ + smmu->features &=3D ~ARM_SMMU_FEAT_BTM; + smmu->options |=3D ARM_SMMU_OPT_CMDQ_FORCE_SYNC; + /* Arm errata 2268618, 2812531 */ + smmu->features &=3D ~ARM_SMMU_FEAT_NESTING; + } break; } break; --=20 2.51.0