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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 C2741C43381 for ; Wed, 13 Mar 2019 19:14:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9126A2075C for ; Wed, 13 Mar 2019 19:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504440; bh=Vi7v90PZ29o3o8d9YBCN+xE51rbhe+JytYUkv4d26zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kZWlFJpfTMdLaGMKJfBuz5fZEoFaqgS4B22Ixg0/UI9N94lSwNxSYb8m26eGfwSIX f6H0h+B5VREmLSBwqywkIqKOXOt9vvcxLDEmYQoPmyJ6GcpDN0dY+OLYy2N8NErfst MQQFar0SrUKUfUq8t8tLe42ukrCb9E/dcaGsnwY4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728140AbfCMTN7 (ORCPT ); Wed, 13 Mar 2019 15:13:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:44300 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728111AbfCMTNx (ORCPT ); Wed, 13 Mar 2019 15:13:53 -0400 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 3A6E520693; Wed, 13 Mar 2019 19:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504433; bh=Vi7v90PZ29o3o8d9YBCN+xE51rbhe+JytYUkv4d26zA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aWCf00S++atSidNZ8qIKQi28GRMuNjuq8BA/Uld0UCq2OSy7h7gjKyMvi47RkmItN 0NCe32/RdbSOzgjrzv5A9l2X+1KPTVMyBoVQxb+d+19SgFIJ4HMR/Ny7ObgyYO0wVs 0jm4mOzjXaVkNaNbNm068Ho6mjJBNSGjR7DVBHMY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Murzin , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL 4.19 24/48] arm64: Relax GIC version check during early boot Date: Wed, 13 Mar 2019 15:12:26 -0400 Message-Id: <20190313191250.158955-24-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191250.158955-1-sashal@kernel.org> References: <20190313191250.158955-1-sashal@kernel.org> MIME-Version: 1.0 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 74698f6971f25d045301139413578865fc2bd8f9 ] Updates to the GIC architecture allow ID_AA64PFR0_EL1.GIC to have values other than 0 or 1. At the moment, Linux is quite strict in the way it handles this field at early boot stage (cpufeature is fine) and will refuse to use the system register CPU interface if it doesn't find the value 1. Fixes: 021f653791ad17e03f98aaa7fb933816ae16f161 ("irqchip: gic-v3: Initial support for GICv3") Reported-by: Chase Conklin Reviewed-by: Marc Zyngier Signed-off-by: Vladimir Murzin Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/head.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 651a06b1980f..77ca59598c8b 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -522,8 +522,7 @@ set_hcr: /* GICv3 system register access */ mrs x0, id_aa64pfr0_el1 ubfx x0, x0, #24, #4 - cmp x0, #1 - b.ne 3f + cbz x0, 3f mrs_s x0, SYS_ICC_SRE_EL2 orr x0, x0, #ICC_SRE_EL2_SRE // Set ICC_SRE_EL2.SRE==1 -- 2.19.1