[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 2/4] hw/intc: Upgrade the SiFive CLINT implementation to R
|
From: |
Anup Patel |
|
Subject: |
Re: [PATCH v3 2/4] hw/intc: Upgrade the SiFive CLINT implementation to RISC-V ACLINT |
|
Date: |
Tue, 31 Aug 2021 14:15:21 +0530 |
On Mon, Aug 30, 2021 at 11:29 AM Alistair Francis <alistair23@gmail.com> wrote:
>
> On Sun, Aug 29, 2021 at 3:01 PM Anup Patel <anup.patel@wdc.com> wrote:
> >
> > The RISC-V ACLINT is more modular and backward compatible with
> > original SiFive CLINT so instead of duplicating the original
> > SiFive CLINT implementation we upgrade the current SiFive CLINT
> > implementation to RISC-V ACLINT implementation.
> >
> > Signed-off-by: Anup Patel <anup.patel@wdc.com>
> > ---
> > hw/intc/riscv_aclint.c | 364 ++++++++++++++++++++++-----------
> > hw/riscv/microchip_pfsoc.c | 9 +-
> > hw/riscv/shakti_c.c | 11 +-
> > hw/riscv/sifive_e.c | 11 +-
> > hw/riscv/sifive_u.c | 9 +-
> > hw/riscv/spike.c | 14 +-
> > hw/riscv/virt.c | 14 +-
> > include/hw/intc/riscv_aclint.h | 54 +++--
> > 8 files changed, 328 insertions(+), 158 deletions(-)
> >
> > diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c
> > index 0f940e332b..d4a7146ca8 100644
> > --- a/hw/intc/riscv_aclint.c
> > +++ b/hw/intc/riscv_aclint.c
> > @@ -1,8 +1,10 @@
> > /*
> > - * SiFive CLINT (Core Local Interruptor)
> > + * RISC-V ACLINT (Advanced Core Local Interruptor)
> > + * URL: https://github.com/riscv/riscv-aclint
> > *
> > * Copyright (c) 2016-2017 Sagar Karandikar, sagark@eecs.berkeley.edu
> > * Copyright (c) 2017 SiFive, Inc.
> > + * Copyright (c) 2021 Western Digital Corporation or its affiliates.
> > *
> > * This provides real-time clock, timer and interprocessor interrupts.
> > *
> > @@ -30,10 +32,10 @@
> > #include "qemu/timer.h"
> > #include "hw/irq.h"
> >
> > -typedef struct sifive_clint_callback {
> > - SiFiveCLINTState *s;
> > +typedef struct riscv_aclint_mtimer_callback {
> > + RISCVAclintMTimerState *s;
> > int num;
> > -} sifive_clint_callback;
> > +} riscv_aclint_mtimer_callback;
> >
> > static uint64_t cpu_riscv_read_rtc(uint32_t timebase_freq)
> > {
> > @@ -45,10 +47,11 @@ static uint64_t cpu_riscv_read_rtc(uint32_t
> > timebase_freq)
> > * Called when timecmp is written to update the QEMU timer or immediately
> > * trigger timer interrupt if mtimecmp <= current timer value.
> > */
> > -static void sifive_clint_write_timecmp(SiFiveCLINTState *s, RISCVCPU *cpu,
> > - int hartid,
> > - uint64_t value,
> > - uint32_t timebase_freq)
> > +static void riscv_aclint_mtimer_write_timecmp(RISCVAclintMTimerState
> > *mtimer,
> > + RISCVCPU *cpu,
> > + int hartid,
> > + uint64_t value,
> > + uint32_t timebase_freq)
> > {
> > uint64_t next;
> > uint64_t diff;
> > @@ -57,14 +60,16 @@ static void sifive_clint_write_timecmp(SiFiveCLINTState
> > *s, RISCVCPU *cpu,
> >
> > cpu->env.timecmp = value;
> > if (cpu->env.timecmp <= rtc_r) {
> > - /* if we're setting an MTIMECMP value in the "past",
> > - immediately raise the timer interrupt */
> > - qemu_irq_raise(s->timer_irqs[hartid - s->hartid_base]);
> > + /*
> > + * If we're setting an MTIMECMP value in the "past",
> > + * immediately raise the timer interrupt
> > + */
> > + qemu_irq_raise(mtimer->timer_irqs[hartid - mtimer->hartid_base]);
> > return;
> > }
> >
> > /* otherwise, set up the future timer interrupt */
> > - qemu_irq_lower(s->timer_irqs[hartid - s->hartid_base]);
> > + qemu_irq_lower(mtimer->timer_irqs[hartid - mtimer->hartid_base]);
> > diff = cpu->env.timecmp - rtc_r;
> > /* back to ns (note args switched in muldiv64) */
> > next = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
> > @@ -76,38 +81,27 @@ static void sifive_clint_write_timecmp(SiFiveCLINTState
> > *s, RISCVCPU *cpu,
> > * Callback used when the timer set using timer_mod expires.
> > * Should raise the timer interrupt line
> > */
> > -static void sifive_clint_timer_cb(void *opaque)
> > +static void riscv_aclint_mtimer_cb(void *opaque)
> > {
> > - sifive_clint_callback *state = opaque;
> > + riscv_aclint_mtimer_callback *state = opaque;
> >
> > qemu_irq_raise(state->s->timer_irqs[state->num]);
> > }
> >
> > -/* CPU wants to read rtc or timecmp register */
> > -static uint64_t sifive_clint_read(void *opaque, hwaddr addr, unsigned size)
> > +/* CPU read MTIMER register */
> > +static uint64_t riscv_aclint_mtimer_read(void *opaque, hwaddr addr,
> > + unsigned size)
> > {
> > - SiFiveCLINTState *clint = opaque;
> > - if (addr >= clint->sip_base &&
> > - addr < clint->sip_base + (clint->num_harts << 2)) {
> > - size_t hartid = clint->hartid_base + ((addr - clint->sip_base) >>
> > 2);
> > - CPUState *cpu = qemu_get_cpu(hartid);
> > - CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > - if (!env) {
> > - error_report("clint: invalid timecmp hartid: %zu", hartid);
> > - } else if ((addr & 0x3) == 0) {
> > - return (env->mip & MIP_MSIP) > 0;
> > - } else {
> > - error_report("clint: invalid read: %08x", (uint32_t)addr);
> > - return 0;
> > - }
> > - } else if (addr >= clint->timecmp_base &&
> > - addr < clint->timecmp_base + (clint->num_harts << 3)) {
> > - size_t hartid = clint->hartid_base +
> > - ((addr - clint->timecmp_base) >> 3);
> > + RISCVAclintMTimerState *mtimer = opaque;
> > +
> > + if (addr >= mtimer->timecmp_base &&
> > + addr < (mtimer->timecmp_base + (mtimer->num_harts << 3))) {
> > + size_t hartid = mtimer->hartid_base +
> > + ((addr - mtimer->timecmp_base) >> 3);
> > CPUState *cpu = qemu_get_cpu(hartid);
> > CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > if (!env) {
> > - error_report("clint: invalid timecmp hartid: %zu", hartid);
> > + error_report("aclint-mtimer: invalid hartid: %zu", hartid);
> > } else if ((addr & 0x7) == 0) {
> > /* timecmp_lo */
> > uint64_t timecmp = env->timecmp;
> > @@ -117,79 +111,69 @@ static uint64_t sifive_clint_read(void *opaque,
> > hwaddr addr, unsigned size)
> > uint64_t timecmp = env->timecmp;
> > return (timecmp >> 32) & 0xFFFFFFFF;
> > } else {
> > - error_report("clint: invalid read: %08x", (uint32_t)addr);
> > + error_report("aclint-mtimer: invalid read: %08x",
> > (uint32_t)addr);
> > return 0;
> > }
> > - } else if (addr == clint->time_base) {
> > + } else if (addr == mtimer->time_base) {
> > /* time_lo */
> > - return cpu_riscv_read_rtc(clint->timebase_freq) & 0xFFFFFFFF;
> > - } else if (addr == clint->time_base + 4) {
> > + return cpu_riscv_read_rtc(mtimer->timebase_freq) & 0xFFFFFFFF;
> > + } else if (addr == mtimer->time_base + 4) {
> > /* time_hi */
> > - return (cpu_riscv_read_rtc(clint->timebase_freq) >> 32) &
> > 0xFFFFFFFF;
> > + return (cpu_riscv_read_rtc(mtimer->timebase_freq) >> 32) &
> > 0xFFFFFFFF;
> > }
> >
> > - error_report("clint: invalid read: %08x", (uint32_t)addr);
> > + error_report("aclint-mtimer: invalid read: %08x", (uint32_t)addr);
> > return 0;
> > }
> >
> > -/* CPU wrote to rtc or timecmp register */
> > -static void sifive_clint_write(void *opaque, hwaddr addr, uint64_t value,
> > - unsigned size)
> > +/* CPU write MTIMER register */
> > +static void riscv_aclint_mtimer_write(void *opaque, hwaddr addr,
> > + uint64_t value, unsigned size)
> > {
> > - SiFiveCLINTState *clint = opaque;
> > + RISCVAclintMTimerState *mtimer = opaque;
> >
> > - if (addr >= clint->sip_base &&
> > - addr < clint->sip_base + (clint->num_harts << 2)) {
> > - size_t hartid = clint->hartid_base + ((addr - clint->sip_base) >>
> > 2);
> > + if (addr >= mtimer->timecmp_base &&
> > + addr < (mtimer->timecmp_base + (mtimer->num_harts << 3))) {
> > + size_t hartid = mtimer->hartid_base +
> > + ((addr - mtimer->timecmp_base) >> 3);
> > CPUState *cpu = qemu_get_cpu(hartid);
> > CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > if (!env) {
> > - error_report("clint: invalid timecmp hartid: %zu", hartid);
> > - } else if ((addr & 0x3) == 0) {
> > - qemu_set_irq(clint->soft_irqs[hartid - clint->hartid_base],
> > value);
> > - } else {
> > - error_report("clint: invalid sip write: %08x", (uint32_t)addr);
> > - }
> > - return;
> > - } else if (addr >= clint->timecmp_base &&
> > - addr < clint->timecmp_base + (clint->num_harts << 3)) {
> > - size_t hartid = clint->hartid_base +
> > - ((addr - clint->timecmp_base) >> 3);
> > - CPUState *cpu = qemu_get_cpu(hartid);
> > - CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > - if (!env) {
> > - error_report("clint: invalid timecmp hartid: %zu", hartid);
> > + error_report("aclint-mtimer: invalid hartid: %zu", hartid);
> > } else if ((addr & 0x7) == 0) {
> > /* timecmp_lo */
> > uint64_t timecmp_hi = env->timecmp >> 32;
> > - sifive_clint_write_timecmp(clint, RISCV_CPU(cpu), hartid,
> > - timecmp_hi << 32 | (value & 0xFFFFFFFF),
> > clint->timebase_freq);
> > + riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu),
> > hartid,
> > + timecmp_hi << 32 | (value & 0xFFFFFFFF),
> > + mtimer->timebase_freq);
> > return;
> > } else if ((addr & 0x7) == 4) {
> > /* timecmp_hi */
> > uint64_t timecmp_lo = env->timecmp;
> > - sifive_clint_write_timecmp(clint, RISCV_CPU(cpu), hartid,
> > - value << 32 | (timecmp_lo & 0xFFFFFFFF),
> > clint->timebase_freq);
> > + riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu),
> > hartid,
> > + value << 32 | (timecmp_lo & 0xFFFFFFFF),
> > + mtimer->timebase_freq);
> > } else {
> > - error_report("clint: invalid timecmp write: %08x",
> > (uint32_t)addr);
> > + error_report("aclint-mtimer: invalid timecmp write: %08x",
> > + (uint32_t)addr);
> > }
> > return;
> > - } else if (addr == clint->time_base) {
> > + } else if (addr == mtimer->time_base) {
> > /* time_lo */
> > - error_report("clint: time_lo write not implemented");
> > + error_report("aclint-mtimer: time_lo write not implemented");
> > return;
> > - } else if (addr == clint->time_base + 4) {
> > + } else if (addr == mtimer->time_base + 4) {
> > /* time_hi */
> > - error_report("clint: time_hi write not implemented");
> > + error_report("aclint-mtimer: time_hi write not implemented");
>
> While we are changing this can we change it to:
>
> qemu_log_mask(LOG_UNIMP,
>
> instead.
>
> That goes for all of the error_reports, can we please change them to
> either `qemu_log_mask(LOG_UNIMP,` or `qemu_log_mask(LOG_GUEST_ERROR,`
Okay, I will replace all error_reports() with qemu_log_mask().
Regards,
Anup
>
> Otherwise:
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
>
> Alistair
>
> > return;
> > }
> >
> > - error_report("clint: invalid write: %08x", (uint32_t)addr);
> > + error_report("aclint-mtimer: invalid write: %08x", (uint32_t)addr);
> > }
> >
> > -static const MemoryRegionOps sifive_clint_ops = {
> > - .read = sifive_clint_read,
> > - .write = sifive_clint_write,
> > +static const MemoryRegionOps riscv_aclint_mtimer_ops = {
> > + .read = riscv_aclint_mtimer_read,
> > + .write = riscv_aclint_mtimer_write,
> > .endianness = DEVICE_LITTLE_ENDIAN,
> > .valid = {
> > .min_access_size = 4,
> > @@ -197,66 +181,75 @@ static const MemoryRegionOps sifive_clint_ops = {
> > }
> > };
> >
> > -static Property sifive_clint_properties[] = {
> > - DEFINE_PROP_UINT32("hartid-base", SiFiveCLINTState, hartid_base, 0),
> > - DEFINE_PROP_UINT32("num-harts", SiFiveCLINTState, num_harts, 0),
> > - DEFINE_PROP_UINT32("sip-base", SiFiveCLINTState, sip_base, 0),
> > - DEFINE_PROP_UINT32("timecmp-base", SiFiveCLINTState, timecmp_base, 0),
> > - DEFINE_PROP_UINT32("time-base", SiFiveCLINTState, time_base, 0),
> > - DEFINE_PROP_UINT32("aperture-size", SiFiveCLINTState, aperture_size,
> > 0),
> > - DEFINE_PROP_UINT32("timebase-freq", SiFiveCLINTState, timebase_freq,
> > 0),
> > +static Property riscv_aclint_mtimer_properties[] = {
> > + DEFINE_PROP_UINT32("hartid-base", RISCVAclintMTimerState,
> > + hartid_base, 0),
> > + DEFINE_PROP_UINT32("num-harts", RISCVAclintMTimerState, num_harts, 1),
> > + DEFINE_PROP_UINT32("timecmp-base", RISCVAclintMTimerState,
> > + timecmp_base, RISCV_ACLINT_DEFAULT_MTIMECMP),
> > + DEFINE_PROP_UINT32("time-base", RISCVAclintMTimerState,
> > + time_base, RISCV_ACLINT_DEFAULT_MTIME),
> > + DEFINE_PROP_UINT32("aperture-size", RISCVAclintMTimerState,
> > + aperture_size, RISCV_ACLINT_DEFAULT_MTIMER_SIZE),
> > + DEFINE_PROP_UINT32("timebase-freq", RISCVAclintMTimerState,
> > + timebase_freq, 0),
> > DEFINE_PROP_END_OF_LIST(),
> > };
> >
> > -static void sifive_clint_realize(DeviceState *dev, Error **errp)
> > +static void riscv_aclint_mtimer_realize(DeviceState *dev, Error **errp)
> > {
> > - SiFiveCLINTState *s = SIFIVE_CLINT(dev);
> > - memory_region_init_io(&s->mmio, OBJECT(dev), &sifive_clint_ops, s,
> > - TYPE_SIFIVE_CLINT, s->aperture_size);
> > + RISCVAclintMTimerState *s = RISCV_ACLINT_MTIMER(dev);
> > + int i;
> > +
> > + memory_region_init_io(&s->mmio, OBJECT(dev), &riscv_aclint_mtimer_ops,
> > + s, TYPE_RISCV_ACLINT_MTIMER, s->aperture_size);
> > sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio);
> >
> > s->timer_irqs = g_malloc(sizeof(qemu_irq) * s->num_harts);
> > qdev_init_gpio_out(dev, s->timer_irqs, s->num_harts);
> >
> > - s->soft_irqs = g_malloc(sizeof(qemu_irq) * s->num_harts);
> > - qdev_init_gpio_out(dev, s->soft_irqs, s->num_harts);
> > + /* Claim timer interrupt bits */
> > + for (i = 0; i < s->num_harts; i++) {
> > + RISCVCPU *cpu = RISCV_CPU(qemu_get_cpu(s->hartid_base + i));
> > + if (riscv_cpu_claim_interrupts(cpu, MIP_MTIP) < 0) {
> > + error_report("MTIP already claimed");
> > + exit(1);
> > + }
> > + }
> > }
> >
> > -static void sifive_clint_class_init(ObjectClass *klass, void *data)
> > +static void riscv_aclint_mtimer_class_init(ObjectClass *klass, void *data)
> > {
> > DeviceClass *dc = DEVICE_CLASS(klass);
> > - dc->realize = sifive_clint_realize;
> > - device_class_set_props(dc, sifive_clint_properties);
> > + dc->realize = riscv_aclint_mtimer_realize;
> > + device_class_set_props(dc, riscv_aclint_mtimer_properties);
> > }
> >
> > -static const TypeInfo sifive_clint_info = {
> > - .name = TYPE_SIFIVE_CLINT,
> > +static const TypeInfo riscv_aclint_mtimer_info = {
> > + .name = TYPE_RISCV_ACLINT_MTIMER,
> > .parent = TYPE_SYS_BUS_DEVICE,
> > - .instance_size = sizeof(SiFiveCLINTState),
> > - .class_init = sifive_clint_class_init,
> > + .instance_size = sizeof(RISCVAclintMTimerState),
> > + .class_init = riscv_aclint_mtimer_class_init,
> > };
> >
> > -static void sifive_clint_register_types(void)
> > -{
> > - type_register_static(&sifive_clint_info);
> > -}
> > -
> > -type_init(sifive_clint_register_types)
> > -
> > /*
> > - * Create CLINT device.
> > + * Create ACLINT MTIMER device.
> > */
> > -DeviceState *sifive_clint_create(hwaddr addr, hwaddr size,
> > - uint32_t hartid_base, uint32_t num_harts, uint32_t sip_base,
> > +DeviceState *riscv_aclint_mtimer_create(hwaddr addr, hwaddr size,
> > + uint32_t hartid_base, uint32_t num_harts,
> > uint32_t timecmp_base, uint32_t time_base, uint32_t timebase_freq,
> > bool provide_rdtime)
> > {
> > int i;
> > + DeviceState *dev = qdev_new(TYPE_RISCV_ACLINT_MTIMER);
> > +
> > + assert(num_harts <= RISCV_ACLINT_MAX_HARTS);
> > + assert(!(addr & 0x7));
> > + assert(!(timecmp_base & 0x7));
> > + assert(!(time_base & 0x7));
> >
> > - DeviceState *dev = qdev_new(TYPE_SIFIVE_CLINT);
> > qdev_prop_set_uint32(dev, "hartid-base", hartid_base);
> > qdev_prop_set_uint32(dev, "num-harts", num_harts);
> > - qdev_prop_set_uint32(dev, "sip-base", sip_base);
> > qdev_prop_set_uint32(dev, "timecmp-base", timecmp_base);
> > qdev_prop_set_uint32(dev, "time-base", time_base);
> > qdev_prop_set_uint32(dev, "aperture-size", size);
> > @@ -268,7 +261,8 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr
> > size,
> > CPUState *cpu = qemu_get_cpu(hartid_base + i);
> > RISCVCPU *rvcpu = RISCV_CPU(cpu);
> > CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > - sifive_clint_callback *cb =
> > g_malloc0(sizeof(sifive_clint_callback));
> > + riscv_aclint_mtimer_callback *cb =
> > + g_malloc0(sizeof(riscv_aclint_mtimer_callback));
> >
> > if (!env) {
> > g_free(cb);
> > @@ -278,17 +272,155 @@ DeviceState *sifive_clint_create(hwaddr addr, hwaddr
> > size,
> > riscv_cpu_set_rdtime_fn(env, cpu_riscv_read_rtc,
> > timebase_freq);
> > }
> >
> > - cb->s = SIFIVE_CLINT(dev);
> > + cb->s = RISCV_ACLINT_MTIMER(dev);
> > cb->num = i;
> > env->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
> > - &sifive_clint_timer_cb, cb);
> > + &riscv_aclint_mtimer_cb, cb);
> > env->timecmp = 0;
> >
> > - qdev_connect_gpio_out_named(dev, NULL, i,
> > - qdev_get_gpio_in(DEVICE(rvcpu), IRQ_M_TIMER));
> > - qdev_connect_gpio_out_named(dev, NULL, num_harts + i,
> > - qdev_get_gpio_in(DEVICE(rvcpu), IRQ_M_SOFT));
> > + qdev_connect_gpio_out(dev, i,
> > + qdev_get_gpio_in(DEVICE(rvcpu),
> > IRQ_M_TIMER));
> > }
> >
> > return dev;
> > }
> > +
> > +/* CPU read [M|S]SWI register */
> > +static uint64_t riscv_aclint_swi_read(void *opaque, hwaddr addr,
> > + unsigned size)
> > +{
> > + RISCVAclintSwiState *swi = opaque;
> > +
> > + if (addr < (swi->num_harts << 2)) {
> > + size_t hartid = swi->hartid_base + (addr >> 2);
> > + CPUState *cpu = qemu_get_cpu(hartid);
> > + CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > + if (!env) {
> > + error_report("aclint-swi: invalid hartid: %zu", hartid);
> > + } else if ((addr & 0x3) == 0) {
> > + return (swi->sswi) ? 0 : ((env->mip & MIP_MSIP) > 0);
> > + }
> > + }
> > +
> > + error_report("aclint-swi: invalid read: %08x", (uint32_t)addr);
>
> Don't use error_report here, instead use:
>
> qemu_log_mask(LOG_GUEST_ERROR,
>
> Alistair
>
> > + return 0;
> > +}
> > +
> > +/* CPU write [M|S]SWI register */
> > +static void riscv_aclint_swi_write(void *opaque, hwaddr addr, uint64_t
> > value,
> > + unsigned size)
> > +{
> > + RISCVAclintSwiState *swi = opaque;
> > +
> > + if (addr < (swi->num_harts << 2)) {
> > + size_t hartid = swi->hartid_base + (addr >> 2);
> > + CPUState *cpu = qemu_get_cpu(hartid);
> > + CPURISCVState *env = cpu ? cpu->env_ptr : NULL;
> > + if (!env) {
> > + error_report("aclint-swi: invalid hartid: %zu", hartid);
> > + } else if ((addr & 0x3) == 0) {
> > + if (value & 0x1) {
> > + qemu_irq_raise(swi->soft_irqs[hartid - swi->hartid_base]);
> > + } else {
> > + if (!swi->sswi) {
> > + qemu_irq_lower(swi->soft_irqs[hartid -
> > swi->hartid_base]);
> > + }
> > + }
> > + return;
> > + }
> > + }
> > +
> > + error_report("aclint-swi: invalid write: %08x", (uint32_t)addr);
> > +}
> > +
> > +static const MemoryRegionOps riscv_aclint_swi_ops = {
> > + .read = riscv_aclint_swi_read,
> > + .write = riscv_aclint_swi_write,
> > + .endianness = DEVICE_LITTLE_ENDIAN,
> > + .valid = {
> > + .min_access_size = 4,
> > + .max_access_size = 4
> > + }
> > +};
> > +
> > +static Property riscv_aclint_swi_properties[] = {
> > + DEFINE_PROP_UINT32("hartid-base", RISCVAclintSwiState, hartid_base, 0),
> > + DEFINE_PROP_UINT32("num-harts", RISCVAclintSwiState, num_harts, 1),
> > + DEFINE_PROP_UINT32("sswi", RISCVAclintSwiState, sswi, false),
> > + DEFINE_PROP_END_OF_LIST(),
> > +};
> > +
> > +static void riscv_aclint_swi_realize(DeviceState *dev, Error **errp)
> > +{
> > + RISCVAclintSwiState *swi = RISCV_ACLINT_SWI(dev);
> > + int i;
> > +
> > + memory_region_init_io(&swi->mmio, OBJECT(dev), &riscv_aclint_swi_ops,
> > swi,
> > + TYPE_RISCV_ACLINT_SWI, RISCV_ACLINT_SWI_SIZE);
> > + sysbus_init_mmio(SYS_BUS_DEVICE(dev), &swi->mmio);
> > +
> > + swi->soft_irqs = g_malloc(sizeof(qemu_irq) * swi->num_harts);
> > + qdev_init_gpio_out(dev, swi->soft_irqs, swi->num_harts);
> > +
> > + /* Claim software interrupt bits */
> > + for (i = 0; i < swi->num_harts; i++) {
> > + RISCVCPU *cpu = RISCV_CPU(qemu_get_cpu(swi->hartid_base + i));
> > + /* We don't claim mip.SSIP because it is writeable by software */
> > + if (riscv_cpu_claim_interrupts(cpu, swi->sswi ? 0 : MIP_MSIP) < 0)
> > {
> > + error_report("MSIP already claimed");
> > + exit(1);
> > + }
> > + }
> > +}
> > +
> > +static void riscv_aclint_swi_class_init(ObjectClass *klass, void *data)
> > +{
> > + DeviceClass *dc = DEVICE_CLASS(klass);
> > + dc->realize = riscv_aclint_swi_realize;
> > + device_class_set_props(dc, riscv_aclint_swi_properties);
> > +}
> > +
> > +static const TypeInfo riscv_aclint_swi_info = {
> > + .name = TYPE_RISCV_ACLINT_SWI,
> > + .parent = TYPE_SYS_BUS_DEVICE,
> > + .instance_size = sizeof(RISCVAclintSwiState),
> > + .class_init = riscv_aclint_swi_class_init,
> > +};
> > +
> > +/*
> > + * Create ACLINT [M|S]SWI device.
> > + */
> > +DeviceState *riscv_aclint_swi_create(hwaddr addr, uint32_t hartid_base,
> > + uint32_t num_harts, bool sswi)
> > +{
> > + int i;
> > + DeviceState *dev = qdev_new(TYPE_RISCV_ACLINT_SWI);
> > +
> > + assert(num_harts <= RISCV_ACLINT_MAX_HARTS);
> > + assert(!(addr & 0x3));
> > +
> > + qdev_prop_set_uint32(dev, "hartid-base", hartid_base);
> > + qdev_prop_set_uint32(dev, "num-harts", num_harts);
> > + qdev_prop_set_uint32(dev, "sswi", sswi ? true : false);
> > + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
> > + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, addr);
> > +
> > + for (i = 0; i < num_harts; i++) {
> > + CPUState *cpu = qemu_get_cpu(hartid_base + i);
> > + RISCVCPU *rvcpu = RISCV_CPU(cpu);
> > +
> > + qdev_connect_gpio_out(dev, i,
> > + qdev_get_gpio_in(DEVICE(rvcpu),
> > + (sswi) ? IRQ_S_SOFT : IRQ_M_SOFT));
> > + }
> > +
> > + return dev;
> > +}
> > +
> > +static void riscv_aclint_register_types(void)
> > +{
> > + type_register_static(&riscv_aclint_mtimer_info);
> > + type_register_static(&riscv_aclint_swi_info);
> > +}
> > +
> > +type_init(riscv_aclint_register_types)
> > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c
> > index eed9e81355..e475b6d511 100644
> > --- a/hw/riscv/microchip_pfsoc.c
> > +++ b/hw/riscv/microchip_pfsoc.c
> > @@ -234,9 +234,12 @@ static void microchip_pfsoc_soc_realize(DeviceState
> > *dev, Error **errp)
> > memmap[MICROCHIP_PFSOC_BUSERR_UNIT4].size);
> >
> > /* CLINT */
> > - sifive_clint_create(memmap[MICROCHIP_PFSOC_CLINT].base,
> > - memmap[MICROCHIP_PFSOC_CLINT].size, 0, ms->smp.cpus,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > + riscv_aclint_swi_create(memmap[MICROCHIP_PFSOC_CLINT].base,
> > + 0, ms->smp.cpus, false);
> > + riscv_aclint_mtimer_create(
> > + memmap[MICROCHIP_PFSOC_CLINT].base + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, 0, ms->smp.cpus,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > CLINT_TIMEBASE_FREQ, false);
> >
> > /* L2 cache controller */
> > diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
> > index f9f0a45651..2f084d3c8d 100644
> > --- a/hw/riscv/shakti_c.c
> > +++ b/hw/riscv/shakti_c.c
> > @@ -124,10 +124,13 @@ static void shakti_c_soc_state_realize(DeviceState
> > *dev, Error **errp)
> > SHAKTI_C_PLIC_CONTEXT_STRIDE,
> > shakti_c_memmap[SHAKTI_C_PLIC].size);
> >
> > - sifive_clint_create(shakti_c_memmap[SHAKTI_C_CLINT].base,
> > - shakti_c_memmap[SHAKTI_C_CLINT].size, 0, 1,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > - SIFIVE_CLINT_TIMEBASE_FREQ, false);
> > + riscv_aclint_swi_create(shakti_c_memmap[SHAKTI_C_CLINT].base,
> > + 0, 1, false);
> > + riscv_aclint_mtimer_create(shakti_c_memmap[SHAKTI_C_CLINT].base +
> > + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, 0, 1,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, false);
> >
> > qdev_prop_set_chr(DEVICE(&(sss->uart)), "chardev", serial_hd(0));
> > if (!sysbus_realize(SYS_BUS_DEVICE(&sss->uart), errp)) {
> > diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c
> > index 1c55435d8a..5ffdd7f1da 100644
> > --- a/hw/riscv/sifive_e.c
> > +++ b/hw/riscv/sifive_e.c
> > @@ -208,10 +208,13 @@ static void sifive_e_soc_realize(DeviceState *dev,
> > Error **errp)
> > SIFIVE_E_PLIC_CONTEXT_BASE,
> > SIFIVE_E_PLIC_CONTEXT_STRIDE,
> > memmap[SIFIVE_E_DEV_PLIC].size);
> > - sifive_clint_create(memmap[SIFIVE_E_DEV_CLINT].base,
> > - memmap[SIFIVE_E_DEV_CLINT].size, 0, ms->smp.cpus,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > - SIFIVE_CLINT_TIMEBASE_FREQ, false);
> > + riscv_aclint_swi_create(memmap[SIFIVE_E_DEV_CLINT].base,
> > + 0, ms->smp.cpus, false);
> > + riscv_aclint_mtimer_create(memmap[SIFIVE_E_DEV_CLINT].base +
> > + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, 0, ms->smp.cpus,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, false);
> > create_unimplemented_device("riscv.sifive.e.aon",
> > memmap[SIFIVE_E_DEV_AON].base, memmap[SIFIVE_E_DEV_AON].size);
> > sifive_e_prci_create(memmap[SIFIVE_E_DEV_PRCI].base);
> > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> > index d1211e1c3d..92b240c78a 100644
> > --- a/hw/riscv/sifive_u.c
> > +++ b/hw/riscv/sifive_u.c
> > @@ -848,9 +848,12 @@ static void sifive_u_soc_realize(DeviceState *dev,
> > Error **errp)
> > serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic),
> > SIFIVE_U_UART0_IRQ));
> > sifive_uart_create(system_memory, memmap[SIFIVE_U_DEV_UART1].base,
> > serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic),
> > SIFIVE_U_UART1_IRQ));
> > - sifive_clint_create(memmap[SIFIVE_U_DEV_CLINT].base,
> > - memmap[SIFIVE_U_DEV_CLINT].size, 0, ms->smp.cpus,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > + riscv_aclint_swi_create(memmap[SIFIVE_U_DEV_CLINT].base, 0,
> > + ms->smp.cpus, false);
> > + riscv_aclint_mtimer_create(memmap[SIFIVE_U_DEV_CLINT].base +
> > + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, 0, ms->smp.cpus,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > CLINT_TIMEBASE_FREQ, false);
> >
> > if (!sysbus_realize(SYS_BUS_DEVICE(&s->prci), errp)) {
> > diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
> > index f682b7ed4e..2619aa1071 100644
> > --- a/hw/riscv/spike.c
> > +++ b/hw/riscv/spike.c
> > @@ -85,7 +85,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry
> > *memmap,
> >
> > qemu_fdt_add_subnode(fdt, "/cpus");
> > qemu_fdt_setprop_cell(fdt, "/cpus", "timebase-frequency",
> > - SIFIVE_CLINT_TIMEBASE_FREQ);
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ);
> > qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0);
> > qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1);
> > qemu_fdt_add_subnode(fdt, "/cpus/cpu-map");
> > @@ -228,11 +228,15 @@ static void spike_board_init(MachineState *machine)
> > sysbus_realize(SYS_BUS_DEVICE(&s->soc[i]), &error_abort);
> >
> > /* Core Local Interruptor (timer and IPI) for each socket */
> > - sifive_clint_create(
> > + riscv_aclint_swi_create(
> > memmap[SPIKE_CLINT].base + i * memmap[SPIKE_CLINT].size,
> > - memmap[SPIKE_CLINT].size, base_hartid, hart_count,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > - SIFIVE_CLINT_TIMEBASE_FREQ, false);
> > + base_hartid, hart_count, false);
> > + riscv_aclint_mtimer_create(
> > + memmap[SPIKE_CLINT].base + i * memmap[SPIKE_CLINT].size +
> > + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, base_hartid, hart_count,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, false);
> > }
> >
> > /* register system main memory (actual RAM) */
> > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
> > index 66de5d3767..3cbb4cd47f 100644
> > --- a/hw/riscv/virt.c
> > +++ b/hw/riscv/virt.c
> > @@ -229,7 +229,7 @@ static void create_fdt(RISCVVirtState *s, const
> > MemMapEntry *memmap,
> >
> > qemu_fdt_add_subnode(fdt, "/cpus");
> > qemu_fdt_setprop_cell(fdt, "/cpus", "timebase-frequency",
> > - SIFIVE_CLINT_TIMEBASE_FREQ);
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ);
> > qemu_fdt_setprop_cell(fdt, "/cpus", "#size-cells", 0x0);
> > qemu_fdt_setprop_cell(fdt, "/cpus", "#address-cells", 0x1);
> > qemu_fdt_add_subnode(fdt, "/cpus/cpu-map");
> > @@ -597,11 +597,15 @@ static void virt_machine_init(MachineState *machine)
> > sysbus_realize(SYS_BUS_DEVICE(&s->soc[i]), &error_abort);
> >
> > /* Per-socket CLINT */
> > - sifive_clint_create(
> > + riscv_aclint_swi_create(
> > memmap[VIRT_CLINT].base + i * memmap[VIRT_CLINT].size,
> > - memmap[VIRT_CLINT].size, base_hartid, hart_count,
> > - SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE,
> > - SIFIVE_CLINT_TIMEBASE_FREQ, true);
> > + base_hartid, hart_count, false);
> > + riscv_aclint_mtimer_create(
> > + memmap[VIRT_CLINT].base + i * memmap[VIRT_CLINT].size +
> > + RISCV_ACLINT_SWI_SIZE,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE, base_hartid, hart_count,
> > + RISCV_ACLINT_DEFAULT_MTIMECMP, RISCV_ACLINT_DEFAULT_MTIME,
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ, true);
> >
> > /* Per-socket PLIC hart topology configuration string */
> > plic_hart_config_len =
> > diff --git a/include/hw/intc/riscv_aclint.h b/include/hw/intc/riscv_aclint.h
> > index 921b1561dd..229bd08d25 100644
> > --- a/include/hw/intc/riscv_aclint.h
> > +++ b/include/hw/intc/riscv_aclint.h
> > @@ -1,8 +1,9 @@
> > /*
> > - * SiFive CLINT (Core Local Interruptor) interface
> > + * RISC-V ACLINT (Advanced Core Local Interruptor) interface
> > *
> > * Copyright (c) 2016-2017 Sagar Karandikar, sagark@eecs.berkeley.edu
> > * Copyright (c) 2017 SiFive, Inc.
> > + * Copyright (c) 2021 Western Digital Corporation or its affiliates.
> > *
> > * This program is free software; you can redistribute it and/or modify it
> > * under the terms and conditions of the GNU General Public License,
> > @@ -17,17 +18,17 @@
> > * this program. If not, see <http://www.gnu.org/licenses/>.
> > */
> >
> > -#ifndef HW_SIFIVE_CLINT_H
> > -#define HW_SIFIVE_CLINT_H
> > +#ifndef HW_RISCV_ACLINT_H
> > +#define HW_RISCV_ACLINT_H
> >
> > #include "hw/sysbus.h"
> >
> > -#define TYPE_SIFIVE_CLINT "riscv.sifive.clint"
> > +#define TYPE_RISCV_ACLINT_MTIMER "riscv.aclint.mtimer"
> >
> > -#define SIFIVE_CLINT(obj) \
> > - OBJECT_CHECK(SiFiveCLINTState, (obj), TYPE_SIFIVE_CLINT)
> > +#define RISCV_ACLINT_MTIMER(obj) \
> > + OBJECT_CHECK(RISCVAclintMTimerState, (obj), TYPE_RISCV_ACLINT_MTIMER)
> >
> > -typedef struct SiFiveCLINTState {
> > +typedef struct RISCVAclintMTimerState {
> > /*< private >*/
> > SysBusDevice parent_obj;
> >
> > @@ -35,28 +36,45 @@ typedef struct SiFiveCLINTState {
> > MemoryRegion mmio;
> > uint32_t hartid_base;
> > uint32_t num_harts;
> > - uint32_t sip_base;
> > uint32_t timecmp_base;
> > uint32_t time_base;
> > uint32_t aperture_size;
> > uint32_t timebase_freq;
> > qemu_irq *timer_irqs;
> > - qemu_irq *soft_irqs;
> > -} SiFiveCLINTState;
> > +} RISCVAclintMTimerState;
> >
> > -DeviceState *sifive_clint_create(hwaddr addr, hwaddr size,
> > - uint32_t hartid_base, uint32_t num_harts, uint32_t sip_base,
> > +DeviceState *riscv_aclint_mtimer_create(hwaddr addr, hwaddr size,
> > + uint32_t hartid_base, uint32_t num_harts,
> > uint32_t timecmp_base, uint32_t time_base, uint32_t timebase_freq,
> > bool provide_rdtime);
> >
> > -enum {
> > - SIFIVE_SIP_BASE = 0x0,
> > - SIFIVE_TIMECMP_BASE = 0x4000,
> > - SIFIVE_TIME_BASE = 0xBFF8
> > -};
> > +#define TYPE_RISCV_ACLINT_SWI "riscv.aclint.swi"
> > +
> > +#define RISCV_ACLINT_SWI(obj) \
> > + OBJECT_CHECK(RISCVAclintSwiState, (obj), TYPE_RISCV_ACLINT_SWI)
> > +
> > +typedef struct RISCVAclintSwiState {
> > + /*< private >*/
> > + SysBusDevice parent_obj;
> > +
> > + /*< public >*/
> > + MemoryRegion mmio;
> > + uint32_t hartid_base;
> > + uint32_t num_harts;
> > + uint32_t sswi;
> > + qemu_irq *soft_irqs;
> > +} RISCVAclintSwiState;
> > +
> > +DeviceState *riscv_aclint_swi_create(hwaddr addr, uint32_t hartid_base,
> > + uint32_t num_harts, bool sswi);
> >
> > enum {
> > - SIFIVE_CLINT_TIMEBASE_FREQ = 10000000
> > + RISCV_ACLINT_DEFAULT_MTIMECMP = 0x0,
> > + RISCV_ACLINT_DEFAULT_MTIME = 0x7ff8,
> > + RISCV_ACLINT_DEFAULT_MTIMER_SIZE = 0x8000,
> > + RISCV_ACLINT_DEFAULT_TIMEBASE_FREQ = 10000000,
> > + RISCV_ACLINT_MAX_HARTS = 4095,
> > + RISCV_ACLINT_SWI_SIZE = 0x4000
> > };
> >
> > #endif
> > --
> > 2.25.1
> >
> >