From: Greg Kroah-Hartman Date: Wed, 6 Nov 2024 07:33:05 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v4.19.323~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92a209336f8d16075cf16b1751c181cb8667e377;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: mtd-spi-nor-winbond-fix-w25q128-regression.patch --- diff --git a/queue-6.1/mtd-spi-nor-winbond-fix-w25q128-regression.patch b/queue-6.1/mtd-spi-nor-winbond-fix-w25q128-regression.patch new file mode 100644 index 00000000000..a162efc15cb --- /dev/null +++ b/queue-6.1/mtd-spi-nor-winbond-fix-w25q128-regression.patch @@ -0,0 +1,56 @@ +From d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901 Mon Sep 17 00:00:00 2001 +From: Michael Walle +Date: Fri, 21 Jun 2024 14:09:29 +0200 +Subject: mtd: spi-nor: winbond: fix w25q128 regression + +From: Michael Walle + +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 +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 +Signed-off-by: Michael Walle +Acked-by: Tudor Ambarus +Reviewed-by: Esben Haabendal +Reviewed-by: Pratyush Yadav +Signed-off-by: Pratyush Yadav +Link: https://lore.kernel.org/r/20240621120929.2670185-1-mwalle@kernel.org +Link: https://lore.kernel.org/r/20240621120929.2670185-1-mwalle@kernel.org +[Backported to v6.6 - vastly different due to upstream changes] +Reviewed-by: Tudor Ambarus +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/spi-nor/winbond.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/mtd/spi-nor/winbond.c ++++ b/drivers/mtd/spi-nor/winbond.c +@@ -120,9 +120,10 @@ static const struct flash_info winbond_n + 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 }, diff --git a/queue-6.1/series b/queue-6.1/series index ec7dd69c1d0..2010b2af13f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -118,3 +118,4 @@ nilfs2-fix-kernel-bug-due-to-missing-clearing-of-checked-flag.patch wifi-iwlwifi-mvm-fix-6-ghz-scan-construction.patch mm-shmem-fix-data-race-in-shmem_getattr.patch loongarch-fix-build-errors-due-to-backported-timens.patch +mtd-spi-nor-winbond-fix-w25q128-regression.patch