From patchwork Wed Aug 24 07:44:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 74558 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp180292qga; Wed, 24 Aug 2016 00:48:32 -0700 (PDT) X-Received: by 10.98.55.1 with SMTP id e1mr3143451pfa.58.1472024912747; Wed, 24 Aug 2016 00:48:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ut14si8386726pab.53.2016.08.24.00.48.27; Wed, 24 Aug 2016 00:48:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754526AbcHXHsO (ORCPT + 27 others); Wed, 24 Aug 2016 03:48:14 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:9197 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754094AbcHXHqd (ORCPT ); Wed, 24 Aug 2016 03:46:33 -0400 Received: from 172.24.1.47 (EHLO szxeml425-hub.china.huawei.com) ([172.24.1.47]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DMC31323; Wed, 24 Aug 2016 15:46:31 +0800 (CST) Received: from localhost (10.177.23.164) by szxeml425-hub.china.huawei.com (10.82.67.180) with Microsoft SMTP Server id 14.3.235.1; Wed, 24 Aug 2016 15:46:23 +0800 From: Zhen Lei To: Catalin Marinas , Will Deacon , linux-arm-kernel , linux-kernel , Rob Herring , "Frank Rowand" , devicetree CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH v7 13/14] of/numa: remove the constraint on the distances of node pairs Date: Wed, 24 Aug 2016 15:44:52 +0800 Message-ID: <1472024693-12912-14-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1472024693-12912-1-git-send-email-thunder.leizhen@huawei.com> References: <1472024693-12912-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.57BD50D7.009D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: ba267dd6215ca47364121cd77f7aac31 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk 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 Acked-by: Rob Herring --- drivers/of/of_numa.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) -- 2.5.0 diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 1234b4a..d0cdf29 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -127,15 +127,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; @@ -145,8 +155,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; }