Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <33241bd3-2f12-954c-6701-56cf563060bb@flygoat.com>
Date:   Tue, 22 Mar 2022 13:19:01 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH 3/3] MIPS: Use memblock_add_node() in early_parse_mem()
 under CONFIG_NUMA
Content-Language: en-GB
To:     Tiezhu Yang <yangtiezhu@loongson.cn>,
        Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc:     Xuefeng Li <lixuefeng@loongson.cn>, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org
References: <1647615920-23103-1-git-send-email-yangtiezhu@loongson.cn>
 <1647615920-23103-4-git-send-email-yangtiezhu@loongson.cn>
From:   Jiaxun Yang <jiaxun.yang@flygoat.com>
In-Reply-To: <1647615920-23103-4-git-send-email-yangtiezhu@loongson.cn>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


在 2022/3/18 15:05, Tiezhu Yang 写道:
> Use memblock_add_node to add new memblock region within a NUMA node
> in early_parse_mem() under CONFIG_NUMA, otherwise the mem parameter
> can not work well.

Hi Tiezhu,

pa_to_nid doesn't exist when CONFIG_NUME is disabled.
So probably you want #ifdef macro instead ？

Thanks.
- Jiaxun

>
> Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
> ---
>   arch/mips/kernel/setup.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
> index c8c8f60..50cdc08 100644
> --- a/arch/mips/kernel/setup.c
> +++ b/arch/mips/kernel/setup.c
> @@ -37,6 +37,7 @@
>   #include <asm/cdmm.h>
>   #include <asm/cpu.h>
>   #include <asm/debug.h>
> +#include <asm/mmzone.h>
>   #include <asm/sections.h>
>   #include <asm/setup.h>
>   #include <asm/smp-ops.h>
> @@ -378,7 +379,10 @@ static int __init early_parse_mem(char *p)
>   			memblock_end_of_DRAM() - memblock_start_of_DRAM());
>   	}
>   
> -	memblock_add(start, size);
> +	if (IS_ENABLED(CONFIG_NUMA))
> +		memblock_add_node(start, size, pa_to_nid(start), MEMBLOCK_NONE);
> +	else
> +		memblock_add(start, size);
>   
>   	return 0;
>   }