From nobody Sat May 11 10:27:55 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=1710416241; cv=none; d=zohomail.com; s=zohoarc; b=Kun2HJcuqtZ9RJy+QgBgLw4Fd3OvJPAIyt4Q0nRgmUCIUYJlK8O4ezDue6jpm2wLo66+cQqYkcZygrF5va6Dm9FjI7m7Ah3RXAYXmC2gt8c4L+r9pbmwYuJeQXS29du9X6KcCTjMr3frk8OH4H0EWGCOXuOCqYQ0mEoymZHEuVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710416241; 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=w95im1M9b1r9dx+OwwC+H9D+z8DADQonKsqvNMhtKqw=; b=Z/BaGCPtOGisQWeWwG7xvHfSByQ5meK35hjBTt+Iz+fg4/3zAMd7d0h2T/wHgPVcSmzLYZsWuub7DyT/kb1FEWKDP3Jg0UcK+YGNq8O8gfJwek7+T7vZaaK+e7rSa+6Cv8/q1rFsv/N2sVvOzmw2LWdElse/nBuEN3AFpcFcI10= 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 1710416241442576.3968741079296; Thu, 14 Mar 2024 04:37:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkjNC-0001OO-3r; Thu, 14 Mar 2024 07:35:46 -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 1rkjMt-0001LI-Jx for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:29 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkjMn-0007H7-Di for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:27 -0400 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1dee5daedf6so37915ad.0 for ; Thu, 14 Mar 2024 04:35:17 -0700 (PDT) Received: from aryabhatta.. ([49.37.251.185]) by smtp.gmail.com with ESMTPSA id y7-20020a17090322c700b001dc6f7e794dsm1465859plg.16.2024.03.14.04.35.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 04:35:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710416117; x=1711020917; 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=w95im1M9b1r9dx+OwwC+H9D+z8DADQonKsqvNMhtKqw=; b=Wy+98mSPATXeInT920615WIoxreV8nYJru5IV3iOZ30bQAfaehv+7HLYCguEAwUztL tLMxXi2QSA5j55k4WdOUALJtGOVYlEKQX9XNZ8JuXQl2zLAROBwpODC5lWLvy0bMiK6h RLoUCD17miKkjVm9bTUjA9xeW32GnvMAwdSdgIW0Ae/gEOQXISQN7NV4Vc1NGqY1n+Mo 8jWXEW8wQCimT7FxrnxzWiF8IrJrdzyc80YVcBJpL9RZHWG+SDrCQFoT9zIl7U1+D51j cdA2MkpJipMJDPm4MxfyolO+6wajYxAa3irUTtGfNmNGNj8miHR/NoxQ7wo5fR4n5Xmr Vw8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710416117; x=1711020917; 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=w95im1M9b1r9dx+OwwC+H9D+z8DADQonKsqvNMhtKqw=; b=O4ri0IjDstcxhj9ncQkPk2HtiRxC78WwpwzrKxUtrb3FfZFn6eimNF4Ohl5XLvVViV lofRsc7LMrXhpLDqYGwFInK/fbEpNm6gejI2GT54aIVWOtctYiZKrVcExD3sA6dx64nC UNLOnk6M64sNy+Daqz3Vn0/o+yadYPHpTtbQZoVTc7dmEW9lfkRpGo1AYiRRHKzVsYD3 nsHmIC8scfS260lGoPrYgXvnwX0kugGMBjn+VQsKV0jQh/D/4Nwxl+pnlSuSbdMg+6Kb DpKkvrEaAbNhNK0NZ8KKPg8hH9Iu6pqRaR/xU3wksht/BNWdWdgtNnv8djwfo30hiU2d ZT4g== X-Forwarded-Encrypted: i=1; AJvYcCXWEbSzKhbDjksVwVay+x/vVJraaE2jWtkkDNbsrpinID8j8iPf/XMC6OZ5inHlf1nj0GRKRlFvLol0yrlbERyrjVu10Ug= X-Gm-Message-State: AOJu0Yw8bvmsofAHPp2NcFdYx0ac3hRDiUAde28pPGMZCD0Dd+VW8oas G/9C7NsUUzQFRJWplz8MoaESRsecLk1fG2kistCRfprWAMs9zTu1wrtNTdj5MRQ= X-Google-Smtp-Source: AGHT+IFXSnT+cB26Vobh5LUfdhAMgQ2yWqL/FIUmwHZcAS2Z4lOX3q2rqJR1WaAX9W+HlDUGcGnsYw== X-Received: by 2002:a17:902:d501:b0:1dd:db2a:62a7 with SMTP id b1-20020a170902d50100b001dddb2a62a7mr1554931plg.3.1710416116615; Thu, 14 Mar 2024 04:35:16 -0700 (PDT) From: Himanshu Chauhan To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: ajones@ventanamicro.com Subject: [PATCH v6 1/3] target/riscv: Enable mcontrol6 triggers only when sdtrig is selected Date: Thu, 14 Mar 2024 17:05:08 +0530 Message-Id: <20240314113510.477862-2-hchauhan@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240314113510.477862-1-hchauhan@ventanamicro.com> References: <20240314113510.477862-1-hchauhan@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::62e; envelope-from=hchauhan@ventanamicro.com; helo=mail-pl1-x62e.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=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-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1710416243508100003 Content-Type: text/plain; charset="utf-8" The mcontrol6 triggers are not defined in debug specification v0.13 These triggers are defined in sdtrig ISA extension. This patch: * Adds ext_sdtrig capability which is used to select mcontrol6 triggers * Keeps the debug property. All triggers that are defined in v0.13 are exposed. Signed-off-by: Himanshu Chauhan --- target/riscv/cpu.c | 4 +- target/riscv/cpu_cfg.h | 1 + target/riscv/csr.c | 2 +- target/riscv/debug.c | 90 +++++++++++++++++++++++++----------------- 4 files changed, 57 insertions(+), 40 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index c160b9216b..2602aae9f5 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1008,7 +1008,7 @@ static void riscv_cpu_reset_hold(Object *obj) set_default_nan_mode(1, &env->fp_status); =20 #ifndef CONFIG_USER_ONLY - if (cpu->cfg.debug) { + if (cpu->cfg.debug || cpu->cfg.ext_sdtrig) { riscv_trigger_reset_hold(env); } =20 @@ -1168,7 +1168,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error= **errp) riscv_cpu_register_gdb_regs_for_features(cs); =20 #ifndef CONFIG_USER_ONLY - if (cpu->cfg.debug) { + if (cpu->cfg.debug || cpu->cfg.ext_sdtrig) { riscv_trigger_realize(&cpu->env); } #endif diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h index 2040b90da0..0c57e1acd4 100644 --- a/target/riscv/cpu_cfg.h +++ b/target/riscv/cpu_cfg.h @@ -114,6 +114,7 @@ struct RISCVCPUConfig { bool ext_zvfbfwma; bool ext_zvfh; bool ext_zvfhmin; + bool ext_sdtrig; bool ext_smaia; bool ext_ssaia; bool ext_sscofpmf; diff --git a/target/riscv/csr.c b/target/riscv/csr.c index 726096444f..26623d3640 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -546,7 +546,7 @@ static RISCVException have_mseccfg(CPURISCVState *env, = int csrno) =20 static RISCVException debug(CPURISCVState *env, int csrno) { - if (riscv_cpu_cfg(env)->debug) { + if (riscv_cpu_cfg(env)->debug || riscv_cpu_cfg(env)->ext_sdtrig) { return RISCV_EXCP_NONE; } =20 diff --git a/target/riscv/debug.c b/target/riscv/debug.c index e30d99cc2f..674223e966 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -100,13 +100,15 @@ static trigger_action_t get_trigger_action(CPURISCVSt= ate *env, target_ulong tdata1 =3D env->tdata1[trigger_index]; int trigger_type =3D get_trigger_type(env, trigger_index); trigger_action_t action =3D DBG_ACTION_NONE; + const RISCVCPUConfig *cfg =3D riscv_cpu_cfg(env); =20 switch (trigger_type) { case TRIGGER_TYPE_AD_MATCH: action =3D (tdata1 & TYPE2_ACTION) >> 12; break; case TRIGGER_TYPE_AD_MATCH6: - action =3D (tdata1 & TYPE6_ACTION) >> 12; + if (cfg->ext_sdtrig) + action =3D (tdata1 & TYPE6_ACTION) >> 12; break; case TRIGGER_TYPE_INST_CNT: case TRIGGER_TYPE_INT: @@ -727,7 +729,12 @@ void tdata_csr_write(CPURISCVState *env, int tdata_ind= ex, target_ulong val) type2_reg_write(env, env->trigger_cur, tdata_index, val); break; case TRIGGER_TYPE_AD_MATCH6: - type6_reg_write(env, env->trigger_cur, tdata_index, val); + if (riscv_cpu_cfg(env)->ext_sdtrig) { + type6_reg_write(env, env->trigger_cur, tdata_index, val); + } else { + qemu_log_mask(LOG_UNIMP, "trigger type: %d is not supported\n", + trigger_type); + } break; case TRIGGER_TYPE_INST_CNT: itrigger_reg_write(env, env->trigger_cur, tdata_index, val); @@ -750,9 +757,14 @@ void tdata_csr_write(CPURISCVState *env, int tdata_ind= ex, target_ulong val) =20 target_ulong tinfo_csr_read(CPURISCVState *env) { - /* assume all triggers support the same types of triggers */ - return BIT(TRIGGER_TYPE_AD_MATCH) | - BIT(TRIGGER_TYPE_AD_MATCH6); + target_ulong ts =3D 0; + + ts =3D BIT(TRIGGER_TYPE_AD_MATCH); + + if (riscv_cpu_cfg(env)->ext_sdtrig) + ts |=3D BIT(TRIGGER_TYPE_AD_MATCH6); + + return ts; } =20 void riscv_cpu_debug_excp_handler(CPUState *cs) @@ -803,19 +815,21 @@ bool riscv_cpu_debug_check_breakpoint(CPUState *cs) } break; case TRIGGER_TYPE_AD_MATCH6: - ctrl =3D env->tdata1[i]; - pc =3D env->tdata2[i]; - - if ((ctrl & TYPE6_EXEC) && (bp->pc =3D=3D pc)) { - if (env->virt_enabled) { - /* check VU/VS bit against current privilege level= */ - if ((ctrl >> 23) & BIT(env->priv)) { - return true; - } - } else { - /* check U/S/M bit against current privilege level= */ - if ((ctrl >> 3) & BIT(env->priv)) { - return true; + if (cpu->cfg.ext_sdtrig) { + ctrl =3D env->tdata1[i]; + pc =3D env->tdata2[i]; + + if ((ctrl & TYPE6_EXEC) && (bp->pc =3D=3D pc)) { + if (env->virt_enabled) { + /* check VU/VS bit against current privilege l= evel */ + if ((ctrl >> 23) & BIT(env->priv)) { + return true; + } + } else { + /* check U/S/M bit against current privilege l= evel */ + if ((ctrl >> 3) & BIT(env->priv)) { + return true; + } } } } @@ -869,27 +883,29 @@ bool riscv_cpu_debug_check_watchpoint(CPUState *cs, C= PUWatchpoint *wp) } break; case TRIGGER_TYPE_AD_MATCH6: - ctrl =3D env->tdata1[i]; - addr =3D env->tdata2[i]; - flags =3D 0; + if (cpu->cfg.ext_sdtrig) { + ctrl =3D env->tdata1[i]; + addr =3D env->tdata2[i]; + flags =3D 0; =20 - if (ctrl & TYPE6_LOAD) { - flags |=3D BP_MEM_READ; - } - if (ctrl & TYPE6_STORE) { - flags |=3D BP_MEM_WRITE; - } + if (ctrl & TYPE6_LOAD) { + flags |=3D BP_MEM_READ; + } + if (ctrl & TYPE6_STORE) { + flags |=3D BP_MEM_WRITE; + } =20 - if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { - if (env->virt_enabled) { - /* check VU/VS bit against current privilege level */ - if ((ctrl >> 23) & BIT(env->priv)) { - return true; - } - } else { - /* check U/S/M bit against current privilege level */ - if ((ctrl >> 3) & BIT(env->priv)) { - return true; + if ((wp->flags & flags) && (wp->vaddr =3D=3D addr)) { + if (env->virt_enabled) { + /* check VU/VS bit against current privilege level= */ + if ((ctrl >> 23) & BIT(env->priv)) { + return true; + } + } else { + /* check U/S/M bit against current privilege level= */ + if ((ctrl >> 3) & BIT(env->priv)) { + return true; + } } } } --=20 2.34.1 From nobody Sat May 11 10:27:55 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=1710416227; cv=none; d=zohomail.com; s=zohoarc; b=Ai/Xq0kH7aeOIppUfuA+Br2IMNTK1SMs3kXhMZ4yMhToLLkNVqA1hRmWpInZhoa1AGNRnleBD4/SdfBt3MBsBad78JYgBB2vENNovHjR8jEReqNxWyMdlnuRoagMiR6dB0VjuMck5KxZprnQwTPD81tDUj/GU2QEjprr6HooVas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710416227; 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=4/UVv186fpZCEdDyDvMRnwoJ+6yboSsZXzEVi9CaxYI=; b=guTAxXmCsJnSG+TYyOec3Vbu3Nuj9nGXmCXuH9fsTz5e5Q9zErdZMIiAtn/UHHuWB4IlPjosgkPNKnnt+BvPzWyhVtjMeepyQIM9tvozx+9DyPoxHaB8KyLDo+L2QoVM8S/WMcm9RW7VzCeEMFzBHW1Adb7B4pWa78FH7Td5LZM= 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 171041622741970.15402380738112; Thu, 14 Mar 2024 04:37:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkjNE-0001Oz-KO; Thu, 14 Mar 2024 07:35:48 -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 1rkjMu-0001LL-Jp for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:29 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkjMs-0007Hb-1R for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:28 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6e6c9f6e654so135985b3a.0 for ; Thu, 14 Mar 2024 04:35:21 -0700 (PDT) Received: from aryabhatta.. ([49.37.251.185]) by smtp.gmail.com with ESMTPSA id y7-20020a17090322c700b001dc6f7e794dsm1465859plg.16.2024.03.14.04.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 04:35:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710416118; x=1711020918; 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=4/UVv186fpZCEdDyDvMRnwoJ+6yboSsZXzEVi9CaxYI=; b=lqcXK51NxIlbLxPHDFo/NQF0foSHQj2S5Be9348GWgnviEMmLCi+Wh+wgr3dwduU6I gScZ+Hf5xyJdx/WMopoFgqS81XPojUb8gJ76MTbaU9xUhxCaGoXS5Bnbkhdao/JY3Pro riDM1vcZa0CX7hlcUxUDfKuxyxDo8Nu3ibWRKRieuNwRai59KkThFOn0vS8yzj5wjmU8 707Fpxw2iYbhMAdYeBPjZ6eonB61XSZQxpsKnXC8xEDOjHZOkhGBaSCgVWpbD7W/H3Xl Q2RrFSsOFo1Ey34jzljsL1TNvY72ecBaNnQaAGlI9lU1mXoazHyqhNyVec2v9oGqaTUL BsfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710416118; x=1711020918; 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=4/UVv186fpZCEdDyDvMRnwoJ+6yboSsZXzEVi9CaxYI=; b=OaGSEiTsvq1PwuJpeKv4iVTyR2W1dJ+0w+oZ3CS2lnpdiDM5DI8N0IBLasOSG0U1l6 dWnGwg7wWe6ipr9eP4KXVz8vqQQs3iNkLJxL+OIf9oBxAQgGqU//4vjghWmtKk9IUPBE IgodiRagWCsdmKr98SHkfNCgMRHOXmBk3AbmtOd/R7Sfn5eaP1XEWqgopIl1mCFD+OT9 uFaEEhPyRjmGM0Lml5vJ4UKomn7zkw2APrGGajiRR1m6JeSWvt9Hbu2h6BulhxmJOmSe XL/Zm1Qf0AJCYNuoO5Cr245FitFgwSblQE4pW7lCjFFCbZphaN7XphbuS+aPkKk9u8HR CXzg== X-Forwarded-Encrypted: i=1; AJvYcCWpYjJtOvw2fUtypPfUqoRQQQwY/em18g0SyfJve6mNyPVCOmsJXtluWoH3u7OX/dtdGsRKf6MJfhyxYUjGNQrw+/ELLfI= X-Gm-Message-State: AOJu0Yyu+r23y8K1hCLDYpi0QyEcvkAitmExtVBDm2NRBHFXayxBrmSv GB6ckUCSmJ63Htdcnp7b/s4Nl1vuQ6xQn9WP5gMaL+yYqAlqv0GEBIBg3YrsIdc= X-Google-Smtp-Source: AGHT+IGByuVp/nA/wgT8tnYB6zVKk+7w8r49tG/kGe8PH3xSr/FuoQkGEmV8/hWMCO0jET7jt0fXIA== X-Received: by 2002:a05:6a20:43a9:b0:1a1:1a07:b0b3 with SMTP id i41-20020a056a2043a900b001a11a07b0b3mr1807777pzl.5.1710416118486; Thu, 14 Mar 2024 04:35:18 -0700 (PDT) From: Himanshu Chauhan To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: ajones@ventanamicro.com Subject: [PATCH v6 2/3] target/riscv: Expose sdtrig ISA extension Date: Thu, 14 Mar 2024 17:05:09 +0530 Message-Id: <20240314113510.477862-3-hchauhan@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240314113510.477862-1-hchauhan@ventanamicro.com> References: <20240314113510.477862-1-hchauhan@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::429; envelope-from=hchauhan@ventanamicro.com; helo=mail-pf1-x429.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: 1710416229531100003 Content-Type: text/plain; charset="utf-8" This patch adds "sdtrig" in the ISA string when sdtrig extension is enabled. The sdtrig extension may or may not be implemented in a system. Therefore, = the -cpu rv64,sdtrig=3D option can be used to dynamically turn sdtrig extension on or off. Since, the sdtrig ISA extension is a superset of debug specification, disab= le the debug property when sdtrig is enabled. A warning is printed when this is done. By default, the sdtrig extension is disabled and debug property enabled as = usual. Signed-off-by: Himanshu Chauhan --- target/riscv/cpu.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 2602aae9f5..66c91fffd6 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -175,6 +175,7 @@ const RISCVIsaExtData isa_edata_arr[] =3D { ISA_EXT_DATA_ENTRY(zvkt, PRIV_VERSION_1_12_0, ext_zvkt), ISA_EXT_DATA_ENTRY(zhinx, PRIV_VERSION_1_12_0, ext_zhinx), ISA_EXT_DATA_ENTRY(zhinxmin, PRIV_VERSION_1_12_0, ext_zhinxmin), + ISA_EXT_DATA_ENTRY(sdtrig, PRIV_VERSION_1_12_0, ext_sdtrig), ISA_EXT_DATA_ENTRY(smaia, PRIV_VERSION_1_12_0, ext_smaia), ISA_EXT_DATA_ENTRY(smepmp, PRIV_VERSION_1_12_0, ext_smepmp), ISA_EXT_DATA_ENTRY(smstateen, PRIV_VERSION_1_12_0, ext_smstateen), @@ -1008,6 +1009,11 @@ static void riscv_cpu_reset_hold(Object *obj) set_default_nan_mode(1, &env->fp_status); =20 #ifndef CONFIG_USER_ONLY + if (!cpu->cfg.debug && cpu->cfg.ext_sdtrig) { + warn_report("Enabling 'debug' since 'sdtrig' is enabled."); + cpu->cfg.debug =3D true; + } + if (cpu->cfg.debug || cpu->cfg.ext_sdtrig) { riscv_trigger_reset_hold(env); } @@ -1480,6 +1486,7 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = =3D { MULTI_EXT_CFG_BOOL("zvfhmin", ext_zvfhmin, false), MULTI_EXT_CFG_BOOL("sstc", ext_sstc, true), =20 + MULTI_EXT_CFG_BOOL("sdtrig", ext_sdtrig, false), MULTI_EXT_CFG_BOOL("smaia", ext_smaia, false), MULTI_EXT_CFG_BOOL("smepmp", ext_smepmp, false), MULTI_EXT_CFG_BOOL("smstateen", ext_smstateen, false), --=20 2.34.1 From nobody Sat May 11 10:27:55 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=1710416215; cv=none; d=zohomail.com; s=zohoarc; b=CXSsGZcmWmzTRojHR3S26bU2CxDFSk1mRaLj2SDLmG3CsAd8aqKhW051UJUY7octqKXIdO145uvU7BlgZIgXgj0MGFOihIqV/ksgHQUH+gc3Jm/air2kBQVmKfAPqaOCLDFp2vsAqitiqdtakz/kzOBqcWeOuBjZABoMBL8uawE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710416215; 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=eNWDQzg7Cj2NmO7oV7q03WSZVn4J1P7IOb9ROmxn1Qs=; b=nx7HCzbphEOWfstUZK9PhHPRC5GwBRB0XcLEdrzyUSsGEPMUYozNLAwGOhkiF51rN3CnvBFw8YW4z/jda6y8ms6jT9Qt/zVssOG880u6/COsAeUbzzcHrPy2tANDXRzRzNN3lFn4fqj3eCWiIVlJ8IdixhfJQJht2nY4WGrv94U= 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 1710416215572855.8665737793276; Thu, 14 Mar 2024 04:36:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rkjNC-0001O7-1Z; Thu, 14 Mar 2024 07:35:46 -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 1rkjMt-0001LF-9b for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:29 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkjMq-0007I2-Di for qemu-devel@nongnu.org; Thu, 14 Mar 2024 07:35:27 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1dde367a10aso247425ad.0 for ; Thu, 14 Mar 2024 04:35:22 -0700 (PDT) Received: from aryabhatta.. ([49.37.251.185]) by smtp.gmail.com with ESMTPSA id y7-20020a17090322c700b001dc6f7e794dsm1465859plg.16.2024.03.14.04.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Mar 2024 04:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1710416120; x=1711020920; 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=eNWDQzg7Cj2NmO7oV7q03WSZVn4J1P7IOb9ROmxn1Qs=; b=i78tVxtIPXB1hLdOY797hImfgOLGO04WZqSVqZphQTrwE6ODrqLBeyoW2J+koVxix2 EWsQAN2e7WyX4fMIsPejFFuvJbk5mZ3TsYcoUS11YDBQx3dzjkrNmmfA3uzw8OzW505F syUkjS9gK+o3vav2M1vo841U5/1NDXxFVuE65TRpyuQmfw6D/vNHvck6gwJr6P+WEntp 4Rgh7GmOjvyQKMRX3rPZfqr3XpNPa5KmHqvEnb5930Qa3lUE0DboE7JdHnDr+XBKMvnd JtU92TlEAL30+2YX0lfrr+IpN8kA25wFmWWA50W74d2Vt4/9C+m4uOOCR1djObYfzkcs i8rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710416120; x=1711020920; 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=eNWDQzg7Cj2NmO7oV7q03WSZVn4J1P7IOb9ROmxn1Qs=; b=iNW5IuRStZTlQfYJ8Yvdh908JgLP8lUWj7sWt+/eKpoDwbRdSu86pp0i0D3MAUmXb/ wXrYcRmrBdDEE7GbtNDeqf28Pt2YAtn5rl5JTg8wMWbDSC/B2XxrhBHIC7os40xEmPm6 hTpJiQfgEd6c4raUyYpckD5Mgpc086sBZnOiGmUpep4GRgDeQuNBFF/i9Kjj8RXOWvRr /NxgWeAnpYiIzJe5MvC+T8A+PbXMxjHL2K1Aya34T3D5j9IUTx2ulkw9GSFeLIVl+m+E HYEREH9JHRVYIFEHhGHLnEh6abcTTxDqS1z2vhgGB9WIiXBJiXC7OmquXOyf6PGdIZdF PRPQ== X-Forwarded-Encrypted: i=1; AJvYcCVa4vHgSUGz21gyxLItkHUigMYIOCzpefOeIy991qQ8WtMv12kZu2OzOpmcpjQfj1t5v1l9g7AS9c9QMDxNapru6G4nbZU= X-Gm-Message-State: AOJu0YziAtD2Y7Hv4xv6tRD2YH5iZvq8x7wZnOJ0USxLZ9BLSFpXSl2I QLhrXRBZAO+VckacfmXpO9nXCWh15OpLb6ycyCxaMHoi0VhzFHvZJMiXXv7IEX3pX7Ek8R0H86f a898= X-Google-Smtp-Source: AGHT+IEMiIdwVR/qco9lcEISeI3075BXQAmycq13RyanmtV6Bs5IvejyhislGKRpsmay/wpgkkOGdw== X-Received: by 2002:a17:902:d50f:b0:1dc:3c:fb67 with SMTP id b15-20020a170902d50f00b001dc003cfb67mr1531812plg.5.1710416120349; Thu, 14 Mar 2024 04:35:20 -0700 (PDT) From: Himanshu Chauhan To: qemu-riscv@nongnu.org, qemu-devel@nongnu.org Cc: ajones@ventanamicro.com Subject: [PATCH v6 3/3] target/riscv: Enable sdtrig for Ventana's Veyron CPUs Date: Thu, 14 Mar 2024 17:05:10 +0530 Message-Id: <20240314113510.477862-4-hchauhan@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240314113510.477862-1-hchauhan@ventanamicro.com> References: <20240314113510.477862-1-hchauhan@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::62f; envelope-from=hchauhan@ventanamicro.com; helo=mail-pl1-x62f.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=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-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1710416217397100005 Content-Type: text/plain; charset="utf-8" Ventana's Veyron CPUs support sdtrig ISA extension. By default, enable the sdtrig extension and disable the debug property for these CPUs. Signed-off-by: Himanshu Chauhan --- target/riscv/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 66c91fffd6..3c7ad1c903 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -569,6 +569,7 @@ static void rv64_veyron_v1_cpu_init(Object *obj) cpu->cfg.cbom_blocksize =3D 64; cpu->cfg.cboz_blocksize =3D 64; cpu->cfg.ext_zicboz =3D true; + cpu->cfg.ext_sdtrig =3D true; cpu->cfg.ext_smaia =3D true; cpu->cfg.ext_ssaia =3D true; cpu->cfg.ext_sscofpmf =3D true; --=20 2.34.1