niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mtd: parsers: bcm63xx: simplify CFE detection

Browse source 
Instead of trying to parse CFE version string, which is customized by some
vendors, let's just check that "CFE1" was passed on argument 3.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200615091740.2958303-1-noltari@gmail.com
This commit is contained in:
Álvaro Fernández Rojas 2020-06-15 11:17:40 +02:00 • committed by Miquel Raynal
parent 4551e78ad9
commit 91e81150d3
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/mtd/parsers/bcm63xxpart.c
View file

@ -22,6 +22,11 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/of.h> #include <linux/of.h>
#ifdef CONFIG_MIPS
#include <asm/bootinfo.h>
#include <asm/fw/cfe/cfe_api.h>
#endif /* CONFIG_MIPS */
#define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */
#define BCM963XX_CFE_MAGIC_OFFSET 0x4e0 #define BCM963XX_CFE_MAGIC_OFFSET 0x4e0
@ -32,28 +37,15 @@
#define STR_NULL_TERMINATE(x) \ #define STR_NULL_TERMINATE(x) \
do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
static int bcm63xx_detect_cfe(struct mtd_info *master) static inline int bcm63xx_detect_cfe(void)
{ {
char buf[9]; int ret = 0;
int ret;
size_t retlen;
ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen, #ifdef CONFIG_MIPS
(void *)buf); ret = (fw_arg3 == CFE_EPTSEAL);
buf[retlen] = 0; #endif /* CONFIG_MIPS */
if (ret) return ret;
return ret;
if (strncmp("cfe-v", buf, 5) == 0)
return 0;
/* very old CFE's do not have the cfe-v string, so check for magic */
ret = mtd_read(master, BCM963XX_CFE_MAGIC_OFFSET, 8, &retlen,
(void *)buf);
buf[retlen] = 0;
return strncmp("CFE1CFE1", buf, 8);
} }
static int bcm63xx_read_nvram(struct mtd_info *master, static int bcm63xx_read_nvram(struct mtd_info *master,
@ -138,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
struct bcm963xx_nvram *nvram = NULL; struct bcm963xx_nvram *nvram = NULL;
int ret; int ret;
if (bcm63xx_detect_cfe(master)) if (!bcm63xx_detect_cfe())
return -EINVAL; return -EINVAL;
nvram = vzalloc(sizeof(*nvram)); nvram = vzalloc(sizeof(*nvram));