From nobody Sun Oct 5 18:21:50 2025 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 E6CD427F000 for ; Thu, 31 Jul 2025 23:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754003972; cv=none; b=FwK9aTjh3MRn6i6t7pgy9bJ1uYNi0/0zPrGDj5spr3WSwscovadryKNUxjkDpmSRmO5t+HXSpfbxb8Q0Ti3grByzCB/TUVGtlg9vB2MNxW+jHab8T4UAJIJq7WfmW2yA4/9pBuZYiq3SSDZgxSOV8Dp2So0hBbv9y9IW2xPTVjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754003972; c=relaxed/simple; bh=ynTUDLBp2gEKhFeiYfxgOCPe6wht1rOzpyg0Vu3jGXs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cUJt72dBWCxRQv+FMV0/jCsnGbSPjsdjwzu4yv16fsPWgPm8iy9xJ2nXpGrpFPJ1j0Mh4FhpoQhHnmZh7oa7hn6ztyR01MlPjQxxulxrNxQIw7CAFdJN3Z6zk2eOft5oUigut+mJd1kT5KItncN6tDh9qXvNUughbaKnDvi1t+w= 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=ufdpYXrj; arc=none smtp.client-ip=209.85.215.177 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="ufdpYXrj" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-b3f7404710aso1332189a12.0 for ; Thu, 31 Jul 2025 16:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1754003970; x=1754608770; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=ufdpYXrjZLKwKW/apeCKt5rRByAeEza9TLVHW5U5Wbn2PsimgKVCYLJtu2CZTgfIyV 3CwZ7oMKQOQhmrEScxWD/GJmMU8kQOTfeo19PERqhAUYz3pE2W2Rzj8Pg9Kb7j8QzLOD HbBFA0c1hGwoDAHwBhWsgv62ymThxRHen38iLgDrMP7B7LovfS7rS2u0Xft57M1DSJZq ijo57MDkm4GObXgrIv/nsK3MGDLLHBRMlyz0CPQa8bxH8Tu2mVKi9TOPijCIUNFZReNW 6Gj1r4JIz2PvzBXrYcqddgbJz/gEvDFjQ4tz28eLsq/rtXcWj0pFPPumICtq1ZaGJhX1 vl4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754003970; x=1754608770; 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=Ome3u7rmCNb01KyjL0hHySpySbFvJDab/QcqkVOgxo4=; b=WVz2B/xfdP6vk4TvWjRjsFU6OyojNhxVqP4GlvpL7Cr3mLxTdwNkSZ54jYKIpAUDrv fy/tFltECkaExUXnOj90lNaVD3UpbtvVXSDN7wsvIzm7SElx0ZoOsWVsvHeNeF/BORTT rwkvx2bXNxIPGl+SgLfWytz0yqj4IUIoqtbaLgg/pEzUXt0TtK8nyL+vorNqNfHPOYRs Q/Ipsksuj21cmlhpV8tCYDXXF+dmuqPlLSqdqNKmthtTAUGk/Ezu5Ug6bBMgJ34DdnTq gfNV2hEUnzOoUP77STVDmLz9xTUf2DJj5H5Fm5CqopCR0/J3aU56Xmx3/pNtqhHu4V5y LctA== X-Gm-Message-State: AOJu0Yz2AeOnfidOKqWAq5GWxdIquJBAZ996UGCUZY/jjAHGpkYDxyFS sgCc59og09uV69OhKG/hlNZ5ZOfHLN8gfJpSWVAQ87+XfaL5T61wN0mXlf95Y9IPZlY= X-Gm-Gg: ASbGncs6KLkllY0zrZ3qtVTYojJiPKf1N/TOEZ8eDKVgkXbgOqTg8O+jC6k2otFSgMw XWav/L2rtDL8Rn33vPQvTEMakaDBIYA/pSrYET1fHCZlQT/AKedTFh+rCv+PKCLhfoCzJoetvba y5i5SHCe6zZ5mRbFkNQH3oO/hHMdm3h+GfMGNwcl4ZydfBD8LYCWVjlpnq6ngukyEeb7kM2Iz37 1PRZ7AfWIe9a8F2Lv3q7kX5LEjv6Im/opQEo+d9gozdEukcZyX5x7ffOx9eeKr2yKxtH8DI7dux ampvwh7LOpNaKleiWMifWDjx2IC2DGS5UWa7lwTrpzOPW5LvJQ4jVH9Dy2TPi8NH5CCasBKnzjr vK/YD83dhBI+eR8DO6VhiN9/5kGYu1dno X-Google-Smtp-Source: AGHT+IEW/IYpi8/2d1JJvWg/cAIN1Y+XWLtRcPc5BAni0gcHSZT0OGnkDz3++3xD4dhcW2YSKWJWHA== X-Received: by 2002:a17:90a:d607:b0:31c:c434:dec8 with SMTP id 98e67ed59e1d1-31f5de4b8eamr12568167a91.20.1754003970168; Thu, 31 Jul 2025 16:19:30 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31f63da8fcfsm5773085a91.7.2025.07.31.16.19.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Jul 2025 16:19:29 -0700 (PDT) From: Deepak Gupta Date: Thu, 31 Jul 2025 16:19:14 -0700 Subject: [PATCH v19 04/27] 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: <20250731-v5_user_cfi_series-v19-4-09b468d7beab@rivosinc.com> References: <20250731-v5_user_cfi_series-v19-0-09b468d7beab@rivosinc.com> In-Reply-To: <20250731-v5_user_cfi_series-v19-0-09b468d7beab@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 6fed42e37705..2f49b9663640 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