From mboxrd@z Thu Jan 1 00:00:00 1970 From: Clément Léger Date: Thu, 18 Apr 2024 16:26:44 +0200 Subject: [RFC PATCH 5/7] riscv: add double trap driver In-Reply-To: <20240418142701.1493091-1-cleger@rivosinc.com> References: <20240418142701.1493091-1-cleger@rivosinc.com> Message-ID: <20240418142701.1493091-6-cleger@rivosinc.com> List-Id: To: kvm-riscv@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Add a small driver to request double trap enabling as well as registering a SSE handler for double trap. This will also be used by KVM SBI FWFT extension support to detect if it is possible to enable double trap in VS-mode. Signed-off-by: Cl?ment L?ger --- arch/riscv/include/asm/sbi.h | 1 + drivers/firmware/Kconfig | 7 +++ drivers/firmware/Makefile | 1 + drivers/firmware/riscv_dbltrp.c | 95 +++++++++++++++++++++++++++++++++ include/linux/riscv_dbltrp.h | 19 +++++++ 5 files changed, 123 insertions(+) create mode 100644 drivers/firmware/riscv_dbltrp.c create mode 100644 include/linux/riscv_dbltrp.h diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 744aa1796c92..9cd4ca66487c 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -314,6 +314,7 @@ enum sbi_sse_attr_id { #define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SPIE (1 << 2) #define SBI_SSE_EVENT_LOCAL_RAS 0x00000000 +#define SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP 0x00000001 #define SBI_SSE_EVENT_GLOBAL_RAS 0x00008000 #define SBI_SSE_EVENT_LOCAL_PMU 0x00010000 #define SBI_SSE_EVENT_LOCAL_SOFTWARE 0xffff0000 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 59f611288807..a037f6e89942 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -197,6 +197,13 @@ config RISCV_SSE_TEST Select if you want to enable SSE extension testing@boot time. This will run a series of test which verifies SSE sanity. +config RISCV_DBLTRP + bool "Enable Double trap handling" + depends on RISCV_SSE && RISCV_SBI + default n + help + Select if you want to enable SSE double trap handler. + config SYSFB bool select BOOT_VESA_SUPPORT diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index fb7b0c08c56d..ad67a1738c0f 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o obj-$(CONFIG_RISCV_SSE) += riscv_sse.o obj-$(CONFIG_RISCV_SSE_TEST) += riscv_sse_test.o +obj-$(CONFIG_RISCV_DBLTRP) += riscv_dbltrp.o obj-$(CONFIG_SYSFB) += sysfb.o obj-$(CONFIG_SYSFB_SIMPLEFB) += sysfb_simplefb.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/riscv_dbltrp.c b/drivers/firmware/riscv_dbltrp.c new file mode 100644 index 000000000000..72f9a067e87a --- /dev/null +++ b/drivers/firmware/riscv_dbltrp.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#define pr_fmt(fmt) "riscv-dbltrp: " fmt + +#include +#include +#include +#include + +#include + +static bool double_trap_enabled; + +static int riscv_sse_dbltrp_handle(uint32_t evt, void *arg, + struct pt_regs *regs) +{ + __show_regs(regs); + panic("Double trap !\n"); + + return 0; +} + +struct cpu_dbltrp_data { + int error; +}; + +static void +sbi_cpu_enable_double_trap(void *data) +{ + struct sbiret ret; + struct cpu_dbltrp_data *cdd = data; + + ret = sbi_ecall(SBI_EXT_FWFT, SBI_EXT_FWFT_SET, + SBI_FWFT_DOUBLE_TRAP_ENABLE, 1, 0, 0, 0, 0); + + if (ret.error) { + cdd->error = 1; + pr_err("Failed to enable double trap on cpu %d\n", smp_processor_id()); + } +} + +static int sbi_enable_double_trap(void) +{ + struct cpu_dbltrp_data cdd = {0}; + + on_each_cpu(sbi_cpu_enable_double_trap, &cdd, 1); + if (cdd.error) + return -1; + + double_trap_enabled = true; + + return 0; +} + +bool riscv_double_trap_enabled(void) +{ + return double_trap_enabled; +} +EXPORT_SYMBOL(riscv_double_trap_enabled); + +static int __init riscv_dbltrp(void) +{ + struct sse_event *evt; + + if (!riscv_has_extension_unlikely(RISCV_ISA_EXT_SSDBLTRP)) { + pr_err("Ssdbltrp extension not available\n"); + return 1; + } + + if (!sbi_probe_extension(SBI_EXT_FWFT)) { + pr_err("Can not enable double trap, SBI_EXT_FWFT is not available\n"); + return 1; + } + + if (sbi_enable_double_trap()) { + pr_err("Failed to enable double trap on all cpus\n"); + return 1; + } + + evt = sse_event_register(SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP, 0, + riscv_sse_dbltrp_handle, NULL); + if (IS_ERR(evt)) { + pr_err("SSE double trap register failed\n"); + return PTR_ERR(evt); + } + + sse_event_enable(evt); + pr_info("Double trap handling registered\n"); + + return 0; +} +device_initcall(riscv_dbltrp); diff --git a/include/linux/riscv_dbltrp.h b/include/linux/riscv_dbltrp.h new file mode 100644 index 000000000000..6de4f43fae6b --- /dev/null +++ b/include/linux/riscv_dbltrp.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#ifndef __LINUX_RISCV_DBLTRP_H +#define __LINUX_RISCV_DBLTRP_H + +#if defined(CONFIG_RISCV_DBLTRP) +bool riscv_double_trap_enabled(void); +#else + +static inline bool riscv_double_trap_enabled(void) +{ + return false; +} +#endif + +#endif /* __LINUX_RISCV_DBLTRP_H */ -- 2.43.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 639A8C4345F for ; Thu, 18 Apr 2024 15:32:01 +0000 (UTC) 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=tgiqXKcC034axXg50Y0HtV9wpRKSeAXfDLoVFgzR5n4=; b=xUbCoAKE3I/CkH 7OkgFhjLUQpr7qGewtAsamGnkKKaM6vFHVokQybc4Nh8yBlgLqx9JkXr6KDDmeImZivmn3TtLEnWS YRjz99WqKiac8aFXhuulKUz+a02JwszXYcLD7Et55OC4nZOVdln5tYHOoFllPotxVOf+cChu10RA5 hIgyoRRoMAL1dpAbcvYYDcEeKiCFeHwL4O2FWY4as3UBmxUmS+WaTFSQOC8QDXufugxlGhMV6Yxnn LAC478ridalAsQwG46HBNyG8DCPst4eY/KazwBheLJOElPypG7lRpDzgJbz8MJ1/faRM4wS1JrRyT gS7MT6BWs/dUSjyfbAfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxTjw-00000002o3a-1SqF; Thu, 18 Apr 2024 15:31:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSjR-00000002cYl-2C0r for linux-riscv@bombadil.infradead.org; Thu, 18 Apr 2024 14:27:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-Type :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=/AvdB3u3xfYtOVc85K9gr+w0O/Mfoyuz+qydkV22p5c=; b=Xu7sqDaQAsKGTZJkfnVNbExYa2 sCEhNogcE7RarBKb96cSoiT9kyG/SjbHGQnKR36NUEsbMfIUnmOK3pFMYmv1pfcPSOhF1B2MkZOTF whDZ41Z/T2njXnbPTnJYVjjPC26D2JM3tYYE7TDOtu1CHnwa47cIxvlHkwTIW2f0n38oJ0trCanCm XXHE+cdZMxid5EB5eUEJ9EV6yjaiqbnb3O0A3JBs+fUtcvNi7EUzodfoUWnznCOo6f7xUAEM6B7j4 yVFRVFUxwqc1v1ybAQOWc+J6wJf6AdS0GXHBlZ3wHRrSG4J8alWyBWb1+X2A9DfXJzpx3Z6N+kT/y QaXJ3iuw==; Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxSjN-0000000C2Pa-0NVd for linux-riscv@lists.infradead.org; Thu, 18 Apr 2024 14:27:19 +0000 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-346407b8c9aso257200f8f.0 for ; Thu, 18 Apr 2024 07:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1713450435; x=1714055235; 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=/AvdB3u3xfYtOVc85K9gr+w0O/Mfoyuz+qydkV22p5c=; b=PM/u6q1OdFkCQf1GXofsvfbkVOWm1kQ62dllCGZBAX+0rpD7iRejofC+vqE/Mk+EUs cgTEzo7TOnZDLGDmuT709BoNy2rcFWh3QOhMGROQY2Pt1aB6/b1QE1AG/wkV3vgYUpj7 y9URkYPQFwE7UOwWWVrX2k8chjUD3L7+0El9jhAMJuZTlM2P5+5UnUbcDSfm7/BUXypu HMtEcH3baPbXC13ZCtvrsPdqMyZyHHpKwTcSSQYYjQRiEiOvJVQ5mFwnbDUrZHjnti4B dkPSi77vlk9agW2TJpOO9y9KZ6vWyyWgYKpnQmdO0yHiL951gJoFRtYkjoUXkf+NQw7K RrNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713450435; x=1714055235; 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=/AvdB3u3xfYtOVc85K9gr+w0O/Mfoyuz+qydkV22p5c=; b=g7Fa7GuygYUzq4+2BOc88ME2eNuNsl7MU/QiSIvGd/ettehug2HNlSPZvxQgh13ZAJ 1LP5TzOdOlrPDs/O+x5/IHCB8iD02Krq12PVQAblWjBekYuu2tccDCWX1p1xVcJY6vKo jfaY3rOILmYoKiCj0gdUFhy+4PlFyTjfmOkaikPzdLb4Jsspz1Lr4z+++F2Sym1D3NsB aiJHG4e1+C5jXJtAKiNvghRaHC3JucUB5zkZ/McTV4BpCpOh0d70xjkluldO0vnCtWl5 G+cPxRRLxqy66irg2NZWkjAdbiHiwy7+GFmcFlUMhjFYxVtMOrkVaeqeARrbk+5y7c1Z oouw== X-Forwarded-Encrypted: i=1; AJvYcCXXhRxCBCCE24Tqq9f77C0UDYLTPhIyBKbqHPBGQQEziO5qfTVT96qqLYKIBjjYzS6IBTzZ81lLVjAsLWMfeEAosufQAHpd9HYDb6DNArLZ X-Gm-Message-State: AOJu0Yz/ETJz6YWqGg7cvVI4HeKfXxO9DcFIeZavLR411xB0n120Mkbd bRIAizdiWyhypDIEngM/12+49PMky9Yyp1VfEm0N5Q6JcOskYmXsiw8uMuU/wh2PIQ1MtkQFjTz 6haw= X-Google-Smtp-Source: AGHT+IEwlQ04KaJP3EVY+XCohGbQqha8fE09E68ZNltKaQxFJ4YDXOPGuVd4fVf/pEkQ78VT8bcTuA== X-Received: by 2002:a05:600c:35ca:b0:418:9941:ca28 with SMTP id r10-20020a05600c35ca00b004189941ca28mr2125666wmq.2.1713450435180; Thu, 18 Apr 2024 07:27:15 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:7b64:4d1d:16d8:e38b]) by smtp.gmail.com with ESMTPSA id v10-20020a05600c470a00b00418a386c059sm2873645wmo.42.2024.04.18.07.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 07:27:14 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Ved Shanbhogue Subject: [RFC PATCH 5/7] riscv: add double trap driver Date: Thu, 18 Apr 2024 16:26:44 +0200 Message-ID: <20240418142701.1493091-6-cleger@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240418142701.1493091-1-cleger@rivosinc.com> References: <20240418142701.1493091-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_152718_047130_63EA020F X-CRM114-Status: GOOD ( 18.99 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org QWRkIGEgc21hbGwgZHJpdmVyIHRvIHJlcXVlc3QgZG91YmxlIHRyYXAgZW5hYmxpbmcgYXMgd2Vs bCBhcwpyZWdpc3RlcmluZyBhIFNTRSBoYW5kbGVyIGZvciBkb3VibGUgdHJhcC4gVGhpcyB3aWxs IGFsc28gYmUgdXNlZCBieSBLVk0KU0JJIEZXRlQgZXh0ZW5zaW9uIHN1cHBvcnQgdG8gZGV0ZWN0 IGlmIGl0IGlzIHBvc3NpYmxlIHRvIGVuYWJsZSBkb3VibGUKdHJhcCBpbiBWUy1tb2RlLgoKU2ln bmVkLW9mZi1ieTogQ2zDqW1lbnQgTMOpZ2VyIDxjbGVnZXJAcml2b3NpbmMuY29tPgotLS0KIGFy Y2gvcmlzY3YvaW5jbHVkZS9hc20vc2JpLmggICAgfCAgMSArCiBkcml2ZXJzL2Zpcm13YXJlL0tj b25maWcgICAgICAgIHwgIDcgKysrCiBkcml2ZXJzL2Zpcm13YXJlL01ha2VmaWxlICAgICAgIHwg IDEgKwogZHJpdmVycy9maXJtd2FyZS9yaXNjdl9kYmx0cnAuYyB8IDk1ICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9saW51eC9yaXNjdl9kYmx0cnAuaCAgICB8IDE5 ICsrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgMTIzIGluc2VydGlvbnMoKykKIGNyZWF0ZSBtb2Rl IDEwMDY0NCBkcml2ZXJzL2Zpcm13YXJlL3Jpc2N2X2RibHRycC5jCiBjcmVhdGUgbW9kZSAxMDA2 NDQgaW5jbHVkZS9saW51eC9yaXNjdl9kYmx0cnAuaAoKZGlmZiAtLWdpdCBhL2FyY2gvcmlzY3Yv aW5jbHVkZS9hc20vc2JpLmggYi9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL3NiaS5oCmluZGV4IDc0 NGFhMTc5NmM5Mi4uOWNkNGNhNjY0ODdjIDEwMDY0NAotLS0gYS9hcmNoL3Jpc2N2L2luY2x1ZGUv YXNtL3NiaS5oCisrKyBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vc2JpLmgKQEAgLTMxNCw2ICsz MTQsNyBAQCBlbnVtIHNiaV9zc2VfYXR0cl9pZCB7CiAjZGVmaW5lIFNCSV9TU0VfQVRUUl9JTlRF UlJVUFRFRF9GTEFHU19TUElFCSgxIDw8IDIpCiAKICNkZWZpbmUgU0JJX1NTRV9FVkVOVF9MT0NB TF9SQVMJCTB4MDAwMDAwMDAKKyNkZWZpbmUgU0JJX1NTRV9FVkVOVF9MT0NBTF9ET1VCTEVfVFJB UAkweDAwMDAwMDAxCiAjZGVmaW5lIFNCSV9TU0VfRVZFTlRfR0xPQkFMX1JBUwkweDAwMDA4MDAw CiAjZGVmaW5lIFNCSV9TU0VfRVZFTlRfTE9DQUxfUE1VCQkweDAwMDEwMDAwCiAjZGVmaW5lIFNC SV9TU0VfRVZFTlRfTE9DQUxfU09GVFdBUkUJMHhmZmZmMDAwMApkaWZmIC0tZ2l0IGEvZHJpdmVy cy9maXJtd2FyZS9LY29uZmlnIGIvZHJpdmVycy9maXJtd2FyZS9LY29uZmlnCmluZGV4IDU5ZjYx MTI4ODgwNy4uYTAzN2Y2ZTg5OTQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2Zpcm13YXJlL0tjb25m aWcKKysrIGIvZHJpdmVycy9maXJtd2FyZS9LY29uZmlnCkBAIC0xOTcsNiArMTk3LDEzIEBAIGNv bmZpZyBSSVNDVl9TU0VfVEVTVAogCSAgU2VsZWN0IGlmIHlvdSB3YW50IHRvIGVuYWJsZSBTU0Ug ZXh0ZW5zaW9uIHRlc3RpbmcgYXQgYm9vdCB0aW1lLgogCSAgVGhpcyB3aWxsIHJ1biBhIHNlcmll cyBvZiB0ZXN0IHdoaWNoIHZlcmlmaWVzIFNTRSBzYW5pdHkuCiAKK2NvbmZpZyBSSVNDVl9EQkxU UlAKKwlib29sICJFbmFibGUgRG91YmxlIHRyYXAgaGFuZGxpbmciCisJZGVwZW5kcyBvbiBSSVND Vl9TU0UgJiYgUklTQ1ZfU0JJCisJZGVmYXVsdCBuCisJaGVscAorCSAgU2VsZWN0IGlmIHlvdSB3 YW50IHRvIGVuYWJsZSBTU0UgZG91YmxlIHRyYXAgaGFuZGxlci4KKwogY29uZmlnIFNZU0ZCCiAJ Ym9vbAogCXNlbGVjdCBCT09UX1ZFU0FfU1VQUE9SVApkaWZmIC0tZ2l0IGEvZHJpdmVycy9maXJt d2FyZS9NYWtlZmlsZSBiL2RyaXZlcnMvZmlybXdhcmUvTWFrZWZpbGUKaW5kZXggZmI3YjBjMDhj NTZkLi5hZDY3YTE3MzhjMGYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZmlybXdhcmUvTWFrZWZpbGUK KysrIGIvZHJpdmVycy9maXJtd2FyZS9NYWtlZmlsZQpAQCAtMTgsNiArMTgsNyBAQCBvYmotJChD T05GSUdfUkFTUEJFUlJZUElfRklSTVdBUkUpICs9IHJhc3BiZXJyeXBpLm8KIG9iai0kKENPTkZJ R19GV19DRkdfU1lTRlMpCSs9IHFlbXVfZndfY2ZnLm8KIG9iai0kKENPTkZJR19SSVNDVl9TU0Up CQkrPSByaXNjdl9zc2Uubwogb2JqLSQoQ09ORklHX1JJU0NWX1NTRV9URVNUKQkrPSByaXNjdl9z c2VfdGVzdC5vCitvYmotJChDT05GSUdfUklTQ1ZfREJMVFJQKQkrPSByaXNjdl9kYmx0cnAubwog b2JqLSQoQ09ORklHX1NZU0ZCKQkJKz0gc3lzZmIubwogb2JqLSQoQ09ORklHX1NZU0ZCX1NJTVBM RUZCKQkrPSBzeXNmYl9zaW1wbGVmYi5vCiBvYmotJChDT05GSUdfVElfU0NJX1BST1RPQ09MKQkr PSB0aV9zY2kubwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9maXJtd2FyZS9yaXNjdl9kYmx0cnAuYyBi L2RyaXZlcnMvZmlybXdhcmUvcmlzY3ZfZGJsdHJwLmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwLi43MmY5YTA2N2U4N2EKLS0tIC9kZXYvbnVsbAorKysgYi9kcml2ZXJz L2Zpcm13YXJlL3Jpc2N2X2RibHRycC5jCkBAIC0wLDAgKzEsOTUgQEAKKy8vIFNQRFgtTGljZW5z ZS1JZGVudGlmaWVyOiBHUEwtMi4wLW9ubHkKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMjMgUml2 b3MgSW5jLgorICovCisKKyNkZWZpbmUgcHJfZm10KGZtdCkgInJpc2N2LWRibHRycDogIiBmbXQK KworI2luY2x1ZGUgPGxpbnV4L2NwdS5oPgorI2luY2x1ZGUgPGxpbnV4L2luaXQuaD4KKyNpbmNs dWRlIDxsaW51eC9yaXNjdl9kYmx0cnAuaD4KKyNpbmNsdWRlIDxsaW51eC9yaXNjdl9zc2UuaD4K KworI2luY2x1ZGUgPGFzbS9zYmkuaD4KKworc3RhdGljIGJvb2wgZG91YmxlX3RyYXBfZW5hYmxl ZDsKKworc3RhdGljIGludCByaXNjdl9zc2VfZGJsdHJwX2hhbmRsZSh1aW50MzJfdCBldnQsIHZv aWQgKmFyZywKKwkJCQkgICBzdHJ1Y3QgcHRfcmVncyAqcmVncykKK3sKKwlfX3Nob3dfcmVncyhy ZWdzKTsKKwlwYW5pYygiRG91YmxlIHRyYXAgIVxuIik7CisKKwlyZXR1cm4gMDsKK30KKworc3Ry dWN0IGNwdV9kYmx0cnBfZGF0YSB7CisJaW50IGVycm9yOworfTsKKworc3RhdGljIHZvaWQKK3Ni aV9jcHVfZW5hYmxlX2RvdWJsZV90cmFwKHZvaWQgKmRhdGEpCit7CisJc3RydWN0IHNiaXJldCBy ZXQ7CisJc3RydWN0IGNwdV9kYmx0cnBfZGF0YSAqY2RkID0gZGF0YTsKKworCXJldCA9IHNiaV9l Y2FsbChTQklfRVhUX0ZXRlQsIFNCSV9FWFRfRldGVF9TRVQsCisJCQlTQklfRldGVF9ET1VCTEVf VFJBUF9FTkFCTEUsIDEsIDAsIDAsIDAsIDApOworCisJaWYgKHJldC5lcnJvcikgeworCQljZGQt PmVycm9yID0gMTsKKwkJcHJfZXJyKCJGYWlsZWQgdG8gZW5hYmxlIGRvdWJsZSB0cmFwIG9uIGNw dSAlZFxuIiwgc21wX3Byb2Nlc3Nvcl9pZCgpKTsKKwl9Cit9CisKK3N0YXRpYyBpbnQgc2JpX2Vu YWJsZV9kb3VibGVfdHJhcCh2b2lkKQoreworCXN0cnVjdCBjcHVfZGJsdHJwX2RhdGEgY2RkID0g ezB9OworCisJb25fZWFjaF9jcHUoc2JpX2NwdV9lbmFibGVfZG91YmxlX3RyYXAsICZjZGQsIDEp OworCWlmIChjZGQuZXJyb3IpCisJCXJldHVybiAtMTsKKworCWRvdWJsZV90cmFwX2VuYWJsZWQg PSB0cnVlOworCisJcmV0dXJuIDA7Cit9CisKK2Jvb2wgcmlzY3ZfZG91YmxlX3RyYXBfZW5hYmxl ZCh2b2lkKQoreworCXJldHVybiBkb3VibGVfdHJhcF9lbmFibGVkOworfQorRVhQT1JUX1NZTUJP TChyaXNjdl9kb3VibGVfdHJhcF9lbmFibGVkKTsKKworc3RhdGljIGludCBfX2luaXQgcmlzY3Zf ZGJsdHJwKHZvaWQpCit7CisJc3RydWN0IHNzZV9ldmVudCAqZXZ0OworCisJaWYgKCFyaXNjdl9o YXNfZXh0ZW5zaW9uX3VubGlrZWx5KFJJU0NWX0lTQV9FWFRfU1NEQkxUUlApKSB7CisJCXByX2Vy cigiU3NkYmx0cnAgZXh0ZW5zaW9uIG5vdCBhdmFpbGFibGVcbiIpOworCQlyZXR1cm4gMTsKKwl9 CisKKwlpZiAoIXNiaV9wcm9iZV9leHRlbnNpb24oU0JJX0VYVF9GV0ZUKSkgeworCQlwcl9lcnIo IkNhbiBub3QgZW5hYmxlIGRvdWJsZSB0cmFwLCBTQklfRVhUX0ZXRlQgaXMgbm90IGF2YWlsYWJs ZVxuIik7CisJCXJldHVybiAxOworCX0KKworCWlmIChzYmlfZW5hYmxlX2RvdWJsZV90cmFwKCkp IHsKKwkJcHJfZXJyKCJGYWlsZWQgdG8gZW5hYmxlIGRvdWJsZSB0cmFwIG9uIGFsbCBjcHVzXG4i KTsKKwkJcmV0dXJuIDE7CisJfQorCisJZXZ0ID0gc3NlX2V2ZW50X3JlZ2lzdGVyKFNCSV9TU0Vf RVZFTlRfTE9DQUxfRE9VQkxFX1RSQVAsIDAsCisJCQkJIHJpc2N2X3NzZV9kYmx0cnBfaGFuZGxl LCBOVUxMKTsKKwlpZiAoSVNfRVJSKGV2dCkpIHsKKwkJcHJfZXJyKCJTU0UgZG91YmxlIHRyYXAg cmVnaXN0ZXIgZmFpbGVkXG4iKTsKKwkJcmV0dXJuIFBUUl9FUlIoZXZ0KTsKKwl9CisKKwlzc2Vf ZXZlbnRfZW5hYmxlKGV2dCk7CisJcHJfaW5mbygiRG91YmxlIHRyYXAgaGFuZGxpbmcgcmVnaXN0 ZXJlZFxuIik7CisKKwlyZXR1cm4gMDsKK30KK2RldmljZV9pbml0Y2FsbChyaXNjdl9kYmx0cnAp OwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9yaXNjdl9kYmx0cnAuaCBiL2luY2x1ZGUvbGlu dXgvcmlzY3ZfZGJsdHJwLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw Li42ZGU0ZjQzZmFlNmIKLS0tIC9kZXYvbnVsbAorKysgYi9pbmNsdWRlL2xpbnV4L3Jpc2N2X2Ri bHRycC5oCkBAIC0wLDAgKzEsMTkgQEAKKy8qIFNQRFgtTGljZW5zZS1JZGVudGlmaWVyOiBHUEwt Mi4wICovCisvKgorICogQ29weXJpZ2h0IChDKSAyMDIzIFJpdm9zIEluYy4KKyAqLworCisjaWZu ZGVmIF9fTElOVVhfUklTQ1ZfREJMVFJQX0gKKyNkZWZpbmUgX19MSU5VWF9SSVNDVl9EQkxUUlBf SAorCisjaWYgZGVmaW5lZChDT05GSUdfUklTQ1ZfREJMVFJQKQorYm9vbCByaXNjdl9kb3VibGVf dHJhcF9lbmFibGVkKHZvaWQpOworI2Vsc2UKKworc3RhdGljIGlubGluZSBib29sIHJpc2N2X2Rv dWJsZV90cmFwX2VuYWJsZWQodm9pZCkKK3sKKwlyZXR1cm4gZmFsc2U7Cit9CisjZW5kaWYKKwor I2VuZGlmIC8qIF9fTElOVVhfUklTQ1ZfREJMVFJQX0ggKi8KLS0gCjIuNDMuMAoKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxp bmcgbGlzdApsaW51eC1yaXNjdkBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcmlzY3YK From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D60BF16C693 for ; Thu, 18 Apr 2024 14:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713450439; cv=none; b=aiwNKmyd9aJ3SkfK8rhou3d7xPxzNOYzPdNre8QIEERVD+dQPUCZ8+PwW0K/yHmqgyysZZvff+H34j2Z69u1Z5Z/TwCNvKtLNpbfm4WSvJBpDvjmaXlS88mWdA+24FNzpQBXio5GwiQl/mkNEs6d9kYdxio27mL/ASLZ4ZUjoH0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713450439; c=relaxed/simple; bh=kcoG6jiY9kWv2/uOQlFh79xxb7l93htaZIA0+tqUeuI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nh5CCoK4gskCC/nzc2fqAfZ4WiqeA4P2/z0pHQC5XV9szPISpfsP7s0zw/CdY4pqQf0aR8H4TLRRR4v5C4uHGoVWYb1r9oFI39HBcR+DioilifwPlDlksiiG4lTqtuxT3fkx9jseI9nmThZ+/HFB5++Ch6IDHrcj1pHj4n1wKLE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=vxzTKzzB; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="vxzTKzzB" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-349a33a9667so132749f8f.3 for ; Thu, 18 Apr 2024 07:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1713450435; x=1714055235; darn=vger.kernel.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=/AvdB3u3xfYtOVc85K9gr+w0O/Mfoyuz+qydkV22p5c=; b=vxzTKzzBJLSR4s1E3LLAE8ZNhOmy1jAWuFlqUwCD541Y06sB3wr6KamOju+8O05pH9 pfVTGYFnzsBispbgw5umkEXCj6GMGv/jDIDb2EWrNwrQ8jSgo154zuE1/14d9QTdTYnp tRXlOaxRBcpTQp67Z88JwBlitbv7C28Y0U4H0CjJDYY/YM5paHDXiO7BiYYdNox+a4sO 1Hyhz6T2C/0ghxHlMwISmlazGM3WQnGEe7U5W5wkeEq3HASHoAoBeq2OIOiqPxNVmjRU lf/AcSVRuCNIOzn0d6//0D9Jj9G6ij7lha0EvXiffBnDNDT9wlHw+18bgnl2xIMMFOzG X1WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713450435; x=1714055235; 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=/AvdB3u3xfYtOVc85K9gr+w0O/Mfoyuz+qydkV22p5c=; b=b06+c6UKpZjQ9PiVMxbnhTSB1Q2jg7RLJ595d1xeWRWTXyjD/cQR1SR+wfmknsL3VZ 6lbZxbY65bvZa0/JlieO0+gEh276UrTeIvgUV8nj95i1hNN+Si5egVIYTbDBKZaf15yn PcltJxK1fe8P7tTZO0ik4Atk7or/af+PSZYWrKTX4YWsos04LBCNRsDsE12dRG/+7kkZ dazFn1KFpD7z6yiBOhnH7QgZW4yMN7aPmqVbB8wrNaEbDU7RMym6wDLYEo4yOA5TmR+z lulthe7vZ10ZAinoE5u8xj0hxgydOHhC5SYo4nT/MM+tfMSRnOraiF1jb8008iN8SBp6 +pHg== X-Forwarded-Encrypted: i=1; AJvYcCVKssP97l74HOUEMG8HtMa8iBLn3L2528Mg/UlFjGCCAlZlBk4euU93S3GcXPr6446mXbkjjm18LLaZHbgVHrFiPIF0NL7UkeR6/A== X-Gm-Message-State: AOJu0YxhbbftVD5BDoQAZRGasUqm32MX7m+cClwpwdH/a9KNst6JF9Qz I5MLSL5jRu9VNL9LEvMQjuFgTLY+Fh33ifl3e8Y3LjHCV7O5Z4CjSqORswfDPXA= X-Google-Smtp-Source: AGHT+IEwlQ04KaJP3EVY+XCohGbQqha8fE09E68ZNltKaQxFJ4YDXOPGuVd4fVf/pEkQ78VT8bcTuA== X-Received: by 2002:a05:600c:35ca:b0:418:9941:ca28 with SMTP id r10-20020a05600c35ca00b004189941ca28mr2125666wmq.2.1713450435180; Thu, 18 Apr 2024 07:27:15 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:999:a3a0:7b64:4d1d:16d8:e38b]) by smtp.gmail.com with ESMTPSA id v10-20020a05600c470a00b00418a386c059sm2873645wmo.42.2024.04.18.07.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 07:27:14 -0700 (PDT) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Atish Patra Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, Ved Shanbhogue Subject: [RFC PATCH 5/7] riscv: add double trap driver Date: Thu, 18 Apr 2024 16:26:44 +0200 Message-ID: <20240418142701.1493091-6-cleger@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240418142701.1493091-1-cleger@rivosinc.com> References: <20240418142701.1493091-1-cleger@rivosinc.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a small driver to request double trap enabling as well as registering a SSE handler for double trap. This will also be used by KVM SBI FWFT extension support to detect if it is possible to enable double trap in VS-mode. Signed-off-by: Clément Léger --- arch/riscv/include/asm/sbi.h | 1 + drivers/firmware/Kconfig | 7 +++ drivers/firmware/Makefile | 1 + drivers/firmware/riscv_dbltrp.c | 95 +++++++++++++++++++++++++++++++++ include/linux/riscv_dbltrp.h | 19 +++++++ 5 files changed, 123 insertions(+) create mode 100644 drivers/firmware/riscv_dbltrp.c create mode 100644 include/linux/riscv_dbltrp.h diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 744aa1796c92..9cd4ca66487c 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -314,6 +314,7 @@ enum sbi_sse_attr_id { #define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SPIE (1 << 2) #define SBI_SSE_EVENT_LOCAL_RAS 0x00000000 +#define SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP 0x00000001 #define SBI_SSE_EVENT_GLOBAL_RAS 0x00008000 #define SBI_SSE_EVENT_LOCAL_PMU 0x00010000 #define SBI_SSE_EVENT_LOCAL_SOFTWARE 0xffff0000 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 59f611288807..a037f6e89942 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -197,6 +197,13 @@ config RISCV_SSE_TEST Select if you want to enable SSE extension testing at boot time. This will run a series of test which verifies SSE sanity. +config RISCV_DBLTRP + bool "Enable Double trap handling" + depends on RISCV_SSE && RISCV_SBI + default n + help + Select if you want to enable SSE double trap handler. + config SYSFB bool select BOOT_VESA_SUPPORT diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index fb7b0c08c56d..ad67a1738c0f 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o obj-$(CONFIG_FW_CFG_SYSFS) += qemu_fw_cfg.o obj-$(CONFIG_RISCV_SSE) += riscv_sse.o obj-$(CONFIG_RISCV_SSE_TEST) += riscv_sse_test.o +obj-$(CONFIG_RISCV_DBLTRP) += riscv_dbltrp.o obj-$(CONFIG_SYSFB) += sysfb.o obj-$(CONFIG_SYSFB_SIMPLEFB) += sysfb_simplefb.o obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o diff --git a/drivers/firmware/riscv_dbltrp.c b/drivers/firmware/riscv_dbltrp.c new file mode 100644 index 000000000000..72f9a067e87a --- /dev/null +++ b/drivers/firmware/riscv_dbltrp.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#define pr_fmt(fmt) "riscv-dbltrp: " fmt + +#include +#include +#include +#include + +#include + +static bool double_trap_enabled; + +static int riscv_sse_dbltrp_handle(uint32_t evt, void *arg, + struct pt_regs *regs) +{ + __show_regs(regs); + panic("Double trap !\n"); + + return 0; +} + +struct cpu_dbltrp_data { + int error; +}; + +static void +sbi_cpu_enable_double_trap(void *data) +{ + struct sbiret ret; + struct cpu_dbltrp_data *cdd = data; + + ret = sbi_ecall(SBI_EXT_FWFT, SBI_EXT_FWFT_SET, + SBI_FWFT_DOUBLE_TRAP_ENABLE, 1, 0, 0, 0, 0); + + if (ret.error) { + cdd->error = 1; + pr_err("Failed to enable double trap on cpu %d\n", smp_processor_id()); + } +} + +static int sbi_enable_double_trap(void) +{ + struct cpu_dbltrp_data cdd = {0}; + + on_each_cpu(sbi_cpu_enable_double_trap, &cdd, 1); + if (cdd.error) + return -1; + + double_trap_enabled = true; + + return 0; +} + +bool riscv_double_trap_enabled(void) +{ + return double_trap_enabled; +} +EXPORT_SYMBOL(riscv_double_trap_enabled); + +static int __init riscv_dbltrp(void) +{ + struct sse_event *evt; + + if (!riscv_has_extension_unlikely(RISCV_ISA_EXT_SSDBLTRP)) { + pr_err("Ssdbltrp extension not available\n"); + return 1; + } + + if (!sbi_probe_extension(SBI_EXT_FWFT)) { + pr_err("Can not enable double trap, SBI_EXT_FWFT is not available\n"); + return 1; + } + + if (sbi_enable_double_trap()) { + pr_err("Failed to enable double trap on all cpus\n"); + return 1; + } + + evt = sse_event_register(SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP, 0, + riscv_sse_dbltrp_handle, NULL); + if (IS_ERR(evt)) { + pr_err("SSE double trap register failed\n"); + return PTR_ERR(evt); + } + + sse_event_enable(evt); + pr_info("Double trap handling registered\n"); + + return 0; +} +device_initcall(riscv_dbltrp); diff --git a/include/linux/riscv_dbltrp.h b/include/linux/riscv_dbltrp.h new file mode 100644 index 000000000000..6de4f43fae6b --- /dev/null +++ b/include/linux/riscv_dbltrp.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Rivos Inc. + */ + +#ifndef __LINUX_RISCV_DBLTRP_H +#define __LINUX_RISCV_DBLTRP_H + +#if defined(CONFIG_RISCV_DBLTRP) +bool riscv_double_trap_enabled(void); +#else + +static inline bool riscv_double_trap_enabled(void) +{ + return false; +} +#endif + +#endif /* __LINUX_RISCV_DBLTRP_H */ -- 2.43.0