From nobody Tue Feb 10 20:30:46 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 4F17A3233EE for ; Thu, 23 Oct 2025 13:25:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761225948; cv=none; b=SPFihf/UW20ITvwvOaPmBFAdSI+FOevxvCPFG9wpPtdq8x1P75SLCZqsTs47u1ymTyhjCfXmMxBK8mDxRkEkB706XkK0Vjr0u11PzX5OWp3mGU1KuuF27+4vRh1fhUL3CGHb8i2CvlfL9UAuV4krTUZFy2YE5tz/t65pizqPTkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761225948; c=relaxed/simple; bh=kcKAh3qiYa6u+vavoC8VVP4XbgP0FdaLB3/LKiPnoo8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bJS3frBFGL1qsucHAYthDc+o00z+wpRF1iWqBE+QD1V+v+PPElfSlOc+m2uWoCNSQB8mSTtnAeWTIQp5q02kIL/70tYh+RGKc/aXSf+d10/TLVqELEjILAX7XD9lRYntLOlQ4DdxwqHHui0xygoDPuqf+NkI1lqY3h3qvLpzY9Y= 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=CPspoa+4; arc=none smtp.client-ip=209.85.210.171 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="CPspoa+4" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-782e93932ffso755330b3a.3 for ; Thu, 23 Oct 2025 06:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1761225946; x=1761830746; 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=CPspoa+4doX3K5jD++RQa01YuvEORL55KDFhzhXcBR1hibSN58febLpj0pGIc7No2g aYB6+JFbFfIWIAZ7seOn9OT5ruunfVMYDsUABSRSmCMiGVg/b//zFRgR/iRbUlVj9SJH HBr/2PB5SCuG4Uctx6FRvZjjyomquu6Q9+M4aXSvoacFShRnLjVvht15dkgTQQZ+mDQ6 +gffQcXzhGaFrqM9w3jDVgc3BpCMAjqYl2oapkXDNXRws5uj5S05Xqz9BQD2dsJXGQ1K yMmxGpqQ15MUv9SO/NaCQMoTCHeXf3dk9fmsFwGn436vcaZKCPSYnK9jPcCYmnAaKAcu RdsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761225946; x=1761830746; 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=qgZVHjQSPw3DOt0f+KGHJbKDi5/3SlBMUG250uVZy6rXBmujTNdZu0J/FyiFVjPuD2 uywzcp0uGOtv35ZbPblgIYYqKfNh8fwL6pmOljiyG+mKeTBsbjqik3QwPUvdPdYxVKT1 FsFYbRNSLSMZ5AtIO3Jju66ViCqq22BvQwo38GlYpKdKLzsAQZQIwlOdpfi5MlwFEkYH n1Dm6S6POwXxObSIc/YTAyaL0BucZ/9JLIOlgQkd/L0XOkJlUSlcr8uSE3jPnunUxpgv WNGQAgLWrxtLQdPd5E+wHczJCRIqwNBG0k8oU3udOVRti1Vyz0ABSAn+rdjjAs85sUmp +GbQ== X-Gm-Message-State: AOJu0Yx0QYVTbBto03M3XkCh3ddSCJxhjtplVWLf0reUirjFvvxzhKLa xkugotYz5IKJmZmTHvpwKuPp1g/fVaCBXpyGRmJ1CIC1rNL6XSw6upS8VcKRBkBonPA= X-Gm-Gg: ASbGncs6qw4Dcq3R4/lZrjw2cyCgSjcycRslcCfzHZIcWAEMqL6N+dHEFMbz1lYPs1W pjctIVidOZxpynHkx9bbOX6Acb6sg6oUYMUecX1IkbF5cf6hPDBvBvGBZy3qIrzeE4jfCB+ucVd 8JE/Avc6tvFocRK+p3pKCxpI+SqCRxL0h34zixYwsMFJZwH19tZ4fJ4Ew23yj+eExqvJEHDw0n3 2YXZWqo9wBsHjO/0cPf5H8Nvf/dLH9mKiud/EyDmfXmZUXstEUvS1K0Ei23075/jRay6O9WvXO9 f7fellDkJTLncNUxJscxchLEG1gkqUl4s4wXkGgwZ0DA+H4uo9s6jCnoLNwQ4unY5dpLp+PGgrI fl7REOeLBXQFQa44oAnH2KXvO50AbcWOxq3tPRwHAUOIlUTdmMYB063INwRN/21inQwlN86h/Sp 3LLOLVQ9xt6IPN3ZXyqrJG X-Google-Smtp-Source: AGHT+IEy3qLITcuChtDM79cXlP4i162rfKSR20rjSZYhE6w88AMJ5HcNN3dCkLwwo8KQPtiBjUNHgw== X-Received: by 2002:a17:902:e88e:b0:27e:f018:d312 with SMTP id d9443c01a7336-290c9cf350amr320485415ad.1.1761225945527; Thu, 23 Oct 2025 06:25:45 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2946e23e4b3sm23432035ad.103.2025.10.23.06.25.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Oct 2025 06:25:45 -0700 (PDT) From: Deepak Gupta Date: Thu, 23 Oct 2025 06:25:33 -0700 Subject: [PATCH v22 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: <20251023-v5_user_cfi_series-v22-4-1d53ce35d8fd@rivosinc.com> References: <20251023-v5_user_cfi_series-v22-0-1d53ce35d8fd@rivosinc.com> In-Reply-To: <20251023-v5_user_cfi_series-v22-0-1d53ce35d8fd@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