Commit e39f223f authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc: Remove more traces of bootmem 



Although we are now selecting NO_BOOTMEM, we still have some traces of
bootmem lying around. That is because even with NO_BOOTMEM there is
still a shim that converts bootmem calls into memblock calls, but
ultimately we want to remove all traces of bootmem.

Most of the patch is conversions from alloc_bootmem() to
memblock_virt_alloc(). In general a call such as:

  p = (struct foo *)alloc_bootmem(x);

Becomes:

  p = memblock_virt_alloc(x, 0);

We don't need the cast because memblock_virt_alloc() returns a void *.
The alignment value of zero tells memblock to use the default alignment,
which is SMP_CACHE_BYTES, the same value alloc_bootmem() uses.

We remove a number of NULL checks on the result of
memblock_virt_alloc(). That is because memblock_virt_alloc() will panic
if it can't allocate, in exactly the same way as alloc_bootmem(), so the
NULL checks are and always have been redundant.

The memory returned by memblock_virt_alloc() is already zeroed, so we
remove several memsets of the result of memblock_virt_alloc().

Finally we convert a few uses of __alloc_bootmem(x, y, MAX_DMA_ADDRESS)
to just plain memblock_virt_alloc(). We don't use memblock_alloc_base()
because MAX_DMA_ADDRESS is ~0ul on powerpc, so limiting the allocation
to that is pointless, 16XB ought to be enough for anyone.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a49ab6ee

arch/powerpc/kernel/pci-common.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/pci.h>

#include <linux/string.h>

#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/delay.h>

#include <linux/export.h>

#include <linux/of_address.h>

arch/powerpc/kernel/pci_32.c

+1 −3
Original line number Diff line number Diff line
@@ -199,9 +199,7 @@ pci_create_OF_bus_map(void) 
	struct property* of_prop;

	struct device_node *dn;



	of_prop = (struct property*) alloc_bootmem(sizeof(struct property) + 256);

	if (!of_prop)

		return;

	of_prop = memblock_virt_alloc(sizeof(struct property) + 256, 0);

	dn = of_find_node_by_path("/");

	if (dn) {

		memset(of_prop, -1, sizeof(struct property) + 256);

arch/powerpc/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static void __init emergency_stack_init(void) 
}



/*

 * Called into from start_kernel this initializes bootmem, which is used

 * Called into from start_kernel this initializes memblock, which is used

 * to manage page allocation until mem_init is called.

 */

void __init setup_arch(char **cmdline_p)

arch/powerpc/lib/alloc.c

+1 −3
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask) 
	if (mem_init_done)

		p = kzalloc(size, mask);

	else {

		p = alloc_bootmem(size);

		if (p)

			memset(p, 0, size);

		p = memblock_virt_alloc(size, 0);

	}

	return p;

}

arch/powerpc/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ int alloc_bootmem_huge_page(struct hstate *hstate) 
	 * If gpages can be in highmem we can't use the trick of storing the

	 * data structure in the page; allocate space for this

	 */

	m = alloc_bootmem(sizeof(struct huge_bootmem_page));

	m = memblock_virt_alloc(sizeof(struct huge_bootmem_page), 0);

	m->phys = gpage_freearray[idx].gpage_list[--nr_gpages];

#else

	m = phys_to_virt(gpage_freearray[idx].gpage_list[--nr_gpages]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE