From patchwork Wed Apr 3 23:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 13616770 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34707CD129D for ; Wed, 3 Apr 2024 23:41:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3B3A6B00A3; Wed, 3 Apr 2024 19:41:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AE1EF6B00A4; Wed, 3 Apr 2024 19:41:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82D926B00A5; Wed, 3 Apr 2024 19:41:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5D5126B00A3 for ; Wed, 3 Apr 2024 19:41:49 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 21828140141 for ; Wed, 3 Apr 2024 23:41:49 +0000 (UTC) X-FDA: 81969845538.21.C0E35F7 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf09.hostedemail.com (Postfix) with ESMTP id 3EBEF14002A for ; Wed, 3 Apr 2024 23:41:47 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="WZV/FL4J"; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712187707; a=rsa-sha256; cv=none; b=ogRLlsGMeN3T2O2Yk6Z389Se+VZ5S07nUZ5ge/mKI6qpD7hU/GUIn0BK58twjDUW6YqTjT Ii1ZPgYLVDrNI4pAJ7O7ut3z1IsWtHznZHdzp40vTQTSv9zItRyz2pM7rllC1jBDVt17yY FN6DuZOsg1pvvINd/fcsGJKxrwZisus= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b="WZV/FL4J"; spf=pass (imf09.hostedemail.com: domain of debug@rivosinc.com designates 209.85.214.177 as permitted sender) smtp.mailfrom=debug@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712187707; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0eUDSnaDyxqGg81dPEndGGDTB0RLZ2EAet5NZFMb2JI=; b=quDzDWilVnAvsn9PGcZ7labx2xblKMfNW8qTk5dF2OVBoDB6pGP1pacaZEtgE0gP/IIb/Y DmdAs3lO30hhH5b+xBTyMAjlj6+yK2+2m14YxZEvcwM73LXpsD4AcUfKZ7B8TPJdlbYd+x 1PXrsov+I6mXpXoe87S0nv0wy1YRxJI= Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1e2987e9d67so2184735ad.1 for ; Wed, 03 Apr 2024 16:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1712187706; x=1712792506; darn=kvack.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=0eUDSnaDyxqGg81dPEndGGDTB0RLZ2EAet5NZFMb2JI=; b=WZV/FL4J2XunfXkRIMK+GjS004pTRZpT7a/V2hUlj98fUcWvxmE4FCHSAj/2n8v319 aOocLfSJgGIT0yfa+HpLBGv2PV79846Nftq8nvLGLiwiZ88xvsSTIXGdugqDb4RjfNIC V4YbmvTK4Lk6BrVZmkPGpPI0/yEJXH8Mj9xL+ZetWQb0UQXRjFRDBx86WoqDqm5TSUSp f5Y0nJK0bLu5fUDy+1JZusgzAyz7qDTRWEPQD0BGXFTAeV9+r5uIUZi7/MBBa8aM9fK0 42KrAe9mh8ns8TMWhCn/qg1IaPxtvJ68Fr+01So6WiNPaYojGltcH8hU13Y/zQC94hqX E+1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712187706; x=1712792506; 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=0eUDSnaDyxqGg81dPEndGGDTB0RLZ2EAet5NZFMb2JI=; b=nUfzo8fjrFxLiOamCqQiKTTIZG/XLlb7dgyjFK3RAT9L1Dl8W0lBVh5ddNEoHjdEfa X/x6hjCHs7EWH3VKrgFJbI2kpXeSJyhDa1vp4Q5JSMNDBTq1CsOM3IplWx96vHg3CoTv +z0LDjtpAPWY5eTRbH7Ww1OPz7t3nnwaQaihf9U3MVRz0eqIxk4sHoCD+oDxgeDYvPg+ OOsYmX79IfrGnA4Y5B0aJdAbbx0Fkt0d/asz/VHSQnTNOY0jM9ug1jIDi5GP7U/DsvjR VIHz8ARmyTXqZI+H6U9wOwy0Ysbtu03iLTRvd99FeWAnM1st228QBa+GmgOcsnf0XOlZ B1Dg== X-Forwarded-Encrypted: i=1; AJvYcCWak2oiizqI+JXlmzOOrPaYPihVElbRpu8t9LiynIns7TSXYGXWro3Sa6MiL7d9kNbuYzxI/Hmqr0iuuK0WQpAooCA= X-Gm-Message-State: AOJu0YyDnvD66Iw9aefbxOH0+KxOibMyUjwGhFKsgxU5+SHCRsZppKe0 czFTnjYQC1sxxG4fGcfmKhLkTmM6GcF6dhVmsXTC7jfs262PZeWcFBPCYpQy8gI= X-Google-Smtp-Source: AGHT+IFyjyOK4imuMufx/V8FtRsE6RLkCpoEsDyebREmag+E/YQOk+Aiq+uxRiaeRtydulTn7Ig+Gg== X-Received: by 2002:a17:902:d2c4:b0:1e2:a61e:47fa with SMTP id n4-20020a170902d2c400b001e2a61e47famr1344360plc.15.1712187706092; Wed, 03 Apr 2024 16:41:46 -0700 (PDT) Received: from debug.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id b18-20020a170902d51200b001deeac592absm13899117plg.180.2024.04.03.16.41.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 16:41:45 -0700 (PDT) From: Deepak Gupta To: paul.walmsley@sifive.com, rick.p.edgecombe@intel.com, broonie@kernel.org, Szabolcs.Nagy@arm.com, kito.cheng@sifive.com, keescook@chromium.org, ajones@ventanamicro.com, conor.dooley@microchip.com, cleger@rivosinc.com, atishp@atishpatra.org, alex@ghiti.fr, bjorn@rivosinc.com, alexghiti@rivosinc.com, samuel.holland@sifive.com, conor@kernel.org Cc: linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kselftest@vger.kernel.org, corbet@lwn.net, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, oleg@redhat.com, akpm@linux-foundation.org, arnd@arndb.de, ebiederm@xmission.com, Liam.Howlett@oracle.com, vbabka@suse.cz, lstoakes@gmail.com, shuah@kernel.org, brauner@kernel.org, debug@rivosinc.com, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.com, charlie@rivosinc.com, apatel@ventanamicro.com, mchitale@ventanamicro.com, dbarboza@ventanamicro.com, sameo@rivosinc.com, shikemeng@huaweicloud.com, willy@infradead.org, vincent.chen@sifive.com, guoren@kernel.org, samitolvanen@google.com, songshuaishuai@tinylab.org, gerg@kernel.org, heiko@sntech.de, bhe@redhat.com, jeeheng.sia@starfivetech.com, cyy@cyyself.name, maskray@google.com, ancientmodern4@gmail.com, mathis.salmen@matsal.de, cuiyunhui@bytedance.com, bgray@linux.ibm.com, mpe@ellerman.id.au, baruch@tkos.co.il, alx@kernel.org, david@redhat.com, catalin.marinas@arm.com, revest@chromium.org, josh@joshtriplett.org, shr@devkernel.io, deller@gmx.de, omosnace@redhat.com, ojeda@kernel.org, jhubbard@nvidia.com Subject: [PATCH v3 06/29] riscv: zicfiss / zicfilp extension csr and bit definitions Date: Wed, 3 Apr 2024 16:34:54 -0700 Message-ID: <20240403234054.2020347-7-debug@rivosinc.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240403234054.2020347-1-debug@rivosinc.com> References: <20240403234054.2020347-1-debug@rivosinc.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3EBEF14002A X-Stat-Signature: g14ddgcy9ypitb3xtshxgkz81msomuu7 X-Rspam-User: X-HE-Tag: 1712187707-635495 X-HE-Meta: U2FsdGVkX1/P3Vpy55xwrXyAWVz2oeqjrx5iiSK+z5UiA1o1oGZattG9e0ExMwkdMrTKevW92t3sF8r2t/PD0VTDomFbEQd/WX0WY4p2hA1yVupQ74pv9ef2fJHxYLkr71cOE91/zFa9QxvqkZWAn36aqLJiIKdzPOKWw394KzsWSyOuudsbhoGVbUaQUSS4kBaWbxypj6mSfuHpgkGe4BoBfPOekeCqbrPo7TY3aTQw8CFhXGgQDn4/xrsSZjDon7e92VqNsHsB75OJtg4cFpELNXDeMWkR22VwK+cLvFQ2uvsTqJOzoLLZ+K8p3UX0BTrk9Mhug+ktg1AdWH65r2NY42eoGikqjM8EAAS+XWT3MDxQbzX5zvQ5DMtg/j4yf4SptVzm8R0eKAYKoKpA4xOX172MKWF8ICgR3R0Guzz3OAZRC+f2+34gceyWV6BCvqCUpuro+Va9HaBEJlYqi5evCl2iVRpIqBtF8DEKn5FoxXaWbcvWXVT4ElCNqsntEkFV7XfPaS6jUDoYuJZIhq7nicFcMOF3kxbH7TvuADOY8f1QFVzMELJ/hfcY0joqda1hf2vBBMU9q68E+KbCjyMnCoiH4BIkIhi42fcKcpFgzNGy//5sKbhAtz10CspCiTKlBlNSeOlec9+DGUB9ptCWVZ5Fww8XIY6Iw1e5ksnbXTKZ1t0D9XaqZmKklMM5oBl/864iakSluLY5vPguJJyFX8THRmBnPQ1zVZfSMnxYGNdAtp2SK86SWAS8oQy+oq6SdvWCdRdU+G6uolZDhupLvoZcInbgMgCucvSCvrtv/y30xPiF+eS+RrYRbid8skwVLJtRpYvvtrJ4lVr1k6UXQmKETLxighIsSbQ/9Cm+N9CVSHnvVGHy4wQkilStu0bpWl7S00FIogN+wuo9DiLkAA5fozcCbD3Ye97GTP5yU2vsplK7yfnEq1Oh6u17Fq7YsALkz1Xp7ozKVSN h+EsnveG R9bc307x8/cOzimeVz9vxViy9xSx/O/whB0FRD7zah77AEuBKFL7p5bBa9afVg7kWTC0Lg6taC1aaYSArehCoKt4BWk0Dvtq2n1I+v1TPjgINcITN1jzI6r9E4m201eKgC8pvh5AFGbqU6kpZLCQLWKll+k1GbdrWAnbGuMw1qdEVZ65ao1yPzeXh0LJmhugibBW3NamxGUG4hWxveDJpCZQKGKQexNgMBGx/ZxSgrgXsKCv1wiQRtzNJpw6+zW1Gn4HT2xUaZPwxJQWejYYu1zGbBI0esS7oBNU1HYSF8/HLwwlhP7ucsG98Kybjkdw2KOb2n3gJv9/uQ/l3OEmyDzPgqRGkVV2hEtdUSIVoCa0IveYUTu3pzQT6VqTbRXGiMBOlLo9VkvxoIulW9utc+cmw6aCvm4se5SIz0Hs42BDo2qj5FauPapHhThv1HtEEh73k7lKbsf/neRvfUWofF2hViJZQRgnrR+83v7vX7nfDze+IUWeyxwrS/+uHL7D2Gj+Mkzptrh7y8kg= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 bbd2207adb39..3bb126d1c5ff 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 */ +/* 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) @@ -196,6 +205,8 @@ #define ENVCFG_PBMTE (_AC(1, ULL) << 62) #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) @@ -216,6 +227,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 /* symbolic CSR names: */ #define CSR_CYCLE 0xc00