-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to Linux 6.1.123 #454
base: master
Are you sure you want to change the base?
Conversation
Signed-off-by: Saikrishna Arcot <[email protected]>
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for doing this. It’d be great if you documented your findings about the patches in the commit message as you already did the work analyzing, which patches to apply and which not.
@@ -140,7 +138,7 @@ Support-for-fullcone-nat.patch | |||
0092-platform-mellanox-Introduce-support-of-Nvidia-smart-.patch | |||
0093-hwmon-pmbus-Add-support-for-MPS-Multi-phase-mp2855-c.patch | |||
0094-i2c-asf-Introduce-MCTP-support-over-ASF-controller.patch | |||
0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch | |||
#0095-platform-mellanox-nvsw-sn2201-Add-support-for-new-sy.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
From 29922c1e20e86e643687a76b8c3181e388067b03 Mon Sep 17 00:00:00 2001 | ||
From: Vivek Reddy <[email protected]> | ||
Date: Fri, 27 Sep 2024 02:27:37 +0000 | ||
Subject: [PATCH] Revert "mtd: spi-nor: Correct flags for Winbond w25q128" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to be the commit below, which does a little bit more though.
commit a207af9bfe76bdc97c14ce58b31759d74440cf8e
Author: Michael Walle <[email protected]>
Date: Fri Jun 21 14:09:29 2024 +0200
mtd: spi-nor: winbond: fix w25q128 regression
commit d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901 upstream.
Commit 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
removed the flags for non-SFDP devices. It was assumed that it wasn't in
use anymore. This wasn't true. Add the no_sfdp_flags as well as the size
again.
We add the additional flags for dual and quad read because they have
been reported to work properly by Hartmut using both older and newer
versions of this flash, the similar flashes with 64Mbit and 256Mbit
already have these flags and because it will (luckily) trigger our
legacy SFDP parsing, so newer versions with SFDP support will still get
the parameters from the SFDP tables.
Reported-by: Hartmut Birr <[email protected]>
Closes: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@mail.gmail.com/
Fixes: 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
Reviewed-by: Linus Walleij <[email protected]>
Signed-off-by: Michael Walle <[email protected]>
Acked-by: Tudor Ambarus <[email protected]>
Reviewed-by: Esben Haabendal <[email protected]>
Reviewed-by: Pratyush Yadav <[email protected]>
Signed-off-by: Pratyush Yadav <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Link: https://lore.kernel.org/r/[email protected]
[Backported to v6.6 - vastly different due to upstream changes]
Reviewed-by: Tudor Ambarus <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
diff --git a/drivers/mtd/spi-nor/winbond.c b/drivers/mtd/spi-nor/winbond.c
index b7c775b615e85..58aba52022bfb 100644
--- a/drivers/mtd/spi-nor/winbond.c
+++ b/drivers/mtd/spi-nor/winbond.c
@@ -120,9 +120,10 @@ static const struct flash_info winbond_nor_parts[] = {
NO_SFDP_FLAGS(SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16)
NO_SFDP_FLAGS(SECT_4K) },
- { "w25q128", INFO(0xef4018, 0, 0, 0)
- PARSE_SFDP
- FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) },
+ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256)
+ FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
+ NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
+ SPI_NOR_QUAD_READ) },
{ "w25q256", INFO(0xef4019, 0, 64 * 1024, 512)
NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
.fixups = &w25q256_fixups },
No description provided.