lkml.org 
[lkml]   [2015]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/1] of: to support binding numa node to root subnode(non-bus)
Date
If use of_platform_populate to scan dt-nodes and add devices, the
subnode of root(such as /smmu), when being scanned and invoke
of_device_add, the ofdev->dev.parent is always equal &platform_bus. So
that, function set_dev_node will not be called. And in device_add,
dev_to_node(parent) always return NUMA_NO_NODE.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
drivers/base/core.c | 2 +-
drivers/of/device.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index dafae6d..5df4f46b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1017,7 +1017,7 @@ int device_add(struct device *dev)
dev->kobj.parent = kobj;

/* use parent numa_node */
- if (parent)
+ if (parent && (parent != &platform_bus))
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 8b91ea2..96ebece 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -63,7 +63,7 @@ int of_device_add(struct platform_device *ofdev)
/* 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)
+ if (!ofdev->dev.parent || (ofdev->dev.parent == &platform_bus))
set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));

return device_add(&ofdev->dev);
--
2.5.0



\
 
 \ /
  Last update: 2015-08-24 14:41    [W:0.044 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site