From patchwork Thu Jun 15 10:29:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9788495 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 07CA860384 for ; Thu, 15 Jun 2017 10:33:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB1DB284C5 for ; Thu, 15 Jun 2017 10:33:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DEB01284DC; Thu, 15 Jun 2017 10:33:41 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 63068284C5 for ; Thu, 15 Jun 2017 10:33:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752428AbdFOKdl (ORCPT ); Thu, 15 Jun 2017 06:33:41 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36633 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbdFOKdk (ORCPT ); Thu, 15 Jun 2017 06:33:40 -0400 Received: by mail-pf0-f196.google.com with SMTP id y7so1292794pfd.3; Thu, 15 Jun 2017 03:33:30 -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=8r9m7sLIIHdnd3kCoe+Lbypq1wkFHLwgqLkMogtAhBk=; b=fvybWDzvsdFEl76cjjPhv1LjQ5AJkYHkqhAvkbmqAfcHgGhi8uta7bmuatwhg9Y15a 4wNidFfByLgwqlroO6pYZo0wKf0W4Dp3sWWwbjrFF6+DmC3kLZKxRbniEopT2Y0u/fDZ uiF0lLtwjeUTDyRIiO92yC0gDwq1gSIuETbUecdrRYQH033bRf20ZNNtxISBHRkShDGq e7tvFp61OB/FocpRAA6NrccvGQvyLl+OqXVd5ShYaKaoGRlkIrNJUMJ9ehWiT6TVYhM6 osX4LcrBs4NQwIohZBWOmMvVyCiTJC7p0SpFu61/1g3Y+xutSFhKzueXPaNW83GcsxmR kxlw== 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=8r9m7sLIIHdnd3kCoe+Lbypq1wkFHLwgqLkMogtAhBk=; b=hbutqi049hJ0NaCpUXyZl5DLUEfj+n+UmqSIe4qPaRA+SKWDZwrM48R0twLaIAmSte LhECl+MwFuOL7du9B3yGk499jf3IBljMyIwXrlfNfn3JSNy1FDYurhwbZsHk+xRvxBOg AeBrRIuGvV69tAoNo2l0+TLM+IVzNNa2bd8ZpNOi693iBKGwcxLZPNuNZsZ9XrTjCm4D lMQ3/sEZthX82pDMmlIdbZdqZHalGiCNQd7tCUUWutkDnact5BqnsN91MBAjpmXWPIi9 zUVwwRC8c8TEUAX0/8qCcppCzAH7PEdBDm+BOMJnwhufXxlyp72rBysOrEkeo6Ccg0UH GfdQ== X-Gm-Message-State: AKS2vOxhKcQnnM6A423iCe+EezpOHzhfppyi1ttgVlCBGSW9xqK+0v1w XWlKtFZDmp1e0Q== X-Received: by 10.99.129.66 with SMTP id t63mr4752399pgd.28.1497522809547; Thu, 15 Jun 2017 03:33:29 -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 g23sm5106389pfj.131.2017.06.15.03.33.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:33:28 -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: Thu, 15 Jun 2017 19:29:38 +0900 Message-Id: <149752257829.21887.15003130821809174947.sendpatchset@little-apple> In-Reply-To: <149752254550.21887.15183665699230243235.sendpatchset@little-apple> References: <149752254550.21887.15183665699230243235.sendpatchset@little-apple> Subject: [PATCH 03/04] iommu/ipmmu-vmsa: Use fwspec on both 32 and 64-bit ARM 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: Robin Murphy Consolidate the 32-bit and 64-bit code to make use of fwspec instead of archdata for the 32-bit ARM case. This is a simplified version of the fwspec handling code from Robin posted as [PATCH] iommu/ipmmu-vmsa: Convert to iommu_fwspec Signed-off-by: Robin Murphy Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) --- 0010/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2017-06-15 17:29:00.290607110 +0900 @@ -73,22 +73,9 @@ static struct ipmmu_vmsa_domain *to_vmsa return container_of(dom, struct ipmmu_vmsa_domain, io_domain); } - static struct ipmmu_vmsa_iommu_priv *to_priv(struct device *dev) { -#if defined(CONFIG_ARM) - return dev->archdata.iommu; -#else - return dev->iommu_fwspec->iommu_priv; -#endif -} -static void set_priv(struct device *dev, struct ipmmu_vmsa_iommu_priv *p) -{ -#if defined(CONFIG_ARM) - dev->archdata.iommu = p; -#else - dev->iommu_fwspec->iommu_priv = p; -#endif + return dev->iommu_fwspec ? dev->iommu_fwspec->iommu_priv : NULL; } #define TLB_LOOP_TIMEOUT 100 /* 100us */ @@ -730,7 +717,7 @@ static int ipmmu_init_platform_device(st priv->utlbs = utlbs; priv->num_utlbs = num_utlbs; priv->dev = dev; - set_priv(dev, priv); + dev->iommu_fwspec->iommu_priv = priv; return 0; error: @@ -887,14 +874,12 @@ static void ipmmu_domain_free_dma(struct static int ipmmu_add_device_dma(struct device *dev) { - struct iommu_fwspec *fwspec = dev->iommu_fwspec; struct iommu_group *group; /* * Only let through devices that have been verified in xlate() - * We may get called with dev->iommu_fwspec set to NULL. */ - if (!fwspec || !fwspec->iommu_priv) + if (!to_priv(dev)) return -ENODEV; group = iommu_group_get_for_dev(dev);