Re: [PATCH 2/8] powerpc/memory: Parse new memory property to register blocks.
On 07/25/2016 03:21 PM, Michael Bringmann wrote: > powerpc/memory: Add parallel routines to parse the new property > "ibm,dynamic-memory-v2" property when it is present, and then to > register the relevant memory blocks with the operating system. > This property format is intended to provide a more compact > representation of memory when communicating with the front end > processor, especially when describing vast amounts of RAM. > > Signed-off-by: Michael Bringmann > --- > diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h > index 7f436ba..b9a1534 100644 > --- a/arch/powerpc/include/asm/prom.h > +++ b/arch/powerpc/include/asm/prom.h > @@ -69,6 +69,8 @@ struct boot_param_header { > * OF address retreival & translation > */ > > +extern int n_mem_addr_cells; > + > /* Parse the ibm,dma-window property of an OF node into the busno, phys and > * size parameters. > */ > @@ -81,8 +83,9 @@ extern void of_instantiate_rtc(void); > extern int of_get_ibm_chip_id(struct device_node *np); > > /* 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 > + * specified in the device tree properties, > + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory > + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory-v2 > */ > struct of_drconf_cell { > u64 base_addr; > @@ -92,9 +95,39 @@ struct of_drconf_cell { > u32 flags; > }; > > -#define DRCONF_MEM_ASSIGNED 0x0008 > -#define DRCONF_MEM_AI_INVALID0x0040 > -#define DRCONF_MEM_RESERVED 0x0080 > +#define DRCONF_MEM_ASSIGNED 0x0008 > +#define DRCONF_MEM_AI_INVALID0x0040 > +#define DRCONF_MEM_RESERVED 0x0080 > + > + /* It is important to note that this structure can not > + * be safely mapped onto the memory containing the > + * 'ibm,dynamic-memory-v2'. This structure represents > + * the order of the fields stored, but compiler alignment > + * may insert extra bytes of padding between the fields > + * 'num_seq_lmbs' and 'base_addr'. > + */ The "packed" attribute should prevent the struct from being padded. struct of_drconf_cell_v2 { ... } __attribute__((packed)); or, simply struct of_drconf_cell_v2 { ... } __packed; -Tyrel > +struct of_drconf_cell_v2 { > + u32 num_seq_lmbs; > + u64 base_addr; > + u32 drc_index; > + u32 aa_index; > + u32 flags; > +}; > + > + > +static inline int dyn_mem_v2_len(int entries) > +{ > + int drconf_v2_cells = (n_mem_addr_cells + 4); > + int drconf_v2_cells_len = (drconf_v2_cells * sizeof(unsigned int)); > + return (((entries) * drconf_v2_cells_len) + > +(1 * sizeof(unsigned int))); > +} > + > +extern void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, > + const __be32 **cellp); > +extern void read_one_drc_info(int **info, char **drc_type, char **drc_name, > + unsigned long int *fdi_p, unsigned long int *nsl_p, > + unsigned long int *si_p, unsigned long int *ldi_p); > > /* > * There are two methods for telling firmware what our capabilities are. > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index 669a15e..ad294ce 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -405,6 +405,24 @@ static void read_drconf_cell(struct of_drconf_cell > *drmem, const __be32 **cellp) > > *cellp = cp + 4; > } > + > + /* > + * Retrieve and validate the ibm,dynamic-memory property of the device tree. > + * Read the next memory block set entry from the ibm,dynamic-memory-v2 > property > + * and return the information in the provided of_drconf_cell_v2 structure. > + */ > +void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, const __be32 > **cellp) > +{ > + const __be32 *cp = (const __be32 *)*cellp; > + drmem->num_seq_lmbs = be32_to_cpu(*cp++); > + drmem->base_addr = read_n_cells(n_mem_addr_cells, &cp); > + drmem->drc_index = be32_to_cpu(*cp++); > + drmem->aa_index = be32_to_cpu(*cp++); > + drmem->flags = be32_to_cpu(*cp++); > + > + *cellp = cp; > +} > +EXPORT_SYMBOL(read_drconf_cell_v2); > > /* > * Retrieve and validate the ibm,dynamic-memory property of the device tree. > diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c > index 946e34f..a55bc1e 100644 > --- a/arch/powerpc/kernel/prom.c > +++ b/arch/powerpc/kernel/prom.c > @@ -56,6 +56,7 @@ > #include > #include > #include > +#include > > #include > > @@ -441,12 +442,12 @@ static int __init > early_init_dt_scan_chosen_ppc(unsigned long node, > > #ifdef CONFIG_PPC_PSERIES > /* > - * Interpret the ibm,dynamic-memory property in the > - * /ibm,dynamic-reconfiguration-memory node. > + * Interpret the ibm,dynamic-memory property/ibm,dynamic-memory-v2 > + * in the /
[PATCH 2/8] powerpc/memory: Parse new memory property to register blocks.
powerpc/memory: Add parallel routines to parse the new property "ibm,dynamic-memory-v2" property when it is present, and then to register the relevant memory blocks with the operating system. This property format is intended to provide a more compact representation of memory when communicating with the front end processor, especially when describing vast amounts of RAM. Signed-off-by: Michael Bringmann --- diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h index 7f436ba..b9a1534 100644 --- a/arch/powerpc/include/asm/prom.h +++ b/arch/powerpc/include/asm/prom.h @@ -69,6 +69,8 @@ struct boot_param_header { * OF address retreival & translation */ +extern int n_mem_addr_cells; + /* Parse the ibm,dma-window property of an OF node into the busno, phys and * size parameters. */ @@ -81,8 +83,9 @@ extern void of_instantiate_rtc(void); extern int of_get_ibm_chip_id(struct device_node *np); /* 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 + * specified in the device tree properties, + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory + * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory-v2 */ struct of_drconf_cell { u64 base_addr; @@ -92,9 +95,39 @@ struct of_drconf_cell { u32 flags; }; -#define DRCONF_MEM_ASSIGNED0x0008 -#define DRCONF_MEM_AI_INVALID 0x0040 -#define DRCONF_MEM_RESERVED0x0080 +#define DRCONF_MEM_ASSIGNED0x0008 +#define DRCONF_MEM_AI_INVALID 0x0040 +#define DRCONF_MEM_RESERVED0x0080 + + /* It is important to note that this structure can not +* be safely mapped onto the memory containing the +* 'ibm,dynamic-memory-v2'. This structure represents +* the order of the fields stored, but compiler alignment +* may insert extra bytes of padding between the fields +* 'num_seq_lmbs' and 'base_addr'. +*/ +struct of_drconf_cell_v2 { + u32 num_seq_lmbs; + u64 base_addr; + u32 drc_index; + u32 aa_index; + u32 flags; +}; + + +static inline int dyn_mem_v2_len(int entries) +{ + int drconf_v2_cells = (n_mem_addr_cells + 4); + int drconf_v2_cells_len = (drconf_v2_cells * sizeof(unsigned int)); + return (((entries) * drconf_v2_cells_len) + +(1 * sizeof(unsigned int))); +} + +extern void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, + const __be32 **cellp); +extern void read_one_drc_info(int **info, char **drc_type, char **drc_name, + unsigned long int *fdi_p, unsigned long int *nsl_p, + unsigned long int *si_p, unsigned long int *ldi_p); /* * There are two methods for telling firmware what our capabilities are. diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 669a15e..ad294ce 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -405,6 +405,24 @@ static void read_drconf_cell(struct of_drconf_cell *drmem, const __be32 **cellp) *cellp = cp + 4; } + + /* + * Retrieve and validate the ibm,dynamic-memory property of the device tree. + * Read the next memory block set entry from the ibm,dynamic-memory-v2 property + * and return the information in the provided of_drconf_cell_v2 structure. + */ +void read_drconf_cell_v2(struct of_drconf_cell_v2 *drmem, const __be32 **cellp) +{ + const __be32 *cp = (const __be32 *)*cellp; + drmem->num_seq_lmbs = be32_to_cpu(*cp++); + drmem->base_addr = read_n_cells(n_mem_addr_cells, &cp); + drmem->drc_index = be32_to_cpu(*cp++); + drmem->aa_index = be32_to_cpu(*cp++); + drmem->flags = be32_to_cpu(*cp++); + + *cellp = cp; +} +EXPORT_SYMBOL(read_drconf_cell_v2); /* * Retrieve and validate the ibm,dynamic-memory property of the device tree. diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 946e34f..a55bc1e 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -56,6 +56,7 @@ #include #include #include +#include #include @@ -441,12 +442,12 @@ static int __init early_init_dt_scan_chosen_ppc(unsigned long node, #ifdef CONFIG_PPC_PSERIES /* - * Interpret the ibm,dynamic-memory property in the - * /ibm,dynamic-reconfiguration-memory node. + * Interpret the ibm,dynamic-memory property/ibm,dynamic-memory-v2 + * in the /ibm,dynamic-reconfiguration-memory node. * This contains a list of memory blocks along with NUMA affinity * information. */ -static int __init early_init_dt_scan_drconf_memory(unsigned long node) +static int __init early_init_dt_scan_drconf_memory_v1(unsigned long node) { const __be32 *dm, *ls, *usm; int l; @@ -516,6 +517,105 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node) memblock_dump_all(