Commit 51975db0 authored by Grant Likely's avatar Grant Likely
Browse files

of/flattree: merge early_init_dt_scan_memory() common code 



Merge common code between PowerPC and Microblaze architectures.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
parent 71a157e8

arch/microblaze/kernel/prom.c

+2 −49
Original line number Diff line number Diff line
@@ -45,62 +45,15 @@ 
/* export that to outside world */

struct device_node *of_chosen;



#define early_init_dt_scan_drconf_memory(node) 0



void __init early_init_dt_scan_chosen_arch(unsigned long node)

{

	/* No Microblaze specific code here */

}



static int __init early_init_dt_scan_memory(unsigned long node,

				const char *uname, int depth, void *data)

void __init early_init_dt_add_memory_arch(u64 base, u64 size)

{

	char *type = of_get_flat_dt_prop(node, "device_type", NULL);

	__be32 *reg, *endp;

	unsigned long l;



	/* Look for the ibm,dynamic-reconfiguration-memory node */

/*	if (depth == 1 &&

		strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0)

		return early_init_dt_scan_drconf_memory(node);

*/

	/* We are scanning "memory" nodes only */

	if (type == NULL) {

		/*

		 * The longtrail doesn't have a device_type on the

		 * /memory node, so look for the node called /memory@0.

		 */

		if (depth != 1 || strcmp(uname, "memory@0") != 0)

			return 0;

	} else if (strcmp(type, "memory") != 0)

		return 0;



	reg = (__be32 *)of_get_flat_dt_prop(node, "linux,usable-memory", &l);

	if (reg == NULL)

		reg = (__be32 *)of_get_flat_dt_prop(node, "reg", &l);

	if (reg == NULL)

		return 0;



	endp = reg + (l / sizeof(__be32));



	pr_debug("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",

		uname, l, reg[0], reg[1], reg[2], reg[3]);



	while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {

		u64 base, size;



		base = dt_mem_next_cell(dt_root_addr_cells, &reg);

		size = dt_mem_next_cell(dt_root_size_cells, &reg);



		if (size == 0)

			continue;

		pr_debug(" - %llx ,  %llx\n", (unsigned long long)base,

			(unsigned long long)size);



	lmb_add(base, size);

}

	return 0;

}



#ifdef CONFIG_EARLY_PRINTK

/* MS this is Microblaze specifig function */

arch/powerpc/kernel/prom.c

+18 −51
Original line number Diff line number Diff line
@@ -483,66 +483,33 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node) 
#define early_init_dt_scan_drconf_memory(node)	0

#endif /* CONFIG_PPC_PSERIES */



static int __init early_init_dt_scan_memory(unsigned long node,

					    const char *uname, int depth, void *data)

static int __init early_init_dt_scan_memory_ppc(unsigned long node,

						const char *uname,

						int depth, void *data)

{

	char *type = of_get_flat_dt_prop(node, "device_type", NULL);

	__be32 *reg, *endp;

	unsigned long l;



	/* Look for the ibm,dynamic-reconfiguration-memory node */

	if (depth == 1 &&

	    strcmp(uname, "ibm,dynamic-reconfiguration-memory") == 0)

		return early_init_dt_scan_drconf_memory(node);

	

	/* We are scanning "memory" nodes only */

	if (type == NULL) {

		/*

		 * The longtrail doesn't have a device_type on the

		 * /memory node, so look for the node called /memory@0.

		 */

		if (depth != 1 || strcmp(uname, "memory@0") != 0)

			return 0;

	} else if (strcmp(type, "memory") != 0)

		return 0;



	reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);

	if (reg == NULL)

		reg = of_get_flat_dt_prop(node, "reg", &l);

	if (reg == NULL)

		return 0;



	endp = reg + (l / sizeof(__be32));



	DBG("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",

	    uname, l, reg[0], reg[1], reg[2], reg[3]);



	while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {

		u64 base, size;



		base = dt_mem_next_cell(dt_root_addr_cells, &reg);

		size = dt_mem_next_cell(dt_root_size_cells, &reg);

	return early_init_dt_scan_memory(node, uname, depth, data);

}



		if (size == 0)

			continue;

		DBG(" - %llx ,  %llx\n", (unsigned long long)base,

		    (unsigned long long)size);

#ifdef CONFIG_PPC64

void __init early_init_dt_add_memory_arch(u64 base, u64 size)

{

#if defined(CONFIG_PPC64)

	if (iommu_is_off) {

		if (base >= 0x80000000ul)

				continue;

			return;

		if ((base + size) > 0x80000000ul)

			size = 0x80000000ul - base;

	}

#endif



	lmb_add(base, size);



	memstart_addr = min((u64)memstart_addr, base);

}



	return 0;

}



static void __init early_reserve_mem(void)

{

	u64 base, size;
@@ -706,7 +673,7 @@ void __init early_init_devtree(void *params) 
	/* Scan memory nodes and rebuild LMBs */

	lmb_init();

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);



	/* Save command line for /proc/cmdline and then parse parameters */

	strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);

drivers/of/fdt.c

+50 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/of.h>

#include <linux/of_fdt.h>





#ifdef CONFIG_PPC

#include <asm/machdep.h>

#endif /* CONFIG_PPC */
@@ -443,6 +444,55 @@ u64 __init dt_mem_next_cell(int s, u32 **cellp) 
	return of_read_number(p, s);

}



/**

 * early_init_dt_scan_memory - Look for an parse memory nodes

 */

int __init early_init_dt_scan_memory(unsigned long node, const char *uname,

				     int depth, void *data)

{

	char *type = of_get_flat_dt_prop(node, "device_type", NULL);

	__be32 *reg, *endp;

	unsigned long l;



	/* We are scanning "memory" nodes only */

	if (type == NULL) {

		/*

		 * The longtrail doesn't have a device_type on the

		 * /memory node, so look for the node called /memory@0.

		 */

		if (depth != 1 || strcmp(uname, "memory@0") != 0)

			return 0;

	} else if (strcmp(type, "memory") != 0)

		return 0;



	reg = of_get_flat_dt_prop(node, "linux,usable-memory", &l);

	if (reg == NULL)

		reg = of_get_flat_dt_prop(node, "reg", &l);

	if (reg == NULL)

		return 0;



	endp = reg + (l / sizeof(__be32));



	pr_debug("memory scan node %s, reg size %ld, data: %x %x %x %x,\n",

	    uname, l, reg[0], reg[1], reg[2], reg[3]);



	while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {

		u64 base, size;



		base = dt_mem_next_cell(dt_root_addr_cells, &reg);

		size = dt_mem_next_cell(dt_root_size_cells, &reg);



		if (size == 0)

			continue;

		pr_debug(" - %llx ,  %llx\n", (unsigned long long)base,

		    (unsigned long long)size);



		early_init_dt_add_memory_arch(base, size);

	}



	return 0;

}



int __init early_init_dt_scan_chosen(unsigned long node, const char *uname,

				     int depth, void *data)

{

include/linux/of_fdt.h

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ extern void early_init_dt_scan_chosen_arch(unsigned long node); 
extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,

				     int depth, void *data);

extern void early_init_dt_check_for_initrd(unsigned long node);

extern int early_init_dt_scan_memory(unsigned long node, const char *uname,

				     int depth, void *data);

extern void early_init_dt_add_memory_arch(u64 base, u64 size);

extern u64 dt_mem_next_cell(int s, u32 **cellp);



/* Early flat tree scan hooks */