From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A91DFC04EB9 for ; Fri, 30 Nov 2018 03:35:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6A49920868 for ; Fri, 30 Nov 2018 03:35:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cp8vqe2Q"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=brainfault-org.20150623.gappssmtp.com header.i=@brainfault-org.20150623.gappssmtp.com header.b="Aa8CTtoA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A49920868 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=brainfault.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=nD/78HglaYooBC69R36zjS8vdMNr/onQwajnEDZfAFw=; b=cp8vqe2Qt234D9 tVE9NdrZcEBq7vnoL/jjGzOKkhN7/1y1ryRhQDCp9Xx57Dm7MzmEEfXMw2rF7FxWDukxyoh0paQjV OrM4tPh8OYMdg6Qp/fKM8ErXpu2LSMarN9Sa0VE6LYM5azI8luFxlrWjYXcz83gzekYsssShlT8il tUqufz3LkJgIqOSJSPU69jK/vuSN/Rcdp5Y5JCDg2N728O5pIFb/qp33Y4ksA40SwsRpqV35O1dIP OeYbQCVM1ZOjGG5bNuUrumxvL3eomC4Z3X8L51qeMpbIQ6U4/PtX/Hlelke64aOozSQM4BPiZ99Ky icqcvt+ETNb63zOxnn3Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSZa6-0002cH-Op; Fri, 30 Nov 2018 03:35:06 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSZa3-0001tn-Gh for linux-riscv@lists.infradead.org; Fri, 30 Nov 2018 03:35:05 +0000 Received: by mail-wr1-x441.google.com with SMTP id x10so3876019wrs.8 for ; Thu, 29 Nov 2018 19:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brainfault-org.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=px///lnI5nlBDxtHhYbqL3fKd6VwAKuL64n/fMX7EZg=; b=Aa8CTtoAN+jIf3mFA3F9tryFcVj5Vj+1+dWCrzYkK5g+RduHKBV9AXQwWhu7cN8+Bf /LBTi0IsoOs6Oc89V1qskRR/+BciLG7fBzCUo90peVTWkSLFBHpScjAI+cqQDOBVXmuO IG6o95LsPwQaRr7lwCrCXkfODpUBIEoMb0BrbHjTHN7NGEjCNDJ7hb05+yKYXD8SsJ4H zJjaIMGeNM1M3xgw1Fv1VzMky6WvgDMhASRa3Skr1/oZaA51f9CXy8f7V4/yvyNSnjox rAGLY0fq0DB5dqDWK1Xwde7uy/LGjvbpMmNndt9rT0AWwNEQs3MSExL1tJOLNkuquEAV 0r7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=px///lnI5nlBDxtHhYbqL3fKd6VwAKuL64n/fMX7EZg=; b=dAnhUPIi1BozOa15GHW2A9ZE8xL+p2wiU/h0BqBP41end0asov8WQTnbyJ2kTbr7p1 J/6565dL2gRUSg22sJgs+TewlvYcmHubkKon08ZcZUZaDZI4mLuH17QDOrK+e96rKDHL 43OtETuhjh9tSBPGVXOwyMAos739nikexDEvjgcyGtCLJl1knJGVjtDSPan2dnw5yVTi JSnStkm8IbKfE3YyN+V8qJoOoWvWaRsRud0H7ltK0Kj6UHx29iwzL203ShSxbJSmozu2 hmAMLKgPMeyoWr9Dlv7OXGVpvbn+vODF9CEkWHbnzmdBfl8KLCUzCkfG26TeYf4bt/Wk 2EeA== X-Gm-Message-State: AA+aEWYU/9qLp45eIupBBtZ9NaN5Scvi13Pv7JBJow3JNsCcL9EMFs9A NVB5YJr4UzeeGx6tZtGNu53mxvmP72EkN76qkLgZW+XR X-Google-Smtp-Source: AFSGD/WXjjnHpKx3qk9Q5BFnMON4UeWnsdYtpQb3Q/2k0/5XnK9ISMruMdx+Dr1iIiMox1LCIw80GfT3aZi9JeuYyjY= X-Received: by 2002:adf:91a3:: with SMTP id 32mr3155796wri.99.1543548891044; Thu, 29 Nov 2018 19:34:51 -0800 (PST) MIME-Version: 1.0 References: <20181127100317.12809-1-anup@brainfault.org> <20181127100317.12809-2-anup@brainfault.org> In-Reply-To: From: Anup Patel Date: Fri, 30 Nov 2018 09:04:46 +0530 Message-ID: Subject: Re: [PATCH v2 1/4] irqchip: sifive-plic: Pre-compute context hart base and enable base To: Atish Patra X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181129_193503_562184_43236A07 X-CRM114-Status: GOOD ( 19.36 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Lezcano , Jason Cooper , Marc Zyngier , Palmer Dabbelt , "linux-kernel@vger.kernel.org List" , Christoph Hellwig , Albert Ou , Thomas Gleixner , linux-riscv@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org On Fri, Nov 30, 2018 at 6:05 AM Atish Patra wrote: > > On 11/27/18 2:03 AM, Anup Patel wrote: > > This patch does following optimizations: > > 1. Pre-compute hart base for each context handler > > 2. Pre-compute enable base for each context handler > > 3. Have enable lock for each context handler instead > > of global plic_toggle_lock > > > > Signed-off-by: Anup Patel > > --- > > drivers/irqchip/irq-sifive-plic.c | 41 +++++++++++++------------------ > > 1 file changed, 17 insertions(+), 24 deletions(-) > > > > diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c > > index 357e9daf94ae..56fce648a901 100644 > > --- a/drivers/irqchip/irq-sifive-plic.c > > +++ b/drivers/irqchip/irq-sifive-plic.c > > @@ -60,36 +60,24 @@ static void __iomem *plic_regs; > > struct plic_handler { > > bool present; > > int ctxid; > > + void __iomem *hart_base; > > + raw_spinlock_t enable_lock; > > + void __iomem *enable_base; > > It should be u32. Otherwise, plic_toggle calculates incorrect address > and it does not boot on Unlheased. Good catch. I did not see this issue on QEMU because we have very IRQs over there. > > > }; > > static DEFINE_PER_CPU(struct plic_handler, plic_handlers); > > > > -static inline void __iomem *plic_hart_offset(int ctxid) > > +static inline void plic_toggle(struct plic_handler *handler, > > + int hwirq, int enable) > > { > > - return plic_regs + CONTEXT_BASE + ctxid * CONTEXT_PER_HART; > > -} > > - > > -static inline u32 __iomem *plic_enable_base(int ctxid) > > -{ > > - return plic_regs + ENABLE_BASE + ctxid * ENABLE_PER_HART; > > -} > > - > > -/* > > - * Protect mask operations on the registers given that we can't assume that > > - * atomic memory operations work on them. > > - */ > > Should we keep the comment for enable_lock ? Sure, I will retain the comment for enable_lock. > > > -static DEFINE_RAW_SPINLOCK(plic_toggle_lock); > > - > > -static inline void plic_toggle(int ctxid, int hwirq, int enable) > > -{ > > - u32 __iomem *reg = plic_enable_base(ctxid) + (hwirq / 32); > > + u32 __iomem *reg = handler->enable_base + (hwirq / 32); > > u32 hwirq_mask = 1 << (hwirq % 32); > > > > - raw_spin_lock(&plic_toggle_lock); > > + raw_spin_lock(&handler->enable_lock); > > if (enable) > > writel(readl(reg) | hwirq_mask, reg); > > else > > writel(readl(reg) & ~hwirq_mask, reg); > > - raw_spin_unlock(&plic_toggle_lock); > > + raw_spin_unlock(&handler->enable_lock); > > } > > > > static inline void plic_irq_toggle(struct irq_data *d, int enable) > > @@ -101,7 +89,7 @@ static inline void plic_irq_toggle(struct irq_data *d, int enable) > > struct plic_handler *handler = per_cpu_ptr(&plic_handlers, cpu); > > > > if (handler->present) > > - plic_toggle(handler->ctxid, d->hwirq, enable); > > + plic_toggle(handler, d->hwirq, enable); > > } > > } > > > > @@ -150,7 +138,7 @@ static struct irq_domain *plic_irqdomain; > > static void plic_handle_irq(struct pt_regs *regs) > > { > > struct plic_handler *handler = this_cpu_ptr(&plic_handlers); > > - void __iomem *claim = plic_hart_offset(handler->ctxid) + CONTEXT_CLAIM; > > + void __iomem *claim = handler->hart_base + CONTEXT_CLAIM; > > irq_hw_number_t hwirq; > > > > WARN_ON_ONCE(!handler->present); > > @@ -240,11 +228,16 @@ static int __init plic_init(struct device_node *node, > > handler = per_cpu_ptr(&plic_handlers, cpu); > > handler->present = true; > > handler->ctxid = i; > > + handler->hart_base = > > + plic_regs + CONTEXT_BASE + i * CONTEXT_PER_HART; > > + raw_spin_lock_init(&handler->enable_lock); > > + handler->enable_base = > > + plic_regs + ENABLE_BASE + i * ENABLE_PER_HART; > > > > /* priority must be > threshold to trigger an interrupt */ > > - writel(0, plic_hart_offset(i) + CONTEXT_THRESHOLD); > > + writel(0, handler->hart_base + CONTEXT_THRESHOLD); > > for (hwirq = 1; hwirq <= nr_irqs; hwirq++) > > - plic_toggle(i, hwirq, 0); > > + plic_toggle(handler, hwirq, 0); > > nr_mapped++; > > } > > > > > -- Anup _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv