RE: [PATCH 3/5] iommu/msm: Add support for generic master bindings
From: Sricharan <hidden>
Date: 2015-08-13 08:09:15
Also in:
linux-arm-kernel, linux-arm-msm, linux-iommu
Hi Stephen,
-----Original Message----- From: Stephen Boyd [mailto:sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org] Sent: Thursday, August 13, 2015 12:42 AM To: Sricharan R Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org;
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org;
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; robin.murphy-5wv7dgnIgG8@public.gmane.org; robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org; joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org; srinivas.kandagatla-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org; laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org; Will.Deacon-5wv7dgnIgG8@public.gmane.org; stepanm-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org; treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org Subject: Re: [PATCH 3/5] iommu/msm: Add support for generic master bindings On 08/12/2015 07:47 AM, Sricharan R wrote:quoted
@@ -702,6 +703,44 @@ static void print_ctx_regs(void __iomem *base,int ctx)quoted
GET_PRRR(base, ctx), GET_NMRR(base, ctx)); } +static void insert_iommu_master(struct device *dev, + struct msm_iommu_dev *iommu, + struct of_phandle_args *spec) +{ + struct msm_iommu_ctx_dev *master; + int sid; + + master = kzalloc(sizeof(*master), GFP_KERNEL);This is called with irqs disabled, but it's not GFP_ATOMIC. Please test
with
DEBUG_ATOMIC_SLEEP=y.
Ok. I will have to adjust the locking here. It should be granular only
for the list manipulation.quoted
+ master->of_node = dev->of_node; + list_add(&master->list, &iommu->ctx_list); + + for (sid = 0; sid < spec->args_count; sid++) + master->mids[sid] = spec->args[sid]; + + master->num_mids = spec->args_count; } + +static int qcom_iommu_of_xlate(struct device *dev, + struct of_phandle_args *spec) { + struct msm_iommu_dev *iommu; + unsigned long flags; + + spin_lock_irqsave(&msm_iommu_lock, flags); + list_for_each_entry(iommu, &qcom_iommu_devices, dev_node) { + if (iommu->dev->of_node == spec->np) + break; + }The braces are unnecessary here.
Ok, will remove this.
quoted
+ + if (!iommu || (iommu->dev->of_node != spec->np))Please remove extraneous parentheses.
Ok.
quoted
+ return -ENODEV; + + insert_iommu_master(dev, iommu, spec); + spin_unlock_irqrestore(&msm_iommu_lock, flags); + + return 0; +} + irqreturn_t msm_iommu_fault_handler(int irq, void *dev_id) { struct msm_iommu_dev *iommu = dev_id; @@ -737,7 +776,7 @@fail:quoted
return 0; } -static const struct iommu_ops msm_iommu_ops = { +static struct iommu_ops msm_iommu_ops = {Is there a reason why we can't make of_iommu_set_ops() take a const ops pointer?
Hmm right. of_iommu_set_ops is the one that needs change. I will add a separate patch to correct that. Regards, Sricharan