From mboxrd@z Thu Jan 1 00:00:00 1970 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 71C8CC25B74 for ; Fri, 10 May 2024 22:37:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA92C6B013C; Fri, 10 May 2024 18:37:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C59A56B013B; Fri, 10 May 2024 18:37:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B21A16B013C; Fri, 10 May 2024 18:37:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 92F436B013A for ; Fri, 10 May 2024 18:37:40 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 30B18C0443 for ; Fri, 10 May 2024 22:37:40 +0000 (UTC) X-FDA: 82103949480.27.815070C Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by imf07.hostedemail.com (Postfix) with ESMTP id 589C14000C for ; Fri, 10 May 2024 22:37:38 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kcbcpyKH; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715380658; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=N1oyif5LMXmv9cfSzvfL4iA3+1faWOlQLzQAOhWAAfQ=; b=7A/Gm7G+5BOsmY4FGtTmUNcCuODzGEOtVogTUzmOZR+dggpGnMSz9HT8i25dTI8Fi+7KYj /XReRQ12DbhpKa5uj7OR5rS6k+93Q2WpnELZFnalZ1d8n3ASsg8rzJHDuXS7WyqSTB+WGW sdPC5WA2xk0qLGDUW4lA3GOcboefkwY= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=kcbcpyKH; spf=pass (imf07.hostedemail.com: domain of charlie@rivosinc.com designates 209.85.215.178 as permitted sender) smtp.mailfrom=charlie@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715380658; a=rsa-sha256; cv=none; b=ij0jSmYGQuwRj1t0lzpIPenob6e8kUufFh42AcVgKH1z5A4VxK/y05xmkKSIbxg59PeqhN B8GI64tMYk/+maR0lsg9rkJly6KY1L3FIEVxtvWshiSMse2W4zoViyFPyd3ZHH71cCXMNe bhYNbeWJ5yRmMSY4wrvKtAAzcGL9D0w= Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-5d81b08d6f2so1715903a12.0 for ; Fri, 10 May 2024 15:37:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1715380657; x=1715985457; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=N1oyif5LMXmv9cfSzvfL4iA3+1faWOlQLzQAOhWAAfQ=; b=kcbcpyKHfEJhcflCWLJ+Wc+oH51MGuVzdV+QQUGZWfu2unJuBsmvMy7ceJPhNDWGqm u6y2+jgbxuahjRs6NUIaH3bOrsYAht3uTzOhDRWFxvw27gancow408Z677KeI7wbPiyR VHY60IZL6aHgEJh6N9ekHhj9asHCqiThnjLVbLWWZgrWN5YqlBwyBl/WD/EYYZzltbIC YDiT7ZLuZrlMHqU9yIEWoi5JtrS1xjyuXQro1Mr7GjZXMVsZtuyDemziibWMurhts8Q7 9K3qYOaWU/2Z38+EStRUyEg6xmmYOGW/0AemKIl7Y/n8L/VQT5n/v2BLMBs3w34sUPbb sdZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715380657; x=1715985457; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=N1oyif5LMXmv9cfSzvfL4iA3+1faWOlQLzQAOhWAAfQ=; b=iR4Sq7sSimfKI1RcJ5bCGV2gzu5tuQQzbU19DdtrjmfhcmWcm2dniJMKqKa6x1xb4o S845N4jyS1JKGQ+ipXZYh5jA+5QfGWGutKHiadL8yzuP7ZcXEzEIdacY3GzvukMJw6ky 5NZCD3pwqw8PRi9tcru3rPn8OfKAjxqfoc1ydItmV/oEABSoe8GQODDorsALk4yJvtIp YGNmtds60WoKlHM6UToAtj2+U7rjkbKGrUPcJCfRuUB2dQJCPo61xNz5h722GXZnfM6K untZpfPt/4yhFG6bkSIwFueqD+VHsr4RzxoCQ8aw20Sq7FxRZ5NPRo/1DaT2UCWuQXEn DzfQ== X-Forwarded-Encrypted: i=1; AJvYcCVZhYnnvssu2Yqv80Yr6Ddt7UQ2gmaRHsgN6Y74k+t2A1mr3dR5sc1cANLGIfOhDeIljm852ft1OQeLFeSU1Qhm2Lg= X-Gm-Message-State: AOJu0YyTDBF/AhBU2b5VcbVoMQs7OLN+2YKNmLEV19dd4PSR0WeEUGmZ 5hnz8XPkwxO0kRhOZlxdPDqEWUteseOyyBaF8XiJI0aRTTGZuz2UAzOO75iMQu8= X-Google-Smtp-Source: AGHT+IF+cB/VeeNmDI2ko+dsDxMtMfecI39OIzLFhWWIUSbrZvt3Adce25QglCrrCpHnBQogkCEnLA== X-Received: by 2002:a05:6a20:1053:b0:1a9:22cc:3ed4 with SMTP id adf61e73a8af0-1afde0a993fmr4462882637.6.1715380657060; Fri, 10 May 2024 15:37:37 -0700 (PDT) Received: from ghost ([2601:647:5700:6860:629e:3f2:f321:6c]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2b62886b72fsm5609203a91.31.2024.05.10.15.37.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 15:37:36 -0700 (PDT) Date: Fri, 10 May 2024 15:37:32 -0700 From: Charlie Jenkins To: Deepak Gupta Cc: 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, 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, andy.chiu@sifive.com, jerry.shih@sifive.com, hankuan.chen@sifive.com, greentime.hu@sifive.com, evan@rivosinc.com, xiao.w.wang@intel.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: Re: [PATCH v3 06/29] riscv: zicfiss / zicfilp extension csr and bit definitions Message-ID: References: <20240403234054.2020347-1-debug@rivosinc.com> <20240403234054.2020347-7-debug@rivosinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240403234054.2020347-7-debug@rivosinc.com> X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 589C14000C X-Stat-Signature: zh1h8ytrfze8aay79chei1f7qbrzzhyu X-HE-Tag: 1715380658-448924 X-HE-Meta: U2FsdGVkX1+siSPd2Syfg2ft6Nl/y5ZAbU3H+Q7A3Z4EyvaIPiwJUQj1Zg3Uao5VB48k8fZ4jtQRoVe58rnMdfkn2jhYbGmOet82FSFyIz9ym41tzJuFcKkJ07ezz0dLNDumLDRh+XDrqp24QMllHQN8xJvN42qSadM2uCEnl6OCTaa2F5zqW0jgH70ZVOxWQcxU2F6Wclr5B4+qXnrQP6w7Q7ZIqNljvZ+wPNxUUKK7hxFVRYujslILNYZQ8NygSQepN2BXi0zpcqDV4N7L7aiFs/UQyDuhaMB1rg7xGEsrsfNgwPVwokf/XlgI5gBwwVNT7V61rGtdg8WzbTRJ5LIzQvuAj+6HBWf8l7uPHlqSJCzPcie2gP4AjN6jiWHeP45pDaLJbdQNpb7nxqc3vdmHsIyvJwo02q2umFrgt8EMCXnK7J7szlxvJxmXRQyxTotoLEAqi2fwXNi7zafYVIvAVrkMqNrL8hf9BPWWS1QtsjCjNvjBAyfWsw5p2FxQgGc5kUBd1xwGSYKJgWZVQErTa1Hn/sO1hageRe6gQECSZM9xecfrZ9jacl44Uh1x5UWRemnYsPzLNc1QVkO0ZqXyUOk4ihZOfHi/jChUBzJCEvxXF1I2zX/blsCoNWDNLpE7/4hPzkjaFx3hHo4vSA3/uaLB+gfo2wNPmBip1WQJ6SPy3+qudh/Vx1WyxeknMV3Vx5xxkn3LBeg7l1TrZUYLIDIYjDfE/megrwJwoZrxAil4vji9Cw6Nr1AtW1ZmozXhX9f2nXpsv/f7LyZVdZ6iTjTnJYGwBU+yG/54Y8HMB9YSpNQQmcGKX6fctgBv+2aU7PkSkKk/WnRGXu4nyUa6LOMzZOdrVhRk8PDUUh9a29sYpBdrGk1B/GnsIKCvIo3+mCFWIl9oq9B+dwhbV98oJ7luOhgBxWN7Ai6KEVY+KbENvVNh2sSUzoZwpNl+JesFAC4PoVYIasJ8TiD B+7n1tDx uuICoqSLGr/+5hAhzq1eAN2D9otCVXL5W887bIEvkKIk7m1EYrwofwmunQ4eQMogLhzNcKNuAwOtgEMvIC+lzf55RONA/9KXvR8CKaDVhTlXBW8QkJAZhTUic8HNg8NTK7yEvOIUJkCqpZXgUc+Uh25Kvjk6qLnDplBZN8mxr6dHvzbeUBbG5Y+AVzbOGD6r1yPG7zoDlrMbpDdOs3qc+jBiIoGtDJOJ6EjJtmjibLr83469rwT9vCQdCV672WQI5BqrvpNzh0D6rYySupiQDm/YE3/pFdN8/vvj/2veVdS9+HMsYA5tTiObOgnpozRVjR4jZ7pFvK+udo+N4nhtndlVmownLr7/d0CC0A5/b8mke9ssLBy/1qFbRFdpwrd20q6tFgrrAsWsPpghr9r6F9bYYobkLoKvyCUy66VBxDk6268fcnecbM0Go8fNA6GfnlJA5Oy0C/5g+TpqyxxlDGZq0jCmOrGEb2gJJfeXDorqxUNF+SSr/Jz3zho8yS89YXAOP1HiLNfesQMKEq1pOstC5BkH2s6R2HSIbE7Vv083FrbxcB72BXGwRSWoAMUCor45D 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: On Wed, Apr 03, 2024 at 04:34:54PM -0700, Deepak Gupta wrote: > 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 > --- > 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 > -- > 2.43.2 > Reviewed-by: Charlie Jenkins