Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751173AbVKEAGJ (ORCPT ); Fri, 4 Nov 2005 19:06:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751172AbVKEAFy (ORCPT ); Fri, 4 Nov 2005 19:05:54 -0500 Received: from gate.crashing.org ([63.228.1.57]:61138 "EHLO gate.crashing.org") by vger.kernel.org with ESMTP id S1751171AbVKEAFw (ORCPT ); Fri, 4 Nov 2005 19:05:52 -0500 Subject: Re: [PATCH 1/4] Memory Add Fixes for ppc64 From: Benjamin Herrenschmidt To: Mike Kravetz Cc: Paul Mackerras , linuxppc64-dev@ozlabs.org, linux-kernel@vger.kernel.org, lhms-devel@lists.sourceforge.net In-Reply-To: <20051104231800.GB25545@w-mikek2.ibm.com> References: <20051104231552.GA25545@w-mikek2.ibm.com> <20051104231800.GB25545@w-mikek2.ibm.com> Content-Type: text/plain Date: Sat, 05 Nov 2005 11:04:30 +1100 Message-Id: <1131149070.29195.41.camel@gaston> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2865 Lines: 68 On Fri, 2005-11-04 at 15:18 -0800, Mike Kravetz wrote: > Add the create_section_mapping() routine to create hptes for memory > sections dynamically added after system boot. > > Signed-off-by: Mike Kravetz This patch will have to be slightly reworked on top of the 64k pages one. It should be trivial though. Ben. > diff -Naupr linux-2.6.14-git7/arch/powerpc/mm/hash_utils_64.c linux-2.6.14-git7.work/arch/powerpc/mm/hash_utils_64.c > --- linux-2.6.14-git7/arch/powerpc/mm/hash_utils_64.c 2005-11-04 21:21:05.000000000 +0000 > +++ linux-2.6.14-git7.work/arch/powerpc/mm/hash_utils_64.c 2005-11-04 22:05:06.000000000 +0000 > @@ -176,6 +176,15 @@ static unsigned long get_hashtable_size( > return pteg_count << 7; > } > > +#ifdef CONFIG_MEMORY_HOTPLUG > +void create_section_mapping(unsigned long start, unsigned long end) > +{ > + create_pte_mapping(start, end, > + _PAGE_ACCESSED | _PAGE_COHERENT | PP_RWXX, > + cur_cpu_spec->cpu_features & CPU_FTR_16M_PAGE ? 1 : 0); > +} > +#endif /* CONFIG_MEMORY_HOTPLUG */ > + > void __init htab_initialize(void) > { > unsigned long table, htab_size_bytes; > diff -Naupr linux-2.6.14-git7/arch/powerpc/mm/mem.c linux-2.6.14-git7.work/arch/powerpc/mm/mem.c > --- linux-2.6.14-git7/arch/powerpc/mm/mem.c 2005-11-04 21:21:05.000000000 +0000 > +++ linux-2.6.14-git7.work/arch/powerpc/mm/mem.c 2005-11-04 22:05:06.000000000 +0000 > @@ -124,6 +124,9 @@ int __devinit add_memory(u64 start, u64 > unsigned long start_pfn = start >> PAGE_SHIFT; > unsigned long nr_pages = size >> PAGE_SHIFT; > > + start += KERNELBASE; > + create_section_mapping(start, start + size); > + > /* this should work for most non-highmem platforms */ > zone = pgdata->node_zones; > > diff -Naupr linux-2.6.14-git7/include/asm-ppc64/sparsemem.h linux-2.6.14-git7.work/include/asm-ppc64/sparsemem.h > --- linux-2.6.14-git7/include/asm-ppc64/sparsemem.h 2005-10-28 00:02:08.000000000 +0000 > +++ linux-2.6.14-git7.work/include/asm-ppc64/sparsemem.h 2005-11-04 22:05:06.000000000 +0000 > @@ -11,6 +11,10 @@ > #define MAX_PHYSADDR_BITS 38 > #define MAX_PHYSMEM_BITS 36 > > +#ifdef CONFIG_MEMORY_HOTPLUG > +extern void create_section_mapping(unsigned long start, unsigned long end); > +#endif /* CONFIG_MEMORY_HOTPLUG */ > + > #endif /* CONFIG_SPARSEMEM */ > > #endif /* _ASM_PPC64_SPARSEMEM_H */ > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/