From patchwork Wed Sep 13 16:38:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Morse X-Patchwork-Id: 138942 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1216533vqx; Wed, 13 Sep 2023 09:45:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1wYQKONIrfmzhzskGjz6xkjxm+8eBxHfWzlqWY8TvSEqXjJso6pcLdzUqo58A/CjiRo0k X-Received: by 2002:a17:902:eb46:b0:1bd:d15f:bdfa with SMTP id i6-20020a170902eb4600b001bdd15fbdfamr3163662pli.68.1694623537917; Wed, 13 Sep 2023 09:45:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694623537; cv=none; d=google.com; s=arc-20160816; b=hOeJ0tAVtqVxTAHa/V4hXv8gIKpTaqdrmke4i30Vgi9vcGcOv8EsdPXu330ogQVjI5 F69UodllLbZOqTOialCd6VGsjQdZr40i5bX6MTC/nlRTjJgc0rK3SNXdW2yOr+6Rjc6e cUykzdsV9j7U8j/ewFxsb6+rfptFtTw1pQrtaohH3rdJwWSzuoAWw8SbVbx7FP9dSW0b aZgFOHRMhyCALos+gPUslr3187xM6LUtdHDKEj5UFyGCEzqjqnJzLqV4qe8RoBMw5MW9 XZPcKI1E7gqyDTExcAwOobcdqKs0bwpXHBCWYAvrYxhb0RH+tQ87fua1ipyNmb5DB6xJ O5Eg== 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=KLugWriGX6zqaFgxpxKzTY3Tax57oIOyzp2E96kFWQ4=; fh=2nhVWB0fZ+8YH0lLFpnF/Mo8eq+n1VMLe+b+IpvS0g0=; b=sWOAGAVrAEjfJBpJqAm7hqItQ+xAiY/fQlK6aRSjvYxMZLvERuDgPUPSw1C/Htbhg0 AeSFUahUNFWwZr5KD0PpWwT728IknXwp5RBeMpDsrZlTwNTiE6FPZtHMKOJSBW5zknQ3 S/O95I4TxIcf1Nlli4ClwqTlPFrL3Jz9h5RKpayZvPhHqpDHsa7jvMxt4Nk6PmzbeFGk nyn2gxwLMdnNdVYSxc0PT2kYHk6P2W00HIFlf/2jFQI8PZNodbq1VH8wGUVECRx+P7uS X2vZl8y8oOsrAbFQW8DEbu+1EtWfhpGMTgnFSyS4geJMjE7AEA2qxMi2KTWxwSMJ/qNR L4sw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id ku3-20020a170903288300b001bbb8a61d3dsi10165386plb.562.2023.09.13.09.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:45:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 87ACC826EDB4; Wed, 13 Sep 2023 09:41:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231241AbjIMQl2 (ORCPT + 35 others); Wed, 13 Sep 2023 12:41:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231343AbjIMQki (ORCPT ); Wed, 13 Sep 2023 12:40:38 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 76A151FC2; Wed, 13 Sep 2023 09:39:45 -0700 (PDT) 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 54D001FB; Wed, 13 Sep 2023 09:40:22 -0700 (PDT) Received: from merodach.members.linode.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5A1BB3F5A1; Wed, 13 Sep 2023 09:39:43 -0700 (PDT) From: James Morse To: linux-pm@vger.kernel.org, loongarch@lists.linux.dev, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-riscv@lists.infradead.org, kvmarm@lists.linux.dev Cc: x86@kernel.org, Salil Mehta , Russell King , Jean-Philippe Brucker , jianyong.wu@arm.com, justin.he@arm.com Subject: [RFC PATCH v2 26/35] arm64: acpi: Move get_cpu_for_acpi_id() to a header Date: Wed, 13 Sep 2023 16:38:14 +0000 Message-Id: <20230913163823.7880-27-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230913163823.7880-1-james.morse@arm.com> References: <20230913163823.7880-1-james.morse@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 09:41:44 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776941570955236380 X-GMAIL-MSGID: 1776941570955236380 ACPI identifies CPUs by UID. get_cpu_for_acpi_id() maps the ACPI UID to the linux CPU number. The helper to retrieve this mapping is only available in arm64's numa code. Move it to live next to get_acpi_id_for_cpu(). Signed-off-by: James Morse Reviewed-by: Jonathan Cameron Reviewed-by: Gavin Shan --- arch/arm64/include/asm/acpi.h | 11 +++++++++++ arch/arm64/kernel/acpi_numa.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 4d537d56eb84..ce5045038e87 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -100,6 +100,17 @@ static inline u32 get_acpi_id_for_cpu(unsigned int cpu) return acpi_cpu_get_madt_gicc(cpu)->uid; } +static inline int get_cpu_for_acpi_id(u32 uid) +{ + int cpu; + + for (cpu = 0; cpu < nr_cpu_ids; cpu++) + if (uid == get_acpi_id_for_cpu(cpu)) + return cpu; + + return -EINVAL; +} + static inline void arch_fix_phys_package_id(int num, u32 slot) { } void __init acpi_init_cpus(void); int apei_claim_sea(struct pt_regs *regs); diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c index e51535a5f939..0c036a9a3c33 100644 --- a/arch/arm64/kernel/acpi_numa.c +++ b/arch/arm64/kernel/acpi_numa.c @@ -34,17 +34,6 @@ int __init acpi_numa_get_nid(unsigned int cpu) return acpi_early_node_map[cpu]; } -static inline int get_cpu_for_acpi_id(u32 uid) -{ - int cpu; - - for (cpu = 0; cpu < nr_cpu_ids; cpu++) - if (uid == get_acpi_id_for_cpu(cpu)) - return cpu; - - return -EINVAL; -} - static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header, const unsigned long end) {