From patchwork Tue Jul 4 14:09:21 2023 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: 115817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1256009vqx; Tue, 4 Jul 2023 07:18:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlG2hSlETXkLpwh95QkzqYS/WOyHGrUdvSN5YXcaUCjI7A45MMcv4rHnovXhaCdSoIK6Sfqi X-Received: by 2002:a92:d2c8:0:b0:345:af82:dc3a with SMTP id w8-20020a92d2c8000000b00345af82dc3amr13603895ilg.14.1688480310184; Tue, 04 Jul 2023 07:18:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688480310; cv=none; d=google.com; s=arc-20160816; b=vhOQi3G+T0aIlC86bY3LZQ7A3zRMeKy0MjH/p+WokPQbd5kAo7Jx8wwPCtrpb++xv1 S4lMFu/xaxNUQ5suplvCvCyiRvwnFQmrW/W0llVnndNHHfAjBpnfSW2D5/6vwEqlbRh+ f8lDe56wqXTNppuq1HNUKEi12i8eFbhQgVbUx4isdLJ19EWNyOqDdo3i+R4A+K9Ue40l rT5QHigPl3lRKSlc5K/jBuNgEK4ons88Ap/G8EGwfOWrHgrUHUMkDoS2IJHgwa+OJKKx b2XWJPCAh8u3D0cbk+lUbYSTE+5fsr1GUZFIuRt6OzeQk6Kdd2vIz/U96DF0sdebj9CW vubQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Pj3KtNcskxGwBQpyjif+BbQZv3sqa1IZuxdbRGC5RTE=; fh=9wrou+MQEPZGr1Z6SaqMAXmpjnaJyNXl4Ao+MUOh3Is=; b=mCDesu/2CUFhKXH8grFtn/dnGMSBJ9uirfuQA7zovwLIibBWFiiXVKwKGfH+9Lmihc D855+Udyj/88QgdsWL41KQReybS6MWfHAlmvf8ZQ8jTpTaQRaJta4h5wV0rC+Tiiqijd U8XPd3HVU3py6xMSfgcZP2GYHKPNmk/A2BB/KMJ7k1nujedSJXCKXeoTAnNp4Fbcp8W/ 79yDT7e0/xw5ZverODeERT9KllJSGAHpVzXVUwsy9xVIdiy9rSMqK/YocCx+gZoWbHt6 WDOdfYJc2c36KMxckuZldMrc4uy5ltSgJZJCpx6dY3e9ZBDUeLxGEwwZRMXt3vbvvNow 6BxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=JshnIAR8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r7-20020a655087000000b005538ee20ecbsi20395017pgp.355.2023.07.04.07.18.15; Tue, 04 Jul 2023 07:18:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=JshnIAR8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231557AbjGDOLp (ORCPT + 99 others); Tue, 4 Jul 2023 10:11:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231160AbjGDOLi (ORCPT ); Tue, 4 Jul 2023 10:11:38 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E0AD10E9 for ; Tue, 4 Jul 2023 07:11:32 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-55b741fd0c5so321374a12.0 for ; Tue, 04 Jul 2023 07:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1688479891; x=1691071891; 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=Pj3KtNcskxGwBQpyjif+BbQZv3sqa1IZuxdbRGC5RTE=; b=JshnIAR8bl71rt3AS3UvaRseV7AvmKEBxHoNNg0/9Qhh8a1yTEPcGhFhTWqHfZeDXO zz5qgL/izraxd+lACmXYz5/XoieedX/a96bKFLIFs+C9JCUM+kgTJy45aunBrt8pI7wp s2BOdmMUUuGkOrDbLfk8RLtcHx6lF3lCNtAp600HpbSgFjPv+cyrTalGob0f6f5gBzut qlBTrFkFe3yTSMx8qWX2NoLmGuh7C0/5BcgvzluimZLJDauzVr1FdM725FboXPc4Q15I GLG4o+IDY/QgjFlIxKEesbCulbASs1+ri51nrsgg622pfAUSMMSHkrlr31t5c+jywUVM NmaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688479891; x=1691071891; 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=Pj3KtNcskxGwBQpyjif+BbQZv3sqa1IZuxdbRGC5RTE=; b=KQ6cm0gSd7suE07OX/EFnGP1LNbp9+N+AdKD1blR3OmaSBMm8YY67bwpD44QaTTCvU +iXbqhVEeZdaMHa1TGWQwNQ0LwagfzxPk1GZb/c/TGDiiv5FlHGQ5rPk03DsCuD31720 HgTeuzlyQ4p7Do6UnmoaJX4tDi1xNhuxXBJi7+yFoeB1tmO3LLmS1NqlEtpyrR2EWb5N BfBOFqgrGiJpx7ru4QMUwmxkd8HJtoO67DTAk6/9oR3XmKfGzlHAERFpip41c4bLPZLc Z6ak8C1SLG6X9zQK/nF9x3JDdVB3rQv1M2XkKAANYTavpVDM2fCwLcL1DUIdgdeu9np/ ZHjg== X-Gm-Message-State: ABy/qLaaphwVuzOYC7Fw6Rp81wr5CCSLHkWjhMSnjw8rDjaU5At26BqF 3nqHcb2noNCpOxjysnpdNlMLvQ== X-Received: by 2002:a17:902:e5c5:b0:1b8:17e8:5472 with SMTP id u5-20020a170902e5c500b001b817e85472mr13650058plf.1.1688479891435; Tue, 04 Jul 2023 07:11:31 -0700 (PDT) Received: from carbon-x1.home ([2a01:cb15:81c2:f100:ef7b:e0f7:d376:e859]) by smtp.gmail.com with ESMTPSA id o1-20020a170902bcc100b001b042c0939fsm17183735pls.99.2023.07.04.07.11.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jul 2023 07:11:31 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Stafford Horne , Brian Cain , Kefeng Wang , "Russell King (Oracle)" , Michael Ellerman , Sunil V L , Anup Patel , Atish Patra , Andrew Jones , Conor Dooley , Heiko Stuebner , Guo Ren , Alexandre Ghiti , Masahiro Yamada , Xianting Tian , Sia Jee Heng , Li Zhengyu , Jisheng Zhang , "Gautham R. Shenoy" , Mark Rutland , Peter Zijlstra , Marc Zyngier , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Krzysztof Kozlowski , Evan Green , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [RFC V2 PATCH 6/9] riscv: add support for SBI misalignment trap delegation Date: Tue, 4 Jul 2023 16:09:21 +0200 Message-Id: <20230704140924.315594-7-cleger@rivosinc.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230704140924.315594-1-cleger@rivosinc.com> References: <20230704140924.315594-1-cleger@rivosinc.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770499929393858335?= X-GMAIL-MSGID: =?utf-8?q?1770499929393858335?= Add support for misalignment trap delegation by setting it with SBI_EXT_FW_FEATURE SBI extension. This extension allows to control SBI behavior by requesting to set them to specific value. In order to implement prctl(PR_SET_UNALIGN, PR_UNALIGN_SIGBUS) behavior properly, we need to let the kernel handle the misalignment error by itself. Signed-off-by: Clément Léger --- arch/riscv/include/asm/sbi.h | 11 +++++++++++ arch/riscv/kernel/sbi.c | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/arch/riscv/include/asm/sbi.h b/arch/riscv/include/asm/sbi.h index 5b4a1bf5f439..c1b74c7d0d56 100644 --- a/arch/riscv/include/asm/sbi.h +++ b/arch/riscv/include/asm/sbi.h @@ -30,6 +30,7 @@ enum sbi_ext_id { SBI_EXT_HSM = 0x48534D, SBI_EXT_SRST = 0x53525354, SBI_EXT_PMU = 0x504D55, + SBI_EXT_FW_FEATURE = 0x46574654, /* Experimentals extensions must lie within this range */ SBI_EXT_EXPERIMENTAL_START = 0x08000000, @@ -236,6 +237,16 @@ enum sbi_pmu_ctr_type { /* Flags defined for counter stop function */ #define SBI_PMU_STOP_FLAG_RESET (1 << 0) +/* SBI function IDs for FW feature extension */ +#define SBI_EXT_FW_FEATURE_SET 0x0 +#define SBI_EXT_FW_FEATURE_GET 0x1 + +enum sbi_fw_features_t { + SBI_FW_FEATURE_MISALIGNED_DELEG = 0, + + SBI_FW_FEATURE_MAX, +}; + #define SBI_SPEC_VERSION_DEFAULT 0x1 #define SBI_SPEC_VERSION_MAJOR_SHIFT 24 #define SBI_SPEC_VERSION_MAJOR_MASK 0x7f diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index c672c8ba9a2a..3be48791455a 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -494,6 +494,16 @@ int sbi_remote_hfence_vvma_asid(const struct cpumask *cpu_mask, } EXPORT_SYMBOL(sbi_remote_hfence_vvma_asid); +static int sbi_fw_feature_set(enum sbi_fw_features_t feature, bool set) +{ + struct sbiret ret; + + ret = sbi_ecall(SBI_EXT_FW_FEATURE, SBI_EXT_FW_FEATURE_SET, feature, + set, 0, 0, 0, 0); + + return sbi_err_map_linux_errno(ret.error); +} + static void sbi_srst_reset(unsigned long type, unsigned long reason) { sbi_ecall(SBI_EXT_SRST, SBI_EXT_SRST_RESET, type, reason, @@ -624,6 +634,17 @@ void __init sbi_init(void) sbi_srst_reboot_nb.priority = 192; register_restart_handler(&sbi_srst_reboot_nb); } + /* + * TODO: this will likely need to be updated when SBI extension + * is ratified + */ + if ((sbi_spec_version >= sbi_mk_version(1, 0)) && + (sbi_probe_extension(SBI_EXT_FW_FEATURE) > 0)) { + pr_info("SBI FW_FEATURE extension detected\n"); + /* Request misaligned handling delegation */ + sbi_fw_feature_set(SBI_FW_FEATURE_MISALIGNED_DELEG, + true); + } } else { __sbi_set_timer = __sbi_set_timer_v01; __sbi_send_ipi = __sbi_send_ipi_v01;