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=-9.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 B7C1EC433DB for ; Thu, 4 Feb 2021 09:51:29 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 406CB64E7B for ; Thu, 4 Feb 2021 09:51:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 406CB64E7B 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=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-ID:References:In-Reply-To:Subject:To:From: Date:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6RbD10XGy4nPYzIpONBCwiq6JNucMwAGxuBq4CVZOKM=; b=hztsp5VyzmjjLf+RrWZDeN6El VQtxGfdCLKuJHXuUVeM2khAOL/7GqILIriFv56DY4Pfdq7DQq7w7xZRDGSxT0lb8PN35fBTOtTAs6 R6Zkyyb9lsn9oOORUxEo+VXXW996gAmI4EsczmsVb5Eg7rdv9euREClPEQ4jvNmD2PqaeVzVh7oGg n5gBNqghPxZYWPGK1PqjyZeL9SA+MFJyGdLmj1VExhqp5jx6lqM25q0+t6vbrLZ8NCAH/ulJbs03J 7YQgqQvWgXfTLE+hoUmHXNxQYhH5YuXeFvMWu/7IPlZ6swYmx6Gr1FU4PgPr+e8SvWrnsdHTLnSzd DgJ+g8k0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7bH7-0002ay-5M; Thu, 04 Feb 2021 09:50:09 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7bH3-0002aM-Hz for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 09:50:07 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1C02664D9F; Thu, 4 Feb 2021 09:50:04 +0000 (UTC) Received: from disco-boy.misterjones.org ([51.254.78.96] helo=www.loen.fr) by disco-boy.misterjones.org with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.94) (envelope-from ) id 1l7bGz-00Bxau-V2; Thu, 04 Feb 2021 09:50:02 +0000 MIME-Version: 1.0 Date: Thu, 04 Feb 2021 09:50:01 +0000 From: Marc Zyngier To: Will Deacon , Alexandru Elisei Subject: Re: [PATCH v6 06/21] arm64: Move VHE-specific SPE setup to mutate_to_vhe() In-Reply-To: <20210204093427.GB20244@willie-the-truck> References: <20210201115637.3123740-1-maz@kernel.org> <20210201115637.3123740-7-maz@kernel.org> <20210203211319.GA19694@willie-the-truck> <20210204093427.GB20244@willie-the-truck> User-Agent: Roundcube Webmail/1.4.10 Message-ID: <12b87236475ec3e03d78dae620530c60@kernel.org> X-Sender: maz@kernel.org X-SA-Exim-Connect-IP: 51.254.78.96 X-SA-Exim-Rcpt-To: will@kernel.org, alexandru.elisei@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, dbrazdil@google.com, ardb@kernel.org, jingzhangos@google.com, pajay@qti.qualcomm.com, psodagud@codeaurora.org, sramana@codeaurora.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_045006_433353_D63D0378 X-CRM114-Status: GOOD ( 14.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Jing Zhang , Prasad Sodagudi , Srinivas Ramana , Suzuki K Poulose , Catalin Marinas , linux-kernel@vger.kernel.org, Ard Biesheuvel , James Morse , Julien Thierry , Ajay Patil , David Brazdil , kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2021-02-04 09:34, Will Deacon wrote: > On Thu, Feb 04, 2021 at 09:30:08AM +0000, Marc Zyngier wrote: [...] >> I think the following patch addresses the above issue, which I'll >> squash >> with the original patch. Please shout if I missed anything. >> >> Thanks, >> >> M. >> >> diff --git a/arch/arm64/kernel/hyp-stub.S >> b/arch/arm64/kernel/hyp-stub.S >> index aa7e8d592295..3e08dcc924b5 100644 >> --- a/arch/arm64/kernel/hyp-stub.S >> +++ b/arch/arm64/kernel/hyp-stub.S >> @@ -115,29 +115,9 @@ 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 >> - mov x2, #MDCR_EL2_TPMS >> - >> -skip_spe: >> - // For VHE, use EL2 translation and disable access from EL1 >> + // Use EL2 translations for SPE 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 > > Looks a tonne better, thanks! Be nice if somebody could test it for us. SPE-equipped machines are the silicon equivalent of hen's teeth... Alex, any chance you could give this a go? M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel