From: Vignesh Raghavendra <vigneshr@ti.com>
To: <Tudor.Ambarus@microchip.com>, <boris.brezillon@collabora.com>,
<marek.vasut@gmail.com>, <miquel.raynal@bootlin.com>,
<richard@nod.at>, <linux-mtd@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [RESEND PATCH v3 19/20] mtd: spi-nor: Introduce spi_nor_get_flash_info()
Date: Tue, 27 Aug 2019 13:07:41 +0530 [thread overview]
Message-ID: <5c3a96a8-228a-3659-d59e-fb3e3d603bb2@ti.com> (raw)
In-Reply-To: <20190826120821.16351-20-tudor.ambarus@microchip.com>
On 26/08/19 5:39 PM, Tudor.Ambarus@microchip.com wrote:
> From: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> Dedicate a function for getting the pointer to the flash_info
> const struct. Trim a bit the spi_nor_scan() huge function.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com>
Regards
Vignesh
> v3: no changes
>
> drivers/mtd/spi-nor/spi-nor.c | 76 +++++++++++++++++++++++++------------------
> 1 file changed, 44 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index d13317d1f372..ec70b58294ec 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -4766,10 +4766,50 @@ static int spi_nor_set_addr_width(struct spi_nor *nor)
> return 0;
> }
>
> +static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
> + const char *name)
> +{
> + const struct flash_info *info = NULL;
> +
> + if (name)
> + info = spi_nor_match_id(name);
> + /* Try to auto-detect if chip name wasn't specified or not found */
> + if (!info)
> + info = spi_nor_read_id(nor);
> + if (IS_ERR_OR_NULL(info))
> + return ERR_PTR(-ENOENT);
> +
> + /*
> + * If caller has specified name of flash model that can normally be
> + * detected using JEDEC, let's verify it.
> + */
> + if (name && info->id_len) {
> + const struct flash_info *jinfo;
> +
> + jinfo = spi_nor_read_id(nor);
> + if (IS_ERR(jinfo)) {
> + return jinfo;
> + } else if (jinfo != info) {
> + /*
> + * JEDEC knows better, so overwrite platform ID. We
> + * can't trust partitions any longer, but we'll let
> + * mtd apply them anyway, since some partitions may be
> + * marked read-only, and we don't want to lose that
> + * information, even if it's not 100% accurate.
> + */
> + dev_warn(nor->dev, "found %s, expected %s\n",
> + jinfo->name, info->name);
> + info = jinfo;
> + }
> + }
> +
> + return info;
> +}
> +
> int spi_nor_scan(struct spi_nor *nor, const char *name,
> const struct spi_nor_hwcaps *hwcaps)
> {
> - const struct flash_info *info = NULL;
> + const struct flash_info *info;
> struct device *dev = nor->dev;
> struct mtd_info *mtd = &nor->mtd;
> struct device_node *np = spi_nor_get_flash_node(nor);
> @@ -4800,37 +4840,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
> if (!nor->bouncebuf)
> return -ENOMEM;
>
> - if (name)
> - info = spi_nor_match_id(name);
> - /* Try to auto-detect if chip name wasn't specified or not found */
> - if (!info)
> - info = spi_nor_read_id(nor);
> - if (IS_ERR_OR_NULL(info))
> - return -ENOENT;
> -
> - /*
> - * If caller has specified name of flash model that can normally be
> - * detected using JEDEC, let's verify it.
> - */
> - if (name && info->id_len) {
> - const struct flash_info *jinfo;
> -
> - jinfo = spi_nor_read_id(nor);
> - if (IS_ERR(jinfo)) {
> - return PTR_ERR(jinfo);
> - } else if (jinfo != info) {
> - /*
> - * JEDEC knows better, so overwrite platform ID. We
> - * can't trust partitions any longer, but we'll let
> - * mtd apply them anyway, since some partitions may be
> - * marked read-only, and we don't want to lose that
> - * information, even if it's not 100% accurate.
> - */
> - dev_warn(dev, "found %s, expected %s\n",
> - jinfo->name, info->name);
> - info = jinfo;
> - }
> - }
> + info = spi_nor_get_flash_info(nor, name);
> + if (IS_ERR(info))
> + return PTR_ERR(info);
>
> nor->info = info;
>
>
--
Regards
Vignesh
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-08-27 7:37 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 12:08 [RESEND PATCH v3 00/20] mtd: spi-nor: move manuf out of the core Tudor.Ambarus
2019-08-26 12:08 ` [RESEND PATCH v3 01/20] mtd: spi-nor: Regroup flash parameter and settings Tudor.Ambarus
2019-08-27 4:21 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 02/20] mtd: spi-nor: Use nor->params Tudor.Ambarus
2019-08-27 4:31 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 03/20] mtd: spi-nor: Drop quad_enable() from 'struct spi-nor' Tudor.Ambarus
2019-08-27 4:47 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 04/20] mtd: spi-nor: Move erase_map to 'struct spi_nor_flash_parameter' Tudor.Ambarus
2019-08-26 12:38 ` Boris Brezillon
2019-08-27 5:39 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 05/20] mtd: spi-nor: Add default_init() hook to tweak flash parameters Tudor.Ambarus
2019-08-27 5:48 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 06/20] mtd: spi-nor: Add a default_init() fixup hook for gd25q256 Tudor.Ambarus
2019-08-27 5:48 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 07/20] mtd: spi_nor: Move manufacturer quad_enable() in ->default_init() Tudor.Ambarus
2019-08-27 5:54 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 08/20] mtd: spi-nor: Split spi_nor_init_params() Tudor.Ambarus
2019-08-27 6:00 ` Vignesh Raghavendra
2019-08-27 7:01 ` Tudor.Ambarus
2019-08-26 12:08 ` [RESEND PATCH v3 09/20] mtd: spi-nor: Create a ->set_4byte() method Tudor.Ambarus
2019-08-27 6:07 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 10/20] mtd: spi-nor: Rework the SPI NOR lock/unlock logic Tudor.Ambarus
2019-08-27 6:36 ` Vignesh Raghavendra
2019-08-27 6:58 ` Tudor.Ambarus
2019-08-26 12:08 ` [RESEND PATCH v3 11/20] mtd: spi-nor: Add post_sfdp() hook to tweak flash config Tudor.Ambarus
2019-08-27 7:08 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 12/20] mtd: spi-nor: Add spansion_post_sfdp_fixups() Tudor.Ambarus
2019-08-27 7:10 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 13/20] mtd: spi-nor: Add a ->convert_addr() method Tudor.Ambarus
2019-08-27 7:13 ` Vignesh Raghavendra
2019-08-26 12:08 ` [RESEND PATCH v3 14/20] mtd: spi_nor: Add a ->setup() method Tudor.Ambarus
2019-08-26 12:40 ` Boris Brezillon
2019-08-26 13:38 ` Schrempf Frieder
2019-08-26 14:02 ` Boris Brezillon
2019-08-26 14:37 ` Schrempf Frieder
2019-08-27 7:16 ` Vignesh Raghavendra
2019-08-26 12:09 ` [RESEND PATCH v3 15/20] mtd: spi-nor: Add s3an_post_sfdp_fixups() Tudor.Ambarus
2019-08-27 7:18 ` Vignesh Raghavendra
2019-08-26 12:09 ` [RESEND PATCH v3 16/20] mtd: spi-nor: Add the SPI_NOR_XSR_RDY flag Tudor.Ambarus
2019-08-27 7:48 ` Vignesh Raghavendra
2019-08-26 12:09 ` [RESEND PATCH v3 17/20] mtd: spi-nor: Bring flash params init together Tudor.Ambarus
2019-08-27 7:35 ` Vignesh Raghavendra
2019-08-26 12:09 ` [RESEND PATCH v3 18/20] mtd: spi_nor: Introduce spi_nor_set_addr_width() Tudor.Ambarus
2019-08-27 7:37 ` Vignesh Raghavendra
2019-08-26 12:09 ` [RESEND PATCH v3 19/20] mtd: spi-nor: Introduce spi_nor_get_flash_info() Tudor.Ambarus
2019-08-27 7:37 ` Vignesh Raghavendra [this message]
2019-08-26 12:09 ` [RESEND RFC PATCH v3 20/20] mtd: spi-nor: Rework the disabling of block write protection Tudor.Ambarus
2019-08-26 12:49 ` Boris Brezillon
2019-08-27 5:33 ` [RESEND PATCH v3 00/20] mtd: spi-nor: move manuf out of the core Vignesh Raghavendra
2019-08-28 10:18 ` Tudor.Ambarus
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=5c3a96a8-228a-3659-d59e-fb3e3d603bb2@ti.com \
--to=vigneshr@ti.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
/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).