CLEANUP: Cleanup of arch/powerpc/ directory

PATCH New Marek Vasut 4 participants 25 messages Oct 25, 2011 – Oct 27, 2011 PowerPC

Share & tools

Marek Vasut

author

2011-10-25 09:37 UTC #0 lore raw

cover CLEANUP: Cleanup of arch/powerpc/ directory

This series fixes the warnings generated by new debug() macro implementation, which will be merged after this series. This series fixes the problems before the macro is reworked to avoid smooth transition. Most of the problems fixed by this series are printf() formating related problems.

Marek Vasut (9):
PowerPC: Squash warning in mpc512x serial.c GCC4.6: Squash warnings in denali_data_eye.c GCC4.6: Squash warnings in denali_spd_ddr2.c GCC4.6: Squash warnings in 44x_spd_ddr.c GCC4.6: Squash warnings in 4xx_ibm_ddr2_autocalib.c GCC4.6: Squash warnings in 4xx_pcie.c
GCC4.6: Use dst instead of l2srbar in cpu_early_init.c GCC4.6: Squash warnings in ddr[123]_dimm_params.c GCC4.6: Squash warnings in mpc86xx/interrupts.c

 arch/powerpc/cpu/mpc512x/serial.c                |    2 +-
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c        |    4 +-
 arch/powerpc/cpu/mpc86xx/interrupts.c            |   12 +++---
 arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c  |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c  |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c  |    2 +-
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c            |   17 ++++---
 arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |    8 ++--
 arch/powerpc/cpu/ppc4xx/4xx_pcie.c               |    3 +-
 arch/powerpc/cpu/ppc4xx/denali_data_eye.c        |   10 ++--
 arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c        |   52 +++++++++++-----------
 11 files changed, 59 insertions(+), 55 deletions(-)

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

Signature · 1 line

1.7.6.3

Marek Vasut

author

2011-10-25 09:37 UTC #1 lore raw

PATCH 1/9 PowerPC: Squash warning in mpc512x serial.c

serial.c: In function 'serial_setbrg_dev':
serial.c:143: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/mpc512x/serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/powerpc/cpu/mpc512x/serial.c +1 -1

index 5ee9cef..7c53346 100644
@@ -140,7 +140,7 @@ void serial_setbrg_dev(unsigned int idx)
 		if (br_env)
 			baudrate = simple_strtoul(br_env, NULL, 10);
 
-		debug("%s: idx %d, baudrate %d\n", __func__, idx, baudrate);
+		debug("%s: idx %d, baudrate %ld\n", __func__, idx, baudrate);
 	}
 
 	/* calculate divisor for setting PSC CTUR and CTLR registers */

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:55 UTC #2 lore raw

PATCH 1/9 PowerPC: Squash warning in mpc512x serial.c

Dear Marek Vasut,

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

serial.c: In function 'serial_setbrg_dev':
serial.c:143: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/mpc512x/serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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
Wenn das dann in die Hose geht, nehme ich es auf meine Kappe.
                                         -- Rudi V?ller, 15. Nov 2003

Marek Vasut

author

2011-10-25 09:37 UTC #3 lore raw

PATCH 2/9 GCC4.6: Squash warnings in denali_data_eye.c

In reply to Marek Vasut

denali_data_eye.c: In function 'denali_core_search_data_eye':denali_spd_ddr2.c:646: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

denali_data_eye.c:320: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:330: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_spd_ddr2.c:676: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_data_eye.c:340: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:350: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:360: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/denali_data_eye.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

arch/powerpc/cpu/ppc4xx/denali_data_eye.c +5 -5

index 9bba0ca..19b65be 100644
@@ -317,7 +317,7 @@ void denali_core_search_data_eye(void)
 	val = (mfdcr(ddrcfgd) & ~DDR0_09_WR_DQS_SHIFT_MASK)
 	    | DDR0_09_WR_DQS_SHIFT_ENCODE(wr_dqs_shift);
 	mtdcr(ddrcfgd, val);
-	debug("DDR0_09=0x%08lx\n", val);
+	debug("DDR0_09=0x%08x\n", val);
 
 	/* -----------------------------------------------------------+
 	 * Set 'dqs_out_shift' = wr_dqs_shift + 32

@@ -327,7 +327,7 @@ void denali_core_search_data_eye(void)
 	val = (mfdcr(ddrcfgd) & ~DDR0_22_DQS_OUT_SHIFT_MASK)
 	    | DDR0_22_DQS_OUT_SHIFT_ENCODE(dqs_out_shift);
 	mtdcr(ddrcfgd, val);
-	debug("DDR0_22=0x%08lx\n", val);
+	debug("DDR0_22=0x%08x\n", val);
 
 	/* -----------------------------------------------------------+
 	 * Set 'dll_dqs_delay_X'.

@@ -337,7 +337,7 @@ void denali_core_search_data_eye(void)
 	val = (mfdcr(ddrcfgd) & ~DDR0_17_DLL_DQS_DELAY_0_MASK)
 	    | DDR0_17_DLL_DQS_DELAY_0_ENCODE(dll_dqs_delay_X);
 	mtdcr(ddrcfgd, val);
-	debug("DDR0_17=0x%08lx\n", val);
+	debug("DDR0_17=0x%08x\n", val);
 
 	/* dll_dqs_delay_1 to dll_dqs_delay_4 */
 	mtdcr(ddrcfga, DDR0_18);

@@ -347,7 +347,7 @@ void denali_core_search_data_eye(void)
 	    | DDR0_18_DLL_DQS_DELAY_2_ENCODE(dll_dqs_delay_X)
 	    | DDR0_18_DLL_DQS_DELAY_1_ENCODE(dll_dqs_delay_X);
 	mtdcr(ddrcfgd, val);
-	debug("DDR0_18=0x%08lx\n", val);
+	debug("DDR0_18=0x%08x\n", val);
 
 	/* dll_dqs_delay_5 to dll_dqs_delay_8 */
 	mtdcr(ddrcfga, DDR0_19);

@@ -357,7 +357,7 @@ void denali_core_search_data_eye(void)
 	    | DDR0_19_DLL_DQS_DELAY_6_ENCODE(dll_dqs_delay_X)
 	    | DDR0_19_DLL_DQS_DELAY_5_ENCODE(dll_dqs_delay_X);
 	mtdcr(ddrcfgd, val);
-	debug("DDR0_19=0x%08lx\n", val);
+	debug("DDR0_19=0x%08x\n", val);
 
 	/* -----------------------------------------------------------+
 	 * Assert 'start' parameter.

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:55 UTC #4 lore raw

PATCH 2/9 GCC4.6: Squash warnings in denali_data_eye.c

Dear Marek Vasut,

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

denali_data_eye.c: In function 'denali_core_search_data_eye':denali_spd_ddr2.c:646: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_data_eye.c:320: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:330: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_spd_ddr2.c:676: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_data_eye.c:340: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:350: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'
denali_data_eye.c:360: warning: format '%08lx' expects type 'long unsigned int', but argument 2 has type 'u32'

Quoted 7 lines

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/denali_data_eye.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

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
"How is this place run - is it an anarchy?"
"No, I wouldn't say so; it is not that well organised..."

Marek Vasut

author

2011-10-25 09:37 UTC #5 lore raw

PATCH 3/9 GCC4.6: Squash warnings in denali_spd_ddr2.c

In reply to Marek Vasut

denali_spd_ddr2.c: In function 'get_spd_info':
denali_spd_ddr2.c:363: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'check_frequency':
denali_spd_ddr2.c:390: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'get_dimm_size':
denali_spd_ddr2.c:473: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:474: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:475: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:476: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_03':
denali_spd_ddr2.c:571: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:604: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:604: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
denali_spd_ddr2.c:643: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:644: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:645: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:646: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:676: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_04':
denali_spd_ddr2.c:731: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:733: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:735: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_05':
denali_spd_ddr2.c:772: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:774: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_06':
denali_spd_ddr2.c:831: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:833: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_11':
denali_spd_ddr2.c:860: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_26':
denali_spd_ddr2.c:931: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:933: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_27':
denali_spd_ddr2.c:944: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_43':
denali_spd_ddr2.c:978: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_44':
denali_spd_ddr2.c:1006: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c |   52 ++++++++++++++--------------
 1 files changed, 26 insertions(+), 26 deletions(-)

arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c +26 ~~-26~~

index c35b113..ce769a7 100644
@@ -360,7 +360,7 @@ static void get_spd_info(unsigned long dimm_ranks[],
 		printf("Install at least one DDR2 DIMM.\n\n");
 		spd_ddr_init_hang();
 	}
-	debug("Total number of ranks = %d\n", *ranks);
+	debug("Total number of ranks = %ld\n", *ranks);
 }
 
 /*------------------------------------------------------------------

@@ -387,7 +387,7 @@ static void check_frequency(unsigned long *dimm_ranks,
 		if (dimm_ranks[dimm_num]) {
 			cycle_time =
 			    get_tcyc(spd_read(iic0_dimm_addr[dimm_num], 9));
-			debug("cycle_time=%d ps\n", cycle_time);
+			debug("cycle_time=%ld ps\n", cycle_time);
 
 			if (cycle_time > (calc_cycle_time + 10)) {
 				/*

@@ -470,10 +470,10 @@ static void get_dimm_size(unsigned long dimm_ranks[],
 			}
 		}
 	}
-	debug("Number of rows = %d\n", *rows);
-	debug("Number of columns = %d\n", *cols);
-	debug("Number of banks = %d\n", *banks);
-	debug("Data width = %d\n", *width);
+	debug("Number of rows = %ld\n", *rows);
+	debug("Number of columns = %ld\n", *cols);
+	debug("Number of banks = %ld\n", *banks);
+	debug("Data width = %ld\n", *width);
 	if (*rows > 14) {
 		printf("ERROR: DRAM DIMM modules have %lu address rows.\n",
 		       *rows);

@@ -568,7 +568,7 @@ static void program_ddr0_03(unsigned long dimm_ranks[],
 	/*------------------------------------------------------------------
 	 * Get the board configuration info.
 	 *-----------------------------------------------------------------*/
-	debug("sdram_freq = %d\n", sdram_freq);
+	debug("sdram_freq = %ld\n", sdram_freq);
 
 	/*------------------------------------------------------------------
 	 * Handle the timing.  We need to find the worst case timing of all

@@ -601,7 +601,7 @@ static void program_ddr0_03(unsigned long dimm_ranks[],
 				    get_tcyc(spd_read(iic0_dimm_addr[dimm_num],
 						      tcyc_addr[cas_index]));
 
-				debug("cas_index = %d: cycle_time_ps = %d\n",
+				debug("cas_index = %ld: cycle_time_ps = %ld\n",
 				      cas_index, cycle_time_ps);
 				/*
 				 * DDR2 devices use the following bitmask for CAS latency:

@@ -640,10 +640,10 @@ static void program_ddr0_03(unsigned long dimm_ranks[],
 	cycle_3_0_clk = MULDIV64(ONE_BILLION, 1000, max_3_0_tcyc_ps) + 10;
 	cycle_4_0_clk = MULDIV64(ONE_BILLION, 1000, max_4_0_tcyc_ps) + 10;
 	cycle_5_0_clk = MULDIV64(ONE_BILLION, 1000, max_5_0_tcyc_ps) + 10;
-	debug("cycle_2_0_clk = %d\n", cycle_2_0_clk);
-	debug("cycle_3_0_clk = %d\n", cycle_3_0_clk);
-	debug("cycle_4_0_clk = %d\n", cycle_4_0_clk);
-	debug("cycle_5_0_clk = %d\n", cycle_5_0_clk);
+	debug("cycle_2_0_clk = %ld\n", cycle_2_0_clk);
+	debug("cycle_3_0_clk = %ld\n", cycle_3_0_clk);
+	debug("cycle_4_0_clk = %ld\n", cycle_4_0_clk);
+	debug("cycle_5_0_clk = %ld\n", cycle_5_0_clk);
 
 	if ((cas_available & 0x04) && (sdram_freq <= cycle_2_0_clk)) {
 		*cas_latency = 2;

@@ -673,7 +673,7 @@ static void program_ddr0_03(unsigned long dimm_ranks[],
 		       cycle_3_0_clk, cycle_4_0_clk, cycle_5_0_clk);
 		spd_ddr_init_hang();
 	}
-	debug("CAS latency = %d\n", *cas_latency);
+	debug("CAS latency = %ld\n", *cas_latency);
 	mtsdram(DDR0_03, ddr0_03);
 }

@@ -728,11 +728,11 @@ static void program_ddr0_04(unsigned long dimm_ranks[],
 			t_rtp_ps = max(t_rtp_ps, ps);
 		}
 	}
-	debug("t_rc_ps  = %d\n", t_rc_ps);
+	debug("t_rc_ps  = %ld\n", t_rc_ps);
 	t_rc_clk = (MULDIV64(sdram_freq, t_rc_ps, ONE_BILLION) + 999) / 1000;
-	debug("t_rrd_ps = %d\n", t_rrd_ps);
+	debug("t_rrd_ps = %ld\n", t_rrd_ps);
 	t_rrd_clk = (MULDIV64(sdram_freq, t_rrd_ps, ONE_BILLION) + 999) / 1000;
-	debug("t_rtp_ps = %d\n", t_rtp_ps);
+	debug("t_rtp_ps = %ld\n", t_rtp_ps);
 	t_rtp_clk = (MULDIV64(sdram_freq, t_rtp_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_04, DDR0_04_TRC_ENCODE(t_rc_clk) |
 		DDR0_04_TRRD_ENCODE(t_rrd_clk) |

@@ -769,9 +769,9 @@ static void program_ddr0_05(unsigned long dimm_ranks[],
 			t_ras_ps = max(t_ras_ps, ps);
 		}
 	}
-	debug("t_rp_ps  = %d\n", t_rp_ps);
+	debug("t_rp_ps  = %ld\n", t_rp_ps);
 	t_rp_clk = (MULDIV64(sdram_freq, t_rp_ps, ONE_BILLION) + 999) / 1000;
-	debug("t_ras_ps = %d\n", t_ras_ps);
+	debug("t_ras_ps = %ld\n", t_ras_ps);
 	t_ras_clk = (MULDIV64(sdram_freq, t_ras_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_05, ddr0_05 | DDR0_05_TRP_ENCODE(t_rp_clk) |
 		DDR0_05_TRAS_MIN_ENCODE(t_ras_clk));

@@ -828,9 +828,9 @@ static void program_ddr0_06(unsigned long dimm_ranks[],
 			t_rfc_ps = max(t_rfc_ps, ps);
 		}
 	}
-	debug("t_wtr_ps = %d\n", t_wtr_ps);
+	debug("t_wtr_ps = %ld\n", t_wtr_ps);
 	t_wtr_clk = (MULDIV64(sdram_freq, t_wtr_ps, ONE_BILLION) + 999) / 1000;
-	debug("t_rfc_ps = %d\n", t_rfc_ps);
+	debug("t_rfc_ps = %ld\n", t_rfc_ps);
 	t_rfc_clk = (MULDIV64(sdram_freq, t_rfc_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_06, ddr0_06 | DDR0_06_TWTR_ENCODE(t_wtr_clk) |
 		DDR0_06_TRFC_ENCODE(t_rfc_clk));

@@ -857,7 +857,7 @@ static void program_ddr0_11(unsigned long sdram_freq)
 	unsigned long const t_xsnr_ps = 200000;	/* 200 ns */
 	unsigned long t_xsnr_clk;
 
-	debug("t_xsnr_ps = %d\n", t_xsnr_ps);
+	debug("t_xsnr_ps = %ld\n", t_xsnr_ps);
 	t_xsnr_clk =
 	    (MULDIV64(sdram_freq, t_xsnr_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_11, DDR0_11_SREFRESH_ENCODE(0) |

@@ -928,9 +928,9 @@ static void program_ddr0_26(unsigned long sdram_freq)
 	unsigned long t_ref_clk;
 
 	/* Round down t_ras_max_clk and t_ref_clk */
-	debug("t_ras_max_ps = %d\n", t_ras_max_ps);
+	debug("t_ras_max_ps = %ld\n", t_ras_max_ps);
 	t_ras_max_clk = MULDIV64(sdram_freq, t_ras_max_ps, ONE_BILLION) / 1000;
-	debug("t_ref_ps     = %d\n", t_ref_ps);
+	debug("t_ref_ps     = %ld\n", t_ref_ps);
 	t_ref_clk = MULDIV64(sdram_freq, t_ref_ps, ONE_BILLION) / 1000;
 	mtsdram(DDR0_26, DDR0_26_TRAS_MAX_ENCODE(t_ras_max_clk) |
 		DDR0_26_TREF_ENCODE(t_ref_clk));

@@ -941,7 +941,7 @@ static void program_ddr0_27(unsigned long sdram_freq)
 	unsigned long const t_init_ps = 200000000;	/* 200 us. init */
 	unsigned long t_init_clk;
 
-	debug("t_init_ps = %d\n", t_init_ps);
+	debug("t_init_ps = %ld\n", t_init_ps);
 	t_init_clk =
 	    (MULDIV64(sdram_freq, t_init_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_27, DDR0_27_EMRS_DATA_ENCODE(0x0000) |

@@ -975,7 +975,7 @@ static void program_ddr0_43(unsigned long dimm_ranks[],
 			t_wr_ps = max(t_wr_ps, ps);
 		}
 	}
-	debug("t_wr_ps = %d\n", t_wr_ps);
+	debug("t_wr_ps = %ld\n", t_wr_ps);
 	t_wr_clk = (MULDIV64(sdram_freq, t_wr_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_43, ddr0_43 | DDR0_43_TWR_ENCODE(t_wr_clk));
 }

@@ -1003,7 +1003,7 @@ static void program_ddr0_44(unsigned long dimm_ranks[],
 			t_rcd_ps = max(t_rcd_ps, ps);
 		}
 	}
-	debug("t_rcd_ps = %d\n", t_rcd_ps);
+	debug("t_rcd_ps = %ld\n", t_rcd_ps);
 	t_rcd_clk = (MULDIV64(sdram_freq, t_rcd_ps, ONE_BILLION) + 999) / 1000;
 	mtsdram(DDR0_44, DDR0_44_TRCD_ENCODE(t_rcd_clk));
 }

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #6 lore raw

PATCH 3/9 GCC4.6: Squash warnings in denali_spd_ddr2.c

Dear Marek Vasut,

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

denali_spd_ddr2.c: In function 'get_spd_info':
denali_spd_ddr2.c:363: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'check_frequency':
denali_spd_ddr2.c:390: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'get_dimm_size':
denali_spd_ddr2.c:473: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:474: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:475: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:476: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_03':
denali_spd_ddr2.c:571: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:604: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:604: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
denali_spd_ddr2.c:643: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:644: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:645: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:646: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:676: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_04':
denali_spd_ddr2.c:731: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:733: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:735: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_05':
denali_spd_ddr2.c:772: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:774: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_06':
denali_spd_ddr2.c:831: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:833: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_11':
denali_spd_ddr2.c:860: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_26':
denali_spd_ddr2.c:931: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c:933: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_27':
denali_spd_ddr2.c:944: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_43':
denali_spd_ddr2.c:978: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
denali_spd_ddr2.c: In function 'program_ddr0_44':
denali_spd_ddr2.c:1006: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

Quoted 7 lines

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/denali_spd_ddr2.c |   52 ++++++++++++++--------------
 1 files changed, 26 insertions(+), 26 deletions(-)

Applied, thanks.

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
Overdrawn?  But I still have checks left!

Marek Vasut

author

2011-10-25 09:37 UTC #7 lore raw

PATCH 4/9 GCC4.6: Squash warnings in 44x_spd_ddr.c

In reply to Marek Vasut

44x_spd_ddr.c: In function 'program_tr0':
44x_spd_ddr.c:823: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_tr1':
44x_spd_ddr.c:1054: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_bxcr':
44x_spd_ddr.c:1127: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
44x_spd_ddr.c:1242: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c +10 -7

index ec7291f..e05daf2 100644
@@ -820,7 +820,7 @@ static void program_tr0(unsigned long *dimm_populated,
 		break;
 	}
 
-	debug("tr0: %x\n", tr0);
+	debug("tr0: %lx\n", tr0);
 	mtsdram(SDRAM0_TR0, tr0);
 }

@@ -1051,7 +1051,7 @@ static void program_tr1(void)
 	}
 	tr1 |= SDRAM_TR1_RDCT_ENCODE(rdclt_average);
 
-	debug("tr1: %x\n", tr1);
+	debug("tr1: %lx\n", tr1);
 
 	/*
 	 * program SDRAM Timing Register 1 TR1

@@ -1124,7 +1124,7 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 			num_col_addr = spd_read(iic0_dimm_addr[dimm_num], 4);
 			num_banks    = spd_read(iic0_dimm_addr[dimm_num], 5);
 			bank_size_id = spd_read(iic0_dimm_addr[dimm_num], 31);
-			debug("DIMM%d: row=%d col=%d banks=%d\n", dimm_num,
+			debug("DIMM%ld: row=%d col=%d banks=%d\n", dimm_num,
 			      num_row_addr, num_col_addr, num_banks);
 
 			/*

@@ -1193,9 +1193,11 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 				bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes =
 					(4 << 20) * bank_size_id;
 				bank_parms[ctrl_bank_num[dimm_num]+i].cr = cr;
-				debug("DIMM%d-bank %d (SDRAM0_B%dCR): bank_size_bytes=%d\n",
-				      dimm_num, i, ctrl_bank_num[dimm_num]+i,
-				      bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes);
+				debug("DIMM%ld-bank %ld (SDRAM0_B%ldCR): "
+					"bank_size_bytes=%ld\n",
+					dimm_num, i,
+					ctrl_bank_num[dimm_num] + i,
+					bank_parms[ctrl_bank_num[dimm_num] + i].bank_size_bytes);
 			}
 		}
 	}

@@ -1239,7 +1241,8 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
 				bank_parms[sorted_bank_num[bx_cr_num]].cr;
 			mtdcr(SDRAM0_CFGDATA, temp);
 			bank_base_addr += bank_parms[sorted_bank_num[bx_cr_num]].bank_size_bytes;
-			debug("SDRAM0_B%dCR=0x%08lx\n", sorted_bank_num[bx_cr_num], temp);
+			debug("SDRAM0_B%ldCR=0x%08lx\n",
+				sorted_bank_num[bx_cr_num], temp);
 		}
 	}

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #8 lore raw

PATCH 4/9 GCC4.6: Squash warnings in 44x_spd_ddr.c

Dear Marek Vasut,

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

44x_spd_ddr.c: In function 'program_tr0':
44x_spd_ddr.c:823: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_tr1':
44x_spd_ddr.c:1054: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_bxcr':
44x_spd_ddr.c:1127: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 5 has type 'long unsigned int'
44x_spd_ddr.c:1242: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'

Quoted 7 lines

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 9 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
The project was large enough and management communication poor enough
to prompt many members of the team to see themselves  as  contestants
making  brownie  points,  rather  than as builders making programming
products. Each suboptimized  his  piece  to  meet  his  targets;  few
stopped to think about the total effect on the customer.
                              - Fred Brooks, "The Mythical Man Month"

Marek Vasut

author

2011-10-25 09:37 UTC #9 lore raw

PATCH 5/9 GCC4.6: Squash warnings in 4xx_ibm_ddr2_autocalib.c

In reply to Marek Vasut

4xx_ibm_ddr2_autocalib.c: In function 'DQS_calibration_methodB':
4xx_ibm_ddr2_autocalib.c:910: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'ulong' 4xx_ibm_ddr2_autocalib.c:911: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'ulong'
4xx_ibm_ddr2_autocalib.c: In function 'DQS_autocalibration':
4xx_ibm_ddr2_autocalib.c:1217: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'ulong' 4xx_ibm_ddr2_autocalib.c:1230: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'ulong'

Signed-off-by Marek Vasut <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +4 -4

index b909fca..4b8e65a 100644
@@ -907,8 +907,8 @@ static u32 DQS_calibration_methodB(struct ddrautocal *cal)
 	mtsdram(SDRAM_RQDC, rqdc_reg);
 	mtsdram(SDRAM_RFDC, rfdc_reg);
 
-	debug("RQDC: 0x%08X\n", rqdc_reg);
-	debug("RFDC: 0x%08X\n", rfdc_reg);
+	debug("RQDC: 0x%08lX\n", rqdc_reg);
+	debug("RFDC: 0x%08lX\n", rfdc_reg);
 
 	/* if something passed, then return the size of the largest window */
 	if (passed != 0) {

@@ -1214,7 +1214,7 @@ u32 DQS_autocalibration(void)
 				SDRAM_RQDC_RQFD_ENCODE(tcal.autocal.rqfd));
 
 		mfsdram(SDRAM_RQDC, rqdc_reg);
-		debug("*** best_result: read value SDRAM_RQDC 0x%08x\n",
+		debug("*** best_result: read value SDRAM_RQDC 0x%08lx\n",
 				rqdc_reg);
 
 #if defined(CONFIG_DDR_RFDC_FIXED)

@@ -1227,7 +1227,7 @@ u32 DQS_autocalibration(void)
 #endif /* CONFIG_DDR_RFDC_FIXED */
 
 		mfsdram(SDRAM_RFDC, rfdc_reg);
-		debug("*** best_result: read value SDRAM_RFDC 0x%08x\n",
+		debug("*** best_result: read value SDRAM_RFDC 0x%08lx\n",
 				rfdc_reg);
 		mfsdram(SDRAM_RDCC, val);
 		debug("***  SDRAM_RDCC 0x%08x\n", val);

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #10 lore raw

PATCH 5/9 GCC4.6: Squash warnings in 4xx_ibm_ddr2_autocalib.c

Dear Marek Vasut,

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

4xx_ibm_ddr2_autocalib.c: In function 'DQS_calibration_methodB':
4xx_ibm_ddr2_autocalib.c:910: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'ulong' 4xx_ibm_ddr2_autocalib.c:911: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'ulong'
4xx_ibm_ddr2_autocalib.c: In function 'DQS_autocalibration':
4xx_ibm_ddr2_autocalib.c:1217: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'ulong' 4xx_ibm_ddr2_autocalib.c:1230: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'ulong'

Quoted 4 lines

Signed-off-by Marek Vasut <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

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
Put your Nose to the Grindstone!
                 -- Amalgamated Plastic Surgeons and Toolmakers, Ltd.

Marek Vasut

author

2011-10-25 09:37 UTC #11 lore raw

PATCH 6/9 GCC4.6: Squash warnings in 4xx_pcie.c

In reply to Marek Vasut

4xx_pcie.c: In function 'pcie_read_config':
4xx_pcie.c:268: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'volatile unsigned char *'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/ppc4xx/4xx_pcie.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

arch/powerpc/cpu/ppc4xx/4xx_pcie.c +2 -1

index b76890e..a87e93b 100644
@@ -265,7 +265,8 @@ static int pcie_read_config(struct pci_controller *hose, unsigned int devfn,
 	 */
 	pcie_dmer_disable ();
 
-	debug("%s: cfg_data=%08x offset=%08x\n", __func__, hose->cfg_data, offset);
+	debug("%s: cfg_data=%p offset=%08x\n", __func__,
+		hose->cfg_data, offset);
 	switch (len) {
 	case 1:
 		*val = in_8(hose->cfg_data + offset);

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #12 lore raw

PATCH 6/9 GCC4.6: Squash warnings in 4xx_pcie.c

Dear Marek Vasut,

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

4xx_pcie.c: In function 'pcie_read_config':
4xx_pcie.c:268: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'volatile unsigned char *'
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/ppc4xx/4xx_pcie.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Applied, thanks.

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
God is real, unless declared integer.

Marek Vasut

author

2011-10-25 09:37 UTC #13 lore raw

PATCH 7/9 GCC4.6: Use dst instead of l2srbar in cpu_early_init.c

In reply to Marek Vasut

cpu_init_early.c: In function 'cpu_init_early_f':
cpu_init_early.c:74: warning: 'l2srbar' may be used uninitialized in this function

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

arch/powerpc/cpu/mpc85xx/cpu_init_early.c +2 -2

index 4ef3c9a..091af7c 100644
@@ -71,7 +71,7 @@ void cpu_init_early_f(void)
 #endif
 #if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399) && !defined(CONFIG_SYS_RAMBOOT)
 	ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
-	u32  *l2srbar, *dst, *src;
+	u32  *dst, *src;
 	void (*setup_ifc_sram)(void);
 #endif

@@ -137,7 +137,7 @@ void cpu_init_early_f(void)
 	dst = (u32 *) SRAM_BASE_ADDR;
 	src = (u32 *) setup_ifc;
 	for (i = 0; i < 1024; i++)
-		*l2srbar++ = *src++;
+		*dst++ = *src++;
 
 	setup_ifc_sram();

Signature · 1 line

1.7.6.3

Kumar Gala

2011-10-25 13:16 UTC #14 lore raw

PATCH 7/9 GCC4.6: Use dst instead of l2srbar in cpu_early_init.c

Quoted 11 lines · Marek Vasut

cpu_init_early.c: In function 'cpu_init_early_f':
cpu_init_early.c:74: warning: 'l2srbar' may be used uninitialized in this function
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

Please hold on this, waiting for a proper fix to the code from Poonam.

Quoted 30 lines

arch/powerpc/cpu/mpc85xx/cpu_init_early.c +2 -2

index 4ef3c9a..091af7c 100644
@@ -71,7 +71,7 @@ void cpu_init_early_f(void)
 #endif
 #if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399) && !defined(CONFIG_SYS_RAMBOOT)
 	ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
-	u32  *l2srbar, *dst, *src;
+	u32  *dst, *src;
 	void (*setup_ifc_sram)(void);
 #endif

@@ -137,7 +137,7 @@ void cpu_init_early_f(void)
 	dst = (u32 *) SRAM_BASE_ADDR;
 	src = (u32 *) setup_ifc;
 	for (i = 0; i < 1024; i++)
-		*l2srbar++ = *src++;
+		*dst++ = *src++;
 
 	setup_ifc_sram();

Signature · 6 lines

1.7.6.3

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Marek Vasut

author

2011-10-25 13:25 UTC #15 lore raw

PATCH 7/9 GCC4.6: Use dst instead of l2srbar in cpu_early_init.c

Quoted 13 lines · Marek Vasut

Quoted 11 lines
cpu_init_early.c: In function 'cpu_init_early_f':
cpu_init_early.c:74: warning: 'l2srbar' may be used uninitialized in this function
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

Quoted 1 line

Please hold on this, waiting for a proper fix to the code from Poonam.

Kumar, I don't mind removing this one. Thanks for looking through the series, it's very appreciated!

Cheers

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #16 lore raw

PATCH 7/9 GCC4.6: Use dst instead of l2srbar in cpu_early_init.c

In reply to Marek Vasut

Dear Marek Vasut,

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

cpu_init_early.c: In function 'cpu_init_early_f':
cpu_init_early.c:74: warning: 'l2srbar' may be used uninitialized in this function
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/mpc85xx/cpu_init_early.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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
You don't have to worry about me. I might have been born yesterday...
but I stayed up all night.

Marek Vasut

author

2011-10-25 09:37 UTC #17 lore raw

PATCH 8/9 GCC4.6: Squash warnings in ddr[123]_dimm_params.c

In reply to Marek Vasut

ddr1_dimm_params.c: In function 'compute_ranksize':
ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'

ddr2_dimm_params.c: In function 'compute_ranksize':
ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'

ddr3_dimm_params.c: In function 'compute_ranksize':
ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int', but argument 2 has type 'long long unsigned int'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c +1 -1

index 9184764..376be2f 100644
@@ -41,7 +41,7 @@ compute_ranksize(unsigned int mem_type, unsigned char row_dens)
 	/* Bottom 2 bits up to the top. */
 	bsize = ((row_dens >> 2) | ((row_dens & 3) << 6));
 	bsize <<= 24ULL;
-	debug("DDR: DDR I rank density = 0x%08x\n", bsize);
+	debug("DDR: DDR I rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }

arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c +1 -1

index b565e33..f637f3d 100644
@@ -40,7 +40,7 @@ compute_ranksize(unsigned int mem_type, unsigned char row_dens)
 	/* Bottom 5 bits up to the top. */
 	bsize = ((row_dens >> 5) | ((row_dens & 31) << 3));
 	bsize <<= 27ULL;
-	debug("DDR: DDR II rank density = 0x%08x\n", bsize);
+	debug("DDR: DDR II rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }

arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c +1 -1

index 838cebe..ffb503a 100644
@@ -71,7 +71,7 @@ compute_ranksize(const ddr3_spd_eeprom_t *spd)
 	bsize = 1ULL << (nbit_sdram_cap_bsize - 3
 		    + nbit_primary_bus_width - nbit_sdram_width);
 
-	debug("DDR: DDR III rank density = 0x%16lx\n", bsize);
+	debug("DDR: DDR III rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }

Signature · 1 line

1.7.6.3

Kumar Gala

2011-10-25 13:16 UTC #18 lore raw

PATCH 8/9 GCC4.6: Squash warnings in ddr[123]_dimm_params.c

Quoted 16 lines · Marek Vasut

ddr1_dimm_params.c: In function 'compute_ranksize':
ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'
ddr2_dimm_params.c: In function 'compute_ranksize':
ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'
ddr3_dimm_params.c: In function 'compute_ranksize':
ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int', but argument 2 has type 'long long unsigned int'
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>

Quoted 5 lines

---

arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

Acked-by Kumar Gala <[email protected]>

[ Are individual maintainers pick these up or is Wolfgang? ]

- k

Wolfgang Denk

2011-10-25 19:28 UTC #19 lore raw

PATCH 8/9 GCC4.6: Squash warnings in ddr[123]_dimm_params.c

Dear Kumar Gala,

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

Acked-by Kumar Gala <[email protected]>

Thanks.

Quoted 1 line

[ Are individual maintainers pick these up or is Wolfgang? ]

I feel it makes little sense to make the situation even more complicated by routing this deluge of patches through many different custodians. I will pick it all. Eventually. Guess I need some more time and way more beer before I dare diving into this.

Best regards,

Wolfgang Denk

Signature · 6 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
Am I your nanny? The kernel is there to support  user  programs,  but
it's a _resource_ handler, not a baby feeder.     - Linus Torvalds in
      <[email protected]>

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #20 lore raw

PATCH 8/9 GCC4.6: Squash warnings in ddr[123]_dimm_params.c

In reply to Marek Vasut

Dear Marek Vasut,

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

ddr1_dimm_params.c: In function 'compute_ranksize':
ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'
ddr2_dimm_params.c: In function 'compute_ranksize':
ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but argument 2 has type 'long long unsigned int'
ddr3_dimm_params.c: In function 'compute_ranksize':
ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int', but argument 2 has type 'long long unsigned int'
Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>

Quoted 5 lines

---
 arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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
"The great question... which I have not been able  to  answer...  is,
`What does woman want?'"                              - Sigmund Freud

Marek Vasut

author

2011-10-25 09:37 UTC #21 lore raw

PATCH 9/9 GCC4.6: Squash warnings in mpc86xx/interrupts.c

In reply to Marek Vasut

interrupts.c: In function 'interrupt_init_cpu':
interrupts.c:62: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
interrupts.c:69: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:72: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:75: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:79: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:83: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'

Signed-off-by Marek Vasut <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

Cc Mike Frysinger <[email protected]>

---
 arch/powerpc/cpu/mpc86xx/interrupts.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

arch/powerpc/cpu/mpc86xx/interrupts.c +6 -6

index 14821f4..aff1f6d 100644
@@ -59,28 +59,28 @@ int interrupt_init_cpu(unsigned long *decrementer_count)
 	pic->gcr = MPC86xx_PICGCR_MODE;
 
 	*decrementer_count = get_tbclk() / CONFIG_SYS_HZ;
-	debug("interrupt init: tbclk() = %d MHz, decrementer_count = %ld\n",
+	debug("interrupt init: tbclk() = %ld MHz, decrementer_count = %ld\n",
 	      (get_tbclk() / 1000000),
 	      *decrementer_count);
 
 #ifdef CONFIG_INTERRUPTS
 
 	pic->iivpr1 = 0x810001;	/* 50220 enable mcm interrupts */
-	debug("iivpr1@%x = %x\n", &pic->iivpr1, pic->iivpr1);
+	debug("iivpr1@%p = %x\n", &pic->iivpr1, pic->iivpr1);
 
 	pic->iivpr2 = 0x810002;	/* 50240 enable ddr interrupts */
-	debug("iivpr2@%x = %x\n", &pic->iivpr2, pic->iivpr2);
+	debug("iivpr2@%p = %x\n", &pic->iivpr2, pic->iivpr2);
 
 	pic->iivpr3 = 0x810003;	/* 50260 enable lbc interrupts */
-	debug("iivpr3@%x = %x\n", &pic->iivpr3, pic->iivpr3);
+	debug("iivpr3@%p = %x\n", &pic->iivpr3, pic->iivpr3);
 
 #if defined(CONFIG_PCI1) || defined(CONFIG_PCIE1)
 	pic->iivpr8 = 0x810008;	/* enable pcie1 interrupts */
-	debug("iivpr8@%x = %x\n", &pic->iivpr8, pic->iivpr8);
+	debug("iivpr8@%p = %x\n", &pic->iivpr8, pic->iivpr8);
 #endif
 #if defined(CONFIG_PCI2) || defined(CONFIG_PCIE2)
 	pic->iivpr9 = 0x810009;	/* enable pcie2 interrupts */
-	debug("iivpr9@%x = %x\n", &pic->iivpr9, pic->iivpr9);
+	debug("iivpr9@%p = %x\n", &pic->iivpr9, pic->iivpr9);
 #endif
 
 	pic->ctpr = 0;	/* 40080 clear current task priority register */

Signature · 1 line

1.7.6.3

Wolfgang Denk

Applied

2011-10-27 21:56 UTC #22 lore raw

PATCH 9/9 GCC4.6: Squash warnings in mpc86xx/interrupts.c

Dear Marek Vasut,

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

interrupts.c: In function 'interrupt_init_cpu':
interrupts.c:62: warning: format '%d' expects type 'int', but argument 2 has type 'long unsigned int'
interrupts.c:69: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:72: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:75: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:79: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'
interrupts.c:83: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'volatile uint *'

Quoted 7 lines

Signed-off-by Marek Vasut <[email protected]>
Cc Wolfgang Denk <[email protected]>
Cc Simon Glass <[email protected]>
Cc Mike Frysinger <[email protected]>
---
 arch/powerpc/cpu/mpc86xx/interrupts.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

Applied, thanks.

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
People with narrow minds usually have broad tongues.

Graeme Russ

2011-10-25 09:46 UTC #23 lore raw

cover CLEANUP: Cleanup of arch/powerpc/ directory

In reply to Marek Vasut

Hi Marek,

Quoted 3 lines · Marek Vasut

This series fixes the warnings generated by new debug() macro implementation, which will be merged after this series. This series fixes the problems before the macro is reworked to avoid smooth transition. Most of the problems fixed by

...reworked to allow smooth transition

Quoted 2 lines

this series are printf() formating related problems.

Regards,

Graeme

Wolfgang Denk

2011-10-25 19:16 UTC #24 lore raw

cover CLEANUP: Cleanup of arch/powerpc/ directory

Dear Graeme,

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

Quoted 3 lines · Marek Vasut
This series fixes the warnings generated by new debug() macro implementation, which will be merged after this series. This series fixes the problems before the macro is reworked to avoid smooth transition. Most of the problems fixed by
...reworked to allow smooth transition

A Freudian slip in its purest unadulterated form...

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
The world is coming to an end -- save your buffers!