From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759101AbbCDSc5 (ORCPT ); Wed, 4 Mar 2015 13:32:57 -0500 Received: from foss.arm.com ([217.140.101.70]:54441 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756099AbbCDScz (ORCPT ); Wed, 4 Mar 2015 13:32:55 -0500 Date: Wed, 4 Mar 2015 18:32:58 +0000 From: Will Deacon To: Baptiste Reynal Cc: "iommu@lists.linux-foundation.org" , "kvmarm@lists.cs.columbia.edu" , "tech@virtualopensystems.com" , Joerg Roedel , "moderated list:ARM SMMU DRIVER" , open list Subject: Re: [PATCH v2 1/1] iommu/arm-smmu: fix ARM_SMMU_FEAT_TRANS_OPS condition Message-ID: <20150304183258.GN17250@arm.com> References: <1425484266-5449-1-git-send-email-b.reynal@virtualopensystems.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1425484266-5449-1-git-send-email-b.reynal@virtualopensystems.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 04, 2015 at 03:51:06PM +0000, Baptiste Reynal wrote: > This patch is a fix to "iommu/arm-smmu: add support for iova_to_phys > through ATS1PR". > According to ARM documentation, translation registers are optional even > in SMMUv1, so ID0_S1TS needs to be checked to verify their presence. > Also, we check that the domain is a stage-1 domain. > > Signed-off-by: Baptiste Reynal > > --- > v1 -> v2: > Add domain stage test (Thanks to Will Deacon) > > --- > drivers/iommu/arm-smmu.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index fc13dd5..a3adde6 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -1288,10 +1288,13 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain, > return 0; > > spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags); > - if (smmu_domain->smmu->features & ARM_SMMU_FEAT_TRANS_OPS) > + if (smmu_domain->smmu->features & ARM_SMMU_FEAT_TRANS_OPS && > + smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { > ret = arm_smmu_iova_to_phys_hard(domain, iova); > - else > + } else { > ret = ops->iova_to_phys(ops, iova); > + } > + > spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags); > > return ret; > @@ -1556,7 +1559,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) > return -ENODEV; > } > > - if (smmu->version == 1 || (!(id & ID0_ATOSNS) && (id & ID0_S1TS))) { > + 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"); Acked-by: Will Deacon Sorry Joerg, but this is the latest in the drip of ARM SMMU fixes for 4.0! Please pick it up with the rest. Will