From patchwork Wed Feb 26 14:39:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Lugou X-Patchwork-Id: 13992601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD6E7C021B8 for ; Wed, 26 Feb 2025 14:41:12 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnIav-0005h3-O0; Wed, 26 Feb 2025 09:41:06 -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 1tnIaD-0005JY-75; Wed, 26 Feb 2025 09:40:21 -0500 Received: from mail-francecentralazlp170110002.outbound.protection.outlook.com ([2a01:111:f403:c20a::2] helo=PAUP264CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnIaB-0003G1-58; Wed, 26 Feb 2025 09:40:20 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nF1xtrLSKmWZPsg/jL4U6iNspF8hA8+suVt4WW7pNdEH8tlFCoVHZU3MyA8q6UaVOWY194FO7hrc0fuV2oxn1zqhnmwQorUprl2tpXhCpGaDEHZ1OmOzmVHVUFszWlK3/tulek9iXR8P8ARn6xpLY6UGPI159Mhcd0RnXoXzctXa61HsmDvPShY/uRCN6XyHA+0XBBpMalmsYHa9O6GrwxKGezSKkjnlR6H7boJEMhg8M1Dej29WUp+gNuQJsxn2UIsrMGeOq0ZFVrJpz+i3Uk1jMX+FNT6lQt07/CK53rgBgbqNwsCHTjb+oSoq8bwvdfSJZT8SvI+C/fiR3QwFAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mp4r+VOmadAMNQZUvb3pycde9VptQ8u6s3FC6wREQko=; b=c196B2X8XvhlsDC8lv4CNYRf+9XDz2QJdsXtibmWOXSbQoTTdP80SNrD8JYmkGqTAlHQfgtNGf4ET6as1vW6EPcQUBkAJSR10oKpB/Ff2NQqihMUW5gI33jDCsE4q32deJOaSylBppEuSklahzC2PLMR9cE8CllaZnhdTPhlIo+EN+1+RxtuySosfDuJT7X008jlF4rxnyjUcqTBnTXwgoOG66ebH4fUaa5wzO913Z337sA766xomUO1T/L4swyOk3QSd7v5fk2P5zpiXrjAaZvQvo9J1SXwZiYhLW4DYUU/W4EofASlGmRsBGJMvFwD+cEZHQWyPnDpxP72o8kuHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=provenrun.com; dmarc=pass action=none header.from=provenrun.com; dkim=pass header.d=provenrun.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=provenrun.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Mp4r+VOmadAMNQZUvb3pycde9VptQ8u6s3FC6wREQko=; b=lDoxSx01P7GjyRJg6ovVnqEh8JOFZ2HeyNjSNFa3YzxlMMIDgZQ+w0Ro3q3lL/TL7QoTi0gNjSCJcMTISLj9oeFKcMW+YWakZrXXBDyVDPddpah8vNRnNM61pIEizkKvap2vvEUabngW+5r28MqZechro+Op4SgN9j7GhbarYQKYY+SwO/ANSRYJni2ar3vhDAWaKXDt5zgiNLv62t3iJayc9JZFf7Ro5IskybYZ84FJyWRgAsq96mHCzOh4Nym5tqxrwMeAIZfq3gq60hJ08Yr/dUHrimiogt99o9EONec9vOcDRx1Vq5HR1tqAiRz6mUvfqFaK94ZHgQFy2v6hdA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=provenrun.com; Received: from PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1f2::18) by MR0P264MB5513.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Wed, 26 Feb 2025 14:40:07 +0000 Received: from PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM ([fe80::ef1:e8a1:244f:3ca7]) by PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM ([fe80::ef1:e8a1:244f:3ca7%5]) with mapi id 15.20.8489.018; Wed, 26 Feb 2025 14:40:07 +0000 From: Florian Lugou To: qemu-devel@nongnu.org Cc: Florian Lugou , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org Subject: [PATCH 1/2] target/riscv: Add scontext CSR handling Date: Wed, 26 Feb 2025 15:39:13 +0100 Message-ID: <20250226143914.769112-2-florian.lugou@provenrun.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250226143914.769112-1-florian.lugou@provenrun.com> References: <20250226143914.769112-1-florian.lugou@provenrun.com> X-ClientProxiedBy: PA7P264CA0019.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:2df::15) To PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1f2::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAZP264MB2990:EE_|MR0P264MB5513:EE_ X-MS-Office365-Filtering-Correlation-Id: 063c8666-2ee1-4818-577a-08dd567376d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|1800799024|10070799003; X-Microsoft-Antispam-Message-Info: XgtEUKWUQmMZoxncraqoTG8Dc6BKiIO/2WvZNst7XcqkjXeJU2qqXjVsuSa340icftNgZRFuonnHGUWEXCgkqPNCWLjRhzWwSaj/F9chS2YmfmSC2XnDaSDp1i9aRv9liLvj/yfHNQU1IqAaIIbeT0xUCJ6K935CSJ2ad/P117e8tjW4Ujno/otMliya0t0rqOKt4hnI4OWg7iYh9rY05EqgYIOgp5SJ1hja5o1VabBPPnAd/i136xXyvthp9Ca8m98sAcitxhwbU66+yO7hn6IbGUJj0hQ7lg95UdMF5uxL8TXahrIhgrSOOd1r11xEKr4EBsKgsbg5pxa3jeuTHS+kBAHNT28yHro+i5fa644GhtZ8lELprS/VSywXjcK18iQktVibEffs9oYVyOThrXPrZ2ISxxPq4YCkrkf0yst1NOJggiYV9IDPJpZCvk/xWPDYGQyMYYf90Dt/SuqSWGntNu0Q4RZmn0Q6U6HKIS+Ye8tbIIm7JIJuWb+Rdnh6hbHpZIR51IQ30uScK5D83IQsHUUu4suDCbuqKCmK+dwmJJuSzRgxCDZoWXhywb91+28yM4OmTfh9vKSj/7aCsJxNmJnYXD8f67ZefJ4I8BDFNV8Pa/NgRVkdCeZo5mfL8af2bYbIh1em8rbCyy2EjOqgkHvoVhDsuwQoq/sRvzDdzWLtkg92upLwKthjPeBxSLoGl0ffNjNl+RJDy6SdZshy2YLuqeB47zPODJUoH9Km1vkGtm85Pns81GUnhpLLOOH6EMhfckDtrxVS6dsRTY1/i4fevNolEuvo2F5gce4fLBjdQXk0Kwr8NrxRsFtttmm4c/fMPdfUXcZ3RbX9vkWb9Le3nVHJ65kXHaCxvbFvVfml7XZ8f/FCjUa8TDbjQndzA6bDyR6yqqeHqcC8BRQIXnESSPivPPIY1p54eQ7dluJc+1G9TtBOn6XaYT7HpxQfvCeZ/nX0/9DDtOkbvZJ9Ywg4vR6sgE541L4Z3+dJ4+2HBKVXM1baVGv3EMwF73bNGn02Afw56+UO+44xfsUkjo/rJEcCTcoN4t6PNFGKWzWc4cXEh3m+n7DIAPN5SfEEdbCpV09NhmCJE2A8P6A49qUhPaIvo9rhgnhH8YEv2d4iafxLbaUoLXLs9B9RoUjqgmWwBjadbjNMYr7/gktaEPaD/QMbkam91GXqoeJlGSxf6/mkcpWgV2lvQ3vWFhfsO1RjENfIoOF7bZer/Dvm6J1+70BaJGhMDzhta7L3xsi2nPSh4s3AqXCnuvx/BEvQuJ0Isa58BHMg1SYx9Q8umTVjVEXhKta9CLqc1A7FbYgtsAuVPdnqQoleN18t0x68t0ABUq0cROkzGrumA1hdTHEwBV9/L0PtQhIxawfJEfHnfIOrbnk2zytOUArx X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(1800799024)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IUCyktQt+5Zkh+kNF75DzPyRyEBjM0NyU46fE7oRLr6gwciDskscTSZuHRt4i+L5uoaQ9i2p3UGSgrUV73EwJFfh9+aGMvQjQ/liHCWQnKcoAKiYxKXI7QeZJjjX8nwnlc95ocZv/IFPpdzvoPNyh7vURvX8d9z8ib+otRE06MCZUSwIVY5t0lboq4qPt/SeTT+gFMaeZcQBz9ObOQI0ml0jhhrc61lJFPU84kKwVYYfdcIXzKspIy5xWbegOZg0lGQkp0ncUF96ATdL9mMJGfSDa/iQEz2SOnMYzRJu3pwqBXwWAqN3lv4khkA23W29SS0BD2zAE5rrJiyqekF3iKWmHEwc+5SdztPK6C0Oy4VtgF2G7R79/iEwReQKtiw1UTMAAiPDUVarlOpb7WNjfQD10ZsQb+JiruDK0r7XHUqfXXXYY6G15dLsJwUD42IVCNjT/074z75OVb4tGMaa4a5Bh3EcU7yVAVp0JwjW20scIH5LH0Q/BfmE50ViDGt3lFEnEb4proL5QKSqKvXy0DD/H7d2ZzkQlKwly4BBki61M84RZy+F/mBJ0ieeVpGxQYauBetMNFR650W0jmRViNBcfqOp8ZrhfBTqEiokIcVop2mmCj097g6ArK4+SpNYItv/TPZr6ivBPnyflkUDloFpQyI6DdQ2Ray5gb5njlWKQYPESm9QbeAKZZKvmouswFLCiwQPVJn5HNaUDOR/CClOR6Xqo0Cx3o/HRxjSGhBNYRoU3JBr0TsRpWXxDOTH6jy6oDxG8LLcy6lV0Sssvjkvvl5mUfapfrEk31OeH8ZkaMrCsfgIHI6yKJk4nCW7D5iqXZ2rrySAg7hfaVRLAVZPDIseZW9KeilZle6HjRXe5P1bJgciZC93L8dOPd1TL3u+2ot9Un4hqammrxR7VXyX8VccsxgB4schqihbbg39RzGuKFqSDABDIFvNw+7HzsTDKoF1LW0KC66lWuXQ1Psbp2FR3cVwIjpnlFlmOPHZjIXdp4CEjXUYzoXTf+qRP6McdNJmy1sun7SS7WOndkjlrKMdwTA+LD+5qlgiCa3NI7hNLQscAu4sIu7QSejXAZ7HPRdCVBkcv4VKOeVxh/EwywULk8lLb1mIIHYNty0zYPRNBZSHcr1w2FcGsqNadzOUZaFQwduR2LozMt0VK6MQCjtRSY/wtwndGxKsshO2nedJINyNuzcaLqlL821svVQXkolbRf13MiGbNI7DLbCLek1yFOym1Vg0oLUqZJGAAMzGWSTDFXJvkHmuABHFL/Y/q8vD38iOiXNSyH2+j0N/T7HU7N5q1N2uAJppqL3mQTXo0o3sXdzS04PxPXFIvo29Nc2g5fYLf1KkN3fo+2P3vyRYG45tL/7/e3u5FGrctGDz0oa1uhO7eY5XJqlUZivxPjrjCqeoZcvd8Bab2U8bsFlmjGr1HFQNgVSnU8nVVjXD8aTOpFvFNDv25pwfU/zU5k7Ewh5YJs6MIzf6yGeEbaCA9Z/Z7BHnIbqty39ujaPONImaquWWI6tXNtDQCtZ8a6nnZSI+HxShnYqG9IM2jfKGYnvreeBqGr2KCe2F0shD34L/Mm3dCe6XKpjPovFS9VmVQNo02OvSQgN1OFOi33/CCkZJIc9ww0fdYs/AaXokFAUtM8AtQ6poYqknzWdlriTCbQyP+pJWDDU0ZQ== X-OriginatorOrg: provenrun.com X-MS-Exchange-CrossTenant-Network-Message-Id: 063c8666-2ee1-4818-577a-08dd567376d0 X-MS-Exchange-CrossTenant-AuthSource: PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 14:40:07.5430 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: ff654c30-3eb4-4445-b89f-a54a92b1f03d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7IdU0fxLy8yKVvDZFqaSDXuOUvWwXqDLK0d0pqFaXlixHw6+E1wXp79LJQ/wmfF5A0BWuEwOyuzi5p1oKD47TZQnnN8WqbUXYp2gWfN9RAs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR0P264MB5513 Received-SPF: pass client-ip=2a01:111:f403:c20a::2; envelope-from=florian.lugou@provenrun.com; helo=PAUP264CU001.outbound.protection.outlook.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_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org scontext size is 16 bits on RV32 and 32 bits on RV64, as recommended by version 1.0 2025-02-21 of the debug specification. When the Smstateen extension is implemented, accessibility to the scontext CSR is controlled by bit 57 of the [mh]stateen0 CSRs. Signed-off-by: Florian Lugou --- target/riscv/cpu.h | 1 + target/riscv/cpu_bits.h | 5 +++++ target/riscv/csr.c | 36 ++++++++++++++++++++++++++++++++++++ target/riscv/debug.c | 1 + 4 files changed, 43 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 97713681cb..e47200f409 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -430,6 +430,7 @@ struct CPUArchState { target_ulong tdata2[RV_MAX_TRIGGERS]; target_ulong tdata3[RV_MAX_TRIGGERS]; target_ulong mcontext; + target_ulong scontext; struct CPUBreakpoint *cpu_breakpoint[RV_MAX_TRIGGERS]; struct CPUWatchpoint *cpu_watchpoint[RV_MAX_TRIGGERS]; QEMUTimer *itrigger_timer[RV_MAX_TRIGGERS]; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index f97c48a394..add0bb9d0e 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -247,6 +247,9 @@ #define CSR_SIEH 0x114 #define CSR_SIPH 0x154 +/* Supervisor-Level Sdtrig CSRs (debug) */ +#define CSR_SCONTEXT 0x5a8 + /* Hpervisor CSRs */ #define CSR_HSTATUS 0x600 #define CSR_HEDELEG 0x602 @@ -959,4 +962,6 @@ typedef enum RISCVException { #define MCONTEXT64 0x0000000000001FFFULL #define MCONTEXT32_HCONTEXT 0x0000007F #define MCONTEXT64_HCONTEXT 0x0000000000003FFFULL +#define SCONTEXT32 0x0000FFFF +#define SCONTEXT64 0x00000000FFFFFFFFULL #endif diff --git a/target/riscv/csr.c b/target/riscv/csr.c index afb7544f07..1c1ac8ed67 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -3221,6 +3221,10 @@ static RISCVException write_mstateen0(CPURISCVState *env, int csrno, wr_mask |= SMSTATEEN0_P1P13; } + if (riscv_cpu_cfg(env)->debug) { + wr_mask |= SMSTATEEN0_HSCONTXT; + } + if (riscv_cpu_cfg(env)->ext_smaia || riscv_cpu_cfg(env)->ext_smcsrind) { wr_mask |= SMSTATEEN0_SVSLCT; } @@ -5053,6 +5057,35 @@ static RISCVException write_mcontext(CPURISCVState *env, int csrno, return RISCV_EXCP_NONE; } +static RISCVException read_scontext(CPURISCVState *env, int csrno, + target_ulong *val) +{ + RISCVException ret = smstateen_acc_ok(env, 0, SMSTATEEN0_HSCONTXT); + if (ret != RISCV_EXCP_NONE) { + return ret; + } + + *val = env->scontext; + return RISCV_EXCP_NONE; +} + +static RISCVException write_scontext(CPURISCVState *env, int csrno, + target_ulong val) +{ + bool rv32 = riscv_cpu_mxl(env) == MXL_RV32 ? true : false; + + RISCVException ret = smstateen_acc_ok(env, 0, SMSTATEEN0_HSCONTXT); + if (ret != RISCV_EXCP_NONE) { + return ret; + } + + /* Spec suggest 16-bit for RV32 and 34-bit for RV64 */ + target_ulong mask = rv32 ? SCONTEXT32 : SCONTEXT64; + + env->scontext = val & mask; + return RISCV_EXCP_NONE; +} + static RISCVException read_mnscratch(CPURISCVState *env, int csrno, target_ulong *val) { @@ -5705,6 +5738,9 @@ riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_SIEH] = { "sieh", aia_smode32, NULL, NULL, rmw_sieh }, [CSR_SIPH] = { "siph", aia_smode32, NULL, NULL, rmw_siph }, + /* Supervisor-Level Sdtrig CSRs (debug) */ + [CSR_SCONTEXT] = { "scontext", debug, read_scontext, write_scontext }, + [CSR_HSTATUS] = { "hstatus", hmode, read_hstatus, write_hstatus, .min_priv_ver = PRIV_VERSION_1_12_0 }, [CSR_HEDELEG] = { "hedeleg", hmode, read_hedeleg, write_hedeleg, diff --git a/target/riscv/debug.c b/target/riscv/debug.c index f6241a80be..914a9ce0f8 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -1086,4 +1086,5 @@ void riscv_trigger_reset_hold(CPURISCVState *env) } env->mcontext = 0; + env->scontext = 0; } From patchwork Wed Feb 26 14:39:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Lugou X-Patchwork-Id: 13992602 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 160A7C18E7C for ; Wed, 26 Feb 2025 14:41:16 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnIaw-0005lA-R3; Wed, 26 Feb 2025 09:41:06 -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 1tnIaH-0005Or-4P; Wed, 26 Feb 2025 09:40:28 -0500 Received: from mail-francecentralazlp170110002.outbound.protection.outlook.com ([2a01:111:f403:c20a::2] helo=PAUP264CU001.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnIaE-0003G1-Qa; Wed, 26 Feb 2025 09:40:24 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jKGeaR8g57adw6CadqrYpyQhAb7U2ZyVXyrFE9UlXT4UcDMV9JatKTXuaYv0Oe9P8eGO6aizIO09Sk8pzDAaDKXX6PUFhg/baLMZhedVpnl2jSnSFTmVv+RqPoNmc3tBNUdp81bO4ahYFwwIQCH8umjZUMcUCsg0Rb0Id5qNxjx1e++Ec6AbEBbxwJKPK6mD4n249j0V0UHzmpeeUkpPOQeu3WSzrXW+5h7CazDrFDa+PEFkKCYBBiHmsnscYIa6kUx3699BjwNyvR2uyjzSdYUik49k1ouFZ0w1WPkRzwCN4UBRLop+n8Hc4P6qYEEGBLnb07DmYftq1XAr2vMqsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=EtdcfQsRu430XON7bWtSEwbLUbBdu7WhQasdSJW1WQc=; b=V6/xIA3jc8DHDVc66Vmes7oA79O/AprB4Kon82rbBD7ogWoVB59vlrRLdLRWjthhaaYo0ffpwLPboTAySYFqswJ3/KGWGhp+sADUPrPeuDxIOi3v8xLVaYFUOLN/lTXHD2Hmit8M1tcVyn2WD0NaKAeXMfUfHaz9rE4adMzXDw2p7psXvD5Syb5VU6cUWeCHZZ+wZG4FykZoRTkfFi6JIKCV0T69b9OiULWsDrb4qKZ0cLlJEIQcRJsS39Igzd2IG4I9A3PxV1nqfbMxaLnbsE0S/sfDPG4JDVkqWJ2KW6eaoJnr5vYQGcG+002dobKvj1kmvznQCV4w/t3a+FHJcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=provenrun.com; dmarc=pass action=none header.from=provenrun.com; dkim=pass header.d=provenrun.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=provenrun.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EtdcfQsRu430XON7bWtSEwbLUbBdu7WhQasdSJW1WQc=; b=FZTkxDZkWWsz4BY3/WSyfJv/g2IhCm/mZMxZT79q5k2XY0uk4M0F2byvGT8XWvxLR/f/ee67nyZDTMMuWt6DuZ7jGAg/lkNs3Ixmj5boZ1pxiigxhCHrktzCrfqttS6jYqrWnLRxxzqzzDKmOqbY3+ij9En+5RpqXOjZIR1tmHAK98idlER/CDY1bTdIRq8S5ZiZ2W9qYRRSk0J1xHOWqLVsP6bYXq5V/Do+Z7chUIvL+1aKx/YvauIq5PFaPLXezZI34RStvIf6J/eBzdqAWYoZxtl9yX+/VoHW9Bd91yBvZHKW73DL7QbY03o7GyxBOHryAMCPZnrQCttLL+/x7A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=provenrun.com; Received: from PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1f2::18) by MR0P264MB5513.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:4b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.19; Wed, 26 Feb 2025 14:40:08 +0000 Received: from PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM ([fe80::ef1:e8a1:244f:3ca7]) by PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM ([fe80::ef1:e8a1:244f:3ca7%5]) with mapi id 15.20.8489.018; Wed, 26 Feb 2025 14:40:08 +0000 From: Florian Lugou To: qemu-devel@nongnu.org Cc: Florian Lugou , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org Subject: [PATCH 2/2] target/riscv: Support matching scontext in Sdtrig's textra CSRs Date: Wed, 26 Feb 2025 15:39:14 +0100 Message-ID: <20250226143914.769112-3-florian.lugou@provenrun.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250226143914.769112-1-florian.lugou@provenrun.com> References: <20250226143914.769112-1-florian.lugou@provenrun.com> X-ClientProxiedBy: PA7P264CA0019.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:2df::15) To PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1f2::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAZP264MB2990:EE_|MR0P264MB5513:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f2c3a0c-78a1-4206-cb8c-08dd56737748 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|366016|1800799024|10070799003; X-Microsoft-Antispam-Message-Info: fi80y7yOkK+1Ry5k1YQetMLdJpMcnqDBC7B7w7TPYDV/UDw346uoZHwNV/kEFEXeUYYOWwVn0mwf0r9Dh7i4IIMXx8xvqYSSAKSrVhxOPVQ0yKLhvkNc5q5RtuBVexyKg4oGoWR8HapgDLja1yymiza5S+k8UyMHuctCuIO904zg3bOKah6XLfSpqi/nWcFxCR+W7wF+5LEGwgSEOQu1c7KpCdbm3ITdAGrdXTYgXuKQtF4RB0fcH19CkQE0yPoirFrQ47bbu06yO96Aldc0W+FRnsVLhMwvaMheB/ZRav6yOJUZvU+tAGM5cgRlbpq17HsvAMrsAkQsCQFghl0m8NzmbwNfhD6KUpojQCNbZtaqcl5kAK0/I6n8lbT8y0s+fDreGdliJMiefCMS7J/FXj7BdB5+n1wRd+1xdL/XhiM72SfkVjbTT2mUpup5Iyp/8Z0sWZHsUGNE0mRhPOv1dV3hCcHejbidMEtmqf0E/eLDeiaIorDJTS51zQcfEQD5QsexTcDLbCyeAJp/24l2LOrA/EGUfJMpwy9YWf9Bjc75p5moDpRT3u8AolnDAzhZCXfCfa6XDo4H5AFSYh1sZUUiAvYvRUpFUJj64D2Q5kPC/D7ShpKvR06qYU9zzllGKweefbpnXZQSB8+/e2FU4tumw0wnca9GwU8bkPRCjSNQwlbqHZjLZEkSXHGBQj/fBH0CwN5cnwGF9nduOLzAjIVcU7fhzLDEsXxxNsbZzNOYTII0SV8jAcBPF61seqZLdu9uTnz8dtUS9V7r7HFzH/NQV/6BRx0QAl5LI4GRs/PpVvTvJvovme6gBRtu1KDpqH1LlzlBfsPnV76w2y6FUeHnVBJbX5OnJ6szFPihpej6ZXAUW6secwHQDozYkfujy3t34qDuXS3KlrvWENBEAHssz5leKE6cN3cPMXv12C/vYmEiFZ8rrtMWv+mrb3C1Ok3ivKJO5F1E0jWX65rMa1SvCG21n35+Hx89abMI1s7w13t5IO6GOrFOO6jHH5JUtusnkK7eJKuJ2RFfjCZIRkoHp6rq58O0khVT0L0RjPwufebJnBvyZIgwGpOKHyAHA/Thk5HZWpJTTUlp9yOwgMdep7VSJOdjUPgw5C8IUnSAZRIT+44cvu38XEJetyt8MRbYSAtfymexa+lD0xrG5xmA1yGb4VGoyHj/9VySoOd8FQwBc68XwxYKFBT8UEhD1NPOHWOMaaoS+HjdPbjKk6iWOSPGxih86spbwkK/I4nWIZNZ2NjwcBA+gHUD3xXaZJ4JMZ7hU+HQDiML0X0mMdopiY1mQB1eoeq4bP4FLINPS79DJaU3wFJ5q5BZRBRSciSpIMic3BMmnhBoZD0ZB49cSOWC0+X5MUI/yAtPMNGzF2drmrVz/RkslOhYMDj1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(366016)(1800799024)(10070799003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O+IXzHBRT4hRcHdBCs8pIEiTrUM9u4b2Kit9z96xveInH9um32mvzOiifKbSvYGliNQzzsXEvXLkPKqFdS7u9m6kwOmfpLMsq9gcu/eIowbCp1Ca0LkR5UwD7LQ+VUmQ4NgnY/6N6/QKRaOUHOH6inZzNX90TvhYP5lSqfTIlCAfJwnR+JG8sipKC4S8dncdWwZMAqnteGAuCzPjsQkbIarEKPNJVDZpXsLaEYwX+21tvxP8QW5IxKbjsuYq/zxaVLlR2lnKqJeOH5by9yig8FtcjtpWjGarUZk0GqzsdLQakUkDtohk6UqMFt89Hiy/TpvO78NZ6V7t+PvmQNop92zge0mq4usFEqwitzhL+OTy4Sme5HFcU3tBcgeSeWkhR5sKtddGEx1k1RGGp8eS86QoxiefAytCJVNZ7jGh1SdeqvXdV5vHH6OnGk7CEvmKWflmeVuqMXpVyR/IPUz4xEt8xvTZWDqc7dUrj2fJXbVdDIcNQrDRi+VIuU/w/Tum2gvpY9k0+XYyhDDnch0uRT5UYf/ojKFXPiQHyJwMu1OBTPjYKz/dfJ0DkWkOp7BXOA1+CKgWTckdytyfBekmAfbE+e8oQMsrl6zkMRSsB7o0GTZJ181AXdDduOMDmFK/ZaK7h+mYmxp27b40cKx3ahOIBUla3ZyokFekiEDlAty9EihrnWwTGdXKLgXXKhsRjp15U+HrlWtE/gGlzKMQ/iEdhgqXb3yROyFUQVPmiBR7FifPwEsXkuphRc8AsWJIWy/nyJS61cGY/HrlxJDT6+Hl6/OWQWyqdx5PTg33ipT+7Vl7LNUr4ikv5suFvoc+oPnko6F2f2FuKonN1+N91dgw3sXpOC5DJO4LxwyF96booYSu9LULPJpQPVbJjeTPzK3hzdS3dobOKuNYyKweG72W2l1xm8IybWPS5tmij7Kny2XHppVknbGNsETFsjkF4jRmC03Fqn1RyWToq6hZgBo8RQRFLjRCFl4pUlqpkSZ0LA0D00hBGfLGc/Swx95VMyNgaKgC3qooX/wC9XnCAE/VHvmfrkfQobwWfv1M3v8DYfvKnyjOsr80I5ksQLiMxuFVcP9CP1RZ3NI/AjFoSGsNRFTo8+FLEcyVAnVT8Wqwif71/LAATxX77tY96Tke2vxRBSz9qk1AwZYTvUPpdPwkdtFMm28aqPWVLTJmsUpUCZm3GyG7RXzBmFAvbfi9TCwcU/EC78T+Ss9jA3PnLHi+83a8QDIc82YX5NGwyJ0lv3/D7cWjPAZcxMLEfFNUqKwY4QUVAeyMegxo5fhaDoo/SX//P/fXTYcw88hmQVn+yy5GDwY+Lur3Z7++Y+HTU+OwN57PK1ywjfHYLGhsF7sBwJWOgezMyZNvKgAr+Ri9tzfLPXq/fPaf6cQiP/b08N6fwouF+IJ+5y9eskWi5iaageZpb3acfMIfLE4tOp8XHoshieLrOUhnpD3DP50yV87FI64E2ZrnUpoFRHvuU6mJ0G1f1ySOrcKqOxakF+TvXsIacp6HiENrijp6w2kvxAcK6PAz2fVsLfgOeVaNUbeGwGL7ofOj3OiK761XV8WivKEyzz3XMoq0kBy+BQD5a62sxniA1Hb0Dp/1rxwgWq8DoTEdcaHUL0qL4sB4PgCmYe0zSPCpbqxr1toPkT+xCHwwCT2p3M22zqku3IV0xA== X-OriginatorOrg: provenrun.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f2c3a0c-78a1-4206-cb8c-08dd56737748 X-MS-Exchange-CrossTenant-AuthSource: PAZP264MB2990.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 14:40:07.9919 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: ff654c30-3eb4-4445-b89f-a54a92b1f03d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MftX9qwR4jLeEZEiSMUjyO1lwYyX+L3fgld9cD2VlpZW4937itM87jXGfcB5t36VYi8rKL2hB7NwSeqKqFUGeLVDQdq/zJ3W/ClG3imjAnc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR0P264MB5513 Received-SPF: pass client-ip=2a01:111:f403:c20a::2; envelope-from=florian.lugou@provenrun.com; helo=PAUP264CU001.outbound.protection.outlook.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_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Support setting textra32.sselect or textra64.sselect to 1 (scontext). The trigger will only match if the content of scontext matches the value in svalue, after it is masked as configured in sbytemask. Signed-off-by: Florian Lugou --- target/riscv/debug.c | 75 +++++++++++++++++++++++++++++++------------- target/riscv/debug.h | 3 ++ 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/target/riscv/debug.c b/target/riscv/debug.c index 914a9ce0f8..ac9752d30e 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -219,8 +219,8 @@ static inline void warn_always_zero_bit(target_ulong val, target_ulong mask, static target_ulong textra_validate(CPURISCVState *env, target_ulong tdata3) { - target_ulong mhvalue, mhselect; - target_ulong mhselect_new; + target_ulong mhvalue, mhselect, sbytemask, svalue, sselect; + target_ulong mhselect_new, sselect_new; target_ulong textra; const uint32_t mhselect_no_rvh[8] = { 0, 0, 0, 0, 4, 4, 4, 4 }; @@ -228,25 +228,17 @@ static target_ulong textra_validate(CPURISCVState *env, target_ulong tdata3) case MXL_RV32: mhvalue = get_field(tdata3, TEXTRA32_MHVALUE); mhselect = get_field(tdata3, TEXTRA32_MHSELECT); - /* Validate unimplemented (always zero) bits */ - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA32_SBYTEMASK, - "sbytemask"); - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA32_SVALUE, - "svalue"); - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA32_SSELECT, - "sselect"); + sbytemask = get_field(tdata3, TEXTRA32_SBYTEMASK); + svalue = get_field(tdata3, TEXTRA32_SVALUE); + sselect = get_field(tdata3, TEXTRA32_SSELECT); break; case MXL_RV64: case MXL_RV128: mhvalue = get_field(tdata3, TEXTRA64_MHVALUE); mhselect = get_field(tdata3, TEXTRA64_MHSELECT); - /* Validate unimplemented (always zero) bits */ - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA64_SBYTEMASK, - "sbytemask"); - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA64_SVALUE, - "svalue"); - warn_always_zero_bit(tdata3, (target_ulong)TEXTRA64_SSELECT, - "sselect"); + sbytemask = get_field(tdata3, TEXTRA64_SBYTEMASK); + svalue = get_field(tdata3, TEXTRA64_SVALUE); + sselect = get_field(tdata3, TEXTRA64_SSELECT); break; default: g_assert_not_reached(); @@ -258,17 +250,34 @@ static target_ulong textra_validate(CPURISCVState *env, target_ulong tdata3) qemu_log_mask(LOG_UNIMP, "mhselect only supports 0 or 4 for now\n"); } + /* Validate sselect. */ + switch (sselect) { + case SSELECT_IGNORE: + case SSELECT_SCONTEXT: + sselect_new = sselect; + break; + default: + sselect_new = 0; + qemu_log_mask(LOG_UNIMP, "sselect only supports 0 or 1 for now\n"); + } + /* Write legal values into textra */ textra = 0; switch (riscv_cpu_mxl(env)) { case MXL_RV32: - textra = set_field(textra, TEXTRA32_MHVALUE, mhvalue); - textra = set_field(textra, TEXTRA32_MHSELECT, mhselect_new); + textra = set_field(textra, TEXTRA32_MHVALUE, mhvalue); + textra = set_field(textra, TEXTRA32_MHSELECT, mhselect_new); + textra = set_field(textra, TEXTRA32_SBYTEMASK, sbytemask); + textra = set_field(textra, TEXTRA32_SVALUE, svalue); + textra = set_field(textra, TEXTRA32_SSELECT, sselect_new); break; case MXL_RV64: case MXL_RV128: - textra = set_field(textra, TEXTRA64_MHVALUE, mhvalue); - textra = set_field(textra, TEXTRA64_MHSELECT, mhselect_new); + textra = set_field(textra, TEXTRA64_MHVALUE, mhvalue); + textra = set_field(textra, TEXTRA64_MHSELECT, mhselect_new); + textra = set_field(textra, TEXTRA64_SBYTEMASK, sbytemask); + textra = set_field(textra, TEXTRA64_SVALUE, svalue); + textra = set_field(textra, TEXTRA64_SSELECT, sselect_new); break; default: g_assert_not_reached(); @@ -368,7 +377,7 @@ static bool trigger_textra_match(CPURISCVState *env, trigger_type_t type, int trigger_index) { target_ulong textra = env->tdata3[trigger_index]; - target_ulong mhvalue, mhselect; + target_ulong mhvalue, mhselect, sbytemask, svalue, sselect; if (type < TRIGGER_TYPE_AD_MATCH || type > TRIGGER_TYPE_AD_MATCH6) { /* textra checking is only applicable when type is 2, 3, 4, 5, or 6 */ @@ -379,11 +388,17 @@ static bool trigger_textra_match(CPURISCVState *env, trigger_type_t type, case MXL_RV32: mhvalue = get_field(textra, TEXTRA32_MHVALUE); mhselect = get_field(textra, TEXTRA32_MHSELECT); + sbytemask = get_field(textra, TEXTRA32_SBYTEMASK); + svalue = get_field(textra, TEXTRA32_SVALUE); + sselect = get_field(textra, TEXTRA32_SSELECT); break; case MXL_RV64: case MXL_RV128: mhvalue = get_field(textra, TEXTRA64_MHVALUE); mhselect = get_field(textra, TEXTRA64_MHSELECT); + sbytemask = get_field(textra, TEXTRA64_SBYTEMASK); + svalue = get_field(textra, TEXTRA64_SVALUE); + sselect = get_field(textra, TEXTRA64_SSELECT); break; default: g_assert_not_reached(); @@ -403,6 +418,24 @@ static bool trigger_textra_match(CPURISCVState *env, trigger_type_t type, break; } + target_ulong svalue_mask = ((sbytemask & 1) * 0xFF) | + ((sbytemask & 2) * 0x7F80) | ((sbytemask & 4) * 0x3FC000) | + ((sbytemask & 8) * 0x1FE00000); + + /* Check svalue and sselect. */ + switch (sselect) { + case SSELECT_IGNORE: + break; + case SSELECT_SCONTEXT: + /* Match if the low bits of scontext equal svalue. */ + if ((svalue & svalue_mask) != (env->scontext & svalue_mask)) { + return false; + } + break; + default: + break; + } + return true; } diff --git a/target/riscv/debug.h b/target/riscv/debug.h index f76b8f944a..16b66441ca 100644 --- a/target/riscv/debug.h +++ b/target/riscv/debug.h @@ -134,6 +134,9 @@ enum { #define MHSELECT_IGNORE 0 #define MHSELECT_MCONTEXT 4 +#define SSELECT_IGNORE 0 +#define SSELECT_SCONTEXT 1 + bool tdata_available(CPURISCVState *env, int tdata_index); target_ulong tselect_csr_read(CPURISCVState *env);