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

Commit f5949720 authored by Nathan Fontenot's avatar Nathan Fontenot Committed by Benjamin Herrenschmidt
Browse files

powerpc+of: Move of_drconf_cell struct definition to asm/prom.h 



This patch moves the definition of the of_drconf_cell struct to asm/prom.h
to make it available for all powerpc/pseries code.

Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent e81b3295

arch/powerpc/include/asm/prom.h

+16 −0
Original line number Diff line number Diff line
@@ -58,6 +58,22 @@ static inline int of_node_to_nid(struct device_node *device) { return 0; } 


extern void of_instantiate_rtc(void);



/* The of_drconf_cell struct defines the layout of the LMB array

 * specified in the device tree property

 * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory

 */

struct of_drconf_cell {

	u64	base_addr;

	u32	drc_index;

	u32	reserved;

	u32	aa_index;

	u32	flags;

};



#define DRCONF_MEM_ASSIGNED	0x00000008

#define DRCONF_MEM_AI_INVALID	0x00000040

#define DRCONF_MEM_RESERVED	0x00000080



/* These includes are put at the bottom because they may contain things

 * that are overridden by this file.  Ideally they shouldn't be included

 * by this file, but there are a bunch of .c files that currently depend

arch/powerpc/mm/numa.c

+0 −12
Original line number Diff line number Diff line
@@ -399,18 +399,6 @@ static unsigned long read_n_cells(int n, const unsigned int **buf) 
	return result;

}



struct of_drconf_cell {

	u64	base_addr;

	u32	drc_index;

	u32	reserved;

	u32	aa_index;

	u32	flags;

};



#define DRCONF_MEM_ASSIGNED	0x00000008

#define DRCONF_MEM_AI_INVALID	0x00000040

#define DRCONF_MEM_RESERVED	0x00000080



/*

 * Read the next memblock list entry from the ibm,dynamic-memory property

 * and return the information in the provided of_drconf_cell structure.