From patchwork Thu Apr 18 13:54:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 1925023 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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=p7tjafUD; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Mi/4yV9k; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VKzn23BDxz1yPv for ; Thu, 18 Apr 2024 23:55:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4p6jak43Z984fBSzGJw+4HLq2AVvo8LzYCFwjjD4eiE=; b=p7tjafUDkBprJp 9Bwz1Ss7XbqEdOVIv+bSYrRxoqZlvz02fgUmIjzEO23KZXaoVobWt5c+E5Os35rNFdua3OMFyh+mJ iDdjtpqaxZkqmunMLmywOuB0KEaIjv/dKGy2a26OGN233OA+5LcCkL58cHZuvARlHJ33t33fZRaRo cyDQz+scJ9uCGjmNU/zFYXpDAHhI5eS2oYsqwS9w0no7OQBMtk3MoIY13APoZuy1yONMYaZF3xDp+ mmD95cO4qPpDiJ6edmIwkoAGmp/xVubRFYhIBuRf5lYCm0nZaO0W9n/AwGQ41+67W21q2XeiHnVBa pA9oTxGFMCUUZDvLk3vw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSEI-00000002SQt-1Ows; Thu, 18 Apr 2024 13:55:10 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSEF-00000002SO3-1zYD for opensbi@lists.infradead.org; Thu, 18 Apr 2024 13:55:09 +0000 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-349a35aba9cso74494f8f.2 for ; Thu, 18 Apr 2024 06:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1713448504; x=1714053304; darn=lists.infradead.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=B1hQVQ10qVRS4HZ6dVC3tVBZEjZ3O6TKe1IWBi/2oX8=; b=Mi/4yV9kF4IpRJQqB2SYj/zTlmn/kYJMSq533JfgQGxy845Swin0nrrYq0uFC3tW5R vBklOD5YC35kzfYqu9QNwDlYkVhOh04Kw9fKVTcJEZBtwu9gc+wtuFzrn+EVyQxusMQN /35BSHxiGuL4vUs4gTeax0vzw1Qx4pdGzYA9rMKxO44asXdcHmDAYwKAoCA420xSKesd kSceflVYQVcBgaZXPzXIERseNySUzEBF2dSFOB/T7H/9iix4HdrqynBxURVUdMVjUfi/ T1drr8YEKk6uj0n4QYBey8/solFbHshUOEJOHRFD+GavCa3wO607t3BpLgHOPD+JkUrr DWsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713448504; x=1714053304; 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=B1hQVQ10qVRS4HZ6dVC3tVBZEjZ3O6TKe1IWBi/2oX8=; b=T9CY0KdjaLk6wtd8yeYAAeZal6yX5/dtejxRs3ZyJ4Eo16c0j0GznBh1TiejEQyTDq O+Esm33g8DNVUvQSbQENO6pZ7ZiE6h+SqI2bx/8/t+2bwpSPUVEvrz2lTbBD6RsN6KFi 6nCMvz2BL8DED5ZPUc3esB7bfn28EMDtov6Pu33cdQiMST+GUGKZWb+9ISuyRHxlvIwp IMbTjgZ3oWq26H22L4IHfiz1mpciy1bpaoFRdF2SBXCsq93gl9FEX6Zg/VT6gRZMWmgV kzNvu3pz+GwYYoeEb9bmpKZOkHWGXqfbHeg3StexbPSZCTDh5Ysbcd3fWfylhIEo1b6o MZEw== X-Gm-Message-State: AOJu0YwIwYFUNT10AV2zuQ27D23nhuSPjIT474L5Y8b/thUrrj0EdbTX U9xifjo9exuWgnLTM3yJMUK1KXgljy13OpJ32VOO+9T5EVcmRCLLo6irVg6034M0VTjw1bC+4Js Unb8= X-Google-Smtp-Source: AGHT+IFCoslnlsJZmvXh8G6Et8RdZNsrw1zjNAqsxUaegNBmuRPzoXiKNwrupRGEOmbr1vMh6E/iFg== X-Received: by 2002:adf:fa41:0:b0:346:500f:9297 with SMTP id y1-20020adffa41000000b00346500f9297mr2016881wrr.2.1713448504611; Thu, 18 Apr 2024 06:55:04 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:7b64:4d1d:16d8:e38b]) by smtp.gmail.com with ESMTPSA id n17-20020adfe791000000b00349be95b5cesm1875409wrm.101.2024.04.18.06.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 06:55:04 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: opensbi@lists.infradead.org, Atish Patra , Anup Patel Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Ved Shanbhogue Subject: [RFC PATCH 3/4] lib: sbi: implement SBI_FWFT_DOUBLE_TRAP_ENABLE Date: Thu, 18 Apr 2024 15:54:19 +0200 Message-ID: <20240418135421.1452709-4-cleger@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240418135421.1452709-1-cleger@rivosinc.com> References: <20240418135421.1452709-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_065507_743350_ED20ECFC X-CRM114-Status: GOOD ( 11.69 ) X-Spam-Score: 0.0 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__Add_support_for_double_trap_firmware_f?= =?unknown-8bit?q?eature_Signed-off-by=3A?= =?unknown-8bit?q?_Cl=C3=A9ment_L=C3=A9ger_=3Ccleger=40rivosinc=2Ecom=3E_---_?= =?unknown-8bit?q?lib/sbi/sbi=5Ffwft=2Ec_=7C_53_++++++++++++++++++++++++++++?= =?unknown-8bit?q?+++++++++++++++++-?= =?unknown-8bit?q?_1_file_changed=2C_52_insertions=28+=29=2C_1_deletion=28-?= =?unknown-8bit?q?=29_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E0_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily_valid?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C_no?= =?unknown-8bit?q?_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo0MjkgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add support for double trap firmware feature Signed-off-by: Clément Léger --- lib/sbi/sbi_fwft.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/lib/sbi/sbi_fwft.c b/lib/sbi/sbi_fwft.c index 78fbd45..965d47a 100644 --- a/lib/sbi/sbi_fwft.c +++ b/lib/sbi/sbi_fwft.c @@ -34,7 +34,7 @@ static unsigned long fwft_ptr_offset; #define MIS_DELEG (1UL << CAUSE_MISALIGNED_LOAD | 1UL << CAUSE_MISALIGNED_STORE) -#define SUPPORTED_FEATURE_COUNT 3 +#define SUPPORTED_FEATURE_COUNT 4 struct fwft_config; @@ -149,6 +149,51 @@ static int sbi_get_adue(struct fwft_config *conf, unsigned long *value) return SBI_OK; } +#if __riscv_xlen == 32 +# define CSR_MENVCFG_DBLTRP CSR_MENVCFGH +# define DBLTRP_DTE (ENVCFG_DTE >> 32) +#else +# define CSR_MENVCFG_DBLTRP CSR_MENVCFG +# define DBLTRP_DTE ENVCFG_DTE +#endif + +static int sbi_double_trap_supported(struct fwft_config *conf) +{ + if (!sbi_hart_has_extension(sbi_scratch_thishart_ptr(), + SBI_HART_EXT_SSDBLTRP)) + return SBI_ENOTSUPP; + + return SBI_OK; +} + +static int sbi_set_double_trap_enable(struct fwft_config *conf, + unsigned long value) +{ + struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); + + if (!sbi_hart_has_extension(scratch, SBI_HART_EXT_SSDBLTRP)) + return SBI_ENOTSUPP; + + if (value) + csr_set(CSR_MENVCFG_DBLTRP, DBLTRP_DTE); + else + csr_clear(CSR_MENVCFG_DBLTRP, DBLTRP_DTE); + + return SBI_SUCCESS; +} + +static int sbi_get_double_trap_enable(struct fwft_config *conf, + unsigned long *value) +{ + struct sbi_scratch *scratch = sbi_scratch_thishart_ptr(); + + if (!sbi_hart_has_extension(scratch, SBI_HART_EXT_SSDBLTRP)) + return SBI_ENOTSUPP; + + *value = (csr_read(CSR_MENVCFG_DBLTRP) & DBLTRP_DTE) != 0; + + return SBI_SUCCESS; +} static struct fwft_config* get_feature_config(enum sbi_fwft_feature_t feature) { @@ -223,6 +268,12 @@ static const struct fwft_feature features[] = .set = sbi_set_misaligned_delegation, .get = sbi_get_misaligned_delegation, }, + { + .id = SBI_FWFT_DOUBLE_TRAP, + .supported = sbi_double_trap_supported, + .set = sbi_set_double_trap_enable, + .get = sbi_get_double_trap_enable, + }, { .id = SBI_FWFT_USEED, .supported = sbi_useed_supported,