Commit aa59fa78 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sparc32-NO_BOOTMEM' 

Mike Rapoport says:

====================
sparc32: switch to NO_BOOTMEM

These patches convert sparc32 to use memblock + nobootmem.
I've made the conversion as simple as possible, just enough to allow moving
HAVE_MEMBLOCK and NO_BOOTMEM to the common SPARC configuration.

v2 changes:
* split whitespace changes to a separate patch
* address Sam's comments [1]

[1] https://lkml.org/lkml/2018/8/2/403


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dfaad39c 8818d89c

arch/sparc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ config SPARC 
	select LOCKDEP_SMALL if LOCKDEP

	select NEED_DMA_MAP_STATE

	select NEED_SG_DMA_LENGTH

	select HAVE_MEMBLOCK

	select NO_BOOTMEM



config SPARC32

	def_bool !64BIT
@@ -62,7 +64,6 @@ config SPARC64 
	select HAVE_KRETPROBES

	select HAVE_KPROBES

	select HAVE_RCU_TABLE_FREE if SMP

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE

	select HAVE_DYNAMIC_FTRACE
@@ -81,7 +82,6 @@ config SPARC64 
	select IRQ_PREFLOW_FASTEOI

	select ARCH_HAVE_NMI_SAFE_CMPXCHG

	select HAVE_C_RECORDMCOUNT

	select NO_BOOTMEM

	select HAVE_ARCH_AUDITSYSCALL

	select ARCH_SUPPORTS_ATOMIC_RMW

	select HAVE_NMI

arch/sparc/mm/init_32.c

+48 −79
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/highmem.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/pagemap.h>

#include <linux/poison.h>

#include <linux/gfp.h>
@@ -101,13 +102,46 @@ static unsigned long calc_max_low_pfn(void) 
	return tmp;

}



static void __init find_ramdisk(unsigned long end_of_phys_memory)

{

#ifdef CONFIG_BLK_DEV_INITRD

	unsigned long size;



	/* Now have to check initial ramdisk, so that it won't pass

	 * the end of memory

	 */

	if (sparc_ramdisk_image) {

		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)

			sparc_ramdisk_image -= KERNBASE;

		initrd_start = sparc_ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;

		if (initrd_end > end_of_phys_memory) {

			printk(KERN_CRIT "initrd extends beyond end of memory "

			       "(0x%016lx > 0x%016lx)\ndisabling initrd\n",

			       initrd_end, end_of_phys_memory);

			initrd_start = 0;

		} else {

			/* Reserve the initrd image area. */

			size = initrd_end - initrd_start;

			memblock_reserve(initrd_start, size);



			initrd_start = (initrd_start - phys_base) + PAGE_OFFSET;

			initrd_end = (initrd_end - phys_base) + PAGE_OFFSET;

		}

	}

#endif

}



unsigned long __init bootmem_init(unsigned long *pages_avail)

{

	unsigned long bootmap_size, start_pfn;

	unsigned long end_of_phys_memory = 0UL;

	unsigned long bootmap_pfn, bytes_avail, size;

	unsigned long start_pfn, bytes_avail, size;

	unsigned long end_of_phys_memory = 0;

	unsigned long high_pages = 0;

	int i;



	memblock_set_bottom_up(true);

	memblock_allow_resize();



	bytes_avail = 0UL;

	for (i = 0; sp_banks[i].num_bytes != 0; i++) {

		end_of_phys_memory = sp_banks[i].base_addr +
@@ -124,12 +158,15 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) 
				if (sp_banks[i].num_bytes == 0) {

					sp_banks[i].base_addr = 0xdeadbeef;

				} else {

					memblock_add(sp_banks[i].base_addr,

						     sp_banks[i].num_bytes);

					sp_banks[i+1].num_bytes = 0;

					sp_banks[i+1].base_addr = 0xdeadbeef;

				}

				break;

			}

		}

		memblock_add(sp_banks[i].base_addr, sp_banks[i].num_bytes);

	}



	/* Start with page aligned address of last symbol in kernel
@@ -140,8 +177,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) 
	/* Now shift down to get the real physical page frame number. */

	start_pfn >>= PAGE_SHIFT;



	bootmap_pfn = start_pfn;



	max_pfn = end_of_phys_memory >> PAGE_SHIFT;



	max_low_pfn = max_pfn;
@@ -150,85 +185,19 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) 
	if (max_low_pfn > pfn_base + (SRMMU_MAXMEM >> PAGE_SHIFT)) {

		highstart_pfn = pfn_base + (SRMMU_MAXMEM >> PAGE_SHIFT);

		max_low_pfn = calc_max_low_pfn();

		high_pages = calc_highpages();

		printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",

		    calc_highpages() >> (20 - PAGE_SHIFT));

		    high_pages >> (20 - PAGE_SHIFT));

	}



#ifdef CONFIG_BLK_DEV_INITRD

	/* Now have to check initial ramdisk, so that bootmap does not overwrite it */

	if (sparc_ramdisk_image) {

		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)

			sparc_ramdisk_image -= KERNBASE;

		initrd_start = sparc_ramdisk_image + phys_base;

		initrd_end = initrd_start + sparc_ramdisk_size;

		if (initrd_end > end_of_phys_memory) {

			printk(KERN_CRIT "initrd extends beyond end of memory "

		                 	 "(0x%016lx > 0x%016lx)\ndisabling initrd\n",

			       initrd_end, end_of_phys_memory);

			initrd_start = 0;

		}

		if (initrd_start) {

			if (initrd_start >= (start_pfn << PAGE_SHIFT) &&

			    initrd_start < (start_pfn << PAGE_SHIFT) + 2 * PAGE_SIZE)

				bootmap_pfn = PAGE_ALIGN (initrd_end) >> PAGE_SHIFT;

		}

	}

#endif	

	/* Initialize the boot-time allocator. */

	bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, pfn_base,

					 max_low_pfn);



	/* Now register the available physical memory with the

	 * allocator.

	 */

	*pages_avail = 0;

	for (i = 0; sp_banks[i].num_bytes != 0; i++) {

		unsigned long curr_pfn, last_pfn;



		curr_pfn = sp_banks[i].base_addr >> PAGE_SHIFT;

		if (curr_pfn >= max_low_pfn)

			break;



		last_pfn = (sp_banks[i].base_addr + sp_banks[i].num_bytes) >> PAGE_SHIFT;

		if (last_pfn > max_low_pfn)

			last_pfn = max_low_pfn;

	find_ramdisk(end_of_phys_memory);



		/*

		 * .. finally, did all the rounding and playing

		 * around just make the area go away?

		 */

		if (last_pfn <= curr_pfn)

			continue;



		size = (last_pfn - curr_pfn) << PAGE_SHIFT;

		*pages_avail += last_pfn - curr_pfn;



		free_bootmem(sp_banks[i].base_addr, size);

	}



#ifdef CONFIG_BLK_DEV_INITRD

	if (initrd_start) {

		/* Reserve the initrd image area. */

		size = initrd_end - initrd_start;

		reserve_bootmem(initrd_start, size, BOOTMEM_DEFAULT);

		*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;



		initrd_start = (initrd_start - phys_base) + PAGE_OFFSET;

		initrd_end = (initrd_end - phys_base) + PAGE_OFFSET;		

	}

#endif

	/* Reserve the kernel text/data/bss. */

	size = (start_pfn << PAGE_SHIFT) - phys_base;

	reserve_bootmem(phys_base, size, BOOTMEM_DEFAULT);

	*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;

	memblock_reserve(phys_base, size);



	/* Reserve the bootmem map.   We do not account for it

	 * in pages_avail because we will release that memory

	 * in free_all_bootmem.

	 */

	size = bootmap_size;

	reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size, BOOTMEM_DEFAULT);

	*pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT;

	size = memblock_phys_mem_size() - memblock_reserved_size();

	*pages_avail = (size >> PAGE_SHIFT) - high_pages;



	return max_pfn;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE