From patchwork Tue Sep 20 13:44:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 9341733 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 C12E1607D0 for ; Tue, 20 Sep 2016 13:55:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B056C296FA for ; Tue, 20 Sep 2016 13:55:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A27372976A; Tue, 20 Sep 2016 13:55:03 +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=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 359FF296FA for ; Tue, 20 Sep 2016 13:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755091AbcITNwv (ORCPT ); Tue, 20 Sep 2016 09:52:51 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35905 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755076AbcITNws (ORCPT ); Tue, 20 Sep 2016 09:52:48 -0400 Received: by mail-pf0-f196.google.com with SMTP id n24so1010895pfb.3; Tue, 20 Sep 2016 06:52:48 -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=DjYZTjTaVcSK9eRQjp2sFUY2CAQIOl6zkSnkoCpz61k=; b=Pf95Q2qvcpIp1/QRshsRtUzTb4RY6JO/bCWTfuJCFJg2Qy20oU3LmBAoCKBsDJW/ei idCKJd/f5axvHRDe64MWrsqLouP5AyCvPo7Pk/2Y7OLbrm/IMuO5jEfF7x7G4Ug0UVWk M+WypSatn1OwrAvMO/LT4QS6WeuroItGcvAj/W1BkZquiLrfU6c8vyxHxRwEqG8WN0jM /pyWXhhnomWtvG+o87Nne7DfCQCuIVWNfuzqJA54zOx91IbEqNZbrTRCjmCDAKKnLp6b VvGs29V87T98/juerCegKZUcOkxUv7f9xKKS/HEJrUWwpJEMWroC5aOxL8dOvXoamgsV 1fdw== 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=DjYZTjTaVcSK9eRQjp2sFUY2CAQIOl6zkSnkoCpz61k=; b=AMrzgV90YwfVMn56oZxik+XAuAg5NbGD58QQaZetfEwFGPNyaXyuX0SzCCCkpQ2Zfs jwYL5Mx74l179h+pebznk6i3zvyM2SfBVNesuBiSogmU1Ndi35h1y9Pl/kB7SzdbQCft 8xFJOZJiGM80eFIPbRSMTXrIWQ3ND8a3Tmj8is+F9/YQNAB5jqc0jblK6zXx5bPvWT72 4FZCn67YxxddMDpvoFUJJNqMUIGVl0RYWOtxLg8iBn2jISXY0qjFk3Hw5NikCOjhNcAM GLviOD3ozF8Woc+hp/qGqk8Atujcr0uSDtm1XDwnCik1h+vc2L6eCw42Ylrel0UOSmn/ bl9g== X-Gm-Message-State: AE9vXwNLiaFhgwIMgsha7cxqQv38UdehIfdYgdwHDO9eA9oPO41grde/uxp4WLyzG9P/+Q== X-Received: by 10.98.73.22 with SMTP id w22mr55193526pfa.62.1474379567871; Tue, 20 Sep 2016 06:52:47 -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 wr8sm39637458pab.44.2016.09.20.06.52.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Sep 2016 06:52:46 -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:16 +0900 Message-Id: <20160920134416.25470.49173.sendpatchset@little-apple> In-Reply-To: <20160920134355.25470.93701.sendpatchset@little-apple> References: <20160920134355.25470.93701.sendpatchset@little-apple> Subject: [PATCH v5 02/07] iommu/ipmmu-vmsa: Rework interrupt code and use bitmap for context 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 Introduce a bitmap for context handing and convert the interrupt routine to handle all registered contexts. At this point the number of contexts are still limited. Also remove the use of the ARM specific mapping variable from ipmmu_irq() to allow compile on ARM64. Signed-off-by: Magnus Damm --- Changes since V4: - None Changes since V3: - None Changes since V2: (Thanks again to Laurent!) - Introduce a spinlock together with the bitmap and domain array. - Break out code into separate functions for alloc and free. - Perform free after (instead of before) configuring hardware registers. - Use the spinlock to protect the domain array in the interrupt handler. Changes since V1: (Thanks to Laurent for feedback!) - Use simple find_first_zero()/set_bit()/clear_bit() for context management. - For allocation rely on spinlock held when calling ipmmu_domain_init_context() - For test/free use atomic bitops - Return IRQ_HANDLED if any of the contexts generated interrupts drivers/iommu/ipmmu-vmsa.c | 76 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 66 insertions(+), 10 deletions(-) --- 0004/drivers/iommu/ipmmu-vmsa.c +++ work/drivers/iommu/ipmmu-vmsa.c 2016-09-20 21:48:23.770607110 +0900 @@ -8,6 +8,7 @@ * the Free Software Foundation; version 2 of the License. */ +#include #include #include #include @@ -26,12 +27,17 @@ #include "io-pgtable.h" +#define IPMMU_CTX_MAX 1 + struct ipmmu_vmsa_device { struct device *dev; void __iomem *base; struct list_head list; unsigned int num_utlbs; + spinlock_t lock; /* Protects ctx and domains[] */ + DECLARE_BITMAP(ctx, IPMMU_CTX_MAX); + struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX]; struct dma_iommu_mapping *mapping; }; @@ -293,9 +299,29 @@ static struct iommu_gather_ops ipmmu_gat * Domain/Context Management */ +static int ipmmu_domain_allocate_context(struct ipmmu_vmsa_device *mmu, + struct ipmmu_vmsa_domain *domain) +{ + unsigned long flags; + int ret; + + spin_lock_irqsave(&mmu->lock, flags); + + ret = find_first_zero_bit(mmu->ctx, IPMMU_CTX_MAX); + if (ret != IPMMU_CTX_MAX) { + mmu->domains[ret] = domain; + set_bit(ret, mmu->ctx); + } + + spin_unlock_irqrestore(&mmu->lock, flags); + + return ret; +} + static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) { u64 ttbr; + int ret; /* * Allocate the page table operations. @@ -325,10 +351,15 @@ static int ipmmu_domain_init_context(str return -EINVAL; /* - * TODO: When adding support for multiple contexts, find an unused - * context. + * Find an unused context. */ - domain->context_id = 0; + ret = ipmmu_domain_allocate_context(domain->mmu, domain); + if (ret == IPMMU_CTX_MAX) { + free_io_pgtable_ops(domain->iop); + return -EBUSY; + } + + domain->context_id = ret; /* TTBR0 */ ttbr = domain->cfg.arm_lpae_s1_cfg.ttbr[0]; @@ -370,6 +401,19 @@ static int ipmmu_domain_init_context(str return 0; } +static void ipmmu_domain_free_context(struct ipmmu_vmsa_device *mmu, + unsigned int context_id) +{ + unsigned long flags; + + spin_lock_irqsave(&mmu->lock, flags); + + clear_bit(context_id, mmu->ctx); + mmu->domains[context_id] = NULL; + + spin_unlock_irqrestore(&mmu->lock, flags); +} + static void ipmmu_domain_destroy_context(struct ipmmu_vmsa_domain *domain) { /* @@ -380,6 +424,7 @@ static void ipmmu_domain_destroy_context */ ipmmu_ctx_write(domain, IMCTR, IMCTR_FLUSH); ipmmu_tlb_sync(domain); + ipmmu_domain_free_context(domain->mmu, domain->context_id); } /* ----------------------------------------------------------------------------- @@ -437,16 +482,25 @@ static irqreturn_t ipmmu_domain_irq(stru static irqreturn_t ipmmu_irq(int irq, void *dev) { struct ipmmu_vmsa_device *mmu = dev; - struct iommu_domain *io_domain; - struct ipmmu_vmsa_domain *domain; + irqreturn_t status = IRQ_NONE; + unsigned int i; + unsigned long flags; - if (!mmu->mapping) - return IRQ_NONE; + spin_lock_irqsave(&mmu->lock, flags); + + /* + * Check interrupts for all active contexts. + */ + for (i = 0; i < IPMMU_CTX_MAX; i++) { + if (!mmu->domains[i]) + continue; + if (ipmmu_domain_irq(mmu->domains[i]) == IRQ_HANDLED) + status = IRQ_HANDLED; + } - io_domain = mmu->mapping->domain; - domain = to_vmsa_domain(io_domain); + spin_unlock_irqrestore(&mmu->lock, flags); - return ipmmu_domain_irq(domain); + return status; } /* ----------------------------------------------------------------------------- @@ -774,6 +828,8 @@ static int ipmmu_probe(struct platform_d mmu->dev = &pdev->dev; mmu->num_utlbs = 32; + spin_lock_init(&mmu->lock); + bitmap_zero(mmu->ctx, IPMMU_CTX_MAX); /* Map I/O memory and request IRQ. */ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);