From patchwork Tue Sep 20 13:44:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9341731 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 A23F260B16 for ; Tue, 20 Sep 2016 13:54:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E76229720 for ; Tue, 20 Sep 2016 13:54:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8330529791; Tue, 20 Sep 2016 13:54:57 +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 00B97296FA for ; Tue, 20 Sep 2016 13:54:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332AbcITNxB (ORCPT ); Tue, 20 Sep 2016 09:53:01 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:36662 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755137AbcITNw6 (ORCPT ); Tue, 20 Sep 2016 09:52:58 -0400 Received: by mail-pa0-f67.google.com with SMTP id my20so963296pab.3; Tue, 20 Sep 2016 06:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=6IEyylUavuA3Aruin1u23NS8hPryFEoDqf7E314gPYc=; b=pAZKZQ0GDeawaHQsmIRUprqe4jx7NDBCuFfAvbz11MhjO+/mky4fiJhCWzYE/gKKFE TAvKSIjIuEaEhwBmUWen/sfUjgs1l/B/MhYSPl78DugU8mPTFPlxjvgog5keItZj5tbr Nmztb2QhlE1Ikru3vFsBjCNhFY7CgK+MLrbX1sqqFK7ii4HjHxM7SevIDYCPA/9LS+01 1N23euIO1sr6kMNBYzRoD6kMKw5+a7N4WmsAjxFFXt10TkHzUFNVMjHp2eQ9RXBRacdJ PEA2xYhv3wW84B5i0dXulxONJl05sxaa0ydNGwrf670XAd3oYIJkmSk/TeBZmkpAwWeW iVbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:date:message-id:in-reply-to :references:subject; bh=6IEyylUavuA3Aruin1u23NS8hPryFEoDqf7E314gPYc=; b=OxKGXPo2U9Q0I/+jbenUtco+J2M0fFKBnRGLlmoURQSaS/UBD2feb0GW92JJTh4x1r xYhTEoTp5XWI/96VkIoYA0tKjdmjqTxQZjYUZei8Y5JzboFVy3M7m82cqjOu1fXYUHMy 0Cx/pIYn5LzpVm5gFdIT+Vp49nghqm8MPE3TbviD67f9Yr7esjVsE3Yzch4HYhddtQz2 M8LBjCdpHP70eBIOaoIJGk15rlAxI4vIjYMZU4Jpnr8K11KYkQbbsvLg0OeSTMQACbp5 YvZrR7xvHo44mOh2qj8APD65Cx/zAwSJAzsFIrGTxgNfEVNEF4GdaedMGX7my9zPNuzq I2qg== X-Gm-Message-State: AE9vXwOX265LKpCD8Hq011NmKgfqxEvfo6js9nvQIMBHrzfx+kCLsVAMaOL8f/d8E7Z2+g== X-Received: by 10.67.7.34 with SMTP id cz2mr41218598pad.173.1474379578021; Tue, 20 Sep 2016 06:52:58 -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 b64sm79614989pfa.82.2016.09.20.06.52.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 06:52:57 -0700 (PDT) From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, joro@8bytes.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm , robin.murphy@arm.com, m.szyprowski@samsung.com Date: Tue, 20 Sep 2016 22:44:26 +0900 Message-Id: <20160920134426.25470.39272.sendpatchset@little-apple> In-Reply-To: <20160920134355.25470.93701.sendpatchset@little-apple> References: <20160920134355.25470.93701.sendpatchset@little-apple> Subject: [PATCH v5 03/07] iommu/ipmmu-vmsa: Break out utlb parsing code 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 Break out the utlb parsing code and dev_data allocation into a separate function. This is preparation for future code sharing. Signed-off-by: Magnus Damm --- Changes since V4: - Dropped hunk with fix to apply on top of: b1e2afc iommu/ipmmu-vmsa: Fix wrong error handle of ipmmu_add_device Changes since V3: - Initialize "mmu" to NULL, check before accessing - Removed group parameter from ipmmu_init_platform_device() Changes since V2: - Included this new patch from the following series: [PATCH 00/04] iommu/ipmmu-vmsa: IPMMU CONFIG_IOMMU_DMA update - Reworked code to fit on top on previous two patches in current series. drivers/iommu/ipmmu-vmsa.c | 58 ++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 21 deletions(-) --- 0006/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-09-20 21:49:34.580607110 +0900 @@ -647,22 +647,15 @@ static int ipmmu_find_utlbs(struct ipmmu return 0; } -static int ipmmu_add_device(struct device *dev) +static int ipmmu_init_platform_device(struct device *dev) { struct ipmmu_vmsa_archdata *archdata; struct ipmmu_vmsa_device *mmu; - struct iommu_group *group = NULL; unsigned int *utlbs; unsigned int i; int num_utlbs; int ret = -ENODEV; - if (dev->archdata.iommu) { - dev_warn(dev, "IOMMU driver already assigned to device %s\n", - dev_name(dev)); - return -EINVAL; - } - /* Find the master corresponding to the device. */ num_utlbs = of_count_phandle_with_args(dev->of_node, "iommus", @@ -699,6 +692,36 @@ static int ipmmu_add_device(struct devic } } + archdata = kzalloc(sizeof(*archdata), GFP_KERNEL); + if (!archdata) { + ret = -ENOMEM; + goto error; + } + + archdata->mmu = mmu; + archdata->utlbs = utlbs; + archdata->num_utlbs = num_utlbs; + dev->archdata.iommu = archdata; + return 0; + +error: + kfree(utlbs); + return ret; +} + +static int ipmmu_add_device(struct device *dev) +{ + struct ipmmu_vmsa_archdata *archdata; + struct ipmmu_vmsa_device *mmu = NULL; + struct iommu_group *group; + int ret; + + if (dev->archdata.iommu) { + dev_warn(dev, "IOMMU driver already assigned to device %s\n", + dev_name(dev)); + return -EINVAL; + } + /* Create a device group and add the device to it. */ group = iommu_group_alloc(); if (IS_ERR(group)) { @@ -716,16 +739,9 @@ static int ipmmu_add_device(struct devic goto error; } - archdata = kzalloc(sizeof(*archdata), GFP_KERNEL); - if (!archdata) { - ret = -ENOMEM; + ret = ipmmu_init_platform_device(dev); + if (ret < 0) goto error; - } - - archdata->mmu = mmu; - archdata->utlbs = utlbs; - archdata->num_utlbs = num_utlbs; - dev->archdata.iommu = archdata; /* * Create the ARM mapping, used by the ARM DMA mapping core to allocate @@ -736,6 +752,8 @@ static int ipmmu_add_device(struct devic * - Make the mapping size configurable ? We currently use a 2GB mapping * at a 1GB offset to ensure that NULL VAs will fault. */ + archdata = dev->archdata.iommu; + mmu = archdata->mmu; if (!mmu->mapping) { struct dma_iommu_mapping *mapping; @@ -760,10 +778,8 @@ static int ipmmu_add_device(struct devic return 0; error: - arm_iommu_release_mapping(mmu->mapping); - - kfree(dev->archdata.iommu); - kfree(utlbs); + if (mmu) + arm_iommu_release_mapping(mmu->mapping); dev->archdata.iommu = NULL;