From patchwork Wed May 17 10:06:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9730649 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 EFF1160138 for ; Wed, 17 May 2017 10:11:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C32A205AF for ; Wed, 17 May 2017 10:11:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90D842872D; Wed, 17 May 2017 10:11:32 +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 413EE205AF for ; Wed, 17 May 2017 10:11:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753945AbdEQKLV (ORCPT ); Wed, 17 May 2017 06:11:21 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35750 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753607AbdEQKLR (ORCPT ); Wed, 17 May 2017 06:11:17 -0400 Received: by mail-pg0-f66.google.com with SMTP id i63so1267279pgd.2; Wed, 17 May 2017 03:11:16 -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=tP+xkUrI9pOm6F1rT+qIForTP0xSSFOcv+r0IOmvCnk=; b=dyLaMyWnAc9FpwCy0KimUn4x2/jV/+K9mjU6guujNTJcyVjHi2HgrLFwQcGfPNt4cV xh3YUTJ0EXUx2nRa2lph0wyXjRj2Xygt6IHIEJ7IBM/RApbKpIhLbBH4XM7mTrv4BETH VVG+vS4rVT8lz06PJo5wKl66KvaBwA/8FKrRdKRvZjmqZvARKK0ynLKKpC1KCvtKhXkg wg+LPlMiq5DO0lQkgVDqN+ObzrsxC2a9MM9pZoqetW8+WaIMN1g37kAcMxYwZv+XZdql YhnQpbzupSN1OrljXnzxEF2MOcU+ehDyR67vA1s3K8qE1kmtsCAs1x/BAkM/O79NUmUN dQAQ== 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=tP+xkUrI9pOm6F1rT+qIForTP0xSSFOcv+r0IOmvCnk=; b=mKWiYOXSGvzxiC3gLkxWmQaPnBsKuBwSdjnet1wG8PRksCEG9w16uPUoUfMtmyKaDY yasS/Jqsu2kShHgRtdYkuWQSsfmzJLBk0V64kcikp98dTfzAJ0zaP9nt03suSZNxOZRJ 3Qj/MEv/nDek6A1Y2LiNuYZ6uO1+5CPR50bgAFushUzOuOnhMY8EQC3h3H30sTqfU1CM oIrtmWccI81RrA7rUqVTLp8Kz2J+kaR7zf/3+gFRwnzqntSrMkkXr5ah/vOsN/TapnB+ M5n++Zs6Rlkm2u3PPt+5c1VJhrKcXIL7nClP2cs86fAdh0VJpGKGWk+0R6Qoie9AeYHn Hg7A== X-Gm-Message-State: AODbwcA/hQzkyqBDK6mvJiDsuqbNGM3B/Ywc9WD97Lzn/6/fGL6NcQ8m Kax43hnIt+lWFw== X-Received: by 10.98.14.13 with SMTP id w13mr2871255pfi.59.1495015876280; Wed, 17 May 2017 03:11:16 -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 d3sm3610736pfg.30.2017.05.17.03.11.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 03:11:15 -0700 (PDT) From: Magnus Damm To: joro@8bytes.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, robin.murphy@arm.com, 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 , sricharan@codeaurora.org, m.szyprowski@samsung.com Date: Wed, 17 May 2017 19:06:48 +0900 Message-Id: <149501560877.21593.10455371761556148369.sendpatchset@little-apple> In-Reply-To: <149501557669.21593.1017116915706613060.sendpatchset@little-apple> References: <149501557669.21593.1017116915706613060.sendpatchset@little-apple> Subject: [PATCH v8 03/08] 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 Reviewed-by: Joerg Roedel --- Changes since V7: - Free archdata and utlbs in case of error drivers/iommu/ipmmu-vmsa.c | 64 ++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 23 deletions(-) --- 0004/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-05-17 16:37:29.080607110 +0900 @@ -649,22 +649,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", @@ -701,6 +694,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)) { @@ -718,16 +741,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 @@ -738,6 +754,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; @@ -762,16 +780,16 @@ static int ipmmu_add_device(struct devic return 0; error: - arm_iommu_release_mapping(mmu->mapping); - - kfree(dev->archdata.iommu); - kfree(utlbs); - - dev->archdata.iommu = NULL; + if (mmu) + arm_iommu_release_mapping(mmu->mapping); if (!IS_ERR_OR_NULL(group)) iommu_group_remove_device(dev); + kfree(archdata->utlbs); + kfree(archdata); + dev->archdata.iommu = NULL; + return ret; }