From: Michael Walle <michael@walle.cc> To: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Michael Walle <michael@walle.cc>, Guenter Roeck <linux@roeck-us.net> Subject: [PATCH] mtd: core: handle flashes without OTP gracefully Date: Fri, 2 Jul 2021 11:38:41 +0200 [thread overview] Message-ID: <20210702093841.32307-1-michael@walle.cc> (raw) There are flash drivers which registers the OTP callbacks although the flash doesn't support OTP regions and return -ENODATA for these callbacks if there is no OTP. If this happens, the probe of the whole flash will fail. Fix it by handling the ENODATA return code and skip the OTP region nvmem setup. Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/mtdcore.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index b5ccd3037788..6881d1423dd6 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -880,7 +880,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) if (mtd->_get_user_prot_info && mtd->_read_user_prot_reg) { size = mtd_otp_size(mtd, true); - if (size < 0) + /* ENODATA means there is no OTP region */ + if (size == -ENODATA) + size = 0; + else if (size < 0) return size; if (size > 0) { @@ -896,7 +899,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) if (mtd->_get_fact_prot_info && mtd->_read_fact_prot_reg) { size = mtd_otp_size(mtd, false); - if (size < 0) { + /* ENODATA means there is no OTP region */ + if (size == -ENODATA) { + size = 0; + } else if (size < 0) { err = size; goto err; } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Michael Walle <michael@walle.cc> To: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Michael Walle <michael@walle.cc>, Guenter Roeck <linux@roeck-us.net> Subject: [PATCH] mtd: core: handle flashes without OTP gracefully Date: Fri, 2 Jul 2021 11:38:41 +0200 [thread overview] Message-ID: <20210702093841.32307-1-michael@walle.cc> (raw) There are flash drivers which registers the OTP callbacks although the flash doesn't support OTP regions and return -ENODATA for these callbacks if there is no OTP. If this happens, the probe of the whole flash will fail. Fix it by handling the ENODATA return code and skip the OTP region nvmem setup. Fixes: 4b361cfa8624 ("mtd: core: add OTP nvmem provider support") Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/mtd/mtdcore.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index b5ccd3037788..6881d1423dd6 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -880,7 +880,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) if (mtd->_get_user_prot_info && mtd->_read_user_prot_reg) { size = mtd_otp_size(mtd, true); - if (size < 0) + /* ENODATA means there is no OTP region */ + if (size == -ENODATA) + size = 0; + else if (size < 0) return size; if (size > 0) { @@ -896,7 +899,10 @@ static int mtd_otp_nvmem_add(struct mtd_info *mtd) if (mtd->_get_fact_prot_info && mtd->_read_fact_prot_reg) { size = mtd_otp_size(mtd, false); - if (size < 0) { + /* ENODATA means there is no OTP region */ + if (size == -ENODATA) { + size = 0; + } else if (size < 0) { err = size; goto err; } -- 2.20.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next reply other threads:[~2021-07-02 9:38 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-02 9:38 Michael Walle [this message] 2021-07-02 9:38 ` [PATCH] mtd: core: handle flashes without OTP gracefully Michael Walle 2021-07-02 13:49 ` Guenter Roeck 2021-07-02 13:49 ` Guenter Roeck 2021-07-02 13:53 ` Michael Walle 2021-07-02 13:53 ` Michael Walle 2021-07-03 9:56 ` Tudor.Ambarus 2021-07-03 9:56 ` Tudor.Ambarus 2021-07-03 16:08 ` Michael Walle 2021-07-03 16:08 ` Michael Walle 2021-07-03 16:42 ` Tudor.Ambarus 2021-07-03 16:42 ` Tudor.Ambarus 2021-07-03 17:26 ` Guenter Roeck 2021-07-03 17:26 ` Guenter Roeck 2021-07-06 16:29 ` Miquel Raynal 2021-07-06 16:29 ` Miquel Raynal 2021-07-06 18:22 ` Guenter Roeck 2021-07-06 18:22 ` 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=20210702093841.32307-1-michael@walle.cc \ --to=michael@walle.cc \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=linux@roeck-us.net \ --cc=miquel.raynal@bootlin.com \ --cc=richard@nod.at \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.