| Message ID | 20200108051343.1939-1-vigneshr@ti.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: spi-nor: Fix selection of 4-byte addressing opcodes on Spansion | expand |
Hi, Vignesh, On Wednesday, January 8, 2020 7:13:43 AM EET Vignesh Raghavendra wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the > content is safe > > mtd->size is still unassigned when running spansion_post_sfdp_fixups() > hook, therefore use nor->params.size to determine the size of flash device. > > This makes sure that 4-byte addressing opcodes are used on Spansion > flashes that are larger than 16MiB and don't have SFDP 4BAIT table > populated. > > Fixes: 92094ebc385e ("mtd: spi-nor: Add spansion_post_sfdp_fixups()") > Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> This fixes a recent bug, so if you want to take it through mtd/fixes you can add: Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> If you want this through spi-nor/next, please let me know and I'll queue it. Cheers, ta > --- > drivers/mtd/spi-nor/spi-nor.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index 1082b6bb1393..cd47f07deff3 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -4783,9 +4783,7 @@ static void spi_nor_info_init_params(struct spi_nor > *nor) > > static void spansion_post_sfdp_fixups(struct spi_nor *nor) > { > - struct mtd_info *mtd = &nor->mtd; > - > - if (mtd->size <= SZ_16M) > + if (nor->params.size <= SZ_16M) > return; > > nor->flags |= SNOR_F_4B_OPCODES; > -- > 2.24.1
Miquel, Please queue this to mtd/fixes. Thanks, ta On Wednesday, January 8, 2020 7:13:43 AM EET Vignesh Raghavendra wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the > content is safe > > mtd->size is still unassigned when running spansion_post_sfdp_fixups() > hook, therefore use nor->params.size to determine the size of flash device. > > This makes sure that 4-byte addressing opcodes are used on Spansion > flashes that are larger than 16MiB and don't have SFDP 4BAIT table > populated. > > Fixes: 92094ebc385e ("mtd: spi-nor: Add spansion_post_sfdp_fixups()") > Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> > --- > drivers/mtd/spi-nor/spi-nor.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index 1082b6bb1393..cd47f07deff3 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -4783,9 +4783,7 @@ static void spi_nor_info_init_params(struct spi_nor > *nor) > > static void spansion_post_sfdp_fixups(struct spi_nor *nor) > { > - struct mtd_info *mtd = &nor->mtd; > - > - if (mtd->size <= SZ_16M) > + if (nor->params.size <= SZ_16M) > return; > > nor->flags |= SNOR_F_4B_OPCODES; > -- > 2.24.1
On Wed, 2020-01-08 at 05:13:43 UTC, Vignesh Raghavendra wrote: > mtd->size is still unassigned when running spansion_post_sfdp_fixups() > hook, therefore use nor->params.size to determine the size of flash device. > > This makes sure that 4-byte addressing opcodes are used on Spansion > flashes that are larger than 16MiB and don't have SFDP 4BAIT table > populated. > > Fixes: 92094ebc385e ("mtd: spi-nor: Add spansion_post_sfdp_fixups()") > Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> > Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/fixes, thanks. Miquel
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 1082b6bb1393..cd47f07deff3 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -4783,9 +4783,7 @@ static void spi_nor_info_init_params(struct spi_nor *nor) static void spansion_post_sfdp_fixups(struct spi_nor *nor) { - struct mtd_info *mtd = &nor->mtd; - - if (mtd->size <= SZ_16M) + if (nor->params.size <= SZ_16M) return; nor->flags |= SNOR_F_4B_OPCODES;
mtd->size is still unassigned when running spansion_post_sfdp_fixups() hook, therefore use nor->params.size to determine the size of flash device. This makes sure that 4-byte addressing opcodes are used on Spansion flashes that are larger than 16MiB and don't have SFDP 4BAIT table populated. Fixes: 92094ebc385e ("mtd: spi-nor: Add spansion_post_sfdp_fixups()") Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com> --- drivers/mtd/spi-nor/spi-nor.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)