From nobody Tue Feb 10 13:37:14 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 1672124084773884.9794166462036; Mon, 26 Dec 2022 22:54:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pA3ln-0006J7-EF; Tue, 27 Dec 2022 01:49:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pA3lb-0006I4-QS; Tue, 27 Dec 2022 01:48:51 -0500 Received: from bg4.exmail.qq.com ([43.155.65.254]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pA3lZ-0006iL-IW; Tue, 27 Dec 2022 01:48:51 -0500 Received: from ubuntu.. ( [111.196.135.79]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 27 Dec 2022 14:48:28 +0800 (CST) X-QQ-mid: bizesmtp64t1672123709tohnlvic X-QQ-SSF: 01200000000000C0C000000A0000000 X-QQ-FEAT: 2d9G4llBGh4VY0flI/Wg+5AxU25O7PXXcpJsSr9IxsjWq/Cs00KI+ItkD+yzv uGvwS2pvLi9RoYvXn/0jvbzRnm9ec01orPtstFQRNpUtiBsXcyPKES4UwbUhBzahRboew7V bUn7hYrNcNyQhmkLVLnybFNbS2M8HEVXa8ONMbgp9UiP36HfId3abkaqJD2dg8fcwM1MnFa yw2xydzbDZ4j7v1jZgQHOgi5xB9cHotZbe7ebF5klytINClwgEzbckSlm4R6WwcaMpqW5Uo q2WG9ANmuyBnHdYfyiM+JEBzKRwM7n9DOUdJH6Wq/ZpFJeOE0zQyEUpLGU0C/VmUpPM7YVt suGvOweFETkEgjQ1gvGzC20izcIiNzDRnSQpRcj X-QQ-GoodBg: 0 From: Bin Meng To: Alistair Francis , qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Alistair Francis , Bin Meng , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Palmer Dabbelt , Paolo Bonzini , qemu-riscv@nongnu.org Subject: [PATCH 05/12] hw/char: riscv_htif: Move registers from CPUArchState to HTIFState Date: Tue, 27 Dec 2022 14:48:05 +0800 Message-Id: <20221227064812.1903326-6-bmeng@tinylab.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221227064812.1903326-1-bmeng@tinylab.org> References: <20221227064812.1903326-1-bmeng@tinylab.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvr:qybglogicsvr3 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=43.155.65.254; envelope-from=bmeng@tinylab.org; helo=bg4.exmail.qq.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, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1672124085487000003 Content-Type: text/plain; charset="utf-8" At present for some unknown reason the HTIF registers (fromhost & tohost) are defined in the RISC-V CPUArchState. It should really be put in the HTIFState struct as it is only meaningful to HTIF. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Reviewed-by: Daniel Henrique Barboza --- include/hw/char/riscv_htif.h | 8 ++++---- target/riscv/cpu.h | 4 ---- hw/char/riscv_htif.c | 35 +++++++++++++++++------------------ hw/riscv/spike.c | 3 +-- target/riscv/machine.c | 6 ++---- 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/include/hw/char/riscv_htif.h b/include/hw/char/riscv_htif.h index 6d172ebd6d..55cc352331 100644 --- a/include/hw/char/riscv_htif.h +++ b/include/hw/char/riscv_htif.h @@ -23,7 +23,6 @@ #include "chardev/char.h" #include "chardev/char-fe.h" #include "exec/memory.h" -#include "target/riscv/cpu.h" =20 #define TYPE_HTIF_UART "riscv.htif.uart" =20 @@ -31,11 +30,12 @@ typedef struct HTIFState { int allow_tohost; int fromhost_inprogress; =20 + uint64_t tohost; + uint64_t fromhost; hwaddr tohost_offset; hwaddr fromhost_offset; MemoryRegion mmio; =20 - CPURISCVState *env; CharBackend chr; uint64_t pending_read; } HTIFState; @@ -51,7 +51,7 @@ void htif_symbol_callback(const char *st_name, int st_inf= o, uint64_t st_value, bool htif_uses_elf_symbols(void); =20 /* legacy pre qom */ -HTIFState *htif_mm_init(MemoryRegion *address_space, CPURISCVState *env, - Chardev *chr, uint64_t nonelf_base); +HTIFState *htif_mm_init(MemoryRegion *address_space, Chardev *chr, + uint64_t nonelf_base); =20 #endif diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 443d15a47c..6f04d853dd 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -309,10 +309,6 @@ struct CPUArchState { target_ulong sscratch; target_ulong mscratch; =20 - /* temporary htif regs */ - uint64_t mfromhost; - uint64_t mtohost; - /* Sstc CSRs */ uint64_t stimecmp; =20 diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c index f28976b110..3bb0a37a3e 100644 --- a/hw/char/riscv_htif.c +++ b/hw/char/riscv_htif.c @@ -100,7 +100,7 @@ static void htif_recv(void *opaque, const uint8_t *buf,= int size) uint64_t val_written =3D s->pending_read; uint64_t resp =3D 0x100 | *buf; =20 - s->env->mfromhost =3D (val_written >> 48 << 48) | (resp << 16 >> 16); + s->fromhost =3D (val_written >> 48 << 48) | (resp << 16 >> 16); } =20 /* @@ -175,7 +175,7 @@ static void htif_handle_tohost_write(HTIFState *s, uint= 64_t val_written) if (cmd =3D=3D HTIF_CONSOLE_CMD_GETC) { /* this should be a queue, but not yet implemented as such */ s->pending_read =3D val_written; - s->env->mtohost =3D 0; /* clear to indicate we read */ + s->tohost =3D 0; /* clear to indicate we read */ return; } else if (cmd =3D=3D HTIF_CONSOLE_CMD_PUTC) { qemu_chr_fe_write(&s->chr, (uint8_t *)&payload, 1); @@ -195,11 +195,11 @@ static void htif_handle_tohost_write(HTIFState *s, ui= nt64_t val_written) * HTIF needs protocol documentation and a more complete state machine. * * while (!s->fromhost_inprogress && - * s->env->mfromhost !=3D 0x0) { + * s->fromhost !=3D 0x0) { * } */ - s->env->mfromhost =3D (val_written >> 48 << 48) | (resp << 16 >> 16); - s->env->mtohost =3D 0; /* clear to indicate we read */ + s->fromhost =3D (val_written >> 48 << 48) | (resp << 16 >> 16); + s->tohost =3D 0; /* clear to indicate we read */ } =20 #define TOHOST_OFFSET1 (s->tohost_offset) @@ -212,13 +212,13 @@ static uint64_t htif_mm_read(void *opaque, hwaddr add= r, unsigned size) { HTIFState *s =3D opaque; if (addr =3D=3D TOHOST_OFFSET1) { - return s->env->mtohost & 0xFFFFFFFF; + return s->tohost & 0xFFFFFFFF; } else if (addr =3D=3D TOHOST_OFFSET2) { - return (s->env->mtohost >> 32) & 0xFFFFFFFF; + return (s->tohost >> 32) & 0xFFFFFFFF; } else if (addr =3D=3D FROMHOST_OFFSET1) { - return s->env->mfromhost & 0xFFFFFFFF; + return s->fromhost & 0xFFFFFFFF; } else if (addr =3D=3D FROMHOST_OFFSET2) { - return (s->env->mfromhost >> 32) & 0xFFFFFFFF; + return (s->fromhost >> 32) & 0xFFFFFFFF; } else { qemu_log("Invalid htif read: address %016" PRIx64 "\n", (uint64_t)addr); @@ -232,22 +232,22 @@ static void htif_mm_write(void *opaque, hwaddr addr, { HTIFState *s =3D opaque; if (addr =3D=3D TOHOST_OFFSET1) { - if (s->env->mtohost =3D=3D 0x0) { + if (s->tohost =3D=3D 0x0) { s->allow_tohost =3D 1; - s->env->mtohost =3D value & 0xFFFFFFFF; + s->tohost =3D value & 0xFFFFFFFF; } else { s->allow_tohost =3D 0; } } else if (addr =3D=3D TOHOST_OFFSET2) { if (s->allow_tohost) { - s->env->mtohost |=3D value << 32; - htif_handle_tohost_write(s, s->env->mtohost); + s->tohost |=3D value << 32; + htif_handle_tohost_write(s, s->tohost); } } else if (addr =3D=3D FROMHOST_OFFSET1) { s->fromhost_inprogress =3D 1; - s->env->mfromhost =3D value & 0xFFFFFFFF; + s->fromhost =3D value & 0xFFFFFFFF; } else if (addr =3D=3D FROMHOST_OFFSET2) { - s->env->mfromhost |=3D value << 32; + s->fromhost |=3D value << 32; s->fromhost_inprogress =3D 0; } else { qemu_log("Invalid htif write: address %016" PRIx64 "\n", @@ -265,8 +265,8 @@ bool htif_uses_elf_symbols(void) return (address_symbol_set =3D=3D 3) ? true : false; } =20 -HTIFState *htif_mm_init(MemoryRegion *address_space, CPURISCVState *env, - Chardev *chr, uint64_t nonelf_base) +HTIFState *htif_mm_init(MemoryRegion *address_space, Chardev *chr, + uint64_t nonelf_base) { uint64_t base, size, tohost_offset, fromhost_offset; =20 @@ -281,7 +281,6 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, CP= URISCVState *env, fromhost_offset =3D fromhost_addr - base; =20 HTIFState *s =3D g_new0(HTIFState, 1); - s->env =3D env; s->tohost_offset =3D tohost_offset; s->fromhost_offset =3D fromhost_offset; s->pending_read =3D 0; diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 82cf41ac27..8606331f61 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -317,8 +317,7 @@ static void spike_board_init(MachineState *machine) fdt_load_addr); =20 /* initialize HTIF using symbols found in load_kernel */ - htif_mm_init(system_memory, &s->soc[0].harts[0].env, - serial_hd(0), memmap[SPIKE_HTIF].base); + htif_mm_init(system_memory, serial_hd(0), memmap[SPIKE_HTIF].base); } =20 static void spike_machine_instance_init(Object *obj) diff --git a/target/riscv/machine.c b/target/riscv/machine.c index c2a94a82b3..2e8beef06e 100644 --- a/target/riscv/machine.c +++ b/target/riscv/machine.c @@ -298,8 +298,8 @@ static const VMStateDescription vmstate_pmu_ctr_state = =3D { =20 const VMStateDescription vmstate_riscv_cpu =3D { .name =3D "cpu", - .version_id =3D 5, - .minimum_version_id =3D 5, + .version_id =3D 6, + .minimum_version_id =3D 6, .post_load =3D riscv_cpu_post_load, .fields =3D (VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32), @@ -349,8 +349,6 @@ const VMStateDescription vmstate_riscv_cpu =3D { VMSTATE_UINTTL_ARRAY(env.mhpmeventh_val, RISCVCPU, RV_MAX_MHPMEVEN= TS), VMSTATE_UINTTL(env.sscratch, RISCVCPU), 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() --=20 2.34.1