From patchwork Thu Feb 14 02:10:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158285 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp793858jaa; Wed, 13 Feb 2019 18:10:41 -0800 (PST) X-Received: by 2002:ac8:2b4b:: with SMTP id 11mr1029213qtv.252.1550110241507; Wed, 13 Feb 2019 18:10:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550110241; cv=none; d=google.com; s=arc-20160816; b=QzQiMiD/wpJbwslicg4DaLmzIsFHYD0q7hbgcOp/i1LMBI9OrgG7HgQWI7XitTGbfK 1nIdUAZ+0sw+LIIoGH505jOd9OrH7mVWVGwXQUkGjTiVGRu58uwrh79nR8Dd+yQa/Lrl bxee9H7aZUvTq9sTfEfrlYTK3zvuBl8mBRA5oxd10LFQOySpz58zjHqooJE/P7xZdA7r NXuMYsb3KHnQIYvbwo07G20komhdC92WrOxl4FH5dDn+haKHMOeLfBnoQPzmmT6JmGjL NLj01jQINsCZGjjCmx7eppMwQMgss0/gDaXk8RgLwkAtNMf1KF4LClzrUKpWQigBrFeC Cz3Q== 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=yvoFdkch7Gd4/MbRPm6+HJonlCHu2OWfPFxCbumCzMk=; b=U0BPMMlpwoms0lvzzpV7Y6p3jjNdv8o6nC01Bv5r/SbFxY2Lkk97am8vbKXEpyTh+R zEN+vGEmbkrzl4DS6pZ7V28GNDysULEdEw/vJ9o1FWjUH/dcZp2hUL1kkMmmIkIvGjMR arKPSFhbQs0UZkim3AaYZRG2nrDu0MmHdqO9ya+piLUyi6Y94mYn9/rBEwvQQ6zWnAgI H2+Io9/zphBVdk10dEZEuW2fMctPf080rmDpHsm4Dg4QfDum9suqrR+0rE0lf1LEYFrB fp13YFQT09at+KOD5xJC+523cdsZAY4YbbSOZb0DwJX7LTDESAWX1rtxPReX5ZuHdyXV OQmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ysqTniWx; 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 b67sor659257qke.9.2019.02.13.18.10.41 for (Google Transport Security); Wed, 13 Feb 2019 18:10:41 -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=ysqTniWx; 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=yvoFdkch7Gd4/MbRPm6+HJonlCHu2OWfPFxCbumCzMk=; b=ysqTniWxOkEN223i3ZqWK3+2Xx1kjnpb4gHRW2xyYDchldG5zL+5a7Q45TMllbqhik UMkxm3LHpdFxxbq6PxHFEf0+SBDVl2Xu8qSZDx3G3Mz3fWBKF+WyDb1kkr3+VxCWv4Pd k1j0NvkzzmIvTB63xRZU9nTgReJRTN40s0dNxlf1e2t20U6XEqi+Y47J6xrizZKowm53 z13xmgLXYXfKsA8zfiN8Wyu3LUa3daVdekpZ6dgt6RGt/4Ioxo99mQ+vAfIrLwmvtNbN j3cOHDiedKf01Bf28npHWE8pKictERK9jStB1KOLoTqgPk/y1sL3E7fNMqtdHlb05Ugj bO2g== 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=bYJmoQYumUjVU18zIR5vynM5PYSw9BZzAkMXrnAz2DLmxBu6QTq69VlUnSv2jPs3Tj t/4TT5/9G5UwXyZJ8oh2eyrC98++AsKced00d5oRCcHm37nwxunw4YBexFcNf4BlIKTJ RG1knhGSxS2Sq/sJ7/iocxiMyEDEgy74cDZSR7Wvv4HVb1aXp4BMmoa9u/ND4b1JXlWY wOqX6ZC3btxLE6Vx5NIrTzaYGnFRDSXISAuy4He4y89/+cEO3gFIK8QMVon7wT7OmKGT FbVi8aq7QNUCWbOH45ogaddRdJrURWgeNGUu9tMvE8kjK6l3jjhiZtlROn8SIkX7lGqv JJNg== X-Gm-Message-State: AHQUAuYS/68XSAvD9QKVYI4krVMzjpLwczZUo4D5+JSHJy22jAhrsuTc B3mh5Mtt9dqU8RTI9cg8OyKyggIB X-Google-Smtp-Source: AHgI3IabMFdTfhlPPpeJQQWD5R+ltUy+nb2QKWqd38UJDeiPhzGdYN9mZwzizCIwSQRfAGIynBGIRw== X-Received: by 2002:a37:8e81:: with SMTP id q123mr998935qkd.34.1550110241233; Wed, 13 Feb 2019 18:10:41 -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 d63sm1091575qka.22.2019.02.13.18.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 18:10:40 -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.14 V2 12/17] ARM: split out processor lookup Date: Wed, 13 Feb 2019 21:10:17 -0500 Message-Id: <20190214021022.5313-13-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214021022.5313-1-dave.long@linaro.org> References: <20190214021022.5313-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 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",