From patchwork Wed Apr 17 13:18:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 789372 Received: from frasgout.his.huawei.com (frasgout.his.huawei.com [185.176.79.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5C0A13DDB4; Wed, 17 Apr 2024 13:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.176.79.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713360138; cv=none; b=gfW4vC1Gaevgv2Dwa2v4G/AgvZDqShIVmcTDpn3XYlvO1IjoG+727yvw+sRUXKS/z0CMYnNiy77LPLRM7JhP2opuy4kYpGSTPdXu09seGjizJHW9aNH80inqDFrsr9sssl83GxVHqdV/3RXoZUr48SCCKoS72KIwdffvm/yygqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713360138; c=relaxed/simple; bh=q9rgmuhSWFWOIBpDyuBLJUfTWRpK6MQ/Ah9Dl96hfnk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JD6NNW0XJljlKfvmPm7jvblf+WtIGh8BNzotDJJgIzBRQ9FYHejp8TS/B3qoi2DrUQScW/lqTd1RhrUZgnMENxVKhQIP8JHfTsAu/cM0fDl/SYy4+3meaNUaNgprN53ePCwV0gypgJfLJ9wRKG01lcvVdWhJHRlrEWGC18MzbKY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=185.176.79.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4VKM325X8Hz6H7hk; Wed, 17 Apr 2024 21:20:14 +0800 (CST) Received: from lhrpeml500005.china.huawei.com (unknown [7.191.163.240]) by mail.maildlp.com (Postfix) with ESMTPS id D07C9140B38; Wed, 17 Apr 2024 21:22:14 +0800 (CST) Received: from SecurePC-101-06.china.huawei.com (10.122.247.231) by lhrpeml500005.china.huawei.com (7.191.163.240) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 17 Apr 2024 14:22:14 +0100 From: Jonathan Cameron To: Thomas Gleixner , Peter Zijlstra , , , , , , , , , Russell King , "Rafael J . Wysocki" , Miguel Luis , James Morse , Salil Mehta , Jean-Philippe Brucker , Catalin Marinas , Will Deacon CC: Ingo Molnar , Borislav Petkov , Dave Hansen , , , Subject: [PATCH v6 06/16] ACPI: processor: Register deferred CPUs from acpi_processor_get_info() Date: Wed, 17 Apr 2024 14:18:59 +0100 Message-ID: <20240417131909.7925-7-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240417131909.7925-1-Jonathan.Cameron@huawei.com> References: <20240417131909.7925-1-Jonathan.Cameron@huawei.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: lhrpeml500001.china.huawei.com (7.191.163.213) To lhrpeml500005.china.huawei.com (7.191.163.240) From: James Morse The arm64 specific arch_register_cpu() call may defer CPU registration until the ACPI interpreter is available and the _STA method can be evaluated. If this occurs, then a second attempt is made in acpi_processor_get_info(). Note that the arm64 specific call has not yet been added so for now this will be called for the original hotplug case. For architectures that do not defer until the ACPI Processor driver loads (e.g. x86), for initially present CPUs there will already be a CPU device. If present do not try to register again. Systems can still be booted with 'acpi=off', or not include an ACPI description at all as in these cases arch_register_cpu() will not have deferred registration when first called. This moves the CPU register logic back to a subsys_initcall(), while the memory nodes will have been registered earlier. Note this is where the call was prior to the cleanup series so there should be no side effects of moving it back again for this specific case. [PATCH 00/21] Initial cleanups for vCPU HP. https://lore.kernel.org/all/ZVyz%2FVe5pPu8AWoA@shell.armlinux.org.uk/ e.g. 5b95f94c3b9f ("x86/topology: Switch over to GENERIC_CPU_DEVICES") Signed-off-by: James Morse Reviewed-by: Gavin Shan Tested-by: Miguel Luis Tested-by: Vishnu Pajjuri Tested-by: Jianyong Wu Signed-off-by: Russell King (Oracle) Co-developed-by: Jonathan Cameron Signed-off-by: Joanthan Cameron --- v6: Squash the two paths for conventional CPU Hotplug and arm64 vCPU HP. v5: Update commit message to make it clear this is moving the init back to where it was until very recently. No longer change the condition in the earlier registration point as that will be handled by the arm64 registration routine deferring until called again here. --- drivers/acpi/acpi_processor.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 7ecb13775d7f..0cac77961020 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -356,8 +356,18 @@ static int acpi_processor_get_info(struct acpi_device *device) * * NOTE: Even if the processor has a cpuid, it may not be present * because cpuid <-> apicid mapping is persistent now. + * + * Note this allows 3 flows, it is up to the arch_register_cpu() + * call to reject any that are not supported on a given architecture. + * A) CPU becomes present. + * B) Previously invalid logical CPU ID (Same as becoming present) + * C) CPU already present and now being enabled (and wasn't registered + * early on an arch that doesn't defer to here) */ - if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) { + if ((!invalid_logical_cpuid(pr->id) && cpu_present(pr->id) && + !get_cpu_device(pr->id)) || + invalid_logical_cpuid(pr->id) || + !cpu_present(pr->id)) { ret = acpi_processor_hotadd_init(pr, device); if (ret)