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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 8000AC33CAF for ; Thu, 16 Jan 2020 19:04:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51973206E6 for ; Thu, 16 Jan 2020 19:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201451; bh=4FwwNBMxPQsMF1REKzY3u6wC+rgjFHSdFCTiwJQWwUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zpf1Ik18Fuv9y0t6504bzkZJglZ08cdzNBU4IJbJiAuAbuhYwibSu8SPPG77dDFgI eX+hDa5wx7m7q0Qiw7QyiwfdS/TwsPmyaPoUhjpRFCEn/5WtCmPAT+hVnz3ruuzBwZ R9ipQhaC9W6aSdi/UvjEOHAd41YcXbkUVwkKyF0Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388352AbgAPRCZ (ORCPT ); Thu, 16 Jan 2020 12:02:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:54612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388292AbgAPRCM (ORCPT ); Thu, 16 Jan 2020 12:02:12 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40D9C20730; Thu, 16 Jan 2020 17:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194131; bh=4FwwNBMxPQsMF1REKzY3u6wC+rgjFHSdFCTiwJQWwUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EKJlT9iQRPPEyx5xPP1S2zzkqUUwk+LsqQUDlNcFKfgUUD0uJfOxYfAFew5HVtSdJ VUOdRGTjfihENyOyF5wPdqXh1Vorf8DmR/8cF2L9+qMR0GbtpdAfhIP4GWWeQekvXR 0pk+vSR0Rrz20Rsnm0H5+k6f0YFntzIglyMZXm0w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Murzin , Marc Zyngier , Russell King , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 221/671] ARM: 8848/1: virt: Align GIC version check with arm64 counterpart Date: Thu, 16 Jan 2020 11:52:10 -0500 Message-Id: <20200116165940.10720-104-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116165940.10720-1-sashal@kernel.org> References: <20200116165940.10720-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vladimir Murzin [ Upstream commit 9db043d36bd379f4cc99054c079de0dabfc38d03 ] arm64 has got relaxation on GIC version check at early boot stage due to update of the GIC architecture let's align ARM with that. To help backports (even though the code was correct at the time of writing) Fixes: e59941b9b381 ("ARM: 8527/1: virt: enable GICv3 system registers") Signed-off-by: Vladimir Murzin Reviewed-by: Marc Zyngier Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/kernel/hyp-stub.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 60146e32619a..82a942894fc0 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -180,8 +180,8 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE @ Check whether GICv3 system registers are available mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 ubfx r7, r7, #28, #4 - cmp r7, #1 - bne 2f + teq r7, #0 + beq 2f @ Enable system register accesses mrc p15, 4, r7, c12, c9, 5 @ ICC_HSRE -- 2.20.1