Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c2f87c2 authored by Laura Abbott's avatar Laura Abbott Committed by Russell King
Browse files

ARM: 8025/1: Get rid of meminfo 



memblock is now fully integrated into the kernel and is the prefered
method for tracking memory. Rather than reinvent the wheel with
meminfo, migrate to using memblock directly instead of meminfo as
an intermediate.

Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1c8c3cf0

arch/arm/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -1101,11 +1101,6 @@ source "arch/arm/firmware/Kconfig" 


source arch/arm/mm/Kconfig



config ARM_NR_BANKS

	int

	default 16 if ARCH_EP93XX

	default 8



config IWMMXT

	bool "Enable iWMMXt support" if !CPU_PJ4

	depends on CPU_XSCALE || CPU_XSC3 || CPU_MOHAWK || CPU_PJ4

arch/arm/boot/compressed/atags_to_fdt.c

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#define do_extend_cmdline 0

#endif



#define NR_BANKS 16



static int node_offset(void *fdt, const char *node_path)

{

	int offset = fdt_path_offset(fdt, node_path);

arch/arm/include/asm/mach/arch.h

+1 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/reboot.h>



struct tag;

struct meminfo;

struct pt_regs;

struct smp_operations;

#ifdef CONFIG_SMP
@@ -47,8 +46,7 @@ struct machine_desc { 
	enum reboot_mode	reboot_mode;	/* default restart mode	*/

	struct smp_operations	*smp;		/* SMP operations	*/

	bool			(*smp_init)(void);

	void			(*fixup)(struct tag *, char **,

					 struct meminfo *);

	void			(*fixup)(struct tag *, char **);

	void			(*init_meminfo)(void);

	void			(*reserve)(void);/* reserve mem blocks	*/

	void			(*map_io)(void);/* IO mapping function	*/

arch/arm/include/asm/memblock.h

+1 −2
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_MEMBLOCK_H

#define _ASM_ARM_MEMBLOCK_H



struct meminfo;

struct machine_desc;



void arm_memblock_init(struct meminfo *, const struct machine_desc *);

void arm_memblock_init(const struct machine_desc *);

phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align);



#endif

arch/arm/include/asm/setup.h

+0 −28
Original line number Diff line number Diff line
@@ -21,34 +21,6 @@ 
#define __tagtable(tag, fn) \

static const struct tagtable __tagtable_##fn __tag = { tag, fn }



/*

 * Memory map description

 */

#define NR_BANKS	CONFIG_ARM_NR_BANKS



struct membank {

	phys_addr_t start;

	phys_addr_t size;

	unsigned int highmem;

};



struct meminfo {

	int nr_banks;

	struct membank bank[NR_BANKS];

};



extern struct meminfo meminfo;



#define for_each_bank(iter,mi)				\

	for (iter = 0; iter < (mi)->nr_banks; iter++)



#define bank_pfn_start(bank)	__phys_to_pfn((bank)->start)

#define bank_pfn_end(bank)	__phys_to_pfn((bank)->start + (bank)->size)

#define bank_pfn_size(bank)	((bank)->size >> PAGE_SHIFT)

#define bank_phys_start(bank)	(bank)->start

#define bank_phys_end(bank)	((bank)->start + (bank)->size)

#define bank_phys_size(bank)	(bank)->size



extern int arm_add_memory(u64 start, u64 size);

extern void early_print(const char *str, ...);

extern void dump_machine_table(void);