| Message ID | 1567231103-13237-10-git-send-email-linyunsheng@huawei.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | check the node id consistently across different arches | expand |
diff --git a/arch/mips/include/asm/mach-loongson64/topology.h b/arch/mips/include/asm/mach-loongson64/topology.h index 7ff819a..b19b983 100644 --- a/arch/mips/include/asm/mach-loongson64/topology.h +++ b/arch/mips/include/asm/mach-loongson64/topology.h @@ -5,7 +5,17 @@ #ifdef CONFIG_NUMA #define cpu_to_node(cpu) (cpu_logical_map(cpu) >> 2) -#define cpumask_of_node(node) (&__node_data[(node)]->cpumask) + +static inline const struct cpumask *cpumask_of_node(int node) +{ + if (node >= MAX_NUMNODES) + return cpu_none_mask; + + if (node < 0 || !__node_data[node]) + return cpu_online_mask; + + return &__node_data[node]->cpumask; +} struct pci_bus; extern int pcibus_to_node(struct pci_bus *);
According to Section 6.2.14 from ACPI spec 6.3 [1], the setting of proximity domain is optional, as below: This optional object is used to describe proximity domain associations within a machine. _PXM evaluates to an integer that identifies a device as belonging to a Proximity Domain defined in the System Resource Affinity Table (SRAT). Since mips loongson64 uses __node_data instead of node_to_cpumask_map, this patch checks node id with the below case before returning &__node_data[node]->cpumask: 1. if node_id >= MAX_NUMNODES, return cpu_none_mask 2. if node_id < 0, return cpu_online_mask 3. if hub_data(node) is NULL, return cpu_online_mask [1] https://uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com> --- arch/mips/include/asm/mach-loongson64/topology.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)