From patchwork Wed Feb 13 21:32:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158264 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp560990jaa; Wed, 13 Feb 2019 13:32:42 -0800 (PST) X-Received: by 2002:a0c:8b64:: with SMTP id d36mr189849qvc.233.1550093562548; Wed, 13 Feb 2019 13:32:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550093562; cv=none; d=google.com; s=arc-20160816; b=W/cnVaRS9gvjiPCoXHDPcJcKWGMXXfuXZpEki3RGkT9KI9/2YgbNmts8DmnS7jEcyk DSHU5T8b8mibwvEsK+KZGO4hQ+pvEzRj4zYW/bkwJkkHa08dyLPjEdAmfb5u2/nBEkIM kcCdGRfu72E8b5T+w3t0eZtfvFbd29+rmyfg6ashjKKmGDCgFuSuIdetNBlH6cVTYyXI i+TWa5CrVcUyX++WT9VOzN6R2kA9231uo+xRKzy3VJ71d77x6HaBj7JA7IVUJWx8c4ZK luqs/N/RKgZUPSrBM+bhGiCNmqe/TLya/3s2uxqKvxXJ/jEgHrDXqEJX9IC8Miztl3Zg nAoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yEcpOWz45DlZuRpoVIt2gmwCWgLldnvEJdiWLJe6SsM=; b=Q/7ePIYtkbOzDtUcMBR0BlI6KuB+gatULbba8Fy8le5hDzbOa1j4BzhJ9GH+OA/UBd NNQoBnWygB2tzSk+tjAlkHNmvpAV6WeG2fnHUYwlzXGakJ0F7eX3PaFwhaEYq1+IXzw7 gl+a3R8ugLwF36wNUxJwYGTy2AwGWFVUpx3dKOmO0HHn6AqTGVE6GZ6/dk3pfujUFHlW 6m42FTV3U0qDzG8j6YJEDF0GBEtJiAm3hQxYf5WnVJUvMboEX61hdF87CHWbHJy2jLL8 xPIo2QylYwQT6All0Tcb7sjqoa89len+9HAfcnJHLXXQYBMLKMJVVSXWFWB147k90ocr WzUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xY92Dfor; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z3sor525235qvm.31.2019.02.13.13.32.42 for (Google Transport Security); Wed, 13 Feb 2019 13:32:42 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xY92Dfor; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=yEcpOWz45DlZuRpoVIt2gmwCWgLldnvEJdiWLJe6SsM=; b=xY92DforhFbv2cZWVFuA+wAEWISzJgcbN6lHdt7O1OIqMul7FpvwUY4dO3MIKKf/BW ZwKyf5Bd+OiyU2l9g5HX8FtPcTV8U9gx5CUlAVD4tdNesRc7WswCrkahrnXbPkYEmBJC wkcU2K8p5lNL/CjZQS7If8YheKGndJ8eMWrSJ2Vdx5Dlgw7LRcUWjR2AuU0YB5zp+dhZ vVj6l2hxFqC6pfU+8/Odg+708ZzJK1s+AYVFIqaJOItwRe99hBN9rTyoqxljJjvOZshk isJv095UXK19rzhdejQCouHBYXeTpeKpeZkUngSMmvlSEyVLShes3zM61p3n6vOQP3Rq PKTw== 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=yEcpOWz45DlZuRpoVIt2gmwCWgLldnvEJdiWLJe6SsM=; b=kVoOKGfea2t0ZTZmoQbW/jjpbU5WkytdBt2nRwLbRWHzu+eFAEostGbcxB4DpqogSd 1D6w54j3dlLfF+yKPZandxlsVoTpGn2KMIrqnnxmtRR2dNJzEeyhHnFgcrD9kWfJrEj2 qHPyyEIAqUMg7IBWylqtW0z96Q4BweyoKfjf6mX8s087+1tPQvAU5cg6+42kamUv8e+t NaTvMHv1ncq7hopXzrKDX7WoHDKVwcFvfYxFtSN1/ovZkDFE3LZptn/JIWgAFv9MXaOx 2OgWMEetm9objW/7r/1r1MjJRVr3tXTBhoQzvGb2vhd45vx4wz5R97P/BtApD0akgH9Q JB/A== X-Gm-Message-State: AHQUAuY3dZI6Izu8LtDenNVVb+UtpNi5XoiR4q8zwWbRNJ7zDBNx7dd6 j4lBueruODd5Xw6QO6lt4NfDCADs X-Google-Smtp-Source: AHgI3Ib42+Syja8TX47oCJxenG/mcxAIKVkK95CvCXAvrmSpO6ztKtl0b+jWng2Z16b0f6Me+RQrlA== X-Received: by 2002:a0c:b90d:: with SMTP id u13mr247321qvf.66.1550093562264; Wed, 13 Feb 2019 13:32:42 -0800 (PST) Return-Path: Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id 8sm382675qtr.7.2019.02.13.13.32.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 13:32:41 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.19 12/17] ARM: split out processor lookup Date: Wed, 13 Feb 2019 16:32:18 -0500 Message-Id: <20190213213223.916-13-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190213213223.916-1-dave.long@linaro.org> References: <20190213213223.916-1-dave.long@linaro.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(-) -- 2.17.1 diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index 0d289240b6ca..775cac3c02bb 100644 --- a/arch/arm/include/asm/cputype.h +++ b/arch/arm/include/asm/cputype.h @@ -111,6 +111,7 @@ #include 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 4c249cb261f3..8fd7baa158a4 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",