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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 2FC17C43444 for ; Thu, 10 Jan 2019 17:52:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0405B20685 for ; Thu, 10 Jan 2019 17:52:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="BRuExwPb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730735AbfAJRwN (ORCPT ); Thu, 10 Jan 2019 12:52:13 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:39783 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730732AbfAJRwM (ORCPT ); Thu, 10 Jan 2019 12:52:12 -0500 Received: by mail-qt1-f196.google.com with SMTP id u47so14299916qtj.6 for ; Thu, 10 Jan 2019 09:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yvoFdkch7Gd4/MbRPm6+HJonlCHu2OWfPFxCbumCzMk=; b=BRuExwPb0a34jVDT0hKrNMf6pr+Qy62GGt2DcOyB/mU5RXUzZSjXItw/F09c/a+ooL X/BYlcmWGltbv62a+YfC0OJLHrH8sFNuMn9vTjorhAPvOcnl1b97qgKrTEHcNbf3Jya9 TxcpyXQwU0mCqQktlvIL1x70SxwgRq9ersgKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yvoFdkch7Gd4/MbRPm6+HJonlCHu2OWfPFxCbumCzMk=; b=JzNruQkDWL/TvNxbmRFER6GcsFq6gTwACDXMSBSz4FZR6O0584m80Qyuy2TQRV+Wgx Pmd+x1ri3Qkl/TyGbXOMjsDSRuXbIZYxlEt61XorgEN1F4QB857MRerUrQpJROyYob2e KN7813yngFi+D83/AzhD3AyJNIo8Lv6Xmbx6zQD0uPCG5b+oergDn7eL94qIGNb6xEWL fzVaq0zLDiIGjPBrjbjDeom9WsgbxVAy5KC4oxu1L44EEIxgnxTy78QcOCudsDMbphXG vRep7ircJesV9I9cEbu0D+qRjY6wEum6UqBOkToNB/sL2sVEnGmjERbXuHBTmMr3vurA uoRQ== X-Gm-Message-State: AJcUukeM6Fvnn3U2cx3z48PAaR9qmuN8PV/oudsZE8hew4AtFiEw03wx xnYcXMmWydl4g+fHSOVX34b7OrHZhuw= X-Google-Smtp-Source: ALg8bN5WcYzSGWfy4mD2GrkPZtCkd+mT9zG7Bc3B1rp0KugbuBTV7VjOQyOtWWB+WlMOKnxpn97Ecg== X-Received: by 2002:ac8:72c1:: with SMTP id o1mr10578018qtp.220.1547142730878; Thu, 10 Jan 2019 09:52:10 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id b8sm41815904qka.79.2019.01.10.09.52.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 09:52:09 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Mark Rutland Cc: Greg KH , Mark Brown Subject: [PATCH 4.14 12/17] ARM: split out processor lookup Date: Thu, 10 Jan 2019 12:51:45 -0500 Message-Id: <20190110175150.5239-13-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110175150.5239-1-dave.long@linaro.org> References: <20190110175150.5239-1-dave.long@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit 65987a8553061515b5851b472081aedb9837a391 upstream. Split out the lookup of the processor type and associated error handling from the rest of setup_processor() - we will need to use this in the secondary CPU bringup path for big.Little Spectre variant 2 mitigation. Reviewed-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/include/asm/cputype.h | 1 + arch/arm/kernel/setup.c | 31 +++++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index 3379c2c684c2..25d523185c6a 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@ -107,6 +107,7 @@ #define ARM_CPU_PART_SCORPION 0x510002d0 extern unsigned int processor_id; +struct proc_info_list *lookup_processor(u32 midr); #ifdef CONFIG_CPU_CP15 #define read_cpuid(reg) \ diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8e9a3e40d949..1a041ad4881e 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -667,22 +667,29 @@ static void __init smp_build_mpidr_hash(void) } #endif -static void __init setup_processor(void) +/* + * locate processor in the list of supported processor types. The linker + * builds this table for us from the entries in arch/arm/mm/proc-*.S + */ +struct proc_info_list *lookup_processor(u32 midr) { - struct proc_info_list *list; + struct proc_info_list *list = lookup_processor_type(midr); - /* - * locate processor in the list of supported processor - * types. The linker builds this table for us from the - * entries in arch/arm/mm/proc-*.S - */ - list = lookup_processor_type(read_cpuid_id()); if (!list) { - pr_err("CPU configuration botched (ID %08x), unable to continue.\n", - read_cpuid_id()); - while (1); + pr_err("CPU%u: configuration botched (ID %08x), CPU halted\n", + smp_processor_id(), midr); + while (1) + /* can't use cpu_relax() here as it may require MMU setup */; } + return list; +} + +static void __init setup_processor(void) +{ + unsigned int midr = read_cpuid_id(); + struct proc_info_list *list = lookup_processor(midr); + cpu_name = list->cpu_name; __cpu_architecture = __get_cpu_architecture(); @@ -700,7 +707,7 @@ static void __init setup_processor(void) #endif pr_info("CPU: %s [%08x] revision %d (ARMv%s), cr=%08lx\n", - cpu_name, read_cpuid_id(), read_cpuid_id() & 15, + list->cpu_name, midr, midr & 15, proc_arch[cpu_architecture()], get_cr()); snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c", -- 2.17.1