Skip to contentSkip to conversation

ACPI: NFIT: Fix incorrect ndr_desc being reportedin dev_err message

PATCH In review Colin Ian King 3 participants 4 messages Sep 2, 2025 – Sep 4, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: NFIT: Fix incorrect ndr_desc being reportedin dev_err message

There appears to be a cut-n-paste error with the incorrect field ndr_desc->numa_node being reported for the target node. Fix this by using ndr_desc->target_node instead.

Fixes f060db99374e ("ACPI: NFIT: Use fallback node id when numa info in NFIT table is incorrect")
---
 drivers/acpi/nfit/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/nfit/core.c +1 -1
index ae035b93da08..3eb56b77cb6d 100644
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
 	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);
+			NUMA_NO_NODE, ndr_desc->target_node, &res.start, &res.end);
 	}
 
 	/*
Signature · 1 line
2.51.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Colin Ian King

There appears to be a cut-n-paste error with the incorrect field

NIT: 'There __is__ a cut-n-paste error..." ;-)

Quoted 25 lines

ndr_desc->numa_node being reported for the target node. Fix this by using ndr_desc->target_node instead.

Fixes f060db99374e ("ACPI: NFIT: Use fallback node id when numa info in NFIT table is incorrect")
---
 drivers/acpi/nfit/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/nfit/core.c +1 -1
index ae035b93da08..3eb56b77cb6d 100644
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
 	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);
+			NUMA_NO_NODE, ndr_desc->target_node, &res.start, &res.end);
 	}
 
 	/*
Signature · 1 line
2.51.0
#2 lore raw
In reply to Colin Ian King
Quoted 16 lines · Colin Ian King

There appears to be a cut-n-paste error with the incorrect field ndr_desc->numa_node being reported for the target node. Fix this by using ndr_desc->target_node instead.

Fixes f060db99374e ("ACPI: NFIT: Use fallback node id when numa info in NFIT table is incorrect")
---
 drivers/acpi/nfit/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/nfit/core.c +0 -0
index ae035b93da08..3eb56b77cb6d 100644

drivers/acpi/nfit/core.c static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,

Quoted 9 lines
drivers/acpi/nfit/core.c +1 -2
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
        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);
+                       NUMA_NO_NODE, ndr_desc->target_node, &res.start, &res.end);
        }
 
        /*
--

Dan, Dave, are you guys going to take this one, or should I take care of it?

#3 lore raw
Quoted 24 lines · Rafael J. Wysocki
Quoted 23 lines · Colin Ian King

There appears to be a cut-n-paste error with the incorrect field ndr_desc->numa_node being reported for the target node. Fix this by using ndr_desc->target_node instead.

Fixes f060db99374e ("ACPI: NFIT: Use fallback node id when numa info in NFIT table is incorrect")
---
 drivers/acpi/nfit/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/acpi/nfit/core.c +1 -1
index ae035b93da08..3eb56b77cb6d 100644
@@ -2637,7 +2637,7 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,
        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);
+                       NUMA_NO_NODE, ndr_desc->target_node, &res.start, &res.end);
        }
 
Quoted 4 lines

drivers/acpi/nfit/core.c static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc,

Quoted 2 lines
drivers/acpi/nfit/core.c +0 -1
        /*
--

Dan, Dave, are you guys going to take this one, or should I take care of it?

Apologies, I should have said I'm taking this one. It is queued up.

Thanks for the ping,
Ira