powerpc/papr_scm: Switch to numa_map_to_online_node() (575e23b6) · Commits · 戴 / test

Now that the core exports numa_map_to_online_node() switch to that instead of the locally coded duplicate. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: "Oliver O'Halloran" <oohall@gmail.com> Acked-by:

Michael Ellerman <mpe@ellerman.id.au> Reported-by:

"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> Reviewed-by:

Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Link: https://lore.kernel.org/r/157401276263.43284.12616818803654229788.stgit@dwillia2-desk3.amr.corp.intel.com Reviewed-by:

Ingo Molnar <mingo@kernel.org> Signed-off-by:

Dan Williams <dan.j.williams@intel.com> Link: https://lore.kernel.org/r/158188325830.894464.9454884523846454529.stgit@dwillia2-desk3.amr.corp.intel.com

arch/powerpc/platforms/pseries/papr_scm.c

+1 −20

Original line number	Diff line number	Diff line
		@@ -285,25 +285,6 @@ int papr_scm_ndctl(struct nvdimm_bus_descriptor nd_desc, struct nvdimm nvdimm,
		return 0;
		}

		static inline int papr_scm_node(int node)
		{
		int min_dist = INT_MAX, dist;
		int nid, min_node;

		if ((node == NUMA_NO_NODE) \|\| node_online(node))
		return node;

		min_node = first_online_node;
		for_each_online_node(nid) {
		dist = node_distance(node, nid);
		if (dist < min_dist) {
		min_dist = dist;
		min_node = nid;
		}
		}
		return min_node;
		}

		static int papr_scm_nvdimm_init(struct papr_scm_priv *p)
		{
		struct device *dev = &p->pdev->dev;
		@@ -349,7 +330,7 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p)

		memset(&ndr_desc, 0, sizeof(ndr_desc));
		target_nid = dev_to_node(&p->pdev->dev);
		online_nid = papr_scm_node(target_nid);
		online_nid = numa_map_to_online_node(target_nid);
		ndr_desc.numa_node = online_nid;
		ndr_desc.target_node = target_nid;
		ndr_desc.res = &p->res;

Admin message