[PATCH v3] mtd: spinand: macronix: Fix MX35LFxGE4AD page size

[PATCH v3] mtd: spinand: macronix: Fix MX35LFxGE4AD page size

[Jaime Liao]

From: JaimeLiao <jaimeliao@mxic.com.tw>

Support for MX35LF{2,4}GE4AD chips was added in mainline through
upstream commit 5ece78de88739b4c68263e9f2582380c1fd8314f.

The patch was later adapted to 5.4.y and backported through
stable commit 85258ae3070848d9d0f6fbee385be2db80e8cf26.

Fix the backport mentioned right above as it is wrong: the bigger chip
features 4kiB pages and not 2kiB pages.

Fixes: 85258ae30708 ("mtd: spinand: macronix: Add support for MX35LFxGE4AD")
Cc: stable@vger.kernel.org # v5.4.y
Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: JaimeLiao <jaimeliao@mxic.com.tw>
---
Hello,

This is my third attempt to fix a stable kernel. This patch is not a
backport from Linus' tree per-se, but a fix of a backport. The original
mainline commit is fine but the backported one is not, we need to fix
the backported commit in the 5.4.y stable kernel, and this is what I am
attempting to do. Let me know if further explanations are needed.

Regards,
Jaime
---
 drivers/mtd/nand/spi/macronix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
index bbb1d68bce4a..f18c6cfe8ff5 100644
--- a/drivers/mtd/nand/spi/macronix.c
+++ b/drivers/mtd/nand/spi/macronix.c
@@ -125,7 +125,7 @@ static const struct spinand_info macronix_spinand_table[] = {
 		     SPINAND_HAS_QE_BIT,
 		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
 	SPINAND_INFO("MX35LF4GE4AD", 0x37,
-		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
+		     NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1),
 		     NAND_ECCREQ(8, 512),
 		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
 					      &write_cache_variants,
-- 
2.25.1

Re: [PATCH v3] mtd: spinand: macronix: Fix MX35LFxGE4AD page size

[Miquel Raynal]

Hi Jaime,

+ linux-mtd which was missing to your contribution.

jaimeliao.tw@gmail.com wrote on Thu, 25 Jan 2024 10:48:16 +0800:

> From: JaimeLiao <jaimeliao@mxic.com.tw>
> 
> Support for MX35LF{2,4}GE4AD chips was added in mainline through
> upstream commit 5ece78de88739b4c68263e9f2582380c1fd8314f.
> 
> The patch was later adapted to 5.4.y and backported through
> stable commit 85258ae3070848d9d0f6fbee385be2db80e8cf26.
> 
> Fix the backport mentioned right above as it is wrong: the bigger chip
> features 4kiB pages and not 2kiB pages.
> 
> Fixes: 85258ae30708 ("mtd: spinand: macronix: Add support for MX35LFxGE4AD")
> Cc: stable@vger.kernel.org # v5.4.y
> Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> Signed-off-by: JaimeLiao <jaimeliao@mxic.com.tw>

Looks legitimate.

Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>

> ---
> Hello,
> 
> This is my third attempt to fix a stable kernel. This patch is not a
> backport from Linus' tree per-se, but a fix of a backport. The original
> mainline commit is fine but the backported one is not, we need to fix
> the backported commit in the 5.4.y stable kernel, and this is what I am
> attempting to do. Let me know if further explanations are needed.
> 
> Regards,
> Jaime
> ---
>  drivers/mtd/nand/spi/macronix.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
> index bbb1d68bce4a..f18c6cfe8ff5 100644
> --- a/drivers/mtd/nand/spi/macronix.c
> +++ b/drivers/mtd/nand/spi/macronix.c
> @@ -125,7 +125,7 @@ static const struct spinand_info macronix_spinand_table[] = {
>  		     SPINAND_HAS_QE_BIT,
>  		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
>  	SPINAND_INFO("MX35LF4GE4AD", 0x37,
> -		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
> +		     NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1),
>  		     NAND_ECCREQ(8, 512),
>  		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
>  					      &write_cache_variants,


Thanks,
Miquèl

Re: [PATCH v3] mtd: spinand: macronix: Fix MX35LFxGE4AD page size

[Greg KH]

On Thu, Jan 25, 2024 at 10:08:20AM +0100, Miquel Raynal wrote:
> Hi Jaime,
> 
> + linux-mtd which was missing to your contribution.
> 
> jaimeliao.tw@gmail.com wrote on Thu, 25 Jan 2024 10:48:16 +0800:
> 
> > From: JaimeLiao <jaimeliao@mxic.com.tw>
> > 
> > Support for MX35LF{2,4}GE4AD chips was added in mainline through
> > upstream commit 5ece78de88739b4c68263e9f2582380c1fd8314f.
> > 
> > The patch was later adapted to 5.4.y and backported through
> > stable commit 85258ae3070848d9d0f6fbee385be2db80e8cf26.
> > 
> > Fix the backport mentioned right above as it is wrong: the bigger chip
> > features 4kiB pages and not 2kiB pages.
> > 
> > Fixes: 85258ae30708 ("mtd: spinand: macronix: Add support for MX35LFxGE4AD")
> > Cc: stable@vger.kernel.org # v5.4.y
> > Cc: Miquel Raynal <miquel.raynal@bootlin.com>
> > Signed-off-by: JaimeLiao <jaimeliao@mxic.com.tw>
> 
> Looks legitimate.
> 
> Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
> 
> > ---
> > Hello,
> > 
> > This is my third attempt to fix a stable kernel. This patch is not a
> > backport from Linus' tree per-se, but a fix of a backport. The original
> > mainline commit is fine but the backported one is not, we need to fix
> > the backported commit in the 5.4.y stable kernel, and this is what I am
> > attempting to do. Let me know if further explanations are needed.
> > 
> > Regards,
> > Jaime
> > ---
> >  drivers/mtd/nand/spi/macronix.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c
> > index bbb1d68bce4a..f18c6cfe8ff5 100644
> > --- a/drivers/mtd/nand/spi/macronix.c
> > +++ b/drivers/mtd/nand/spi/macronix.c
> > @@ -125,7 +125,7 @@ static const struct spinand_info macronix_spinand_table[] = {
> >  		     SPINAND_HAS_QE_BIT,
> >  		     SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)),
> >  	SPINAND_INFO("MX35LF4GE4AD", 0x37,
> > -		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
> > +		     NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1),
> >  		     NAND_ECCREQ(8, 512),
> >  		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
> >  					      &write_cache_variants,
> 
> 
> Thanks,
> Miquèl
> 

Now queued up, thanks.

greg k-h