OMAP3: Print correct silicon revision
PATCH 2/2 OMAP3: Print correct silicon revision
The function display_board_info() displays incorrect silicon revision - based on the return value from function get_cpu_rev().
This patch fixes the problem.
--- cpu/arm_cortexa8/cpu.c | 4 ++-- cpu/arm_cortexa8/omap3/clock.c | 5 +++-- cpu/arm_cortexa8/omap3/sys_info.c | 30 ++++++++++++++++++++++-------- include/asm-arm/arch-omap3/omap3.h | 10 ++++++++-- 4 files changed, 35 insertions(+), 14 deletions(-)
cpu/arm_cortexa8/cpu.c +2 -2
@@ -101,7 +101,7 @@ void l2cache_enable()volatile unsigned int j;/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () ==CPU_3430_ES2 ) { +if (get_cpu_rev () >=CPU_3XX_ES20 ) { __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); __asm__ __volatile__("orr %0, %0, #0x2" :"=r" (i)); __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i));
@@ -131,7 +131,7 @@ void l2cache_disable()volatile unsigned int j;/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () ==CPU_3430_ES2 ) { +if (get_cpu_rev () >=CPU_3XX_ES20 ) { __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); __asm__ __volatile__("bic %0, %0, #0x2" :"=r" (i)); __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i));
cpu/arm_cortexa8/omap3/clock.c +3 -2
@@ -132,7 +132,7 @@ void prcm_init(void)void (*f_lock_pll) (u32 ,u32 ,u32 ,u32 );int xip_safe, p0, p1, p2, p3;u32 osc_clk =0 , sys_clkin_sel; -u32 clk_index, sil_index; +u32 clk_index, sil_index =0 ;prm_t *prm_base = (prm_t *)PRM_BASE ;prcm_t *prcm_base = (prcm_t *)PRCM_BASE ;dpll_param *dpll_param_p;
@@ -170,7 +170,8 @@ void prcm_init(void)* and sil_index will get the values for that SysClk for the * appropriate silicon rev. */ - sil_index =get_cpu_rev () -1 ; +if (get_cpu_rev ()) + sil_index =1 ;/* Unlock MPU DPLL (slows things down, and needed later) */ sr32 (&prcm_base->clken_pll_mpu,0 ,3 ,PLL_LOW_POWER_BYPASS );
cpu/arm_cortexa8/omap3/sys_info.c +22 -8
@@ -35,6 +35,12 @@ extern omap3_sysinfo sysinfo;static gpmc_csx_t *gpmc_cs_base = (gpmc_csx_t *)GPMC_CONFIG_CS0_BASE ;static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE ;static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE ; +static char *rev_s[CPU_3XX_MAX_REV ] = { +"1.0" , +"2.0" , +"2.1" , +"3.0" , +"3.1" };/***************************************************************** * dieid_num_r(void) - read and set die ID
@@ -76,18 +82,27 @@ u32 get_cpu_type(void)u32 get_cpu_rev (void ) {u32 cpuid =0 ; +ctrl_id_t *id_base;/* * On ES1.0 the IDCODE register is not exposed on L4 -* so using CPU ID to differentiate -* between ES2.0 and ES1.0. +* so using CPU ID to differentiate between ES1.0 and > ES1.0. */ __asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0" :"=r" (cpuid));if ((cpuid &0xf ) ==0x0 ) -return CPU_3430_ES1 ; -else -return CPU_3430_ES2 ; +return CPU_3XX_ES10 ; +else { +/* Decode the IDs on > ES1.0 */ + id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE ; + + cpuid = (readl (&id_base->idcode) >>CPU_3XX_ID_SHIFT ) &0xff ; + +/* Some early ES2.0 seem to report ID 0, fix this */ +if (cpuid ==0 ) + cpuid =CPU_3XX_ES20 ; +return cpuid; + } }/****************************************************
@@ -215,9 +230,8 @@ void display_board_info(void) sec_s ="?" ; } - -printf ("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n" , cpu_s, - sec_s,get_cpu_rev ()); +printf ("OMAP%s-%s [ES%s], CPU-OPP2 L3-165MHz\n" , cpu_s, + sec_s, rev_s[get_cpu_rev ()]);printf ("%s + %s/%s\n" , sysinfo.board_string, mem_s, sysinfo.nand_string);
include/asm-arm/arch-omap3/omap3.h +8 -2
@@ -171,8 +171,14 @@ typedef struct gpio {* ES1 = 0+1 = 1 * ES1 = 1+1 = 1 */ -#define CPU_3430_ES1 1 -#define CPU_3430_ES2 2 +#define CPU_3XX_ES10 0 +#define CPU_3XX_ES20 1 +#define CPU_3XX_ES21 2 +#define CPU_3XX_ES30 3 +#define CPU_3XX_ES31 4 +#define CPU_3XX_MAX_REV (CPU_3XX_ES31 + 1) + +#define CPU_3XX_ID_SHIFT 28#define WIDTH_8BIT 0x0000#define WIDTH_16BIT 0x1000/* bit pos for 16 bit in gpmc */
Signature · 1 line
1.6.2.1
PATCH 2/2 OMAP3: Print correct silicon revision
Quoted 5 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
two comment on the omap3
first for the cp15 we have the get/set_cr API it will be nice to use it and the omap3 specific l2 cache management need to be moved to the soc no the arch as currenty
Best Regards,
J.
PATCH 2/2 OMAP3: Print correct silicon revision
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 11 lines · In message <[email protected]> you wrote:
Quoted 5 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
two comment on the omap3
first for the cp15 we have the get/set_cr API it will be nice to use it and the omap3 specific l2 cache management need to be moved to the soc no the arch as currenty
But this is outside the scope of this patch, isn;t it?
I mean, you will apply this patch, right?
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 2003PATCH 2/2 OMAP3: Print correct silicon revision
In reply to Sanjeev PremiQuoted 7 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
Signed-off-by Sanjeev Premi <[email protected]>
Quoted 135 lines
--- cpu/arm_cortexa8/cpu.c | 4 ++-- cpu/arm_cortexa8/omap3/clock.c | 5 +++-- cpu/arm_cortexa8/omap3/sys_info.c | 30 ++++++++++++++++++++++-------- include/asm-arm/arch-omap3/omap3.h | 10 ++++++++-- 4 files changed, 35 insertions(+), 14 deletions(-)cpu/arm_cortexa8/cpu.c +2
-2@@ -101,7 +101,7 @@ void l2cache_enable()volatile unsigned int j;/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () ==CPU_3430_ES2 ) { +if (get_cpu_rev () >=CPU_3XX_ES20 ) { __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); __asm__ __volatile__("orr %0, %0, #0x2" :"=r" (i)); __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i));@@ -131,7 +131,7 @@ void l2cache_disable()volatile unsigned int j;/* ES2 onwards we can disable/enable L2 ourselves */ -if (get_cpu_rev () ==CPU_3430_ES2 ) { +if (get_cpu_rev () >=CPU_3XX_ES20 ) { __asm__ __volatile__("mrc p15, 0, %0, c1, c0, 1" :"=r" (i)); __asm__ __volatile__("bic %0, %0, #0x2" :"=r" (i)); __asm__ __volatile__("mcr p15, 0, %0, c1, c0, 1" :"=r" (i));cpu/arm_cortexa8/omap3/clock.c +3
-2@@ -132,7 +132,7 @@ void prcm_init(void)void (*f_lock_pll) (u32 ,u32 ,u32 ,u32 );int xip_safe, p0, p1, p2, p3;u32 osc_clk =0 , sys_clkin_sel; -u32 clk_index, sil_index; +u32 clk_index, sil_index =0 ;prm_t *prm_base = (prm_t *)PRM_BASE ;prcm_t *prcm_base = (prcm_t *)PRCM_BASE ;dpll_param *dpll_param_p;@@ -170,7 +170,8 @@ void prcm_init(void)* and sil_index will get the values for that SysClk for the * appropriate silicon rev. */ - sil_index =get_cpu_rev () -1 ; +if (get_cpu_rev ()) + sil_index =1 ;/* Unlock MPU DPLL (slows things down, and needed later) */ sr32 (&prcm_base->clken_pll_mpu,0 ,3 ,PLL_LOW_POWER_BYPASS );cpu/arm_cortexa8/omap3/sys_info.c +22
-8@@ -35,6 +35,12 @@ extern omap3_sysinfo sysinfo;static gpmc_csx_t *gpmc_cs_base = (gpmc_csx_t *)GPMC_CONFIG_CS0_BASE ;static sdrc_t *sdrc_base = (sdrc_t *)OMAP34XX_SDRC_BASE ;static ctrl_t *ctrl_base = (ctrl_t *)OMAP34XX_CTRL_BASE ; +static char *rev_s[CPU_3XX_MAX_REV ] = { +"1.0" , +"2.0" , +"2.1" , +"3.0" , +"3.1" };/***************************************************************** * dieid_num_r(void) - read and set die ID @@ -76,18 +82,27 @@ u32 get_cpu_type(void)u32 get_cpu_rev (void ) {u32 cpuid =0 ; +ctrl_id_t *id_base;/* * On ES1.0 the IDCODE register is not exposed on L4 -* so using CPU ID to differentiate -* between ES2.0 and ES1.0. +* so using CPU ID to differentiate between ES1.0 and > ES1.0. */ __asm__ __volatile__("mrc p15, 0, %0, c0, c0, 0" :"=r" (cpuid));if ((cpuid &0xf ) ==0x0 ) -return CPU_3430_ES1 ; -else -return CPU_3430_ES2 ; +return CPU_3XX_ES10 ; +else { +/* Decode the IDs on > ES1.0 */ + id_base = (ctrl_id_t *)OMAP34XX_ID_L4_IO_BASE ; + + cpuid = (readl (&id_base->idcode) >>CPU_3XX_ID_SHIFT ) &0xff ; + +/* Some early ES2.0 seem to report ID 0, fix this */ +if (cpuid ==0 ) + cpuid =CPU_3XX_ES20 ; +return cpuid; + } }/**************************************************** @@ -215,9 +230,8 @@ void display_board_info(void) sec_s ="?" ; } - -printf ("OMAP%s-%s rev %d, CPU-OPP2 L3-165MHz\n" , cpu_s, - sec_s,get_cpu_rev ()); +printf ("OMAP%s-%s [ES%s], CPU-OPP2 L3-165MHz\n" , cpu_s, + sec_s, rev_s[get_cpu_rev ()]);printf ("%s + %s/%s\n" , sysinfo.board_string, mem_s, sysinfo.nand_string);include/asm-arm/arch-omap3/omap3.h +8
-2@@ -171,8 +171,14 @@ typedef struct gpio {* ES1 = 0+1 = 1 * ES1 = 1+1 = 1 */ -#define CPU_3430_ES1 1 -#define CPU_3430_ES2 2 +#define CPU_3XX_ES10 0 +#define CPU_3XX_ES20 1 +#define CPU_3XX_ES21 2 +#define CPU_3XX_ES30 3 +#define CPU_3XX_ES31 4 +#define CPU_3XX_MAX_REV (CPU_3XX_ES31 + 1) + +#define CPU_3XX_ID_SHIFT 28#define WIDTH_8BIT 0x0000#define WIDTH_16BIT 0x1000/* bit pos for 16 bit in gpmc */
PATCH 2/2 OMAP3: Print correct silicon revision
Quoted 11 lines · Dirk Behme
Quoted 7 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>
why the twice?
Best Regards,
J.
PATCH 2/2 OMAP3: Print correct silicon revision
Dear Jean-Christophe,
Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 5 lines · Dirk Behme
Quoted 4 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
This patch fixes the problem.
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>why the twice?
I wanted to mention that I helped developing these patches and that I tested them on real HW.
http://kerneltrap.org/node/8329:
"The Signed-off-by: tag implies that the signer was involved in the development of the patch"
"Tested-by ... it's very useful information to have. For a start, it tells you who has the hardware and knows how to build ..."
If you think one is enough, remove what you don't like ;)
Dirk
PATCH 2/2 OMAP3: Print correct silicon revision
Quoted 11 lines · Dirk Behme
Dear Jean-Christophe,
Quoted 8 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 7 lines · Dirk Behme
Quoted 6 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>why the twice?
I wanted to mention that I helped developing these patches and that I tested them on real HW.
what do you mean by help?
review or dev?
if it's review I do not think the sob is correct
Best Regards,
J.
PATCH 2/2 OMAP3: Print correct silicon revision
Quoted 21 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 19 lines · Dirk Behme
Dear Jean-Christophe,
Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 13 lines · Dirk Behme
Quoted 8 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>
Quoted 10 lines
Quoted 5 lines
Quoted 2 lines
why the twice?
I wanted to mention that I helped developing these patches and that I tested them on real HW.
what do you mean by help?
review or dev?
if it's review I do not think the sob is correct
Seriously, who cares? This extra information doesn't hurt anything so let it pass.
--Ben
PATCH 2/2 OMAP3: Print correct silicon revision
Quoted 27 lines · Ben Warren
Quoted 26 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 24 lines · Dirk Behme
Dear Jean-Christophe,
Quoted 8 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 6 lines · Dirk Behme
Quoted 4 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().Quoted 9 lines
Quoted 7 lines
Quoted 4 lines
This patch fixes the problem.
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>why the twice?
I wanted to mention that I helped developing these patches and that I tested them on real HW.
Quoted 7 lines
Quoted 5 lines
what do you mean by help?
review or dev?
if it's review I do not think the sob is correctSeriously, who cares? This extra information doesn't hurt anything so let it pass.
Yes, totally agreed. Thanks.
Best regards
Dirk
[U-Boot] Using Signed-off-by, was: OMAP3: Print correct silicon revision
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe,
Quoted 12 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 11 lines · Dirk Behme
Dear Jean-Christophe,
Quoted 8 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 7 lines · Dirk Behme
Quoted 6 lines · Sanjeev Premi
The function
display_board_info()displays incorrect silicon revision - based on the return value from functionget_cpu_rev().This patch fixes the problem.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Sanjeev Premi <[email protected]>Signed-off-by Dirk Behme <[email protected]>Tested-by Dirk Behme <[email protected]>why the twice?
I wanted to mention that I helped developing these patches and that I tested them on real HW.
what do you mean by help?
review or dev?
Sorry, but I can't see what might be unclear with the string 'helped developing' I used regarding your question.
Quoted 1 line
if it's review I do not think the sob is correct
Please elaborate more why in review case you think sob is not correct?
Dirk