This is a note to let you know that I've just added the patch titled
mtd: spi-nor: sfdp: Fix index value for SCCR dwords
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mtd-spi-nor-sfdp-fix-index-value-for-sccr-dwords.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ad9679f3811899fd1c21dc7bdd715e8e1cfb46b9 Mon Sep 17 00:00:00 2001
From: Takahiro Kuwano <Takahiro.Kuwano@xxxxxxxxxxxx>
Date: Mon, 26 Dec 2022 13:01:58 +0900
Subject: mtd: spi-nor: sfdp: Fix index value for SCCR dwords
From: Takahiro Kuwano <Takahiro.Kuwano@xxxxxxxxxxxx>
commit ad9679f3811899fd1c21dc7bdd715e8e1cfb46b9 upstream.
Array index for SCCR 22th DOWRD should be 21.
Fixes: 981a8d60e01f ("mtd: spi-nor: Parse SFDP SCCR Map")
Signed-off-by: Takahiro Kuwano <Takahiro.Kuwano@xxxxxxxxxxxx>
Signed-off-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxx>
Reviewed-by: Michael Walle <michael@xxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/d8a2a77c2c95cf776e7dcae6392d29fdcf5d6307.1672026365.git.Takahiro.Kuwano@xxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mtd/spi-nor/sfdp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/mtd/spi-nor/sfdp.c
+++ b/drivers/mtd/spi-nor/sfdp.c
@@ -1220,7 +1220,7 @@ static int spi_nor_parse_sccr(struct spi
le32_to_cpu_array(dwords, sccr_header->length);
- if (FIELD_GET(SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE, dwords[22]))
+ if (FIELD_GET(SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE, dwords[21]))
nor->flags |= SNOR_F_IO_MODE_EN_VOLATILE;
out:
Patches currently in stable-queue which might be from Takahiro.Kuwano@xxxxxxxxxxxx are
queue-5.15/mtd-spi-nor-sfdp-fix-index-value-for-sccr-dwords.patch
queue-5.15/mtd-spi-nor-spansion-consider-reserved-bits-in-cfr5-register.patch
