From patchwork Tue Jun 25 15:35:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Klokov X-Patchwork-Id: 1952175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=syntacore.com header.i=@syntacore.com header.a=rsa-sha256 header.s=mta-04 header.b=rwELIuEq; dkim=pass (2048-bit key; unprotected) header.d=syntacore.com header.i=@syntacore.com header.a=rsa-sha256 header.s=mta-03 header.b=xThCHyqW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7pqP2gcVz20X1 for ; Wed, 26 Jun 2024 01:37:21 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sM8Db-0006SH-E4; Tue, 25 Jun 2024 11:36:27 -0400 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 1sM8DY-0006Re-0O; Tue, 25 Jun 2024 11:36:24 -0400 Received: from mta-04.yadro.com ([89.207.88.248]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sM8DV-00048K-1d; Tue, 25 Jun 2024 11:36:23 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-04.yadro.com E5170C0009 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syntacore.com; s=mta-04; t=1719329775; bh=dE2Ipnc3B+p3Uhh7CdB4UlOglZBL898qva3/j6i5HcI=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=rwELIuEqoewYYM5WGjeWbRyH2fODRvEYOo7bmXU8WHavFJgjiYM08ntTn+YRNqLE9 /70qDdDZVWEIL9Hf/iwKLLwPNZ1KXzT5JIvrad5xXNafxsK1t8J8yAKd7Qy5aYWgWc 1K8vrg7tsJUYKIT6q3uej8/Z+X3LFJu+FtUW0acBf5cJM2gyl4QhsNBXOBVFTuCiyF Vjrrlyd0ais5HKHEx6QeUoTBgP7HHXEsBaHP1JR9uUZ1AF6B9S7wi76PG4lG0RhPOj cQYTo+hicT8lxrh9u0ktOGzhTNN3wZzlOmpe2KTxByTKHJZKREshkqHcPqZgwuk62i C/auoCpp3/hDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syntacore.com; s=mta-03; t=1719329775; bh=dE2Ipnc3B+p3Uhh7CdB4UlOglZBL898qva3/j6i5HcI=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=xThCHyqW1DiI+f7xv5i3yTiQhWROeppg1YCXWF2Xc35oUv6Vo+WRaKbpUYfCGa70b zumR08Xrmb4Gk7bkYP++v9rjy8F3PImTmpYIyv/VHGaZaTTvX36AFS3X8s1UMNiYVj bMaOnANL8P94zc3/yxoeJBLnifXSjvRuD9t4/0VXkwafELJLlO60N7uDXEbvaSDSZm 9TJg4tcseuICpgLlRUNSVa5vGGTZEi74BJDhjIG7GrH1uvxS7UPm5Dq5GgdnxdjTEj +mvn07+2xE24WXMUSiaORxYZy0j3CdTvj1SgfbggSXbFWeBscg2CJLuT2i52IA419m bDQIR9p0uufBA== From: Ivan Klokov To: CC: , , , , , , , , , Ivan Klokov Subject: [RFC PATCH v3 1/2] target/riscv: Add RISC-V CSR qtest support Date: Tue, 25 Jun 2024 18:35:54 +0300 Message-ID: <20240625153555.104088-2-ivan.klokov@syntacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240625153555.104088-1-ivan.klokov@syntacore.com> References: <20240625153555.104088-1-ivan.klokov@syntacore.com> MIME-Version: 1.0 X-ClientProxiedBy: T-EXCH-07.corp.yadro.com (172.17.11.57) To S-Exch-01.corp.yadro.com (10.78.5.241) Received-SPF: permerror client-ip=89.207.88.248; envelope-from=ivan.klokov@syntacore.com; helo=mta-04.yadro.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The RISC-V architecture supports the creation of custom CSR-mapped devices. It would be convenient to test them in the same way as MMIO-mapped devices. To do this, a new call has been added to read/write CSR registers. Signed-off-by: Ivan Klokov Acked-by: Thomas Huth --- target/riscv/cpu.c | 14 +++++++++++ target/riscv/cpu.h | 3 +++ target/riscv/csr.c | 53 +++++++++++++++++++++++++++++++++++++++++- tests/qtest/libqtest.c | 27 +++++++++++++++++++++ tests/qtest/libqtest.h | 14 +++++++++++ 5 files changed, 110 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 69a08e8c2c..55cc01bfb3 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1148,7 +1148,17 @@ void riscv_cpu_finalize_features(RISCVCPU *cpu, Error **errp) } } } +#ifndef CONFIG_USER_ONLY +static void riscv_cpu_register_csr_qtest_callback(void) +{ + static gsize reinit_done; + if (g_once_init_enter(&reinit_done)) { + qtest_set_command_cb(csr_qtest_callback); + g_once_init_leave(&reinit_done, 1); + } +} +#endif static void riscv_cpu_realize(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); @@ -1174,6 +1184,10 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) } riscv_cpu_register_gdb_regs_for_features(cs); +#ifndef CONFIG_USER_ONLY + /* register callback for csr qtests */ + riscv_cpu_register_csr_qtest_callback(); +#endif #ifndef CONFIG_USER_ONLY if (cpu->cfg.debug) { diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 6fe0d712b4..6d4bbec53c 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -32,6 +32,8 @@ #include "cpu_cfg.h" #include "qapi/qapi-types-common.h" #include "cpu-qom.h" +#include "qemu/cutils.h" +#include "sysemu/qtest.h" typedef struct CPUArchState CPURISCVState; @@ -813,6 +815,7 @@ bool riscv_cpu_accelerator_compatible(RISCVCPU *cpu); /* CSR function table */ extern riscv_csr_operations csr_ops[CSR_TABLE_SIZE]; +bool csr_qtest_callback(CharBackend *chr, gchar **words); extern const bool valid_vm_1_10_32[], valid_vm_1_10_64[]; diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 58ef7079dc..f4f5128c9c 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -29,7 +29,7 @@ #include "sysemu/cpu-timers.h" #include "qemu/guest-random.h" #include "qapi/error.h" - +#include "tests/qtest/libqtest.h" /* CSR function table public API */ void riscv_get_csr_ops(int csrno, riscv_csr_operations *ops) @@ -4549,6 +4549,57 @@ static RISCVException write_jvt(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +#if !defined(CONFIG_USER_ONLY) +static uint64_t 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_csrrw(env, csrno, (target_ulong *)val, 0, 0); + + } else if (strcmp(cmd, "set_csr") == 0) { + ret = riscv_csrrw(env, csrno, NULL, *(target_ulong *)val, MAKE_64BIT_MASK(0, TARGET_LONG_BITS)); + } + + if (ret == RISCV_EXCP_NONE) { + ret = 0; + } else { + g_assert_not_reached(); + } + + return ret; +} + +bool csr_qtest_callback(CharBackend *chr, gchar **words) +{ + if (strcmp(words[0], "csr") == 0) { + + uint64_t res, 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); + res = csr_call(words[1], cpu, csr, &val); + + qtest_send_prefix(chr); + qtest_sendf(chr, "OK %"PRIx64" "TARGET_FMT_lx"\n", res, (target_ulong)val); + + return true; + } + + return false; +} +#endif + /* * Control and Status Register function table * riscv_csr_operations::predicate() must be provided for an implemented CSR diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c index c7f6897d78..f8c3ff15a9 100644 --- a/tests/qtest/libqtest.c +++ b/tests/qtest/libqtest.c @@ -1205,6 +1205,33 @@ uint64_t qtest_rtas_call(QTestState *s, const char *name, return 0; } +static void qtest_rsp_csr(QTestState *s, uint64_t *val) +{ + gchar **args; + uint64_t ret; + int rc; + + args = qtest_rsp_args(s, 3); + + rc = qemu_strtou64(args[1], NULL, 16, &ret); + g_assert(rc == 0); + rc = qemu_strtou64(args[2], NULL, 16, val); + g_assert(rc == 0); + + g_strfreev(args); +} + +uint64_t qtest_csr_call(QTestState *s, const char *name, + uint64_t cpu, int csr, + uint64_t *val) +{ + qtest_sendf(s, "csr %s 0x%"PRIx64" %d 0x%"PRIx64"\n", + name, cpu, csr, *val); + + qtest_rsp_csr(s, val); + return 0; +} + void qtest_add_func(const char *str, void (*fn)(void)) { gchar *path = g_strdup_printf("/%s/%s", qtest_get_arch(), str); diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h index c261b7e0b3..53cd8fe9f0 100644 --- a/tests/qtest/libqtest.h +++ b/tests/qtest/libqtest.h @@ -577,6 +577,20 @@ uint64_t qtest_rtas_call(QTestState *s, const char *name, uint32_t nargs, uint64_t args, uint32_t nret, uint64_t ret); +/** + * qtest_csr_call: + * @s: #QTestState instance to operate on. + * @name: name of the command to call. + * @cpu: hart number. + * @csr: CSR number. + * @val: Value for reading/writing. + * + * Call an CSR function + */ +uint64_t qtest_csr_call(QTestState *s, const char *name, + uint64_t cpu, int csr, + unsigned long *val); + /** * qtest_bufread: * @s: #QTestState instance to operate on. From patchwork Tue Jun 25 15:35:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Klokov X-Patchwork-Id: 1952177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=syntacore.com header.i=@syntacore.com header.a=rsa-sha256 header.s=mta-04 header.b=ZbTGnaLb; dkim=pass (2048-bit key; unprotected) header.d=syntacore.com header.i=@syntacore.com header.a=rsa-sha256 header.s=mta-03 header.b=sSQVWWbw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W7pql2lwjz20X1 for ; Wed, 26 Jun 2024 01:37:39 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sM8De-0006WH-4n; Tue, 25 Jun 2024 11:36:30 -0400 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 1sM8DZ-0006Rq-7I; Tue, 25 Jun 2024 11:36:25 -0400 Received: from mta-04.yadro.com ([89.207.88.248]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sM8DV-00048Y-1U; Tue, 25 Jun 2024 11:36:24 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mta-04.yadro.com 25923C0009 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syntacore.com; s=mta-04; t=1719329777; bh=wLlcKrBkJxyiieu6ax+od3Jo2DL/gvxf1C5KMKJGUNA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=ZbTGnaLbYRGcwKVez5gHUbqQMoFPpVDNIyOTMm0yEY0i4qBanhzQxzjUVS1vsGfMH ZAAiCy9/lzbH3qEdqmhgI7nNWoGEsQ9KCme5pUjtot6lchWWLIzmZdik0sGZFJyhV4 F0oqYccObHOQb2Y/dUoIcjbJgiuuzcE3ry1KhE7fhvlwwnYNEnGe9ATkkiCRHkcfec wRm1tfghjCyjfPaB+wqx6T0Y/zwCOhLegjsnU3sgD0d5LtZKO+xWt/fD+BJxPX/tVI +qgW3sp6enpt2lsaveH1WEoa+5SI1DBQnSslwn1+6wGNQy6mRcJVaB3yddz+W4085u hbA1KxNJvqJxA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=syntacore.com; s=mta-03; t=1719329777; bh=wLlcKrBkJxyiieu6ax+od3Jo2DL/gvxf1C5KMKJGUNA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=sSQVWWbwgQUkN2D8zySc35RUM9IVM63ppACHQ6lDZCeQ+Yy5Z7wmu247r0dOs8hgn K+Fk8FdznT0wM474kNLhKWofv3WRmUQ5u9b8rPy8cjY5XePx/gkDFak7D9mpjy3tmx 9bk+QIenfdq5OJ0UxCwaRdr8q7SbVtedjzlKQIKJVAglrjRKTzyuxVVmhAbElgbnls hp7eLamw4sRv2WOXZY1EFRnngzuWyoKUcpRwgbKT2fu7K4b9+l4cgmX83IQbNFABjO b93CzO9f4aK+S/0ZDJQ2SfqVk9IQSucXjBJ+NrlNxsrKkjNiwOFmVm4JFY7HVG6EPQ 1y5j1pQv9OPvg== From: Ivan Klokov To: CC: , , , , , , , , , Ivan Klokov Subject: [RFC PATCH v3 2/2] tests/qtest: QTest example for RISC-V CSR register Date: Tue, 25 Jun 2024 18:35:55 +0300 Message-ID: <20240625153555.104088-3-ivan.klokov@syntacore.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240625153555.104088-1-ivan.klokov@syntacore.com> References: <20240625153555.104088-1-ivan.klokov@syntacore.com> MIME-Version: 1.0 X-ClientProxiedBy: T-EXCH-07.corp.yadro.com (172.17.11.57) To S-Exch-01.corp.yadro.com (10.78.5.241) Received-SPF: permerror client-ip=89.207.88.248; envelope-from=ivan.klokov@syntacore.com; helo=mta-04.yadro.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Added demo for reading CSR register from qtest environment. Signed-off-by: Ivan Klokov --- tests/qtest/meson.build | 2 + tests/qtest/riscv-csr-test.c | 85 ++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 tests/qtest/riscv-csr-test.c diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 12792948ff..45d651da99 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -259,6 +259,8 @@ qtests_s390x = \ qtests_riscv32 = \ (config_all_devices.has_key('CONFIG_SIFIVE_E_AON') ? ['sifive-e-aon-watchdog-test'] : []) +qtests_riscv32 += ['riscv-csr-test'] + qos_test_ss = ss.source_set() qos_test_ss.add( 'ac97-test.c', diff --git a/tests/qtest/riscv-csr-test.c b/tests/qtest/riscv-csr-test.c new file mode 100644 index 0000000000..21a3646ae9 --- /dev/null +++ b/tests/qtest/riscv-csr-test.c @@ -0,0 +1,85 @@ +/* + * QTest testcase for RISC-V CSRs + * + * Copyright (c) 2024 Syntacore. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that 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. + */ + +#include "qemu/osdep.h" +#include "libqtest-single.h" +#include "libqtest.h" + +static uint64_t qcsr_call(QTestState *qts, const char *name, uint64_t cpu, + int csrno, uint64_t *val) +{ + uint64_t res = 0; + + res = qtest_csr_call(qts, name, cpu, csrno, val); + + return res; +} + +static int qcsr_get_csr(QTestState *qts, uint64_t cpu, + int csrno, uint64_t *val) +{ + int res; + + res = qcsr_call(qts, "get_csr", cpu, csrno, val); + + return res; +} + +static int qcsr_set_csr(QTestState *qts, uint64_t cpu, + int csrno, uint64_t *val) +{ + int res; + + res = qcsr_call(qts, "set_csr", cpu, csrno, val); + + return res; +} + +static void run_test_csr(void) +{ + + uint64_t res; + uint64_t val = 0; + + res = qcsr_get_csr(global_qtest, 0, 0xf11, &val); + + g_assert_cmpint(res, ==, 0); + g_assert_cmpint(val, ==, 0x100); + + val = 0xff; + res = qcsr_set_csr(global_qtest, 0, 0x342, &val); + g_assert_cmpint(res, ==, 0); + + val = 0; + res = qcsr_get_csr(global_qtest, 0, 0x342, &val); + + g_assert_cmpint(res, ==, 0); + g_assert_cmpint(val, ==, 0xff); + + qtest_quit(global_qtest); +} + +int main(int argc, char **argv) +{ + g_test_init(&argc, &argv, NULL); + + qtest_add_func("/cpu/csr", run_test_csr); + + qtest_start("-machine virt -cpu any,mvendorid=0x100"); + + return g_test_run(); + +}