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=-15.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 C12DEC47092 for ; Mon, 31 May 2021 01:06:31 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 E72A961222 for ; Mon, 31 May 2021 01:06:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E72A961222 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4FtcYx4QHsz2yyF for ; Mon, 31 May 2021 11:06:29 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com (client-ip=45.249.212.255; helo=szxga08-in.huawei.com; envelope-from=wangkefeng.wang@huawei.com; receiver=) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (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 4FtcYY6Rjbz2xvL for ; Mon, 31 May 2021 11:06:09 +1000 (AEST) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4FtcRq29ZCz1BGCy; Mon, 31 May 2021 09:01:11 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 09:05:50 +0800 Received: from [10.174.177.243] (10.174.177.243) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 31 May 2021 09:05:50 +0800 Subject: Re: [PATCH 11/15] powerpc: convert to setup_initial_init_mm() To: Christophe Leroy References: <20210529105504.180544-1-wangkefeng.wang@huawei.com> <20210529105504.180544-12-wangkefeng.wang@huawei.com> <20210529181630.Horde.rvXKyt8t9f8DiqTVTuSKUw3@messagerie.c-s.fr> From: Kefeng Wang Message-ID: Date: Mon, 31 May 2021 09:05:49 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20210529181630.Horde.rvXKyt8t9f8DiqTVTuSKUw3@messagerie.c-s.fr> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected 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: Andrew Morton , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 2021/5/30 0:16, Christophe Leroy wrote: > Kefeng Wang a écrit : > >> Use setup_initial_init_mm() helper to simplify code. >> >> Cc: Michael Ellerman >> Cc: Benjamin Herrenschmidt >> Cc: linuxppc-dev@lists.ozlabs.org >> Signed-off-by: Kefeng Wang >> --- >>  arch/powerpc/kernel/setup-common.c | 5 +---- >>  1 file changed, 1 insertion(+), 4 deletions(-) >> >> diff --git a/arch/powerpc/kernel/setup-common.c >> b/arch/powerpc/kernel/setup-common.c >> index 046fe21b5c3b..c046d99efd18 100644 >> --- a/arch/powerpc/kernel/setup-common.c >> +++ b/arch/powerpc/kernel/setup-common.c >> @@ -928,10 +928,7 @@ void __init setup_arch(char **cmdline_p) >> >>      klp_init_thread_info(&init_task); >> >> -    init_mm.start_code = (unsigned long)_stext; >> -    init_mm.end_code = (unsigned long) _etext; >> -    init_mm.end_data = (unsigned long) _edata; >> -    init_mm.brk = klimit; >> +    setup_initial_init_mm(_stext, _etext, _edata, _end); > > This looks wrong, should be klimit instead of _end IIUC see  arch/powerpc/kernel/setup-common.c: unsigned long klimit = (unsigned long) _end; the setup_initial_init_mm helper [1] should use the original _end +static inline void setup_initial_init_mm(char *start_code, + char *end_code, + char *end_data, + char *brk) +{ + init_mm.start_code = (unsigned long)start_code; + init_mm.end_code = (unsigned long)end_code; + init_mm.end_data = (unsigned long)end_data; + init_mm.brk = (unsigned long)brk; +} [1] https://lkml.org/lkml/2021/5/29/84 > >> >>      mm_iommu_init(&init_mm); >>      irqstack_early_init(); >> -- >> 2.26.2 > > > . >