Skip to contentSkip to conversation

mtd: spi-nor: changes for v6.12

GIT PULL Pratyush Yadav 2 participants 4 messages Sep 12, 2024 – Sep 15, 2024 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

Hi Miquel,

Here are the SPI NOR changes for v6.12. I usually base my branch on top of -rc1, but this time around it seems I did it a few commits after v6.11-rc1. Probably just didn't notice torvalds/master had moved. Should make no difference in practice anyway.

Regards,
Pratyush Yadav

The following changes since commit dc1c8034e31b14a2e5e212104ec508aec44ce1b9:

minmax: simplify min()/max()/clamp() implementation (2024-07-28 20:24:12 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git tags/spi-nor/for-6.12

for you to fetch changes up to 527d0fa65426b9957422d0e716fde0d0602c75c2:

mtd: spi-nor: fix flash probing (2024-09-09 15:42:50 +0200)

----------------------------------------------------------------
SPI NOR changes for 6.12

Notable changes:

- Add Write Protect support for N25Q064A.

- New flash support for Zetta ZD25Q128C and Spansion S28HS256T.

- Fix a NULL dereference in probe path for flashes without a name. The probe path tries to access the name without checking its existence first. S28HS256T is the first flash to define its entry without a name, uncovering this issue.

----------------------------------------------------------------
Brian Norris (1):
mtd: spi-nor: micron-st: Add n25q064a WP support

Csókás, Bence (1):
mtd: spi-nor: sst: Factor out common write operation to sst_nor_write_data()

Michael Walle (2):
mtd: spi-nor: winbond: add Zetta ZD25Q128C support
mtd: spi-nor: fix flash probing

Takahiro Kuwano (1):
mtd: spi-nor: spansion: Add support for S28HS256T

 drivers/mtd/spi-nor/core.c      |  3 ++-
 drivers/mtd/spi-nor/micron-st.c |  2 ++
 drivers/mtd/spi-nor/spansion.c  |  4 ++++
 drivers/mtd/spi-nor/sst.c       | 39 +++++++++++++++++++--------------------
 drivers/mtd/spi-nor/winbond.c   | 26 ++++++++++++++++++++++++++
 5 files changed, 53 insertions(+), 21 deletions(-)

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

maintainer
#1 lore raw

Hi Pratyush,

[email protected] wrote on Thu, 12 Sep 2024 12:28:57 +0200:

Quoted 6 lines

Hi Miquel,

Here are the SPI NOR changes for v6.12. I usually base my branch on top of -rc1, but this time around it seems I did it a few commits after v6.11-rc1. Probably just didn't notice torvalds/master had moved. Should make no difference in practice anyway.

I don't think I can merge your tag without the 4 minmax patches, which means they will appear in my final merge request to Linus, unless I explicitly don't use an -rc as a base, but this must be justified I believe. Can you please fix the branch and regenerate the tag? I don't mind personally if you force push, if it makes the history more clear.

Thanks!
Miquèl

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

#2 lore raw
Quoted 11 lines · Miquel Raynal

Hi Pratyush,

[email protected] wrote on Thu, 12 Sep 2024 12:28:57 +0200:

Quoted 6 lines

Hi Miquel,

Here are the SPI NOR changes for v6.12. I usually base my branch on top of -rc1, but this time around it seems I did it a few commits after v6.11-rc1. Probably just didn't notice torvalds/master had moved. Should make no difference in practice anyway.

Quoted 5 lines

I don't think I can merge your tag without the 4 minmax patches, which means they will appear in my final merge request to Linus, unless I explicitly don't use an -rc as a base, but this must be justified I believe. Can you please fix the branch and regenerate the tag? I don't mind personally if you force push, if it makes the history more clear.

TL;DR: I'll rebase and send you a new pull request.

I thought it wouldn't matter since Linus' tree already has those minmax commits anyway. I did a test merge just now and seems I was right. When I merge current spi-nor/next into mtd/next, and then merge mtd/next into torvalds/master, here's the merge I get:

Merge branch 'mtd/merge-test'

* mtd/merge-test:
mtd: spi-nor: fix flash probing
mtd: powernv: Add check devm_kasprintf() returned value
mtd: spi-nor: spansion: Add support for S28HS256T
mtd: concat: Use kmemdup_array instead of kmemdup for multiple allocation
mtd: parsers: bcm47xxpart: make read-only array possible_nvram_sizes static const
mtd: Use of_property_read_bool()
mtd: slram: insert break after errors in parsing the map
mtd: spi-nor: winbond: add Zetta ZD25Q128C support
mtd: spi-nor: micron-st: Add n25q064a WP support
mtd: spi-nor: sst: Factor out common write operation to sst_nor_write_data()

But since mtd/next doesn't have the minmax commits, here is what the merge of spi-nor/next into mtd/next looks like:

Merge branch 'spi-nor/next' into mtd/merge-test

* spi-nor/next:
mtd: spi-nor: fix flash probing
mtd: spi-nor: spansion: Add support for S28HS256T
mtd: spi-nor: winbond: add Zetta ZD25Q128C support
mtd: spi-nor: micron-st: Add n25q064a WP support
mtd: spi-nor: sst: Factor out common write operation to sst_nor_write_data()
minmax: simplify min()/max()/clamp() implementation
minmax: don't use max() in situations that want a C constant expression
minmax: scsi: fix mis-use of 'clamp()' in sr.c
minmax: make generic MIN() and MAX() macros available everywhere

Essentially, your merge to Linus would be fine but my merge to your branch will (appear to) have these extra commits.

I don't think any of this is worth the extra confusion so I will just rebase my branch on v6.11-rc1 force push. Will send you a v2 of the pull request soon.

Side note:

Quoted 2 lines

[...]unless I explicitly don't use an -rc as a base, but this must be justified I believe.

I am curious why that is so. I don't see how using an -rc as base is any better than using any other commit in Linus' tree. For git it doesn't matter since an -rc commit is the same as any other commit. I suppose if everyone does it, the history might be a bit cleaner, but I don't see how it would make much of a difference in practice.

Signature · 6 lines
Regards,
Pratyush Yadav

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
maintainer
#3 lore raw

Hi Pratyush,

[email protected] wrote on Sat, 14 Sep 2024 17:55:39 +0200:

Quoted 45 lines · Miquel Raynal
Quoted 12 lines

Hi Pratyush,

[email protected] wrote on Thu, 12 Sep 2024 12:28:57 +0200:

Quoted 6 lines

Hi Miquel,

Here are the SPI NOR changes for v6.12. I usually base my branch on top of -rc1, but this time around it seems I did it a few commits after v6.11-rc1. Probably just didn't notice torvalds/master had moved. Should make no difference in practice anyway.

Quoted 5 lines

I don't think I can merge your tag without the 4 minmax patches, which means they will appear in my final merge request to Linus, unless I explicitly don't use an -rc as a base, but this must be justified I believe. Can you please fix the branch and regenerate the tag? I don't mind personally if you force push, if it makes the history more clear.

TL;DR: I'll rebase and send you a new pull request.

I thought it wouldn't matter since Linus' tree already has those minmax commits anyway. I did a test merge just now and seems I was right. When I merge current spi-nor/next into mtd/next, and then merge mtd/next into torvalds/master, here's the merge I get:

Merge branch 'mtd/merge-test'

* mtd/merge-test:
mtd: spi-nor: fix flash probing
mtd: powernv: Add check devm_kasprintf() returned value
mtd: spi-nor: spansion: Add support for S28HS256T
mtd: concat: Use kmemdup_array instead of kmemdup for multiple allocation
mtd: parsers: bcm47xxpart: make read-only array possible_nvram_sizes static const
mtd: Use of_property_read_bool()
mtd: slram: insert break after errors in parsing the map
mtd: spi-nor: winbond: add Zetta ZD25Q128C support
mtd: spi-nor: micron-st: Add n25q064a WP support
mtd: spi-nor: sst: Factor out common write operation to sst_nor_write_data()

But since mtd/next doesn't have the minmax commits, here is what the merge of spi-nor/next into mtd/next looks like:

Merge branch 'spi-nor/next' into mtd/merge-test

Quoted 10 lines

* spi-nor/next:
mtd: spi-nor: fix flash probing
mtd: spi-nor: spansion: Add support for S28HS256T
mtd: spi-nor: winbond: add Zetta ZD25Q128C support
mtd: spi-nor: micron-st: Add n25q064a WP support
mtd: spi-nor: sst: Factor out common write operation to sst_nor_write_data()
minmax: simplify min()/max()/clamp() implementation
minmax: don't use max() in situations that want a C constant expression
minmax: scsi: fix mis-use of 'clamp()' in sr.c
minmax: make generic MIN() and MAX() macros available everywhere

Yes, this one looks bad, but you're right the final merge request would have been clean.

Quoted 9 lines

Essentially, your merge to Linus would be fine but my merge to your branch will (appear to) have these extra commits.

I don't think any of this is worth the extra confusion so I will just rebase my branch on v6.11-rc1 force push. Will send you a v2 of the pull request soon.

Side note:

Quoted 8 lines
Quoted 2 lines

[...]unless I explicitly don't use an -rc as a base, but this must be justified I believe.

I am curious why that is so. I don't see how using an -rc as base is any better than using any other commit in Linus' tree. For git it doesn't matter since an -rc commit is the same as any other commit. I suppose if everyone does it, the history might be a bit cleaner, but I don't see how it would make much of a difference in practice.

Yes, I guess for cleanliness purposes it is expected that people base their branches on -rc tags, so it is easier to catch what is part of their work? Otherwise if you _need_ another patch in-between I believe it should be stated why you need it.

Anyway, thanks for the v2!

Cheers,
Miquèl

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/