diff mbox

[linux,dev-4.7] mtd: spi-nor: add SECT_4K to mx25l25635e

Message ID 1477039467-25076-1-git-send-email-clg@kaod.org
State Accepted, archived
Headers show

Commit Message

Cédric Le Goater Oct. 21, 2016, 8:44 a.m. UTC
The current setting is to erase blocks (64KB) but the chip supports
sector (4KB) erase and it is currently a problem to erase "partitions"
which are smaller than the block size (64KB), the GUARD partition for
instance.
 
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 drivers/mtd/spi-nor/spi-nor.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Cédric Le Goater Oct. 21, 2016, 9:52 a.m. UTC | #1
On 10/21/2016 10:44 AM, Cédric Le Goater wrote:
> The current setting is to erase blocks (64KB) but the chip supports
> sector (4KB) erase and it is currently a problem to erase "partitions"
> which are smaller than the block size (64KB), the GUARD partition for
> instance.

There are few other macronixs that would need a similar change but 
this has an impact on existing jffs2 filesystems on the flash. I am 
not sure we will be able to merge this change in mainline.

C.


> Signed-off-by: Cédric Le Goater <clg@kaod.org>
> ---
>  drivers/mtd/spi-nor/spi-nor.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-openbmc-4.7.git/drivers/mtd/spi-nor/spi-nor.c
> ===================================================================
> --- linux-openbmc-4.7.git.orig/drivers/mtd/spi-nor/spi-nor.c
> +++ linux-openbmc-4.7.git/drivers/mtd/spi-nor/spi-nor.c
> @@ -855,7 +855,7 @@ static const struct flash_info spi_nor_i
>  	{ "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
>  	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
>  	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
> -	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
> +	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SECT_4K) },
>  	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
>  	{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) },
>  	{ "mx66l1g45g",  INFO(0xc2201b, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_QUAD_READ) },
>
Joel Stanley Oct. 25, 2016, 12:11 p.m. UTC | #2
On Fri, Oct 21, 2016 at 8:22 PM, Cédric Le Goater <clg@kaod.org> wrote:
> On 10/21/2016 10:44 AM, Cédric Le Goater wrote:
>> The current setting is to erase blocks (64KB) but the chip supports
>> sector (4KB) erase and it is currently a problem to erase "partitions"
>> which are smaller than the block size (64KB), the GUARD partition for
>> instance.
>
> There are few other macronixs that would need a similar change but
> this has an impact on existing jffs2 filesystems on the flash. I am
> not sure we will be able to merge this change in mainline.

We reverted this one in [1] as it was breaking JFFS2 [2] as you predicted.

[1] https://gerrit.openbmc-project.xyz/#/c/892/
[2] https://github.com/openbmc/openbmc/issues/701

Cheers,

Joel
diff mbox

Patch

Index: linux-openbmc-4.7.git/drivers/mtd/spi-nor/spi-nor.c
===================================================================
--- linux-openbmc-4.7.git.orig/drivers/mtd/spi-nor/spi-nor.c
+++ linux-openbmc-4.7.git/drivers/mtd/spi-nor/spi-nor.c
@@ -855,7 +855,7 @@  static const struct flash_info spi_nor_i
 	{ "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
-	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
+	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, SECT_4K) },
 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
 	{ "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, SPI_NOR_QUAD_READ) },
 	{ "mx66l1g45g",  INFO(0xc2201b, 0, 64 * 1024, 2048, SECT_4K | SPI_NOR_QUAD_READ) },