From patchwork Tue Feb 16 14:56:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 62039 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1711974lbl; Tue, 16 Feb 2016 06:57:51 -0800 (PST) X-Received: by 10.66.147.164 with SMTP id tl4mr30739711pab.40.1455634670094; Tue, 16 Feb 2016 06:57:50 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 70si51706761pfk.205.2016.02.16.06.57.49; Tue, 16 Feb 2016 06:57:50 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-samsung-soc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932224AbcBPO5s (ORCPT + 4 others); Tue, 16 Feb 2016 09:57:48 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:22655 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755279AbcBPO5n (ORCPT ); Tue, 16 Feb 2016 09:57:43 -0500 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O2N00GC6AW3NZ30@mailout1.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Tue, 16 Feb 2016 14:57:39 +0000 (GMT) X-AuditID: cbfec7f4-f79026d00000418a-7e-56c338e36b50 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id D0.96.16778.3E833C65; Tue, 16 Feb 2016 14:57:39 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O2N00BHIAVXJJA0@eusync3.samsung.com>; Tue, 16 Feb 2016 14:57:39 +0000 (GMT) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Joerg Roedel , Inki Dae , Kukjin Kim , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH 01/11] iommu: exynos: rework iommu group initialization Date: Tue, 16 Feb 2016 15:56:54 +0100 Message-id: <1455634624-18130-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1455634624-18130-1-git-send-email-m.szyprowski@samsung.com> References: <1455634624-18130-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrALMWRmVeSWpSXmKPExsVy+t/xq7qPLQ6HGdx/rWuxccZ6VotJ9yew WCzYb23ROXsDu8XrF4YW/Y9fM1tsenyN1WLG+X1MFmuP3GV34PR4cnAek8emVZ1sHpuX1HtM vrGc0aNvyypGj8+b5ALYorhsUlJzMstSi/TtErgypu1/wl6wg6/ixPc5rA2MP7i7GDk5JARM JM592cgEYYtJXLi3nq2LkYtDSGApo0TjzZcsEE4Tk8SZ2+tZQKrYBAwlut52sYHYIgL5Ei/2 /gUrYhb4xShxrrMdbJSwgLtEV8MJMJtFQFVi7+rDYDavgIfEsuV9zBDr5CT+v1wBFOfg4BTw lLj5OQ4kLARUcnTXBJYJjLwLGBlWMYqmliYXFCel5xrqFSfmFpfmpesl5+duYoSE25cdjIuP WR1iFOBgVOLh5fA4FCbEmlhWXJl7iFGCg1lJhPffK6AQb0piZVVqUX58UWlOavEhRmkOFiVx 3rm73ocICaQnlqRmp6YWpBbBZJk4OKUaGH0uVIsq/GzjdWe6Z/rtxY0lTfHuey8tr0+v+sRg Ib7s3NKY5gQXtQW9SamWXFqfXoqVMVy/+jFnCu+/6grJXcyhy+4nC11Lf7Y0+eenW6fmztwq 9tiXs18gpuzeV+Yt4ftO+f2u03ZpLbWQdHU3cwx21JkQlM2kvbEqfNZqZU91idSz5+8yKbEU ZyQaajEXFScCADbaoKMzAgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch replaces custom code in add_device implementation with iommu_group_get_for_dev() call and provides the needed callback. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 97c41b8..4fc0790 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -1114,28 +1114,32 @@ static phys_addr_t exynos_iommu_iova_to_phys(struct iommu_domain *iommu_domain, return phys; } +static struct iommu_group *get_device_iommu_group(struct device *dev) +{ + struct iommu_group *group; + + group = iommu_group_get(dev); + if (!group) + group = iommu_group_alloc(); + + return group; +} + static int exynos_iommu_add_device(struct device *dev) { struct iommu_group *group; - int ret; if (!has_sysmmu(dev)) return -ENODEV; - group = iommu_group_get(dev); + group = iommu_group_get_for_dev(dev); - if (!group) { - group = iommu_group_alloc(); - if (IS_ERR(group)) { - dev_err(dev, "Failed to allocate IOMMU group\n"); - return PTR_ERR(group); - } - } + if (IS_ERR(group)) + return PTR_ERR(group); - ret = iommu_group_add_device(group, dev); iommu_group_put(group); - return ret; + return 0; } static void exynos_iommu_remove_device(struct device *dev) @@ -1182,6 +1186,7 @@ static struct iommu_ops exynos_iommu_ops = { .unmap = exynos_iommu_unmap, .map_sg = default_iommu_map_sg, .iova_to_phys = exynos_iommu_iova_to_phys, + .device_group = get_device_iommu_group, .add_device = exynos_iommu_add_device, .remove_device = exynos_iommu_remove_device, .pgsize_bitmap = SECT_SIZE | LPAGE_SIZE | SPAGE_SIZE,