Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754625AbbFWMHr (ORCPT ); Tue, 23 Jun 2015 08:07:47 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:36180 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753844AbbFWMHj (ORCPT ); Tue, 23 Jun 2015 08:07:39 -0400 From: Sricharan R To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, will.deacon@arm.com, b.reynal@virtualopensystems.com, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: sricharan@codeaurora.org Subject: [PATCH] iommu/arm-smmu: Fix bug in ARM_SMMU_FEAT_TRANS_OPS condition check Date: Tue, 23 Jun 2015 17:37:26 +0530 Message-Id: <1435061246-14690-1-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.8.2.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1244 Lines: 31 Patch 'fix ARM_SMMU_FEAT_TRANS_OPS condition' changed the check for ARM_SMMU_FEAT_TRANS_OPS to be based on presence of stage1 check, but used (id & ID0_ATOSNS) instead of !(id & ID0_ATOSNS). Fix it here. Signed-off-by: Sricharan R --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 09091e9..fbf4af6 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1866,7 +1866,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"); } -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/