From: <Tudor.Ambarus@microchip.com>
To: <vigneshr@ti.com>, <boris.brezillon@collabora.com>,
<marek.vasut@gmail.com>
Cc: <dwmw2@infradead.org>, <computersforpeace@gmail.com>,
<miquel.raynal@bootlin.com>, <richard@nod.at>,
<linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
<boris.brezillon@bootlin.com>
Subject: Re: [PATCH 6/7] mtd: spi-nor: Rework the SPI NOR lock/unlock logic
Date: Mon, 5 Aug 2019 08:00:00 +0000 [thread overview]
Message-ID: <d02fc366-55b6-f698-2419-f277e88dfe02@microchip.com> (raw)
In-Reply-To: <21112f0c-abf0-2b86-5847-2ad7676a29be@ti.com>
On 08/04/2019 05:36 PM, Vignesh Raghavendra wrote:
> External E-Mail
>
>
> Hi Tudor,
>
> On 31-Jul-19 2:33 PM, Tudor.Ambarus@microchip.com wrote:
>> From: Boris Brezillon <boris.brezillon@bootlin.com>
>>
>> Move the locking hooks in a separate struct so that we have just
>> one field to update when we change the locking implementation.
>>
>> stm_locking_ops, the legacy locking operations, can be overwritten
>> later on by implementing manufacturer specific default_init() hooks.
>>
>> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
>> [tudor.ambarus@microchip.com: use ->default_init() hook]
>> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
>
> [...]
>
>> @@ -1782,7 +1788,7 @@ static int spi_nor_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
>> if (ret)
>> return ret;
>>
>> - ret = nor->flash_is_locked(nor, ofs, len);
>> + ret = nor->locking_ops->is_locked(nor, ofs, len);
>>
>> spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
>> return ret;
>> @@ -4805,6 +4811,10 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
>> nor->quad_enable = spansion_quad_enable;
>> nor->set_4byte = spansion_set_4byte;
>>
>> + /* Default locking operations. */
>> + if (info->flags & SPI_NOR_HAS_LOCK)
>> + nor->locking_ops = &stm_locking_ops;
>> +
>
> This condition is different than how lock/unlock ops are populated
> today. We would need to add SPI_NOR_HAS_LOCK to all SNOR_MFR_ST and
> SNOR_MFR_MICRON entries to be backward compatible or keep the condition
> as is.
Will do, thanks!
>
>> /* Init flash parameters based on flash_info struct and SFDP */
>> spi_nor_init_params(nor, ¶ms);
>>
>> @@ -4819,21 +4829,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
>> mtd->_read = spi_nor_read;
>> mtd->_resume = spi_nor_resume;
>>
>> - /* NOR protection support for STmicro/Micron chips and similar */
>> - if (JEDEC_MFR(info) == SNOR_MFR_ST ||
>> - JEDEC_MFR(info) == SNOR_MFR_MICRON ||
>> - info->flags & SPI_NOR_HAS_LOCK) {
>> - nor->flash_lock = stm_lock;
>> - nor->flash_unlock = stm_unlock;
>> - nor->flash_is_locked = stm_is_locked;
>> - }
>> -
>
> [...]
>
>> diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
>> index a434ab7a53e6..bd68ec5a10e7 100644
>> --- a/include/linux/mtd/spi-nor.h
>> +++ b/include/linux/mtd/spi-nor.h
>> @@ -425,9 +425,23 @@ struct spi_nor {
>> int (*set_4byte)(struct spi_nor *nor, bool enable);
>> int (*clear_sr_bp)(struct spi_nor *nor);
>>
>> + const struct spi_nor_locking_ops *locking_ops;
>> +
>
> Also, to be consistent, document this new member.
Will do.
>
>
>> void *priv;
>> };
>>
>> +/**
>> + * struct spi_nor_locking_ops - SPI NOR locking methods
>> + * @lock: lock a region of the SPI NOR
>> + * @unlock: unlock a region of the SPI NOR
>> + * @is_locked: check if a region of the SPI NOR is completely locked
>> + */
>> +struct spi_nor_locking_ops {
>> + int (*lock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
>> + int (*unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
>> + int (*is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len);
>
> checkpatch does not like uint64_t. Please changes these to size_t
This respects what struct mtd_info is expecting:
int (*_lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*_unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
int (*_is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len);
I haven't seen the warnings, would you mind pasting them?
./scripts/checkpatch.pl --strict 6-7-mtd-spi-nor-Rework-the-SPI-NOR-lock-unlock-logic.patch
total: 0 errors, 0 warnings, 0 checks, 102 lines checked
6-7-mtd-spi-nor-Rework-the-SPI-NOR-lock-unlock-logic.patch has no obvious style problems and is ready for submission.
Cheers,
ta
>
> Regards
> Vignesh
>
>
>> +};
>> +
>> static u64 __maybe_unused
>> spi_nor_region_is_last(const struct spi_nor_erase_region *region)
>> {
>>
next prev parent reply other threads:[~2019-08-05 8:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 9:03 [PATCH 0/7] mtd: spi-nor: move manuf out of the core - batch 1 Tudor.Ambarus
2019-07-31 9:03 ` [PATCH 1/7] mtd: spi-nor: Add default_init() hook to tweak flash parameters Tudor.Ambarus
2019-08-01 6:24 ` Boris Brezillon
2019-07-31 9:03 ` [PATCH 2/7] mtd: spi-nor: Add a default_init() fixup hook for gd25q256 Tudor.Ambarus
2019-07-31 9:03 ` [PATCH 3/7] mtd: spi_nor: Rework quad_enable() Tudor.Ambarus
2019-08-01 6:29 ` Boris Brezillon
2019-08-05 7:43 ` Tudor.Ambarus
2019-07-31 9:03 ` [PATCH 4/7] mtd: spi-nor: Split spi_nor_init_params() Tudor.Ambarus
2019-08-01 6:31 ` Boris Brezillon
2019-07-31 9:03 ` [PATCH 5/7] mtd: spi-nor: Create a ->set_4byte() method Tudor.Ambarus
2019-07-31 9:03 ` [PATCH 6/7] mtd: spi-nor: Rework the SPI NOR lock/unlock logic Tudor.Ambarus
2019-08-04 14:36 ` Vignesh Raghavendra
2019-08-05 8:00 ` Tudor.Ambarus [this message]
2019-08-05 11:29 ` Vignesh Raghavendra
2019-07-31 9:03 ` [PATCH 7/7] mtd: spi-nor: Rework the disabling of write protection at init 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=d02fc366-55b6-f698-2419-f277e88dfe02@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=boris.brezillon@bootlin.com \
--cc=boris.brezillon@collabora.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--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 \
--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).