Commit 56f2de81 authored by Zhen Lei's avatar Zhen Lei Committed by Greg Kroah-Hartman

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: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6713e8fb
...@@ -1066,7 +1066,7 @@ int device_add(struct device *dev) ...@@ -1066,7 +1066,7 @@ int device_add(struct device *dev)
dev->kobj.parent = kobj; dev->kobj.parent = kobj;
/* use parent numa_node */ /* use parent numa_node */
if (parent) if (parent && (dev_to_node(dev) == NUMA_NO_NODE))
set_dev_node(dev, dev_to_node(parent)); set_dev_node(dev, dev_to_node(parent));
/* first, register with generic layer. */ /* first, register with generic layer. */
......
...@@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev) ...@@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev)
ofdev->name = dev_name(&ofdev->dev); ofdev->name = dev_name(&ofdev->dev);
ofdev->id = -1; 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 * If this device has not binding numa node in devicetree, that is
* explicitly */ * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this
if (!ofdev->dev.parent) * device is on the same node as the parent.
set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); */
set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
return device_add(&ofdev->dev); return device_add(&ofdev->dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment