powerpc: Consolidate bootcount_{store|load} for PowerPC

PATCH New Stefan Roese 3 participants 3 messages Apr 28, 2010 – May 6, 2010 PowerPC

Share & tools

Stefan Roese

author

2010-04-28 08:47 UTC #0 lore raw

PATCH v2 1/1 powerpc: Consolidate bootcount_{store|load} for PowerPC

This patch consolidates bootcount_{store|load} for PowerPC by implementing a common version in arch/powerpc/lib/bootcount.c. This code is now used by all PowerPC variants that currently have these functions implemented.

The functions now use the proper IO-accessor functions to read/write the values.

This code also supports two different bootcount versions:

a) Use 2 seperate words (2 * 32bit) to store the bootcounter
b) Use only 1 word (2 * 16bit) to store the bootcounter

Version b) was already used by MPC5xxx.

Signed-off-by Stefan Roese <[email protected]>

Acked-by Detlev Zundel <[email protected]>

Cc Michael Zaidman <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Kim Phillips <[email protected]>

Cc Anatolij Gustschin <[email protected]>

---
v2:
- Replace CONFIG_SYS_BOOTCOUNT_USE_32BIT with CONFIG_SYS_BOOTCOUNT_SINGLEWORD as suggested by Detlev
- Use CONFIG_8xx for MPC8xx define section
- Replace CONFIG_BOOTCOUNT_ADDR with CONFIG_SYS_BOOTCOUNT_ADDR

 arch/powerpc/cpu/mpc5xxx/cpu.c      |   20 --------
 arch/powerpc/cpu/mpc8260/commproc.c |   24 ---------
 arch/powerpc/cpu/mpc83xx/cpu.c      |   30 ------------
 arch/powerpc/cpu/mpc8xx/commproc.c  |   26 ----------
 arch/powerpc/cpu/ppc4xx/commproc.c  |   24 ---------
 arch/powerpc/lib/Makefile           |    1 +
 arch/powerpc/lib/bootcount.c        |   90 +++++++++++++++++++++++++++++++++++
 7 files changed, 91 insertions(+), 124 deletions(-)
 create mode 100644 arch/powerpc/lib/bootcount.c

arch/powerpc/cpu/mpc5xxx/cpu.c +0 ~~-20~~

index b20234d..44b8a7a 100644
@@ -154,26 +154,6 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 }
 #endif
 
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-
-void bootcount_store (ulong a)
-{
-	volatile ulong *save_addr = (volatile ulong *) (MPC5XXX_CDM_BRDCRMB);
-
-	*save_addr = (BOOTCOUNT_MAGIC & 0xffff0000) | a;
-}
-
-ulong bootcount_load (void)
-{
-	volatile ulong *save_addr = (volatile ulong *) (MPC5XXX_CDM_BRDCRMB);
-
-	if ((*save_addr & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000))
-		return 0;
-	else
-		return (*save_addr & 0x0000ffff);
-}
-#endif /* CONFIG_BOOTCOUNT_LIMIT */
-
 #ifdef CONFIG_MPC5xxx_FEC
 /* Default initializations for FEC controllers.  To override,
  * create a board-specific function called:

arch/powerpc/cpu/mpc8260/commproc.c +0 ~~-24~~

index 111a67c..c522bc5 100644
@@ -195,27 +195,3 @@ ulong post_word_load (void)
 }
 
 #endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-
-void bootcount_store (ulong a)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)(CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR);
-
-	save_addr[0] = a;
-	save_addr[1] = BOOTCOUNT_MAGIC;
-}
-
-ulong bootcount_load (void)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)(CONFIG_SYS_IMMR + CPM_BOOTCOUNT_ADDR);
-
-	if (save_addr[1] != BOOTCOUNT_MAGIC)
-		return 0;
-	else
-		return save_addr[0];
-}
-
-#endif /* CONFIG_BOOTCOUNT_LIMIT */

arch/powerpc/cpu/mpc83xx/cpu.c +0 ~~-30~~

index 51180d6..fb32f01 100644
@@ -302,33 +302,3 @@ int cpu_mmc_init(bd_t *bis)
 	return 0;
 #endif
 }
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-
-#if !defined(CONFIG_MPC8360)
-#error "CONFIG_BOOTCOUNT_LIMIT only for MPC8360 implemented"
-#endif
-
-#if !defined(CONFIG_BOOTCOUNT_ADDR)
-#define CONFIG_BOOTCOUNT_ADDR	(0x110000 + QE_MURAM_SIZE - 2 * sizeof(unsigned long))
-#endif
-
-#include <asm/io.h>
-
-void bootcount_store (ulong a)
-{
-	void *reg = (void *)(CONFIG_SYS_IMMR + CONFIG_BOOTCOUNT_ADDR);
-	out_be32 (reg, a);
-	out_be32 (reg + 4, BOOTCOUNT_MAGIC);
-}
-
-ulong bootcount_load (void)
-{
-	void *reg = (void *)(CONFIG_SYS_IMMR + CONFIG_BOOTCOUNT_ADDR);
-
-	if (in_be32 (reg + 4) != BOOTCOUNT_MAGIC)
-		return 0;
-	else
-		return in_be32 (reg);
-}
-#endif /* CONFIG_BOOTCOUNT_LIMIT */

arch/powerpc/cpu/mpc8xx/commproc.c +0 ~~-26~~

index a87a0dc..2c85377 100644
@@ -103,29 +103,3 @@ ulong post_word_load (void)
 }
 
 #endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-
-void bootcount_store (ulong a)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)( ((immap_t *) CONFIG_SYS_IMMR)->im_cpm.cp_dpmem +
-		                    CPM_BOOTCOUNT_ADDR );
-
-	save_addr[0] = a;
-	save_addr[1] = BOOTCOUNT_MAGIC;
-}
-
-ulong bootcount_load (void)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)( ((immap_t *) CONFIG_SYS_IMMR)->im_cpm.cp_dpmem +
-		                    CPM_BOOTCOUNT_ADDR );
-
-	if (save_addr[1] != BOOTCOUNT_MAGIC)
-		return 0;
-	else
-		return save_addr[0];
-}
-
-#endif /* CONFIG_BOOTCOUNT_LIMIT */

arch/powerpc/cpu/ppc4xx/commproc.c +0 ~~-24~~

index a1696d3..6bf95e6 100644
@@ -51,27 +51,3 @@ ulong post_word_load (void)
 }
 
 #endif	/* CONFIG_POST || CONFIG_LOGBUFFER*/
-
-#ifdef CONFIG_BOOTCOUNT_LIMIT
-
-void bootcount_store (ulong a)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)(CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_BOOTCOUNT_ADDR);
-
-	save_addr[0] = a;
-	save_addr[1] = BOOTCOUNT_MAGIC;
-}
-
-ulong bootcount_load (void)
-{
-	volatile ulong *save_addr =
-		(volatile ulong *)(CONFIG_SYS_OCM_DATA_ADDR + CONFIG_SYS_BOOTCOUNT_ADDR);
-
-	if (save_addr[1] != BOOTCOUNT_MAGIC)
-		return 0;
-	else
-		return save_addr[0];
-}
-
-#endif /* CONFIG_BOOTCOUNT_LIMIT */

arch/powerpc/lib/Makefile +1 -0

index 334e457..5f85502 100644
@@ -33,6 +33,7 @@ SOBJS-y	+= reloc.o
 COBJS-y	+= bat_rw.o
 COBJS-y	+= board.o
 COBJS-y	+= bootm.o
+COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o
 COBJS-y	+= cache.o
 COBJS-y	+= extable.o
 COBJS-y	+= interrupts.o

arch/powerpc/lib/bootcount.c new file +90 -0

90 lines not on this page · raw message

Signature · 1 line

1.7.1

Kim Phillips

2010-04-28 21:53 UTC #1 lore raw

PATCH v2 1/1 powerpc: Consolidate bootcount_{store|load} for PowerPC

Quoted 15 lines · On Wed, 28 Apr 2010 10:47:36 +0200 Stefan Roese <[email protected]> wrote:

This patch consolidates bootcount_{store|load} for PowerPC by implementing a common version in arch/powerpc/lib/bootcount.c. This code is now used by all PowerPC variants that currently have these functions implemented.
The functions now use the proper IO-accessor functions to read/write the values.
This code also supports two different bootcount versions:
a) Use 2 seperate words (2 * 32bit) to store the bootcounter
b) Use only 1 word (2 * 16bit) to store the bootcounter
Version b) was already used by MPC5xxx.

Quoted 7 lines

Signed-off-by Stefan Roese <[email protected]>
Acked-by Detlev Zundel <[email protected]>
Cc Michael Zaidman <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Kim Phillips <[email protected]>
Cc Anatolij Gustschin <[email protected]>
---

83xx bits Acked-by: Kim Phillips <[email protected]>

Kim

Wolfgang Denk

Applied

2010-05-06 21:29 UTC #2 lore raw

PATCH v2 1/1 powerpc: Consolidate bootcount_{store|load} for PowerPC

In reply to Stefan Roese

Dear Stefan Roese,

Quoted 28 lines · In message <[email protected]> you wrote:

This patch consolidates bootcount_{store|load} for PowerPC by implementing a common version in arch/powerpc/lib/bootcount.c. This code is now used by all PowerPC variants that currently have these functions implemented.
The functions now use the proper IO-accessor functions to read/write the values.
This code also supports two different bootcount versions:
a) Use 2 seperate words (2 * 32bit) to store the bootcounter
b) Use only 1 word (2 * 16bit) to store the bootcounter
Version b) was already used by MPC5xxx.
Signed-off-by Stefan Roese <[email protected]>
Acked-by Detlev Zundel <[email protected]>
Cc Michael Zaidman <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Kim Phillips <[email protected]>
Cc Anatolij Gustschin <[email protected]>
---
v2:
- Replace CONFIG_SYS_BOOTCOUNT_USE_32BIT with CONFIG_SYS_BOOTCOUNT_SINGLEWORD as suggested by Detlev
- Use CONFIG_8xx for MPC8xx define section
- Replace CONFIG_BOOTCOUNT_ADDR with CONFIG_SYS_BOOTCOUNT_ADDR

Quoted 9 lines

 arch/powerpc/cpu/mpc5xxx/cpu.c      |   20 --------
 arch/powerpc/cpu/mpc8260/commproc.c |   24 ---------
 arch/powerpc/cpu/mpc83xx/cpu.c      |   30 ------------
 arch/powerpc/cpu/mpc8xx/commproc.c  |   26 ----------
 arch/powerpc/cpu/ppc4xx/commproc.c  |   24 ---------
 arch/powerpc/lib/Makefile           |    1 +
 arch/powerpc/lib/bootcount.c        |   90 +++++++++++++++++++++++++++++++++++
 7 files changed, 91 insertions(+), 124 deletions(-)
 create mode 100644 arch/powerpc/lib/bootcount.c

Applied, thanks.

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
"There are some good people in it, but the orchestra as  a  whole  is
equivalent to a gang bent on destruction."      - John Cage, composer