From patchwork Tue Mar 15 17:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8590521 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F4184C0553 for ; Tue, 15 Mar 2016 17:02:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C97E2202C8 for ; Tue, 15 Mar 2016 17:02:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AECA20304 for ; Tue, 15 Mar 2016 17:02:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934808AbcCORBe (ORCPT ); Tue, 15 Mar 2016 13:01:34 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:35208 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932591AbcCORBb (ORCPT ); Tue, 15 Mar 2016 13:01:31 -0400 Received: by mail-pf0-f178.google.com with SMTP id n5so36210259pfn.2; Tue, 15 Mar 2016 10:01:31 -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=yXveD6lovhvvp+ST8aQjrpeJhdSiN2lyBFzdsNYF7Bs=; b=OJnulevrLZH7JnJYbGM1vkdE4pKxUS89etOQzUPHKTkDRpsk1OCzho1DAfYM4fELgs dzwH200iaaQS1V7kONRmyxO8JtF7aGgJs1dTtVu06Nugh4yNHASTPoAiM8+zp/agzWvZ qCUzlxYQaCFaUjt5WZJsS8W82wl4gYTFhgW8zGHr6Pm4mT/rn0Oor2ItO+6fWCsaMg8j eMDDh6Duj+zhqDOrPAFzcPT17w5bmoOZh3lFG92x1h7eRla5ruW1rrxxoTH2iPpjFoFD G24zf+Aafd5QiKCd1gTKb/0pKBTU/+32C5ZyixR9UgAjafeM+p5OMe/79fAIYEKl1q24 tRzg== 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=yXveD6lovhvvp+ST8aQjrpeJhdSiN2lyBFzdsNYF7Bs=; b=N50J/xKLveX3rwli83er5Lvpy3HBgU7fBhRXPKQm0c+z0KUURsSdVFXa40SMSUwzQN 43itm/CbKZVPob30t5OYgPmcpETic41ofi3n2WyQAkSLrPPnpqZIf6vNvq/XSEBxkNES bhL8kyQlau3cltAWwbAYZiPpSLy4qD6C1InBdZaOlIXFmSkFoLLDJEfUMvpeXjiRqcHI B8cRntCZaRmLGLLrFtMuLhWmflU9q7SCysUdL3M1xYH8zjC09MwJqOADcGg5OQUIhYC1 Y6tI9LuAIFcyMJuu0c4vNoL5IWZ4/ND5xN1Gq8tMXTPxQUoCiT5FxDrDKcS+ukGqGObk tcIg== X-Gm-Message-State: AD7BkJICyj8FKCZ+oPLzIngo7ClzrH7RMNAPd617oROQ28mRLSYzgxThKtyMxh1eFqZ+GQ== X-Received: by 10.66.102.37 with SMTP id fl5mr48032616pab.32.1458061290700; Tue, 15 Mar 2016 10:01:30 -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 v14sm6790050pas.10.2016.03.15.10.01.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Mar 2016 10:01:29 -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: Wed, 16 Mar 2016 02:04:51 +0900 Message-Id: <20160315170451.20615.97297.sendpatchset@little-apple> In-Reply-To: <20160315170431.20615.30333.sendpatchset@little-apple> References: <20160315170431.20615.30333.sendpatchset@little-apple> Subject: [PATCH 02/04] 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-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.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 --- drivers/iommu/ipmmu-vmsa.c | 125 ++++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 55 deletions(-) --- 0008/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-03-15 21:08:20.180513000 +0900 @@ -619,6 +619,69 @@ static int ipmmu_find_utlbs(struct ipmmu return 0; } +static int ipmmu_init_platform_device(struct device *dev, + struct iommu_group *group) +{ + struct ipmmu_vmsa_archdata *archdata; + struct ipmmu_vmsa_device *mmu; + unsigned int *utlbs; + unsigned int i; + int num_utlbs; + int ret = -ENODEV; + + /* Find the master corresponding to the device. */ + + num_utlbs = of_count_phandle_with_args(dev->of_node, "iommus", + "#iommu-cells"); + if (num_utlbs < 0) + return -ENODEV; + + utlbs = kcalloc(num_utlbs, sizeof(*utlbs), GFP_KERNEL); + if (!utlbs) + return -ENOMEM; + + spin_lock(&ipmmu_devices_lock); + + list_for_each_entry(mmu, &ipmmu_devices, list) { + ret = ipmmu_find_utlbs(mmu, dev, utlbs, num_utlbs); + if (!ret) { + /* + * TODO Take a reference to the MMU to protect + * against device removal. + */ + break; + } + } + + spin_unlock(&ipmmu_devices_lock); + + if (ret < 0) + goto error; + + for (i = 0; i < num_utlbs; ++i) { + if (utlbs[i] >= mmu->num_utlbs) { + ret = -EINVAL; + goto error; + } + } + + 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; +} + #if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) static int ipmmu_map_attach(struct device *dev, struct ipmmu_vmsa_device *mmu) { @@ -675,13 +738,8 @@ static inline void ipmmu_release_mapping static int ipmmu_add_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; + struct iommu_group *group; + int ret; if (dev->archdata.iommu) { dev_warn(dev, "IOMMU driver already assigned to device %s\n", @@ -689,42 +747,6 @@ static int ipmmu_add_device(struct devic return -EINVAL; } - /* Find the master corresponding to the device. */ - - num_utlbs = of_count_phandle_with_args(dev->of_node, "iommus", - "#iommu-cells"); - if (num_utlbs < 0) - return -ENODEV; - - utlbs = kcalloc(num_utlbs, sizeof(*utlbs), GFP_KERNEL); - if (!utlbs) - return -ENOMEM; - - spin_lock(&ipmmu_devices_lock); - - list_for_each_entry(mmu, &ipmmu_devices, list) { - ret = ipmmu_find_utlbs(mmu, dev, utlbs, num_utlbs); - if (!ret) { - /* - * TODO Take a reference to the MMU to protect - * against device removal. - */ - break; - } - } - - spin_unlock(&ipmmu_devices_lock); - - if (ret < 0) - return -ENODEV; - - for (i = 0; i < num_utlbs; ++i) { - if (utlbs[i] >= mmu->num_utlbs) { - ret = -EINVAL; - goto error; - } - } - /* Create a device group and add the device to it. */ group = iommu_group_alloc(); if (IS_ERR(group)) { @@ -742,27 +764,20 @@ 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, group); + if (ret < 0) { + dev_err(dev, "Failed to init platform device\n"); goto error; } - archdata->mmu = mmu; - archdata->utlbs = utlbs; - archdata->num_utlbs = num_utlbs; - dev->archdata.iommu = archdata; - - ret = ipmmu_map_attach(dev, mmu); + ret = ipmmu_map_attach(dev, ((struct ipmmu_vmsa_archdata *) + dev->archdata.iommu)->mmu); if (ret < 0) goto error; return 0; error: - kfree(dev->archdata.iommu); - kfree(utlbs); - dev->archdata.iommu = NULL; if (!IS_ERR_OR_NULL(group))