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

powerpc: Drop zalloc_maybe_bootmem() 



The only callers of zalloc_maybe_bootmem() are PCI setup routines. These
used to be called early during boot before slab setup, and also during
runtime due to hotplug.

But commit 5537fcb3 ("powerpc/pci: Add ppc_md.discover_phbs()")
moved the boot-time calls later, after slab setup, meaning there's no
longer any need for zalloc_maybe_bootmem(), kzalloc() can be used in all
cases.

Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230823055430.752550-1-mpe@ellerman.id.au
parent 22b16561

arch/powerpc/include/asm/setup.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ 
extern void ppc_printk_progress(char *s, unsigned short hex);

extern void ppc_printk_progress(char *s, unsigned short hex);





extern unsigned long long memory_limit;

extern unsigned long long memory_limit;

extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);





struct device_node;

struct device_node;

arch/powerpc/kernel/pci-common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev) 
{

{

	struct pci_controller *phb;

	struct pci_controller *phb;





	phb = zalloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);

	phb = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);

	if (phb == NULL)

	if (phb == NULL)

		return NULL;

		return NULL;

arch/powerpc/lib/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ endif 
CFLAGS_code-patching.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

CFLAGS_code-patching.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

CFLAGS_feature-fixups.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)

CFLAGS_feature-fixups.o += $(DISABLE_LATENT_ENTROPY_PLUGIN)





obj-y += alloc.o code-patching.o feature-fixups.o pmem.o

obj-y += code-patching.o feature-fixups.o pmem.o





obj-$(CONFIG_CODE_PATCHING_SELFTEST) += test-code-patching.o

obj-$(CONFIG_CODE_PATCHING_SELFTEST) += test-code-patching.o

arch/powerpc/lib/alloc.c

deleted100644 → 0
+0 −23
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/types.h>

#include <linux/init.h>

#include <linux/slab.h>

#include <linux/memblock.h>

#include <linux/string.h>

#include <asm/setup.h>





void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)

{

	void *p;



	if (slab_is_available())

		p = kzalloc(size, mask);

	else {

		p = memblock_alloc(size, SMP_CACHE_BYTES);

		if (!p)

			panic("%s: Failed to allocate %zu bytes\n", __func__,

			      size);

	}

	return p;

}

arch/powerpc/sysdev/fsl_pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -767,7 +767,7 @@ static int __init mpc83xx_pcie_setup(struct pci_controller *hose, 
	u32 cfg_bar;

	u32 cfg_bar;

	int ret = -ENOMEM;

	int ret = -ENOMEM;





	pcie = zalloc_maybe_bootmem(sizeof(*pcie), GFP_KERNEL);

	pcie = kzalloc(sizeof(*pcie), GFP_KERNEL);

	if (!pcie)

	if (!pcie)

		return ret;

		return ret;