Skip to content

Commit

Permalink
of: to support binding numa node to specified device in devicetree
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Zhen Lei authored and Greg Kroah-Hartman committed Oct 18, 2015
1 parent 6713e8f commit 56f2de8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/base/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down
11 changes: 6 additions & 5 deletions drivers/of/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 56f2de8

Please sign in to comment.