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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, 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 1C88FC433DB for ; Fri, 19 Mar 2021 09:54:25 +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 A50E664F53 for ; Fri, 19 Mar 2021 09:54:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A50E664F53 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.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:MIME-Version:Message-ID:In-Reply-To:Date:From:Cc:To: Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=kANqgdi27q3zl0QMOaRFkYhPxRqV9OlSv4CbzLOKXEo=; b=Vy9htv8gmYnIcVFi8WcVq/IWp nSQoqgTZjHmr8m+iXx/K0b2AF3yuIZLGihvZ2fnCztzM2vyKrfKo0XN7dh7SDVGYnm7dF8BoIYA8Q kE9M3UmLPgzTl2l0x9Xlq3Ux0AeBG5nxBzKTsKAzo1qDtdOOQAp4JCaYn4M05+88zhU+qabcJFOXQ lAPIBLmIIR+ovwd2jvTgCSQ0VRIfvCLLDD6wUyuwFho01RivEAW6Y04UAGkPr6+hNVdJMTRAVrod7 4uc66J9Ss2sJ4QWJGtZvbZM2+Vc/sdN8k4ybHzPvJwzKZoaP+b4zj7DW2+u1mgJNuPEjeV31PuQVG 6iFAJeySQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lNBo6-006z77-41; Fri, 19 Mar 2021 09:52:38 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lNBo1-006z6R-5k for linux-arm-kernel@lists.infradead.org; Fri, 19 Mar 2021 09:52:35 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id F072D64E21; Fri, 19 Mar 2021 09:52:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616147551; bh=mtFkRJyjBsyFfrC1gvVw1HObtFDVEu14xvnNbdeb01c=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=Bb8UL/ot6bnMdfitTBrPIxitauMuUQRysoPxX0Z2pYeU3aj8MMP32n+oxTjh/pjyf YbQc6357IrtZbRsTN2EV7R0iSa7iG7Hmgs81Nrl9SY9g+ykE4eAy90nHY/6088Z0He oeICb7hixHPMWnP1V7BfQOYEVJgKivkCIy8/4w/8= Subject: Patch "arm64: Unconditionally set virtual cpu id registers" has been added to the 4.14-stable tree To: catalin.marinas@arm.com, dbrazdil@google.com, linux-arm-kernel@lists.infradead.org, maz@kernel.org, vladimir.murzin@arm.com, will@kernel.org Cc: From: Date: Fri, 19 Mar 2021 10:52:29 +0100 In-Reply-To: <20210316134319.89472-1-vladimir.murzin@arm.com> Message-ID: <161614754918214@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210319_095233_524078_6535CB16 X-CRM114-Status: GOOD ( 14.62 ) 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 This is a note to let you know that I've just added the patch titled arm64: Unconditionally set virtual cpu id registers to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm64-unconditionally-set-virtual-cpu-id-registers.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From vladimir.murzin@arm.com Fri Mar 19 10:43:20 2021 From: Vladimir Murzin Date: Tue, 16 Mar 2021 13:43:19 +0000 Subject: arm64: Unconditionally set virtual cpu id registers To: linux-arm-kernel@lists.infradead.org, stable@vger.kernel.org Cc: catalin.marinas@arm.com, will@kernel.org, maz@kernel.org, dbrazdil@google.com Message-ID: <20210316134319.89472-1-vladimir.murzin@arm.com> From: Vladimir Murzin Commit 78869f0f0552 ("arm64: Extract parts of el2_setup into a macro") reorganized el2 setup in such way that virtual cpu id registers set only in nVHE, yet they used (and need) to be set irrespective VHE support. Fixes: 78869f0f0552 ("arm64: Extract parts of el2_setup into a macro") Signed-off-by: Vladimir Murzin Acked-by: Will Deacon Reviewed-by: Marc Zyngier --- Changelog v1 -> v2 - Drop the reference to 32bit guests from commit message (per Marc) There is no upstream fix since issue went away due to code there has been reworked in 5.12: nVHE comes first, so virtual cpu id register are always set. Maintainers, please, Ack. arch/arm64/include/asm/el2_setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index f988e94cdf9e..db87daca6b8c 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -113,7 +113,7 @@ .endm /* Virtual CPU ID registers */ -.macro __init_el2_nvhe_idregs +.macro __init_el2_idregs mrs x0, midr_el1 mrs x1, mpidr_el1 msr vpidr_el2, x0 @@ -165,6 +165,7 @@ __init_el2_stage2 __init_el2_gicv3 __init_el2_hstr + __init_el2_idregs /* * When VHE is not in use, early init of EL2 needs to be done here. @@ -173,7 +174,6 @@ * will be done via the _EL1 system register aliases in __cpu_setup. */ .ifeqs "\mode", "nvhe" - __init_el2_nvhe_idregs __init_el2_nvhe_cptr __init_el2_nvhe_sve __init_el2_nvhe_prepare_eret -- 2.24.0 Patches currently in stable-queue which might be from vladimir.murzin@arm.com are queue-4.14/arm64-unconditionally-set-virtual-cpu-id-registers.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel