From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rapoport Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Date: Fri, 4 Jun 2021 17:49:41 +0300 Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> Mime-Version: 1.0 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Content-Disposition: inline In-Reply-To: List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , linux-m68k@lists.linux-m68k.o On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. 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=-21.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BF16CC47098 for ; Fri, 4 Jun 2021 14:49:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A42E761412 for ; Fri, 4 Jun 2021 14:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229978AbhFDOvj (ORCPT ); Fri, 4 Jun 2021 10:51:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:48878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229656AbhFDOvj (ORCPT ); Fri, 4 Jun 2021 10:51:39 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7C46140B; Fri, 4 Jun 2021 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mike Rapoport Date: Fri, 04 Jun 2021 14:49:41 +0000 Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-Id: List-Id: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 16485C07E94 for ; Fri, 4 Jun 2021 14:50:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 B74996140B for ; Fri, 4 Jun 2021 14:50:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B74996140B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qZHrIivwf3uwgGZqo9uQSvlPS/NAHSGZl0vWRAxQ680=; b=b09VRlP1tplH83 R9M+pQzyf6tPZ8BrylNxzItZ48rD/kkDhacWO4Wh/jalDayo2u/zTUu3tLHr2Fw2cO4kjK9iVA+wG cv2UO+v4DfDYFk7941wGhqXXFsew4JqNUSBIrtt7uKYRMj+6rQRVZkxP3yCK4lq7EpOhoVMDsn05j T/rEnTuHxPnE1dysZ4Rqx6IVEvIJzYpjmICN3ppTVV1jZIgubKJkTbH+7ltgtkUWBasX9TsXVtCyl gTObJBwmLS4hd4QgHynZcczVaC5H9sImT5sC/MP0vXI6g5de98lbk9j3lGltx4hhPzo87xMCdXDfN 5t5f5ZxyavgasW620Qig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB9H-00E02x-Qk; Fri, 04 Jun 2021 14:50:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB8z-00DzzZ-A9; Fri, 04 Jun 2021 14:49:57 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7C46140B; Fri, 4 Jun 2021 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210604_074953_409450_3210002F X-CRM114-Status: GOOD ( 25.70 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 A5C79C07E94 for ; Fri, 4 Jun 2021 14:50:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 70942613FF for ; Fri, 4 Jun 2021 14:50:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70942613FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=f/n9BAbJH1pDScqWwJhiaWWVktEyOa4atbhVSznbt3E=; b=j9gIJhhqnfQkiO NXfxNbAMiW/cWFHleaWt1tQrMNxXBu7xClBqxl5tH4wUfo5lj5kp0a8xpy3VEWA+rqZvMbdeumqzE XYDG8A51h9yCRPI/rAOZ1U+oj4eR5I6NfNMRZmdRn7CvBhNMkgLRs734AZyhM4fIOl4lM3F/VbF/3 Z9C+CCXlUe0EzM7p9gqzS+j4IwCkpWAcd+hSvDElK1u1oVUgxZojMT089wGo8DR40ytrgZmwdDsuS 2eSVdA2ICa2w33A3gJAcJMtSFKwvBB+Ef7WlMztnTBvvB9A9viFOesdWmy2bEMvvrRl3r0N3Tcf6/ ZRE+FMUfEoZOAyT43s3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB9J-00E03B-0V; Fri, 04 Jun 2021 14:50:13 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB8z-00DzzZ-A9; Fri, 04 Jun 2021 14:49:57 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7C46140B; Fri, 4 Jun 2021 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210604_074953_409450_3210002F X-CRM114-Status: GOOD ( 25.70 ) X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux on Synopsys ARC Processors List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-snps-arc" Errors-To: linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc 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=-18.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 510E7C07E94 for ; Fri, 4 Jun 2021 14:50:30 +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 C55FB613FF for ; Fri, 4 Jun 2021 14:50:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C55FB613FF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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 4FxQfr44xzz302S for ; Sat, 5 Jun 2021 00:50:28 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=LwwJaCK2; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kernel.org (client-ip=198.145.29.99; helo=mail.kernel.org; envelope-from=rppt@kernel.org; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=LwwJaCK2; dkim-atps=neutral Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (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 4FxQfD15C7z2ylk for ; Sat, 5 Jun 2021 00:49:56 +1000 (AEST) Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7C46140B; Fri, 4 Jun 2021 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport To: Vineet Gupta Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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: "linux-ia64@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "sparclinux@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "linux-arch@vger.kernel.org" , "linux-s390@vger.kernel.org" , Jonathan Corbet , "linux-doc@vger.kernel.org" , Mike Rapoport , Geert Uytterhoeven , Matt Turner , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , Arnd Bergmann , "linux-m68k@lists.linux-m68k.org" , Ivan Kokshaysky , "linux-arm-kernel@lists.infradead.org" , Richard Henderson , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linux-alpha@vger.kernel.org" , Andrew Morton , "linuxppc-dev@lists.ozlabs.org" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 892B1C07E94 for ; Fri, 4 Jun 2021 14:51:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 51CC8613AA for ; Fri, 4 Jun 2021 14:51:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51CC8613AA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=h8B2u4fCD8KYvVk6ZRAbg0vORAUsptZq1K+nDJO4wBQ=; b=wmwKE+lX3i+MiL fnJC8WaEWqkx1Z/tWnP9Li1iebaZnltWL7CMTm5bSpkcudXp5gcNWMiTXkYCwPAL6fV97hs+4m8ML YjwJz6kjlxnMfdk83RRStBGLYGgF1cNgTbcTOlU358SO+6s5Hi5KWfPxaHXb6cb48MZb7P6Dt0jsq Kq2ix/RlZzjoWAHPnhPlXoMVQFAdFJlxndJAfLVVFF53DaxVsyyIKzQrHw8X/E7pHglTYA35AnZlp rQHqsOHSMnXQJXfLd5aU2dEWiOXVuUzzb92pQgKvaqJh3BuHI85n+uftPMInTBqTthfNCqRuipK+L NLuabjoeNicZ8VYsKfGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB98-00E01K-30; Fri, 04 Jun 2021 14:50:02 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lpB8z-00DzzZ-A9; Fri, 04 Jun 2021 14:49:57 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7C46140B; Fri, 4 Jun 2021 14:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1622818193; bh=rnFSlNaPq8u6wC/6QmquuOa136Onpb4MOEGa2hLgk9I=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=LwwJaCK2IwLxB9kyXGjYKVF9yzkzn7XRMKeQ8X72ltVfnmPF5p41UBu+e+05a9DAy tZKeaBQHBAcKLB2Qe5TMvMpTImanf/IJol37sjCQauBE3/upu93O1L0ehCiz24v3Eo sgkxYEhJA2jhJ1hXN8nOKaMM///ktUE3ni2XrsbrjomrPUTFManqUNJ/xUZvLqqjSH FSVnaCBtBJhMvzfd0MKLff525QxHTp7w4mkKBDT0KOaGgN/fy/0yJ+Z0e/so6SnMiQ P2u25M6Qqug84oEiWVQUttGG0bIXa2/7x8ISySiIyeKQCCUonmeBlNLWKV2nP78fa3 67XpLaAb4EoHQ== Date: Fri, 4 Jun 2021 17:49:41 +0300 From: Mike Rapoport To: Vineet Gupta Cc: Andrew Morton , Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , "kexec@lists.infradead.org" , "linux-alpha@vger.kernel.org" , "linux-arch@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-doc@vger.kernel.org" , "linux-ia64@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-m68k@lists.linux-m68k.org" , "linux-mips@vger.kernel.org" , "linux-mm@kvack.org" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "linux-sh@vger.kernel.org" , "linux-snps-arc@lists.infradead.org" , "linux-xtensa@linux-xtensa.org" , "linuxppc-dev@lists.ozlabs.org" , "sparclinux@vger.kernel.org" Subject: Re: [PATCH v2 3/9] arc: remove support for DISCONTIGMEM Message-ID: References: <20210604064916.26580-1-rppt@kernel.org> <20210604064916.26580-4-rppt@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210604_074953_409450_3210002F X-CRM114-Status: GOOD ( 25.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Jun 04, 2021 at 02:07:39PM +0000, Vineet Gupta wrote: > On 6/3/21 11:49 PM, Mike Rapoport wrote: > > From: Mike Rapoport > > > > DISCONTIGMEM was replaced by FLATMEM with freeing of the unused memory map > > in v5.11. > > > > Remove the support for DISCONTIGMEM entirely. > > > > Signed-off-by: Mike Rapoport > > Looks non intrusive, but I'd still like to give this a spin on hardware > - considering highmem on ARC has tendency to go sideways ;-) > Can you please share a branch ! Sure: https://git.kernel.org/pub/scm/linux/kernel/git/rppt/linux.git/log/?h=memory-models/rm-discontig/v2 > Acked-by: Vineet Gupta Thanks! > Thx, > -Vineet > > > --- > > arch/arc/Kconfig | 13 ------------ > > arch/arc/include/asm/mmzone.h | 40 ----------------------------------- > > arch/arc/mm/init.c | 8 ------- > > 3 files changed, 61 deletions(-) > > delete mode 100644 arch/arc/include/asm/mmzone.h > > > > diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig > > index 2d98501c0897..d8f51eb8963b 100644 > > --- a/arch/arc/Kconfig > > +++ b/arch/arc/Kconfig > > @@ -62,10 +62,6 @@ config SCHED_OMIT_FRAME_POINTER > > config GENERIC_CSUM > > def_bool y > > > > -config ARCH_DISCONTIGMEM_ENABLE > > - def_bool n > > - depends on BROKEN > > - > > config ARCH_FLATMEM_ENABLE > > def_bool y > > > > @@ -344,15 +340,6 @@ config ARC_HUGEPAGE_16M > > > > endchoice > > > > -config NODES_SHIFT > > - int "Maximum NUMA Nodes (as a power of 2)" > > - default "0" if !DISCONTIGMEM > > - default "1" if DISCONTIGMEM > > - depends on NEED_MULTIPLE_NODES > > - help > > - Accessing memory beyond 1GB (with or w/o PAE) requires 2 memory > > - zones. > > - > > config ARC_COMPACT_IRQ_LEVELS > > depends on ISA_ARCOMPACT > > bool "Setup Timer IRQ as high Priority" > > diff --git a/arch/arc/include/asm/mmzone.h b/arch/arc/include/asm/mmzone.h > > deleted file mode 100644 > > index b86b9d1e54dc..000000000000 > > --- a/arch/arc/include/asm/mmzone.h > > +++ /dev/null > > @@ -1,40 +0,0 @@ > > -/* SPDX-License-Identifier: GPL-2.0-only */ > > -/* > > - * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > > - */ > > - > > -#ifndef _ASM_ARC_MMZONE_H > > -#define _ASM_ARC_MMZONE_H > > - > > -#ifdef CONFIG_DISCONTIGMEM > > - > > -extern struct pglist_data node_data[]; > > -#define NODE_DATA(nid) (&node_data[nid]) > > - > > -static inline int pfn_to_nid(unsigned long pfn) > > -{ > > - int is_end_low = 1; > > - > > - if (IS_ENABLED(CONFIG_ARC_HAS_PAE40)) > > - is_end_low = pfn <= virt_to_pfn(0xFFFFFFFFUL); > > - > > - /* > > - * node 0: lowmem: 0x8000_0000 to 0xFFFF_FFFF > > - * node 1: HIGHMEM w/o PAE40: 0x0 to 0x7FFF_FFFF > > - * HIGHMEM with PAE40: 0x1_0000_0000 to ... > > - */ > > - if (pfn >= ARCH_PFN_OFFSET && is_end_low) > > - return 0; > > - > > - return 1; > > -} > > - > > -static inline int pfn_valid(unsigned long pfn) > > -{ > > - int nid = pfn_to_nid(pfn); > > - > > - return (pfn <= node_end_pfn(nid)); > > -} > > -#endif /* CONFIG_DISCONTIGMEM */ > > - > > -#endif > > diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c > > index 397a201adfe3..abfeef7bf6f8 100644 > > --- a/arch/arc/mm/init.c > > +++ b/arch/arc/mm/init.c > > @@ -32,11 +32,6 @@ unsigned long arch_pfn_offset; > > EXPORT_SYMBOL(arch_pfn_offset); > > #endif > > > > -#ifdef CONFIG_DISCONTIGMEM > > -struct pglist_data node_data[MAX_NUMNODES] __read_mostly; > > -EXPORT_SYMBOL(node_data); > > -#endif > > - > > long __init arc_get_mem_sz(void) > > { > > return low_mem_sz; > > @@ -147,9 +142,6 @@ void __init setup_arch_memory(void) > > * to the hole is freed and ARC specific version of pfn_valid() > > * handles the hole in the memory map. > > */ > > -#ifdef CONFIG_DISCONTIGMEM > > - node_set_online(1); > > -#endif > > > > min_high_pfn = PFN_DOWN(high_mem_start); > > max_high_pfn = PFN_DOWN(high_mem_start + high_mem_sz); > -- Sincerely yours, Mike. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel