Skip to content

Commit 4a1c388

Browse files
committed
Merge tag 'powerpc-6.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman: - A fix for NUMA distance handling in the pseries SCM (pmem) driver. Thanks to Aneesh Kumar K.V. * tag 'powerpc-6.3-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/papr_scm: Update the NUMA distance table for the target node
2 parents f0dd81d + b277fc7 commit 4a1c388

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

arch/powerpc/mm/numa.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ void update_numa_distance(struct device_node *node)
366366
WARN(numa_distance_table[nid][nid] == -1,
367367
"NUMA distance details for node %d not provided\n", nid);
368368
}
369+
EXPORT_SYMBOL_GPL(update_numa_distance);
369370

370371
/*
371372
* ibm,numa-lookup-index-table= {N, domainid1, domainid2, ..... domainidN}

arch/powerpc/platforms/pseries/papr_scm.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,6 +1428,13 @@ static int papr_scm_probe(struct platform_device *pdev)
14281428
return -ENODEV;
14291429
}
14301430

1431+
/*
1432+
* open firmware platform device create won't update the NUMA
1433+
* distance table. For PAPR SCM devices we use numa_map_to_online_node()
1434+
* to find the nearest online NUMA node and that requires correct
1435+
* distance table information.
1436+
*/
1437+
update_numa_distance(dn);
14311438

14321439
p = kzalloc(sizeof(*p), GFP_KERNEL);
14331440
if (!p)

0 commit comments

Comments
 (0)