The implementation of the pseries-specific dynamic memory features is currently implemented in several non-pseries-specific files. This patch set moves the implementation of the device-tree parsing code for the properties ibm,dynamic-memory, ibm,dynamic-memory-v2, and its representation in the kernel into the platform-specific directory to the Pseries features.
This patch moves drmem.h from directory arch/powerpc/include/asm to arch/powerpc/platforms/pseries, and fixing include file references in pseries files. Signed-off-by: Michael Bringmann <m...@linux.vnet.ibm.com> --- arch/powerpc/include/asm/drmem.h | 107 ----------------------- arch/powerpc/platforms/pseries/drmem.c | 2 arch/powerpc/platforms/pseries/drmem.h | 107 +++++++++++++++++++++++ arch/powerpc/platforms/pseries/hotplug-memory.c | 2 arch/powerpc/platforms/pseries/lparcfg.c | 2 5 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 arch/powerpc/include/asm/drmem.h create mode 100644 arch/powerpc/platforms/pseries/drmem.h diff --git a/arch/powerpc/include/asm/drmem.h b/arch/powerpc/include/asm/drmem.h deleted file mode 100644 index 7c1d8e7..0000000 --- a/arch/powerpc/include/asm/drmem.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * drmem.h: Power specific logical memory block representation - * - * Copyright 2017 IBM Corporation - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -#ifndef _ASM_POWERPC_LMB_H -#define _ASM_POWERPC_LMB_H - -struct drmem_lmb { - u64 base_addr; - u32 drc_index; - u32 aa_index; - u32 flags; -}; - -struct drmem_lmb_info { - struct drmem_lmb *lmbs; - int n_lmbs; - u32 lmb_size; -}; - -extern struct drmem_lmb_info *drmem_info; - -#define for_each_drmem_lmb_in_range(lmb, start, end) \ - for ((lmb) = (start); (lmb) <= (end); (lmb)++) - -#define for_each_drmem_lmb(lmb) \ - for_each_drmem_lmb_in_range((lmb), \ - &drmem_info->lmbs[0], \ - &drmem_info->lmbs[drmem_info->n_lmbs - 1]) - -/* - * The of_drconf_cell_v1 struct defines the layout of the LMB data - * specified in the ibm,dynamic-memory device tree property. - * The property itself is a 32-bit value specifying the number of - * LMBs followed by an array of of_drconf_cell_v1 entries, one - * per LMB. - */ -struct of_drconf_cell_v1 { - __be64 base_addr; - __be32 drc_index; - __be32 reserved; - __be32 aa_index; - __be32 flags; -}; - -/* - * Version 2 of the ibm,dynamic-memory property is defined as a - * 32-bit value specifying the number of LMB sets followed by an - * array of of_drconf_cell_v2 entries, one per LMB set. - */ -struct of_drconf_cell_v2 { - u32 seq_lmbs; - u64 base_addr; - u32 drc_index; - u32 aa_index; - u32 flags; -} __packed; - -#define DRCONF_MEM_ASSIGNED 0x00000008 -#define DRCONF_MEM_AI_INVALID 0x00000040 -#define DRCONF_MEM_RESERVED 0x00000080 - -static inline u32 drmem_lmb_size(void) -{ - return drmem_info->lmb_size; -} - -#define DRMEM_LMB_RESERVED 0x80000000 - -static inline void drmem_mark_lmb_reserved(struct drmem_lmb *lmb) -{ - lmb->flags |= DRMEM_LMB_RESERVED; -} - -static inline void drmem_remove_lmb_reservation(struct drmem_lmb *lmb) -{ - lmb->flags &= ~DRMEM_LMB_RESERVED; -} - -static inline bool drmem_lmb_reserved(struct drmem_lmb *lmb) -{ - return lmb->flags & DRMEM_LMB_RESERVED; -} - -u64 drmem_lmb_memory_max(void); -void __init walk_drmem_lmbs(struct device_node *dn, - void (*func)(struct drmem_lmb *, const __be32 **)); -int drmem_update_dt(void); - -#ifdef CONFIG_PPC_PSERIES -void __init walk_drmem_lmbs_early(unsigned long node, - void (*func)(struct drmem_lmb *, const __be32 **)); -#endif - -static inline void invalidate_lmb_associativity_index(struct drmem_lmb *lmb) -{ - lmb->aa_index = 0xffffffff; -} - -#endif /* _ASM_POWERPC_LMB_H */ diff --git a/arch/powerpc/platforms/pseries/drmem.c b/arch/powerpc/platforms/pseries/drmem.c index 01ac651..a52f10e 100644 --- a/arch/powerpc/platforms/pseries/drmem.c +++ b/arch/powerpc/platforms/pseries/drmem.c @@ -17,7 +17,7 @@ #include <linux/memblock.h> #include <asm/prom.h> #include <asm/iommu.h> -#include <asm/drmem.h> +#include "drmem.h" static struct drmem_lmb_info __drmem_info; struct drmem_lmb_info *drmem_info = &__drmem_info; diff --git a/arch/powerpc/platforms/pseries/drmem.h b/arch/powerpc/platforms/pseries/drmem.h new file mode 100644 index 0000000..7c1d8e7 --- /dev/null +++ b/arch/powerpc/platforms/pseries/drmem.h @@ -0,0 +1,107 @@ +/* + * drmem.h: Power specific logical memory block representation + * + * Copyright 2017 IBM Corporation + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#ifndef _ASM_POWERPC_LMB_H +#define _ASM_POWERPC_LMB_H + +struct drmem_lmb { + u64 base_addr; + u32 drc_index; + u32 aa_index; + u32 flags; +}; + +struct drmem_lmb_info { + struct drmem_lmb *lmbs; + int n_lmbs; + u32 lmb_size; +}; + +extern struct drmem_lmb_info *drmem_info; + +#define for_each_drmem_lmb_in_range(lmb, start, end) \ + for ((lmb) = (start); (lmb) <= (end); (lmb)++) + +#define for_each_drmem_lmb(lmb) \ + for_each_drmem_lmb_in_range((lmb), \ + &drmem_info->lmbs[0], \ + &drmem_info->lmbs[drmem_info->n_lmbs - 1]) + +/* + * The of_drconf_cell_v1 struct defines the layout of the LMB data + * specified in the ibm,dynamic-memory device tree property. + * The property itself is a 32-bit value specifying the number of + * LMBs followed by an array of of_drconf_cell_v1 entries, one + * per LMB. + */ +struct of_drconf_cell_v1 { + __be64 base_addr; + __be32 drc_index; + __be32 reserved; + __be32 aa_index; + __be32 flags; +}; + +/* + * Version 2 of the ibm,dynamic-memory property is defined as a + * 32-bit value specifying the number of LMB sets followed by an + * array of of_drconf_cell_v2 entries, one per LMB set. + */ +struct of_drconf_cell_v2 { + u32 seq_lmbs; + u64 base_addr; + u32 drc_index; + u32 aa_index; + u32 flags; +} __packed; + +#define DRCONF_MEM_ASSIGNED 0x00000008 +#define DRCONF_MEM_AI_INVALID 0x00000040 +#define DRCONF_MEM_RESERVED 0x00000080 + +static inline u32 drmem_lmb_size(void) +{ + return drmem_info->lmb_size; +} + +#define DRMEM_LMB_RESERVED 0x80000000 + +static inline void drmem_mark_lmb_reserved(struct drmem_lmb *lmb) +{ + lmb->flags |= DRMEM_LMB_RESERVED; +} + +static inline void drmem_remove_lmb_reservation(struct drmem_lmb *lmb) +{ + lmb->flags &= ~DRMEM_LMB_RESERVED; +} + +static inline bool drmem_lmb_reserved(struct drmem_lmb *lmb) +{ + return lmb->flags & DRMEM_LMB_RESERVED; +} + +u64 drmem_lmb_memory_max(void); +void __init walk_drmem_lmbs(struct device_node *dn, + void (*func)(struct drmem_lmb *, const __be32 **)); +int drmem_update_dt(void); + +#ifdef CONFIG_PPC_PSERIES +void __init walk_drmem_lmbs_early(unsigned long node, + void (*func)(struct drmem_lmb *, const __be32 **)); +#endif + +static inline void invalidate_lmb_associativity_index(struct drmem_lmb *lmb) +{ + lmb->aa_index = 0xffffffff; +} + +#endif /* _ASM_POWERPC_LMB_H */ diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 2a983b5..988d67e4 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -23,7 +23,7 @@ #include <asm/prom.h> #include <asm/sparsemem.h> #include <asm/fadump.h> -#include <asm/drmem.h> +#include "drmem.h" #include "pseries.h" static bool rtas_hp_event; diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c index 7944873..28d931e 100644 --- a/arch/powerpc/platforms/pseries/lparcfg.c +++ b/arch/powerpc/platforms/pseries/lparcfg.c @@ -37,8 +37,8 @@ #include <asm/vio.h> #include <asm/mmu.h> #include <asm/machdep.h> -#include <asm/drmem.h> +#include "drmem.h" #include "pseries.h" /*