mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-15 06:01:58 -06:00

* Reduce the overhead for simple RISC-V vector unit-stride loads and stores * Add V bit to GDB priv reg * Add 'sha' support * Add traces for exceptions in user mode * Update Pointer Masking to Zjpm v1.0 * Add Smrnmi support * Fix timebase-frequency when using KVM acceleration * Add RISC-V Counter delegation ISA extension support * Add support for Smdbltrp and Ssdbltrp extensions * Introduce a translation tag for the IOMMU page table cache * Support Supm and Sspm as part of Zjpm v1.0 * Convert htif debug prints to trace event -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEaukCtqfKh31tZZKWr3yVEwxTgBMFAmeMUUwACgkQr3yVEwxT gBNgDQ/+JeqcsbJRX+PZQJEV06tDIJpk+mfaBHUYSGdNkjI9fzowNaxFIEB2vaLt 4+xAGMnJ4vMcjJyBcPOn1FKAlowM7MsUNITOF9Rstnyriqnj2UsUZ9YBtkuG6gWH ZHoYEKu7mAZoZw5RRx4TatHDXw7TYfUsrDPrn+x6yeCZTq9ruRTlHkzp2LC725Vq KTnbWAP7WlqiJaSxB5eIFYT5tYP1Blp0yD358B037C57EU9j5zm2FQdFmVK1+xRF dFg/urBIzfAjjkCS/t9DmH+S6NgMEut6udUhllk/KUJAzWvsggc4wZZlWjFOJFJY fIxx3alhY3pcm1PYjFpf15Poz6Pqva/KGjwgZafirKQtPbRSzfRkUwcHOYRTQT9j abeiB44XPaeIl8Jvw7GLxcWtlJ5NmBrZho+2Z9mIhB/Ix5H3PDgs18Oc/s73P2qQ JFLRb7cpYy1HbRc0ugvwAmOTY1t6HX8HAtT+3rNhiXpXnj4RW2C/WU1cEqrg8QkM cTPiy2zHoBhAWt9aDK1Kvbhb1vur3JaF7rk9jeKlriFr87Ly+yPU+8mnEDw40NMR Tc9nivqmOqqXS5AM9O/W1uzTWzpxIUy7XBy3cuSk0uZCoge4IE2Or7P2Rb2uyaNZ RkAo/PL2N1cMjP7gB3kLRtYY7FA+nal66KhfbHPRHqj+ZwUAxzs= =F3IG -----END PGP SIGNATURE----- Merge tag 'pull-riscv-to-apply-20250119-1' of https://github.com/alistair23/qemu into staging Second RISC-V PR for 10.0 * Reduce the overhead for simple RISC-V vector unit-stride loads and stores * Add V bit to GDB priv reg * Add 'sha' support * Add traces for exceptions in user mode * Update Pointer Masking to Zjpm v1.0 * Add Smrnmi support * Fix timebase-frequency when using KVM acceleration * Add RISC-V Counter delegation ISA extension support * Add support for Smdbltrp and Ssdbltrp extensions * Introduce a translation tag for the IOMMU page table cache * Support Supm and Sspm as part of Zjpm v1.0 * Convert htif debug prints to trace event # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEaukCtqfKh31tZZKWr3yVEwxTgBMFAmeMUUwACgkQr3yVEwxT # gBNgDQ/+JeqcsbJRX+PZQJEV06tDIJpk+mfaBHUYSGdNkjI9fzowNaxFIEB2vaLt # 4+xAGMnJ4vMcjJyBcPOn1FKAlowM7MsUNITOF9Rstnyriqnj2UsUZ9YBtkuG6gWH # ZHoYEKu7mAZoZw5RRx4TatHDXw7TYfUsrDPrn+x6yeCZTq9ruRTlHkzp2LC725Vq # KTnbWAP7WlqiJaSxB5eIFYT5tYP1Blp0yD358B037C57EU9j5zm2FQdFmVK1+xRF # dFg/urBIzfAjjkCS/t9DmH+S6NgMEut6udUhllk/KUJAzWvsggc4wZZlWjFOJFJY # fIxx3alhY3pcm1PYjFpf15Poz6Pqva/KGjwgZafirKQtPbRSzfRkUwcHOYRTQT9j # abeiB44XPaeIl8Jvw7GLxcWtlJ5NmBrZho+2Z9mIhB/Ix5H3PDgs18Oc/s73P2qQ # JFLRb7cpYy1HbRc0ugvwAmOTY1t6HX8HAtT+3rNhiXpXnj4RW2C/WU1cEqrg8QkM # cTPiy2zHoBhAWt9aDK1Kvbhb1vur3JaF7rk9jeKlriFr87Ly+yPU+8mnEDw40NMR # Tc9nivqmOqqXS5AM9O/W1uzTWzpxIUy7XBy3cuSk0uZCoge4IE2Or7P2Rb2uyaNZ # RkAo/PL2N1cMjP7gB3kLRtYY7FA+nal66KhfbHPRHqj+ZwUAxzs= # =F3IG # -----END PGP SIGNATURE----- # gpg: Signature made Sat 18 Jan 2025 20:11:40 EST # gpg: using RSA key 6AE902B6A7CA877D6D659296AF7C95130C538013 # gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 6AE9 02B6 A7CA 877D 6D65 9296 AF7C 9513 0C53 8013 * tag 'pull-riscv-to-apply-20250119-1' of https://github.com/alistair23/qemu: (50 commits) hw/char/riscv_htif: Convert HTIF_DEBUG() to trace events target/riscv: Support Supm and Sspm as part of Zjpm v1.0 hw/riscv/riscv-iommu.c: Introduce a translation tag for the page table cache target/riscv: Add Smdbltrp ISA extension enable switch target/riscv: Implement Smdbltrp behavior target/riscv: Implement Smdbltrp sret, mret and mnret behavior target/riscv: Add Smdbltrp CSRs handling target/riscv: Add Ssdbltrp ISA extension enable switch target/riscv: Implement Ssdbltrp exception handling target/riscv: Implement Ssdbltrp sret, mret and mnret behavior target/riscv: Add Ssdbltrp CSRs handling target/riscv: Fix henvcfg potentially containing stale bits target/riscv: Add configuration for S[m|s]csrind, Smcdeleg/Ssccfg target/riscv: Add implied rule for counter delegation extensions target/riscv: Invoke pmu init after feature enable target/riscv: Add counter delegation/configuration support target/riscv: Add select value range check for counter delegation target/riscv: Add counter delegation definitions target/riscv: Add properties for counter delegation ISA extensions target/riscv: Support generic CSR indirect access ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
184 lines
5.7 KiB
C
184 lines
5.7 KiB
C
/*
|
|
* QEMU RISCV Hart Array
|
|
*
|
|
* Copyright (c) 2017 SiFive, Inc.
|
|
*
|
|
* Holds the state of a homogeneous array of RISC-V harts
|
|
*
|
|
* 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 for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "system/reset.h"
|
|
#include "system/qtest.h"
|
|
#include "qemu/cutils.h"
|
|
#include "hw/sysbus.h"
|
|
#include "target/riscv/cpu.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/riscv/riscv_hart.h"
|
|
#include "qemu/error-report.h"
|
|
|
|
static const Property riscv_harts_props[] = {
|
|
DEFINE_PROP_UINT32("num-harts", RISCVHartArrayState, num_harts, 1),
|
|
DEFINE_PROP_UINT32("hartid-base", RISCVHartArrayState, hartid_base, 0),
|
|
DEFINE_PROP_STRING("cpu-type", RISCVHartArrayState, cpu_type),
|
|
DEFINE_PROP_UINT64("resetvec", RISCVHartArrayState, resetvec,
|
|
DEFAULT_RSTVEC),
|
|
|
|
/*
|
|
* Smrnmi implementation-defined interrupt and exception trap handlers.
|
|
*
|
|
* When an RNMI interrupt is detected, the hart then enters M-mode and
|
|
* jumps to the address defined by "rnmi-interrupt-vector".
|
|
*
|
|
* When the hart encounters an exception while executing in M-mode with
|
|
* the mnstatus.NMIE bit clear, the hart then jumps to the address
|
|
* defined by "rnmi-exception-vector".
|
|
*/
|
|
DEFINE_PROP_ARRAY("rnmi-interrupt-vector", RISCVHartArrayState,
|
|
num_rnmi_irqvec, rnmi_irqvec, qdev_prop_uint64,
|
|
uint64_t),
|
|
DEFINE_PROP_ARRAY("rnmi-exception-vector", RISCVHartArrayState,
|
|
num_rnmi_excpvec, rnmi_excpvec, qdev_prop_uint64,
|
|
uint64_t),
|
|
};
|
|
|
|
static void riscv_harts_cpu_reset(void *opaque)
|
|
{
|
|
RISCVCPU *cpu = opaque;
|
|
cpu_reset(CPU(cpu));
|
|
}
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
static void csr_call(char *cmd, uint64_t cpu_num, int csrno, uint64_t *val)
|
|
{
|
|
RISCVCPU *cpu = RISCV_CPU(cpu_by_arch_id(cpu_num));
|
|
CPURISCVState *env = &cpu->env;
|
|
|
|
int ret = RISCV_EXCP_NONE;
|
|
if (strcmp(cmd, "get_csr") == 0) {
|
|
ret = riscv_csrr(env, csrno, (target_ulong *)val);
|
|
} else if (strcmp(cmd, "set_csr") == 0) {
|
|
ret = riscv_csrrw(env, csrno, NULL, *(target_ulong *)val,
|
|
MAKE_64BIT_MASK(0, TARGET_LONG_BITS));
|
|
}
|
|
|
|
g_assert(ret == RISCV_EXCP_NONE);
|
|
}
|
|
|
|
static bool csr_qtest_callback(CharBackend *chr, gchar **words)
|
|
{
|
|
if (strcmp(words[0], "csr") == 0) {
|
|
|
|
uint64_t cpu;
|
|
uint64_t val;
|
|
int rc, csr;
|
|
|
|
rc = qemu_strtou64(words[2], NULL, 0, &cpu);
|
|
g_assert(rc == 0);
|
|
rc = qemu_strtoi(words[3], NULL, 0, &csr);
|
|
g_assert(rc == 0);
|
|
rc = qemu_strtou64(words[4], NULL, 0, &val);
|
|
g_assert(rc == 0);
|
|
csr_call(words[1], cpu, csr, &val);
|
|
|
|
qtest_send_prefix(chr);
|
|
qtest_sendf(chr, "OK 0 "TARGET_FMT_lx"\n", (target_ulong)val);
|
|
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
static void riscv_cpu_register_csr_qtest_callback(void)
|
|
{
|
|
static GOnce once;
|
|
g_once(&once, (GThreadFunc)qtest_set_command_cb, csr_qtest_callback);
|
|
}
|
|
#endif
|
|
|
|
static bool riscv_hart_realize(RISCVHartArrayState *s, int idx,
|
|
char *cpu_type, Error **errp)
|
|
{
|
|
object_initialize_child(OBJECT(s), "harts[*]", &s->harts[idx], cpu_type);
|
|
qdev_prop_set_uint64(DEVICE(&s->harts[idx]), "resetvec", s->resetvec);
|
|
|
|
if (s->harts[idx].cfg.ext_smrnmi) {
|
|
if (idx < s->num_rnmi_irqvec) {
|
|
qdev_prop_set_uint64(DEVICE(&s->harts[idx]),
|
|
"rnmi-interrupt-vector", s->rnmi_irqvec[idx]);
|
|
}
|
|
|
|
if (idx < s->num_rnmi_excpvec) {
|
|
qdev_prop_set_uint64(DEVICE(&s->harts[idx]),
|
|
"rnmi-exception-vector", s->rnmi_excpvec[idx]);
|
|
}
|
|
} else {
|
|
if (s->num_rnmi_irqvec > 0) {
|
|
warn_report_once("rnmi-interrupt-vector property is ignored "
|
|
"because Smrnmi extension is not enabled.");
|
|
}
|
|
|
|
if (s->num_rnmi_excpvec > 0) {
|
|
warn_report_once("rnmi-exception-vector property is ignored "
|
|
"because Smrnmi extension is not enabled.");
|
|
}
|
|
}
|
|
|
|
s->harts[idx].env.mhartid = s->hartid_base + idx;
|
|
qemu_register_reset(riscv_harts_cpu_reset, &s->harts[idx]);
|
|
return qdev_realize(DEVICE(&s->harts[idx]), NULL, errp);
|
|
}
|
|
|
|
static void riscv_harts_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
RISCVHartArrayState *s = RISCV_HART_ARRAY(dev);
|
|
int n;
|
|
|
|
s->harts = g_new0(RISCVCPU, s->num_harts);
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
riscv_cpu_register_csr_qtest_callback();
|
|
#endif
|
|
|
|
for (n = 0; n < s->num_harts; n++) {
|
|
if (!riscv_hart_realize(s, n, s->cpu_type, errp)) {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void riscv_harts_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
device_class_set_props(dc, riscv_harts_props);
|
|
dc->realize = riscv_harts_realize;
|
|
}
|
|
|
|
static const TypeInfo riscv_harts_info = {
|
|
.name = TYPE_RISCV_HART_ARRAY,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(RISCVHartArrayState),
|
|
.class_init = riscv_harts_class_init,
|
|
};
|
|
|
|
static void riscv_harts_register_types(void)
|
|
{
|
|
type_register_static(&riscv_harts_info);
|
|
}
|
|
|
|
type_init(riscv_harts_register_types)
|