From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754111AbcFGIJH (ORCPT ); Tue, 7 Jun 2016 04:09:07 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:30329 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754092AbcFGIJC (ORCPT ); Tue, 7 Jun 2016 04:09:02 -0400 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , Ganapatrao Kulkarni , Robert Richter , "David Daney" , Rob Herring , "Frank Rowand" , Grant Likely , devicetree , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH v4 13/14] of/numa: remove the constraint on the distances of node pairs Date: Tue, 7 Jun 2016 16:08:17 +0800 Message-ID: <1465286898-13828-14-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com> References: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com> 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.0A090201.57568119.01CF,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: 9f98234f55d08d9185c5cfa4dafb6371 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At present, the distances must equal in both direction for each node pairs. For example: the distance of node B->A must the same to A->B. But we really don't have to do this. End up fill default distances as below: 1. If both direction specified, keep no change. 2. If only one direction specified, assign it to the other direction. 3. If none of the two direction specified, both are assigned to REMOTE_DISTANCE. Signed-off-by: Zhen Lei --- drivers/of/of_numa.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 019738f..ce782f9 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -122,15 +122,25 @@ static int __init of_numa_parse_distance_map_v1(struct device_node *map) numa_set_distance(nodea, nodeb, distance); pr_debug("distance[node%d -> node%d] = %d\n", nodea, nodeb, distance); - - /* Set default distance of node B->A same as A->B */ - if (nodeb > nodea) - numa_set_distance(nodeb, nodea, distance); } return 0; } +static void __init fill_default_distances(void) +{ + int i, j; + + for (i = 0; i < nr_node_ids; i++) + for (j = 0; j < nr_node_ids; j++) + if (i == j) + numa_set_distance(i, j, LOCAL_DISTANCE); + else if (!node_distance(i, j)) + numa_set_distance(i, j, + node_distance(j, i) ? : REMOTE_DISTANCE); + +} + static int __init of_numa_parse_distance_map(void) { int ret = 0; @@ -140,8 +150,10 @@ static int __init of_numa_parse_distance_map(void) "numa-distance-map-v1"); if (np) ret = of_numa_parse_distance_map_v1(np); - of_node_put(np); + + fill_default_distances(); + return ret; } -- 2.5.0