From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932908AbbHXMd3 (ORCPT ); Mon, 24 Aug 2015 08:33:29 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:44237 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753990AbbHXMd1 (ORCPT ); Mon, 24 Aug 2015 08:33:27 -0400 From: Zhen Lei To: Grant Likely , Rob Herring , devicetree , Greg Kroah-Hartman , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH 1/1] of: to support binding numa node to root subnode(non-bus) Date: Mon, 24 Aug 2015 20:30:10 +0800 Message-ID: <1440419410-10520-1-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.55DB0F11.002B,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 9ec58dc02d0a79ceb6658f93cb5437a4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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