From: Guenter Roeck <linux@roeck-us.net>
To: "Naresh Kamboju" <naresh.kamboju@linaro.org>,
"Álvaro Fernández Rojas" <noltari@gmail.com>,
linux-mips@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Richard Weinberger <richard@nod.at>,
Linus Walleij <linus.walleij@linaro.org>,
jonas.gorski@gmail.com, open list <linux-kernel@vger.kernel.org>,
lkft-triage@lists.linaro.org, tsbogend@alpha.franken.de,
bcm-kernel-feedback-list@broadcom.com,
Miquel Raynal <miquel.raynal@bootlin.com>,
linux-mtd@lists.infradead.org,
Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v4] mtd: parsers: bcm63xx: simplify CFE detection
Date: Mon, 21 Sep 2020 20:26:19 -0700 [thread overview]
Message-ID: <bff67b4c-4fa0-2441-ddbe-15366c8601d1@roeck-us.net> (raw)
In-Reply-To: <CA+G9fYvGkowdQmi1eBfoq2dhzBfgkFh9+7tgdNw75LydxkAEPw@mail.gmail.com>
On 9/21/20 8:18 PM, Naresh Kamboju wrote:
> On Fri, 14 Aug 2020 at 14:26, Guenter Roeck <linux@roeck-us.net> wrote:
>>
>> On Mon, Jun 15, 2020 at 11:17:40AM +0200, Álvaro Fernández Rojas wrote:
>>> 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>
>>
>
> We still see mips: allmodconfig build failure on Linus tree
>
Yes, same here.
Guenter
> make -sk KBUILD_BUILD_USER=TuxBuild -C/linux ARCH=mips
> CROSS_COMPILE=mips-linux-gnu- HOSTCC=gcc CC="sccache
> mips-linux-gnu-gcc" O=build allmodconfig
>
> make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=mips
> CROSS_COMPILE=mips-linux-gnu- HOSTCC=gcc CC="sccache
> mips-linux-gnu-gcc" O=build
>
>
>> mips:allmodconfig:
>>
>> ERROR: modpost: "fw_arg3" [drivers/mtd/parsers/bcm63xxpart.ko] undefined!
>
> ERROR: modpost: "fw_arg3" [drivers/mtd/parsers/bcm63xxpart.ko] undefined!
>
> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
>
> Full build link,
> https://builds.tuxbuild.com/Sm59_9tjFMpIvT27qf5kNA/build.log
>
>>
>> This is not surprising, since fw_arg3 is not exported.
>>
>> Guenter
>>
>>> ---
>>> v4: shorten conditional compilation part as suggested by Miquèl.
>>> 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 | 32 ++++++++++++-------------------
>>> 1 file changed, 12 insertions(+), 20 deletions(-)
>>>
>>> diff --git a/drivers/mtd/parsers/bcm63xxpart.c b/drivers/mtd/parsers/bcm63xxpart.c
>>> index 78f90c6c18fd..b15bdadaedb5 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,15 @@
>>> #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;
>>> + int ret = 0;
>>>
>>> - ret = mtd_read(master, BCM963XX_CFE_VERSION_OFFSET, 5, &retlen,
>>> - (void *)buf);
>>> - buf[retlen] = 0;
>>> +#ifdef CONFIG_MIPS
>>> + ret = (fw_arg3 == CFE_EPTSEAL);
>>> +#endif /* CONFIG_MIPS */
>>>
>>> - 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);
>>> + return ret;
>>> }
>>>
>>> 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;
>>> int ret;
>>>
>>> - if (bcm63xx_detect_cfe(master))
>>> + if (!bcm63xx_detect_cfe())
>>> return -EINVAL;
>>>
>>> nvram = vzalloc(sizeof(*nvram));
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-09-22 3:27 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
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 [this message]
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=bff67b4c-4fa0-2441-ddbe-15366c8601d1@roeck-us.net \
--to=linux@roeck-us.net \
--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=lkft-triage@lists.linaro.org \
--cc=miquel.raynal@bootlin.com \
--cc=naresh.kamboju@linaro.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).