From patchwork Tue Jan 16 13:25:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 10166941 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DC50601E7 for ; Tue, 16 Jan 2018 13:29:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FF062853E for ; Tue, 16 Jan 2018 13:29:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 247DC28543; Tue, 16 Jan 2018 13:29:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B71D628541 for ; Tue, 16 Jan 2018 13:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=AnMDNL7MZh4PY6myGC0PiryxnHTtFuZncheoubj5K9g=; b=oivJhjj25oh5KWphvWp0VJmywI fymRY+5KyzT9k9H8SecC6soT60LLwJ0b92AHR9/oDdpbjFW1xa4pU/x3R60T1FjCno+O32B+CWDW1 x+P+0bbR3SY5r4KcOIHes5N5RNNhWuuOIoP4fUF1q8eiXSBLdYGuhFrcBFmoI+atq946O9Py9qPpv g6Awip8PVzVCTibmtlcxXhJ8uZO9jgGsEJhGxSpOCo81xtUFuxOHcu5HyZbtknw/vr295E6riqMB0 8ZVhGw70vYydK7o5RKtyMgNYy0lvH6Jl3c7aKZxnvuv/iq+E9pJyOY8Go8Q19eyD3GoUULyr+PI8T U32RE1gg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ebRIT-0006fe-Bu; Tue, 16 Jan 2018 13:29:01 +0000 Received: from regular1.263xmail.com ([211.150.99.131]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebRGi-0004H1-TT; Tue, 16 Jan 2018 13:28:01 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.11]) by regular1.263xmail.com (Postfix) with ESMTP id EB4C06227; Tue, 16 Jan 2018 21:26:57 +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 4CCAA383; Tue, 16 Jan 2018 21:26:55 +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: 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 5543HJNFVY; Tue, 16 Jan 2018 21:26:59 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Subject: [PATCH v2 09/13] iommu/rockchip: Use iommu_group_get_for_dev() for add_device Date: Tue, 16 Jan 2018 21:25:36 +0800 Message-Id: <20180116132540.18939-10-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180116132540.18939-1-jeffy.chen@rock-chips.com> References: <20180116132540.18939-1-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180116_052713_730107_5B4EAF43 X-CRM114-Status: GOOD ( 13.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xxm@rock-chips.com, Joerg Roedel , Jeffy Chen , tfiga@chromium.org, jcliang@chromium.org, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, Heiko Stuebner MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP IOMMU drivers are supposed to call this function instead of manually creating a group in their .add_device callback. This behavior is not strictly required by ARM DMA mapping implementation, but ARM64 already relies on it. This patch fixes the rockchip-iommu driver to comply with this requirement. Signed-off-by: Tomasz Figa Signed-off-by: Jeffy Chen --- Changes in v2: None drivers/iommu/rockchip-iommu.c | 120 +++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 57 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index a7442d59ca43..ea4df162108b 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -888,6 +888,39 @@ static struct rk_iommu *rk_iommu_from_dev(struct device *dev) return rk_iommu; } +static void rk_iommu_detach_device(struct iommu_domain *domain, + struct device *dev) +{ + struct rk_iommu *iommu; + struct rk_iommu_domain *rk_domain = to_rk_domain(domain); + unsigned long flags; + int i; + + /* Allow 'virtual devices' (eg drm) to detach from domain */ + iommu = rk_iommu_from_dev(dev); + if (!iommu) + return; + + spin_lock_irqsave(&rk_domain->iommus_lock, flags); + list_del_init(&iommu->node); + spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); + + /* Ignore error while disabling, just keep going */ + WARN_ON(rk_iommu_enable_clocks(iommu)); + rk_iommu_enable_stall(iommu); + rk_iommu_disable_paging(iommu); + for (i = 0; i < iommu->num_mmu; i++) { + rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0); + rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, 0); + } + rk_iommu_disable_stall(iommu); + rk_iommu_disable_clocks(iommu); + + iommu->domain = NULL; + + dev_dbg(dev, "Detached from iommu domain\n"); +} + static int rk_iommu_attach_device(struct iommu_domain *domain, struct device *dev) { @@ -904,6 +937,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, if (!iommu) return 0; + if (iommu->domain) + rk_iommu_detach_device(iommu->domain, dev); + ret = rk_iommu_enable_clocks(iommu); if (ret) return ret; @@ -948,39 +984,6 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, return ret; } -static void rk_iommu_detach_device(struct iommu_domain *domain, - struct device *dev) -{ - struct rk_iommu *iommu; - struct rk_iommu_domain *rk_domain = to_rk_domain(domain); - unsigned long flags; - int i; - - /* Allow 'virtual devices' (eg drm) to detach from domain */ - iommu = rk_iommu_from_dev(dev); - if (!iommu) - return; - - spin_lock_irqsave(&rk_domain->iommus_lock, flags); - list_del_init(&iommu->node); - spin_unlock_irqrestore(&rk_domain->iommus_lock, flags); - - /* Ignore error while disabling, just keep going */ - WARN_ON(rk_iommu_enable_clocks(iommu)); - rk_iommu_enable_stall(iommu); - rk_iommu_disable_paging(iommu); - for (i = 0; i < iommu->num_mmu; i++) { - rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, 0); - rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, 0); - } - rk_iommu_disable_stall(iommu); - rk_iommu_disable_clocks(iommu); - - iommu->domain = NULL; - - dev_dbg(dev, "Detached from iommu domain\n"); -} - static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) { struct rk_iommu_domain *rk_domain; @@ -1131,41 +1134,20 @@ static int rk_iommu_add_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; + group = iommu_group_get_for_dev(dev); + if (IS_ERR(group)) + return PTR_ERR(group); iommu = rk_iommu_from_dev(dev); if (iommu) iommu_device_link(&iommu->iommu, dev); iommu_group_put(group); - return 0; - -err_remove_device: - iommu_group_remove_device(dev); -err_put_group: - iommu_group_put(group); - return ret; } static void rk_iommu_remove_device(struct device *dev) @@ -1182,6 +1164,29 @@ static void rk_iommu_remove_device(struct device *dev) iommu_group_remove_device(dev); } +static struct iommu_group *rk_iommu_device_group(struct device *dev) +{ + struct iommu_group *group; + int ret; + + group = iommu_group_get(dev); + if (!group) { + group = iommu_group_alloc(); + if (IS_ERR(group)) + return group; + } + + ret = rk_iommu_group_set_iommudata(group, dev); + if (ret) + goto err_put_group; + + return group; + +err_put_group: + iommu_group_put(group); + return ERR_PTR(ret); +} + static const struct iommu_ops rk_iommu_ops = { .domain_alloc = rk_iommu_domain_alloc, .domain_free = rk_iommu_domain_free, @@ -1193,6 +1198,7 @@ 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 = rk_iommu_device_group, .pgsize_bitmap = RK_IOMMU_PGSIZE_BITMAP, };