From patchwork Fri Feb 3 13:50:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 52504 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp850437wrn; Fri, 3 Feb 2023 05:56:45 -0800 (PST) X-Google-Smtp-Source: AK7set+tDFkegIP7vUdQMAIb5wg+vcd/aweDufuWHY7YYWOzi/r+lBsRLRyd5bb98R3vFNILdqA9 X-Received: by 2002:a17:906:7c52:b0:78d:f455:b5d4 with SMTP id g18-20020a1709067c5200b0078df455b5d4mr11624058ejp.20.1675432605459; Fri, 03 Feb 2023 05:56:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675432605; cv=none; d=google.com; s=arc-20160816; b=llnjF1fvOb0xYg/zzRgVj4jFhDiOaIl1ZjoJ/GW/2l0kJfbKTYrjQmul8aKNUF2S1N 7aH3PhbHFGAa8D8Rwc8MREO3p9DVxaar14amkRyLDqds0CyjTNWa0uUGS/Ajwe/Haoqa hDeRUUoffKiYL0Ft1U9G4f3upWp4x+LdbHhzIaCsiglGWQo3JKqg+yjLO50Eizo96luy 5QFZR47KrRGu5VCNgJKGLhg5zqsR45o1ukYYWRh27RcMA0tA+oXQ0B1u4233p1RsNA2U a6kmKMWZLD7SHzJIq4U2PTlUVMzNIJ3eUzHj4cVRxXZWViumOGBf5FuNZlc9YYiLrbDZ ekyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=/iMFMNxhqRzrHRY9QKj/n+48aT3gwGXVj/DRoJpewG0=; b=ll5NoWHE0hhri6e2k7ZOHF1qlbOLj8cy+djD47Z1bs4iqzZqClinwypHJ7Kn1ZZTfM 7nQzIornJniJYWVTOWa/R6lFayeGvYhasxldV8PGIWaf4bWwc5WX37idzRdfQwMn3vXj j3p88AjcIb1NJHorlYwd5O58FAvFARa/VEqZ5VKE8saKzMGwMpvLruxNTaltkflL3XjX JjsYC9TJK1V/GDWhgZdAQ7xr6Yy/n+d7fsNv6IoYbWwSksBbXSO3iGZibw1DCqSPTB0X jAKVXmACECNY1j4awqZ92g8J1Y0IaE/maTIctdC2AI6WxI152KBxMXZ1mLBkvdr0xmnp qECA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v15-20020a17090610cf00b00889f329db7fsi1381309ejv.999.2023.02.03.05.56.22; Fri, 03 Feb 2023 05:56:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233083AbjBCNzr (ORCPT + 99 others); Fri, 3 Feb 2023 08:55:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233252AbjBCNzA (ORCPT ); Fri, 3 Feb 2023 08:55:00 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 95487A147C; Fri, 3 Feb 2023 05:53:28 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0EB6B15A1; Fri, 3 Feb 2023 05:53:30 -0800 (PST) Received: from eglon.cambridge.arm.com (eglon.cambridge.arm.com [10.1.196.177]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4197A3F71E; Fri, 3 Feb 2023 05:52:44 -0800 (PST) From: James Morse To: linux-pm@vger.kernel.org, loongarch@lists.linux.dev, kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org Cc: Marc Zyngier , Thomas Gleixner , Lorenzo Pieralisi , Mark Rutland , Sudeep Holla , Borislav Petkov , H Peter Anvin , Dave Hansen , Ingo Molnar , Will Deacon , Catalin Marinas , Huacai Chen , James Morse , Suzuki K Poulose , Oliver Upton , Len Brown , Rafael Wysocki , WANG Xuerui , Salil Mehta , Russell King , Jean-Philippe Brucker Subject: [RFC PATCH 13/32] ACPI: processor: Register all CPUs from acpi_processor_get_info() Date: Fri, 3 Feb 2023 13:50:24 +0000 Message-Id: <20230203135043.409192-14-james.morse@arm.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230203135043.409192-1-james.morse@arm.com> References: <20230203135043.409192-1-james.morse@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756818419639772204?= X-GMAIL-MSGID: =?utf-8?q?1756818419639772204?= To allow ACPI to skip the call to arch_register_cpu() when the _STA value indicates the CPU can't be brought online right now, move the arch_register_cpu() call into acpi_processor_get_info(). Systems can still be booted with 'acpi=off', or in the case of arm64, not include an ACPI description at all. For these, the CPUs are registered by cpu_dev_register_generic(). This moves the CPU register logic back to a subsys_initcall(), while the memory nodes will have been registered earlier. Signed-off-by: James Morse --- drivers/acpi/acpi_processor.c | 6 ++++++ drivers/base/cpu.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 967837b60453..a93a6c4115c4 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -272,6 +272,12 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->id = 0; } + if (!invalid_logical_cpuid(pr->id) && cpu_present(pr->id)) { + int ret = arch_register_cpu(pr->id); + if (ret) + return ret; + } + /* * Extra Processor objects may be enumerated on MP systems with * less than the max # of CPUs. They should be ignored _iff diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 178936533d87..0ba646022a5e 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -504,7 +504,7 @@ static void __init cpu_dev_register_generic(void) { int i; - if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES)) + if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES) || !acpi_disabled) return; for_each_present_cpu(i) {