From patchwork Mon Jul 17 13:05:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9844939 X-Patchwork-Delegate: geert@linux-m68k.org 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 6F6FA6037F for ; Mon, 17 Jul 2017 13:09:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6246926E4A for ; Mon, 17 Jul 2017 13:09:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DB4628505; Mon, 17 Jul 2017 13:09:53 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EECB726E4A for ; Mon, 17 Jul 2017 13:09:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751303AbdGQNIo (ORCPT ); Mon, 17 Jul 2017 09:08:44 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33892 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751280AbdGQNIn (ORCPT ); Mon, 17 Jul 2017 09:08:43 -0400 Received: by mail-pg0-f66.google.com with SMTP id v190so5690997pgv.1; Mon, 17 Jul 2017 06:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=JG2DWv/VaPEViA51go7uyb6kIHhM26qAacJqqQ1bdBk=; b=i6wR86OxlsdiDgWyyZ5nBsPw8k+1fPtW5omnrN0vvl6oNHzB2xWU0Bi+oGKdf65YMs XUoR6Pwug4PR0DZCdAbrnlFC81Myk/FFVq72GoluJSvYAfvXwEYt0q/tYRJqx4Tx93zB PN3MSl4V4gZErntY5ND1rm0JdUeQLgPue+EvTe97+JRRsYB3450oy7R6+huBIsVhrs80 J6GCqiWTMu7I6yeSFBWBcE4f0FyUdjslPZ6NAAoyloedvct9tNDrG4m10ena5ydXbi5U 0xu7oJOPSJqY8BU5kiT2+RDyxWhqxDOzOnchQN2SsyXYrl4Qo6lIfsXQ6k8iFjGmjfy7 L4jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=JG2DWv/VaPEViA51go7uyb6kIHhM26qAacJqqQ1bdBk=; b=kdmDrPzugSxbxbWxJTYEc65hia6nUmCJJm+LdMxbtOd/0W5Xs16KVHQMJ5URwkfdi5 5wREGxa0NSso5w60LfYWTNg379uynPH2Y4RLGcPtPRBut9vIe5SthxsAIGW6GBoV1gqH OU5dUaDgOSLRiGSn+2f34K2Vtbb5Y5q+YHP3uoKZQFkEYkINxRZtbB3cf9jWP0A9lbjk jXnm6tFBVO/Il4zXLYHhr6cU6hPk3EeUMpfhBp6j6CSHZAuvcH6nORYzTJlG1P24VQay ncbWRpTnwvzg0CaX95uVDzKZCLZq/8WWp32B+xCDySKtKwUjQTslNHPK8gE8zxRvzx5I NLlA== X-Gm-Message-State: AIVw110k+ubBd45TLyMVL+pDyvq7g1QzKUxIT2HNGjhofXSBpgFSQwFQ IPHT9ctdpRQyHg== X-Received: by 10.99.121.204 with SMTP id u195mr28266361pgc.16.1500296922670; Mon, 17 Jul 2017 06:08:42 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id t11sm35148753pfi.66.2017.07.17.06.08.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 06:08:41 -0700 (PDT) From: Magnus Damm To: joro@8bytes.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, sricharan@codeaurora.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, iommu@lists.linux-foundation.org, horms+renesas@verge.net.au, Magnus Damm , robin.murphy@arm.com, m.szyprowski@samsung.com Date: Mon, 17 Jul 2017 22:05:20 +0900 Message-Id: <150029672099.22030.9705035062184016120.sendpatchset@little-apple> In-Reply-To: <150029669967.22030.8059216113725566341.sendpatchset@little-apple> References: <150029669967.22030.8059216113725566341.sendpatchset@little-apple> Subject: [PATCH v2 02/05] iommu/ipmmu-vmsa: Consistent ->of_xlate() handling Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm The 32-bit ARM code gets updated to make use of ->of_xlate() and the code is shared between 64-bit and 32-bit ARM. The of_device_is_available() check gets dropped since it is included in of_iommu_xlate(). Suggested-by: Robin Murphy Signed-off-by: Magnus Damm --- Changes since V1: - Moved "Initialize once" check to ipmmu_of_xlate() - thanks Geert! drivers/iommu/ipmmu-vmsa.c | 51 ++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 34 deletions(-) --- 0002/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-07-17 21:03:38.340607110 +0900 @@ -734,6 +734,16 @@ error: return ret; } +static int ipmmu_of_xlate(struct device *dev, + struct of_phandle_args *spec) +{ + /* Initialize once - xlate() will call multiple times */ + if (to_priv(dev)) + return 0; + + return ipmmu_init_platform_device(dev); +} + #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) static struct iommu_domain *ipmmu_domain_alloc(unsigned type) @@ -750,11 +760,11 @@ static int ipmmu_add_device(struct devic struct iommu_group *group; int ret; - if (to_priv(dev)) { - dev_warn(dev, "IOMMU driver already assigned to device %s\n", - dev_name(dev)); - return -EINVAL; - } + /* + * Only let through devices that have been verified in xlate() + */ + if (!to_priv(dev)) + return -ENODEV; /* Create a device group and add the device to it. */ group = iommu_group_alloc(); @@ -773,10 +783,6 @@ static int ipmmu_add_device(struct devic goto error; } - ret = ipmmu_init_platform_device(dev); - if (ret < 0) - goto error; - /* * Create the ARM mapping, used by the ARM DMA mapping core to allocate * VAs. This will allocate a corresponding IOMMU domain. @@ -817,24 +823,13 @@ error: if (!IS_ERR_OR_NULL(group)) iommu_group_remove_device(dev); - kfree(to_priv(dev)->utlbs); - kfree(to_priv(dev)); - set_priv(dev, NULL); - return ret; } static void ipmmu_remove_device(struct device *dev) { - struct ipmmu_vmsa_iommu_priv *priv = to_priv(dev); - arm_iommu_detach_device(dev); iommu_group_remove_device(dev); - - kfree(priv->utlbs); - kfree(priv); - - set_priv(dev, NULL); } static const struct iommu_ops ipmmu_ops = { @@ -849,6 +844,7 @@ static const struct iommu_ops ipmmu_ops .add_device = ipmmu_add_device, .remove_device = ipmmu_remove_device, .pgsize_bitmap = SZ_1G | SZ_2M | SZ_4K, + .of_xlate = ipmmu_of_xlate, }; #endif /* !CONFIG_ARM && CONFIG_IOMMU_DMA */ @@ -958,19 +954,6 @@ static struct iommu_group *ipmmu_find_gr return group; } -static int ipmmu_of_xlate_dma(struct device *dev, - struct of_phandle_args *spec) -{ - /* If the IPMMU device is disabled in DT then return error - * to make sure the of_iommu code does not install ops - * even though the iommu device is disabled - */ - if (!of_device_is_available(spec->np)) - return -ENODEV; - - return ipmmu_init_platform_device(dev); -} - static const struct iommu_ops ipmmu_ops = { .domain_alloc = ipmmu_domain_alloc_dma, .domain_free = ipmmu_domain_free_dma, @@ -984,7 +967,7 @@ static const struct iommu_ops ipmmu_ops .remove_device = ipmmu_remove_device_dma, .device_group = ipmmu_find_group_dma, .pgsize_bitmap = SZ_1G | SZ_2M | SZ_4K, - .of_xlate = ipmmu_of_xlate_dma, + .of_xlate = ipmmu_of_xlate, }; #endif /* CONFIG_IOMMU_DMA */