Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp168205imm; Thu, 2 Aug 2018 16:14:38 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcDSnmHdOsNRuDXp/ZXMcZWR/YBCbB51TkYWyFAhloDz7MV6QtxP7ePLp+iBsG2lxwYIM8b X-Received: by 2002:a17:902:6ac3:: with SMTP id i3-v6mr1226030plt.252.1533251678261; Thu, 02 Aug 2018 16:14:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533251678; cv=none; d=google.com; s=arc-20160816; b=PaLbKjyuP52hfSj5Mc5dcRg7hbMCosGwxWvoK8Y8gTceQxPuunX5AnJ1Icql4+oXsB fkiglxzNv7a6dq+xvA1EJS/gD47j9+34cWiLJEZZvFh2YhlTpits3chovzs15Rmn1XDF YNSRBwBJWEirCUhD8xtsGRG/gUUBD+Ejgw/8hyiL8NfFaVdas0YIqwhBNyroPxQ0ZfIl 2z021AqCwNP0MB2TveTCUoiFNin1LE084/PkbJt+DgWd+UPZXd7Jzgvxl1DndfiRP37t 0eCQGvGoCu/D1XA+I4XjiMsCotTTCb30vukZiMZ59ErEosBqjb+Vika3ureX7VQVg9IU utnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=WKysEWlK3JZIt0oXKzoV6UOUwwSJFgb3wa7+1Zlzvtc=; b=S8oXEcHEbvLaIY+7qck7XFikmveXo7Bu0M7v75/ewHTwjd7bwk4Fll6JPfPeg5o65j QOQdDjU9fIGJS3XTsu3AwtXJ9jt3HdWLFE1Plurfu+p44DRDQUCmJ8y+dk0gtlZDMeGw ifFFwpYEJ0oi5LBJt8LOjanPWRKYA8SVQvximZiCvYRmqORHs1GuSLtcyNAz+JDKhRVB YtA4CWiMvkIRcMF34nTC+y1bDay/UB7/mRNvfLPcbOd8ULYCiY4pdCESbNblLKOofcz/ XDo6IoGXccJeL9lthVMCU7CL+8ndRg2/i/awMVecjpYuRu2gvQKwwYkRgAigFMAILDkg xkxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=WxHN12u0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e20-v6si3246422pfm.177.2018.08.02.16.14.23; Thu, 02 Aug 2018 16:14:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=WxHN12u0; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730951AbeHCBGs (ORCPT + 99 others); Thu, 2 Aug 2018 21:06:48 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:58343 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726949AbeHCBGr (ORCPT ); Thu, 2 Aug 2018 21:06:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1533251607; x=1564787607; h=subject:to:cc:references:from:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=6INDY9f8ttBYljExoNjPd3iTbcegvvf3gSjXEfr66dI=; b=WxHN12u0PlnJzI3eRePAsx/tIzDpeJNnPHxfDfH2oyggDjlElkfd6Rl5 PiPbgQ4/kjUtfuks8rZkotkPw66pr5yCgLI4f9dKom6V2ZF9VmIseuhWi G00ge+IOeOEwEAQsS5Z/61vuygbYiqS/1HE5YLUDIE56wu5F4cofxqdLY k1yc4eODIhLAdbsnsIK2q/+O4yNICd6F1uqBel1ZPJE5aMHgKGfv9hoqH tus83Q913oPzKSNJ4GrVfYp6h5OEkEU6aJ1Sb1OezcwqZS42jEuCOEH3R ejpO6RscnU2Tm7GXakxVlBT1VHRULQw85bEJnwtuXLIN8IR8F+q6cLYLO w==; X-IronPort-AV: E=Sophos;i="5.51,437,1526313600"; d="scan'208";a="86180096" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 03 Aug 2018 07:13:26 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 02 Aug 2018 16:01:13 -0700 Received: from c02v91rdhtd5.sdcorp.global.sandisk.com (HELO [10.196.159.148]) ([10.196.159.148]) by uls-op-cesaip02.wdc.com with ESMTP; 02 Aug 2018 16:13:27 -0700 Subject: Re: [PATCH 10/11] irqchip: add a SiFive PLIC driver To: Christoph Hellwig , "tglx@linutronix.de" , "palmer@sifive.com" , "jason@lakedaemon.net" , "marc.zyngier@arm.com" , "robh+dt@kernel.org" , "mark.rutland@arm.com" Cc: "anup@brainfault.org" , "devicetree@vger.kernel.org" , "aou@eecs.berkeley.edu" , "linux-kernel@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "shorne@gmail.com" References: <20180802115008.4031-1-hch@lst.de> <20180802115008.4031-11-hch@lst.de> From: Atish Patra Message-ID: <2416469e-c39e-6481-f5e0-ad191b858d06@wdc.com> Date: Thu, 2 Aug 2018 16:13:26 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180802115008.4031-11-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/2/18 4:51 AM, Christoph Hellwig wrote: > Adds a driver for the SiFive implementation of the RISC-V Platform Level > Interrupt Controller (PLIC). The PLIC connects global interrupt sources > to the local interrupt controller on each hart. > > This driver is based on the driver in the RISC-V tree from Palmer Dabbelt, > but has been almost entirely rewritten since, and includes many fixes > from Atish Patra. > > Signed-off-by: Christoph Hellwig > --- > arch/riscv/configs/defconfig | 1 + > drivers/irqchip/Kconfig | 12 ++ > drivers/irqchip/Makefile | 1 + > drivers/irqchip/irq-sifive-plic.c | 259 ++++++++++++++++++++++++++++++ > 4 files changed, 273 insertions(+) > create mode 100644 drivers/irqchip/irq-sifive-plic.c > > diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig > index 07326466871b..36473d7dbaac 100644 > --- a/arch/riscv/configs/defconfig > +++ b/arch/riscv/configs/defconfig > @@ -76,3 +76,4 @@ CONFIG_ROOT_NFS=y > CONFIG_CRYPTO_USER_API_HASH=y > CONFIG_MODULES=y > CONFIG_MODULE_UNLOAD=y > +CONFIG_SIFIVE_PLIC=y > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index e9233db16e03..df345b878ac2 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -372,3 +372,15 @@ config QCOM_PDC > IRQs for Qualcomm Technologies Inc (QTI) mobile chips. > > endmenu > + > +config SIFIVE_PLIC > + bool "SiFive Platform-Level Interrupt Controller" > + depends on RISCV > + help > + This enables support for the PLIC chip found in SiFive (and > + potentially other) RISC-V systems. The PLIC controls devices > + interrupts and connects them to each core's local interrupt > + controller. Aside from timer and software interrupts, all other > + interrupt sources are subordinate to the PLIC. > + > + If you don't know what to do here, say Y. > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index 15f268f646bf..fbd1ec8070ef 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -87,3 +87,4 @@ obj-$(CONFIG_MESON_IRQ_GPIO) += irq-meson-gpio.o > obj-$(CONFIG_GOLDFISH_PIC) += irq-goldfish-pic.o > obj-$(CONFIG_NDS32) += irq-ativic32.o > obj-$(CONFIG_QCOM_PDC) += qcom-pdc.o > +obj-$(CONFIG_SIFIVE_PLIC) += irq-sifive-plic.o > diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c > new file mode 100644 > index 000000000000..d2fb8364dec5 > --- /dev/null > +++ b/drivers/irqchip/irq-sifive-plic.c > @@ -0,0 +1,259 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2017 SiFive > + * Copyright (C) 2018 Christoph Hellwig > + */ > +#define pr_fmt(fmt) "plic: " fmt > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +/* > + * This driver implements a version of the RISC-V PLIC with the actual layout > + * specified in chapter 8 of the SiFive U5 Coreplex Series Manual: > + * > + * https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf > + * > + * The largest number supported by devices marked as 'riscv,plic0', is 1024, of > + * which device 0 is defined as non-existant by the RISC-V Priviledged Spec. /s/existant/existent /s/Priviledged/Privileged > + */ > + > +#define MAX_DEVICES 1024 > +#define MAX_CONTEXTS 15872 > + > +/* > + * Each interrupt source has a priority register associated with it. > + * We always hardwire it to one in Linux. > + */ > +#define PRIORITY_BASE 0 > +#define PRIORITY_PER_ID 4 > + > +/* > + * Each hart context has a vector of interupt enable bits associated with it. /s/interupt/interrupt > + * There's one bit for each interrupt source. > + */ > +#define ENABLE_BASE 0x2000 > +#define ENABLE_PER_HART 0x80 > + > +/* > + * Each hart context has a set of control registers associated with it. Right > + * now there's only two: a source priority threshold over which the hart will > + * take an interrupt, and a register to claim interrupts. > + */ > +#define CONTEXT_BASE 0x200000 > +#define CONTEXT_PER_HART 0x1000 > +#define CONTEXT_THRESHOLD 0x00 > +#define CONTEXT_CLAIM 0x04 > + > +static void __iomem *plic_regs; > + > +struct plic_handler { > + bool present; > + int ctxid; > +}; > +static DEFINE_PER_CPU(struct plic_handler, plic_handlers); > + > +static inline void __iomem *plic_hart_offset(int ctxid) > +{ > + 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. > + */ > +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 hwirq_mask = 1 << (hwirq % 32); > + > + raw_spin_lock(&plic_toggle_lock); > + if (enable) > + writel(readl(reg) | hwirq_mask, reg); > + else > + writel(readl(reg) & ~hwirq_mask, reg); > + raw_spin_unlock(&plic_toggle_lock); > +} > + > +static inline void plic_irq_toggle(struct irq_data *d, int enable) > +{ > + int cpu; > + > + writel(enable, plic_regs + PRIORITY_BASE + d->hwirq * PRIORITY_PER_ID); > + for_each_cpu(cpu, irq_data_get_affinity_mask(d)) { > + struct plic_handler *handler = per_cpu_ptr(&plic_handlers, cpu); > + > + if (handler->present) > + plic_toggle(handler->ctxid, d->hwirq, enable); > + } > +} > + > +static void plic_irq_enable(struct irq_data *d) > +{ > + plic_irq_toggle(d, 1); > +} > + > +static void plic_irq_disable(struct irq_data *d) > +{ > + plic_irq_toggle(d, 0); > +} > + > +static struct irq_chip plic_chip = { > + .name = "SiFive PLIC", > + /* > + * There is no need to mask/unmask PLIC interrupts. They are "masked" > + * by reading claim and "unmasked" when writing it back. > + */ > + .irq_enable = plic_irq_enable, > + .irq_disable = plic_irq_disable, > +}; > + > +static int plic_irqdomain_map(struct irq_domain *d, unsigned int irq, > + irq_hw_number_t hwirq) > +{ > + irq_set_chip_and_handler(irq, &plic_chip, handle_simple_irq); > + irq_set_chip_data(irq, NULL); > + irq_set_noprobe(irq); > + return 0; > +} > + > +static const struct irq_domain_ops plic_irqdomain_ops = { > + .map = plic_irqdomain_map, > + .xlate = irq_domain_xlate_onecell, > +}; > + > +static struct irq_domain *plic_irqdomain; > + > +/* > + * Handling an interrupt is a two-step process: first you claim the interrupt > + * by reading the claim register, then you complete the interrupt by writing > + * that source ID back to the same claim register. This automatically enables > + * and disables the interrupt, so there's nothing else to do. > + */ > +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; > + irq_hw_number_t hwirq; > + > + WARN_ON_ONCE(!handler->present); > + > + csr_clear(sie, SIE_STIE); We should clear the SIE_SEIE not SIE_STIE. Correct ? > + while ((hwirq = readl(claim))) { > + int irq = irq_find_mapping(plic_irqdomain, hwirq); > + > + if (unlikely(irq <= 0)) > + pr_warn_ratelimited("can't find mapping for hwirq %lu\n", > + hwirq); > + else > + generic_handle_irq(irq); > + writel(hwirq, claim); > + } > + csr_set(sie, SIE_STIE); Same as above. > +} > + > +/* > + * Walk up the DT tree until we find a active RISC-V core (HART) node and > + * extract the cpuid from it. > + */ > +static int plic_find_hart_id(struct device_node *node) > +{ > + for (; node; node = node->parent) { > + if (of_device_is_compatible(node, "riscv")) > + return riscv_of_processor_hart(node); > + } > + > + return -1; > +} > + > +static int __init plic_init(struct device_node *node, > + struct device_node *parent) > +{ > + int error = 0, nr_handlers, nr_mapped = 0, i; > + u32 nr_irqs; > + > + if (plic_regs) { > + pr_warning("PLIC already present.\n"); Got a check-patch warning. WARNING: Prefer pr_warn(... to pr_warning(... #257: FILE: drivers/irqchip/irq-sifive-plic.c:191: + pr_warning("PLIC already present.\n"); > + return -ENXIO; > + } > + > + plic_regs = of_iomap(node, 0); > + if (WARN_ON(!plic_regs)) > + return -EIO; > + > + error = -EINVAL; > + of_property_read_u32(node, "riscv,ndev", &nr_irqs); > + if (WARN_ON(!nr_irqs)) > + goto out_iounmap; > + > + nr_handlers = of_irq_count(node); > + if (WARN_ON(!nr_handlers)) > + goto out_iounmap; > + if (WARN_ON(nr_handlers < num_possible_cpus())) > + goto out_iounmap; > + > + error = -ENOMEM; > + plic_irqdomain = irq_domain_add_linear(node, nr_irqs + 1, > + &plic_irqdomain_ops, NULL); > + if (WARN_ON(!plic_irqdomain)) > + goto out_iounmap; > + > + for (i = 0; i < nr_handlers; i++) { > + struct of_phandle_args parent; > + struct plic_handler *handler; > + irq_hw_number_t hwirq; > + int cpu; > + > + if (of_irq_parse_one(node, i, &parent)) { > + pr_err("failed to parse parent for contxt %d.\n", i); /s/contxt/context > + continue; > + } > + > + /* skip context holes */ > + if (parent.args[0] == -1) > + continue; > + > + cpu = plic_find_hart_id(parent.np->parent); Since plic_find_hart_id() is going to walk up the DT, we can pass only parent.np instead of parent.np->parent. It does not increase any efficiency either way. So not very necessary. Just thought of taking the advantage of plic_find_hart_id. Regards, Atish > + if (cpu < 0) { > + pr_warn("failed to parse hart ID for context %d.\n", i); > + continue; > + } > + > + handler = per_cpu_ptr(&plic_handlers, cpu); > + handler->present = true; > + handler->ctxid = i; > + > + /* priority must be > threshold to trigger an interrupt */ > + writel(0, plic_hart_offset(i) + CONTEXT_THRESHOLD); > + for (hwirq = 1; hwirq <= nr_irqs; hwirq++) > + plic_toggle(i, hwirq, 0); > + nr_mapped++; > + } > + > + pr_info("mapped %d interrupts to %d (out of %d) handlers.\n", > + nr_irqs, nr_mapped, nr_handlers); > + set_handle_irq(plic_handle_irq); > + return 0; > + > +out_iounmap: > + iounmap(plic_regs); > + return error; > +} > + > +IRQCHIP_DECLARE(sifive_plic0, "sifive,plic0", plic_init); > +IRQCHIP_DECLARE(riscv_plic0, "riscv,plic0", plic_init); /* for legacy systems */ >