On Tue, Oct 29, 2024 at 11:01:45AM +0100, Linus Walleij wrote:
> From: Michael Walle <mwalle@xxxxxxxxxx>
>
> Upstream commit d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901
>
> ("mtd: spi-nor: winbond: fix w25q128 regression")
> however the code has changed a lot after v6.6 so the patch did
> not apply to v6.6 or v6.1 which still has the problem.
>
> This patch fixes the issue in the way of the old API and has
> been tested on hardware. Please apply it for v6.1 and v6.6.
>
> 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 <e9hack@xxxxxxxxx>
> Closes: https://lore.kernel.org/r/CALxbwRo_-9CaJmt7r7ELgu+vOcgk=xZcGHobnKf=oT2=u4d4aA@xxxxxxxxxxxxxx/
> Fixes: 83e824a4a595 ("mtd: spi-nor: Correct flags for Winbond w25q128")
> Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> Signed-off-by: Michael Walle <mwalle@xxxxxxxxxx>
> Acked-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxx>
> Reviewed-by: Esben Haabendal <esben@xxxxxxxxxx>
> Reviewed-by: Pratyush Yadav <pratyush@xxxxxxxxxx>
> Signed-off-by: Pratyush Yadav <pratyush@xxxxxxxxxx>
> Link: https://lore.kernel.org/r/20240621120929.2670185-1-mwalle@xxxxxxxxxx
> [Backported to v6.6 - vastly different due to upstream changes]
> Reviewed-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxx>
> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
> ---
> This fix backported to stable v6.6 and v6.1 after reports
> from OpenWrt users:
> https://github.com/openwrt/openwrt/issues/16796
> ---
> Changes in v2:
> - Use the right upstream committ ID (dunno what happened)
> - Put the commit ID on top on the desired format.
> - Link to v1: https://lore.kernel.org/r/20241028-v6-6-v1-1-991446d71bb7@xxxxxxxxxx
> ---
> drivers/mtd/spi-nor/winbond.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
Now queued up, thanks.
greg k-h
