From patchwork Tue Dec 15 12:02:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 7854001 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@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 3B4C9BEEE1 for ; Tue, 15 Dec 2015 12:01:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 585AB20304 for ; Tue, 15 Dec 2015 12:01:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41F31202FE for ; Tue, 15 Dec 2015 12:01:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965136AbbLOMBX (ORCPT ); Tue, 15 Dec 2015 07:01:23 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:36067 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964921AbbLOMBU (ORCPT ); Tue, 15 Dec 2015 07:01:20 -0500 Received: by mail-pf0-f179.google.com with SMTP id u66so3760882pfb.3; Tue, 15 Dec 2015 04:01:20 -0800 (PST) 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=8qkklugDkTbmtU7L4Dl8zXm0Jbtaj+bHgsjkUneMshE=; b=vFgU59FPvHsisAtTFJKu496y5yVSwlfS11aNnGRJqOuQSAQ+5A8Vv0T7OxMx2fwu48 vJ0UaC6QIcd0BgYmgKKfbrPdskQw5uNLOk2wRvzXYXOQYjjE2Uy4gH3CXcAJqsAPbjN2 meyDy67+pNWK7V5y91AjUUAed1dxNkOr9dxIf+RLuP1c1P3tS2XdtS7bx8gJZZtUdJo+ AvUHxMUaPZVvXSq+w0XKxqJ3FTLaPDPy16wvS6z66EiDS8pMhYC2QyG42+pFMYVpArtX 5Eh40hNF6gLr5oG26g+9ex8ZI/8cEJq9ih2Or2N2Um9h50KSkwAtfS/8ux2z4nhoKUAa 8CMA== X-Received: by 10.98.67.76 with SMTP id q73mr43987482pfa.73.1450180879645; Tue, 15 Dec 2015 04:01:19 -0800 (PST) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by smtp.gmail.com with ESMTPSA id r5sm1918644pfi.73.2015.12.15.04.01.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Dec 2015 04:01:18 -0800 (PST) From: Magnus Damm To: iommu@lists.linux-foundation.org Cc: laurent.pinchart+renesas@ideasonboard.com, geert+renesas@glider.be, linux-sh@vger.kernel.org, joro@8bytes.org, linux-kernel@vger.kernel.org, horms+renesas@verge.net.au, Magnus Damm Date: Tue, 15 Dec 2015 21:02:58 +0900 Message-Id: <20151215120258.26216.81905.sendpatchset@little-apple> In-Reply-To: <20151215120212.26216.61530.sendpatchset@little-apple> References: <20151215120212.26216.61530.sendpatchset@little-apple> Subject: [PATCH 05/06] iommu/ipmmu-vmsa: Break out 32-bit ARM mapping code Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 Make the driver compile on more than just 32-bit ARM by breaking out and wrapping ARM specific functions in #ifdefs. Needed to be able to use the driver on other architectures. Signed-off-by: Magnus Damm --- drivers/iommu/ipmmu-vmsa.c | 94 +++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 32 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0007/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2015-12-15 13:20:26.580513000 +0900 @@ -22,8 +22,10 @@ #include #include +#ifdef CONFIG_ARM #include #include +#endif #include "io-pgtable.h" @@ -38,7 +40,9 @@ struct ipmmu_vmsa_device { DECLARE_BITMAP(ctx, IPMMU_CTX_MAX); struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX]; +#ifdef CONFIG_ARM struct dma_iommu_mapping *mapping; +#endif }; struct ipmmu_vmsa_domain { @@ -621,6 +625,60 @@ static int ipmmu_find_utlbs(struct ipmmu return 0; } +#ifdef CONFIG_ARM +static int ipmmu_map_attach(struct device *dev, struct ipmmu_vmsa_device *mmu) +{ + int ret; + + /* + * Create the ARM mapping, used by the ARM DMA mapping core to allocate + * VAs. This will allocate a corresponding IOMMU domain. + * + * TODO: + * - Create one mapping per context (TLB). + * - Make the mapping size configurable ? We currently use a 2GB mapping + * at a 1GB offset to ensure that NULL VAs will fault. + */ + if (!mmu->mapping) { + struct dma_iommu_mapping *mapping; + + mapping = arm_iommu_create_mapping(&platform_bus_type, + SZ_1G, SZ_2G); + if (IS_ERR(mapping)) { + dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n"); + return PTR_ERR(mapping); + } + + mmu->mapping = mapping; + } + + /* Attach the ARM VA mapping to the device. */ + ret = arm_iommu_attach_device(dev, mmu->mapping); + if (ret < 0) { + dev_err(dev, "Failed to attach device to VA mapping\n"); + arm_iommu_release_mapping(mmu->mapping); + } + + return ret; +} +static inline void ipmmu_detach(struct device *dev) +{ + arm_iommu_detach_device(dev); +} +static inline void ipmmu_release_mapping(struct ipmmu_vmsa_device *mmu) +{ + arm_iommu_release_mapping(mmu->mapping); +} +#else +static inline int ipmmu_map_attach(struct device *dev, + struct ipmmu_vmsa_device *mmu) +{ + return 0; +} +static inline void ipmmu_detach(struct device *dev) {} +static inline void ipmmu_release_mapping(struct ipmmu_vmsa_device *mmu) {} +#endif + static int ipmmu_add_device(struct device *dev) { struct ipmmu_vmsa_dev_data *dev_data = get_dev_data(dev); @@ -701,41 +759,13 @@ static int ipmmu_add_device(struct devic dev_data->num_utlbs = num_utlbs; set_dev_data(dev, dev_data); - /* - * Create the ARM mapping, used by the ARM DMA mapping core to allocate - * VAs. This will allocate a corresponding IOMMU domain. - * - * TODO: - * - Create one mapping per context (TLB). - * - Make the mapping size configurable ? We currently use a 2GB mapping - * at a 1GB offset to ensure that NULL VAs will fault. - */ - if (!mmu->mapping) { - struct dma_iommu_mapping *mapping; - - mapping = arm_iommu_create_mapping(&platform_bus_type, - SZ_1G, SZ_2G); - if (IS_ERR(mapping)) { - dev_err(mmu->dev, "failed to create ARM IOMMU mapping\n"); - ret = PTR_ERR(mapping); - goto error; - } - - mmu->mapping = mapping; - } - - /* Attach the ARM VA mapping to the device. */ - ret = arm_iommu_attach_device(dev, mmu->mapping); - if (ret < 0) { - dev_err(dev, "Failed to attach device to VA mapping\n"); + ret = ipmmu_map_attach(dev, mmu); + if (ret < 0) goto error; - } return 0; error: - arm_iommu_release_mapping(mmu->mapping); - kfree(dev_data); kfree(utlbs); @@ -751,7 +781,7 @@ static void ipmmu_remove_device(struct d { struct ipmmu_vmsa_dev_data *dev_data = get_dev_data(dev); - arm_iommu_detach_device(dev); + ipmmu_detach(dev); iommu_group_remove_device(dev); kfree(dev_data->utlbs); @@ -862,7 +892,7 @@ static int ipmmu_remove(struct platform_ list_del(&mmu->list); spin_unlock(&ipmmu_devices_lock); - arm_iommu_release_mapping(mmu->mapping); + ipmmu_release_mapping(mmu); ipmmu_device_reset(mmu);