From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755776AbaHEKvY (ORCPT ); Tue, 5 Aug 2014 06:51:24 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:44632 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755051AbaHEKtK (ORCPT ); Tue, 5 Aug 2014 06:49:10 -0400 X-AuditID: cbfec7f4-b7f156d0000063c7-e1-53e0b6a47c17 From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Marek Szyprowski , linaro-mm-sig@lists.linaro.org, Arnd Bergmann , Shaik Ameer Basha , Cho KyongHo , Joerg Roedel , Thierry Reding , Olof Johansson , Laurent Pinchart , Rob Herring , Greg Kroah-Hartman , "Rafael J. Wysocki" , Inki Dae , Kukjin Kim , Sylwester Nawrocki , Tomasz Figa , Kyungmin Park Subject: [PATCH 23/29] iommu: exynos: init iommu controllers from device tree Date: Tue, 05 Aug 2014 12:47:51 +0200 Message-id: <1407235677-26324-24-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1407235677-26324-1-git-send-email-m.szyprowski@samsung.com> References: <1407235677-26324-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsVy+t/xq7pLtj0INtg2x8bi76Rj7BbNi9ez WUy6P4HFYsF+a4vO2RvYLXoXXGWzONv0ht2ic+ISdosvVx4yWWx6fI3V4vKuOWwWM87vY7JY e+Quu8Wp65/ZLP71HmS0OHP6EqvF/z072C0Ov2lntTjycDe7xapdfxgtbv/mcxD1eHJwHpPH 71+TGD12zrrL7jG7Yyarx6ZVnWwe++euYffYvKTe4/a/x8wek28sZ/S4cqKJ1aO3+R2bx5ar 7SwefVtWMXp83iQXwBfFZZOSmpNZllqkb5fAlbHz0XSmgnUaFVennGVqYDys0MXIySEhYCKx Zu9NJghbTOLCvfVsXYxcHEICSxklDr7dCJYQEuhjkpjyMQPEZhMwlOh62wVWJCLQyyjR3/SD CcRhFljHKrG/9zoLSJWwgK/E3wO7wGwWAVWJvu5tbCA2r4CnxIXn76DWyUn8f7kCzOYEih++ eYAVYpuHxM8Na9gnMPIuYGRYxSiaWppcUJyUnmuoV5yYW1yal66XnJ+7iRESOV92MC4+ZnWI UYCDUYmH1+D03WAh1sSy4srcQ4wSHMxKIrwSax4EC/GmJFZWpRblxxeV5qQWH2Jk4uCUamBc XXLlw8E/vsJ7ln9O7r2/VfhHmVOigWB/uP/ltX+ur1t4r7q4RcE3fIeVek+L0Yybl4JDW2aW 8Zb/yhTzemlUIdq/Xa0gQ5XHcHZRF5uj75yX1xluvfn8Ka3P/yvztAUvFvIYec7+W13P/lK9 IWj5/kv68U9Swne3NjVVvHLlKOG47sqwz0uJpTgj0VCLuag4EQAY0Q5YegIAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds code to initialize and assign SYSMMU controllers to their master devices defined in device tree. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 152 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 145 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 46e0edc..845f547 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -211,6 +212,9 @@ struct sysmmu_drvdata { struct list_head owner_node; phys_addr_t pgtable; int version; + const char *name; + dma_addr_t base; + size_t size; }; static bool set_sysmmu_active(struct sysmmu_drvdata *data) @@ -574,6 +578,11 @@ static int __init exynos_sysmmu_probe(struct platform_device *pdev) } data->sysmmu = dev; + + /* default io address space parameters */ + data->base = SZ_1G; + data->size = SZ_2G; + spin_lock_init(&data->lock); platform_set_drvdata(pdev, data); @@ -1055,30 +1064,159 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *domain, return phys; } +static void __free_owner_struct(struct exynos_iommu_owner *owner, + struct device *dev) +{ + while (!list_empty(&owner->clients)) + list_del_init(owner->clients.next); + + kfree(owner); + dev->archdata.iommu = NULL; +} + +static int __init_master_sysmmu(struct device *dev) +{ + struct of_phandle_args sysmmu_spec; + struct exynos_iommu_owner *owner; + int i = 0; + int ret; + + owner = kzalloc(sizeof(*owner), GFP_KERNEL); + if (!owner) + return -ENOMEM; + INIT_LIST_HEAD(&owner->clients); + + while (!of_parse_phandle_with_args(dev->of_node, "iommus", + "#iommu-cells", i, + &sysmmu_spec)) { + struct platform_device *sysmmu; + struct sysmmu_drvdata *data; + + sysmmu = of_find_device_by_node(sysmmu_spec.np); + if (!sysmmu) { + dev_err(dev, "sysmmu node not found\n"); + ret = -ENODEV; + goto err; + } + data = platform_get_drvdata(sysmmu); + if (!data) { + ret = -ENODEV; + goto err; + } + + of_property_read_string_index(dev->of_node, "iommu-names", i, + &data->name); + + if (sysmmu_spec.args_count == 2) { + data->base = sysmmu_spec.args[0]; + data->size = sysmmu_spec.args[1]; + } else if (sysmmu_spec.args_count != 0) { + dev_err(dev, "incorrect iommu property specified\n"); + ret = -EINVAL; + goto err; + } + + list_add_tail(&data->owner_node, &owner->clients); + + i++; + } + + if (i == 0) { + ret = -ENODEV; + goto err; + } + + dev->archdata.iommu = owner; + dev_dbg(dev, "registered %d sysmmu controllers\n", i); + + return 0; +err: + __free_owner_struct(owner, dev); + return ret; +} + +static int __init_subdevice_sysmmu(struct device *dev) +{ + struct device *parent = dev->parent; + struct exynos_iommu_owner *owner; + struct sysmmu_drvdata *data; + char *name; + + name = strrchr(dev_name(dev), ':'); + if (!name) + return -ENODEV; + name++; + + owner = parent->archdata.iommu; + if (!owner) + return -ENODEV; + + list_for_each_entry(data, &owner->clients, owner_node) + if (strcmp(name, data->name) == 0) + break; + if (!data) + return -ENODEV; + + owner = kzalloc(sizeof(*owner), GFP_KERNEL); + if (!owner) + return -ENOMEM; + INIT_LIST_HEAD(&owner->clients); + + /* move sysmmu from parent to child device */ + list_del(&data->owner_node); + list_add_tail(&data->owner_node, &owner->clients); + + dev->archdata.iommu = owner; + dev_dbg(dev->parent, + "registered sysmmu controller for %s subdevice\n", data->name); + + return 0; +} + static int exynos_iommu_add_device(struct device *dev) { struct iommu_group *group; int ret; - group = iommu_group_get(dev); + BUG_ON(dev->archdata.iommu != NULL); - if (!group) { - group = iommu_group_alloc(); - if (IS_ERR(group)) { - dev_err(dev, "Failed to allocate IOMMU group\n"); - return PTR_ERR(group); - } + if (of_get_property(dev->of_node, "iommus", NULL)) + ret = __init_master_sysmmu(dev); + else if (dev->parent && + of_get_property(dev->parent->of_node, "iommus", NULL)) + ret = __init_subdevice_sysmmu(dev); + else + return -ENODEV; + + if (ret) + return ret; + + group = iommu_group_alloc(); + if (IS_ERR(group)) { + dev_err(dev, "Failed to allocate IOMMU group\n"); + ret = PTR_ERR(group); + goto err; } ret = iommu_group_add_device(group, dev); + if (ret != 0) + goto err; + iommu_group_put(group); + return 0; +err: + __free_owner_struct(dev->archdata.iommu, dev); return ret; } static void exynos_iommu_remove_device(struct device *dev) { + struct exynos_iommu_owner *owner = dev->archdata.iommu; + iommu_group_remove_device(dev); + if (owner) + __free_owner_struct(owner, dev); } static const struct iommu_ops exynos_iommu_ops = { -- 1.9.2