powerpc: Move cpu specific lmb reserve to arch_lmb_reserve

PATCH Superseded Kumar Gala 1 participant 2 messages Jan 31, 2011 – Feb 10, 2011 PowerPC

Share & tools

Kumar Gala

author

2011-01-31 22:15 UTC #0 lore raw

PATCH v2 1/1 powerpc: Move cpu specific lmb reserve to arch_lmb_reserve

We've been utilizing board_lmb_reserve to reserve the boot page for MP systems. We can just move this into arch_lmb_reserve for 85xx & 86xx systems rather than duplicating in each board port.

Signed-off-by Kumar Gala <[email protected]>

---
* Fix compiler warning for not including <asm/mp.h> in bootm.c

 arch/powerpc/lib/bootm.c                  |    5 +++++
 board/freescale/corenet_ds/corenet_ds.c   |   11 +----------
 board/freescale/mpc8572ds/mpc8572ds.c     |   11 +----------
 board/freescale/mpc8641hpcn/mpc8641hpcn.c |   11 +----------
 board/freescale/p1022ds/p1022ds.c         |   10 +---------
 board/freescale/p1_p2_rdb/p1_p2_rdb.c     |    9 ---------
 board/freescale/p2020ds/p2020ds.c         |   10 +---------
 board/sbc8641d/sbc8641d.c                 |    9 ---------
 board/xes/xpedite517x/xpedite517x.c       |    9 ---------
 board/xes/xpedite537x/xpedite537x.c       |    9 ---------
 board/xes/xpedite550x/xpedite550x.c       |    9 ---------
 11 files changed, 10 insertions(+), 93 deletions(-)

arch/powerpc/lib/bootm.c +5 -0

index 116d81b..c7f3d08 100644
@@ -33,6 +33,7 @@
 #include <bzlib.h>
 #include <environment.h>
 #include <asm/byteorder.h>
+#include <asm/mp.h>
 
 #if defined(CONFIG_OF_LIBFDT)
 #include <fdt.h>

@@ -166,6 +167,10 @@ void arch_lmb_reserve(struct lmb *lmb)
 	sp -= 4096;
 	lmb_reserve(lmb, sp, (CONFIG_SYS_SDRAM_BASE + get_effective_memsize() - sp));
 
+#ifdef CONFIG_MP
+	cpu_mp_lmb_reserve(lmb);
+#endif
+
 	return ;
 }

board/freescale/corenet_ds/corenet_ds.c +1 ~~-10~~

index 232dc72..3db93c3 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Freescale Semiconductor, Inc.
+ * Copyright 2009-2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -39,8 +39,6 @@ extern void pci_of_setup(void *blob, bd_t *bd);
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void cpu_mp_lmb_reserve(struct lmb *lmb);
-
 int checkboard (void)
 {
 	u8 sw;

@@ -186,13 +184,6 @@ int misc_init_r(void)
 	return 0;
 }
 
-#ifdef CONFIG_MP
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif
-
 void ft_board_setup(void *blob, bd_t *bd)
 {
 	phys_addr_t base;

board/freescale/mpc8572ds/mpc8572ds.c +1 ~~-10~~

index 4b2ef4e..f444805 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2010 Freescale Semiconductor, Inc.
+ * Copyright 2007-2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -259,12 +259,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 #endif
 }
 #endif
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 ~~-10~~

index 166ff0c..cd2ce4b 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, 2007, 2010 Freescale Semiconductor.
+ * Copyright 2006, 2007, 2010-2011 Freescale Semiconductor.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -261,12 +261,3 @@ void board_reset(void)
 	while (1)
 		;
 }
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/freescale/p1022ds/p1022ds.c +1 -9

index 0ea0bdf..62beafa 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Freescale Semiconductor, Inc.
+ * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * Authors: Srikanth Srinivasan <[email protected]>
  *          Timur Tabi <[email protected]>
  *

@@ -24,7 +24,6 @@
 #include <fdt_support.h>
 #include <tsec.h>
 #include <asm/fsl_law.h>
-#include <asm/mp.h>
 #include <netdev.h>
 #include <i2c.h>
 #include <hwconfig.h>

@@ -302,10 +301,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 	ft_codec_setup(blob, "wlf,wm8776");
 }
 #endif
-
-#ifdef CONFIG_MP
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/freescale/p1_p2_rdb/p1_p2_rdb.c +0 -9

index 0780942..806d90e 100644
@@ -229,12 +229,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 	fdt_fixup_memory(blob, (u64)base, (u64)size);
 }
 #endif
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/freescale/p2020ds/p2020ds.c +1 -9

index 8546aa9..58c56e7 100644
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2010 Freescale Semiconductor, Inc.
+ * Copyright 2007-2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -36,7 +36,6 @@
 #include <fdt_support.h>
 #include <tsec.h>
 #include <asm/fsl_law.h>
-#include <asm/mp.h>
 #include <netdev.h>
 
 #include "../common/ngpixis.h"

@@ -249,10 +248,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 #endif
 }
 #endif
-
-#ifdef CONFIG_MP
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/sbc8641d/sbc8641d.c +0 -9

index 5c30b26..dd58541 100644
@@ -273,12 +273,3 @@ void board_reset(void)
 	__asm__ __volatile__ ("rfi");
 #endif
 }
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/xes/xpedite517x/xpedite517x.c +0 -9

index 61443aa..179b238 100644
@@ -93,12 +93,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 	ft_cpu_setup(blob, bd);
 }
 #endif
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/xes/xpedite537x/xpedite537x.c +0 -9

index d074495..9d9afae 100644
@@ -96,12 +96,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 	ft_cpu_setup(blob, bd);
 }
 #endif
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

board/xes/xpedite550x/xpedite550x.c +0 -9

index 6f91c83..24b2b0e 100644
@@ -96,12 +96,3 @@ void ft_board_setup(void *blob, bd_t *bd)
 	ft_cpu_setup(blob, bd);
 }
 #endif
-
-#ifdef CONFIG_MP
-extern void cpu_mp_lmb_reserve(struct lmb *lmb);
-
-void board_lmb_reserve(struct lmb *lmb)
-{
-	cpu_mp_lmb_reserve(lmb);
-}
-#endif

Signature · 1 line

1.7.2.3

Kumar Gala

author Applied

2011-02-10 05:16 UTC #1 lore raw

PATCH v2 1/1 powerpc: Move cpu specific lmb reserve to arch_lmb_reserve

Quoted 8 lines · Kumar Gala

We've been utilizing board_lmb_reserve to reserve the boot page for MP systems. We can just move this into arch_lmb_reserve for 85xx & 86xx systems rather than duplicating in each board port.
Signed-off-by Kumar Gala <[email protected]>
---
* Fix compiler warning for not including <asm/mp.h> in bootm.c

Quoted 12 lines

arch/powerpc/lib/bootm.c                  |    5 +++++
board/freescale/corenet_ds/corenet_ds.c   |   11 +----------
board/freescale/mpc8572ds/mpc8572ds.c     |   11 +----------
board/freescale/mpc8641hpcn/mpc8641hpcn.c |   11 +----------
board/freescale/p1022ds/p1022ds.c         |   10 +---------
board/freescale/p1_p2_rdb/p1_p2_rdb.c     |    9 ---------
board/freescale/p2020ds/p2020ds.c         |   10 +---------
board/sbc8641d/sbc8641d.c                 |    9 ---------
board/xes/xpedite517x/xpedite517x.c       |    9 ---------
board/xes/xpedite537x/xpedite537x.c       |    9 ---------
board/xes/xpedite550x/xpedite550x.c       |    9 ---------
11 files changed, 10 insertions(+), 93 deletions(-)

applied to 85xx next

- k