From: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: will.deacon-5wv7dgnIgG8@public.gmane.org, Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org, Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org, stuart.yoder-3arQi8VN3Tc@public.gmane.org, tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org, anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org, thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org Subject: [PATCH 06/12] iommu/arm-smmu: Streamline SMMU data lookup Date: Mon, 29 Feb 2016 13:46:15 +0000 [thread overview] Message-ID: <dea9c65414a1134bbe74dee79a055bf2222d8adc.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> Simplify things by stashing our SMMU instance data in drvdata, so that we don't need to go off hunting for it in the driver model callbacks. Watch out, arm_smmu_devices list, your days are numbered! Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> --- drivers/iommu/arm-smmu.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 2409e3b..514ae2d 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1836,6 +1836,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) } } + platform_set_drvdata(pdev, smmu); INIT_LIST_HEAD(&smmu->list); spin_lock(&arm_smmu_devices_lock); list_add(&smmu->list, &arm_smmu_devices); @@ -1860,24 +1861,17 @@ out_put_masters: static int arm_smmu_device_remove(struct platform_device *pdev) { + struct arm_smmu_device *smmu = platform_get_drvdata(pdev); int i; - struct device *dev = &pdev->dev; - struct arm_smmu_device *curr, *smmu = NULL; struct rb_node *node; - spin_lock(&arm_smmu_devices_lock); - list_for_each_entry(curr, &arm_smmu_devices, list) { - if (curr->dev == dev) { - smmu = curr; - list_del(&smmu->list); - break; - } - } - spin_unlock(&arm_smmu_devices_lock); - if (!smmu) return -ENODEV; + spin_lock(&arm_smmu_devices_lock); + list_del(&smmu->list); + spin_unlock(&arm_smmu_devices_lock); + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { struct arm_smmu_master *master = container_of(node, struct arm_smmu_master, node); @@ -1885,7 +1879,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev) } if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS)) - dev_err(dev, "removing device with active domains!\n"); + dev_err(&pdev->dev, "removing device with active domains!\n"); for (i = 0; i < smmu->num_global_irqs; ++i) free_irq(smmu->irqs[i], smmu); -- 2.7.2.333.g70bd996.dirty -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: robin.murphy@arm.com (Robin Murphy) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/12] iommu/arm-smmu: Streamline SMMU data lookup Date: Mon, 29 Feb 2016 13:46:15 +0000 [thread overview] Message-ID: <dea9c65414a1134bbe74dee79a055bf2222d8adc.1456514380.git.robin.murphy@arm.com> (raw) In-Reply-To: <cover.1456514380.git.robin.murphy@arm.com> Simplify things by stashing our SMMU instance data in drvdata, so that we don't need to go off hunting for it in the driver model callbacks. Watch out, arm_smmu_devices list, your days are numbered! Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/iommu/arm-smmu.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 2409e3b..514ae2d 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1836,6 +1836,7 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) } } + platform_set_drvdata(pdev, smmu); INIT_LIST_HEAD(&smmu->list); spin_lock(&arm_smmu_devices_lock); list_add(&smmu->list, &arm_smmu_devices); @@ -1860,24 +1861,17 @@ out_put_masters: static int arm_smmu_device_remove(struct platform_device *pdev) { + struct arm_smmu_device *smmu = platform_get_drvdata(pdev); int i; - struct device *dev = &pdev->dev; - struct arm_smmu_device *curr, *smmu = NULL; struct rb_node *node; - spin_lock(&arm_smmu_devices_lock); - list_for_each_entry(curr, &arm_smmu_devices, list) { - if (curr->dev == dev) { - smmu = curr; - list_del(&smmu->list); - break; - } - } - spin_unlock(&arm_smmu_devices_lock); - if (!smmu) return -ENODEV; + spin_lock(&arm_smmu_devices_lock); + list_del(&smmu->list); + spin_unlock(&arm_smmu_devices_lock); + for (node = rb_first(&smmu->masters); node; node = rb_next(node)) { struct arm_smmu_master *master = container_of(node, struct arm_smmu_master, node); @@ -1885,7 +1879,7 @@ static int arm_smmu_device_remove(struct platform_device *pdev) } if (!bitmap_empty(smmu->context_map, ARM_SMMU_MAX_CBS)) - dev_err(dev, "removing device with active domains!\n"); + dev_err(&pdev->dev, "removing device with active domains!\n"); for (i = 0; i < smmu->num_global_irqs; ++i) free_irq(smmu->irqs[i], smmu); -- 2.7.2.333.g70bd996.dirty
next prev parent reply other threads:[~2016-02-29 13:46 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-29 13:46 [PATCH 00/12] Generic DT bindings for PCI and ARM SMMU Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <cover.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 13:46 ` [PATCH 01/12] Docs: dt: add PCI IOMMU map bindings Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <5bcbc7c0c8825cb0a2ac216bac0ab99722a84618.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:27 ` Rob Herring 2016-03-03 22:27 ` Rob Herring 2016-02-29 13:46 ` [PATCH 02/12] of/irq: Break out msi-map lookup (again) Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 03/12] iommu/of: Handle iommu-map property for PCI Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 04/12] arm64/dma-mapping: Extend DMA ops workaround to PCI devices Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <ffcca878210c916962c562d3d1341aae93d593d0.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 16:47 ` Catalin Marinas 2016-02-29 13:46 ` [PATCH 05/12] arm64/dma-mapping: Remove default domain workaround Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <698ecf1450da8b56a8f297b83815d2fe866ca0e1.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 16:51 ` Catalin Marinas 2016-02-29 13:46 ` Robin Murphy [this message] 2016-02-29 13:46 ` [PATCH 06/12] iommu/arm-smmu: Streamline SMMU data lookup Robin Murphy 2016-02-29 13:46 ` [PATCH 07/12] iommu/arm-smmu: Factor out mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 08/12] iommu/arm-smmu: Refactor master/group config handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 09/12] iommu/arm-smmu: Simplify mmu-masters handling Robin Murphy 2016-02-29 13:46 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 10/12] Docs: dt: document ARM SMMU generic binding usage Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <af1ce6d7d69e340ac839c69b475728f7aa50ff23.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-03-03 22:29 ` Rob Herring 2016-03-03 22:29 ` Rob Herring 2016-02-29 13:46 ` [PATCH 11/12] iommu/arm-smmu: Generic IOMMU DT bindings support Robin Murphy 2016-02-29 13:46 ` Robin Murphy [not found] ` <a3edd4225fe8b39440fb9b6a70a70883d3cb103b.1456514380.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2016-02-29 18:09 ` Sricharan 2016-02-29 18:09 ` Sricharan 2016-03-02 13:30 ` Robin Murphy 2016-03-02 13:30 ` Robin Murphy 2016-02-29 13:46 ` [PATCH 12/12] iommu/arm-smmu: Group platform devices appropriately Robin Murphy 2016-02-29 13:46 ` Robin Murphy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dea9c65414a1134bbe74dee79a055bf2222d8adc.1456514380.git.robin.murphy@arm.com \ --to=robin.murphy-5wv7dgnigg8@public.gmane.org \ --cc=Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org \ --cc=Thomas.Lendacky-5C7GfCeVMHo@public.gmane.org \ --cc=anup.patel-dY08KVG/lbpWk0Htik3J/w@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=stuart.yoder-3arQi8VN3Tc@public.gmane.org \ --cc=tchalamarla-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org \ --cc=thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.