From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 783ECC433E1 for ; Mon, 17 Aug 2020 16:08:04 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1861F22BF3 for ; Mon, 17 Aug 2020 16:08:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="f2ceEm4J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1861F22BF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4BVf8d4xPvzDqLW for ; Tue, 18 Aug 2020 02:08:01 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0b-001b2d01.pphosted.com; envelope-from=aneesh.kumar@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=f2ceEm4J; dkim-atps=neutral Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4BVdvL1lRKzDqTW for ; Tue, 18 Aug 2020 01:56:29 +1000 (AEST) Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 07HFXF5W012235; Mon, 17 Aug 2020 11:56:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=0SZdXQ4W9MSFxop1NtmyzHTArzYUeoXuSUI/3LxsCnY=; b=f2ceEm4JWztBeATowhQX6z3wpmxu0LR32ApW57zBbjEpyoQXO/4LSfWeFcDxK7TR6pX1 EpEJfR95V1AVin1k9A/0TfvDraHBSW0t0vMsucAfBv7K3f+HYInusvzsC7qAX/Zw/G2d 6fqgJx6OMml2WleRLoHfYADQqXo0Ho9evMebi9BgmraY5GIuToWEL2zhlG5FZ+8fK6lJ MH9/PX9SOLA36pNpnLtN+jZolGBu+vent6YPG67ZZWuzJ/wcTya4F03JIotgp1jk1lTT JUZMk3ppPt3wTHIVaQIgYMH2p66lM9IXxk8h1mWZjyDJ94vcyOmSPjz24nhSZdWpaHyj Cg== Received: from ppma06fra.de.ibm.com (48.49.7a9f.ip4.static.sl-reverse.com [159.122.73.72]) by mx0a-001b2d01.pphosted.com with ESMTP id 32y4kwymus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2020 11:56:23 -0400 Received: from pps.filterd (ppma06fra.de.ibm.com [127.0.0.1]) by ppma06fra.de.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 07HFVRRH013608; Mon, 17 Aug 2020 15:56:18 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma06fra.de.ibm.com with ESMTP id 32x6ygsfuu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Aug 2020 15:56:18 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 07HFskMC53674360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Aug 2020 15:54:47 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9C0404C046; Mon, 17 Aug 2020 15:56:15 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 943544C040; Mon, 17 Aug 2020 15:56:14 +0000 (GMT) Received: from [9.102.2.56] (unknown [9.102.2.56]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 17 Aug 2020 15:56:14 +0000 (GMT) Subject: Re: [PATCH v2 2/4] powerpc/mem: Store the dt_root_size/addr cell values for later usage To: Hari Bathini , linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au References: <20200806162329.276534-1-aneesh.kumar@linux.ibm.com> <20200806162329.276534-2-aneesh.kumar@linux.ibm.com> From: "Aneesh Kumar K.V" Message-ID: <23b3af9c-c10a-16a8-3fde-15e83ff24acf@linux.ibm.com> Date: Mon, 17 Aug 2020 21:26:13 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-08-17_10:2020-08-17, 2020-08-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2008170118 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nathan Lynch Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 8/17/20 9:00 PM, Hari Bathini wrote: > > > On 06/08/20 9:53 pm, Aneesh Kumar K.V wrote: >> dt_root_addr_cells and dt_root_size_cells are __initdata variables. >> So make a copy of the same which can be used post init. >> > > This avoids doing the same thing at multiple places. > So, thanks for the patch, Aneesh. > > Looks good to me. > > but nitpick below... > >> Signed-off-by: Aneesh Kumar K.V >> --- >> arch/powerpc/include/asm/drmem.h | 2 ++ >> arch/powerpc/kernel/prom.c | 7 +++++++ >> arch/powerpc/mm/numa.c | 1 + >> 3 files changed, 10 insertions(+) >> >> diff --git a/arch/powerpc/include/asm/drmem.h >> b/arch/powerpc/include/asm/drmem.h >> index d719cbac34b2..ffb59caa88ee 100644 >> --- a/arch/powerpc/include/asm/drmem.h >> +++ b/arch/powerpc/include/asm/drmem.h >> @@ -123,4 +123,6 @@ static inline void lmb_clear_nid(struct drmem_lmb >> *lmb) >> } >> #endif >> +extern int mem_addr_cells, mem_size_cells; > > Should this be in include/asm/prom.h instead, given the definition > comes from kernel/prom.c file? > We added the variable definition to prom.c because that is where we are doing early device tree scanning. But the users should not really be including prom.h. The variables are related drmem and hence I used drmem.h for include. >> + >> #endif /* _ASM_POWERPC_LMB_H */ >> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c >> index d8a2fb87ba0c..9a1701e85747 100644 >> --- a/arch/powerpc/kernel/prom.c >> +++ b/arch/powerpc/kernel/prom.c >> @@ -73,6 +73,7 @@ u64 ppc64_rma_size; >> #endif >> static phys_addr_t first_memblock_size; >> static int __initdata boot_cpu_count; >> +int mem_addr_cells, mem_size_cells; >> static int __init early_parse_mem(char *p) >> { >> @@ -536,6 +537,12 @@ static int __init >> early_init_dt_scan_memory_ppc(unsigned long node, >> const char *uname, >> int depth, void *data) >> { >> + /* >> + * Make a copy from __initdata variable >> + */ >> + mem_addr_cells = dt_root_addr_cells; >> + mem_size_cells = dt_root_size_cells; >> + >> #ifdef CONFIG_PPC_PSERIES >> if (depth == 1 && >> strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0) { >> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c >> index 058fee9a0835..77d41d9775d2 100644 >> --- a/arch/powerpc/mm/numa.c >> +++ b/arch/powerpc/mm/numa.c >> @@ -368,6 +368,7 @@ static void __init get_n_mem_cells(int >> *n_addr_cells, int *n_size_cells) >> of_node_put(memory); >> } >> +/* dt_mem_next_cell is __init */ >> static unsigned long read_n_cells(int n, const __be32 **buf) >> { >> unsigned long result = 0; >>