Message ID | 20210612160422.330705-1-anup.patel@wdc.com |
---|---|
Headers | show |
Series | RISC-V ACLINT Support | expand |
On Sat, 12 Jun 2021 17:04:16 +0100, Anup Patel <anup.patel@wdc.com> wrote: > > If 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) > 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. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > arch/riscv/mm/tlbflush.c | 62 +++++++++++++++++++++++++++++++--------- > 1 file changed, 48 insertions(+), 14 deletions(-) > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > index 720b443c4528..009c56fa102d 100644 > --- a/arch/riscv/mm/tlbflush.c > +++ b/arch/riscv/mm/tlbflush.c > @@ -1,39 +1,73 @@ > // SPDX-License-Identifier: GPL-2.0 > +/* > + * TLB flush implementation. > + * > + * Copyright (c) 2021 Western Digital Corporation or its affiliates. > + */ I find this a bit odd. You don't mention this addition in the commit message, and a quick look at the commits touching tlbflush.[ch] doesn't make the copyright assignment obvious (most commits originate from either SiFive or Christoph). In any way, please keep this kind of changes out of this series if possible, and have a separate discussion on who gets to brag about this code. Thanks, M.
On Sat, 12 Jun 2021 17:04:17 +0100, Anup Patel <anup.patel@wdc.com> wrote: > > The RISC-V ACLINT provides MSWI and SSWI devices for M-mode and > S-mode software interrupts respectively. We add irqchip driver > which provide IPI operations based on ACLINT [M|S]SWI devices > to the Linux RISC-V kernel. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > drivers/irqchip/Kconfig | 11 +++ > drivers/irqchip/Makefile | 1 + > drivers/irqchip/irq-aclint-swi.c | 122 +++++++++++++++++++++++++++++++ > 3 files changed, 134 insertions(+) > create mode 100644 drivers/irqchip/irq-aclint-swi.c > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > index 62543a4eccc0..2010d493b03b 100644 > --- a/drivers/irqchip/Kconfig > +++ b/drivers/irqchip/Kconfig > @@ -508,6 +508,17 @@ config RISCV_INTC > > If you don't know what to do here, say Y. > > +config RISCV_ACLINT_SWI > + bool "RISC-V Advanced Core Local Interruptor Software Interrupts" > + depends on RISCV > + help > + This enables support for software interrupts using the Advanced > + Core Local Interruptor (ACLINT) found in RISC-V systems. The > + RISC-V ACLINT provides devices for inter-process interrupt and > + timer functionality. > + > + If you don't know what to do here, say Y. > + > config SIFIVE_PLIC > bool "SiFive Platform-Level Interrupt Controller" > depends on RISCV > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > index f88cbf36a9d2..a6edf6733c1d 100644 > --- a/drivers/irqchip/Makefile > +++ b/drivers/irqchip/Makefile > @@ -97,6 +97,7 @@ obj-$(CONFIG_QCOM_PDC) += qcom-pdc.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_ACLINT_SWI) += irq-aclint-swi.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-aclint-swi.c b/drivers/irqchip/irq-aclint-swi.c > new file mode 100644 > index 000000000000..f9607072cc7b > --- /dev/null > +++ b/drivers/irqchip/irq-aclint-swi.c > @@ -0,0 +1,122 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2021 Western Digital Corporation or its affiliates. > + */ > + > +#define pr_fmt(fmt) "aclint-swi: " fmt > +#include <linux/cpu.h> > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/irq.h> > +#include <linux/irqchip.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/of_irq.h> > +#include <linux/smp.h> > + > +struct aclint_swi { > + void __iomem *sip_reg; > +}; > +static DEFINE_PER_CPU(struct aclint_swi, aclint_swis); > + > +static void aclint_swi_send_ipi(const struct cpumask *target) > +{ > + unsigned int cpu; > + struct aclint_swi *swi; > + > + for_each_cpu(cpu, target) { > + swi = per_cpu_ptr(&aclint_swis, cpu); > + if (!swi->sip_reg) { > + pr_warn("%s: CPU%d SIP register not available\n", > + __func__, cpu); > + continue; > + } > + > + writel(1, swi->sip_reg); > + } > +} > + > +static void aclint_swi_clear_ipi(void) > +{ > + struct aclint_swi *swi = this_cpu_ptr(&aclint_swis); > + > + if (!swi->sip_reg) { > + pr_warn("%s: CPU%d SIP register not available\n", > + __func__, smp_processor_id()); > + return; > + } > + > + writel(0, swi->sip_reg); > +} > + > +static struct riscv_ipi_ops aclint_swi_ipi_ops = { > + .name = "ACLINT-SWI", > + .use_for_rfence = true, > + .ipi_inject = aclint_swi_send_ipi, > + .ipi_clear = aclint_swi_clear_ipi, > +}; > + > +static int __init aclint_swi_init(struct device_node *node, > + struct device_node *parent) > +{ > + void __iomem *base; > + struct aclint_swi *swi; > + u32 i, nr_irqs, nr_cpus = 0; > + > + /* Map the registers */ > + base = of_iomap(node, 0); > + if (!base) { > + pr_err("%pOFP: could not map registers\n", node); > + return -ENODEV; > + } > + > + /* Iterarte over each target CPU connected with this ACLINT */ > + nr_irqs = of_irq_count(node); > + for (i = 0; i < nr_irqs; i++) { > + struct of_phandle_args parent; > + int cpu, hartid; > + > + if (of_irq_parse_one(node, i, &parent)) { > + pr_err("%pOFP: failed to parse irq %d.\n", > + node, i); > + continue; > + } > + > + if (parent.args[0] != RV_IRQ_SOFT) { > + pr_err("%pOFP: invalid irq %d (hwirq %d)\n", > + node, i, parent.args[0]); > + continue; > + } > + > + hartid = riscv_of_parent_hartid(parent.np); > + if (hartid < 0) { > + pr_warn("failed to parse hart ID for irq %d.\n", i); > + continue; > + } > + > + cpu = riscv_hartid_to_cpuid(hartid); > + if (cpu < 0) { > + pr_warn("Invalid cpuid for irq %d\n", i); > + continue; > + } > + > + swi = per_cpu_ptr(&aclint_swis, cpu); > + swi->sip_reg = base + i * sizeof(u32); > + nr_cpus++; > + } > + > + /* Announce the ACLINT SWI device */ > + pr_info("%pOFP: providing IPIs for %d CPUs\n", node, nr_cpus); > + > + /* Register the IPI operations */ > + riscv_set_ipi_ops(&aclint_swi_ipi_ops); > + > + return 0; > +} > + > +#ifdef CONFIG_RISCV_M_MODE > +IRQCHIP_DECLARE(riscv_aclint_swi, "riscv,aclint-mswi", aclint_swi_init); > +#else > +IRQCHIP_DECLARE(riscv_aclint_swi, "riscv,aclint-sswi", aclint_swi_init); > +#endif I'm sorry, but this really isn't an irqchip driver. This is a piece of arch-specific code that uses *none* of the irq subsystem abstractions apart from the IRQCHIP_DECLARE() macro. If you implemented it on top of the IPI irq_domain abstraction, making your IPIs actual IRQs, use the proper interrupt flows and accounting, then it would make sense to call it an irqchip driver. But as it stands, it has no place in drivers/irqchip. Thanks, M.
On Sun, Jun 13, 2021 at 3:11 PM Marc Zyngier <maz@kernel.org> wrote: > > On Sat, 12 Jun 2021 17:04:17 +0100, > Anup Patel <anup.patel@wdc.com> wrote: > > > > The RISC-V ACLINT provides MSWI and SSWI devices for M-mode and > > S-mode software interrupts respectively. We add irqchip driver > > which provide IPI operations based on ACLINT [M|S]SWI devices > > to the Linux RISC-V kernel. > > > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > > --- > > drivers/irqchip/Kconfig | 11 +++ > > drivers/irqchip/Makefile | 1 + > > drivers/irqchip/irq-aclint-swi.c | 122 +++++++++++++++++++++++++++++++ > > 3 files changed, 134 insertions(+) > > create mode 100644 drivers/irqchip/irq-aclint-swi.c > > > > diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig > > index 62543a4eccc0..2010d493b03b 100644 > > --- a/drivers/irqchip/Kconfig > > +++ b/drivers/irqchip/Kconfig > > @@ -508,6 +508,17 @@ config RISCV_INTC > > > > If you don't know what to do here, say Y. > > > > +config RISCV_ACLINT_SWI > > + bool "RISC-V Advanced Core Local Interruptor Software Interrupts" > > + depends on RISCV > > + help > > + This enables support for software interrupts using the Advanced > > + Core Local Interruptor (ACLINT) found in RISC-V systems. The > > + RISC-V ACLINT provides devices for inter-process interrupt and > > + timer functionality. > > + > > + If you don't know what to do here, say Y. > > + > > config SIFIVE_PLIC > > bool "SiFive Platform-Level Interrupt Controller" > > depends on RISCV > > diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile > > index f88cbf36a9d2..a6edf6733c1d 100644 > > --- a/drivers/irqchip/Makefile > > +++ b/drivers/irqchip/Makefile > > @@ -97,6 +97,7 @@ obj-$(CONFIG_QCOM_PDC) += qcom-pdc.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_ACLINT_SWI) += irq-aclint-swi.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-aclint-swi.c b/drivers/irqchip/irq-aclint-swi.c > > new file mode 100644 > > index 000000000000..f9607072cc7b > > --- /dev/null > > +++ b/drivers/irqchip/irq-aclint-swi.c > > @@ -0,0 +1,122 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (C) 2021 Western Digital Corporation or its affiliates. > > + */ > > + > > +#define pr_fmt(fmt) "aclint-swi: " fmt > > +#include <linux/cpu.h> > > +#include <linux/interrupt.h> > > +#include <linux/io.h> > > +#include <linux/irq.h> > > +#include <linux/irqchip.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/of_address.h> > > +#include <linux/of_irq.h> > > +#include <linux/smp.h> > > + > > +struct aclint_swi { > > + void __iomem *sip_reg; > > +}; > > +static DEFINE_PER_CPU(struct aclint_swi, aclint_swis); > > + > > +static void aclint_swi_send_ipi(const struct cpumask *target) > > +{ > > + unsigned int cpu; > > + struct aclint_swi *swi; > > + > > + for_each_cpu(cpu, target) { > > + swi = per_cpu_ptr(&aclint_swis, cpu); > > + if (!swi->sip_reg) { > > + pr_warn("%s: CPU%d SIP register not available\n", > > + __func__, cpu); > > + continue; > > + } > > + > > + writel(1, swi->sip_reg); > > + } > > +} > > + > > +static void aclint_swi_clear_ipi(void) > > +{ > > + struct aclint_swi *swi = this_cpu_ptr(&aclint_swis); > > + > > + if (!swi->sip_reg) { > > + pr_warn("%s: CPU%d SIP register not available\n", > > + __func__, smp_processor_id()); > > + return; > > + } > > + > > + writel(0, swi->sip_reg); > > +} > > + > > +static struct riscv_ipi_ops aclint_swi_ipi_ops = { > > + .name = "ACLINT-SWI", > > + .use_for_rfence = true, > > + .ipi_inject = aclint_swi_send_ipi, > > + .ipi_clear = aclint_swi_clear_ipi, > > +}; > > + > > +static int __init aclint_swi_init(struct device_node *node, > > + struct device_node *parent) > > +{ > > + void __iomem *base; > > + struct aclint_swi *swi; > > + u32 i, nr_irqs, nr_cpus = 0; > > + > > + /* Map the registers */ > > + base = of_iomap(node, 0); > > + if (!base) { > > + pr_err("%pOFP: could not map registers\n", node); > > + return -ENODEV; > > + } > > + > > + /* Iterarte over each target CPU connected with this ACLINT */ > > + nr_irqs = of_irq_count(node); > > + for (i = 0; i < nr_irqs; i++) { > > + struct of_phandle_args parent; > > + int cpu, hartid; > > + > > + if (of_irq_parse_one(node, i, &parent)) { > > + pr_err("%pOFP: failed to parse irq %d.\n", > > + node, i); > > + continue; > > + } > > + > > + if (parent.args[0] != RV_IRQ_SOFT) { > > + pr_err("%pOFP: invalid irq %d (hwirq %d)\n", > > + node, i, parent.args[0]); > > + continue; > > + } > > + > > + hartid = riscv_of_parent_hartid(parent.np); > > + if (hartid < 0) { > > + pr_warn("failed to parse hart ID for irq %d.\n", i); > > + continue; > > + } > > + > > + cpu = riscv_hartid_to_cpuid(hartid); > > + if (cpu < 0) { > > + pr_warn("Invalid cpuid for irq %d\n", i); > > + continue; > > + } > > + > > + swi = per_cpu_ptr(&aclint_swis, cpu); > > + swi->sip_reg = base + i * sizeof(u32); > > + nr_cpus++; > > + } > > + > > + /* Announce the ACLINT SWI device */ > > + pr_info("%pOFP: providing IPIs for %d CPUs\n", node, nr_cpus); > > + > > + /* Register the IPI operations */ > > + riscv_set_ipi_ops(&aclint_swi_ipi_ops); > > + > > + return 0; > > +} > > + > > +#ifdef CONFIG_RISCV_M_MODE > > +IRQCHIP_DECLARE(riscv_aclint_swi, "riscv,aclint-mswi", aclint_swi_init); > > +#else > > +IRQCHIP_DECLARE(riscv_aclint_swi, "riscv,aclint-sswi", aclint_swi_init); > > +#endif > > I'm sorry, but this really isn't an irqchip driver. This is a piece of > arch-specific code that uses *none* of the irq subsystem abstractions > apart from the IRQCHIP_DECLARE() macro. Yes, I was not sure we can call it IRQCHIP hence the RFC PATCH. Both ACLINT MSWI and SSWI are special devices providing only IPI support so I will re-think how to fit this. > > If you implemented it on top of the IPI irq_domain abstraction, making > your IPIs actual IRQs, use the proper interrupt flows and accounting, > then it would make sense to call it an irqchip driver. But as it > stands, it has no place in drivers/irqchip. Okay, let me explore IPI irq_domain if it is suitable for this. Regards, Anup > > Thanks, > > M. > > -- > Without deviation from the norm, progress is not possible.
On Sun, Jun 13, 2021 at 3:03 PM Marc Zyngier <maz@kernel.org> wrote: > > On Sat, 12 Jun 2021 17:04:16 +0100, > Anup Patel <anup.patel@wdc.com> wrote: > > > > If 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) > > 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. > > > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > > --- > > arch/riscv/mm/tlbflush.c | 62 +++++++++++++++++++++++++++++++--------- > > 1 file changed, 48 insertions(+), 14 deletions(-) > > > > diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c > > index 720b443c4528..009c56fa102d 100644 > > --- a/arch/riscv/mm/tlbflush.c > > +++ b/arch/riscv/mm/tlbflush.c > > @@ -1,39 +1,73 @@ > > // SPDX-License-Identifier: GPL-2.0 > > +/* > > + * TLB flush implementation. > > + * > > + * Copyright (c) 2021 Western Digital Corporation or its affiliates. > > + */ > > I find this a bit odd. You don't mention this addition in the commit > message, and a quick look at the commits touching tlbflush.[ch] > doesn't make the copyright assignment obvious (most commits originate > from either SiFive or Christoph). > > In any way, please keep this kind of changes out of this series if > possible, and have a separate discussion on who gets to brag about > this code. I agree it's unrelated change. The commit history suggest mm/tlbflush.c was added by Christoph and other commits after that are from Atish (Western Digital). I will sort this out separately. Regards, Anup > > Thanks, > > M. > > -- > Without deviation from the norm, progress is not possible.
On Sun, 13 Jun 2021 13:25:40 +0100, Anup Patel <anup@brainfault.org> wrote: > > On Sun, Jun 13, 2021 at 3:11 PM Marc Zyngier <maz@kernel.org> wrote: > > > > I'm sorry, but this really isn't an irqchip driver. This is a piece of > > arch-specific code that uses *none* of the irq subsystem abstractions > > apart from the IRQCHIP_DECLARE() macro. > > Yes, I was not sure we can call it IRQCHIP hence the RFC PATCH. > > Both ACLINT MSWI and SSWI are special devices providing only IPI > support so I will re-think how to fit this. It depends on how you think of IPIs in your architecture. arm64 (and even now 32bit) have been moved to a mode where IPIs are normal interrupts, as it helps with other things such as our pseudo NMIs, and reduces code duplication. MIPS has done the same for a long time (they don't have dedicated HW for that). M.
On Mon, Jun 14, 2021 at 3:08 PM Marc Zyngier <maz@kernel.org> wrote: > > On Sun, 13 Jun 2021 13:25:40 +0100, > Anup Patel <anup@brainfault.org> wrote: > > > > On Sun, Jun 13, 2021 at 3:11 PM Marc Zyngier <maz@kernel.org> wrote: > > > > > > I'm sorry, but this really isn't an irqchip driver. This is a piece of > > > arch-specific code that uses *none* of the irq subsystem abstractions > > > apart from the IRQCHIP_DECLARE() macro. > > > > Yes, I was not sure we can call it IRQCHIP hence the RFC PATCH. > > > > Both ACLINT MSWI and SSWI are special devices providing only IPI > > support so I will re-think how to fit this. > > It depends on how you think of IPIs in your architecture. > > arm64 (and even now 32bit) have been moved to a mode where IPIs are > normal interrupts, as it helps with other things such as our pseudo > NMIs, and reduces code duplication. MIPS has done the same for a long > time (they don't have dedicated HW for that). RISC-V is also moving in a similar direction with the RISC-V advanced interrupt architecture (AIA) specification which aims at defining an interrupt controller having MSI support, virtualization support and scalable for a large number of CPUs. The RISC-V AIA treats IPIs as normal interrupts. The RISC-V ACLINT based IPI support is for RISC-V systems which only need a simple interrupt controller without MSI support and virtualization support. These systems will not implement RISC-V AIA. Regards, Anup > > M. > > -- > Without deviation from the norm, progress is not possible.
On Sun, Jun 13, 2021 at 12:07 AM Anup Patel <anup.patel@wdc.com> wrote: > > The software interrupt pending (i.e. [M|S]SIP) bit is writeable for > S-mode but readonly for M-mode so we clear this bit only when using nits: read-only > SBI IPI operations. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > arch/riscv/kernel/sbi.c | 8 +++++++- > arch/riscv/kernel/smp.c | 2 -- > 2 files changed, 7 insertions(+), 3 deletions(-) > Otherwise, Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sun, Jun 13, 2021 at 12:06 AM Anup Patel <anup.patel@wdc.com> wrote: > > We add "#define pr_fmt()" in smp.c to use "riscv:" as common > print prefix for all pr_xyz() statements in this file. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > arch/riscv/kernel/smp.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sun, Jun 13, 2021 at 12:08 AM Anup Patel <anup.patel@wdc.com> wrote: > > The QEMU virt machine has provision to emulate ACLINT SWI device > for supervisor-mode so let's select corresponding driver from > SOC_VIRT kconfig option. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > arch/riscv/Kconfig.socs | 1 + > 1 file changed, 1 insertion(+) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sun, Jun 13, 2021 at 12:07 AM Anup Patel <anup.patel@wdc.com> wrote: > > The RISC-V ACLINT specification is a modular specification and the > ACLINT MTIMER device is compatible with the M-mode timer functionality > of the CLINT device. This patch extends the CLINT driver to support > both CLINT device and ACLINT MTIMER device. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > drivers/clocksource/timer-clint.c | 43 +++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 13 deletions(-) > > diff --git a/drivers/clocksource/timer-clint.c b/drivers/clocksource/timer-clint.c > index dfdcd94c1fd5..ca329c450810 100644 > --- a/drivers/clocksource/timer-clint.c > +++ b/drivers/clocksource/timer-clint.c > @@ -2,8 +2,15 @@ > /* > * Copyright (C) 2020 Western Digital Corporation or its affiliates. > * > - * Most of the M-mode (i.e. NoMMU) RISC-V systems usually have a > - * CLINT MMIO timer device. > + * Most of the M-mode (i.e. NoMMU) RISC-V systems usually have a CLINT > + * MMIO device which is a composite device capable of injecting M-mode > + * software interrupts and M-mode timer interrupts. > + * > + * The RISC-V ACLINT specification is modular in nature and defines > + * separate devices for M-mode software interrupt (MSWI), M-mode timer > + * (MTIMER) and S-mode software interrupt (SSWI). > + * > + * This is a common driver for CLINT device and ACLINT MTIMER device. > */ > > #define pr_fmt(fmt) "clint: " fmt > @@ -21,14 +28,20 @@ > #include <linux/smp.h> > #include <linux/timex.h> > > -#ifndef CONFIG_RISCV_M_MODE > +#ifdef CONFIG_RISCV_M_MODE > #include <asm/clint.h> > + > +u64 __iomem *clint_time_val; > +EXPORT_SYMBOL(clint_time_val); > #endif > > #define CLINT_IPI_OFF 0 > #define CLINT_TIMER_CMP_OFF 0x4000 > #define CLINT_TIMER_VAL_OFF 0xbff8 > > +#define ACLINT_MTIMER_CMP_OFF 0x0000 > +#define ACLINT_MTIMER_VAL_OFF 0x7ff8 > + > /* CLINT manages IPI and Timer for RISC-V M-mode */ > static u32 __iomem *clint_ipi_base; > static u64 __iomem *clint_timer_cmp; > @@ -36,11 +49,6 @@ static u64 __iomem *clint_timer_val; > static unsigned long clint_timer_freq; > static unsigned int clint_timer_irq; > > -#ifdef CONFIG_RISCV_M_MODE > -u64 __iomem *clint_time_val; > -EXPORT_SYMBOL(clint_time_val); > -#endif > - > static void clint_send_ipi(const struct cpumask *target) > { > unsigned int cpu; > @@ -191,9 +199,15 @@ static int __init clint_timer_init_dt(struct device_node *np) > return -ENODEV; > } > > - clint_ipi_base = base + CLINT_IPI_OFF; > - clint_timer_cmp = base + CLINT_TIMER_CMP_OFF; > - clint_timer_val = base + CLINT_TIMER_VAL_OFF; > + if (of_device_is_compatible(np, "riscv,aclint-mtimer")) { This patch should come after patch 8 which introduces this DT binding > + clint_ipi_base = NULL; > + clint_timer_cmp = base + ACLINT_MTIMER_CMP_OFF; > + clint_timer_val = base + ACLINT_MTIMER_VAL_OFF; > + } else { > + clint_ipi_base = base + CLINT_IPI_OFF; > + clint_timer_cmp = base + CLINT_TIMER_CMP_OFF; > + clint_timer_val = base + CLINT_TIMER_VAL_OFF; > + } > clint_timer_freq = riscv_timebase; > > #ifdef CONFIG_RISCV_M_MODE > @@ -230,8 +244,10 @@ static int __init clint_timer_init_dt(struct device_node *np) > goto fail_free_irq; > } > > - riscv_set_ipi_ops(&clint_ipi_ops); > - clint_clear_ipi(); > + if (clint_ipi_base) { > + riscv_set_ipi_ops(&clint_ipi_ops); > + clint_clear_ipi(); > + } > > return 0; > > @@ -244,3 +260,4 @@ static int __init clint_timer_init_dt(struct device_node *np) > > TIMER_OF_DECLARE(clint_timer, "riscv,clint0", clint_timer_init_dt); > TIMER_OF_DECLARE(clint_timer1, "sifive,clint0", clint_timer_init_dt); > +TIMER_OF_DECLARE(clint_timer2, "riscv,aclint-mtimer", clint_timer_init_dt); Otherwise, Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On Sun, Jun 13, 2021 at 12:08 AM Anup Patel <anup.patel@wdc.com> wrote: > > Add myself as maintainer for RISC-V ACLINT drivers. > > Signed-off-by: Anup Patel <anup.patel@wdc.com> > --- > MAINTAINERS | 9 +++++++++ > 1 file changed, 9 insertions(+) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>