RISC-V IPI Improvements
cover RISC-V IPI Improvements
This series aims to improve IPI support in Linux RISC-V in following ways:
1) Treat IPIs as normal per-CPU interrupts instead of having custom RISC-V specific hooks. This also makes Linux RISC-V IPI support aligned with other architectures.
2) Remote TLB flushes and icache flushes should prefer local IPIs instead of SBI calls whenever we have specialized hardware (such as RISC-V AIA IMSIC and RISC-V ACLINT) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.
These patches were already part of the "Linux RISC-V ACLINT Support" series but this now a separate series so that it can be merged independently of the "Linux RISC-V ACLINT Support" series.
(Refer, https://lore.kernel.org/lkml/[email protected]/)
These patches are also a preparatory patches for the up-coming:
1) Linux RISC-V ACLINT support
2) Linux RISC-V AIA support
3) KVM RISC-V TLB flush improvements
These patches can also be found in riscv_ipi_imp_v1 branch at:
https://github.com/avpatel/linux.git
Anup Patel (6):
RISC-V: Clear SIP bit only when using SBI IPI operations irqchip/riscv-intc: Set intc domain as the default host
RISC-V: Treat IPIs as normal Linux IRQs
RISC-V: Allow marking IPIs as suitable for remote FENCEs
RISC-V: Use IPIs for remote TLB flush when possible
RISC-V: Use IPIs for remote icache flush when possible
arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ipi-mux.h | 45 +++++++ arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 49 +++++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 217 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi.c | 18 ++- arch/riscv/kernel/smp.c | 164 +++++++++++----------- arch/riscv/kernel/smpboot.c | 5 +- arch/riscv/mm/cacheflush.c | 5 +- arch/riscv/mm/tlbflush.c | 93 ++++++++++--- drivers/clocksource/timer-clint.c | 8 +- drivers/clocksource/timer-riscv.c | 17 +-- drivers/irqchip/irq-riscv-intc.c | 62 ++++----- 16 files changed, 521 insertions(+), 172 deletions(-) create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.c
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 1/6 RISC-V: Clear SIP bit only when using SBI IPI operations
The software interrupt pending (i.e. [M|S]SIP) bit is writeable for S-mode but read-only for M-mode so we clear this bit only when using SBI IPI operations.
--- arch/riscv/kernel/sbi.c | 8 +++++++- arch/riscv/kernel/smp.c | 2 -- 2 files changed, 7 insertions(+), 3 deletions(-)
arch/riscv/kernel/sbi.c +7 -1
@@ -621,8 +621,14 @@ static void sbi_send_cpumask_ipi(const struct cpumask *target)sbi_send_ipi (target); } +static void sbi_ipi_clear (void ) +{ +csr_clear (CSR_IP ,IE_SIE ); +} +static const struct riscv_ipi_ops sbi_ipi_ops = { - .ipi_inject = sbi_send_cpumask_ipi + .ipi_inject = sbi_send_cpumask_ipi, + .ipi_clear = sbi_ipi_clear };void __init sbi_init (void )
arch/riscv/kernel/smp.c +0 -2
@@ -89,8 +89,6 @@ void riscv_clear_ipi(void) {if (ipi_ops && ipi_ops->ipi_clear) ipi_ops->ipi_clear (); - -csr_clear (CSR_IP ,IE_SIE ); }EXPORT_SYMBOL_GPL (riscv_clear_ipi);
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 2/6 irqchip/riscv-intc: Set intc domain as the default host
In reply to Anup PatelWe have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)
drivers/clocksource/timer-riscv.c +1 -16
@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {
@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;
drivers/irqchip/irq-riscv-intc.c +9 -0
@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc; } +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain); + cpuhp_setup_state(CPUHP_AP_IRQ_RISCV_STARTING, "irqchip/riscv/intc:starting", riscv_intc_cpu_starting,
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 3/6 RISC-V: Treat IPIs as normal Linux IRQs
In reply to Anup PatelCurrently, the RISC-V kernel provides arch specific hooks (i.e. struct riscv_ipi_ops) to register IPI handling methods. The stats gathering of IPIs is also arch specific in the RISC-V kernel.
Other architectures (such as ARM, ARM64, and MIPS) have moved away from custom arch specific IPI handling methods. Currently, these architectures have Linux irqchip drivers providing a range of Linux IRQ numbers to be used as IPIs and IPI triggering is done using generic IPI APIs. This approach allows architectures to treat IPIs as normal Linux IRQs and IPI stats gathering is done by the generic Linux IRQ subsystem.
We extend the RISC-V IPI handling as-per above approach so that arch specific IPI handling methods (struct riscv_ipi_ops) can be removed and the IPI handling is totally contained within Linux irqchip drivers.
--- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ipi-mux.h | 43 ++++++ arch/riscv/include/asm/sbi.h | 2 + arch/riscv/include/asm/smp.h | 35 +++-- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/cpu-hotplug.c | 3 +- arch/riscv/kernel/ipi-mux.c | 216 ++++++++++++++++++++++++++++++ arch/riscv/kernel/irq.c | 3 +- arch/riscv/kernel/sbi.c | 13 +- arch/riscv/kernel/smp.c | 153 +++++++++++---------- arch/riscv/kernel/smpboot.c | 5 +- drivers/clocksource/timer-clint.c | 8 +- drivers/irqchip/irq-riscv-intc.c | 55 ++++---- 13 files changed, 399 insertions(+), 139 deletions(-) create mode 100644 arch/riscv/include/asm/ipi-mux.h create mode 100644 arch/riscv/kernel/ipi-mux.c
arch/riscv/Kconfig +1 -0
@@ -54,6 +54,7 @@ config RISCV select GENERIC_GETTIMEOFDAY if HAVE_GENERIC_VDSO select GENERIC_IDLE_POLL_SETUP select GENERIC_IOREMAP if MMU + select GENERIC_IRQ_IPI select GENERIC_IRQ_MULTI_HANDLER select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL
arch/riscv/include/asm/ipi-mux.h new file +43 -0
43 lines not on this page · raw message
arch/riscv/include/asm/sbi.h +2 -0
@@ -116,6 +116,7 @@ struct sbiret { };void sbi_init (void ); +void sbi_ipi_init (void ); struct sbiret sbi_ecall(int ext, int fid, unsigned long arg0, unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4,
@@ -185,6 +186,7 @@ static inline unsigned long sbi_mk_version(unsigned long major,int sbi_err_map_linux_errno (int err);#else /* CONFIG_RISCV_SBI */ static inline int sbi_remote_fence_i (const struct cpumask *cpu_mask) {return -1 ; } +static inline void sbi_ipi_init (void ) { }static inline void sbi_init (void ) {}#endif /* CONFIG_RISCV_SBI */ #endif /* _ASM_RISCV_SBI_H */
arch/riscv/include/asm/smp.h +21 -14
@@ -15,11 +15,6 @@struct seq_file ;extern unsigned long boot_cpu_hartid; -struct riscv_ipi_ops { -void (*ipi_inject)(const struct cpumask *target); -void (*ipi_clear)(void ); -}; -#ifdef CONFIG_SMP /* * Mapping between linux logical cpu index and hartid.
@@ -33,9 +28,6 @@ void show_ipi_stats(struct seq_file *p, int prec);/* SMP initialization hook for setup_arch */ void __init setup_smp (void ); -/* Called from C code, this handles an IPI. */ -void handle_IPI (struct pt_regs *regs); -/* Hook for the generic smp_call_function_many() routine. */ void arch_send_call_function_ipi_mask (struct cpumask *mask);
@@ -44,11 +36,17 @@ void arch_send_call_function_single_ipi(int cpu);int riscv_hartid_to_cpuid (int hartid); -/* Set custom IPI operations */ -void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops); +/* Enable IPI for CPU hotplug */ +void riscv_ipi_enable (void ); + +/* Disable IPI for CPU hotplug */ +void riscv_ipi_disable (void ); -/* Clear IPI for current CPU */ -void riscv_clear_ipi (void ); +/* Check if IPI interrupt numbers are available */ +bool riscv_ipi_have_virq_range (void ); + +/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ +void riscv_ipi_set_virq_range (int virq,int nr_irqs);/* Secondary hart entry */ asmlinkage void smp_callin(void);
@@ -82,11 +80,20 @@ static inline unsigned long cpuid_to_hartid_map(int cpu)return boot_cpu_hartid; } -static inline void riscv_set_ipi_ops (const struct riscv_ipi_ops *ops) +static inline void riscv_ipi_enable (void ) { } -static inline void riscv_clear_ipi (void ) +static inline void riscv_ipi_disable (void ) +{ +} + +static inline bool riscv_ipi_have_virq_range (void ) +{ +return false; +} + +static inline void riscv_ipi_set_virq_range (int virq,int nr) { }
arch/riscv/kernel/Makefile +1 -0
@@ -42,6 +42,7 @@ obj-$(CONFIG_RISCV_M_MODE) += traps_misaligned.o obj-$(CONFIG_FPU) += fpu.o obj-$(CONFIG_SMP) += smpboot.o obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_SMP) += ipi-mux.o obj-$(CONFIG_SMP) += cpu_ops.o obj-$(CONFIG_RISCV_BOOT_SPINWAIT) += cpu_ops_spinwait.o
arch/riscv/kernel/cpu-hotplug.c +2 -1
@@ -12,7 +12,7 @@#include <linux/sched/hotplug.h> #include <asm/irq.h> #include <asm/cpu_ops.h> -#include <asm/sbi.h> +#include <asm/smp.h> bool cpu_has_hotplug (unsigned int cpu) {
@@ -41,6 +41,7 @@ int __cpu_disable(void)remove_cpu_topology (cpu);set_cpu_online (cpu, false); +riscv_ipi_disable ();irq_migrate_all_off_this_cpu ();return ret;
arch/riscv/kernel/ipi-mux.c new file +216 -0
216 lines not on this page · raw message
arch/riscv/kernel/irq.c +2 -1
@@ -8,7 +8,7 @@#include <linux/interrupt.h> #include <linux/irqchip.h> #include <linux/seq_file.h> -#include <asm/smp.h> +#include <asm/sbi.h> int arch_show_interrupts (struct seq_file *p,int prec) {
@@ -21,4 +21,5 @@ void __init init_IRQ(void)irqchip_init ();if (!handle_arch_irq)panic ("No interrupt controller found." ); +sbi_ipi_init (); }
arch/riscv/kernel/sbi.c +7 -6
@@ -5,9 +5,11 @@* Copyright (c) 2020 Western Digital Corporation or its affiliates. */ +#define pr_fmt (fmt) "riscv: " fmt#include <linux/init.h> #include <linux/pm.h> #include <linux/reboot.h> +#include <asm/ipi-mux.h> #include <asm/sbi.h> #include <asm/smp.h>
@@ -626,10 +628,11 @@ static void sbi_ipi_clear(void)csr_clear (CSR_IP ,IE_SIE ); } -static const struct riscv_ipi_ops sbi_ipi_ops = { - .ipi_inject = sbi_send_cpumask_ipi, - .ipi_clear = sbi_ipi_clear -}; +void __init sbi_ipi_init (void ) +{ +if (riscv_ipi_mux_create (true, sbi_ipi_clear, sbi_send_cpumask_ipi)) +pr_info ("providing IPIs using SBI IPI extension\n" ); +}void __init sbi_init (void ) {
@@ -677,6 +680,4 @@ void __init sbi_init(void) __sbi_send_ipi = __sbi_send_ipi_v01; __sbi_rfence = __sbi_rfence_v01; } - -riscv_set_ipi_ops (&sbi_ipi_ops); }
arch/riscv/kernel/smp.c +76 -77
204 lines not on this page · raw message
arch/riscv/kernel/smpboot.c +2 -3
@@ -30,7 +30,6 @@#include <asm/numa.h> #include <asm/tlbflush.h> #include <asm/sections.h> -#include <asm/sbi.h> #include <asm/smp.h> #include <asm/alternative.h>
@@ -159,12 +158,12 @@ asmlinkage __visible void smp_callin(void)struct mm_struct *mm = &init_mm;unsigned int curr_cpuid =smp_processor_id (); -riscv_clear_ipi (); -/* All kernel threads share the same mm context. */ mmgrab (mm); current->active_mm = mm; +riscv_ipi_enable (); +notify_cpu_starting (curr_cpuid);numa_add_cpu (curr_cpuid);update_siblings_masks (curr_cpuid);
drivers/clocksource/timer-clint.c +2 -6
@@ -20,6 +20,7 @@#include <linux/of_irq.h> #include <linux/smp.h> #include <linux/timex.h> +#include <asm/ipi-mux.h> #ifndef CONFIG_RISCV_M_MODE #include <asm/clint.h>
@@ -54,11 +55,6 @@ static void clint_clear_ipi(void)writel (0 , clint_ipi_base +cpuid_to_hartid_map (smp_processor_id ())); } -static struct riscv_ipi_ops clint_ipi_ops = { - .ipi_inject = clint_send_ipi, - .ipi_clear = clint_clear_ipi, -}; -#ifdef CONFIG_64BIT #define clint_get_cycles () readq_relaxed(clint_timer_val)#else
@@ -228,7 +224,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_free_irq; } -riscv_set_ipi_ops (&clint_ipi_ops); +riscv_ipi_mux_create (true, clint_clear_ipi, clint_send_ipi);clint_clear_ipi ();return 0 ;
drivers/irqchip/irq-riscv-intc.c +24 -31
82 lines not on this page · raw message
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 4/6 RISC-V: Allow marking IPIs as suitable for remote FENCEs
In reply to Anup PatelTo do remote FENCEs (i.e. remote TLB flushes) using IPI calls on the RISC-V kernel, we need hardware mechanism to directly inject IPI from the RISC-V kernel instead of using SBI calls.
The upcoming ACLINT [M|S]SWI devices and AIA IMSIC devices allow direct IPI injection from the RISC-V kernel. To support this, we extend the riscv_ipi_set_virq_range() function so that irqchip drivers can mark IPIs as suitable for remote FENCEs.
--- arch/riscv/include/asm/ipi-mux.h | 2 ++ arch/riscv/include/asm/smp.h | 18 ++++++++++++++++-- arch/riscv/kernel/ipi-mux.c | 3 ++- arch/riscv/kernel/sbi.c | 3 ++- arch/riscv/kernel/smp.c | 11 ++++++++++- drivers/clocksource/timer-clint.c | 2 +- 6 files changed, 33 insertions(+), 6 deletions(-)
arch/riscv/include/asm/ipi-mux.h +2 -0
@@ -15,6 +15,7 @@ void riscv_ipi_mux_handle_irq(void);/* Create irq_domain for muxed IPIs */ struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask));
@@ -28,6 +29,7 @@ static inline void riscv_ipi_mux_handle_irq(void) }static inline struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask)) {
arch/riscv/include/asm/smp.h +16 -2
@@ -16,6 +16,9 @@ struct seq_file;extern unsigned long boot_cpu_hartid;#ifdef CONFIG_SMP + +#include <linux/jump_label.h> +/* * Mapping between linux logical cpu index and hartid. */
@@ -46,7 +49,12 @@ void riscv_ipi_disable(void);bool riscv_ipi_have_virq_range (void );/* Set the IPI interrupt numbers for arch (called by irqchip drivers) */ -void riscv_ipi_set_virq_range (int virq,int nr_irqs); +void riscv_ipi_set_virq_range (int virq,int nr_irqs,bool use_for_rfence); + +/* Check if we can use IPIs for remote FENCEs */ +DECLARE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +#define riscv_use_ipi_for_rfence () \ + static_branch_unlikely(&riscv_ipi_for_rfence)/* Secondary hart entry */ asmlinkage void smp_callin(void);
@@ -93,10 +101,16 @@ static inline bool riscv_ipi_have_virq_range(void) return false; } -static inline void riscv_ipi_set_virq_range (int virq,int nr) +static inline void riscv_ipi_set_virq_range (int virq,int nr, +bool use_for_rfence) { } +static inline bool riscv_use_ipi_for_rfence (void ) +{ +return false; +} +#endif /* CONFIG_SMP */ #if defined(CONFIG_HOTPLUG_CPU ) && (CONFIG_SMP )
arch/riscv/kernel/ipi-mux.c +2 -1
@@ -145,6 +145,7 @@ static int ipi_mux_starting_cpu(unsigned int cpu) }struct irq_domain *riscv_ipi_mux_create (bool use_soft_irq, +bool use_for_rfence,void (*clear_ipi)(void ),void (*send_ipi)(const struct cpumask *mask)) {
@@ -192,7 +193,7 @@ struct irq_domain *riscv_ipi_mux_create(bool use_soft_irq,"irqchip/riscv/ipi-mux:starting" , ipi_mux_starting_cpu, ipi_mux_dying_cpu); -riscv_ipi_set_virq_range (virq,BITS_PER_LONG ); +riscv_ipi_set_virq_range (virq,BITS_PER_LONG , use_for_rfence);return ipi_mux_priv.domain;
arch/riscv/kernel/sbi.c +2 -1
@@ -630,7 +630,8 @@ static void sbi_ipi_clear(void)void __init sbi_ipi_init (void ) { -if (riscv_ipi_mux_create (true, sbi_ipi_clear, sbi_send_cpumask_ipi)) +if (riscv_ipi_mux_create (true, false, + sbi_ipi_clear, sbi_send_cpumask_ipi))pr_info ("providing IPIs using SBI IPI extension\n" ); }
arch/riscv/kernel/smp.c +10 -1
@@ -149,7 +149,10 @@ bool riscv_ipi_have_virq_range(void)return (ipi_virq_base) ? true : false; } -void riscv_ipi_set_virq_range (int virq,int nr) +DEFINE_STATIC_KEY_FALSE (riscv_ipi_for_rfence); +EXPORT_SYMBOL_GPL (riscv_ipi_for_rfence); + +void riscv_ipi_set_virq_range (int virq,int nr,bool use_for_rfence) {int i, err;
@@ -172,6 +175,12 @@ void riscv_ipi_set_virq_range(int virq, int nr)/* Enabled IPIs for boot CPU immediately */ riscv_ipi_enable (); + +/* Update RFENCE static key */ +if (use_for_rfence) +static_branch_enable (&riscv_ipi_for_rfence); +else +static_branch_disable (&riscv_ipi_for_rfence); }EXPORT_SYMBOL_GPL (riscv_ipi_set_virq_range);
drivers/clocksource/timer-clint.c +1 -1
@@ -224,7 +224,7 @@ static int __init clint_timer_init_dt(struct device_node *np) goto fail_free_irq; } -riscv_ipi_mux_create (true, clint_clear_ipi, clint_send_ipi); +riscv_ipi_mux_create (true, true, clint_clear_ipi, clint_send_ipi);clint_clear_ipi ();return 0 ;
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 5/6 RISC-V: Use IPIs for remote TLB flush when possible
In reply to Anup PatelIf IPI calls are injected using SBI IPI calls then remote TLB flush using SBI RFENCE calls is much faster because using IPIs for remote TLB flush would still endup as SBI IPI calls with extra processing on kernel side.
It is now possible to have specialized hardware (such as RISC-V AIA and RISC-V ACLINT) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.
This patch extends remote TLB flush functions to use IPIs whenever underlying IPI operations are suitable for remote FENCEs.
--- arch/riscv/mm/tlbflush.c | 93 +++++++++++++++++++++++++++++++++------- 1 file changed, 78 insertions(+), 15 deletions(-)
arch/riscv/mm/tlbflush.c +78 -15
@@ -23,14 +23,62 @@ static inline void local_flush_tlb_page_asid(unsigned long addr, : "memory"); } +static inline void local_flush_tlb_range (unsigned long start, +unsigned long size,unsigned long stride) +{ +if (size <= stride) +local_flush_tlb_page (start); +else +local_flush_tlb_all (); +} + +static inline void local_flush_tlb_range_asid (unsigned long start, +unsigned long size,unsigned long stride,unsigned long asid) +{ +if (size <= stride) +local_flush_tlb_page_asid (start, asid); +else +local_flush_tlb_all_asid (asid); +} + +static void __ipi_flush_tlb_all (void *info) +{ +local_flush_tlb_all (); +} +void flush_tlb_all (void ) { -sbi_remote_sfence_vma (NULL ,0 ,-1 ); +if (riscv_use_ipi_for_rfence ()) +on_each_cpu (__ipi_flush_tlb_all,NULL ,1 ); +else +sbi_remote_sfence_vma (NULL ,0 ,-1 ); +} + +struct flush_tlb_range_data { +unsigned long asid; +unsigned long start; +unsigned long size; +unsigned long stride; +}; + +static void __ipi_flush_tlb_range_asid (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range_asid (d->start, d->size, d->stride, d->asid); +} + +static void __ipi_flush_tlb_range (void *info) +{ +struct flush_tlb_range_data *d = info; + +local_flush_tlb_range (d->start, d->size, d->stride); } -static void __sbi_tlb_flush_range (struct mm_struct *mm,unsigned long start, -unsigned long size,unsigned long stride) +static void __flush_tlb_range (struct mm_struct *mm,unsigned long start, +unsigned long size,unsigned long stride) { +struct flush_tlb_range_data ftd;struct cpumask *cmask =mm_cpumask (mm);unsigned int cpuid;bool broadcast;
@@ -45,19 +93,34 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,unsigned long asid =atomic_long_read (&mm->context.id);if (broadcast) { -sbi_remote_sfence_vma_asid (cmask, start, size, asid); - }else if (size <= stride) { -local_flush_tlb_page_asid (start, asid); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid = asid; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range_asid, + &ftd,1 ); + }else +sbi_remote_sfence_vma_asid (cmask, + start, size, asid); }else { -local_flush_tlb_all_asid (asid); +local_flush_tlb_range_asid (start, size, stride, asid); } }else {if (broadcast) { -sbi_remote_sfence_vma (cmask, start, size); - }else if (size <= stride) { -local_flush_tlb_page (start); +if (riscv_use_ipi_for_rfence ()) { + ftd.asid =0 ; + ftd.start = start; + ftd.size = size; + ftd.stride = stride; +on_each_cpu_mask (cmask, + __ipi_flush_tlb_range, + &ftd,1 ); + }else +sbi_remote_sfence_vma (cmask, start, size); }else { -local_flush_tlb_all (); +local_flush_tlb_range (start, size, stride); } }
@@ -66,23 +129,23 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start,void flush_tlb_mm (struct mm_struct *mm) { -__sbi_tlb_flush_range (mm,0 ,-1 ,PAGE_SIZE ); +__flush_tlb_range (mm,0 ,-1 ,PAGE_SIZE ); }void flush_tlb_page (struct vm_area_struct *vma,unsigned long addr) { -__sbi_tlb_flush_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, addr,PAGE_SIZE ,PAGE_SIZE ); }void flush_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PAGE_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PAGE_SIZE ); }#ifdef CONFIG_TRANSPARENT_HUGEPAGE void flush_pmd_tlb_range (struct vm_area_struct *vma,unsigned long start,unsigned long end) { -__sbi_tlb_flush_range (vma->vm_mm, start, end - start,PMD_SIZE ); +__flush_tlb_range (vma->vm_mm, start, end - start,PMD_SIZE ); }#endif
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 6/6 RISC-V: Use IPIs for remote icache flush when possible
In reply to Anup PatelIf IPI calls are injected using SBI IPI calls then remote icache flush using SBI RFENCE calls is much faster because using IPIs for remote icache flush would still endup as SBI IPI calls with extra processing on the kernel side.
It is now possible to have specialized hardware (such as RISC-V AIA and RISC-V ACLINT) which allows S-mode software to directly inject IPIs without any assistance from M-mode runtime firmware.
This patch extends remote icache flush functions to use IPIs whenever underlying IPI operations are suitable for remote FENCEs.
--- arch/riscv/mm/cacheflush.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/riscv/mm/cacheflush.c +3 -2
@@ -18,7 +18,7 @@ void flush_icache_all(void) {local_flush_icache_all (); -if (IS_ENABLED (CONFIG_RISCV_SBI )) +if (IS_ENABLED (CONFIG_RISCV_SBI ) && !riscv_use_ipi_for_rfence ())sbi_remote_fence_i (NULL );else on_each_cpu (ipi_remote_fence_i,NULL ,1 );
@@ -66,7 +66,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local)* with flush_icache_deferred(). */ smp_mb (); - }else if (IS_ENABLED (CONFIG_RISCV_SBI )) { + }else if (IS_ENABLED (CONFIG_RISCV_SBI ) && + !riscv_use_ipi_for_rfence ()) {sbi_remote_fence_i (&others); }else {on_each_cpu_mask (&others, ipi_remote_fence_i,NULL ,1 );
Signature · 7 lines
2.25.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
In reply to Anup PatelQuoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;
drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);
No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
M.
Signature · 6 lines
Without deviation from the norm, progress is not possible. _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Anup Patel
maintainerRe: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
Quoted 73 lines · Marc Zyngier
Quoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
Quoted 2 lines
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
In absence of INTC as the default domain, currently we have various drivers looking up INTC irq_domain from DT (or ACPI). This is quite a bit of duplicate code across various drivers.
How about having a irq_domain lookup routine (riscv_intc_find_irq_domain()) exported by the RISC-V INTC driver or arch/riscv ?
OR
Do you have an alternative suggestion ?
Regards,
Anup
Quoted 5 lines
M.--
Without deviation from the norm, progress is not possible.
Re: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
Quoted 78 lines · Anup Patel
Quoted 73 lines · Marc Zyngier
Quoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
Quoted 2 lines
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
Quoted 8 lines
In absence of INTC as the default domain, currently we have various drivers looking up INTC
irq_domainfrom DT (or ACPI). This is quite a bit of duplicate code across various drivers.How about having a
irq_domainlookup routine (riscv_intc_find_irq_domain()) exported by the RISC-V INTC driver orarch/riscv?
OR
Do you have an alternative suggestion ?
But *why* don't you provide an interrupt controller node for DT? I really don't think that's outlandish to require.
For ACPI, we already have an interface that allows a fwnode to be registered (acpi_set_irq_model) and interrupts mapped (acpi_register_gsi).
You should already have all the required tools you need.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
Quoted 85 lines · Marc Zyngier
Quoted 82 lines · Anup Patel
Quoted 73 lines · Marc Zyngier
Quoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
Quoted 2 lines
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
In absence of INTC as the default domain, currently we have various drivers looking up INTC
irq_domainfrom DT (or ACPI). This is quite a bit of duplicate code across various drivers.
Quoted 7 lines
Quoted 4 lines
How about having a
irq_domainlookup routine (riscv_intc_find_irq_domain()) exported by the RISC-V INTC driver orarch/riscv?
OR
Do you have an alternative suggestion ?But *why* don't you provide an interrupt controller node for DT? I really don't think that's outlandish to require.
Historically, all RISC-V SBI related drivers never had any DT/ACPI node because we can always query/discover the SBI functionality at runtime.
The mechanism to query/discover SBI IPI, Timer and PMU is through SBI base functions. Also, local interrupts used by these drivers are specified by the RISC-V specification. This means having a DT/ACPI node for these drivers doesn't provide any info.
We will be having KVM RISC-V AIA support in future which will not have a DT/ACPI node as well because this can be discovered as a CPU capability and the local interrupt to be used is specified by the RISC-V hypervisor specification.
Quoted 4 lines
For ACPI, we already have an interface that allows a fwnode to be registered (
acpi_set_irq_model) and interrupts mapped (acpi_register_gsi).
The ACPI specification being proposed for RISC-V does not have any details for SBI IPI, Timer, and PMU for the same reasons mentioned above.
Quoted 2 lines
You should already have all the required tools you need.
Are you okay if arch/riscv exports riscv_intc_find_irq_domain() ? OR
Maybe export riscv_intc_find_irq_domain() from INTC driver ?
Regards,
Anup
Quoted 5 lines
M.--
Without deviation from the norm, progress is not possible.
Re: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
Quoted 110 lines · Anup Patel
Quoted 85 lines · Marc Zyngier
Quoted 82 lines · Anup Patel
Quoted 73 lines · Marc Zyngier
Quoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
Quoted 2 lines
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
In absence of INTC as the default domain, currently we have various drivers looking up INTC
irq_domainfrom DT (or ACPI). This is quite a bit of duplicate code across various drivers.Quoted 7 lines
Quoted 4 lines
How about having a
irq_domainlookup routine (riscv_intc_find_irq_domain()) exported by the RISC-V INTC driver orarch/riscv?
OR
Do you have an alternative suggestion ?But *why* don't you provide an interrupt controller node for DT? I really don't think that's outlandish to require.
Historically, all RISC-V SBI related drivers never had any DT/ACPI node because we can always query/discover the SBI functionality at runtime.
The mechanism to query/discover SBI IPI, Timer and PMU is through SBI base functions. Also, local interrupts used by these drivers are specified by the RISC-V specification. This means having a DT/ACPI node for these drivers doesn't provide any info.
We will be having KVM RISC-V AIA support in future which will not have a DT/ACPI node as well because this can be discovered as a CPU capability and the local interrupt to be used is specified by the RISC-V hypervisor specification.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
For ACPI, we already have an interface that allows a fwnode to be registered (
acpi_set_irq_model) and interrupts mapped (acpi_register_gsi).The ACPI specification being proposed for RISC-V does not have any details for SBI IPI, Timer, and PMU for the same reasons mentioned above.
Neither does it on the other architectures.
And yet we are able to synthesise fwnodes and use the whole of the infrastructure as intended without having to resort to this crap that was only introduced to cope with 20 year old PPC board files.
Only dead architectures are using irq_set_default_host().
Quoted 7 lines
Quoted 3 lines
You should already have all the required tools you need.
Are you okay if
arch/riscvexportsriscv_intc_find_irq_domain()? OR
Maybe exportriscv_intc_find_irq_domain()from INTC driver ?
Neither. That's just papering over the core problem.
Either you start creating fwnodes out of thin air, which is what we do for both x86 and arm64 when using ACPI, or you add support for SBI (or whatever new spec the RISC-V people come up with) as a provider of fwnodes.
Anything else looks like a pretty bad regression.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Anup Patel
maintainerRe: [PATCH 2/6] irqchip/riscv-intc: Set intc domain as the default host
Quoted 121 lines · Marc Zyngier
Quoted 110 lines · Anup Patel
Quoted 85 lines · Marc Zyngier
Quoted 82 lines · Anup Patel
Quoted 73 lines · Marc Zyngier
Quoted 54 lines · Anup Patel
We have quite a few RISC-V drivers (such as RISC-V SBI IPI driver, RISC-V timer driver, RISC-V PMU driver, etc) which do not have a dedicated DT/ACPI fwnode. This patch makes intc domain as the default host so that these drivers can directly create local interrupt mapping using standardized local interrupt numbers
Signed-off-by Anup Patel <[email protected]>--- drivers/clocksource/timer-riscv.c | 17 +---------------- drivers/irqchip/irq-riscv-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 16 deletions(-)drivers/clocksource/timer-riscv.c +1
-16@@ -102,8 +102,6 @@ static irqreturn_t riscv_timer_interrupt(int irq, void *dev_id)static int __init riscv_timer_init_dt (struct device_node *n) {int cpuid, hartid, error; -struct device_node *child; -struct irq_domain *domain; hartid =riscv_of_processor_hartid (n);if (hartid <0 ) {@@ -121,20 +119,7 @@ static int __init riscv_timer_init_dt(struct device_node *n)if (cpuid !=smp_processor_id ())return 0 ; - domain =NULL ; - child =of_get_compatible_child (n,"riscv,cpu-intc" ); -if (!child) { -pr_err ("Failed to find INTC node [%pOF]\n" , n); -return -ENODEV ; - } - domain =irq_find_host (child); -of_node_put (child); -if (!domain) { -pr_err ("Failed to find IRQ domain for node [%pOF]\n" , n); -return -ENODEV ; - } - - riscv_clock_event_irq =irq_create_mapping (domain,RV_IRQ_TIMER ); + riscv_clock_event_irq =irq_create_mapping (NULL ,RV_IRQ_TIMER );if (!riscv_clock_event_irq) {pr_err ("Failed to map timer interrupt for node [%pOF]\n" , n);return -ENODEV ;drivers/irqchip/irq-riscv-intc.c +0
-0@@ -125,6 +125,15 @@ static int __init riscv_intc_init(struct device_node *node,return rc;drivers/irqchip/irq-riscv-intc.c static int __init riscv_intc_init(struct device_node *node, · line 135
Quoted 10 lines
drivers/irqchip/irq-riscv-intc.c +8
-0} +/* +* Make INTC as the default domain which will allow drivers +* not having dedicated DT/ACPI fwnode (such as RISC-V SBI IPI +* driver, RISC-V timer driver, RISC-V PMU driver, etc) can +* directly create local interrupt mapping using standardized +* local interrupt numbers. +*/ +irq_set_default_host (intc_domain);No, please. This really is a bad idea. This sort of catch-all have constantly proven to be a nuisance, because they discard all the topology information. Eventually, you realise that you need to know where this is coming from, but it really is too late.
Quoted 2 lines
I'd rather you *synthesise* a fwnode (like ACPI does) rather then do this.
In absence of INTC as the default domain, currently we have various drivers looking up INTC
irq_domainfrom DT (or ACPI). This is quite a bit of duplicate code across various drivers.Quoted 7 lines
Quoted 4 lines
How about having a
irq_domainlookup routine (riscv_intc_find_irq_domain()) exported by the RISC-V INTC driver orarch/riscv?
OR
Do you have an alternative suggestion ?But *why* don't you provide an interrupt controller node for DT? I really don't think that's outlandish to require.
Historically, all RISC-V SBI related drivers never had any DT/ACPI node because we can always query/discover the SBI functionality at runtime.
The mechanism to query/discover SBI IPI, Timer and PMU is through SBI base functions. Also, local interrupts used by these drivers are specified by the RISC-V specification. This means having a DT/ACPI node for these drivers doesn't provide any info.
We will be having KVM RISC-V AIA support in future which will not have a DT/ACPI node as well because this can be discovered as a CPU capability and the local interrupt to be used is specified by the RISC-V hypervisor specification.
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
For ACPI, we already have an interface that allows a fwnode to be registered (
acpi_set_irq_model) and interrupts mapped (acpi_register_gsi).The ACPI specification being proposed for RISC-V does not have any details for SBI IPI, Timer, and PMU for the same reasons mentioned above.
Quoted 7 lines
Neither does it on the other architectures.
And yet we are able to synthesise fwnodes and use the whole of the infrastructure as intended without having to resort to this crap that was only introduced to cope with 20 year old PPC board files.
Only dead architectures are using
irq_set_default_host().
Okay, I will drop the idea of using irq_set_default_host() in INTC driver.
Quoted 9 lines
Quoted 8 lines
Quoted 4 lines
You should already have all the required tools you need.
Are you okay if
arch/riscvexportsriscv_intc_find_irq_domain()? OR
Maybe exportriscv_intc_find_irq_domain()from INTC driver ?
Quoted 8 lines
Neither. That's just papering over the core problem.
Either you start creating fwnodes out of thin air, which is what we do for both x86 and arm64 when using ACPI, or you add support for SBI (or whatever new spec the RISC-V people come up with) as a provider of fwnodes.
Anything else looks like a pretty bad regression.
Actually, SBI spec has been used for quite a few years in RISC-V now. It can be compared with the ARM PSCI spec so it's not a HW description format like DT or ACPI.
How about arch/riscv creating an exported riscv_intc_fwnode ? (This riscv_intc_fwnode can be used by various drivers to obtain the INTC irq_domain)
Regards,
Anup
Quoted 7 lines
Thanks,
M.--
Without deviation from the norm, progress is not possible.