From patchwork Fri Feb 3 13:50:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 52494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp849718wrn; Fri, 3 Feb 2023 05:54:54 -0800 (PST) X-Google-Smtp-Source: AK7set+yf4kG9xT7sKseW9hIwfOo4+/1RwNbFjgrQwzHoAZxYYdTpbvnVpt0Ox+RXriRt2PevqKf X-Received: by 2002:a17:906:5054:b0:880:23b8:4d42 with SMTP id e20-20020a170906505400b0088023b84d42mr11803676ejk.19.1675432494318; Fri, 03 Feb 2023 05:54:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675432494; cv=none; d=google.com; s=arc-20160816; b=svYUfDKMN9Thebj7t4DxJoauMs1dtKjNC2U0w0pqnA+kIwPspKX2fJ2Ns7odeHrIbE MJTLodselYqP4R/Zpeekk9YhS0vExjEv98yT6+JEGLcJauAoAcxocU8TONCC2hQpwxeP d0KCvQXZWwa3iGC8yJD4rNJHOiK0uxw6YHOL0Z5NHCx3kDPXO2TrWt28TpjGpdFcd10e DR6Irk9qYhk4L7gugJ+tEWqP+9MwrcSWARkLCjK8nj/GPnbEagdwG0prNfOGEs/yh9GS 61D3w05NylnHPks1Z8AShqkoumMtj30DMJmPh3Y9Gwl0NTFMf/7jxju8WEfDqQE1Z+6m 62ZA== 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=Wnw15l0d718monvMJesSwipNj8AuVj8nW/KEUWaybA8=; b=v1UolApq/Otmh9rVW/leRMkUt4bMNAjvvggjlPfHy4MDxTdm1zGCDkAz6rej++Xk14 /040IIwulQNle+Pook2Vf64bf+oUjZ+qvDeVDiw32LKvo+UdlmE+5L29679fTK43fODu KKO48mSGfulvSlvY4OYGdI/GyQbnkwABs6k+mJkfErCnBIsbty6EMhiK56elx6kxhDvr NL5GlIVcCjKJvGpsqn8DlfNxSy4pOUQ51SxPFqjihehBkiRwoHA8f8yO6XiDC7J8RGv4 0oUNjWJj2gynLkVXjFpjqsoJiMCp1+OIurbf7Z4G4wYdPtwhV82wdvQ9M9gh8zzFvuIB zUTQ== 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 gc17-20020a1709072b1100b00879b98e37acsi3088542ejc.331.2023.02.03.05.54.29; Fri, 03 Feb 2023 05:54:54 -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 S233005AbjBCNxb (ORCPT + 99 others); Fri, 3 Feb 2023 08:53:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233161AbjBCNwd (ORCPT ); Fri, 3 Feb 2023 08:52:33 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 804E7A1453; Fri, 3 Feb 2023 05:52:18 -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 6C73B1474; Fri, 3 Feb 2023 05:53:00 -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 9E52A3F71E; Fri, 3 Feb 2023 05:52:14 -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 06/32] arm64: setup: Switch over to GENERIC_CPU_DEVICES using arch_register_cpu() Date: Fri, 3 Feb 2023 13:50:17 +0000 Message-Id: <20230203135043.409192-7-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?1756818303342656451?= X-GMAIL-MSGID: =?utf-8?q?1756818303342656451?= To allow ACPI's _STA value to hide CPUs that are present, but not available to online right now due to VMM of firmware policy, the register_cpu() call needs to be made by the ACPI machinery when ACPI is in use. Switching to GENERIC_CPU_DEVICES is an intermediate step to allow all four ACPI architectures to be modified at once. Switch over to GENERIC_CPU_DEVICES, and provide an arch_register_cpu() that populates the hotpluggable flag. arch_register_cpu() is also the interface the ACPI machinery expects. The struct cpu in struct cpuinfo_arm64 is never used directly, remove it to use the one GENERIC_CPU_DEVICES provides. Signed-off-by: James Morse --- arch/arm64/Kconfig | 1 + arch/arm64/include/asm/cpu.h | 1 - arch/arm64/kernel/setup.c | 13 ++++--------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 03934808b2ed..6d272dad8eba 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -127,6 +127,7 @@ config ARM64 select GENERIC_ARCH_TOPOLOGY select GENERIC_CLOCKEVENTS_BROADCAST select GENERIC_CPU_AUTOPROBE + select GENERIC_CPU_DEVICES select GENERIC_CPU_VULNERABILITIES select GENERIC_EARLY_IOREMAP select GENERIC_IDLE_POLL_SETUP diff --git a/arch/arm64/include/asm/cpu.h b/arch/arm64/include/asm/cpu.h index fd7a92219eea..eca1aea89e81 100644 --- a/arch/arm64/include/asm/cpu.h +++ b/arch/arm64/include/asm/cpu.h @@ -38,7 +38,6 @@ struct cpuinfo_32bit { }; struct cpuinfo_arm64 { - struct cpu cpu; struct kobject kobj; u64 reg_ctr; u64 reg_cntfrq; diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 12cfe9d0d3fa..de6eb242faec 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -395,19 +395,14 @@ static inline bool cpu_can_disable(unsigned int cpu) return false; } -static int __init topology_init(void) +int arch_register_cpu(int num) { - int i; + struct cpu *cpu = &per_cpu(cpu_devices, num); - for_each_possible_cpu(i) { - struct cpu *cpu = &per_cpu(cpu_data.cpu, i); - cpu->hotpluggable = cpu_can_disable(i); - register_cpu(cpu, i); - } + cpu->hotpluggable = cpu_can_disable(num); - return 0; + return register_cpu(cpu, num); } -subsys_initcall(topology_init); static void dump_kernel_offset(void) {