From nobody Wed Nov 27 07:33:52 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=1700766998; cv=none; d=zohomail.com; s=zohoarc; b=LPImUG9TK6p0e76ReegRiB5Aj9sGx+ar2kJfA4QwdJbTcpHzm+bEK4yhIEsJE4JIxlgz7gmM14QpSpd/PDj4SfyW07zakF58BsVYU8nfrmMk9jCsV1oSREepyLjS1Gh4prWXTcjE0dD4j0gAJ/VogRkTXPuDLz4lkc8ClrNNMSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700766998; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=F3cAPK7POkxyDf86f2CZfhfjK5yQaCv5kDXzXsqfuNk=; b=b1Blm1GXA5mD3msJD5AUvQosBqO8EvDgtXmQzfS+5LA4SUEwXShoQEvi/V2DeKUqkzsaP3Vz2gJkQBYgUG/VtvKcdAF2C2EtdJolepaIlINVbjdHMrORmR40F5a9BfMYjyW4LdPUT3CTvK/vGbO+X0JlQ7B6oPQVdAYrR6sgYQI= 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 170076699891926.720172091440645; Thu, 23 Nov 2023 11:16:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6FB8-000085-Gh; Thu, 23 Nov 2023 14:15:58 -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 1r6FB7-0008Vo-Ho for qemu-devel@nongnu.org; Thu, 23 Nov 2023 14:15:57 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6FB5-0003o0-W7 for qemu-devel@nongnu.org; Thu, 23 Nov 2023 14:15:57 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1ce627400f6so8964655ad.2 for ; Thu, 23 Nov 2023 11:15:55 -0800 (PST) Received: from grind.. ([2804:7f0:bdcd:fb00:6501:2693:db52:c621]) by smtp.gmail.com with ESMTPSA id h21-20020a170902eed500b001bc21222e34sm1680760plb.285.2023.11.23.11.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 11:15:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1700766954; x=1701371754; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F3cAPK7POkxyDf86f2CZfhfjK5yQaCv5kDXzXsqfuNk=; b=lggOLv4q8nS0YJofNpPH8OaEEHr3YkP08YWE+TjoLxVfjx0ZotIozHONc2Dsn3wANd XPV3zDGoMpW47bjW9TKG1Io+L2sXvl77AC43UqbAlfmFeJZDFus6Sg2og6AcF5KEBIsM zpj3e24OzXykWvUVpTHzhFEimi/PtOPX0TeTCk3tsikYEluESIutw+vDB1Y1eolBuGYB dBo/gsCTcvu723TA4470y9g1r4grDi2FrDop1GoFiQgG3ORS8j96DWybbwBtxtmRRgiM pqQ3lPV5tae7JmrX4d5RHx/rxkQEg6BBjUnqQTM6XVZaIE2KhpGFzplHMbHCmTL0x2ot EzDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700766954; x=1701371754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F3cAPK7POkxyDf86f2CZfhfjK5yQaCv5kDXzXsqfuNk=; b=UhZSeCYVI8YI8wnhfA0rKrJozkPYjC75n+m+8cON2PKa3LeMtQaHNMPS3Evr6vnpvV XN4sV4qeHWQ1Hmpj9yiA9/1JGjtnaKtXYf5uV5RLI0Re9KaBW/XhZHCs36D85/YVdFCb 9orivBTbDmK6h9vszZ/cR36dm1MtlU25I2yQ1sgZwHolMVDkRyMadmL6D3gq8a1ZbchZ Ssufz1VbcSy0vilLsPA0GQyMqyRHZMysSgERh9dUEQw5Ou7Zd+vml+3OTWCABH/17kb/ z0dO0rhO+viK6Om1l5pkVTEHvfoaHI66N2g+eoelZDHRzlrwm+cCKEJ4GcJyXhLHN7xC SaiA== X-Gm-Message-State: AOJu0YwsXw2vSWmY9qbMZ4E3ZrXCIlPs5Q5vIZnO2E5ZEvL+KHnFzrwb C3TiMWP0bSQzvF+eL5aEvh8hvsQnqhndQSZyjWM= X-Google-Smtp-Source: AGHT+IF2zaRM69vieJYmziac3Wmy9Y01txIclsVs38rEJB4TKnnzzgD/hkGvIefladLrvjK5M9zXLA== X-Received: by 2002:a17:903:4282:b0:1c9:faef:5765 with SMTP id ju2-20020a170903428200b001c9faef5765mr416652plb.5.1700766954048; Thu, 23 Nov 2023 11:15:54 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH for-9.0 5/7] target/riscv: add satp_mode profile support Date: Thu, 23 Nov 2023 16:15:30 -0300 Message-ID: <20231123191532.1101644-6-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231123191532.1101644-1-dbarboza@ventanamicro.com> References: <20231123191532.1101644-1-dbarboza@ventanamicro.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::630; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x630.google.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, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1700767000158100001 Content-Type: text/plain; charset="utf-8" 'satp_mode' is a requirement for supervisor profiles like RVA22S64. User-mode/application profiles like RVA22U64 doesn't care. Add 'satp_mode' to the profile description. If a profile requires it, set it during cpu_set_profile(). We'll also check it during finalize() to validate if the running config implements the profile. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 1 + target/riscv/tcg/tcg-cpu.c | 41 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 2b79fe861b..a77118549b 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1543,6 +1543,7 @@ static RISCVCPUProfile RVA22U64 =3D { .name =3D "rva22u64", .misa_ext =3D RVI | RVM | RVA | RVF | RVD | RVC | RVU, .priv_spec =3D RISCV_PROFILE_ATTR_UNUSED, + .satp_mode =3D RISCV_PROFILE_ATTR_UNUSED, .ext_offsets =3D { CPU_CFG_OFFSET(ext_zicsr), CPU_CFG_OFFSET(ext_zihintpause), CPU_CFG_OFFSET(ext_zba), CPU_CFG_OFFSET(ext_zbb), diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 485d2da3c2..6c5fceb5f5 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -82,6 +82,7 @@ typedef struct riscv_cpu_profile { bool enabled; bool user_set; int priv_spec; + int satp_mode; const int32_t ext_offsets[]; } RISCVCPUProfile; =20 diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index a26cc6f093..8cfab26915 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -775,6 +775,31 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, = Error **errp) riscv_cpu_disable_priv_spec_isa_exts(cpu); } =20 +#ifndef CONFIG_USER_ONLY +static bool riscv_cpu_validate_profile_satp(RISCVCPU *cpu, + RISCVCPUProfile *profile, + bool send_warn) +{ + int satp_max =3D satp_mode_max_from_map(cpu->cfg.satp_mode.supported); + + if (profile->satp_mode > satp_max) { + if (send_warn) { + bool is_32bit =3D riscv_cpu_is_32bit(cpu); + const char *req_satp =3D satp_mode_str(profile->satp_mode, is_= 32bit); + const char *cur_satp =3D satp_mode_str(satp_max, is_32bit); + + warn_report("Profile %s requires satp mode %s, " + "but satp mode %s was set", profile->name, + req_satp, cur_satp); + } + + return false; + } + + return true; +} +#endif + static void riscv_cpu_validate_profile(RISCVCPU *cpu, RISCVCPUProfile *profile) { @@ -784,6 +809,13 @@ static void riscv_cpu_validate_profile(RISCVCPU *cpu, bool profile_impl =3D true; int i; =20 +#ifndef CONFIG_USER_ONLY + if (profile->satp_mode !=3D RISCV_PROFILE_ATTR_UNUSED) { + profile_impl =3D riscv_cpu_validate_profile_satp(cpu, profile, + send_warn); + } +#endif + if (profile->priv_spec !=3D env->priv_ver) { profile_impl =3D false; =20 @@ -1083,10 +1115,19 @@ static void cpu_set_profile(Object *obj, Visitor *v= , const char *name, profile->user_set =3D true; profile->enabled =3D value; =20 + if (profile->enabled) { cpu->env.priv_ver =3D profile->priv_spec; } =20 +#ifndef CONFIG_USER_ONLY + if (profile->satp_mode !=3D RISCV_PROFILE_ATTR_UNUSED) { + const char *satp_prop =3D satp_mode_str(profile->satp_mode, + riscv_cpu_is_32bit(cpu)); + object_property_set_bool(obj, satp_prop, profile->enabled, NULL); + } +#endif + for (i =3D 0; misa_bits[i] !=3D 0; i++) { uint32_t bit =3D misa_bits[i]; =20 --=20 2.41.0