From: Miquel Raynal <miquel.raynal@bootlin.com>
To: "Álvaro Fernández Rojas" <noltari@gmail.com>
Cc: f.fainelli@gmail.com, vigneshr@ti.com, richard@nod.at,
linus.walleij@linaro.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org, tsbogend@alpha.franken.de,
bcm-kernel-feedback-list@broadcom.com, jonas.gorski@gmail.com,
linux-mtd@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v3] mtd: parsers: bcm63xx: simplify CFE detection
Date: Mon, 15 Jun 2020 10:54:33 +0200 [thread overview]
Message-ID: <20200615105433.56fb5310@xps13> (raw)
In-Reply-To: <20200612073549.1658336-1-noltari@gmail.com>
Hi Álvaro,
Álvaro Fernández Rojas <noltari@gmail.com> wrote on Fri, 12 Jun 2020
09:35: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 <noltari@gmail.com>
> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
> ---
> v3: keep COMPILE_TEST compatibility by adding a new function that only checks
> fw_arg3 when CONFIG_MIPS is defined.
> v2: use CFE_EPTSEAL definition and avoid using an additional function.
>
> drivers/mtd/parsers/bcm63xxpart.c | 34 +++++++++++--------------------
> 1 file changed, 12 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/mtd/parsers/bcm63xxpart.c b/drivers/mtd/parsers/bcm63xxpart.c
> index 78f90c6c18fd..c514c04789af 100644
> --- a/drivers/mtd/parsers/bcm63xxpart.c
> +++ b/drivers/mtd/parsers/bcm63xxpart.c
> @@ -22,6 +22,11 @@
> #include <linux/mtd/partitions.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_MAGIC_OFFSET 0x4e0
> @@ -32,28 +37,13 @@
> #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)
> +static inline int bcm63xx_detect_cfe(void)
> {
> - 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);
> +#ifdef CONFIG_MIPS
> + return (fw_arg3 == CFE_EPTSEAL);
> +#else
> + return 0;
> +#endif /* CONFIG_MIPS */
What about:
ret = 0;
#ifdef CONFIG_MIPS
ret = (fw_arg3 == CFE_EPTSEAL)
#endif
return ret;
This is for shortening the conditional part.
> }
>
> static int bcm63xx_read_nvram(struct mtd_info *master,
> @@ -138,7 +128,7 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master,
> struct bcm963xx_nvram *nvram = NULL;
> int ret;
>
> - if (bcm63xx_detect_cfe(master))
> + if (!bcm63xx_detect_cfe())
> return -EINVAL;
>
> nvram = vzalloc(sizeof(*nvram));
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-06-15 8:55 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-08 9:40 [PATCH 0/2] mtd: parsers: bcm63xx: simplify CFE detection Álvaro Fernández Rojas
2020-06-08 9:40 ` [PATCH 1/2] MIPS: BCM63xx: add helper function to detect CFE Álvaro Fernández Rojas
2020-06-08 9:40 ` [PATCH 2/2] mtd: parsers: bcm63xx: simplify CFE detection Álvaro Fernández Rojas
2020-06-08 16:06 ` [PATCH v2] " Álvaro Fernández Rojas
2020-06-11 7:55 ` Miquel Raynal
2020-06-11 15:16 ` Álvaro Fernández Rojas
2020-06-11 15:42 ` Florian Fainelli
2020-06-11 15:46 ` Miquel Raynal
2020-06-11 16:14 ` Álvaro Fernández Rojas
2020-06-12 7:02 ` Miquel Raynal
2020-06-12 7:30 ` Álvaro Fernández Rojas
2020-06-12 7:33 ` Miquel Raynal
2020-06-12 7:37 ` Álvaro Fernández Rojas
2020-06-12 7:35 ` [PATCH v3] " Álvaro Fernández Rojas
2020-06-15 8:54 ` Miquel Raynal [this message]
2020-06-15 9:17 ` [PATCH v4] " Álvaro Fernández Rojas
2020-06-15 16:30 ` Florian Fainelli
2020-06-15 17:38 ` Miquel Raynal
2020-08-14 8:56 ` Guenter Roeck
2020-09-22 3:18 ` Naresh Kamboju
2020-09-22 3:26 ` Guenter Roeck
2020-09-28 14:16 ` Miquel Raynal
2020-09-28 19:35 ` Florian Fainelli
2020-09-29 17:27 ` [PATCH] mtd: parsers: bcm63xx: Do not make it modular Florian Fainelli
2020-10-02 7:15 ` Miquel Raynal
2020-10-11 14:14 ` Guenter Roeck
2020-10-12 7:04 ` Miquel Raynal
2020-10-12 13:24 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200615105433.56fb5310@xps13 \
--to=miquel.raynal@bootlin.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=jonas.gorski@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=noltari@gmail.com \
--cc=richard@nod.at \
--cc=tsbogend@alpha.franken.de \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).