From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934541AbbI1R21 (ORCPT ); Mon, 28 Sep 2015 13:28:27 -0400 Received: from e19.ny.us.ibm.com ([129.33.205.209]:59771 "EHLO e19.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934523AbbI1R2X (ORCPT ); Mon, 28 Sep 2015 13:28:23 -0400 X-IBM-Helo: d01dlp03.pok.ibm.com X-IBM-MailFrom: nacc@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org Date: Mon, 28 Sep 2015 10:28:17 -0700 From: Nishanth Aravamudan To: Raghavendra K T Cc: benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, anton@samba.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, cl@linux.com, gkurz@linux.vnet.ibm.com, grant.likely@linaro.org, nikunj@linux.vnet.ibm.com, khandual@linux.vnet.ibm.com Subject: Re: [PATCH RFC 3/5] powerpc:numa create 1:1 mappaing between chipid and nid Message-ID: <20150928172817.GC48470@linux.vnet.ibm.com> References: <1443378553-2146-1-git-send-email-raghavendra.kt@linux.vnet.ibm.com> <1443378553-2146-4-git-send-email-raghavendra.kt@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1443378553-2146-4-git-send-email-raghavendra.kt@linux.vnet.ibm.com> X-Operating-System: Linux 3.13.0-40-generic (x86_64) User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15092817-0057-0000-0000-000001AEA4B9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27.09.2015 [23:59:11 +0530], Raghavendra K T wrote: > Once we have made the distinction between nid and chipid > create a 1:1 mapping between them. This makes compacting the > nids easy later. Didn't the previous patch just do the opposite of... > @@ -286,7 +308,7 @@ int of_node_to_nid(struct device_node *device) > > of_node_get(device); > while (device) { > - nid = of_node_to_chipid_single(device); > + nid = of_node_to_nid_single(device); > if (nid != -1) > break; > > @@ -498,7 +520,7 @@ static int of_get_assoc_arrays(struct device_node *memory, > } > > /* > - * This is like of_node_to_chipid_single() for memory represented in the > + * This is like of_node_to_nid_single() for memory represented in the > * ibm,dynamic-reconfiguration-memory node. > */ > static int of_drconf_to_nid_single(struct of_drconf_cell *drmem, > @@ -557,7 +579,7 @@ static int numa_setup_cpu(unsigned long lcpu) > goto out; > } > > - nid = of_node_to_chipid_single(cpu); > + nid = of_node_to_nid_single(cpu); > > out_present: > if (nid < 0 || !node_online(nid)) > @@ -754,7 +776,7 @@ static int __init parse_numa_properties(void) > > cpu = of_get_cpu_node(i, NULL); > BUG_ON(!cpu); > - nid = of_node_to_chipid_single(cpu); > + nid = of_node_to_nid_single(cpu); > of_node_put(cpu); > > /* > @@ -796,7 +818,7 @@ new_range: > * have associativity properties. If none, then > * everything goes to default_nid. > */ > - nid = of_node_to_chipid_single(memory); > + nid = of_node_to_nid_single(memory); > if (nid < 0) > nid = default_nid; > > @@ -1119,7 +1141,7 @@ static int hot_add_node_scn_to_nid(unsigned long scn_addr) > if ((scn_addr < start) || (scn_addr >= (start + size))) > continue; > > - nid = of_node_to_chipid_single(memory); > + nid = of_node_to_nid_single(memory); > break; > } > > @@ -1415,7 +1437,7 @@ int arch_update_cpu_topology(void) > > /* Use associativity from first thread for all siblings */ > vphn_get_associativity(cpu, associativity); > - new_nid = associativity_to_chipid(associativity); > + new_nid = associativity_to_nid(associativity); > if (new_nid < 0 || !node_online(new_nid)) > new_nid = first_online_node; > Why is this churn useful?