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 55395C43381 for ; Wed, 13 Mar 2019 19:11:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 268252184C for ; Wed, 13 Mar 2019 19:11:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504290; bh=sUmCNFFZpdty6vBuGfBlRo6K0jX151qsZtCcqzZe+A8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nIpaRprbogOCWSnCoHAc8OpiVoBWa15SnaaOo0/8XRLu07THsfeNdYIt8XpBzWVk6 RL+66371Bsr2dachNoCQ9tpEFJzMsT7UQZNy6DQbJ+kdNew9MC3ogJQCKB2M2tDyX1 vvWAWaTOWCt+rQAb1kJdFj9A0uQ6CPRKmnIySrE8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727489AbfCMTL3 (ORCPT ); Wed, 13 Mar 2019 15:11:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:41974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727453AbfCMTLY (ORCPT ); Wed, 13 Mar 2019 15:11:24 -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 D0EA5213A2; Wed, 13 Mar 2019 19:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504283; bh=sUmCNFFZpdty6vBuGfBlRo6K0jX151qsZtCcqzZe+A8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IBCOkeJo0CB6dgj6rWVhHwCd1sqzL3tzkfwlEFyuXl82sVSEfERWjJKTHZb7aPmYQ jy/k/qk2tr457BQXtxMLjgE7sc9qmdZZbr7RpFzKTuKU6VNolxXLmkmsEEP50CzEha J5wiBj3meD2WPGFTW8LAOSB5/+75apjz0MKP0SoI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vladimir Murzin , Will Deacon , Sasha Levin Subject: [PATCH AUTOSEL 4.20 30/60] arm64: Relax GIC version check during early boot Date: Wed, 13 Mar 2019 15:09:51 -0400 Message-Id: <20190313191021.158171-30-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191021.158171-1-sashal@kernel.org> References: <20190313191021.158171-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 b207a2ce4bc6..715151b6d8b9 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -524,8 +524,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