Patch "mtd: spi-nor: Fix address width on flash chips > 16MB" has been added to the 5.9-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    mtd: spi-nor: Fix address width on flash chips > 16MB

to the 5.9-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-fix-address-width-on-flash-chips-16mb.patch
and it can be found in the queue-5.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8438202b95b0fa25e2ed0f8eb044476494ee61a1
Author: Bert Vermeulen <bert@xxxxxxxx>
Date:   Tue Oct 6 15:23:46 2020 +0200

    mtd: spi-nor: Fix address width on flash chips > 16MB
    
    [ Upstream commit 324f78dfb442b82365548b657ec4e6974c677502 ]
    
    If a flash chip has more than 16MB capacity but its BFPT reports
    BFPT_DWORD1_ADDRESS_BYTES_3_OR_4, the spi-nor framework defaults to 3.
    
    The check in spi_nor_set_addr_width() doesn't catch it because addr_width
    did get set. This fixes that check.
    
    Fixes: f9acd7fa80be ("mtd: spi-nor: sfdp: default to addr_width of 3 for configurable widths")
    Signed-off-by: Bert Vermeulen <bert@xxxxxxxx>
    Signed-off-by: Vignesh Raghavendra <vigneshr@xxxxxx>
    Reviewed-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx>
    Reviewed-by: Pratyush Yadav <p.yadav@xxxxxx>
    Reviewed-by: Joel Stanley <joel@xxxxxxxxx>
    Reviewed-by: Cédric Le Goater <clg@xxxxxxxx>
    Tested-by: Joel Stanley <joel@xxxxxxxxx>
    Tested-by: Cédric Le Goater <clg@xxxxxxxx>
    Link: https://lore.kernel.org/r/20201006132346.12652-1-bert@xxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index b37d6c1936de1..f0ae7a01703a1 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -3008,13 +3008,15 @@ static int spi_nor_set_addr_width(struct spi_nor *nor)
 		/* already configured from SFDP */
 	} else if (nor->info->addr_width) {
 		nor->addr_width = nor->info->addr_width;
-	} else if (nor->mtd.size > 0x1000000) {
-		/* enable 4-byte addressing if the device exceeds 16MiB */
-		nor->addr_width = 4;
 	} else {
 		nor->addr_width = 3;
 	}
 
+	if (nor->addr_width == 3 && nor->mtd.size > 0x1000000) {
+		/* enable 4-byte addressing if the device exceeds 16MiB */
+		nor->addr_width = 4;
+	}
+
 	if (nor->addr_width > SPI_NOR_MAX_ADDR_WIDTH) {
 		dev_dbg(nor->dev, "address width is too large: %u\n",
 			nor->addr_width);