From nobody Fri Dec 19 19:04:54 2025 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 AD9872FDC50 for ; Mon, 13 Oct 2025 21:56:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760392569; cv=none; b=ukPY6RnmHScv07alw/UyEa5z5nQigyAvIn6Irvsox9qZYf5+BFZ7WFMM4EkSaFZjJ+VvxyOZ3EPxCO1eHAqaAgCRCKm3DjGouSxOelAlaxWXNdXIKILd6uQMwAEqdFlxLxVedG3fI3JEEvkO53tR9FHbpz84yB8MljbE9V47mtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760392569; c=relaxed/simple; bh=kcKAh3qiYa6u+vavoC8VVP4XbgP0FdaLB3/LKiPnoo8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ds9Di0o5f/VWGbxxAnqMrSMFAyKgWHvD784dgxWaA8ZOUuxGeVMxe3CGwymAOZ30kUgwCvV9fvaZ6FaRC6D8j2GUl8bT0oESkGf8JMaShKkv5gYOxeHaK3hcTJDE+/jlic+sfWWMKwqBdhivxBUf+M2yyKYzvWpk2wKhmHVZXto= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc.com header.i=@rivosinc.com header.b=M7S3UxZe; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (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 header.i=@rivosinc.com header.b="M7S3UxZe" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-339c9bf3492so6023359a91.2 for ; Mon, 13 Oct 2025 14:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1760392567; x=1760997367; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=VM5DlrQCbRYqN6WQC0IO67CheqmNFMHVu1qXR64a+aw=; b=M7S3UxZe7hFGWfgNneqeQQbb09etUMsP1GAKYhIvdzV//Rof733krKGwOVdZsmTtd2 g47wnUVzp4sPaERd4Gy6Y/ysVsWK0fJnVPlNoJn+c7zZ01LaM+EzF//1x7ZwS+cvwu6q OSKOg0oNEtqeVzrpTtb9n+v55GNxnadvdD6SJbJmrez2jfIGDuIrx44KliexoFulHIcP ycVfDnoARZqtY2lCpxmx/HB5+1SXtPsfXX5DCghuZXTTtT+ZvIhTtXhl0VpSp5Sbd7Ct 38TTPTalT614s08JMJC6AVYdYfBPHrBJe+tKG93X3BwLkbHXZJG+2QOQE5QP/hvme/Y2 dmPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760392567; x=1760997367; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VM5DlrQCbRYqN6WQC0IO67CheqmNFMHVu1qXR64a+aw=; b=GQy9YPmc2S+psZyMiRO6GIlGWp2B2Yvj8j7UnT/hD26zBwppmi+r2EB+qsLJRX+oSv rcerZEGUOCvA8+Sr392jr5NT7gQ56jqzb2dKiDVFEJmoY9ahz+Gzi7GKHRbcaM7xQIta /GOej6crcdnuCEs58n+6HkohuxvasBSC+wGScsu56wifV7WaHT6EYYVMfmbaBM9D7b0v EDaqwPlL/pBk7/TKIvz72yowXvAvsmYFzyD4f2gLHK1rjI0WHYQKAHuKYQ1pi1i8xb3w c58oegQPNm9KZVIl6b6PSiqlPXsFUCiF8FrTzJTvtVW9jyazoHZIgkVidu3nJ+pFUBvE 8Pyg== X-Gm-Message-State: AOJu0YxHB/kzxaMp1F2VeO8VcaV+eMtiZ8+WBLanbhImsbmBmPkGzyUH Al6qQntM2em+ufVZzgEIWczDbeR1veGkDn8jzuRxfCBs4PA7gef3ccMrlDawOyMDtg4= X-Gm-Gg: ASbGncuX5Hs1fM3a7uEj1qcP54/IvUyq4L9lR3IFbx5lozWLFBoVNHMHKNtvLCXl5Jh YD/81dWiCqLOMkgV9jP6sHg6J2Lq3z9s5tst4t/W/re20UJ+khWMeuaJFWW9V/XLXgy/Wd/rIkR Efsn2DcYki/N1svZO6ZEMyfm45+/rBlYUEH1PgYI7atb2nd+fVE2dTRunLtA0qMgqhblMXqNgzd TQcGsNDrjmWBbPxPTfnMa0Tz7/9WeGDdNXCRn31PgfeaNfuWxZs8lQ9axzltVAD0deb6NAaN3Pf 6aF0SZbUOQJazWBvf6Oq5FL8hdSR1g5x5a81Bhd40OtjkFWrvzTPu4ZkK0qU+St2T9sC3mDR2z0 bjzZ7lCW7bhqr2DacSlTPClCeH2dvmWChjaYrS4SUdJ/8qRbFJAg= X-Google-Smtp-Source: AGHT+IEk8C0wXtpiaSerIOmMVJ34V19j3qCgt/dP0k/QOvSZF8SGdHByWOIwcunMLrrPAiMMdWB6bA== X-Received: by 2002:a17:90b:1d85:b0:32b:623d:ee91 with SMTP id 98e67ed59e1d1-33b5138623dmr30507133a91.27.1760392566692; Mon, 13 Oct 2025 14:56:06 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33b626bb49esm13143212a91.12.2025.10.13.14.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Oct 2025 14:56:06 -0700 (PDT) From: Deepak Gupta Date: Mon, 13 Oct 2025 14:55:56 -0700 Subject: [PATCH v20 04/28] riscv: zicfiss / zicfilp extension csr and bit definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251013-v5_user_cfi_series-v20-4-b9de4be9912e@rivosinc.com> References: <20251013-v5_user_cfi_series-v20-0-b9de4be9912e@rivosinc.com> In-Reply-To: <20251013-v5_user_cfi_series-v20-0-b9de4be9912e@rivosinc.com> To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andrew Morton , "Liam R. Howlett" , Vlastimil Babka , Lorenzo Stoakes , Paul Walmsley , Palmer Dabbelt , Albert Ou , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Arnd Bergmann , Christian Brauner , Peter Zijlstra , Oleg Nesterov , Eric Biederman , Kees Cook , Jonathan Corbet , Shuah Khan , Jann Horn , Conor Dooley , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Benno Lossin Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, alistair.francis@wdc.com, richard.henderson@linaro.org, jim.shu@sifive.com, andybnac@gmail.com, kito.cheng@sifive.com, charlie@rivosinc.com, atishp@rivosinc.com, evan@rivosinc.com, cleger@rivosinc.com, alexghiti@rivosinc.com, samitolvanen@google.com, broonie@kernel.org, rick.p.edgecombe@intel.com, rust-for-linux@vger.kernel.org, Deepak Gupta X-Mailer: b4 0.13.0 zicfiss and zicfilp extension gets enabled via b3 and b2 in *envcfg CSR. menvcfg controls enabling for S/HS mode. henvcfg control enabling for VS while senvcfg controls enabling for U/VU mode. zicfilp extension extends *status CSR to hold `expected landing pad` bit. A trap or interrupt can occur between an indirect jmp/call and target instr. `expected landing pad` bit from CPU is recorded into xstatus CSR so that when supervisor performs xret, `expected landing pad` state of CPU can be restored. zicfiss adds one new CSR - CSR_SSP: CSR_SSP contains current shadow stack pointer. Signed-off-by: Deepak Gupta Reviewed-by: Charlie Jenkins --- arch/riscv/include/asm/csr.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 4a37a98398ad..78f573ab4c53 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -18,6 +18,15 @@ #define SR_MPP _AC(0x00001800, UL) /* Previously Machine */ #define SR_SUM _AC(0x00040000, UL) /* Supervisor User Memory Access */ =20 +/* zicfilp landing pad status bit */ +#define SR_SPELP _AC(0x00800000, UL) +#define SR_MPELP _AC(0x020000000000, UL) +#ifdef CONFIG_RISCV_M_MODE +#define SR_ELP SR_MPELP +#else +#define SR_ELP SR_SPELP +#endif + #define SR_FS _AC(0x00006000, UL) /* Floating-point Status */ #define SR_FS_OFF _AC(0x00000000, UL) #define SR_FS_INITIAL _AC(0x00002000, UL) @@ -212,6 +221,8 @@ #define ENVCFG_PMM_PMLEN_16 (_AC(0x3, ULL) << 32) #define ENVCFG_CBZE (_AC(1, UL) << 7) #define ENVCFG_CBCFE (_AC(1, UL) << 6) +#define ENVCFG_LPE (_AC(1, UL) << 2) +#define ENVCFG_SSE (_AC(1, UL) << 3) #define ENVCFG_CBIE_SHIFT 4 #define ENVCFG_CBIE (_AC(0x3, UL) << ENVCFG_CBIE_SHIFT) #define ENVCFG_CBIE_ILL _AC(0x0, UL) @@ -230,6 +241,11 @@ #define SMSTATEEN0_HSENVCFG (_ULL(1) << SMSTATEEN0_HSENVCFG_SHIFT) #define SMSTATEEN0_SSTATEEN0_SHIFT 63 #define SMSTATEEN0_SSTATEEN0 (_ULL(1) << SMSTATEEN0_SSTATEEN0_SHIFT) +/* + * zicfiss user mode csr + * CSR_SSP holds current shadow stack pointer. + */ +#define CSR_SSP 0x011 =20 /* mseccfg bits */ #define MSECCFG_PMM ENVCFG_PMM --=20 2.43.0