Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp579224img; Fri, 22 Mar 2019 04:26:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwaeGUMpxYhAZPqG5LLkppkrait7B573iON9a2Tvi4C4+IM7eiOyuiYUGDlMIb3nWFI3Ni4 X-Received: by 2002:aa7:8144:: with SMTP id d4mr6216244pfn.88.1553254019040; Fri, 22 Mar 2019 04:26:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553254019; cv=none; d=google.com; s=arc-20160816; b=iZ3zNEZny4Clo3AJ+sXpPOFrTyozMTEd5kU+8hJQwk8l2hCezFcjz9rNMqLz9yD6Ux EmR7bQ5M6KBSv3eOYOZA9R9XoI8dCKaK9Nyh1cixqnSggF3ApuLF5M6tybLS9t6cQcWx cRccaKET5qCRnvXpqorvBC59rHuh0R8KWVWBx8NHZ2BVWUUExGipJrAerMIXiaoVOfGo /+ShxeS0V96B2jOTQSXc3/Ujpc1pmRyRawS4QZcqEHCrZGXXO1ZAxRfjBxfA7x8mTXn+ tbAo11dMr7Qvx4jaEdDG3gf47vgUvTas//rpFThFh1/kz9Qe8r2753IWL+QK2buWR+qj 71WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BCiL2BLgqrV7ajp4oitvW0/SXYL/VzwfTWRoA8YF2Vk=; b=nWKaWrwBj2kyyNnmkB+f6lfLzi78qSKsRmOEsdsEed4XxysfNQKd0+slK+daNkKBDj FjRYaSXBMMQKcpY7RmW0jSLxTroW0YXY1hYoww1ycNlewmelNxYYd39bvNQoB7sHTKXp VYqu//hvXwrCrJUl6nge6xuUG0uJ96OfKKcs3/sWQChbYsdlZJgqXxt/4e9mhILumFO7 cF6wiu8QyiUXU4HMoRksFpKu3BX1ynmZtTi4qJ+nCwz55ptGehNXkQp0xRcpS+i/S8wy mNOlHHTpeRZCYmTRiXwNTZoVmV9/YUbM0FPubaxI1tJq+a/k/lYZhLd0RpFziCzehfES HaPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=skOkhREZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p6si6403632pga.151.2019.03.22.04.26.41; Fri, 22 Mar 2019 04:26:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=skOkhREZ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729222AbfCVLZD (ORCPT + 99 others); Fri, 22 Mar 2019 07:25:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:52252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728398AbfCVLZC (ORCPT ); Fri, 22 Mar 2019 07:25:02 -0400 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 F151720657; Fri, 22 Mar 2019 11:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253901; bh=mcuC1EYdhw7vBuBIIg+vsBoP00uZ0k4eUaG/iGWES8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=skOkhREZ+Lwc7QTQIRC0wlSko8VjGnQKM9snF3VmDkxGmaMvYyJ9CDTbjTz8vnx2c ZltdeCGpjrEhEhrC2A26zCTTiZYPgxs7RGsykiUuO/bnz/go2Jcw4cD2EXD0a+vvyw XnxGUYuS69S995BMulJr9XXYz3jScDVmfpqi1WeI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chase Conklin , Marc Zyngier , Vladimir Murzin , Will Deacon , Sasha Levin Subject: [PATCH 3.18 106/134] arm64: Relax GIC version check during early boot Date: Fri, 22 Mar 2019 12:15:19 +0100 Message-Id: <20190322111217.888753719@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 5c4b8d6e8ba0..fcb224df471d 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -295,8 +295,7 @@ CPU_LE( bic x0, x0, #(3 << 24) ) // Clear the EE and E0E bits for EL1 /* 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, ICC_SRE_EL2 orr x0, x0, #ICC_SRE_EL2_SRE // Set ICC_SRE_EL2.SRE==1 -- 2.19.1