From patchwork Wed Mar 22 22:19:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1760035 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=KOcFlt7a; dkim-atps=neutral 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 4PhlDT46JHz2476 for ; Thu, 23 Mar 2023 10:34:17 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pf6yU-0006px-9t; Wed, 22 Mar 2023 18:30: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 1pf6yS-0006pp-T9 for qemu-devel@nongnu.org; Wed, 22 Mar 2023 18:30:28 -0400 Received: from mail-yw1-x1131.google.com ([2607:f8b0:4864:20::1131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pf6yD-0007Ff-Pt for qemu-devel@nongnu.org; Wed, 22 Mar 2023 18:30:28 -0400 Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-541a05e4124so364408577b3.1 for ; Wed, 22 Mar 2023 15:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1679524208; 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=gSRdDD81e7A1PCiuRYEMqVD92dtWZhXv26NfXfSATYc=; b=KOcFlt7ahf7rVP0x6FVGuaimAcsl7Ne8SfBVblrh2ULpooLYSK6BL1ECk99mYJZrkq Qw833K8h3Hf4+azzYpFXG4RVT0pt/Fy9n+xDysWIxxqZzmL+Pm92EgFltHHqTpvyGZoI Md+3twCidhxnQwJP4AYOADFpsKx/m6GQfmkm1QTGcVT/bmTnlq0stsS0ql0jiIYmGr0W jRf+YituzujjUUbvl7IXb2RRms1yFbNzi+tp9AtUoCc/vdC1gJeWpIW107tnW4JZ+Hpq R9iEzOZz1TNrhdtEEq03pHJe02kEeD07BnWcqru7vc6uX7emoYtfxNw7bPcAyJIivm0b vyEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679524208; 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=gSRdDD81e7A1PCiuRYEMqVD92dtWZhXv26NfXfSATYc=; b=e9lBfGkyEfWhLMWzWDSxDqJCvrJIg5rdWOfwi4NlW50YGEVYD1kS4/PzKonbtvS4QI VHcP9Vb5Ed6aDapIi1aK4Na7CRSIj+fS6cdbc3SvtRkJtAn6J9+318NrTXhrsrr/jhQV O5JvYeW0rwpEAS/9NxDrohZr5HBib3obLqDFlmIKD3L5yos8NMQQZnTpMC+EtjRBTSPP Yiz8Qgyx/GawukHvF5lm5IYFACVf0zVVUrcgbt2cV1RkE9lAIMsm+IlMRFX7I7vq1r74 1LKIg2lhEPRPniRDNBPnsB+Mm2O3jC7dneNBu8k2Qs6iOL5AaxDNrfN4MRkADd2bDuD8 mpCw== X-Gm-Message-State: AAQBX9fBEyOGEr9oTcjrEBHU9ExycNotsHq5h3xEXpEAZieTAAtRHuSI qQWoZhLy8nf9ZA3j7uGGzoLSA7JbRX0sS+PDM7Y= X-Google-Smtp-Source: AK7set9bbwcE9m9O1sjfaI5cMsBtmUH6pAgsYqzJuP7tKvD7RSUUk34t53xuVLXbIeZmcM5G1zXiKw== X-Received: by 2002:a05:6870:c0d5:b0:172:48e:b8c4 with SMTP id e21-20020a056870c0d500b00172048eb8c4mr601841oad.17.1679523665259; Wed, 22 Mar 2023 15:21:05 -0700 (PDT) Received: from grind.. ([177.95.89.231]) by smtp.gmail.com with ESMTPSA id ax35-20020a05687c022300b0017243edbe5bsm5586817oac.58.2023.03.22.15.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 15:21:04 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH for-8.1 v4 14/25] target/riscv: add RVG Date: Wed, 22 Mar 2023 19:19:53 -0300 Message-Id: <20230322222004.357013-15-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322222004.357013-1-dbarboza@ventanamicro.com> References: <20230322222004.357013-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1131; envelope-from=dbarboza@ventanamicro.com; helo=mail-yw1-x1131.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 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 'G' bit in misa_ext is a virtual extension that enables a set of extensions (i, m, a, f, d, icsr and ifencei). We're already have code to handle it but no bit definition. Add it. Add RVG to set_misa() in rv64_thead_c906_cpu_init() and remove the manual cpu->cfg.ext_g assignment while we're at it. Signed-off-by: Daniel Henrique Barboza --- target/riscv/cpu.c | 8 ++++++-- target/riscv/cpu.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c4f18d0436..f41888baa0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -274,6 +274,9 @@ static uint32_t riscv_get_misa_ext_with_cpucfg(RISCVCPUConfig *cfg) if (cfg->ext_j) { ext |= RVJ; } + if (cfg->ext_g) { + ext |= RVG; + } return ext; } @@ -293,6 +296,7 @@ static void riscv_set_cpucfg_with_misa(RISCVCPUConfig *cfg, cfg->ext_u = misa_ext & RVU; cfg->ext_h = misa_ext & RVH; cfg->ext_j = misa_ext & RVJ; + cfg->ext_g = misa_ext & RVG; } static void set_misa(CPURISCVState *env, RISCVMXL mxl, uint32_t ext) @@ -474,10 +478,10 @@ static void rv64_thead_c906_cpu_init(Object *obj) CPURISCVState *env = &RISCV_CPU(obj)->env; RISCVCPU *cpu = RISCV_CPU(obj); - set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | RVC | RVS | RVU); + set_misa(env, MXL_RV64, RVI | RVM | RVA | RVF | RVD | + RVC | RVS | RVU | RVG); env->priv_ver = PRIV_VERSION_1_11_0; - cpu->cfg.ext_g = true; cpu->cfg.ext_icsr = true; cpu->cfg.ext_zfh = true; cpu->cfg.mmu = true; diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 2263629332..dbb4df9df0 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -82,6 +82,7 @@ #define RVU RV('U') #define RVH RV('H') #define RVJ RV('J') +#define RVG RV('G') /* Privileged specification version */