[U-Boot] [PATCH 1/2] powerpc: Use print_size() where appropriate

Shruti Kanetkar
2013-07-31T15:31:04Z

Makes the startup output more consistent

Signed-off-by: Shruti Kanetkar <Shruti@Freescale.com>
Acked-by: Andy Fleming <afleming@freescale.com>
---
arch/powerpc/cpu/mpc824x/cpu.c | 8 +++-----
arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 +++++---
arch/powerpc/cpu/mpc8xx/cpu.c | 24 +++++++++++-------------
arch/powerpc/cpu/mpc8xxx/ddr/main.c | 3 ++-
4 files changed, 21 insertions(+), 22 deletions(-)

Hello PowerPC Custodians,

These are two simple patches I've been playing with as part of my learning
process. I realize that perhaps pieces of these patches should be submitted to
their respective custodians, but given their simplicity I'm thinking one of the
powerpc custodians can apply them (Andy perhaps) to their tree if nobody objects

I compile-tested these patches on all the mpc8xx and mpc8[356]xxx powerpc
boards/targets and I run them on one board each of the following families of
SoC(s): MPC8xx, MPC83xx and MPC85xx

Checkpatch has a few warnings like this:

WARNING: space prohibited between function name and open parenthesis '('
#132: FILE: arch/powerpc/cpu/ppc4xx/cpu.c:670:
+ printf (" 16 KiB I-Cache %d KiB D-Cache",

but I simply preserved the existing formating/style in the respective files

Regards,
Shruti.

diff --git a/arch/powerpc/cpu/mpc824x/cpu.c b/arch/powerpc/cpu/mpc824x/cpu.c
index 44f91b2..8be57ac 100644
--- a/arch/powerpc/cpu/mpc824x/cpu.c
+++ b/arch/powerpc/cpu/mpc824x/cpu.c
@@ -61,12 +61,10 @@ int checkcpu (void)
return -1; /* no valid CPU revision info */
}

- printf (" at %s MHz:", strmhz (buf, clock));
+ printf (" at %s MHz: ", strmhz (buf, clock));

- printf (" %u kB I-Cache", checkicache () >> 10);
- printf (" %u kB D-Cache", checkdcache () >> 10);
-
- puts ("\n");
+ print_size(checkicache(), " I-Cache ");
+ print_size(checkdcache(), " D-Cache\n");

return 0;
}
diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c
index 3c8f59c..6433997 100644
--- a/arch/powerpc/cpu/mpc85xx/cpu_init.c
+++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c
@@ -182,7 +182,8 @@ static void enable_cpc(void)

}

- printf("Corenet Platform Cache: %d KB enabled\n", size);
+ puts("Corenet Platform Cache: ");
+ print_size(size * 1024, " enabled\n");
}

static void invalidate_cpc(void)
@@ -533,13 +534,14 @@ int cpu_init_r(void)
if (CONFIG_SYS_INIT_L2CSR0 & L2CSR0_L2E) {
while (!(mfspr(SPRN_L2CSR0) & L2CSR0_L2E))
;
- printf("%d KB enabled\n", (l2cfg0 & 0x3fff) * 64);
+ print_size((l2cfg0 & 0x3fff) * 64 * 1024, " enabled\n");
}

skip_l2:
#elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2)
if (l2cache->l2csr0 & L2CSR0_L2E)
- printf("%d KB enabled\n", (l2cache->l2cfg0 & 0x3fff) * 64);
+ print_size((l2cache->l2cfg0 & 0x3fff) * 64 * 1024,
+ " enabled\n");

enable_cluster_l2();
#else
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index dc33eb3..b7f3eea 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -152,10 +152,8 @@ static int check_CPU (long clock, uint pvr, uint immr)
#else
printf (" at %s MHz: ", strmhz (buf, clock));
#endif
- printf ("%u kB I-Cache %u kB D-Cache",
- checkicache () >> 10,
- checkdcache () >> 10
- );
+ print_size(checkicache(), " I-Cache ");
+ print_size(checkdcache(), " D-Cache");

/* do we have a FEC (860T/P or 852/859/866/885)? */

@@ -220,10 +218,10 @@ static int check_CPU (long clock, uint pvr, uint immr)
printf ("unknown MPC857 (0x%08x)", k);
#endif

- printf (" at %s MHz:", strmhz (buf, clock));
+ printf (" at %s MHz: ", strmhz (buf, clock));

- printf (" %u kB I-Cache", checkicache () >> 10);
- printf (" %u kB D-Cache", checkdcache () >> 10);
+ print_size(checkicache(), " I-Cache ");
+ print_size(checkdcache(), " D-Cache");

/* lets check and see if we're running on a 862T (or P?) */

@@ -281,10 +279,10 @@ static int check_CPU (long clock, uint pvr, uint immr)
if (suf)
printf ("PPC823ZTnn%s", suf);

- printf (" at %s MHz:", strmhz (buf, clock));
+ printf (" at %s MHz: ", strmhz (buf, clock));

- printf (" %u kB I-Cache", checkicache () >> 10);
- printf (" %u kB D-Cache", checkdcache () >> 10);
+ print_size(checkicache(), " I-Cache ");
+ print_size(checkdcache(), " D-Cache");

/* lets check and see if we're running on a 860T (or P?) */

@@ -337,10 +335,10 @@ static int check_CPU (long clock, uint pvr, uint immr)
default:
printf ("unknown MPC850 (0x%08x)", k);
}
- printf (" at %s MHz:", strmhz (buf, clock));
+ printf (" at %s MHz: ", strmhz (buf, clock));

- printf (" %u kB I-Cache", checkicache () >> 10);
- printf (" %u kB D-Cache", checkdcache () >> 10);
+ print_size(checkicache(), " I-Cache ");
+ print_size(checkdcache(), " D-Cache");

/* lets check and see if we're running on a 850T (or P?) */

diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
index 7a8636d..40c03d4 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c
@@ -637,7 +637,8 @@ phys_size_t fsl_ddr_sdram(void)
#if !defined(CONFIG_PHYS_64BIT)
/* Check for 4G or more. Bad. */
if (total_memory >= (1ull << 32)) {
- printf("Detected %lld MB of memory\n", total_memory >> 20);
+ puts("Detected ");
+ print_size(total_memory, " of memory\n");
printf(" This U-Boot only supports < 4G of DDR\n");
printf(" You could rebuild it with CONFIG_PHYS_64BIT\n");
printf(" "); /* re-align to match init_func_ram print */
--
1.8.3.1