| From f060db99374e80e853ac4916b49f0a903f65e9dc Mon Sep 17 00:00:00 2001 |
| From: Jia He <justin.he@arm.com> |
| Date: Wed, 22 Sep 2021 23:29:19 +0800 |
| Subject: ACPI: NFIT: Use fallback node id when numa info in NFIT table is incorrect |
| |
| From: Jia He <justin.he@arm.com> |
| |
| commit f060db99374e80e853ac4916b49f0a903f65e9dc upstream. |
| |
| When ACPI NFIT table is failing to populate correct numa information |
| on arm64, dax_kmem will get NUMA_NO_NODE from the NFIT driver. |
| |
| Without this patch, pmem can't be probed as RAM devices on arm64 guest: |
| $ndctl create-namespace -fe namespace0.0 --mode=devdax --map=dev -s 1g -a 128M |
| kmem dax0.0: rejecting DAX region [mem 0x240400000-0x2bfffffff] with invalid node: -1 |
| kmem: probe of dax0.0 failed with error -22 |
| |
| Suggested-by: Dan Williams <dan.j.williams@intel.com> |
| Signed-off-by: Jia He <justin.he@arm.com> |
| Cc: <stable@vger.kernel.org> |
| Fixes: c221c0b0308f ("device-dax: "Hotplug" persistent memory for use like normal RAM") |
| Link: https://lore.kernel.org/r/20210922152919.6940-1-justin.he@arm.com |
| Signed-off-by: Dan Williams <dan.j.williams@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/acpi/nfit/core.c | 12 ++++++++++++ |
| 1 file changed, 12 insertions(+) |
| |
| --- a/drivers/acpi/nfit/core.c |
| +++ b/drivers/acpi/nfit/core.c |
| @@ -3018,6 +3018,18 @@ static int acpi_nfit_register_region(str |
| ndr_desc->target_node = NUMA_NO_NODE; |
| } |
| |
| + /* Fallback to address based numa information if node lookup failed */ |
| + if (ndr_desc->numa_node == NUMA_NO_NODE) { |
| + ndr_desc->numa_node = memory_add_physaddr_to_nid(spa->address); |
| + dev_info(acpi_desc->dev, "changing numa node from %d to %d for nfit region [%pa-%pa]", |
| + NUMA_NO_NODE, ndr_desc->numa_node, &res.start, &res.end); |
| + } |
| + if (ndr_desc->target_node == NUMA_NO_NODE) { |
| + ndr_desc->target_node = phys_to_target_node(spa->address); |
| + dev_info(acpi_desc->dev, "changing target node from %d to %d for nfit region [%pa-%pa]", |
| + NUMA_NO_NODE, ndr_desc->numa_node, &res.start, &res.end); |
| + } |
| + |
| /* |
| * Persistence domain bits are hierarchical, if |
| * ACPI_NFIT_CAPABILITY_CACHE_FLUSH is set then |
