86xx: Cleanup MP support
PATCH v2 1/3 86xx: Cleanup MP support
* Use CONFIG_MP instead of CONFIG_NUM_CPUS to match 85xx
* Introduce determine_mp_bootpg() helper. We'll need this to address a bug introduced in v2009.03 with 86xx MP booting. We have to make sure to reserve the region of memory used for the MP bootpg() so other u-boot code doesn't use it.
* Added dummy versions of cpu_status() & cpu_release() to allow cmd_mp.c to build and work. In the future we should look at implementing cpu_release(). This could be common w/85xx if we use spin tables on 86xx.
---
* removed change to 85xx code
* added comments about cpu_status() & cpu_release()
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/sbc8641d/sbc8641d.c | 2 +- cpu/mpc86xx/Makefile | 7 ++-- cpu/mpc86xx/fdt.c | 12 ++----- cpu/mpc86xx/mp.c | 50 +++++++++++++++++++---------- cpu/mpc86xx/mp.h | 1 + cpu/mpc86xx/release.S | 2 - include/configs/MPC8641HPCN.h | 1 + include/configs/sbc8641d.h | 1 + 9 files changed, 44 insertions(+), 34 deletions(-)
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1 -1
@@ -375,7 +375,7 @@ void board_reset(void) ; } -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP extern void cpu_mp_lmb_reserve (struct lmb *lmb);void board_lmb_reserve (struct lmb *lmb)
board/sbc8641d/sbc8641d.c +1 -1
@@ -414,7 +414,7 @@ void board_reset(void)#endif } -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP extern void cpu_mp_lmb_reserve (struct lmb *lmb);void board_lmb_reserve (struct lmb *lmb)
cpu/mpc86xx/Makefile +3 -4
@@ -31,10 +31,9 @@ LIB = $(obj)lib$(CPU).a START = start.o SOBJS = cache.o -ifneq ($(CONFIG_NUM_CPUS),1) -COBJS-y += mp.o -SOBJS += release.o -endif +SOBJS-$(CONFIG_MP) += release.o +SOBJS += $(SOBJS-y) +COBJS-$(CONFIG_MP) += mp.o COBJS-y += traps.o COBJS-y += cpu.o COBJS-y += cpu_init.o
cpu/mpc86xx/fdt.c +3 -9
@@ -15,9 +15,9 @@ DECLARE_GLOBAL_DATA_PTR;void ft_cpu_setup (void *blob,bd_t *bd) { -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP int off; -u32 bootpg; +u32 bootpg =determine_mp_bootpg ();#endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,
@@ -48,13 +48,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);#endif -#if (CONFIG_NUM_CPUS >1 ) -/* if we have 4G or more of memory, put the boot page at 4Gb-1M */ -if (gd->ram_size >0xfffff000 ) - bootpg =0xfff00000 ; -else - bootpg = gd->ram_size - (1024 *1024 ); - +#ifdef CONFIG_MP /* Reserve the boot page so OSes dont use it */ off =fdt_add_mem_rsv (blob, bootpg, (u64 )4096 );if (off <0 )
cpu/mpc86xx/mp.c +33 -17
71 lines not on this page · raw message
cpu/mpc86xx/mp.h +1 -0
@@ -3,5 +3,6 @@void setup_mp (void );void cpu_mp_lmb_reserve (struct lmb *lmb); +u32 determine_mp_bootpg (void );#endif
cpu/mpc86xx/release.S +0 -2
@@ -41,7 +41,6 @@ * Core 0 must copy this to a 1M aligned region and set BPTR * to point to it. */ -#if (CONFIG_NUM_CPUS > 1) .align 12 .globl __secondary_start_page __secondary_start_page:
@@ -166,4 +165,3 @@ invl2: blr /* Never Returns, Running in Linux Now */ -#endif
include/configs/MPC8641HPCN.h +1 -0
@@ -36,6 +36,7 @@#define CONFIG_MPC86xx 1/* MPC86xx */ #define CONFIG_MPC8641 1/* MPC8641 specific */ #define CONFIG_MPC8641HPCN 1/* MPC8641HPCN board specific */ +#define CONFIG_MP 1/* support multiple processors */ #define CONFIG_NUM_CPUS 2/* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */ /*#define CONFIG_PHYS_64BIT 1*/ /* Place devices in 36-bit space */
include/configs/sbc8641d.h +1 -0
@@ -40,6 +40,7 @@#define CONFIG_MPC86xx 1/* MPC86xx */ #define CONFIG_MPC8641 1/* MPC8641 specific */ #define CONFIG_SBC8641D 1/* SBC8641D board specific */ +#define CONFIG_MP 1/* support multiple processors */ #define CONFIG_NUM_CPUS 2/* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */
Signature · 1 line
1.5.6.6
PATCH 2/3 85xx: Introduce determine_mp_bootpg() helper.
Match determine_mp_bootpg() that was added for 86xx. We need this to address a bug introduced in v2009.03 with 86xx MP booting. We have to make sure to reserve the region of memory used for the MP bootpg() so other u-boot code doesn't use it.
---
* fix up based on tweak to patch 1/3
cpu/mpc85xx/fdt.c | 9 ++------- cpu/mpc85xx/mp.c | 25 +++++++++++-------------- cpu/mpc85xx/mp.h | 1 + 3 files changed, 14 insertions(+), 21 deletions(-)
cpu/mpc85xx/fdt.c +2 -7
@@ -39,13 +39,8 @@ void ft_fixup_cpu(void *blob, u64 memory_limit) {int off;ulong spin_tbl_addr =get_spin_addr (); -u32 bootpg, id =get_my_id (); - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg (); +u32 id =get_my_id (); off =fdt_node_offset_by_prop_value (blob,-1 ,"device_type" ,"cpu" ,4 );while (off != -FDT_ERR_NOTFOUND ) {
cpu/mpc85xx/mp.c +11 -14
@@ -112,6 +112,15 @@ int cpu_release(int nr, int argc, char *argv[])return 0 ; } +u32 determine_mp_bootpg (void ) +{ +/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ +if ((u64 )gd->ram_size >0xfffff000 ) +return (0xfffff000 ); + +return (gd->ram_size -4096 ); +} +ulong get_spin_addr (void ) {extern ulong __secondary_start_page;
@@ -188,13 +197,7 @@ static void pq3_mp_up(unsigned long bootpg)void cpu_mp_lmb_reserve (struct lmb *lmb) { -u32 bootpg; - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg ();lmb_reserve (lmb, bootpg,4096 ); }
@@ -203,13 +206,7 @@ void setup_mp(void) {extern ulong __secondary_start_page;ulong fixup = (ulong)&__secondary_start_page; -u32 bootpg; - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg ();memcpy ((void *)bootpg, (void *)fixup,4096 );flush_cache (bootpg,4096 );
cpu/mpc85xx/mp.h +1 -0
@@ -5,6 +5,7 @@ ulong get_spin_addr(void);void setup_mp (void );u32 get_my_id (void );void cpu_mp_lmb_reserve (struct lmb *lmb); +u32 determine_mp_bootpg (void );#define BOOT_ENTRY_ADDR_UPPER 0#define BOOT_ENTRY_ADDR_LOWER 1
Signature · 1 line
1.5.6.6
PATCH 3/3 85xx/86xx: Ensure MP boot page is not used
We had a bug on 86xx in which the boot page used to bring up secondary cores was being overwritten and used for the malloc region in u-boot.
We need to reserve the region of memory that the boot page is going to be put at so nothing uses it.
---
* No real change, just here for completeness
lib_ppc/board.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
lib_ppc/board.c +13 -0
@@ -79,6 +79,10 @@#include <asm/mmu.h> #endif +#ifdef CONFIG_MP +extern u32 determine_mp_bootpg (void ); +#endif +#ifdef CONFIG_SYS_UPDATE_FLASH_SIZE extern int update_flash_size (int flash_size);#endif
@@ -444,6 +448,15 @@ void board_init_f (ulong bootflag) addr =CONFIG_SYS_SDRAM_BASE +get_effective_memsize (); +#if defined(CONFIG_MP ) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500 )) +/* We need to make sure the location we intend to put secondary core +* boot code is reserved and not used by any part of u-boot */ +if (addr >determine_mp_bootpg ()) { + addr =determine_mp_bootpg (); +debug ("Reserving MP boot page to %08lx\n" , addr); + } +#endif +#ifdef CONFIG_LOGBUFFER #ifndef CONFIG_ALT_LB_ADDR /* reserve kernel log buffer */
Signature · 1 line
1.5.6.6
PATCH 3/3 85xx/86xx: Ensure MP boot page is not used
Dear Kumar Gala,
Quoted 10 lines · In message <[email protected]> you…
We had a bug on 86xx in which the boot page used to bring up secondary cores was being overwritten and used for the malloc region in u-boot.
We need to reserve the region of memory that the boot page is going to be put at so nothing uses it.
Signed-off-by Kumar Gala <[email protected]>Acked-by Becky Bruce <[email protected]>---
* No real change, just here for completeness
...
lib_ppc/board.c line 84
Quoted 3 lines
lib_ppc/board.c +3
-0+#ifdef CONFIG_MP +extern u32 determine_mp_bootpg (void ); +#endif
Please provide a prototype in some appropriate header file so we can get rid of this "extern".
lib_ppc/board.c void board_init_f (ulong bootflag) · line 453
Quoted 10 lines
#ifdef
CONFIG_SYS_UPDATE_FLASH_SIZE
extern intupdate_flash_size(intflash_size);
#endiflib_ppc/board.c +3
-0@@ -444,6 +448,15 @@ void board_init_f (ulong bootflag) addr =CONFIG_SYS_SDRAM_BASE +get_effective_memsize (); +#if defined(CONFIG_MP ) && (defined(CONFIG_MPC86xx) || defined(CONFIG_E500 )) +/* We need to make sure the location we intend to put secondary core +* boot code is reserved and not used by any part of u-boot */
Incorrect multiline comment.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de If all you have is a hammer, everything looks like a nail.
PATCH 2/3 85xx: Introduce determine_mp_bootpg() helper.
In reply to Kumar GalaQuoted 6 lines · Kumar Gala
Match
determine_mp_bootpg()that was added for 86xx. We need this to address a bug introduced in v2009.03 with 86xx MP booting. We have to make sure to reserve the region of memory used for the MPbootpg()so other u-boot code doesn't use it.Signed-off-by Kumar Gala <[email protected]>
Quoted 99 lines
---
* fix up based on tweak to patch 1/3cpu/mpc85xx/fdt.c | 9 ++------- cpu/mpc85xx/mp.c | 25 +++++++++++-------------- cpu/mpc85xx/mp.h | 1 + 3 files changed, 14 insertions(+), 21 deletions(-)cpu/mpc85xx/fdt.c +2
-7@@ -39,13 +39,8 @@ void ft_fixup_cpu(void *blob, u64 memory_limit) {int off;ulong spin_tbl_addr =get_spin_addr (); -u32 bootpg, id =get_my_id (); - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg (); +u32 id =get_my_id (); off =fdt_node_offset_by_prop_value (blob,-1 ,"device_type" ,"cpu" ,4 );while (off != -FDT_ERR_NOTFOUND) {cpu/mpc85xx/mp.c +11
-14@@ -112,6 +112,15 @@ int cpu_release(int nr, int argc, char *argv[])return 0 ; } +u32 determine_mp_bootpg (void ) +{ +/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ +if ((u64 )gd->ram_size >0xfffff000 ) +return (0xfffff000 ); + +return (gd->ram_size -4096 ); +} +ulong get_spin_addr (void ) {extern ulong __secondary_start_page;@@ -188,13 +197,7 @@ static void pq3_mp_up(unsigned long bootpg)void cpu_mp_lmb_reserve (struct lmb *lmb) { -u32 bootpg; - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg ();lmb_reserve (lmb, bootpg,4096 ); }@@ -203,13 +206,7 @@ void setup_mp(void) {extern ulong __secondary_start_page;ulong fixup = (ulong)&__secondary_start_page; -u32 bootpg; - -/* if we have 4G or more of memory, put the boot page at 4Gb-4k */ -if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfffff000 ; -else - bootpg = gd->ram_size -4096 ; +u32 bootpg =determine_mp_bootpg ();memcpy ((void *)bootpg, (void *)fixup,4096 );flush_cache (bootpg,4096 );cpu/mpc85xx/mp.h +1
-0@@ -5,6 +5,7 @@ ulong get_spin_addr(void);void setup_mp (void );u32 get_my_id (void );void cpu_mp_lmb_reserve (struct lmb *lmb); +u32 determine_mp_bootpg (void );#define BOOT_ENTRY_ADDR_UPPER 0#define BOOT_ENTRY_ADDR_LOWER 1Signature · 6 lines
1.5.6.6 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 1/3 86xx: Cleanup MP support
In reply to Kumar GalaQuoted 13 lines · Kumar Gala
* Use
CONFIG_MPinstead ofCONFIG_NUM_CPUSto match 85xx
* Introducedetermine_mp_bootpg()helper. We'll need this to address a
bug introduced in v2009.03 with 86xx MP booting. We have to make
sure
to reserve the region of memory used for the MPbootpg()so other u-boot code doesn't use it.
* Added dummy versions ofcpu_status()&cpu_release()to allowcmd_mp.c
to build and work. In the future we should look at implementingcpu_release(). This could be common w/85xx if we use spin tables on 86xx.
Quoted 4 lines
Signed-off-by Kumar Gala <[email protected]>---
* removed change to 85xx code
* added comments aboutcpu_status()&cpu_release()
Quoted 230 lines
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 2 +- board/sbc8641d/sbc8641d.c | 2 +- cpu/mpc86xx/Makefile | 7 ++-- cpu/mpc86xx/fdt.c | 12 ++----- cpu/mpc86xx/mp.c | 50 ++++++++++++++++++ +---------- cpu/mpc86xx/mp.h | 1 + cpu/mpc86xx/release.S | 2 - include/configs/MPC8641HPCN.h | 1 + include/configs/sbc8641d.h | 1 + 9 files changed, 44 insertions(+), 34 deletions(-)board/ renamed from board/freescale/mpc8641hpcn/mpc8641hpcn.c +0
-0
freescale/mpc8641hpcn/mpc8641hpcn.c
index 1e35dfa..ef0095a 100644board/freescale/mpc8641hpcn/mpc8641hpcn.c +1
-1@@ -375,7 +375,7 @@ void board_reset(void) ; } -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP extern void cpu_mp_lmb_reserve (struct lmb *lmb);void board_lmb_reserve (struct lmb *lmb)board/sbc8641d/sbc8641d.c +1
-1@@ -414,7 +414,7 @@ void board_reset(void)#endif } -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP extern void cpu_mp_lmb_reserve (struct lmb *lmb);void board_lmb_reserve (struct lmb *lmb)cpu/mpc86xx/Makefile +0
-0@@ -31,10 +31,9 @@ LIB = $(obj)lib$(CPU).aSTART = start.o
SOBJS = cache.ocpu/mpc86xx/Makefile +3
-4-ifneq ($(CONFIG_NUM_CPUS),1) -COBJS-y += mp.o -SOBJS += release.o -endif +SOBJS-$(CONFIG_MP) += release.o +SOBJS += $(SOBJS-y) +COBJS-$(CONFIG_MP) += mp.oCOBJS-y += traps.o
COBJS-y += cpu.o
COBJS-y += cpu_init.ocpu/mpc86xx/fdt.c +3
-9@@ -15,9 +15,9 @@ DECLARE_GLOBAL_DATA_PTR;void ft_cpu_setup (void *blob,bd_t *bd) { -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP int off; -u32 bootpg; +u32 bootpg =determine_mp_bootpg ();#endif do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,@@ -48,13 +48,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);#endif -#if (CONFIG_NUM_CPUS >1 ) -/* if we have 4G or more of memory, put the boot page at 4Gb-1M */ -if (gd->ram_size >0xfffff000 ) - bootpg =0xfff00000 ; -else - bootpg = gd->ram_size - (1024 *1024 ); - +#ifdef CONFIG_MP /* Reserve the boot page so OSes dont use it */ off =fdt_add_mem_rsv (blob, bootpg, (u64 )4096 );if (off <0 )cpu/mpc86xx/mp.c +33
-17@@ -8,16 +8,42 @@DECLARE_GLOBAL_DATA_PTR ; -#if (CONFIG_NUM_CPUS >1 ) -void cpu_mp_lmb_reserve (struct lmb *lmb) +int cpu_reset (int nr) +{ +volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR ; +volatile ccsr_pic_t *pic = &immr->im_pic; +out_be32 (&pic->pir,1 << nr); + (void )in_be32 (&pic->pir); +out_be32 (&pic->pir,0x0 ); + +return 0 ; +} + +int cpu_status (int nr) +{ +/* dummy function so common/cmd_mp.c will build */ +return 0 ; +} + +int cpu_release (int nr,int argc,char *argv[]) { -u32 bootpg; +/* dummy function so common/cmd_mp.c will build +* should be implemented in the future */ +return 1 ; +} +u32 determine_mp_bootpg (void ) +{/* if we have 4G or more of memory, put the boot page at 4Gb-1M */ if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfff00000 ; -else - bootpg = gd->ram_size - (1024 *1024 ); +return (0xfff00000 ); + +return (gd->ram_size - (1024 *1024 )); +} + +void cpu_mp_lmb_reserve (struct lmb *lmb) +{ +u32 bootpg =determine_mp_bootpg ();/* tell u-boot we stole a page */ lmb_reserve (lmb, bootpg,4096 );@@ -31,18 +57,9 @@ void setup_mp(void) {extern ulong __secondary_start_page;ulong fixup = (ulong)&__secondary_start_page; -u32 bootpg; +u32 bootpg =determine_mp_bootpg ();u32 bootpg_va; -/* -* If we have 4G or more of memory, put the boot page at 4Gb-1M. -* Otherwise, put it at the very end of RAM. -*/ -if (gd->ram_size >0xfffff000 ) - bootpg =0xfff00000 ; -else - bootpg = gd->ram_size - (1024 *1024 ); -if (bootpg >=CONFIG_SYS_MAX_DDR_BAT_SIZE ) {/* We're not covered by the DDR mapping, set up BAT */ write_bat(DBAT7, CONFIG_SYS_SCRATCH_VA | BATU_BL_128K |@@ -65,4 +82,3 @@ void setup_mp(void)out_be32 ((uint *)(CONFIG_SYS_CCSRBAR +0x20 ),0x80000000 | (bootpg >>12 )); } -#endif cpu/mpc86xx/mp.h +1
-0@@ -3,5 +3,6 @@void setup_mp (void );void cpu_mp_lmb_reserve (struct lmb *lmb); +u32 determine_mp_bootpg (void );#endif cpu/mpc86xx/release.S +0
-1@@ -41,7 +41,6 @@ * Core 0 must copy this to a 1M aligned region and set BPTR * to point to it. */ -#if (CONFIG_NUM_CPUS > 1) .align 12.globl
__secondary_start_page__secondary_start_page:cpu/mpc86xx/release.S +0
-1@@ -166,4 +165,3 @@ invl2: blr /* Never Returns, Running in Linux Now */ -#endifinclude/configs/ renamed from include/configs/MPC8641HPCN.h +0
-0
MPC8641HPCN.h
index 9d66101..d8042fb 100644include/configs/MPC8641HPCN.h +1
-0@@ -36,6 +36,7 @@#define CONFIG_MPC86xx 1/* MPC86xx */ #define CONFIG_MPC8641 1/* MPC8641 specific */ #define CONFIG_MPC8641HPCN 1/* MPC8641HPCN board specific */ +#define CONFIG_MP 1/* support multiple processors */ #define CONFIG_NUM_CPUS 2/* Number of CPUs in the system */ #define CONFIG_LINUX_RESET_VEC 0x100/* Reset vector used by Linux */ /*#define CONFIG_PHYS_64BIT 1*/ /* Place devices in 36-bit space */ include/configs/sbc8641d.h +1
-0@@ -40,6 +40,7 @@#define CONFIG_MPC86xx 1/* MPC86xx */ #define CONFIG_MPC8641 1/* MPC8641 specific */ #define CONFIG_SBC8641D 1/* SBC8641D board specific */ +#define CONFIG_MP 1/* support multiple processors */ #define CONFIG_NUM_CPUS 2/* Number of CPUs in the system */
#defineCONFIG_LINUX_RESET_VEC0x100/* Reset vector used by
Linux */Signature · 6 lines
1.5.6.6 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
PATCH v2 1/3 86xx: Cleanup MP support
In reply to Kumar GalaDear Kumar Gala,
Quoted 9 lines · In message <[email protected]> you…
* Use
CONFIG_MPinstead ofCONFIG_NUM_CPUSto match 85xx
* Introducedetermine_mp_bootpg()helper. We'll need this to address a bug introduced in v2009.03 with 86xx MP booting. We have to make sure to reserve the region of memory used for the MPbootpg()so other u-boot code doesn't use it.
* Added dummy versions ofcpu_status()&cpu_release()to allowcmd_mp.cto build and work. In the future we should look at implementingcpu_release(). This could be common w/85xx if we use spin tables on 86xx.
...
board/freescale/mpc8641hpcn/mpc8641hpcn.c void board_reset(void) · line 379
Quoted 11 lines
board/freescale/mpc8641hpcn/mpc8641hpcn.c +1
-1@@ -375,7 +375,7 @@ void board_reset(void) ; } -#if (CONFIG_NUM_CPUS >1 ) +#ifdef CONFIG_MP extern void cpu_mp_lmb_reserve (struct lmb *lmb);
We should have a prototype somewhere, and get rid of this extern.
...
Quoted 8 lines
cpu/mpc86xx/Makefile +0
-0@@ -31,10 +31,9 @@ LIB = $(obj)lib$(CPU).a START = start.o SOBJS = cache.o
cpu/mpc86xx/Makefile LIB = $(obj)lib$(CPU).a · line 39
Quoted 10 lines
cpu/mpc86xx/Makefile +3
-4-ifneq ($(CONFIG_NUM_CPUS),1) -COBJS-y += mp.o -SOBJS += release.o -endif +SOBJS-$(CONFIG_MP) += release.o +SOBJS += $(SOBJS-y) +COBJS-$(CONFIG_MP) += mp.o COBJS-y += traps.o COBJS-y += cpu.o COBJS-y += cpu_init.o
Please keep list sorted.
...
Quoted 7 lines
cpu/mpc86xx/mp.c +0
-0@@ -8,16 +8,42 @@DECLARE_GLOBAL_DATA_PTR ;
cpu/mpc86xx/mp.c line 17
Quoted 10 lines
cpu/mpc86xx/mp.c +7
-2-#if (CONFIG_NUM_CPUS >1 ) -void cpu_mp_lmb_reserve (struct lmb *lmb) +int cpu_reset (int nr) +{ +volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR ; +volatile ccsr_pic_t *pic = &immr->im_pic; +out_be32 (&pic->pir,1 << nr); + (void )in_be32 (&pic->pir); +out_be32 (&pic->pir,0x0 );
Please add some comment to explain what you are doing here, and why.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de An age is called Dark not because the light fails to shine, but because people refuse to see it. -- James Michener, "Space"
PATCH v2 1/3 86xx: Cleanup MP support
In reply to Kumar Galacpu/mpc86xx/mp.c line 14
Quoted 6 lines · On Wed, 1 Apr 2009 11:06:27 -0500 Kumar Gala <[email protected]> wrote:
cpu/mpc86xx/mp.c +4
-2-#if (CONFIG_NUM_CPUS >1 ) -void cpu_mp_lmb_reserve (struct lmb *lmb) +int cpu_reset (int nr) +{ +volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR ; +volatile ccsr_pic_t *pic = &immr->im_pic;
blank line here
cpu/mpc86xx/mp.c line 17
Quoted 3 lines
cpu/mpc86xx/mp.c +3
-0+out_be32 (&pic->pir,1 << nr); + (void )in_be32 (&pic->pir); +out_be32 (&pic->pir,0x0 );
can be two setbits32
cpu/mpc86xx/mp.c line 41
Quoted 10 lines
cpu/mpc86xx/mp.c +5
-3+u32 determine_mp_bootpg (void ) +{/* if we have 4G or more of memory, put the boot page at 4Gb-1M */ if ((u64 )gd->ram_size >0xfffff000 ) - bootpg =0xfff00000 ; -else - bootpg = gd->ram_size - (1024 *1024 ); +return (0xfff00000 ); + +return (gd->ram_size - (1024 *1024 ));
? this line not reached
Kim
PATCH v2 1/3 86xx: Cleanup MP support
Quoted 12 lines · Kim Phillips
cpu/mpc86xx/mp.c line 14
Quoted 6 lines · On Wed, 1 Apr 2009 11:06:27 -0500 Kumar Gala <[email protected]> wrote:
cpu/mpc86xx/mp.c +4
-2-#if (CONFIG_NUM_CPUS >1 ) -void cpu_mp_lmb_reserve (struct lmb *lmb) +int cpu_reset (int nr) +{ +volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR ; +volatile ccsr_pic_t *pic = &immr->im_pic;blank line here
Quoted 5 lines
cpu/mpc86xx/mp.c line 17
Quoted 3 lines
cpu/mpc86xx/mp.c +3
-0+out_be32 (&pic->pir,1 << nr); + (void )in_be32 (&pic->pir); +out_be32 (&pic->pir,0x0 );can be two setbits32
this is now a noop.
Quoted 4 lines
Quoted 4 lines
(quoted diff) +2
-0+u32 determine_mp_bootpg(void) +{/* if we have 4G or more of memory, put the boot page at 4Gb-1M */ if ((u64)gd->ram_size > 0xfffff000)
Quoted 8 lines
cpu/mpc86xx/mp.c line 41
Quoted 6 lines
cpu/mpc86xx/mp.c +3
-3- bootpg =0xfff00000 ; - else - bootpg = gd->ram_size - (1024 *1024 ); +return (0xfff00000 ); + +return (gd->ram_size - (1024 *1024 ));? this line not reached
the diff is funny here, look again its:
if (foo)
return A
return B;
- k