mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-27 22:24:11 +08:00
a445699879
Currently, only acpi_early_node_map[0] was initialized to NUMA_NO_NODE.
To ensure all the values were properly initialized, switch to initialize
all of them to NUMA_NO_NODE.
Fixes: eabd9db64e ("ACPI: RISCV: Add NUMA support based on SRAT and SLIT")
Reported-by: Andrew Jones <ajones@ventanamicro.com>
Suggested-by: Andrew Jones <ajones@ventanamicro.com>
Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/0d362a8ae50558b95685da4c821b2ae9e8cf78be.1722828421.git.haibo1.xu@intel.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
132 lines
3.2 KiB
C
132 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* ACPI 6.6 based NUMA setup for RISCV
|
|
* Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c
|
|
*
|
|
* Copyright 2004 Andi Kleen, SuSE Labs.
|
|
* Copyright (C) 2013-2016, Linaro Ltd.
|
|
* Author: Hanjun Guo <hanjun.guo@linaro.org>
|
|
* Copyright (C) 2024 Intel Corporation.
|
|
*
|
|
* Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
|
|
*
|
|
* Called from acpi_numa_init while reading the SRAT and SLIT tables.
|
|
* Assumes all memory regions belonging to a single proximity domain
|
|
* are in one chunk. Holes between them will be included in the node.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) "ACPI: NUMA: " fmt
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/bitmap.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/mmzone.h>
|
|
#include <linux/module.h>
|
|
#include <linux/topology.h>
|
|
|
|
#include <asm/numa.h>
|
|
|
|
static int acpi_early_node_map[NR_CPUS] __initdata = { [0 ... NR_CPUS - 1] = NUMA_NO_NODE };
|
|
|
|
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_rintc_pxm(union acpi_subtable_headers *header,
|
|
const unsigned long end)
|
|
{
|
|
struct acpi_srat_rintc_affinity *pa;
|
|
int cpu, pxm, node;
|
|
|
|
if (srat_disabled())
|
|
return -EINVAL;
|
|
|
|
pa = (struct acpi_srat_rintc_affinity *)header;
|
|
if (!pa)
|
|
return -EINVAL;
|
|
|
|
if (!(pa->flags & ACPI_SRAT_RINTC_ENABLED))
|
|
return 0;
|
|
|
|
pxm = pa->proximity_domain;
|
|
node = pxm_to_node(pxm);
|
|
|
|
/*
|
|
* If we can't map the UID to a logical cpu this
|
|
* means that the UID is not part of possible cpus
|
|
* so we do not need a NUMA mapping for it, skip
|
|
* the SRAT entry and keep parsing.
|
|
*/
|
|
cpu = get_cpu_for_acpi_id(pa->acpi_processor_uid);
|
|
if (cpu < 0)
|
|
return 0;
|
|
|
|
acpi_early_node_map[cpu] = node;
|
|
pr_info("SRAT: PXM %d -> HARTID 0x%lx -> Node %d\n", pxm,
|
|
cpuid_to_hartid_map(cpu), node);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void __init acpi_map_cpus_to_nodes(void)
|
|
{
|
|
int i;
|
|
|
|
/*
|
|
* In ACPI, SMP and CPU NUMA information is provided in separate
|
|
* static tables, namely the MADT and the SRAT.
|
|
*
|
|
* Thus, it is simpler to first create the cpu logical map through
|
|
* an MADT walk and then map the logical cpus to their node ids
|
|
* as separate steps.
|
|
*/
|
|
acpi_table_parse_entries(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat),
|
|
ACPI_SRAT_TYPE_RINTC_AFFINITY, acpi_parse_rintc_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 -> logical node ID mapping */
|
|
void __init acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa)
|
|
{
|
|
int pxm, node;
|
|
|
|
if (srat_disabled())
|
|
return;
|
|
|
|
if (pa->header.length < sizeof(struct acpi_srat_rintc_affinity)) {
|
|
pr_err("SRAT: Invalid SRAT header length: %d\n", pa->header.length);
|
|
bad_srat();
|
|
return;
|
|
}
|
|
|
|
if (!(pa->flags & ACPI_SRAT_RINTC_ENABLED))
|
|
return;
|
|
|
|
pxm = pa->proximity_domain;
|
|
node = acpi_map_pxm_to_node(pxm);
|
|
|
|
if (node == NUMA_NO_NODE) {
|
|
pr_err("SRAT: Too many proximity domains %d\n", pxm);
|
|
bad_srat();
|
|
return;
|
|
}
|
|
|
|
node_set(node, numa_nodes_parsed);
|
|
}
|