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=-18.0 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,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 7EC87C433DB for ; Wed, 3 Feb 2021 21:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4528E64F6A for ; Wed, 3 Feb 2021 21:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232226AbhBCVOJ (ORCPT ); Wed, 3 Feb 2021 16:14:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:36744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229897AbhBCVOG (ORCPT ); Wed, 3 Feb 2021 16:14:06 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3E67C64F5F; Wed, 3 Feb 2021 21:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612386806; bh=VS8yGGa3Q4OSZtI8MdKl0s1r50NHskoTYCo1kYP5p3U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=hrMa8Jay8pHUd7P774ypjFN+qs8pzMW+5LMIunYpx8GhSTh22IlURyZWABK4NPWPH XZbp7u8J0nYW9OJQR86rxEaoASK4n/w9dSSl/eP6q4DdGRbT83z3UzlunEdodcDxtn Yf8RgMT5ZJERTnkAtaWBAk4BUwdAFq0hEFf8r1aEb/hUbIULBZf2FTdmcoN7bWVwxL ZPaHTc+AJqa9FjEEUq/px1svUn0Gyiwr4saTl4ymC3wqSqzVl5hdtr4SkXCteL1AFZ WlEg6q6aANTkVXmj/l0fesDklhPJd9V8OqZczp+l2PsCzHbu2AWmWVsBlRqrYXB/1A sVUPmvKCX7T7A== Date: Wed, 3 Feb 2021 21:13:19 +0000 From: Will Deacon To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, Catalin Marinas , Mark Rutland , David Brazdil , Alexandru Elisei , Ard Biesheuvel , Jing Zhang , Ajay Patil , Prasad Sodagudi , Srinivas Ramana , James Morse , Julien Thierry , Suzuki K Poulose , kernel-team@android.com Subject: Re: [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe() Message-ID: <20210203211319.GA19694@willie-the-truck> References: <20210201115637.3123740-1-maz@kernel.org> <20210201115637.3123740-7-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210201115637.3123740-7-maz@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Marc, On Mon, Feb 01, 2021 at 11:56:22AM +0000, Marc Zyngier wrote: > There isn't much that a VHE kernel needs on top of whatever has > been done for nVHE, so let's move the little we need to the > VHE stub (the SPE setup), and drop the init_el2_state macro. > > No expected functional change. > > Signed-off-by: Marc Zyngier > Acked-by: David Brazdil > Acked-by: Catalin Marinas > --- > arch/arm64/kernel/hyp-stub.S | 28 +++++++++++++++++++++++++--- > 1 file changed, 25 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S > index 373ed2213e1d..6b5c73cf9d52 100644 > --- a/arch/arm64/kernel/hyp-stub.S > +++ b/arch/arm64/kernel/hyp-stub.S > @@ -92,9 +92,6 @@ SYM_CODE_START_LOCAL(mutate_to_vhe) > msr hcr_el2, x0 > isb > > - // Doesn't do much on VHE, but still, worth a shot > - init_el2_state vhe > - > // Use the EL1 allocated stack, per-cpu offset > mrs x0, sp_el1 > mov sp, x0 > @@ -107,6 +104,31 @@ SYM_CODE_START_LOCAL(mutate_to_vhe) > mrs_s x0, SYS_VBAR_EL12 > msr vbar_el1, x0 > > + // Fixup SPE configuration, if supported... > + mrs x1, id_aa64dfr0_el1 > + ubfx x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4 > + mov x2, xzr > + cbz x1, skip_spe > + > + // ... and not owned by EL3 > + mrs_s x0, SYS_PMBIDR_EL1 > + and x0, x0, #(1 << SYS_PMBIDR_EL1_P_SHIFT) > + cbnz x0, skip_spe > + > + // Let the SPE driver in control of the sampling > + mrs_s x0, SYS_PMSCR_EL1 > + bic x0, x0, #(1 << SYS_PMSCR_EL2_PCT_SHIFT) > + bic x0, x0, #(1 << SYS_PMSCR_EL2_PA_SHIFT) > + msr_s SYS_PMSCR_EL1, x0 Why do we need to touch pmscr_el1 at all? The SPE driver should take care of that, no? If you drop the pmscr_el1 accesses, I think you can drop the pmbidr_el1 check as well. And actually, then why even check dfr0? Doing the bic for the mdcr_el1.e2pb bits is harmless. > + mov x2, #MDCR_EL2_TPMS > + > +skip_spe: > + // For VHE, use EL2 translation and disable access from EL1 > + mrs x0, mdcr_el2 > + bic x0, x0, #(MDCR_EL2_E2PB_MASK << MDCR_EL2_E2PB_SHIFT) > + orr x0, x0, x2 > + msr mdcr_el2, x0 Doesn't this undo the setting of mdcr_el2.hpmn if SPE is not present or unavailable? (This wouldn't be an issue if we removed the skip_spe paths altogether). Will