Re: [PATCH 2/5] move of_drconf_cell definition to prom.h

[Brian King]

Nathan Fontenot wrote:
 Move the definition of the of_drconf_cell struct from numa.c to prom.h. 
 This
 is needed so that we can parse the ibm,dynamic-memory device-tree property
 when DLPAR adding and removing memory.
 
 Signed-off-by: Nathan Fontenot nf...@austin.ibm.com
 ---
 
 Index: powerpc/arch/powerpc/include/asm/prom.h
 ===
 --- powerpc.orig/arch/powerpc/include/asm/prom.h2009-09-11
 12:43:39.0 -0500
 +++ powerpc/arch/powerpc/include/asm/prom.h2009-09-11
 12:52:11.0 -0500
 @@ -349,6 +349,18 @@
  */
 extern void __iomem *of_iomap(struct device_node *device, int index);
 
 +struct of_drconf_cell {
 +u64base_addr;
 +u32drc_index;
 +u32reserved;
 +u32aa_index;
 +u32flags;
 +};

Might as well fix this up to use a tab instead of spaces for the indentation
if you are moving it.

 +
 +#define DRCONF_MEM_ASSIGNED0x0008
 +#define DRCONF_MEM_AI_INVALID0x0040
 +#define DRCONF_MEM_RESERVED0x0080
 +
 /*
  * NB:  This is here while we transition from using asm/prom.h
  * to linux/of.h
 Index: powerpc/arch/powerpc/mm/numa.c
 ===
 --- powerpc.orig/arch/powerpc/mm/numa.c2009-09-11 12:43:39.0
 -0500
 +++ powerpc/arch/powerpc/mm/numa.c2009-09-11 12:52:11.0 -0500
 @@ -296,18 +296,6 @@
 return result;
 }
 
 -struct of_drconf_cell {
 -u64base_addr;
 -u32drc_index;
 -u32reserved;
 -u32aa_index;
 -u32flags;
 -};
 -
 -#define DRCONF_MEM_ASSIGNED0x0008
 -#define DRCONF_MEM_AI_INVALID0x0040
 -#define DRCONF_MEM_RESERVED0x0080
 -
 /*
  * Read the next lmb list entry from the ibm,dynamic-memory property
  * and return the information in the provided of_drconf_cell structure.
 ___
 Linuxppc-dev mailing list
 Linuxppc-dev@lists.ozlabs.org
 https://lists.ozlabs.org/listinfo/linuxppc-dev


-- 
Brian King
Linux on Power Virtualization
IBM Linux Technology Center


___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

[PATCH 2/5] move of_drconf_cell definition to prom.h

[Nathan Fontenot]

Move the definition of the of_drconf_cell struct from numa.c to prom.h.  This
is needed so that we can parse the ibm,dynamic-memory device-tree property
when DLPAR adding and removing memory.

Signed-off-by: Nathan Fontenot nf...@austin.ibm.com
---

Index: powerpc/arch/powerpc/include/asm/prom.h
===
--- powerpc.orig/arch/powerpc/include/asm/prom.h2009-09-11 
12:43:39.0 -0500
+++ powerpc/arch/powerpc/include/asm/prom.h 2009-09-11 12:52:11.0 
-0500
@@ -349,6 +349,18 @@
 */
extern void __iomem *of_iomap(struct device_node *device, int index);

+struct of_drconf_cell {
+   u64 base_addr;
+   u32 drc_index;
+   u32 reserved;
+   u32 aa_index;
+   u32 flags;
+};
+
+#define DRCONF_MEM_ASSIGNED0x0008
+#define DRCONF_MEM_AI_INVALID  0x0040
+#define DRCONF_MEM_RESERVED0x0080
+
/*
 * NB:  This is here while we transition from using asm/prom.h
 * to linux/of.h
Index: powerpc/arch/powerpc/mm/numa.c
===
--- powerpc.orig/arch/powerpc/mm/numa.c 2009-09-11 12:43:39.0 -0500
+++ powerpc/arch/powerpc/mm/numa.c  2009-09-11 12:52:11.0 -0500
@@ -296,18 +296,6 @@
return result;
}

-struct of_drconf_cell {
-   u64 base_addr;
-   u32 drc_index;
-   u32 reserved;
-   u32 aa_index;
-   u32 flags;
-};
-
-#define DRCONF_MEM_ASSIGNED0x0008
-#define DRCONF_MEM_AI_INVALID  0x0040
-#define DRCONF_MEM_RESERVED0x0080
-
/*
 * Read the next lmb list entry from the ibm,dynamic-memory property
 * and return the information in the provided of_drconf_cell structure.
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev