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 X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C108C433E0 for ; Wed, 17 Mar 2021 14:32:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1789964E13 for ; Wed, 17 Mar 2021 14:32:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231886AbhCQObf (ORCPT ); Wed, 17 Mar 2021 10:31:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:53988 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231912AbhCQObH (ORCPT ); Wed, 17 Mar 2021 10:31:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26D7564F67; Wed, 17 Mar 2021 14:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615991467; bh=S3JhTXMjWji0Vcn4IbAXOL+PlkhYOkccvDgq5tIxZqM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gd5K9dwWeW2twuwVtOVTybSn0Rqnktu+3VRkcDDcJgl6cF2ca31aWt3NmbaIX1Xbu ilH4P4RBMyK1XbcM5G8Dpb24Pl3hNhzT5NTjwWj7SxawhsmPo3ypEcANPLluaSxdI3 ei7+x9WhQ1cEPUOAFGiehQyU7PYF3tigFiqPPrRgPPflrbED96mHMdDQm7UIS+kQzO l1+BtZcDiLs3y3yBuMgZVfzxrAyzeg3EXFgNsOTkEeKTEvnCtuw57XwNK7YstnV7Kb 3YCo+8iFAP+9mouFphJjh/NtqgxM7QlAxvFU6QR0BvnPmqzqku1+Xcd48EUiL+6B7U CVdBJnBOeOnJA== Date: Wed, 17 Mar 2021 14:31:01 +0000 From: Will Deacon To: Marc Zyngier Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, dave.martin@arm.com, daniel.kiss@arm.com, Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , broonie@kernel.org, kernel-team@android.com Subject: Re: [PATCH 02/10] KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 Message-ID: <20210317143101.GC5393@willie-the-truck> References: <20210316101312.102925-1-maz@kernel.org> <20210316101312.102925-3-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210316101312.102925-3-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Mar 16, 2021 at 10:13:04AM +0000, Marc Zyngier wrote: > Switch to the unified EL1 accessors for ZCR_EL1, which will make > things easier for nVHE support. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/fpsimd.c | 3 ++- > arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c > index 3e081d556e81..b7e36a506d3d 100644 > --- a/arch/arm64/kvm/fpsimd.c > +++ b/arch/arm64/kvm/fpsimd.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -112,7 +113,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) > fpsimd_save_and_flush_cpu_state(); > > if (guest_has_sve) > - __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_s(SYS_ZCR_EL12); > + __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_el1(SYS_ZCR); > } else if (host_has_sve) { > /* > * The FPSIMD/SVE state in the CPU has not been touched, and we > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > index 807bc4734828..d762d5bdc2d5 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > @@ -269,7 +269,7 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu) > __sve_restore_state(vcpu_sve_pffr(vcpu), > &vcpu->arch.ctxt.fp_regs.fpsr, > sve_vq_from_vl(vcpu->arch.sve_max_vl) - 1); > - write_sysreg_s(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR_EL12); > + write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR); > } else { > __fpsimd_restore_state(&vcpu->arch.ctxt.fp_regs); Looks straightforward enough: Acked-by: Will Deacon Will 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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E32FBC433DB for ; Wed, 17 Mar 2021 14:32:52 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6377164F26 for ; Wed, 17 Mar 2021 14:32:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6377164F26 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; 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=6zziNhD4o6pxt5FboBgLSgz6NcUmXUEZznCsLauxZK4=; b=D8IL6SD/rm/2i2/7igLWeImQe +fgoFTlfLIc/yArtAb+SM+nIHJHQ51//p5nz2cCLH5lTuB3C4pSR7l6TO3rNq+mAfXG6Ddcfxn7y+ yBtRyYzU6B6YlZmsn9KZr9y06dftY4S7ZNc+LhAEA6hbBqUR5Lz+Gs5pUpu9JO1CkjjSf10UNMmYU CbGvGfaazepO508iEF/MIY3tPe5nan67VXtJicpkruLAz0drtJto5CngaUeoaru+gayBuIDosfrOT uF2OI9E2XjRKqQQWwrkITY/XX3ioCswuTAwVB/xShmKdrgGJ9PlEJJjyaVtcd0/PUAeVfOTddNQuH JJ5CPGN6w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lMXCf-003Gb1-G9; Wed, 17 Mar 2021 14:31:17 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lMXCZ-003GYV-UU for linux-arm-kernel@lists.infradead.org; Wed, 17 Mar 2021 14:31:13 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 26D7564F67; Wed, 17 Mar 2021 14:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615991467; bh=S3JhTXMjWji0Vcn4IbAXOL+PlkhYOkccvDgq5tIxZqM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gd5K9dwWeW2twuwVtOVTybSn0Rqnktu+3VRkcDDcJgl6cF2ca31aWt3NmbaIX1Xbu ilH4P4RBMyK1XbcM5G8Dpb24Pl3hNhzT5NTjwWj7SxawhsmPo3ypEcANPLluaSxdI3 ei7+x9WhQ1cEPUOAFGiehQyU7PYF3tigFiqPPrRgPPflrbED96mHMdDQm7UIS+kQzO l1+BtZcDiLs3y3yBuMgZVfzxrAyzeg3EXFgNsOTkEeKTEvnCtuw57XwNK7YstnV7Kb 3YCo+8iFAP+9mouFphJjh/NtqgxM7QlAxvFU6QR0BvnPmqzqku1+Xcd48EUiL+6B7U CVdBJnBOeOnJA== Date: Wed, 17 Mar 2021 14:31:01 +0000 From: Will Deacon To: Marc Zyngier Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, dave.martin@arm.com, daniel.kiss@arm.com, Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , broonie@kernel.org, kernel-team@android.com Subject: Re: [PATCH 02/10] KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 Message-ID: <20210317143101.GC5393@willie-the-truck> References: <20210316101312.102925-1-maz@kernel.org> <20210316101312.102925-3-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210316101312.102925-3-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210317_143112_217061_5717F0B9 X-CRM114-Status: GOOD ( 15.31 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Mar 16, 2021 at 10:13:04AM +0000, Marc Zyngier wrote: > Switch to the unified EL1 accessors for ZCR_EL1, which will make > things easier for nVHE support. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/fpsimd.c | 3 ++- > arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c > index 3e081d556e81..b7e36a506d3d 100644 > --- a/arch/arm64/kvm/fpsimd.c > +++ b/arch/arm64/kvm/fpsimd.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -112,7 +113,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) > fpsimd_save_and_flush_cpu_state(); > > if (guest_has_sve) > - __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_s(SYS_ZCR_EL12); > + __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_el1(SYS_ZCR); > } else if (host_has_sve) { > /* > * The FPSIMD/SVE state in the CPU has not been touched, and we > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > index 807bc4734828..d762d5bdc2d5 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > @@ -269,7 +269,7 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu) > __sve_restore_state(vcpu_sve_pffr(vcpu), > &vcpu->arch.ctxt.fp_regs.fpsr, > sve_vq_from_vl(vcpu->arch.sve_max_vl) - 1); > - write_sysreg_s(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR_EL12); > + write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR); > } else { > __fpsimd_restore_state(&vcpu->arch.ctxt.fp_regs); Looks straightforward enough: Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F4C3C433E0 for ; Wed, 17 Mar 2021 14:31:12 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id AE7BC64F69 for ; Wed, 17 Mar 2021 14:31:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE7BC64F69 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 21E7A4B65F; Wed, 17 Mar 2021 10:31:11 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@kernel.org Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2UtrruhDpSm1; Wed, 17 Mar 2021 10:31:09 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id ECB9A4B441; Wed, 17 Mar 2021 10:31:09 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 9BDD34B3EE for ; Wed, 17 Mar 2021 10:31:09 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7+e4tE9HgpZy for ; Wed, 17 Mar 2021 10:31:08 -0400 (EDT) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 8F54B4B3C1 for ; Wed, 17 Mar 2021 10:31:08 -0400 (EDT) Received: by mail.kernel.org (Postfix) with ESMTPSA id 26D7564F67; Wed, 17 Mar 2021 14:31:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615991467; bh=S3JhTXMjWji0Vcn4IbAXOL+PlkhYOkccvDgq5tIxZqM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gd5K9dwWeW2twuwVtOVTybSn0Rqnktu+3VRkcDDcJgl6cF2ca31aWt3NmbaIX1Xbu ilH4P4RBMyK1XbcM5G8Dpb24Pl3hNhzT5NTjwWj7SxawhsmPo3ypEcANPLluaSxdI3 ei7+x9WhQ1cEPUOAFGiehQyU7PYF3tigFiqPPrRgPPflrbED96mHMdDQm7UIS+kQzO l1+BtZcDiLs3y3yBuMgZVfzxrAyzeg3EXFgNsOTkEeKTEvnCtuw57XwNK7YstnV7Kb 3YCo+8iFAP+9mouFphJjh/NtqgxM7QlAxvFU6QR0BvnPmqzqku1+Xcd48EUiL+6B7U CVdBJnBOeOnJA== Date: Wed, 17 Mar 2021 14:31:01 +0000 From: Will Deacon To: Marc Zyngier Subject: Re: [PATCH 02/10] KVM: arm64: Use {read,write}_sysreg_el1 to access ZCR_EL1 Message-ID: <20210317143101.GC5393@willie-the-truck> References: <20210316101312.102925-1-maz@kernel.org> <20210316101312.102925-3-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210316101312.102925-3-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Cc: kvm@vger.kernel.org, Catalin Marinas , kvmarm@lists.cs.columbia.edu, broonie@kernel.org, kernel-team@android.com, dave.martin@arm.com, linux-arm-kernel@lists.infradead.org, daniel.kiss@arm.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Tue, Mar 16, 2021 at 10:13:04AM +0000, Marc Zyngier wrote: > Switch to the unified EL1 accessors for ZCR_EL1, which will make > things easier for nVHE support. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/fpsimd.c | 3 ++- > arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/fpsimd.c b/arch/arm64/kvm/fpsimd.c > index 3e081d556e81..b7e36a506d3d 100644 > --- a/arch/arm64/kvm/fpsimd.c > +++ b/arch/arm64/kvm/fpsimd.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -112,7 +113,7 @@ void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) > fpsimd_save_and_flush_cpu_state(); > > if (guest_has_sve) > - __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_s(SYS_ZCR_EL12); > + __vcpu_sys_reg(vcpu, ZCR_EL1) = read_sysreg_el1(SYS_ZCR); > } else if (host_has_sve) { > /* > * The FPSIMD/SVE state in the CPU has not been touched, and we > diff --git a/arch/arm64/kvm/hyp/include/hyp/switch.h b/arch/arm64/kvm/hyp/include/hyp/switch.h > index 807bc4734828..d762d5bdc2d5 100644 > --- a/arch/arm64/kvm/hyp/include/hyp/switch.h > +++ b/arch/arm64/kvm/hyp/include/hyp/switch.h > @@ -269,7 +269,7 @@ static inline bool __hyp_handle_fpsimd(struct kvm_vcpu *vcpu) > __sve_restore_state(vcpu_sve_pffr(vcpu), > &vcpu->arch.ctxt.fp_regs.fpsr, > sve_vq_from_vl(vcpu->arch.sve_max_vl) - 1); > - write_sysreg_s(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR_EL12); > + write_sysreg_el1(__vcpu_sys_reg(vcpu, ZCR_EL1), SYS_ZCR); > } else { > __fpsimd_restore_state(&vcpu->arch.ctxt.fp_regs); Looks straightforward enough: Acked-by: Will Deacon Will _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm