MIPS: BCM63xx: improve CFE version detection
PATCH 1/1 MIPS: BCM63xx: improve CFE version detection
There are some CFE variants that start with 'cfe-vd' instead of 'cfe-v', such as the one used in the Huawei HG556a: "cfe-vd081.5003". In this case, the CFE version is stored as is (string vs number bytes).
Some newer devices have an additional version number, such as the Comtrend
VR-3032u: "1.0.38-112.118-11".
Finally, print the string as is if the version doesn't start with "cfe-v" or "cfe-vd", but starts with "cfe-".
--- arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
arch/mips/bcm63xx/boards/board_bcm963xx.c +18 -4
@@ -763,11 +763,25 @@ void __init board_prom_init(void)/* dump cfe version */ cfe = boot_addr +BCM963XX_CFE_VERSION_OFFSET ; -if (!memcmp (cfe,"cfe-v" ,5 )) -snprintf (cfe_version,sizeof (cfe_version),"%u.%u.%u-%u.%u" , - cfe[5 ], cfe[6 ], cfe[7 ], cfe[8 ], cfe[9 ]); -else +if (strstarts (cfe,"cfe-" )) { +if (cfe[4 ] =='v' ) { +if (cfe[5 ] =='d' ) +snprintf (cfe_version,11 ,"%s" , + (char *) &cfe[5 ]); +else if (cfe[10 ] >0 ) +snprintf (cfe_version,sizeof (cfe_version), +"%u.%u.%u-%u.%u-%u" , cfe[5 ], cfe[6 ], + cfe[7 ], cfe[8 ], cfe[9 ], cfe[10 ]); +else +snprintf (cfe_version,sizeof (cfe_version), +"%u.%u.%u-%u.%u" , cfe[5 ], cfe[6 ], + cfe[7 ], cfe[8 ], cfe[9 ]); + }else { +snprintf (cfe_version,12 ,"%s" , (char *) &cfe[4 ]); + } + }else {strcpy (cfe_version,"unknown" ); + }pr_info ("CFE version: %s\n" , cfe_version);bcm63xx_nvram_init (boot_addr +BCM963XX_NVRAM_OFFSET );
Signature · 1 line
2.26.2
Quoted 7 lines · Álvaro Fernández Rojas
There are some CFE variants that start with 'cfe-vd' instead of 'cfe-v', such as the one used in the Huawei HG556a: "cfe-vd081.5003". In this case, the CFE version is stored as is (string vs number bytes).
Some newer devices have an additional version number, such as the Comtrend
VR-3032u: "1.0.38-112.118-11".
Quoted 7 lines
Finally, print the string as is if the version doesn't start with "cfe-v" or "cfe-vd", but starts with "cfe-".
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]