Received: by 10.213.65.68 with SMTP id h4csp130491imn; Fri, 23 Mar 2018 00:43:09 -0700 (PDT) X-Google-Smtp-Source: AG47ELtwSFLVSik4NNyI7/zgLkR7QuGUsissEH+2Qge8zhIcuwbptDdeoTumsAYgn8Vixjk+BQgZ X-Received: by 2002:a17:902:76c5:: with SMTP id j5-v6mr19911298plt.166.1521790989002; Fri, 23 Mar 2018 00:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521790988; cv=none; d=google.com; s=arc-20160816; b=X/8jXGtXcLDs5asPHwo/KYI7QYyBrxhHFbbXMcOrWjHDK6J4vAwJdvu1ioZGdWUejT VLJcblWe7EW30Ei3KmbtFiGLT7f3J7iD681GVq2RXBbQ3muKb82pvqslQEKcrPs0ft9o mDoENRFohI3HGiHb1XEyBlhi1VWkqJR4ORlSd7xNLIyjdEzX+CLT2jZYG5fXlm045cX1 zpV79ZdiVEa1hBAU02HcmTFwyFQuIhPvcSZdqwJkLcdiaWAiisc+HKTLrcI66YmCXfQi 7d43YG2P3gNpirK/fGjqFp1IgcQycmgHIdfZuvoG8c44eKaX0ZWumNzsh4XrWjavJmQm cKKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=FEbmE66ffyQfdbktLjTt4Jt0oj8A3ymdb3/1WftzM9g=; b=MVDQ9Hj5A8+PLcEPsQIAbONg2pcMnFahLk4K7wl2D6c6zKXbsbWVCk0dnnUQVGzD+p 3V70FxFx+yT3M+7ksxcjMXQ++dIjzySnHKTOckHYcbn5NQy4xKMJgRsgIfx70RvXQgWw GuJJNTQPi/3gwSdtFfoFXspmUILxjFuPyVrXnQ2FoasgPGC3hOSjEIe8bwg/Ktx7YZ9H mQetw62Rxh5spCSnv3JV6OxlRyEZQAgVa4NbgvvfiGqHP30zXgQpGzzf9jfmW5wc3Yau R+/Wfm8AVRCT2I/bsy/cfZakilTxxbla1/zqXT7E9x0FW14xBUwoIIpIkCpx3UmJXcM3 7rxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n6-v6si6516110pla.26.2018.03.23.00.42.54; Fri, 23 Mar 2018 00:43:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbeCWHkq (ORCPT + 99 others); Fri, 23 Mar 2018 03:40:46 -0400 Received: from regular1.263xmail.com ([211.150.99.132]:58708 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751699AbeCWHkp (ORCPT ); Fri, 23 Mar 2018 03:40:45 -0400 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.12]) by regular1.263xmail.com (Postfix) with ESMTP id 1B7A29444; Fri, 23 Mar 2018 15:40:39 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id EAC083DD; Fri, 23 Mar 2018 15:40:29 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <7d803a580c3024b47326608bba03cb2d> X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 12198FJ4UJ5; Fri, 23 Mar 2018 15:40:36 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.com, tfiga@chromium.org, Jeffy Chen , Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 11/14] iommu/rockchip: Use OF_IOMMU to attach devices automatically Date: Fri, 23 Mar 2018 15:38:11 +0800 Message-Id: <20180323073814.5802-12-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180323073814.5802-1-jeffy.chen@rock-chips.com> References: <20180323073814.5802-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Converts the rockchip-iommu driver to use the OF_IOMMU infrastructure, which allows attaching master devices to their IOMMUs automatically according to DT properties. Signed-off-by: Jeffy Chen Reviewed-by: Robin Murphy --- Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: Add struct rk_iommudata. Squash iommu/rockchip: Use iommu_group_get_for_dev() for add_device Changes in v2: None drivers/iommu/rockchip-iommu.c | 135 ++++++++++++----------------------------- 1 file changed, 40 insertions(+), 95 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 7970d21b9858..bd8580b897e9 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -104,6 +105,10 @@ struct rk_iommu { struct iommu_domain *domain; /* domain to which iommu is attached */ }; +struct rk_iommudata { + struct rk_iommu *iommu; +}; + static struct device *dma_dev; static inline void rk_table_flush(struct rk_iommu_domain *dom, dma_addr_t dma, @@ -807,18 +812,9 @@ static size_t rk_iommu_unmap(struct iommu_domain *domain, unsigned long _iova, static struct rk_iommu *rk_iommu_from_dev(struct device *dev) { - struct iommu_group *group; - struct device *iommu_dev; - struct rk_iommu *rk_iommu; + struct rk_iommudata *data = dev->archdata.iommu; - group = iommu_group_get(dev); - if (!group) - return NULL; - iommu_dev = iommu_group_get_iommudata(group); - rk_iommu = dev_get_drvdata(iommu_dev); - iommu_group_put(group); - - return rk_iommu; + return data ? data->iommu : NULL; } static int rk_iommu_attach_device(struct iommu_domain *domain, @@ -989,110 +985,53 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) iommu_put_dma_cookie(&rk_domain->domain); } -static bool rk_iommu_is_dev_iommu_master(struct device *dev) -{ - struct device_node *np = dev->of_node; - int ret; - - /* - * An iommu master has an iommus property containing a list of phandles - * to iommu nodes, each with an #iommu-cells property with value 0. - */ - ret = of_count_phandle_with_args(np, "iommus", "#iommu-cells"); - return (ret > 0); -} - -static int rk_iommu_group_set_iommudata(struct iommu_group *group, - struct device *dev) +static int rk_iommu_add_device(struct device *dev) { - struct device_node *np = dev->of_node; - struct platform_device *pd; - int ret; - struct of_phandle_args args; + struct iommu_group *group; + struct rk_iommu *iommu; - /* - * An iommu master has an iommus property containing a list of phandles - * to iommu nodes, each with an #iommu-cells property with value 0. - */ - ret = of_parse_phandle_with_args(np, "iommus", "#iommu-cells", 0, - &args); - if (ret) { - dev_err(dev, "of_parse_phandle_with_args(%pOF) => %d\n", - np, ret); - return ret; - } - if (args.args_count != 0) { - dev_err(dev, "incorrect number of iommu params found for %pOF (found %d, expected 0)\n", - args.np, args.args_count); - return -EINVAL; - } + iommu = rk_iommu_from_dev(dev); + if (!iommu) + return -ENODEV; - pd = of_find_device_by_node(args.np); - of_node_put(args.np); - if (!pd) { - dev_err(dev, "iommu %pOF not found\n", args.np); - return -EPROBE_DEFER; - } + group = iommu_group_get_for_dev(dev); + if (IS_ERR(group)) + return PTR_ERR(group); + iommu_group_put(group); - /* TODO(djkurtz): handle multiple slave iommus for a single master */ - iommu_group_set_iommudata(group, &pd->dev, NULL); + iommu_device_link(&iommu->iommu, dev); return 0; } -static int rk_iommu_add_device(struct device *dev) +static void rk_iommu_remove_device(struct device *dev) { - struct iommu_group *group; struct rk_iommu *iommu; - int ret; - - if (!rk_iommu_is_dev_iommu_master(dev)) - return -ENODEV; - - group = iommu_group_get(dev); - if (!group) { - group = iommu_group_alloc(); - if (IS_ERR(group)) { - dev_err(dev, "Failed to allocate IOMMU group\n"); - return PTR_ERR(group); - } - } - - ret = iommu_group_add_device(group, dev); - if (ret) - goto err_put_group; - - ret = rk_iommu_group_set_iommudata(group, dev); - if (ret) - goto err_remove_device; iommu = rk_iommu_from_dev(dev); - if (iommu) - iommu_device_link(&iommu->iommu, dev); - iommu_group_put(group); - - return 0; - -err_remove_device: + iommu_device_unlink(&iommu->iommu, dev); iommu_group_remove_device(dev); -err_put_group: - iommu_group_put(group); - return ret; } -static void rk_iommu_remove_device(struct device *dev) +static int rk_iommu_of_xlate(struct device *dev, + struct of_phandle_args *args) { - struct rk_iommu *iommu; + struct platform_device *iommu_dev; + struct rk_iommudata *data; - if (!rk_iommu_is_dev_iommu_master(dev)) - return; + data = devm_kzalloc(dma_dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; - iommu = rk_iommu_from_dev(dev); - if (iommu) - iommu_device_unlink(&iommu->iommu, dev); + iommu_dev = of_find_device_by_node(args->np); - iommu_group_remove_device(dev); + data->iommu = platform_get_drvdata(iommu_dev); + dev->archdata.iommu = data; + + of_dev_put(iommu_dev); + + return 0; } static const struct iommu_ops rk_iommu_ops = { @@ -1106,7 +1045,9 @@ static const struct iommu_ops rk_iommu_ops = { .add_device = rk_iommu_add_device, .remove_device = rk_iommu_remove_device, .iova_to_phys = rk_iommu_iova_to_phys, + .device_group = generic_device_group, .pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP, + .of_xlate = rk_iommu_of_xlate, }; static int rk_iommu_probe(struct platform_device *pdev) @@ -1178,6 +1119,8 @@ static int rk_iommu_probe(struct platform_device *pdev) goto err_unprepare_clocks; iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops); + iommu_device_set_fwnode(&iommu->iommu, &dev->of_node->fwnode); + err = iommu_device_register(&iommu->iommu); if (err) goto err_remove_sysfs; @@ -1250,6 +1193,8 @@ static int __init rk_iommu_init(void) } subsys_initcall(rk_iommu_init); +IOMMU_OF_DECLARE(rk_iommu_of, "rockchip,iommu"); + MODULE_DESCRIPTION("IOMMU API for Rockchip"); MODULE_AUTHOR("Simon Xue and Daniel Kurtz "); MODULE_ALIAS("platform:rockchip-iommu"); -- 2.11.0