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 BBDCBC433E0 for ; Fri, 19 Mar 2021 09:47:05 +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 6145F64F68 for ; Fri, 19 Mar 2021 09:47:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6145F64F68 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=W3gXdmZHmHB8BGiH1KLoA37DD6UPMkJZ5ucRjlQbdI8=; b=Eitxkank298qls+aITcJ0/V4U Wh+dnXHhgm4LGw5t0FqDi6f8Ar8deXIYkNTmp2zsCIgs69n2lK+pU8HNOVwHOFsWHpvbfyRwHD0f4 Z801gwQGh6oQT2TIJxEv0k40ES22EUyvkAyO3to5AKMKfIteMwrtGixoQJw920TT8DshJNRPDawqB wBxtoj8jazfj12DpcQ/U393uB51Turde8M28NLEkcv1GUFX4L8xHD9J92fYCuLz63syvxbfN3RjPj ERGfEr0AvVMpVxR6o2QrxBvmdo7MVTPS0dA79db4oQXXfaC72lDFZllGNtK+qknY7UjTqixaWWPe6 Ulu7OAppA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lNBhO-006yF3-N7; Fri, 19 Mar 2021 09:45:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lNBhE-006yE0-LG for linux-arm-kernel@lists.infradead.org; Fri, 19 Mar 2021 09:45:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9540564F6A; Fri, 19 Mar 2021 09:45:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616147131; bh=5bWZvCmB4TDOS8NzHKUnKHnOHAZ24yLYCR4j4tun1J4=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=RJUAd96jJ9fb1oSfGkt9wUGBvIoEmhQd2IpqAAolBNaKFaja8hd3jyGoUyYbxgEty I7DR+ulwtpheASllmfB4aPqFMcfOUEfvy8JC71qZOClB+D7HdQpj7CuU3ALyijpRtq TODPA/9ViJ12rTx3eixXM/S1QKsotLLHz1NPKUF0= Subject: Patch "arm64: Unconditionally set virtual cpu id registers" has been added to the 5.11-stable tree To: catalin.marinas@arm.com, dbrazdil@google.com, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, maz@kernel.org, vladimir.murzin@arm.com, will@kernel.org Cc: From: Date: Fri, 19 Mar 2021 10:45:28 +0100 In-Reply-To: <20210316134319.89472-1-vladimir.murzin@arm.com> Message-ID: <161614712819275@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_094533_048818_B5FDE981 X-CRM114-Status: GOOD ( 12.82 ) 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 5.11-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-5.11 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 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/include/asm/el2_setup.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -111,7 +111,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 @@ -163,6 +163,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. @@ -171,7 +172,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 Patches currently in stable-queue which might be from vladimir.murzin@arm.com are queue-5.11/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