Commit d38f0ff9 authored Jun 29, 2015 by Will Deacon Committed by Joerg Roedel Jun 29, 2015

iommu/arm-smmu: Fix broken ATOS check



Commit 83a60ed8 ("iommu/arm-smmu: fix ARM_SMMU_FEAT_TRANS_OPS
condition") accidentally negated the ID0_ATOSNS predicate in the ATOS
feature check, causing the driver to attempt ATOS requests on SMMUv2
hardware without the ATOS feature implemented.

This patch restores the predicate to the correct value.

Cc: <stable@vger.kernel.org> # 4.0+
Reported-by: Varun Sethi <varun.sethi@freescale.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 38667f18

drivers/iommu/arm-smmu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1566,7 +1566,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
		return -ENODEV;
		}

		if ((id & ID0_S1TS) && ((smmu->version == 1) \|\| (id & ID0_ATOSNS))) {
		if ((id & ID0_S1TS) && ((smmu->version == 1) \|\| !(id & ID0_ATOSNS))) {
		smmu->features \|= ARM_SMMU_FEAT_TRANS_OPS;
		dev_notice(smmu->dev, "\taddress translation ops\n");
		}

Admin message