From patchwork Sun Aug 11 04:23:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 818456 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 E591D11CAB for ; Sun, 11 Aug 2024 04:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350209; cv=none; b=LFAgpkc+jDjohDWeB/L/Wu2A5QAa/vho2e2JiRbMZ3UdOXnWBggTbCcCObViM6D+8E3I9yxfL94C+SIbPrMlva8LA6z2/WgoOseyy7M+bTnwNxed6w3jQjx4XgvBEb6BEpH3Kw1UmCn5oTeh9XKP9ne1cIfzKsF5PDnPgaTHgzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350209; c=relaxed/simple; bh=xpJSspjo/kxZJVLu6z9sm7UqL8TSnlpBfcXKMMsCcg0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KLkWA3edCbcE8LF/jIZz1ETcXyIKlT+f3kTjzm7h2UnBs/iEJ9JeTtPPxo6G34G9AaPhqsqRXBOSLKJ2FoN+LY9OB21TnzB1wSPJ/5/sc+CpKtiWGsG/AUcEGMtrCEXQiak1hCERPyov0IW5eCfoqbfE9ONnhWUb2AABS3wMcMA= 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=45.249.212.187 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.19.162.254]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4WhPdY2z5CzyP5F; Sun, 11 Aug 2024 12:22:57 +0800 (CST) Received: from dggpemf500002.china.huawei.com (unknown [7.185.36.57]) by mail.maildlp.com (Postfix) with ESMTPS id 27733180101; Sun, 11 Aug 2024 12:23:23 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf500002.china.huawei.com (7.185.36.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sun, 11 Aug 2024 12:23:22 +0800 From: Hanjun Guo To: Sudeep Holla , Lorenzo Pieralisi , "Rafael J . Wysocki" CC: Will Deacon , Catalin Marinas , , , Hanjun Guo Subject: [PATCH v2 1/4] ARM64: ACPI: Remove the leftover acpi_init_cpus() Date: Sun, 11 Aug 2024 12:23:00 +0800 Message-ID: <20240811042303.3498761-2-guohanjun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240811042303.3498761-1-guohanjun@huawei.com> References: <20240811042303.3498761-1-guohanjun@huawei.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf500002.china.huawei.com (7.185.36.57) In commit 0f0783365cbb ("ARM64: kernel: unify ACPI and DT cpus initialization"), function acpi_init_cpus() was removed but the declaration was left in the asm/acpi.h, remove it. Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acpi.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index a407f9cd549e..e872d28edb04 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -132,10 +132,8 @@ static inline int get_cpu_for_acpi_id(u32 uid) } 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); #else -static inline void acpi_init_cpus(void) { } static inline int apei_claim_sea(struct pt_regs *regs) { return -ENOENT; } #endif /* CONFIG_ACPI */ From patchwork Sun Aug 11 04:23:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 820353 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (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 0442FFC11 for ; Sun, 11 Aug 2024 04:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350214; cv=none; b=VD/kqKwe+1Qk4hCcHwfWWTr4g7dYApbX5eSLo56fuc4/Pw1Olk6tCAwxi++Ky8yjR9rXKSLdCIgKMQrDSiktvhbJpSV/cUXODLOJDKfKOuEPcR4w56SvwKurfoIz9HQsBRpHLVlwNRDK3YM1UPHssGQgg3dIbNoOHiifTsW6+HQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350214; c=relaxed/simple; bh=sjJ0eZhlAhrVM4dqw8JpuA7hLDl1o1M5bxNmRl1f2Kc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OhZaeoPEf2MJSCVx6484AWsSwSnzUdD3QCInY3DgtqwL5PjadpRqI+Eix2AcapuPKpFChZejWn8JOsX8Joh8J7ejoyUypshqwx1vAqtYJMK2saDcosFiHjGapgOxPJMV1+xxYT2+Rkino3ymObLJ/6nQTsuuiXEAar0RFJg8STc= 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=45.249.212.189 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.19.163.252]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4WhPXr5lGtzQpWm; Sun, 11 Aug 2024 12:18:52 +0800 (CST) Received: from dggpemf500002.china.huawei.com (unknown [7.185.36.57]) by mail.maildlp.com (Postfix) with ESMTPS id 9B1871800A0; Sun, 11 Aug 2024 12:23:23 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf500002.china.huawei.com (7.185.36.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sun, 11 Aug 2024 12:23:23 +0800 From: Hanjun Guo To: Sudeep Holla , Lorenzo Pieralisi , "Rafael J . Wysocki" CC: Will Deacon , Catalin Marinas , , , Hanjun Guo Subject: [PATCH v2 2/4] ARM64: ACPI: Remove the leftover arm64_acpi_numa_init() Date: Sun, 11 Aug 2024 12:23:01 +0800 Message-ID: <20240811042303.3498761-3-guohanjun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240811042303.3498761-1-guohanjun@huawei.com> References: <20240811042303.3498761-1-guohanjun@huawei.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf500002.china.huawei.com (7.185.36.57) In commit eb75541f8b45 ("arm64, numa: Change the numa init functions name to be generic"), arm64_acpi_numa_init() was renamed to arch_acpi_numa_init() and be static, so the leftover arm64_acpi_numa_init() in head file should be removed. Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acpi.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index e872d28edb04..5e25110ad1b7 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -175,11 +175,9 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) #endif /* CONFIG_ACPI_APEI */ #ifdef CONFIG_ACPI_NUMA -int arm64_acpi_numa_init(void); int acpi_numa_get_nid(unsigned int cpu); void acpi_map_cpus_to_nodes(void); #else -static inline int arm64_acpi_numa_init(void) { return -ENOSYS; } static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } static inline void acpi_map_cpus_to_nodes(void) { } #endif /* CONFIG_ACPI_NUMA */ From patchwork Sun Aug 11 04:23:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 818455 Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) (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 1BE1D101C4 for ; Sun, 11 Aug 2024 04:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.190 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350214; cv=none; b=F93sJisrNa1qYhW2ImdoYcB+FzDMItCA11iuD2FezPdV+EuxZ2oELsr5VvVVWht5oR0StrB4leTs5aXg7QYDm1u8ktR3IU4LEBZjXwUFTI7DkNa9baaRR5oZo3HoXp+KX9c2fvQe7y6UNA0O3Royo3vD7Uq+vcqFV4YRna0yvJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350214; c=relaxed/simple; bh=5iBR2l9ylKoGUWPzBkh3Or4BcYRBka8ZpxwL+cmpe4M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iP9Qx5pEgabC8DEZMtwPF6X2Om1zABAbBiQZpgvj3/Ho/87EJ/yq6yl9R//tBintX8jfr8nrfbstU9/RwGnwpllgwmgogQEEdcC7lKGy4hiJTlr7M9TYqwySLpxZF7dKq+zf3ybgmbFvXwgvYP9RZqh6Z1uShCjblTW55vjFvWI= 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=45.249.212.190 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.19.88.163]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4WhPXX25fqz2CmK8; Sun, 11 Aug 2024 12:18:36 +0800 (CST) Received: from dggpemf500002.china.huawei.com (unknown [7.185.36.57]) by mail.maildlp.com (Postfix) with ESMTPS id 1A38618001B; Sun, 11 Aug 2024 12:23:24 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf500002.china.huawei.com (7.185.36.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sun, 11 Aug 2024 12:23:23 +0800 From: Hanjun Guo To: Sudeep Holla , Lorenzo Pieralisi , "Rafael J . Wysocki" CC: Will Deacon , Catalin Marinas , , , Hanjun Guo Subject: [PATCH v2 3/4] ARM64: ACPI: Make acpi_numa_get_nid() invisible to kernel/smp.c Date: Sun, 11 Aug 2024 12:23:02 +0800 Message-ID: <20240811042303.3498761-4-guohanjun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240811042303.3498761-1-guohanjun@huawei.com> References: <20240811042303.3498761-1-guohanjun@huawei.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf500002.china.huawei.com (7.185.36.57) To do the preparation of moving acpi_numa.c to drivers/acpi/arm64, Make acpi_numa_get_nid() invisible to kernel/smp.c, with less export functions. Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acpi.h | 2 -- arch/arm64/kernel/acpi_numa.c | 8 +++++++- arch/arm64/kernel/smp.c | 5 ----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 5e25110ad1b7..40a501e1f26b 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -175,10 +175,8 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) #endif /* CONFIG_ACPI_APEI */ #ifdef CONFIG_ACPI_NUMA -int acpi_numa_get_nid(unsigned int cpu); void acpi_map_cpus_to_nodes(void); #else -static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } static inline void acpi_map_cpus_to_nodes(void) { } #endif /* CONFIG_ACPI_NUMA */ diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c index 0c036a9a3c33..2e55ff02bf07 100644 --- a/arch/arm64/kernel/acpi_numa.c +++ b/arch/arm64/kernel/acpi_numa.c @@ -29,7 +29,7 @@ static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE }; -int __init acpi_numa_get_nid(unsigned int cpu) +static int __init acpi_numa_get_nid(unsigned int cpu) { return acpi_early_node_map[cpu]; } @@ -72,9 +72,15 @@ static int __init acpi_parse_gicc_pxm(union acpi_subtable_headers *header, void __init acpi_map_cpus_to_nodes(void) { + int i; + acpi_table_parse_entries(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat), ACPI_SRAT_TYPE_GICC_AFFINITY, acpi_parse_gicc_pxm, 0); + + for (i = 0; i < nr_cpu_ids; i++) + early_map_cpu_to_node(i, acpi_numa_get_nid(i)); + } /* Callback for Proximity Domain -> ACPI processor UID mapping */ diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 5e18fbcee9a2..b717b77ed4d6 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -650,8 +650,6 @@ acpi_parse_gic_cpu_interface(union acpi_subtable_headers *header, static void __init acpi_parse_and_init_cpus(void) { - int i; - /* * do a walk of MADT to determine how many CPUs * we have including disabled CPUs, and get information @@ -669,9 +667,6 @@ static void __init acpi_parse_and_init_cpus(void) * as separate steps. */ acpi_map_cpus_to_nodes(); - - for (i = 0; i < nr_cpu_ids; i++) - early_map_cpu_to_node(i, acpi_numa_get_nid(i)); } #else #define acpi_parse_and_init_cpus(...) do { } while (0) From patchwork Sun Aug 11 04:23:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 818454 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (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 231291171C for ; Sun, 11 Aug 2024 04:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350215; cv=none; b=pQsFulgf1rN+LecIebxncVS5ioTW9w87E+3Pa7z69ORFsxPdEtinBN6SijdZ2mh7iPkVfyYFNDjcdsgEVnmSmrXhRD+apzvMV2NB9x/dWyMb9Xd9KOLVS7xz5DrcRQl4Eu84ZZD26+UZwkULmGw4KVvBBMNu2EB9+1MBrHwwOLs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723350215; c=relaxed/simple; bh=37p30hmVwlYYjNuW+Hxc5jsFpZWdhlpW3NjHuwz5kR8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NwhWroYHZSImAoZjJifVwXfI+4S1IH04eU1tT6d7Tscg5n9GV05ie58zFOiOCe/yUtlHVJdRxtKXq3ZShNkBtpTYgjrX7Qx02fthD8pafIgVuBa8JDxkfYa6xRg+kVLebwTe8W+F0/pfljteXGDM9qqKwChewGOFnA8bkkv6cgI= 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=45.249.212.189 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.19.88.194]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4WhPXs5GyxzQpWs; Sun, 11 Aug 2024 12:18:53 +0800 (CST) Received: from dggpemf500002.china.huawei.com (unknown [7.185.36.57]) by mail.maildlp.com (Postfix) with ESMTPS id 8A98714022E; Sun, 11 Aug 2024 12:23:24 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf500002.china.huawei.com (7.185.36.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sun, 11 Aug 2024 12:23:24 +0800 From: Hanjun Guo To: Sudeep Holla , Lorenzo Pieralisi , "Rafael J . Wysocki" CC: Will Deacon , Catalin Marinas , , , Hanjun Guo Subject: [PATCH v2 4/4] ARM64: ACPI: Move the NUMA code to drivers/acpi/arm64/ Date: Sun, 11 Aug 2024 12:23:03 +0800 Message-ID: <20240811042303.3498761-5-guohanjun@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240811042303.3498761-1-guohanjun@huawei.com> References: <20240811042303.3498761-1-guohanjun@huawei.com> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf500002.china.huawei.com (7.185.36.57) The ARM64 ACPI NUMA code can be moved out of arm64 arch code as it just related to ACPI NUMA table parsing, mappings for ACPI numa node and cpu, so move the ACPI NUMA code to drivers/acpi/arm64/. Since arm64 selects ACPI_NUMA by default if ACPI=y, just move the function definitions under CONFIG_ARM64 in linux/acpi.h, as the caller of acpi_map_cpus_to_nodes() is only with ACPI selected, so no inline function is needed, this will solve the conflict with riscv implementation as well. Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acpi.h | 6 ------ arch/arm64/kernel/Makefile | 1 - drivers/acpi/arm64/Makefile | 1 + {arch/arm64/kernel => drivers/acpi/arm64}/acpi_numa.c | 0 include/linux/acpi.h | 1 + 5 files changed, 2 insertions(+), 7 deletions(-) rename {arch/arm64/kernel => drivers/acpi/arm64}/acpi_numa.c (100%) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 40a501e1f26b..572355783971 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -174,12 +174,6 @@ static inline pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr) } #endif /* CONFIG_ACPI_APEI */ -#ifdef CONFIG_ACPI_NUMA -void acpi_map_cpus_to_nodes(void); -#else -static inline void acpi_map_cpus_to_nodes(void) { } -#endif /* CONFIG_ACPI_NUMA */ - #define ACPI_TABLE_UPGRADE_MAX_PHYS MEMBLOCK_ALLOC_ACCESSIBLE #endif /*_ASM_ACPI_H*/ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 2b112f3b7510..c7d09c6348a4 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -52,7 +52,6 @@ obj-$(CONFIG_EFI) += efi.o efi-rt-wrapper.o obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_ARMV8_DEPRECATED) += armv8_deprecated.o obj-$(CONFIG_ACPI) += acpi.o -obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_ARM64_ACPI_PARKING_PROTOCOL) += acpi_parking_protocol.o obj-$(CONFIG_PARAVIRT) += paravirt.o obj-$(CONFIG_RANDOMIZE_BASE) += kaslr.o diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile index 05ecde9eaabe..9aeed2e4ebde 100644 --- a/drivers/acpi/arm64/Makefile +++ b/drivers/acpi/arm64/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ACPI_APMT) += apmt.o obj-$(CONFIG_ACPI_FFH) += ffh.o obj-$(CONFIG_ACPI_GTDT) += gtdt.o obj-$(CONFIG_ACPI_IORT) += iort.o +obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.o obj-$(CONFIG_ARM_AMBA) += amba.o obj-y += dma.o init.o diff --git a/arch/arm64/kernel/acpi_numa.c b/drivers/acpi/arm64/acpi_numa.c similarity index 100% rename from arch/arm64/kernel/acpi_numa.c rename to drivers/acpi/arm64/acpi_numa.c diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0687a442fec7..09e0c2ad8c43 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -253,6 +253,7 @@ static inline void acpi_arch_dma_setup(struct device *dev) { } #endif #ifdef CONFIG_ARM64 +void acpi_map_cpus_to_nodes(void); void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa); #else static inline void