From nobody Tue Feb 10 06:56:11 2026 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3266031AF2C for ; Wed, 14 Jan 2026 15:14:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768403675; cv=none; b=sv6pwEmrh7elQeyEAAGFhKJaVYHcedWU+FW0nFyoldeuRf9su9vcvH5T2BIcaON6wqAGW15JdJUZhRS5YazWbFIWvdaP3EcPHb4i0JELgEX1ljBfKCHU84ekHLBxNEJwcJ++jqtb7RwmCU72Eaxsh50+xFX2MaoT7D+usqO8I0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768403675; c=relaxed/simple; bh=3w9x74jvoREdIp5sUyjkTqZxpMoWLz4rF2zIt3mzXw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MfoIM+U/ZSLF0VIZBMiWcAlBJXBIcN97TwohYgjN+4Ft0TMSTL5HSAxl8q18QmHFegjrBTaJyu8LFHUdNIK9HATlN9tTRDgn4M4GGHDn8oRG7+DzuIiMAcR4REIc/uz3TjptiN4ljQl+1OxEth0eTW5dLgqfHzMgwVYJr+/FwwU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CXFjAT3g; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CXFjAT3g" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4779aa4f928so88316595e9.1 for ; Wed, 14 Jan 2026 07:14:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768403672; x=1769008472; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C8A+Z3N19sy1v8240Of8lIsB5cOXR7K+c682PDevVZw=; b=CXFjAT3gyQ8p+tLGiwV1h4vJxIk0y9qiggBGgx+2/Glv3A4MM6/a9MUNuVTLIABxBH 9dC66puXLDDOsJx3hohSR5WKHaESWtPDeYkeOjYUe2psMXeiRC5oV8C3amNHeNm9RWSv +rKD5Zwb3AIjHXsi1YE9MRpmJkDFgyQF7d8nCsiHP0nharX1eZ3HDAx+5bAuK1Dm8iYk DhapoU07c00rxnDXBRvedVg7r8g+2gt8B9WOB13MKcT42nvoHPv5XBRBpjisGE4RBH1e tnW71zZiXnQXGTJ0M0Y6OeZzljPbwxyWx3DlPu1e6p9EC1G+mrqCpofbwgcoHMPZ6miC bwRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768403672; x=1769008472; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=C8A+Z3N19sy1v8240Of8lIsB5cOXR7K+c682PDevVZw=; b=k09cXIfpd6Rj49P+7yXSAet8JVpRZhltdueQfyoATqJYYVb8GP+IFVqOylD4BBhQ28 ZVwjAmLs/9QHnTtf+6j0mjYDJ3LLt9lmRlxEyWk7f7YQ/QnjdMhCfE+lkOjzf4oNWFmE oDqRh+JOHffTkuBaAqDaAJSEgxMSko70tBICdi8UaHUXN3uFqWVQMunopZu4n71uEzC5 Yteg5sjfRYz7n59zp2PR6wh8siXWWkLbxlcycDM4lSYdAAWZ8cjx4/bEOAtsQ7DDgi8E FPNrv4cFDXpEBOkgM7uYS5sshPLm2bnIIkeDponca5xC5ztlU53V6PwINspNwhg1CzNK cYUw== X-Gm-Message-State: AOJu0YwZTqaLGPCs+BdxgdH49o0ov/aGgJQQJ17aDJXYnIZfHLt0nsFK J6ocgr4e5siw5sETyj0XlpnAK6MC1ZMXOFKq+fGTr72jUEgIxXY0wE2LHXVmfg== X-Gm-Gg: AY/fxX7boOAO37Zc5EUDg33UhUdQNpichdnBc8SOPfk5cq/fYzVw3w2zOE07ytE9ojs n0xr6nIwlDUApe3CubvSgsqmsyNwDi91J6lTEn5429yeF9Y0LG3RcGz9VC3ZXKnlBrjNfZrLY2g us1+OQXFmuTACD2sBZXQ4i8OKFONZM4/kO/HaI+SBR5pmFZwPbfqPjBforrcj44i6xQ29FcWOyU ywctdzl+xtiXVt+mswRXdRQBRGCMdhFnDmrKHACGcUZ8ph/89B3hV+V1MdmJw37v5WFTpdsuH2i l2dv2T/VwkydiHuNH7lyUzoTM3UGJmwfUR1Ya9noBQcUJ2tFwvE8oLDUxC27cWNd9LUnp2qXK9l ciM/FwjBzOBb4N17M0zVpFPqZBQE9w5M1nmd9+kn2B/RdvQsDIXs+b6yg98gJNqzoo9Fc9wjAoz OIbU81RMDSJP3454Ta6u67IhZYs6ELY5I9R8Ju5qxIFW5exMfAqGlX6SSQD0T3O/xe X-Received: by 2002:a05:600c:1f89:b0:47d:3ffa:5c75 with SMTP id 5b1f17b1804b1-47ee335157dmr33867745e9.20.1768403671798; Wed, 14 Jan 2026 07:14:31 -0800 (PST) Received: from localhost (brnt-04-b2-v4wan-170138-cust2432.vm7.cable.virginm.net. [94.175.9.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47ee7d58f09sm21659865e9.12.2026.01.14.07.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:14:31 -0800 (PST) From: Stafford Horne To: LKML Cc: Linux OpenRISC , devicetree , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stafford Horne , Thomas Gleixner , Jonas Bonn , Stefan Kristiansson Subject: [PATCH v5 4/6] openrisc: Fix IPIs on simple multicore systems Date: Wed, 14 Jan 2026 15:13:13 +0000 Message-ID: <20260114151328.3827992-5-shorne@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260114151328.3827992-1-shorne@gmail.com> References: <20260114151328.3827992-1-shorne@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit c05671846451 ("openrisc: sleep instead of spin on secondary wait") fixed OpenRISC SMP Linux for QEMU. However, stability was never achieved on FPGA development boards. This is because the above patch has a step to unmask IPIs on non-boot cpu's but on hardware without power management, IPIs remain masked. This meant that IPI's were never actually working on the simple SMP systems we run on development boards. The systems booted but stability was very suspect. Add the ability to unmask IPI's on the non-boot cores. This is done by making the OMPIC IRQs proper percpu IRQs. We can then use the enabled_percpu_irq() to unmask IRQ on the non-boot cpus. Update the or1k PIC driver to use a flow handler that can switch between percpu and the configured level or edge flow handlers at runtime. This mechanism is inspired by that done in the J-Core AIC driver. Signed-off-by: Stafford Horne Acked-by: Thomas Gleixner --- Since v4: - Added acked-by. arch/openrisc/include/asm/smp.h | 3 ++- arch/openrisc/kernel/smp.c | 22 +++++++++++++++++++++- drivers/irqchip/irq-ompic.c | 15 +++++++++++---- drivers/irqchip/irq-or1k-pic.c | 27 ++++++++++++++++++++++++++- 4 files changed, 60 insertions(+), 7 deletions(-) diff --git a/arch/openrisc/include/asm/smp.h b/arch/openrisc/include/asm/sm= p.h index e21d2f12b5b6..007296f160ef 100644 --- a/arch/openrisc/include/asm/smp.h +++ b/arch/openrisc/include/asm/smp.h @@ -20,7 +20,8 @@ extern void smp_init_cpus(void); extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); =20 -extern void set_smp_cross_call(void (*)(const struct cpumask *, unsigned i= nt)); +extern void set_smp_cross_call(void (*)(const struct cpumask *, unsigned i= nt), + unsigned int irq); extern void handle_IPI(unsigned int ipi_msg); =20 #endif /* __ASM_OPENRISC_SMP_H */ diff --git a/arch/openrisc/kernel/smp.c b/arch/openrisc/kernel/smp.c index 86da4bc5ee0b..040ca201b692 100644 --- a/arch/openrisc/kernel/smp.c +++ b/arch/openrisc/kernel/smp.c @@ -13,6 +13,7 @@ =20 #include #include +#include #include #include #include @@ -25,6 +26,7 @@ =20 asmlinkage __init void secondary_start_kernel(void); =20 +static unsigned int ipi_irq __ro_after_init; static void (*smp_cross_call)(const struct cpumask *, unsigned int); =20 unsigned long secondary_release =3D -1; @@ -39,6 +41,14 @@ enum ipi_msg_type { =20 static DEFINE_SPINLOCK(boot_lock); =20 +static void or1k_ipi_enable(void) +{ + if (WARN_ON_ONCE(!ipi_irq)) + return; + + enable_percpu_irq(ipi_irq, 0); +} + static void boot_secondary(unsigned int cpu, struct task_struct *idle) { /* @@ -136,6 +146,7 @@ asmlinkage __init void secondary_start_kernel(void) complete(&cpu_running); =20 synchronise_count_slave(cpu); + or1k_ipi_enable(); set_cpu_online(cpu, true); =20 local_irq_enable(); @@ -195,9 +206,18 @@ void smp_send_stop(void) smp_call_function(stop_this_cpu, NULL, 0); } =20 -void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned= int)) +void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned= int), + unsigned int irq) { + if (WARN_ON(ipi_irq)) + return; + smp_cross_call =3D fn; + + ipi_irq =3D irq; + + /* Enabled IPIs for boot CPU immediately */ + or1k_ipi_enable(); } =20 void arch_send_call_function_single_ipi(int cpu) diff --git a/drivers/irqchip/irq-ompic.c b/drivers/irqchip/irq-ompic.c index e66ef4373b1e..f0e0b435bb1d 100644 --- a/drivers/irqchip/irq-ompic.c +++ b/drivers/irqchip/irq-ompic.c @@ -84,6 +84,8 @@ DEFINE_PER_CPU(unsigned long, ops); =20 static void __iomem *ompic_base; =20 +static DEFINE_PER_CPU_READ_MOSTLY(int, ipi_dummy_dev); + static inline u32 ompic_readreg(void __iomem *base, loff_t offset) { return ioread32be(base + offset); @@ -183,12 +185,17 @@ static int __init ompic_of_init(struct device_node *n= ode, goto out_unmap; } =20 - ret =3D request_irq(irq, ompic_ipi_handler, IRQF_PERCPU, - "ompic_ipi", NULL); - if (ret) + irq_set_percpu_devid(irq); + ret =3D request_percpu_irq(irq, ompic_ipi_handler, "ompic_ipi", + &ipi_dummy_dev); + + if (ret) { + pr_err("ompic: failed to request irq %d, error: %d", + irq, ret); goto out_irq_disp; + } =20 - set_smp_cross_call(ompic_raise_softirq); + set_smp_cross_call(ompic_raise_softirq, irq); =20 return 0; =20 diff --git a/drivers/irqchip/irq-or1k-pic.c b/drivers/irqchip/irq-or1k-pic.c index 48126067c54b..73dc99c71d40 100644 --- a/drivers/irqchip/irq-or1k-pic.c +++ b/drivers/irqchip/irq-or1k-pic.c @@ -118,11 +118,36 @@ static void or1k_pic_handle_irq(struct pt_regs *regs) generic_handle_domain_irq(root_domain, irq); } =20 +/* + * The OR1K PIC is a cpu-local interrupt controller and does not distingui= sh or + * use distinct irq number ranges for per-cpu event interrupts (IPI). Since + * information to determine whether a particular irq number should be trea= ted as + * per-cpu is not available at mapping time, we use a wrapper handler func= tion + * which chooses the right handler at runtime based on whether IRQF_PERCPU= was + * used when requesting the irq. Borrowed from J-Core AIC. + */ +static void or1k_irq_flow_handler(struct irq_desc *desc) +{ +#ifdef CONFIG_SMP + struct irq_data *data =3D irq_desc_get_irq_data(desc); + struct or1k_pic_dev *pic =3D data->domain->host_data; + + if (irqd_is_per_cpu(data)) + handle_percpu_devid_irq(desc); + else + pic->handle(desc); +#endif +} + static int or1k_map(struct irq_domain *d, unsigned int irq, irq_hw_number_= t hw) { struct or1k_pic_dev *pic =3D d->host_data; =20 - irq_set_chip_and_handler(irq, &pic->chip, pic->handle); + if (IS_ENABLED(CONFIG_SMP)) + irq_set_chip_and_handler(irq, &pic->chip, or1k_irq_flow_handler); + else + irq_set_chip_and_handler(irq, &pic->chip, pic->handle); + irq_set_status_flags(irq, pic->flags); =20 return 0; --=20 2.51.0