diff options
| author | Will Deacon <will.deacon@arm.com> | 2015-06-29 17:47:42 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-06-29 21:57:32 +0200 |
| commit | d38f0ff9ab35414644995bae187d015c31aae19c (patch) | |
| tree | eb7d666fac0246c3be7dd2e48ca0fe6ae6d13db0 /drivers/iommu | |
| parent | 38667f18900afe172a4fe44279b132b4140f920f (diff) | |
| download | op-kernel-dev-d38f0ff9ab35414644995bae187d015c31aae19c.zip op-kernel-dev-d38f0ff9ab35414644995bae187d015c31aae19c.tar.gz | |
iommu/arm-smmu: Fix broken ATOS check
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.
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>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index dce041b..4cd0c29 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -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"); } |
