From patchwork Tue Jan 28 14:04:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232665 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 4B518C2D0DB for ; Tue, 28 Jan 2020 14:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2408E21739 for ; Tue, 28 Jan 2020 14:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221110; bh=sBOmsTByakk8KKA7ILbP/W5S02VAFz9A7cTKeuS7gGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jhXExBSANKWyZ/vhUUXhQU3NVcMhDjYHeDjY0PCXEecK8cDCoihI7kWg7l1dv5dwG mih7bGIGVDLwYZyvY1W1i0efyILJNHI4Ca6yiS9ytUrEksBkuI3uS9xsbrTLrTrckb r/qWqZicmKh7N0lVmPGSrnsmHXEd2vTN51fSXH3A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730196AbgA1OS2 (ORCPT ); Tue, 28 Jan 2020 09:18:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:42426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730473AbgA1OS1 (ORCPT ); Tue, 28 Jan 2020 09:18:27 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 4E7012071E; Tue, 28 Jan 2020 14:18:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221106; bh=sBOmsTByakk8KKA7ILbP/W5S02VAFz9A7cTKeuS7gGE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=scwViIiRegJdJyyxZl2+PV7kK0dv8XxXaK0yXYUeSXM8sdWE2Wf0Zew7U91+2bfgy Y01IlVid/+t1cQzlSFjaN5QR7XdfMl1KD0raZtoQoozbhOQKR1HOBEG/CZgr8YvxNy 10rNJgi5cWCb5W7d+ClRzyUTa93ubkE1yJPzAoow= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vladimir Murzin , Marc Zyngier , Russell King , Sasha Levin Subject: [PATCH 4.9 091/271] ARM: 8848/1: virt: Align GIC version check with arm64 counterpart Date: Tue, 28 Jan 2020 15:04:00 +0100 Message-Id: <20200128135859.362889084@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 15d073ae5da2a..f5e5e3e196592 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -179,8 +179,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