of: to support binding numa node to specified device in devicetree

For now, in function device_add, the new device will be forced to
inherit the numa node of its parent. But this will override the device's
numa node which configured in devicetree.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 334ec7ef1960..b7d56c5ea3c6 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1066,7 +1066,7 @@ int device_add(struct device *dev)
                 dev->kobj.parent = kobj;
 
         /* use parent numa_node */
-        if (parent)
+        if (parent && (dev_to_node(dev) == NUMA_NO_NODE))
                 set_dev_node(dev, dev_to_node(parent));
 
         /* first, register with generic layer. */
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 8b91ea241b10..e5f47cec75f3 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev)
         ofdev->name = dev_name(&ofdev->dev);
         ofdev->id = -1;
 
-        /* device_add will assume that this device is on the same node as
-         * the parent. If there is no parent defined, set the node
-         * explicitly */
-        if (!ofdev->dev.parent)
-                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
+        /*
+         * If this device has not binding numa node in devicetree, that is
+         * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this
+         * device is on the same node as the parent.
+         */
+        set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
 
         return device_add(&ofdev->dev);
 }