Commit fd3e4543 authored Nov 15, 2017 by Ganapatrao Kulkarni Committed by Rafael J. Wysocki Nov 27, 2017

ACPI / NUMA: ia64: Parse all entries of SRAT memory affinity table



In current implementation, SRAT Memory Affinity Structure table
parsing is restricted to number of maximum memblocks allowed
(NR_NODE_MEMBLKS). However NR_NODE_MEMBLKS is defined individually
as per architecture requirements. Hence removing the restriction of
SRAT Memory Affinity Structure parsing in ACPI driver code and
let architecture code check for allowed memblocks count.

This check is already there in the x86 code, so do the same on ia64.

Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 4fbd8d19

arch/ia64/kernel/acpi.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -504,6 +504,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
		if (!(ma->flags & ACPI_SRAT_MEM_ENABLED))
		return -1;

		if (num_node_memblks >= NR_NODE_MEMBLKS) {
		pr_err("NUMA: too many memblk ranges\n");
		return -EINVAL;
		}

		/* record this node in proximity bitmap */
		pxm_bit_set(pxm);

drivers/acpi/numa.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -460,8 +460,7 @@ int __init acpi_numa_init(void)
		srat_proc, ARRAY_SIZE(srat_proc), 0);

		cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
		acpi_parse_memory_affinity,
		NR_NODE_MEMBLKS);
		acpi_parse_memory_affinity, 0);
		}

		/* SLIT: System Locality Information Table */

Admin message