Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751675AbcCVSib (ORCPT ); Tue, 22 Mar 2016 14:38:31 -0400 Received: from mail.kernel.org ([198.145.29.136]:51390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750856AbcCVSi3 (ORCPT ); Tue, 22 Mar 2016 14:38:29 -0400 MIME-Version: 1.0 In-Reply-To: <1458669509-7178-7-git-send-email-joro@8bytes.org> References: <1458669509-7178-1-git-send-email-joro@8bytes.org> <1458669509-7178-7-git-send-email-joro@8bytes.org> From: Rob Herring Date: Tue, 22 Mar 2016 13:38:06 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 6/6] iommu/arm-smmu: Make use of phandle iterators in device-tree parsing To: Joerg Roedel Cc: Grant Likely , Will Deacon , "linux-arm-kernel@lists.infradead.org" , "devicetree@vger.kernel.org" , Linux IOMMU , "linux-kernel@vger.kernel.org" , Joerg Roedel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2212 Lines: 60 On Tue, Mar 22, 2016 at 12:58 PM, Joerg Roedel wrote: > From: Joerg Roedel > > Remove the usage of of_parse_phandle_with_args() and replace > it by the phandle-iterator implementation so that we can > parse out all of the potentially present 128 stream-ids. > > Signed-off-by: Joerg Roedel > --- > drivers/iommu/arm-smmu.c | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 59ee4b8..413bd64 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -48,7 +48,7 @@ > #include "io-pgtable.h" > > /* Maximum number of stream IDs assigned to a single device */ > -#define MAX_MASTER_STREAMIDS MAX_PHANDLE_ARGS > +#define MAX_MASTER_STREAMIDS 128 > > /* Maximum number of context banks per SMMU */ > #define ARM_SMMU_MAX_CBS 128 > @@ -349,6 +349,12 @@ struct arm_smmu_domain { > struct iommu_domain domain; > }; > > +struct arm_smmu_phandle_args { > + struct device_node *np; > + int args_count; > + uint32_t args[MAX_MASTER_STREAMIDS]; > +}; > + > static struct iommu_ops arm_smmu_ops; > > static DEFINE_SPINLOCK(arm_smmu_devices_lock); > @@ -458,7 +464,7 @@ static int insert_smmu_master(struct arm_smmu_device *smmu, > > static int register_smmu_master(struct arm_smmu_device *smmu, > struct device *dev, > - struct of_phandle_args *masterspec) > + struct arm_smmu_phandle_args *masterspec) > { > int i; > struct arm_smmu_master *master; > @@ -1716,7 +1722,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) > struct arm_smmu_device *smmu; > struct device *dev = &pdev->dev; > struct rb_node *node; > - struct of_phandle_args masterspec; > + struct of_phandle_iterator it; > + struct arm_smmu_phandle_args masterspec; Isn't this a bit big to put on the stack being ~512 bytes? > int num_irqs, i, err; > > smmu = devm_kzalloc(dev, sizeof(*smmu), GFP_KERNEL);