Hi Álvaro,
Álvaro Fernández Rojas <nolt...@gmail.com> wrote on Mon, 8 Jun 2020
18:06:49 +0200:
> 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 <nolt...@gmail.com>
> Signed-off-by: Jonas Gorski <jonas.gor...@gmail.com>
> ---
> v2: use CFE_EPTSEAL definition and avoid using an additional funtion.
>
> drivers/mtd/parsers/bcm63xxpart.c | 29 ++++-------------------------
> 1 file changed, 4 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/mtd/parsers/bcm63xxpart.c
> b/drivers/mtd/parsers/bcm63xxpart.c
> index 78f90c6c18fd..493a75b2f266 100644
> --- a/drivers/mtd/parsers/bcm63xxpart.c
> +++ b/drivers/mtd/parsers/bcm63xxpart.c
> @@ -22,6 +22,9 @@
> #include <linux/mtd/partitions.h>
> #include <linux/of.h>
>
> +#include <asm/bootinfo.h>
> +#include <asm/fw/cfe/cfe_api.h>
Are you sure both includes are needed?
I don't think it is a good habit to include asm/ headers, are you sure
there is not another header doing it just fine?
> +
> #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least
> 64KiB */
>
> #define BCM963XX_CFE_MAGIC_OFFSET 0x4e0
> @@ -32,30 +35,6 @@
> #define STR_NULL_TERMINATE(x) \
> do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
>
> -static int bcm63xx_detect_cfe(struct mtd_info *master)
> -{
> - char buf[9];
> - int ret;
> - size_t retlen;
> -
> - ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
> - (void *)buf);
> - buf[retlen] = 0;
> -
> - if (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,
> struct bcm963xx_nvram *nvram)
> {
> @@ -138,7 +117,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info
> *master,
> struct bcm963xx_nvram *nvram = NULL;
> int ret;
>
> - if (bcm63xx_detect_cfe(master))
> + if (fw_arg3 != CFE_EPTSEAL)
> return -EINVAL;
>
> nvram = vzalloc(sizeof(*nvram));
