Hi Anup! Wow, I'm really happy to see that you're moving towards the 1-1 model! Anup Patel <apatel@xxxxxxxxxxxxxxxx> writes: > The RISC-V advanced interrupt architecture (AIA) specification > defines a new MSI controller called incoming message signalled > interrupt controller (IMSIC) which manages MSI on per-HART (or > per-CPU) basis. It also supports IPIs as software injected MSIs. > (For more details refer https://github.com/riscv/riscv-aia) > > Let us add an early irqchip driver for RISC-V IMSIC which sets > up the IMSIC state and provide IPIs. It would help (reviewers, and future bugfixers) if you add (here or in the cover) what design decisions you've taken instead of just saying that you're now supporting IMSIC. > Signed-off-by: Anup Patel <apatel@xxxxxxxxxxxxxxxx> > --- > drivers/irqchip/Kconfig | 6 + > drivers/irqchip/Makefile | 1 + > drivers/irqchip/irq-riscv-imsic-early.c | 235 ++++++ > drivers/irqchip/irq-riscv-imsic-state.c | 962 ++++++++++++++++++++++++ > drivers/irqchip/irq-riscv-imsic-state.h | 109 +++ > include/linux/irqchip/riscv-imsic.h | 87 +++ > 6 files changed, 1400 insertions(+) > create mode 100644 drivers/irqchip/irq-riscv-imsic-early.c > create mode 100644 drivers/irqchip/irq-riscv-imsic-state.c > create mode 100644 drivers/irqchip/irq-riscv-imsic-state.h > create mode 100644 include/linux/irqchip/riscv-imsic.h > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index f7149d0f3d45..bdd80716114d 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -546,6 +546,12 @@ config SIFIVE_PLIC > select IRQ_DOMAIN_HIERARCHY > select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP > > +config RISCV_IMSIC > + bool > + depends on RISCV > + select IRQ_DOMAIN_HIERARCHY > + select GENERIC_MSI_IRQ > + > config EXYNOS_IRQ_COMBINER > bool "Samsung Exynos IRQ combiner support" if COMPILE_TEST > depends on (ARCH_EXYNOS && ARM) || COMPILE_TEST > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index ffd945fe71aa..d714724387ce 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -95,6 +95,7 @@ obj-$(CONFIG_QCOM_MPM) += irq-qcom-mpm.o > obj-$(CONFIG_CSKY_MPINTC) += irq-csky-mpintc.o > obj-$(CONFIG_CSKY_APB_INTC) += irq-csky-apb-intc.o > obj-$(CONFIG_RISCV_INTC) += irq-riscv-intc.o > +obj-$(CONFIG_RISCV_IMSIC) += irq-riscv-imsic-state.o irq-riscv-imsic-early.o > obj-$(CONFIG_SIFIVE_PLIC) += irq-sifive-plic.o > obj-$(CONFIG_IMX_IRQSTEER) += irq-imx-irqsteer.o > obj-$(CONFIG_IMX_INTMUX) += irq-imx-intmux.o > diff --git a/drivers/irqchip/irq-riscv-imsic-early.c b/drivers/irqchip/irq-riscv-imsic-early.c > new file mode 100644 > index 000000000000..23f689ff5807 > --- /dev/null > +++ b/drivers/irqchip/irq-riscv-imsic-early.c > @@ -0,0 +1,235 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2021 Western Digital Corporation or its affiliates. > + * Copyright (C) 2022 Ventana Micro Systems Inc. > + */ > + > +#define pr_fmt(fmt) "riscv-imsic: " fmt > +#include <linux/cpu.h> > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/irq.h> > +#include <linux/irqchip.h> > +#include <linux/irqchip/chained_irq.h> > +#include <linux/module.h> > +#include <linux/spinlock.h> > +#include <linux/smp.h> > + > +#include "irq-riscv-imsic-state.h" > + > +static int imsic_parent_irq; > + > +#ifdef CONFIG_SMP > +static irqreturn_t imsic_local_sync_handler(int irq, void *data) > +{ > + imsic_local_sync(); > + return IRQ_HANDLED; > +} > + > +static void imsic_ipi_send(unsigned int cpu) > +{ > + struct imsic_local_config *local = > + per_cpu_ptr(imsic->global.local, cpu); General nit for the series; There's a lot line breaks in the series. Try to use the full 100 chars for a line. > + > + writel(IMSIC_IPI_ID, local->msi_va); Do you need the barriers here? If so, please document. If not, use the _releaxed() version. > +} > + > +static void imsic_ipi_starting_cpu(void) > +{ > + /* Enable IPIs for current CPU. */ > + __imsic_id_set_enable(IMSIC_IPI_ID); > + > + /* Enable virtual IPI used for IMSIC ID synchronization */ > + enable_percpu_irq(imsic->ipi_virq, 0); Maybe pass IRQ_TYPE_NONE instead of 0, so it's clearer? > +} > + > +static void imsic_ipi_dying_cpu(void) > +{ > + /* > + * Disable virtual IPI used for IMSIC ID synchronization so > + * that we don't receive ID synchronization requests. > + */ > + disable_percpu_irq(imsic->ipi_virq); > +} > + > +static int __init imsic_ipi_domain_init(void) > +{ > + int virq; > + > + /* Create IMSIC IPI multiplexing */ > + virq = ipi_mux_create(IMSIC_NR_IPI, imsic_ipi_send); > + if (virq <= 0) > + return (virq < 0) ? virq : -ENOMEM; > + imsic->ipi_virq = virq; > + > + /* First vIRQ is used for IMSIC ID synchronization */ > + virq = request_percpu_irq(imsic->ipi_virq, imsic_local_sync_handler, > + "riscv-imsic-lsync", imsic->global.local); > + if (virq) > + return virq; > + irq_set_status_flags(imsic->ipi_virq, IRQ_HIDDEN); > + imsic->ipi_lsync_desc = irq_to_desc(imsic->ipi_virq); > + > + /* Set vIRQ range */ > + riscv_ipi_set_virq_range(imsic->ipi_virq + 1, IMSIC_NR_IPI - 1, true); > + > + /* Announce that IMSIC is providing IPIs */ > + pr_info("%pfwP: providing IPIs using interrupt %d\n", > + imsic->fwnode, IMSIC_IPI_ID); > + > + return 0; > +} > +#else > +static void imsic_ipi_starting_cpu(void) > +{ > +} > + > +static void imsic_ipi_dying_cpu(void) > +{ > +} > + > +static int __init imsic_ipi_domain_init(void) > +{ > + return 0; > +} > +#endif > + > +/* > + * To handle an interrupt, we read the TOPEI CSR and write zero in one > + * instruction. If TOPEI CSR is non-zero then we translate TOPEI.ID to > + * Linux interrupt number and let Linux IRQ subsystem handle it. > + */ > +static void imsic_handle_irq(struct irq_desc *desc) > +{ > + struct irq_chip *chip = irq_desc_get_chip(desc); > + int err, cpu = smp_processor_id(); > + struct imsic_vector *vec; > + unsigned long local_id; > + > + chained_irq_enter(chip, desc); > + > + while ((local_id = csr_swap(CSR_TOPEI, 0))) { > + local_id = local_id >> TOPEI_ID_SHIFT; > + > + if (local_id == IMSIC_IPI_ID) { > +#ifdef CONFIG_SMP > + ipi_mux_process(); > +#endif > + continue; > + } > + > + if (unlikely(!imsic->base_domain)) > + continue; > + > + vec = imsic_vector_from_local_id(cpu, local_id); > + if (!vec) { > + pr_warn_ratelimited( > + "vector not found for local ID 0x%lx\n", > + local_id); > + continue; > + } > + > + err = generic_handle_domain_irq(imsic->base_domain, > + vec->hwirq); > + if (unlikely(err)) > + pr_warn_ratelimited( > + "hwirq 0x%x mapping not found\n", > + vec->hwirq); > + } > + > + chained_irq_exit(chip, desc); > +} > + > +static int imsic_starting_cpu(unsigned int cpu) > +{ > + /* Enable per-CPU parent interrupt */ > + enable_percpu_irq(imsic_parent_irq, > + irq_get_trigger_type(imsic_parent_irq)); > + > + /* Setup IPIs */ > + imsic_ipi_starting_cpu(); > + > + /* > + * Interrupts identities might have been enabled/disabled while > + * this CPU was not running so sync-up local enable/disable state. > + */ > + imsic_local_sync(); > + > + /* Enable local interrupt delivery */ > + imsic_local_delivery(true); > + > + return 0; > +} > + > +static int imsic_dying_cpu(unsigned int cpu) > +{ > + /* Cleanup IPIs */ > + imsic_ipi_dying_cpu(); > + > + return 0; > +} > + > +static int __init imsic_early_probe(struct fwnode_handle *fwnode) > +{ > + int rc; > + struct irq_domain *domain; > + > + /* Find parent domain and register chained handler */ > + domain = irq_find_matching_fwnode(riscv_get_intc_hwnode(), > + DOMAIN_BUS_ANY); > + if (!domain) { > + pr_err("%pfwP: Failed to find INTC domain\n", fwnode); > + return -ENOENT; > + } > + imsic_parent_irq = irq_create_mapping(domain, RV_IRQ_EXT); > + if (!imsic_parent_irq) { > + pr_err("%pfwP: Failed to create INTC mapping\n", fwnode); > + return -ENOENT; > + } > + irq_set_chained_handler(imsic_parent_irq, imsic_handle_irq); > + > + /* Initialize IPI domain */ > + rc = imsic_ipi_domain_init(); > + if (rc) { > + pr_err("%pfwP: Failed to initialize IPI domain\n", fwnode); > + return rc; > + } > + > + /* > + * Setup cpuhp state (must be done after setting imsic_parent_irq) > + * > + * Don't disable per-CPU IMSIC file when CPU goes offline > + * because this affects IPI and the masking/unmasking of > + * virtual IPIs is done via generic IPI-Mux > + */ > + cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, > + "irqchip/riscv/imsic:starting", > + imsic_starting_cpu, imsic_dying_cpu); > + > + return 0; > +} > + > +static int __init imsic_early_dt_init(struct device_node *node, > + struct device_node *parent) > +{ > + int rc; > + struct fwnode_handle *fwnode = &node->fwnode; > + > + /* Setup IMSIC state */ > + rc = imsic_setup_state(fwnode); > + if (rc) { > + pr_err("%pfwP: failed to setup state (error %d)\n", > + fwnode, rc); > + return rc; > + } > + > + /* Do early setup of IPIs */ > + rc = imsic_early_probe(fwnode); > + if (rc) > + return rc; > + > + /* Ensure that OF platform device gets probed */ > + of_node_clear_flag(node, OF_POPULATED); > + return 0; > +} > +IRQCHIP_DECLARE(riscv_imsic, "riscv,imsics", imsic_early_dt_init); > diff --git a/drivers/irqchip/irq-riscv-imsic-state.c b/drivers/irqchip/irq-riscv-imsic-state.c > new file mode 100644 > index 000000000000..54465e47851c > --- /dev/null > +++ b/drivers/irqchip/irq-riscv-imsic-state.c > @@ -0,0 +1,962 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2021 Western Digital Corporation or its affiliates. > + * Copyright (C) 2022 Ventana Micro Systems Inc. > + */ > + > +#define pr_fmt(fmt) "riscv-imsic: " fmt > +#include <linux/cpu.h> > +#include <linux/bitmap.h> > +#include <linux/interrupt.h> > +#include <linux/irq.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/of_irq.h> > +#include <linux/seq_file.h> > +#include <linux/spinlock.h> > +#include <linux/smp.h> > +#include <asm/hwcap.h> > + > +#include "irq-riscv-imsic-state.h" > + > +#define IMSIC_DISABLE_EIDELIVERY 0 > +#define IMSIC_ENABLE_EIDELIVERY 1 > +#define IMSIC_DISABLE_EITHRESHOLD 1 > +#define IMSIC_ENABLE_EITHRESHOLD 0 > + > +#define imsic_csr_write(__c, __v) \ > +do { \ > + csr_write(CSR_ISELECT, __c); \ > + csr_write(CSR_IREG, __v); \ > +} while (0) > + > +#define imsic_csr_read(__c) \ > +({ \ > + unsigned long __v; \ > + csr_write(CSR_ISELECT, __c); \ > + __v = csr_read(CSR_IREG); \ > + __v; \ > +}) > + > +#define imsic_csr_read_clear(__c, __v) \ > +({ \ > + unsigned long __r; \ > + csr_write(CSR_ISELECT, __c); \ > + __r = csr_read_clear(CSR_IREG, __v); \ > + __r; \ > +}) > + > +#define imsic_csr_set(__c, __v) \ > +do { \ > + csr_write(CSR_ISELECT, __c); \ > + csr_set(CSR_IREG, __v); \ > +} while (0) > + > +#define imsic_csr_clear(__c, __v) \ > +do { \ > + csr_write(CSR_ISELECT, __c); \ > + csr_clear(CSR_IREG, __v); \ > +} while (0) > + > +struct imsic_priv *imsic; > + > +const struct imsic_global_config *imsic_get_global_config(void) > +{ > + return (imsic) ? &imsic->global : NULL; Nit: No need for the parenthesis. > +} > +EXPORT_SYMBOL_GPL(imsic_get_global_config); > + > +static bool __imsic_eix_read_clear(unsigned long id, bool pend) > +{ > + unsigned long isel, imask; > + > + isel = id / BITS_PER_LONG; > + isel *= BITS_PER_LONG / IMSIC_EIPx_BITS; > + isel += (pend) ? IMSIC_EIP0 : IMSIC_EIE0; > + imask = BIT(id & (__riscv_xlen - 1)); > + > + return (imsic_csr_read_clear(isel, imask) & imask) ? true : false; > +} > + > +#define __imsic_id_read_clear_enabled(__id) \ > + __imsic_eix_read_clear((__id), false) > +#define __imsic_id_read_clear_pending(__id) \ > + __imsic_eix_read_clear((__id), true) > + > +void __imsic_eix_update(unsigned long base_id, > + unsigned long num_id, bool pend, bool val) > +{ > + unsigned long i, isel, ireg; > + unsigned long id = base_id, last_id = base_id + num_id; > + > + while (id < last_id) { > + isel = id / BITS_PER_LONG; > + isel *= BITS_PER_LONG / IMSIC_EIPx_BITS; > + isel += (pend) ? IMSIC_EIP0 : IMSIC_EIE0; Parenthesis nit. > + > + ireg = 0; > + for (i = id & (__riscv_xlen - 1); > + (id < last_id) && (i < __riscv_xlen); i++) { > + ireg |= BIT(i); > + id++; > + } > + > + /* > + * The IMSIC EIEx and EIPx registers are indirectly > + * accessed via using ISELECT and IREG CSRs so we > + * need to access these CSRs without getting preempted. > + * > + * All existing users of this function call this > + * function with local IRQs disabled so we don't > + * need to do anything special here. > + */ > + if (val) > + imsic_csr_set(isel, ireg); > + else > + imsic_csr_clear(isel, ireg); > + } > +} > + > +void imsic_local_sync(void) > +{ > + struct imsic_local_priv *lpriv = this_cpu_ptr(imsic->lpriv); > + struct imsic_local_config *mlocal; > + struct imsic_vector *mvec; > + unsigned long flags; > + int i; > + > + raw_spin_lock_irqsave(&lpriv->ids_lock, flags); > + for (i = 1; i <= imsic->global.nr_ids; i++) { > + if (i == IMSIC_IPI_ID) > + continue; > + > + if (test_bit(i, lpriv->ids_enabled_bitmap)) > + __imsic_id_set_enable(i); > + else > + __imsic_id_clear_enable(i); > + > + mvec = lpriv->ids_move[i]; > + lpriv->ids_move[i] = NULL; > + if (mvec) { > + if (__imsic_id_read_clear_pending(i)) { > + mlocal = per_cpu_ptr(imsic->global.local, > + mvec->cpu); > + writel(mvec->local_id, mlocal->msi_va); Again, do you need all the barriers? If yes, document. No, then relax the call. > + } > + > + lpriv->vectors[i].hwirq = UINT_MAX; > + lpriv->vectors[i].order = UINT_MAX; > + clear_bit(i, lpriv->ids_used_bitmap); > + } > + > + } > + raw_spin_unlock_irqrestore(&lpriv->ids_lock, flags); > +} > + > +void imsic_local_delivery(bool enable) > +{ > + if (enable) { > + imsic_csr_write(IMSIC_EITHRESHOLD, IMSIC_ENABLE_EITHRESHOLD); > + imsic_csr_write(IMSIC_EIDELIVERY, IMSIC_ENABLE_EIDELIVERY); > + } else { > + imsic_csr_write(IMSIC_EIDELIVERY, IMSIC_DISABLE_EIDELIVERY); > + imsic_csr_write(IMSIC_EITHRESHOLD, IMSIC_DISABLE_EITHRESHOLD); > + } My regular "early exit" nit. I guess I really dislike indentation. ;-) > +} > + > +#ifdef CONFIG_SMP > +static void imsic_remote_sync(unsigned int cpu) > +{ > + /* > + * We simply inject ID synchronization IPI to a target CPU > + * if it is not same as the current CPU. The ipi_send_mask() > + * implementation of IPI mux will inject ID synchronization > + * IPI only for CPUs that have enabled it so offline CPUs > + * won't receive IPI. An offline CPU will unconditionally > + * synchronize IDs through imsic_starting_cpu() when the > + * CPU is brought up. > + */ > + if (cpu_online(cpu)) { > + if (cpu != smp_processor_id()) > + __ipi_send_mask(imsic->ipi_lsync_desc, cpumask_of(cpu)); > + else > + imsic_local_sync(); > + } > +} > +#else > +static inline void imsic_remote_sync(unsigned int cpu) Remove inline. > +{ > + imsic_local_sync(); > +} > +#endif > + > +void imsic_vector_mask(struct imsic_vector *vec) > +{ > + struct imsic_local_priv *lpriv; > + unsigned long flags; > + > + lpriv = per_cpu_ptr(imsic->lpriv, vec->cpu); > + if (WARN_ON(&lpriv->vectors[vec->local_id] != vec)) > + return; > + > + raw_spin_lock_irqsave(&lpriv->ids_lock, flags); > + bitmap_clear(lpriv->ids_enabled_bitmap, vec->local_id, 1); > + raw_spin_unlock_irqrestore(&lpriv->ids_lock, flags); > + > + imsic_remote_sync(vec->cpu); x86 seems to set a timer instead, for the remote cpu cleanup, which can be much cheaper, and less in instrusive. Is that applicable here? > +} > + > +void imsic_vector_unmask(struct imsic_vector *vec) > +{ > + struct imsic_local_priv *lpriv; > + unsigned long flags; > + > + lpriv = per_cpu_ptr(imsic->lpriv, vec->cpu); > + if (WARN_ON(&lpriv->vectors[vec->local_id] != vec)) > + return; > + > + raw_spin_lock_irqsave(&lpriv->ids_lock, flags); > + bitmap_set(lpriv->ids_enabled_bitmap, vec->local_id, 1); > + raw_spin_unlock_irqrestore(&lpriv->ids_lock, flags); > + > + imsic_remote_sync(vec->cpu); > +} > + > +void imsic_vector_move(struct imsic_vector *old_vec, > + struct imsic_vector *new_vec) > +{ > + struct imsic_local_priv *old_lpriv, *new_lpriv; > + struct imsic_vector *ovec, *nvec; > + unsigned long flags, flags1; > + unsigned int i; > + > + if (WARN_ON(old_vec->cpu == new_vec->cpu || > + old_vec->order != new_vec->order || > + (old_vec->local_id & IMSIC_VECTOR_MASK(old_vec)) || > + (new_vec->local_id & IMSIC_VECTOR_MASK(new_vec)))) > + return; > + > + old_lpriv = per_cpu_ptr(imsic->lpriv, old_vec->cpu); > + if (WARN_ON(&old_lpriv->vectors[old_vec->local_id] != old_vec)) > + return; > + > + new_lpriv = per_cpu_ptr(imsic->lpriv, new_vec->cpu); > + if (WARN_ON(&new_lpriv->vectors[new_vec->local_id] != new_vec)) > + return; > + > + raw_spin_lock_irqsave(&old_lpriv->ids_lock, flags); > + raw_spin_lock_irqsave(&new_lpriv->ids_lock, flags1); > + > + /* Move the state of each vector entry */ > + for (i = 0; i < BIT(old_vec->order); i++) { > + ovec = old_vec + i; > + nvec = new_vec + i; > + > + /* Unmask the new vector entry */ > + if (test_bit(ovec->local_id, old_lpriv->ids_enabled_bitmap)) > + bitmap_set(new_lpriv->ids_enabled_bitmap, > + nvec->local_id, 1); > + > + /* Mask the old vector entry */ > + bitmap_clear(old_lpriv->ids_enabled_bitmap, ovec->local_id, 1); > + > + /* > + * Move and re-trigger the new vector entry based on the > + * pending state of the old vector entry because we might > + * get a device interrupt on the old vector entry while > + * device was being moved to the new vector entry. > + */ > + old_lpriv->ids_move[ovec->local_id] = nvec; > + } Hmm, nested spinlocks, and reimplementing what the irq matrix allocator does. Convince me why irq matrix is not a good fit to track the interrupts IDs *and* get handling/tracking for managed/unmanaged interrupts. You said that it was the power-of-two blocks for MSI, but can't that be enfored on matrix alloc? Where are you doing the special handling of MSI? The reason I'm asking is because I'm pretty certain that x86 has proper MSI support (Thomas Gleixner can answer for sure! ;-)) IMSIC smells a lot like the the LAPIC. The implementation could probably be *very* close to what arch/x86/kernel/apic/vector.c does. Am I completly off here? Björn
