From nobody Wed May 15 16:11:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1652131958; cv=none; d=zohomail.com; s=zohoarc; b=JJwwLi7HdSql581GowbzLrdzk1R1t1WDsCb8k8iGvGQdFlVtv9/JZ0mGOnT/94tQWJYCDRIUwugjcvqhzr45Cqoux60Agp4E7RyGtUHSNb9Re6ob2ci9shuynDNjPPzAvswv0foX9eXb0lPDe32RGQwnY2QNSp90ZT5S3nF47L8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652131958; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CJvE3h4tAyhIhICfBpxcnPQ4S29PH71ESKQFWSylxS8=; b=dAvOthiAv5eN/1XwttLkLaEylgzocFzjjHu6G7T9STVEEvmU6lhnaXJS1HroJZR5a8jBORiEG63IdeMbwNH53CeC9HxiPE9UY3vc3EZjBNLP4GfoPZEaHaFSObR57hkyX3NNeymtAepwUGS6lixkvOPfbLkgjg9yEzlRqyGnoU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652131957977928.3660743502622; Mon, 9 May 2022 14:32:37 -0700 (PDT) Received: from localhost ([::1]:34140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noAzc-0003w4-BT for importer@patchew.org; Mon, 09 May 2022 17:32:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noAvn-0000Yc-SU for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:40 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:36616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noAvj-00018j-Fx for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:37 -0400 Received: by mail-pg1-x532.google.com with SMTP id s16so2985050pgs.3 for ; Mon, 09 May 2022 14:28:35 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id n89-20020a17090a5ae200b001cd4989fecfsm164509pji.27.2022.05.09.14.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 14:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CJvE3h4tAyhIhICfBpxcnPQ4S29PH71ESKQFWSylxS8=; b=tkCVj1JPTmWOEL6PcuvsIkAqEjpk/+FgUGB3+r5O5p0zezFor+xCSC34CLUDdq+Hn2 6fGaJ/PTlHbgcL0UCIIgo6ZVJtpd/SINKFRn754s+bqJxk2UuScxEqp+BweaqHh5edBe T01twIo71x5IDNeMlCjeiN0lWLu9YRuRtclQd5K+A8O21/UXDUruyWEmPkj7PgGHl5Yt WqFGl6SqUFppIV2gDaJ4vCT6fnwOaDPw7WcmsMcuMDLUdQXXJTpetR9DWmtaGTXj47Ly aXKMs+zFps0ZSbP1/FGiErT2miK8Z6Xrt0Uz4PA10FrwbbCBDmW4SNwaF1/vcWzabamG hhqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CJvE3h4tAyhIhICfBpxcnPQ4S29PH71ESKQFWSylxS8=; b=ZfyF4pZ/eSeTHxC6WPZlDj5QKXAjUpQVe4ENSOoG+/iOypzzF37G2zxCdg1awe8ZFT zbrPoIqDIUFHo3F+7aVmiCI13QtnPoElNZwhP4q+Nfw31yeQpnZvbZNS2tKoQjU0yj4S xGdLM70Y1Kn4el6B3H+DROVbsUu6iH1vvGZ6OCLmeBr9iDSuZt66ftyTv4vanSofrZSo ljyXyxWaqOicbjfcNMWfVi/lavcDvO8mUCekImFnynYgOTTgv9cKoWjTwwatehjAYsht qy9ZRfbUZu5MHPHLWxDY/QpRCeRjW2UW6ebvKluAqzBGjs9d/TNAyjLtauinqVJ26uIr irfQ== X-Gm-Message-State: AOAM533K1mAI5mVqLo6Qj45NvB/uDDTkgY1Hi0EVMsDDUXNdLCeeYUcb HZnl3wf1fR6LMu1sBLxmaM1mM/Ci/6dkIg== X-Google-Smtp-Source: ABdhPJxb/8+JbF6cr3jaLF0/E4grDiGWhQeK7YHOThaxSU0Sh//9DjwHEpKcFEU0QXIYNFmx4vSY8g== X-Received: by 2002:a62:3848:0:b0:50d:376e:57ed with SMTP id f69-20020a623848000000b0050d376e57edmr17808468pfa.71.1652131713852; Mon, 09 May 2022 14:28:33 -0700 (PDT) From: Atish Patra To: qemu-devel@nongnu.org Cc: Atish Patra , Alistair Francis , Bin Meng , Palmer Dabbelt , qemu-riscv@nongnu.org Subject: [PATCH v3 1/3] hw/intc: Move mtimer/mtimecmp to aclint Date: Mon, 9 May 2022 14:28:25 -0700 Message-Id: <20220509212827.2057822-2-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509212827.2057822-1-atishp@rivosinc.com> References: <20220509212827.2057822-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::532; envelope-from=atishp@rivosinc.com; helo=mail-pg1-x532.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @rivosinc-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1652131959362100001 Content-Type: text/plain; charset="utf-8" Historically, The mtimer/mtimecmp has been part of the CPU because they are per hart entities. However, they actually belong to aclint which is a MMIO device. Move them to the ACLINT device. This also emulates the real hardware more closely. Signed-off-by: Atish Patra Reviewed-by: Anup Patel --- hw/intc/riscv_aclint.c | 41 ++++++++++++++++++++++++---------- hw/timer/ibex_timer.c | 18 ++++++--------- include/hw/intc/riscv_aclint.h | 2 ++ include/hw/timer/ibex_timer.h | 2 ++ target/riscv/cpu.h | 2 -- target/riscv/machine.c | 5 ++--- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/hw/intc/riscv_aclint.c b/hw/intc/riscv_aclint.c index 0412edc98257..83d317def395 100644 --- a/hw/intc/riscv_aclint.c +++ b/hw/intc/riscv_aclint.c @@ -32,6 +32,7 @@ #include "hw/intc/riscv_aclint.h" #include "qemu/timer.h" #include "hw/irq.h" +#include "migration/vmstate.h" =20 typedef struct riscv_aclint_mtimer_callback { RISCVAclintMTimerState *s; @@ -65,8 +66,8 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAclint= MTimerState *mtimer, =20 uint64_t rtc_r =3D cpu_riscv_read_rtc(mtimer); =20 - cpu->env.timecmp =3D value; - if (cpu->env.timecmp <=3D rtc_r) { + mtimer->timecmp[hartid] =3D value; + if (mtimer->timecmp[hartid] <=3D rtc_r) { /* * If we're setting an MTIMECMP value in the "past", * immediately raise the timer interrupt @@ -77,7 +78,7 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAclint= MTimerState *mtimer, =20 /* otherwise, set up the future timer interrupt */ qemu_irq_lower(mtimer->timer_irqs[hartid - mtimer->hartid_base]); - diff =3D cpu->env.timecmp - rtc_r; + diff =3D mtimer->timecmp[hartid] - rtc_r; /* back to ns (note args switched in muldiv64) */ uint64_t ns_diff =3D muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_f= req); =20 @@ -102,7 +103,7 @@ static void riscv_aclint_mtimer_write_timecmp(RISCVAcli= ntMTimerState *mtimer, next =3D MIN(next, INT64_MAX); } =20 - timer_mod(cpu->env.timer, next); + timer_mod(mtimer->timers[hartid], next); } =20 /* @@ -133,11 +134,11 @@ static uint64_t riscv_aclint_mtimer_read(void *opaque= , hwaddr addr, "aclint-mtimer: invalid hartid: %zu", hartid); } else if ((addr & 0x7) =3D=3D 0) { /* timecmp_lo for RV32/RV64 or timecmp for RV64 */ - uint64_t timecmp =3D env->timecmp; + uint64_t timecmp =3D mtimer->timecmp[hartid]; return (size =3D=3D 4) ? (timecmp & 0xFFFFFFFF) : timecmp; } else if ((addr & 0x7) =3D=3D 4) { /* timecmp_hi */ - uint64_t timecmp =3D env->timecmp; + uint64_t timecmp =3D mtimer->timecmp[hartid]; return (timecmp >> 32) & 0xFFFFFFFF; } else { qemu_log_mask(LOG_UNIMP, @@ -177,7 +178,7 @@ static void riscv_aclint_mtimer_write(void *opaque, hwa= ddr addr, } else if ((addr & 0x7) =3D=3D 0) { if (size =3D=3D 4) { /* timecmp_lo for RV32/RV64 */ - uint64_t timecmp_hi =3D env->timecmp >> 32; + uint64_t timecmp_hi =3D mtimer->timecmp[hartid] >> 32; riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu), = hartid, timecmp_hi << 32 | (value & 0xFFFFFFFF)); } else { @@ -188,7 +189,7 @@ static void riscv_aclint_mtimer_write(void *opaque, hwa= ddr addr, } else if ((addr & 0x7) =3D=3D 4) { if (size =3D=3D 4) { /* timecmp_hi for RV32/RV64 */ - uint64_t timecmp_lo =3D env->timecmp; + uint64_t timecmp_lo =3D mtimer->timecmp[hartid]; riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu), = hartid, value << 32 | (timecmp_lo & 0xFFFFFFFF)); } else { @@ -233,7 +234,7 @@ static void riscv_aclint_mtimer_write(void *opaque, hwa= ddr addr, continue; } riscv_aclint_mtimer_write_timecmp(mtimer, RISCV_CPU(cpu), - i, env->timecmp); + i, mtimer->timecmp[i]); } return; } @@ -283,6 +284,8 @@ static void riscv_aclint_mtimer_realize(DeviceState *de= v, Error **errp) s->timer_irqs =3D g_new(qemu_irq, s->num_harts); qdev_init_gpio_out(dev, s->timer_irqs, s->num_harts); =20 + s->timers =3D g_malloc0(s->num_harts * sizeof(QEMUTimer)); + s->timecmp =3D g_new0(uint64_t, s->num_harts); /* Claim timer interrupt bits */ for (i =3D 0; i < s->num_harts; i++) { RISCVCPU *cpu =3D RISCV_CPU(qemu_get_cpu(s->hartid_base + i)); @@ -309,6 +312,18 @@ static void riscv_aclint_mtimer_reset_enter(Object *ob= j, ResetType type) riscv_aclint_mtimer_write(mtimer, mtimer->time_base, 0, 8); } =20 +static const VMStateDescription vmstate_riscv_mtimer =3D { + .name =3D "riscv_mtimer", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_VARRAY_UINT32(timecmp, RISCVAclintMTimerState, + num_harts, 0, + vmstate_info_uint64, uint64_t), + VMSTATE_END_OF_LIST() + } +}; + static void riscv_aclint_mtimer_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -316,6 +331,7 @@ static void riscv_aclint_mtimer_class_init(ObjectClass = *klass, void *data) device_class_set_props(dc, riscv_aclint_mtimer_properties); ResettableClass *rc =3D RESETTABLE_CLASS(klass); rc->phases.enter =3D riscv_aclint_mtimer_reset_enter; + dc->vmsd =3D &vmstate_riscv_mtimer; } =20 static const TypeInfo riscv_aclint_mtimer_info =3D { @@ -335,6 +351,7 @@ DeviceState *riscv_aclint_mtimer_create(hwaddr addr, hw= addr size, { int i; DeviceState *dev =3D qdev_new(TYPE_RISCV_ACLINT_MTIMER); + RISCVAclintMTimerState *s =3D RISCV_ACLINT_MTIMER(dev); =20 assert(num_harts <=3D RISCV_ACLINT_MAX_HARTS); assert(!(addr & 0x7)); @@ -365,11 +382,11 @@ DeviceState *riscv_aclint_mtimer_create(hwaddr addr, = hwaddr size, riscv_cpu_set_rdtime_fn(env, cpu_riscv_read_rtc, dev); } =20 - cb->s =3D RISCV_ACLINT_MTIMER(dev); + cb->s =3D s; cb->num =3D i; - env->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, + s->timers[i] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &riscv_aclint_mtimer_cb, cb); - env->timecmp =3D 0; + s->timecmp[i] =3D 0; =20 qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(DEVICE(rvcpu), IRQ_M_TIMER)= ); diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index 8c2ca364daab..d8b8e4e1f602 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -60,8 +60,6 @@ static uint64_t cpu_riscv_read_rtc(uint32_t timebase_freq) =20 static void ibex_timer_update_irqs(IbexTimerState *s) { - CPUState *cs =3D qemu_get_cpu(0); - RISCVCPU *cpu =3D RISCV_CPU(cs); uint64_t value =3D s->timer_compare_lower0 | ((uint64_t)s->timer_compare_upper0 << 32); uint64_t next, diff; @@ -73,9 +71,9 @@ static void ibex_timer_update_irqs(IbexTimerState *s) } =20 /* Update the CPUs mtimecmp */ - cpu->env.timecmp =3D value; + s->mtimecmp =3D value; =20 - if (cpu->env.timecmp <=3D now) { + if (s->mtimecmp <=3D now) { /* * If the mtimecmp was in the past raise the interrupt now. */ @@ -91,7 +89,7 @@ static void ibex_timer_update_irqs(IbexTimerState *s) qemu_irq_lower(s->m_timer_irq); qemu_set_irq(s->irq, false); =20 - diff =3D cpu->env.timecmp - now; + diff =3D s->mtimecmp - now; next =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + muldiv64(diff, NANOSECONDS_PER_SECOND, @@ -99,9 +97,9 @@ static void ibex_timer_update_irqs(IbexTimerState *s) =20 if (next < qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)) { /* We overflowed the timer, just set it as large as we can */ - timer_mod(cpu->env.timer, 0x7FFFFFFFFFFFFFFF); + timer_mod(s->mtimer, 0x7FFFFFFFFFFFFFFF); } else { - timer_mod(cpu->env.timer, next); + timer_mod(s->mtimer, next); } } =20 @@ -120,11 +118,9 @@ static void ibex_timer_reset(DeviceState *dev) { IbexTimerState *s =3D IBEX_TIMER(dev); =20 - CPUState *cpu =3D qemu_get_cpu(0); - CPURISCVState *env =3D cpu->env_ptr; - env->timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, + s->mtimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &ibex_timer_cb, s); - env->timecmp =3D 0; + s->mtimecmp =3D 0; =20 s->timer_ctrl =3D 0x00000000; s->timer_cfg0 =3D 0x00010000; diff --git a/include/hw/intc/riscv_aclint.h b/include/hw/intc/riscv_aclint.h index 26d4048687fb..693415eb6def 100644 --- a/include/hw/intc/riscv_aclint.h +++ b/include/hw/intc/riscv_aclint.h @@ -32,6 +32,8 @@ typedef struct RISCVAclintMTimerState { /*< private >*/ SysBusDevice parent_obj; uint64_t time_delta; + uint64_t *timecmp; + QEMUTimer **timers; =20 /*< public >*/ MemoryRegion mmio; diff --git a/include/hw/timer/ibex_timer.h b/include/hw/timer/ibex_timer.h index 1a0a28d5fab5..41f5c82a920b 100644 --- a/include/hw/timer/ibex_timer.h +++ b/include/hw/timer/ibex_timer.h @@ -33,6 +33,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) struct IbexTimerState { /* */ SysBusDevice parent_obj; + uint64_t mtimecmp; + QEMUTimer *mtimer; /* Internal timer for M-mode interrupt */ =20 /* */ MemoryRegion mmio; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 34c22d5d3be3..1119d5201066 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -275,7 +275,6 @@ struct CPUArchState { /* temporary htif regs */ uint64_t mfromhost; uint64_t mtohost; - uint64_t timecmp; =20 /* physical memory protection */ pmp_table_t pmp_state; @@ -330,7 +329,6 @@ struct CPUArchState { float_status fp_status; =20 /* Fields from here on are preserved across CPU reset. */ - QEMUTimer *timer; /* Internal timer */ =20 hwaddr kernel_addr; hwaddr fdt_addr; diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 2a437b29a1ce..7d85de0b1d49 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -286,8 +286,8 @@ static const VMStateDescription vmstate_envcfg =3D { =20 const VMStateDescription vmstate_riscv_cpu =3D { .name =3D "cpu", - .version_id =3D 3, - .minimum_version_id =3D 3, + .version_id =3D 4, + .minimum_version_id =3D 4, .post_load =3D riscv_cpu_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32), @@ -334,7 +334,6 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINTTL(env.mscratch, RISCVCPU), VMSTATE_UINT64(env.mfromhost, RISCVCPU), VMSTATE_UINT64(env.mtohost, RISCVCPU), - VMSTATE_UINT64(env.timecmp, RISCVCPU), =20 VMSTATE_END_OF_LIST() }, --=20 2.25.1 From nobody Wed May 15 16:11:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1652131922; cv=none; d=zohomail.com; s=zohoarc; b=QpMheFt+iQheMKOP+YVyGKMO2KFqap7l5nWH88seeSrad7T3ahB0KB9YcP91QW6towFNePryMC4XthuyAfVR76zs9uagJpRFcP/FCU5SSjBMgBSktskc9OGs/dD6/rspFDrW/BQErfE3Ncq/suCRLdR+oTESAZRcZPD0+hZEjDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652131922; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=65d5ZCwemXPSu+CwCS6rg3pHbi0TsJYMsI5av2MlXLU=; b=cJSLnRUo2wRDBFEn1zZxGn070ttd9rKIEO0PN93G/kxxmEr+fv27R9Jitm0I9rjX7qYpFOjl6LhoOnfiODrm3nZdfDfYcehggPtJDUDCbBO5EL+fKNfrm0d34p4YPmFYCuQpG4a9TeJnBaxQaRACqYOx2cx+9Xi08yPPKbnUzzY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16521319219681022.523132904197; Mon, 9 May 2022 14:32:01 -0700 (PDT) Received: from localhost ([::1]:60880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noAz2-0002vw-IG for importer@patchew.org; Mon, 09 May 2022 17:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noAvn-0000Ya-S1 for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:40 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:35815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noAvk-00018u-P7 for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:39 -0400 Received: by mail-pl1-x636.google.com with SMTP id c9so14363282plh.2 for ; Mon, 09 May 2022 14:28:36 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id n89-20020a17090a5ae200b001cd4989fecfsm164509pji.27.2022.05.09.14.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 14:28:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=65d5ZCwemXPSu+CwCS6rg3pHbi0TsJYMsI5av2MlXLU=; b=sKo3P9clabPf6umGmCXDsecLjnHfnEHDq06/sk9r8OKI/sGhXu8t5ReypPGg1n99Kk cUsw354YMajHSQPt8iKFbIudM+AYkZHmWQj3XcUNBw0rJNz7Y94uMFrDR8JCCiUOiT4p Qm2ZNem8Q89SuXgfcpU/5kF2oPN9FlNrwcKYnyH2SDFwzVDfoJIJl+XHHy/Edy0vGIsm ccppZwOAn/FzBAL0XKlxJm7CLt7/RoQJKVujI52Bo+CWwYLeVwwlisxq1DuwUHBuWH5d m5FLtBaWDBm8TMaAtFoUvv7SXtY3KAK6MAKkNM+SvvNEtV/7G7KLC9HyQZrmFASDw4YK xmoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=65d5ZCwemXPSu+CwCS6rg3pHbi0TsJYMsI5av2MlXLU=; b=ur1vjyQ8FuAyb8vJjgZtSA6DEhuuLR1PE1sU9w9zPOj/HeHrhI1pg2jllhZt39/fg6 CHTjbwnCzAbrCSbHSNi9/TmL5CJ9+nSLma6KZoXR7A0jqfn/7kU4dq+ScEsLpVpl9Pko StNSu/TnRcOc3p/eciiveCdHDuPyJWODiF2tHgvruFUAh/xlgFd+zqvN/0Kpi1x6BbjV uvws2cmpDA5yXriJkFKtb0ipenTYz6DzAXGZyMGIQyt8H8MOX+83IL2VML0mMLeXclcy eX1XUT61f7ca5e3MImLBMMUVXvOjbggnProUS3dH1aBipUy28jCXUMgaKctEsTFF2pls 2Upw== X-Gm-Message-State: AOAM532zMAtQaLF32V3+O0jc3IrwH65m4a3u58uyDSe7PzJ43g3ksOqH Aoe0676XJnvlKaaer0aM7wyqKlMo8X2O9g== X-Google-Smtp-Source: ABdhPJz+U7wQ4FyH1yfgrVQ+4qnpWA/3p1NyBQRSpBTeADHstVl7+gM1P6MpxMZO6GSMHCQdcrfNIw== X-Received: by 2002:a17:902:d402:b0:15e:cae9:cc47 with SMTP id b2-20020a170902d40200b0015ecae9cc47mr17107305ple.100.1652131715116; Mon, 09 May 2022 14:28:35 -0700 (PDT) From: Atish Patra To: qemu-devel@nongnu.org Cc: Atish Patra , Alistair Francis , Bin Meng , Palmer Dabbelt , qemu-riscv@nongnu.org Subject: [PATCH v3 2/3] target/riscv: Add stimecmp support Date: Mon, 9 May 2022 14:28:26 -0700 Message-Id: <20220509212827.2057822-3-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509212827.2057822-1-atishp@rivosinc.com> References: <20220509212827.2057822-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=atishp@rivosinc.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @rivosinc-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1652131923156100003 Content-Type: text/plain; charset="utf-8" stimecmp allows the supervisor mode to update stimecmp CSR directly to program the next timer interrupt. This CSR is part of the Sstc extension which was ratified recently. Signed-off-by: Atish Patra --- target/riscv/cpu.c | 8 ++++ target/riscv/cpu.h | 7 +++ target/riscv/cpu_bits.h | 4 ++ target/riscv/csr.c | 92 +++++++++++++++++++++++++++++++++++ target/riscv/machine.c | 1 + target/riscv/meson.build | 3 +- target/riscv/time_helper.c | 98 ++++++++++++++++++++++++++++++++++++++ target/riscv/time_helper.h | 30 ++++++++++++ 8 files changed, 242 insertions(+), 1 deletion(-) create mode 100644 target/riscv/time_helper.c create mode 100644 target/riscv/time_helper.h diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 19f4e8294042..d58dd2f857a7 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -23,6 +23,7 @@ #include "qemu/log.h" #include "cpu.h" #include "internals.h" +#include "time_helper.h" #include "exec/exec-all.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -779,7 +780,12 @@ static void riscv_cpu_init(Object *obj) #ifndef CONFIG_USER_ONLY qdev_init_gpio_in(DEVICE(cpu), riscv_cpu_set_irq, IRQ_LOCAL_MAX + IRQ_LOCAL_GUEST_MAX); + + if (cpu->cfg.ext_sstc) { + riscv_timer_init(cpu); + } #endif /* CONFIG_USER_ONLY */ + } =20 static Property riscv_cpu_properties[] =3D { @@ -806,6 +812,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true), + DEFINE_PROP_BOOL("sstc", RISCVCPU, cfg.ext_sstc, true), =20 DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_STRING("vext_spec", RISCVCPU, cfg.vext_spec), @@ -965,6 +972,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **= isa_str, int max_str_len) ISA_EDATA_ENTRY(zbs, ext_zbs), ISA_EDATA_ENTRY(zve32f, ext_zve32f), ISA_EDATA_ENTRY(zve64f, ext_zve64f), + ISA_EDATA_ENTRY(sstc, ext_sstc), ISA_EDATA_ENTRY(svinval, ext_svinval), ISA_EDATA_ENTRY(svnapot, ext_svnapot), ISA_EDATA_ENTRY(svpbmt, ext_svpbmt), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 1119d5201066..9a01e6d0f587 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -276,6 +276,11 @@ struct CPUArchState { uint64_t mfromhost; uint64_t mtohost; =20 + /* Sstc CSRs */ + uint64_t stimecmp; + /* For RV32 only */ + uint8_t stimecmp_wr_done; + /* physical memory protection */ pmp_table_t pmp_state; target_ulong mseccfg; @@ -329,6 +334,7 @@ struct CPUArchState { float_status fp_status; =20 /* Fields from here on are preserved across CPU reset. */ + QEMUTimer *stimer; /* Internal timer for S-mode interrupt */ =20 hwaddr kernel_addr; hwaddr fdt_addr; @@ -379,6 +385,7 @@ struct RISCVCPUConfig { bool ext_counters; bool ext_ifencei; bool ext_icsr; + bool ext_sstc; bool ext_svinval; bool ext_svnapot; bool ext_svpbmt; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 4e5b630f5965..29d0e4a1be01 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -215,6 +215,10 @@ #define CSR_STVAL 0x143 #define CSR_SIP 0x144 =20 +/* Sstc supervisor CSRs */ +#define CSR_STIMECMP 0x14D +#define CSR_STIMECMPH 0x15D + /* Supervisor Protection and Translation */ #define CSR_SPTBR 0x180 #define CSR_SATP 0x180 diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 245f007e66e1..8952d1308008 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -21,6 +21,7 @@ #include "qemu/log.h" #include "qemu/timer.h" #include "cpu.h" +#include "time_helper.h" #include "qemu/main-loop.h" #include "exec/exec-all.h" #include "sysemu/cpu-timers.h" @@ -537,6 +538,87 @@ static RISCVException read_timeh(CPURISCVState *env, i= nt csrno, return RISCV_EXCP_NONE; } =20 +static RISCVException sstc(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_sstc || !env->rdtime_fn) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (env->priv =3D=3D PRV_M) { + return RISCV_EXCP_NONE; + } + + if (env->priv !=3D PRV_S) { + return RISCV_EXCP_ILLEGAL_INST; + } + + /* + * No need of separate function for rv32 as menvcfg stores both menvcfg + * menvcfgh for RV32. + */ + if (!(get_field(env->mcounteren, COUNTEREN_TM) && + get_field(env->menvcfg, MENVCFG_STCE))) { + return RISCV_EXCP_ILLEGAL_INST; + } + + return RISCV_EXCP_NONE; +} + +static RISCVException read_stimecmp(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->stimecmp; + return RISCV_EXCP_NONE; +} + +static RISCVException read_stimecmph(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->stimecmp >> 32; + return RISCV_EXCP_NONE; +} + +static RISCVException write_stimecmp(CPURISCVState *env, int csrno, + target_ulong val) +{ + RISCVCPU *cpu =3D env_archcpu(env); + + if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { + env->stimecmp =3D deposit64(env->stimecmp, 0, 32, (uint64_t)val); + env->stimecmp_wr_done |=3D 0x01; + if (env->stimecmp_wr_done !=3D 0x03) { + return RISCV_EXCP_NONE; + } else { + env->stimecmp_wr_done =3D 0; + } + } else { + env->stimecmp =3D val; + } + + riscv_timer_write_timecmp(cpu, env->stimer, env->stimecmp, 0, MIP_STIP= ); + + return RISCV_EXCP_NONE; +} + +static RISCVException write_stimecmph(CPURISCVState *env, int csrno, + target_ulong val) +{ + RISCVCPU *cpu =3D env_archcpu(env); + + env->stimecmp =3D deposit64(env->stimecmp, 32, 32, (uint64_t)val); + env->stimecmp_wr_done |=3D 0x02; + if (env->stimecmp_wr_done !=3D 0x03) { + return RISCV_EXCP_NONE; + } + env->stimecmp_wr_done =3D 0; + riscv_timer_write_timecmp(cpu, env->stimer, env->stimecmp, 0, MIP_STIP= ); + + return RISCV_EXCP_NONE; +} + /* Machine constants */ =20 #define M_MODE_INTERRUPTS ((uint64_t)(MIP_MSIP | MIP_MTIP | MIP_MEIP)) @@ -1515,6 +1597,12 @@ static RISCVException rmw_mip64(CPURISCVState *env, = int csrno, new_val |=3D env->external_seip * MIP_SEIP; } =20 + if (cpu->cfg.ext_sstc && (env->priv =3D=3D PRV_M) && + get_field(env->menvcfg, MENVCFG_STCE)) { + /* sstc extension forbids STIP & VSTIP to be writeable in mip */ + mask =3D mask & ~(MIP_STIP | MIP_VSTIP); + } + if (mask) { old_mip =3D riscv_cpu_update_mip(cpu, mask, (new_val & mask)); } else { @@ -3341,6 +3429,10 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { [CSR_SCAUSE] =3D { "scause", smode, read_scause, write_scause = }, [CSR_STVAL] =3D { "stval", smode, read_stval, write_stval }, [CSR_SIP] =3D { "sip", smode, NULL, NULL, rmw_sip = }, + [CSR_STIMECMP] =3D { "stimecmp", sstc, read_stimecmp, write_stimecmp, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_STIMECMPH] =3D { "stimecmph", sstc, read_stimecmph, write_stimecm= ph, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, =20 /* Supervisor Protection and Translation */ [CSR_SATP] =3D { "satp", smode, read_satp, write_satp = }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index 7d85de0b1d49..ee02bfc18916 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -334,6 +334,7 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINTTL(env.mscratch, RISCVCPU), VMSTATE_UINT64(env.mfromhost, RISCVCPU), VMSTATE_UINT64(env.mtohost, RISCVCPU), + VMSTATE_UINT64(env.stimecmp, RISCVCPU), =20 VMSTATE_END_OF_LIST() }, diff --git a/target/riscv/meson.build b/target/riscv/meson.build index 2c20f3dd8e9c..1243d019148e 100644 --- a/target/riscv/meson.build +++ b/target/riscv/meson.build @@ -29,7 +29,8 @@ riscv_softmmu_ss.add(files( 'pmp.c', 'debug.c', 'monitor.c', - 'machine.c' + 'machine.c', + 'time_helper.c' )) =20 target_arch +=3D {'riscv': riscv_ss} diff --git a/target/riscv/time_helper.c b/target/riscv/time_helper.c new file mode 100644 index 000000000000..f3fb5eac7b7b --- /dev/null +++ b/target/riscv/time_helper.c @@ -0,0 +1,98 @@ +/* + * RISC-V timer helper implementation. + * + * Copyright (c) 2022 Rivos Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "cpu_bits.h" +#include "time_helper.h" +#include "hw/intc/riscv_aclint.h" + +static void riscv_stimer_cb(void *opaque) +{ + RISCVCPU *cpu =3D opaque; + riscv_cpu_update_mip(cpu, MIP_STIP, BOOL_TO_MASK(1)); +} + +/* + * Called when timecmp is written to update the QEMU timer or immediately + * trigger timer interrupt if mtimecmp <=3D current timer value. + */ +void riscv_timer_write_timecmp(RISCVCPU *cpu, QEMUTimer *timer, + uint64_t timecmp, uint64_t delta, + uint32_t timer_irq) +{ + uint64_t diff, ns_diff, next; + CPURISCVState *env =3D &cpu->env; + RISCVAclintMTimerState *mtimer =3D env->rdtime_fn_arg; + uint32_t timebase_freq =3D mtimer->timebase_freq; + uint64_t rtc_r =3D env->rdtime_fn(env->rdtime_fn_arg) + delta; + + if (timecmp <=3D rtc_r) { + /* + * If we're setting an stimecmp value in the "past", + * immediately raise the timer interrupt + */ + riscv_cpu_update_mip(cpu, timer_irq, BOOL_TO_MASK(1)); + return; + } + + /* Clear the [V]STIP bit in mip */ + riscv_cpu_update_mip(cpu, timer_irq, BOOL_TO_MASK(0)); + + /* otherwise, set up the future timer interrupt */ + diff =3D timecmp - rtc_r; + /* back to ns (note args switched in muldiv64) */ + ns_diff =3D muldiv64(diff, NANOSECONDS_PER_SECOND, timebase_freq); + + /* + * check if ns_diff overflowed and check if the addition would potenti= ally + * overflow + */ + if ((NANOSECONDS_PER_SECOND > timebase_freq && ns_diff < diff) || + ns_diff > INT64_MAX) { + next =3D INT64_MAX; + } else { + /* + * as it is very unlikely qemu_clock_get_ns will return a value + * greater than INT64_MAX, no additional check is needed for an + * unsigned integer overflow. + */ + next =3D qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + ns_diff; + /* + * if ns_diff is INT64_MAX next may still be outside the range + * of a signed integer. + */ + next =3D MIN(next, INT64_MAX); + } + + timer_mod(timer, next); +} + +void riscv_timer_init(RISCVCPU *cpu) +{ + CPURISCVState *env; + + if (!cpu) { + return; + } + + env =3D &cpu->env; + env->stimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &riscv_stimer_cb, cpu= ); + env->stimecmp =3D 0; + +} diff --git a/target/riscv/time_helper.h b/target/riscv/time_helper.h new file mode 100644 index 000000000000..7b3cdcc35020 --- /dev/null +++ b/target/riscv/time_helper.h @@ -0,0 +1,30 @@ +/* + * RISC-V timer header file. + * + * Copyright (c) 2022 Rivos Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2 or later, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License f= or + * more details. + * + * You should have received a copy of the GNU General Public License along= with + * this program. If not, see . + */ + +#ifndef RISCV_TIME_HELPER_H +#define RISCV_TIME_HELPER_H + +#include "cpu.h" +#include "qemu/timer.h" + +void riscv_timer_write_timecmp(RISCVCPU *cpu, QEMUTimer *timer, + uint64_t timecmp, uint64_t delta, + uint32_t timer_irq); +void riscv_timer_init(RISCVCPU *cpu); + +#endif --=20 2.25.1 From nobody Wed May 15 16:11:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1652132129; cv=none; d=zohomail.com; s=zohoarc; b=WXmjj6dfQiIrYU/JQbrjyzqRMhqIbKA+TGrsLZrRvlRR3VUbLD2UrtCZN3DKh7h6qzzRYMqE1bN8JP6d+xZ/kiu0zXurjIM/tb/p3EQnQ3VN0tgd6fiX6wTUh+2kQy603TIOjRHdel7wTQf+m90vJi6GNDD0x2ElSCOwqdfmeOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652132129; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iuuI54Lwuo7uwJqJvtj4ONy1uauEOe+H9Zp8YQg0IRs=; b=i2l7L5VEEMOj1ULuqWdYFhvc+bh/aYaB+6COmsAxWuj7cib6mEqUiP3fja5YwDqq1QoUnim8sUYjGDybQ5C9kJqXBuxPannOBFB0n/H7/i9utjoHv1Y7AzcebncbursKaXv3JcZt65S/Vdls/NuqiDWDTJjLGzZgAn/BFOjtZIM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1652132129070292.27878301632006; Mon, 9 May 2022 14:35:29 -0700 (PDT) Received: from localhost ([::1]:41034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noB2N-0000CY-MH for importer@patchew.org; Mon, 09 May 2022 17:35:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noAvp-0000Yt-Ds for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:42 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:42953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noAvn-00019L-I1 for qemu-devel@nongnu.org; Mon, 09 May 2022 17:28:41 -0400 Received: by mail-pg1-x529.google.com with SMTP id 202so13067985pgc.9 for ; Mon, 09 May 2022 14:28:37 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id n89-20020a17090a5ae200b001cd4989fecfsm164509pji.27.2022.05.09.14.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 14:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iuuI54Lwuo7uwJqJvtj4ONy1uauEOe+H9Zp8YQg0IRs=; b=XEvg/JChe7rgm9AdOtUJWLDjnJmaiYxezBlzw2W5Byw0hCNKt/q3wiwMCL4R5ZUoM+ EgAOZZbs5kSeaX1Kl+3K6v4A2tlQO5xbeGWasdNj8OWu1AAVQx+kSx394B+kZcxwHsFd m+OQeXCRCyANg2e4evBIUFYPpvbXCI+aWH0wJHoM5Xn6jSh49xwPSAIcoI52/F7jPVtA bckDti11Uo3804EbOKqb0C77ovCWLuOzRZxFzu/Z+y4Qa4wDsOd5AY1wm0gky8AIkOCj SrI3Jxtb8a/UOY+5iHiLJk2QrFUr6vsJyfQA8msL5Y3kl/DKFOhI14SD9Erg8QMJjp2Q +Nzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iuuI54Lwuo7uwJqJvtj4ONy1uauEOe+H9Zp8YQg0IRs=; b=IxlJn/Mk7ou2nm0EnlUSHY4CGEi162YBp1Sip34zDY+lJiVle+bUvpDvIvu+k4FFUD 0oZVItwQb4AcdqEOeUwFpi8mssj8rAPa6sEqdG6PTHZd33LHVSMsH7MvaZQwFf7OausS QZjHHIRU8f3MKSXSSMx6dWh7QO81JYIrJKjcIoQkQALsMtJYygnT39jfJuM+KWS84fxG 66+ruRCKQLhMM1PoXwDsMS3lrItm0ZIKwIUKj/AT6kyz7637kVCCEhKBDA6No1mcEu9u XZjFL6kwgiFB5ThORDcbLEE77X0LFn4DTm0KGL/vkiGCe1j3ojh4A7aOpnDEvy1satvc IMRQ== X-Gm-Message-State: AOAM533o6DgTIGdfURKcQPWontsmTWGccwrp6utEZaqWjKfa/KQ/0tgu 2AHhMKxZm/jSopPqtWOzH0r7cR2uwZNaAA== X-Google-Smtp-Source: ABdhPJx7raQAuoY/UFXkgxXDoCZ17KgD/h/L7ostoEpSGbutytOaKSsZYFCBTp1BepDJv+PRjt5Vsg== X-Received: by 2002:a05:6a00:1781:b0:50a:94f0:661d with SMTP id s1-20020a056a00178100b0050a94f0661dmr17624964pfg.10.1652131716359; Mon, 09 May 2022 14:28:36 -0700 (PDT) From: Atish Patra To: qemu-devel@nongnu.org Cc: Atish Patra , Alistair Francis , Bin Meng , Palmer Dabbelt , qemu-riscv@nongnu.org Subject: [PATCH v3 3/3] target/riscv: Add vstimecmp support Date: Mon, 9 May 2022 14:28:27 -0700 Message-Id: <20220509212827.2057822-4-atishp@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509212827.2057822-1-atishp@rivosinc.com> References: <20220509212827.2057822-1-atishp@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=atishp@rivosinc.com; helo=mail-pg1-x529.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @rivosinc-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1652132130253100001 Content-Type: text/plain; charset="utf-8" vstimecmp CSR allows the guest OS or to program the next guest timer interrupt directly. Thus, hypervisor no longer need to inject the timer interrupt to the guest if vstimecmp is used. This was ratified as a part of the Sstc extension. Signed-off-by: Atish Patra --- target/riscv/cpu.h | 5 ++ target/riscv/cpu_bits.h | 4 ++ target/riscv/cpu_helper.c | 11 +++- target/riscv/csr.c | 112 ++++++++++++++++++++++++++++++++++++- target/riscv/machine.c | 1 + target/riscv/time_helper.c | 16 ++++++ 6 files changed, 144 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 9a01e6d0f587..798874d6189d 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -280,6 +280,9 @@ struct CPUArchState { uint64_t stimecmp; /* For RV32 only */ uint8_t stimecmp_wr_done; + uint64_t vstimecmp; + /* For RV32 only */ + uint8_t vstimecmp_wr_done; =20 /* physical memory protection */ pmp_table_t pmp_state; @@ -335,6 +338,8 @@ struct CPUArchState { =20 /* Fields from here on are preserved across CPU reset. */ QEMUTimer *stimer; /* Internal timer for S-mode interrupt */ + QEMUTimer *vstimer; /* Internal timer for VS-mode interrupt */ + bool vstime_irq; =20 hwaddr kernel_addr; hwaddr fdt_addr; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 29d0e4a1be01..5c9f512872e1 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -272,6 +272,10 @@ #define CSR_VSIP 0x244 #define CSR_VSATP 0x280 =20 +/* Sstc virtual CSRs */ +#define CSR_VSTIMECMP 0x24D +#define CSR_VSTIMECMPH 0x25D + #define CSR_MTINST 0x34a #define CSR_MTVAL2 0x34b =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index e1aa4f2097c1..2715021c022e 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -344,8 +344,9 @@ static uint64_t riscv_cpu_all_pending(CPURISCVState *en= v) { uint32_t gein =3D get_field(env->hstatus, HSTATUS_VGEIN); uint64_t vsgein =3D (env->hgeip & (1ULL << gein)) ? MIP_VSEIP : 0; + uint64_t vstip =3D (env->vstime_irq) ? MIP_VSTIP : 0; =20 - return (env->mip | vsgein) & env->mie; + return (env->mip | vsgein | vstip) & env->mie; } =20 int riscv_cpu_mirq_pending(CPURISCVState *env) @@ -604,7 +605,7 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t m= ask, uint64_t value) { CPURISCVState *env =3D &cpu->env; CPUState *cs =3D CPU(cpu); - uint64_t gein, vsgein =3D 0, old =3D env->mip; + uint64_t gein, vsgein =3D 0, vstip =3D 0, old =3D env->mip; bool locked =3D false; =20 if (riscv_cpu_virt_enabled(env)) { @@ -612,6 +613,10 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t = mask, uint64_t value) vsgein =3D (env->hgeip & (1ULL << gein)) ? MIP_VSEIP : 0; } =20 + /* No need to update mip for VSTIP */ + mask =3D ((mask =3D=3D MIP_VSTIP) && env->vstime_irq) ? 0 : mask; + vstip =3D env->vstime_irq ? MIP_VSTIP : 0; + if (!qemu_mutex_iothread_locked()) { locked =3D true; qemu_mutex_lock_iothread(); @@ -619,7 +624,7 @@ uint64_t riscv_cpu_update_mip(RISCVCPU *cpu, uint64_t m= ask, uint64_t value) =20 env->mip =3D (env->mip & ~mask) | (value & mask); =20 - if (env->mip | vsgein) { + if (env->mip | vsgein | vstip) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 8952d1308008..35eb2c4d84eb 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -567,17 +567,110 @@ static RISCVException sstc(CPURISCVState *env, int c= srno) return RISCV_EXCP_NONE; } =20 +static RISCVException sstc_hmode(CPURISCVState *env, int csrno) +{ + CPUState *cs =3D env_cpu(env); + RISCVCPU *cpu =3D RISCV_CPU(cs); + + if (!cpu->cfg.ext_sstc || !env->rdtime_fn) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (env->priv =3D=3D PRV_M) { + return RISCV_EXCP_NONE; + } + + if (!(get_field(env->mcounteren, COUNTEREN_TM) & + get_field(env->menvcfg, MENVCFG_STCE))) { + return RISCV_EXCP_ILLEGAL_INST; + } + + if (!(get_field(env->hcounteren, COUNTEREN_TM) & + get_field(env->henvcfg, HENVCFG_STCE))) { + return RISCV_EXCP_VIRT_INSTRUCTION_FAULT; + } + + return RISCV_EXCP_NONE; +} + +static RISCVException read_vstimecmp(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->vstimecmp; + + return RISCV_EXCP_NONE; +} + +static RISCVException read_vstimecmph(CPURISCVState *env, int csrno, + target_ulong *val) +{ + *val =3D env->vstimecmp >> 32; + + return RISCV_EXCP_NONE; +} + +static RISCVException write_vstimecmp(CPURISCVState *env, int csrno, + target_ulong val) +{ + RISCVCPU *cpu =3D env_archcpu(env); + + if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { + env->vstimecmp =3D deposit64(env->vstimecmp, 0, 32, (uint64_t)val); + env->vstimecmp_wr_done |=3D 0x01; + if (env->vstimecmp_wr_done !=3D 0x03) { + return RISCV_EXCP_NONE; + } else { + env->vstimecmp_wr_done =3D 0; + } + } else { + env->vstimecmp =3D val; + } + + riscv_timer_write_timecmp(cpu, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + + return RISCV_EXCP_NONE; +} + +static RISCVException write_vstimecmph(CPURISCVState *env, int csrno, + target_ulong val) +{ + RISCVCPU *cpu =3D env_archcpu(env); + + env->vstimecmp =3D deposit64(env->vstimecmp, 32, 32, (uint64_t)val); + env->vstimecmp_wr_done |=3D 0x02; + if (env->vstimecmp_wr_done !=3D 0x03) { + return RISCV_EXCP_NONE; + } + + env->vstimecmp_wr_done =3D 0; + riscv_timer_write_timecmp(cpu, env->vstimer, env->vstimecmp, + env->htimedelta, MIP_VSTIP); + + return RISCV_EXCP_NONE; +} + static RISCVException read_stimecmp(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->stimecmp; + if (riscv_cpu_virt_enabled(env)) { + *val =3D env->vstimecmp; + } else { + *val =3D env->stimecmp; + } + return RISCV_EXCP_NONE; } =20 static RISCVException read_stimecmph(CPURISCVState *env, int csrno, target_ulong *val) { - *val =3D env->stimecmp >> 32; + if (riscv_cpu_virt_enabled(env)) { + *val =3D env->vstimecmp >> 32; + } else { + *val =3D env->stimecmp >> 32; + } + return RISCV_EXCP_NONE; } =20 @@ -586,6 +679,10 @@ static RISCVException write_stimecmp(CPURISCVState *en= v, int csrno, { RISCVCPU *cpu =3D env_archcpu(env); =20 + if (riscv_cpu_virt_enabled(env)) { + return write_vstimecmp(env, csrno, val); + } + if (riscv_cpu_mxl(env) =3D=3D MXL_RV32) { env->stimecmp =3D deposit64(env->stimecmp, 0, 32, (uint64_t)val); env->stimecmp_wr_done |=3D 0x01; @@ -608,6 +705,10 @@ static RISCVException write_stimecmph(CPURISCVState *e= nv, int csrno, { RISCVCPU *cpu =3D env_archcpu(env); =20 + if (riscv_cpu_virt_enabled(env)) { + return write_vstimecmph(env, csrno, val); + } + env->stimecmp =3D deposit64(env->stimecmp, 32, 32, (uint64_t)val); env->stimecmp_wr_done |=3D 0x02; if (env->stimecmp_wr_done !=3D 0x03) { @@ -1612,6 +1713,7 @@ static RISCVException rmw_mip64(CPURISCVState *env, i= nt csrno, if (csrno !=3D CSR_HVIP) { gin =3D get_field(env->hstatus, HSTATUS_VGEIN); old_mip |=3D (env->hgeip & ((target_ulong)1 << gin)) ? MIP_VSEIP := 0; + old_mip |=3D env->vstime_irq ? MIP_VSTIP : 0; } =20 if (ret_val) { @@ -3433,6 +3535,12 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] =3D { .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, [CSR_STIMECMPH] =3D { "stimecmph", sstc, read_stimecmph, write_stimecm= ph, .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_VSTIMECMP] =3D { "vstimecmp", sstc_hmode, read_vstimecmp, + write_vstimecmp, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, + [CSR_VSTIMECMPH] =3D { "vstimecmph", sstc_hmode, read_vstimecmph, + write_vstimecmph, + .min_priv_ver =3D PRIV_VERSION_1= _12_0 }, =20 /* Supervisor Protection and Translation */ [CSR_SATP] =3D { "satp", smode, read_satp, write_satp = }, diff --git a/target/riscv/machine.c b/target/riscv/machine.c index ee02bfc18916..d453b401bdfd 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -92,6 +92,7 @@ static const VMStateDescription vmstate_hyper =3D { VMSTATE_UINTTL(env.hgeie, RISCVCPU), VMSTATE_UINTTL(env.hgeip, RISCVCPU), VMSTATE_UINT64(env.htimedelta, RISCVCPU), + VMSTATE_UINT64(env.vstimecmp, RISCVCPU), =20 VMSTATE_UINTTL(env.hvictl, RISCVCPU), VMSTATE_UINT8_ARRAY(env.hviprio, RISCVCPU, 64), diff --git a/target/riscv/time_helper.c b/target/riscv/time_helper.c index f3fb5eac7b7b..8cce667dfd47 100644 --- a/target/riscv/time_helper.c +++ b/target/riscv/time_helper.c @@ -22,6 +22,14 @@ #include "time_helper.h" #include "hw/intc/riscv_aclint.h" =20 +static void riscv_vstimer_cb(void *opaque) +{ + RISCVCPU *cpu =3D opaque; + CPURISCVState *env =3D &cpu->env; + env->vstime_irq =3D 1; + riscv_cpu_update_mip(cpu, MIP_VSTIP, BOOL_TO_MASK(1)); +} + static void riscv_stimer_cb(void *opaque) { RISCVCPU *cpu =3D opaque; @@ -47,10 +55,16 @@ void riscv_timer_write_timecmp(RISCVCPU *cpu, QEMUTimer= *timer, * If we're setting an stimecmp value in the "past", * immediately raise the timer interrupt */ + if (timer_irq =3D=3D MIP_VSTIP) { + env->vstime_irq =3D 1; + } riscv_cpu_update_mip(cpu, timer_irq, BOOL_TO_MASK(1)); return; } =20 + if (timer_irq =3D=3D MIP_VSTIP) { + env->vstime_irq =3D 0; + } /* Clear the [V]STIP bit in mip */ riscv_cpu_update_mip(cpu, timer_irq, BOOL_TO_MASK(0)); =20 @@ -95,4 +109,6 @@ void riscv_timer_init(RISCVCPU *cpu) env->stimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &riscv_stimer_cb, cpu= ); env->stimecmp =3D 0; =20 + env->vstimer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, &riscv_vstimer_cb, c= pu); + env->vstimecmp =3D 0; } --=20 2.25.1