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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E9A3ECE79AB for ; Wed, 20 Sep 2023 08:13:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3MMyHr+8ouUc15edxrXD07iPRkunfxavqS0wEGCvs1k=; b=T5y4etN2nf+nTX KAMzzbsy/nmg4CYsWVm8y1f05NrYOhOOT9HIs5EnJhmMRHdDEsktT6zGzEGbJuHgkTS9l+fJniLVv pSbCTlC+NXe+b1k5ApTH+wwwm/mdMpGwfdaUOQCyZqDzYj1U7uVpaFvg47GQBxUAtF8JnCgADNj+a j959ZytoOOtxnAZNDLq92CL4mRx2IKl3mlG6SvH9lwvEgNXl6zWP1daXzbpgCTenhpF03VewowhIo VmNKNlJ9WaTuOkascs1c7EjZ9LpR3WE3pqjABxySCvND/015m037p/VWBiXOyXUzH+KCt2Iq5hVtY sws/K/DVs4C+Pp/pXJWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qisL4-002FDZ-1L; Wed, 20 Sep 2023 08:13:38 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qisL1-002FBZ-1I for linux-riscv@lists.infradead.org; Wed, 20 Sep 2023 08:13:37 +0000 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-307d58b3efbso6220565f8f.0 for ; Wed, 20 Sep 2023 01:13:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1695197611; x=1695802411; darn=lists.infradead.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=bFVwkQGYHLyQMWXHCf9YewQuFfTq2ysEb3BcSmI7FIU=; b=ngQsv0vT6ShGf4fTBNLEBLQnbuQS0D9m4SymMShMtb7xPpXRgdVo3WxVu0Tu1oeswo aqEtSecMze94K4hp/kDRnUS5d/a9NLJOICPnwubGOgXju3hjZymREbhBjc6+I10QcG0Q pMVbT329xTOB4UkEbLcpKn5ArJhwPX4SozCREUgs0U1QrYPs/6hjd60hYAKSPZ8DuHi2 9VNH8VSwQt42ow+y30bxiuuj5fa1y8fE83tDY691wZVsN9qu6sTQpgS5NjXW8e15Lm0/ lJXlC2Yf4rI4ZeEDKPwRh85alK+vzNIqzQitirc29C3TMPdHXCViJRQyDdPxXxeBsm/U +u4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695197611; x=1695802411; 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=bFVwkQGYHLyQMWXHCf9YewQuFfTq2ysEb3BcSmI7FIU=; b=Q0TR3VTP/OzxTeHrrneQVUrb+lHIg73XjqEIDetRjnaOJvhcV2smZN/WJ6c0BlxoJR krPWtvHLhmzs9ICJgnEcdvmMJIt8ioJ8iFKW+mDxctoGNymIDHL2q9jMRIPiizxV6jqp aOIl1vU8n1XN1H+NRz3xiyvVyKB498mcZGGuz8qAjcuWft8q8pCAx5qoEOWMkYzv9L9i 1COKbLVHar7n09brQIz0LAyRvDjUMSDDCQ/i04DDtRVK08NiXXt9YieqFZNpq6LEogqQ 8TVjC5SS/AMharR/TKQ2N8u55MVlS408NkZDxO/EBjqwkT3MXEOPgswoL2Iw+gW9HVJ0 sIAQ== X-Gm-Message-State: AOJu0YxPJAmLlD7IHufegeLm7XGU0CtEJdRWhyfV7eGx9cpOC4MicdJV DOZn2/rglseGckJxOjkXon1JMQ== X-Google-Smtp-Source: AGHT+IGq8/xjn/oNq2PTpNaOrP+pjj6Y9zwWhdZGp94uECltWuxSC0BJqvKxel2SPT2PaHs+TjltqA== X-Received: by 2002:a5d:56ce:0:b0:31c:8c93:61e3 with SMTP id m14-20020a5d56ce000000b0031c8c9361e3mr1658749wrw.60.1695197610866; Wed, 20 Sep 2023 01:13:30 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id e1-20020a5d65c1000000b00315af025098sm17764141wrw.46.2023.09.20.01.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 01:13:30 -0700 (PDT) Date: Wed, 20 Sep 2023 10:13:29 +0200 From: Andrew Jones To: Anup Patel Cc: Paolo Bonzini , Atish Patra , Palmer Dabbelt , Paul Walmsley , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Shuah Khan , Mayuresh Chitale , devicetree@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH 6/7] KVM: riscv: selftests: Add smstateen registers to get-reg-list test Message-ID: <20230920-af833495ead3e2f8c32d63cc@orel> References: <20230919035343.1399389-1-apatel@ventanamicro.com> <20230919035343.1399389-7-apatel@ventanamicro.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230919035343.1399389-7-apatel@ventanamicro.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230920_011335_439072_ACC134CC X-CRM114-Status: GOOD ( 21.81 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Tue, Sep 19, 2023 at 09:23:42AM +0530, Anup Patel wrote: > We have a new smstateen registers as separate sub-type of CSR ONE_REG > interface so let us add these registers to get-reg-list test. > > Signed-off-by: Anup Patel > --- > .../selftests/kvm/riscv/get-reg-list.c | 34 +++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/tools/testing/selftests/kvm/riscv/get-reg-list.c b/tools/testing/selftests/kvm/riscv/get-reg-list.c > index 0928c35470ae..9f464c7996c6 100644 > --- a/tools/testing/selftests/kvm/riscv/get-reg-list.c > +++ b/tools/testing/selftests/kvm/riscv/get-reg-list.c > @@ -49,6 +49,7 @@ bool filter_reg(__u64 reg) > case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZICSR: > case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIFENCEI: > case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_ZIHPM: > + case KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_SMSTATEEN: > return true; > /* AIA registers are always available when Ssaia can't be disabled */ > case KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_AIA_REG(siselect): > @@ -184,6 +185,8 @@ static const char *core_id_to_str(const char *prefix, __u64 id) > "KVM_REG_RISCV_CSR_GENERAL | KVM_REG_RISCV_CSR_REG(" #csr ")" > #define RISCV_CSR_AIA(csr) \ > "KVM_REG_RISCV_CSR_AIA | KVM_REG_RISCV_CSR_REG(" #csr ")" > +#define RISCV_CSR_SMSTATEEN(csr) \ > + "KVM_REG_RISCV_CSR_SMSTATEEN | KVM_REG_RISCV_CSR_REG(" #csr ")" > > static const char *general_csr_id_to_str(__u64 reg_off) > { > @@ -241,6 +244,18 @@ static const char *aia_csr_id_to_str(__u64 reg_off) > return NULL; > } > > +static const char *smstateen_csr_id_to_str(__u64 reg_off) > +{ > + /* reg_off is the offset into struct kvm_riscv_smstateen_csr */ > + switch (reg_off) { > + case KVM_REG_RISCV_CSR_SMSTATEEN_REG(sstateen0): > + return RISCV_CSR_SMSTATEEN(sstateen0); > + } > + > + TEST_FAIL("Unknown smstateen csr reg: 0x%llx", reg_off); > + return NULL; > +} > + > static const char *csr_id_to_str(const char *prefix, __u64 id) > { > __u64 reg_off = id & ~(REG_MASK | KVM_REG_RISCV_CSR); > @@ -253,6 +268,8 @@ static const char *csr_id_to_str(const char *prefix, __u64 id) > return general_csr_id_to_str(reg_off); > case KVM_REG_RISCV_CSR_AIA: > return aia_csr_id_to_str(reg_off); > + case KVM_REG_RISCV_CSR_SMSTATEEN: > + return smstateen_csr_id_to_str(reg_off); > } > > TEST_FAIL("%s: Unknown csr subtype: 0x%llx", prefix, reg_subtype); > @@ -342,6 +359,7 @@ static const char *isa_ext_id_to_str(__u64 id) > "KVM_RISCV_ISA_EXT_ZICSR", > "KVM_RISCV_ISA_EXT_ZIFENCEI", > "KVM_RISCV_ISA_EXT_ZIHPM", > + "KVM_RISCV_ISA_EXT_SMSTATEEN", If we merge [1] first, then this would be added in alphabetical order. [1] https://lore.kernel.org/all/20230817162344.17076-6-ajones@ventanamicro.com/ > }; > > if (reg_off >= ARRAY_SIZE(kvm_isa_ext_reg_name)) { > @@ -629,6 +647,11 @@ static __u64 aia_regs[] = { > KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_SSAIA, > }; > > +static __u64 smstateen_regs[] = { > + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_CSR | KVM_REG_RISCV_CSR_SMSTATEEN | KVM_REG_RISCV_CSR_SMSTATEEN_REG(sstateen0), > + KVM_REG_RISCV | KVM_REG_SIZE_ULONG | KVM_REG_RISCV_ISA_EXT | KVM_RISCV_ISA_EXT_SMSTATEEN, > +}; > + > static __u64 fp_f_regs[] = { > KVM_REG_RISCV | KVM_REG_SIZE_U32 | KVM_REG_RISCV_FP_F | KVM_REG_RISCV_FP_F_REG(f[0]), > KVM_REG_RISCV | KVM_REG_SIZE_U32 | KVM_REG_RISCV_FP_F | KVM_REG_RISCV_FP_F_REG(f[1]), > @@ -736,6 +759,8 @@ static __u64 fp_d_regs[] = { > {"zihpm", .feature = KVM_RISCV_ISA_EXT_ZIHPM, .regs = zihpm_regs, .regs_n = ARRAY_SIZE(zihpm_regs),} > #define AIA_REGS_SUBLIST \ > {"aia", .feature = KVM_RISCV_ISA_EXT_SSAIA, .regs = aia_regs, .regs_n = ARRAY_SIZE(aia_regs),} > +#define SMSTATEEN_REGS_SUBLIST \ > + {"smstateen", .feature = KVM_RISCV_ISA_EXT_SMSTATEEN, .regs = smstateen_regs, .regs_n = ARRAY_SIZE(smstateen_regs),} > #define FP_F_REGS_SUBLIST \ > {"fp_f", .feature = KVM_RISCV_ISA_EXT_F, .regs = fp_f_regs, \ > .regs_n = ARRAY_SIZE(fp_f_regs),} > @@ -863,6 +888,14 @@ static struct vcpu_reg_list aia_config = { > }, > }; > > +static struct vcpu_reg_list smstateen_config = { > + .sublists = { > + BASE_SUBLIST, > + SMSTATEEN_REGS_SUBLIST, > + {0}, > + }, > +}; > + > static struct vcpu_reg_list fp_f_config = { > .sublists = { > BASE_SUBLIST, > @@ -895,6 +928,7 @@ struct vcpu_reg_list *vcpu_configs[] = { > &zifencei_config, > &zihpm_config, > &aia_config, > + &smstateen_config, > &fp_f_config, > &fp_d_config, > }; > -- > 2.34.1 > Reviewed-by: Andrew Jones Thanks, drew _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv