Patch "iommu/arm-smmu: Fix broken ATOS check" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

iommu/arm-smmu: Fix broken ATOS check

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iommu-arm-smmu-fix-broken-atos-check.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Will Deacon <[email protected]>
Date: Mon, 29 Jun 2015 17:47:42 +0100
Subject: iommu/arm-smmu: Fix broken ATOS check

From: Will Deacon <[email protected]>

commit d38f0ff9ab35414644995bae187d015c31aae19c upstream.

Commit 83a60ed8f0b5 ("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.

---
 drivers/iommu/arm-smmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -1533,7 +1533,7 @@ static int arm_smmu_device_cfg_probe(str
 		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");
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/iommu-arm-smmu-fix-broken-atos-check.patch