From patchwork Fri Jan 24 09:29:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233207 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=unavailable 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 080C3C35242 for ; Fri, 24 Jan 2020 09:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D366A20709 for ; Fri, 24 Jan 2020 09:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859587; bh=aact3I6c+oZm65CsIWErj5LOzFRreHh98x1rQVOP7rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lv1thjij+KPZb/CsXxcNjIBJNOSYNsiEGDzMNqmuv4WQ+8ojuQ9nptEIl+A8McqPZ zoiFRMgT1QD+klvD5MPePnddtfS7/nA5XO7SIFniyt/1piDcXfjMcqf3fWEKiGCd3O DTKkNZhqJIOIx+l+bX+rQ3HcolkUzovsxkH6PhhI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388207AbgAXJxD (ORCPT ); Fri, 24 Jan 2020 04:53:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:55320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388220AbgAXJxD (ORCPT ); Fri, 24 Jan 2020 04:53:03 -0500 Received: from localhost (unknown [145.15.244.15]) (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 E83B920718; Fri, 24 Jan 2020 09:53:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859582; bh=aact3I6c+oZm65CsIWErj5LOzFRreHh98x1rQVOP7rs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DMMTbZJB0mHHMt4BuVlkjSceKUBtSKf/pJhE2AU8U+EuWnjo6Y3Wb6I9oDKW0hCNB BW3O87BHy1ydOYiyBUFNjDLzvNtlnNZdQmnLBKG+W/yc5AuZbDUIV6hbAJScYVG/Jj swmPnEeBaoiTE+waytE648ssun3EU4Vkxg3+QLpk= 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.14 131/343] ARM: 8848/1: virt: Align GIC version check with arm64 counterpart Date: Fri, 24 Jan 2020 10:29:09 +0100 Message-Id: <20200124092937.225636396@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@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 60146e32619a5..82a942894fc04 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