sf: unify write funcs

Once we add a new page_size field for write lengths, we can unify the
write methods for most of the spi flash drivers.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c
index 682670892aae72145eef805b9ffa28dad5f04b86..036855b197ebbabd52646191b5233cf51e63f230 100644 (file)
--- a/drivers/mtd/spi/eon.c
+++ b/drivers/mtd/spi/eon.c
@@ -56,69 +56,6 @@ static const struct eon_spi_flash_params eon_spi_flash_table[] = {
        },
 };
 
-static int eon_write(struct spi_flash *flash,
-                    u32 offset, size_t len, const void *buf)
-{
-       struct eon_spi_flash *eon = to_eon_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long byte_addr;
-       unsigned long page_size;
-       size_t chunk_len;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-       page_size = eon->params->page_size;
-       page_addr = offset / page_size;
-       byte_addr = offset % page_size;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = 0;
-       for (actual = 0; actual < len; actual += chunk_len) {
-               chunk_len = min(len - actual, page_size - byte_addr);
-
-               cmd[0] = CMD_EN25Q128_PP;
-               cmd[1] = page_addr >> 8;
-               cmd[2] = page_addr;
-               cmd[3] = byte_addr;
-
-               debug
-                   ("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %d\n",
-                    buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
-
-               ret = spi_flash_cmd_write_enable(flash);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-                                         buf + actual, chunk_len);
-               if (ret < 0) {
-                       debug("SF: EON Page Program failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret)
-                       break;
-
-               page_addr++;
-               byte_addr = 0;
-       }
-
-       debug("SF: EON: Successfully programmed %u bytes @ 0x%x\n",
-             len, offset);
-
-       spi_release_bus(flash->spi);
-       return ret;
-}
-
 static int eon_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        return spi_flash_cmd_erase(flash, CMD_EN25Q128_BE, offset, len);
@@ -151,9 +88,10 @@ struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
        eon->flash.spi = spi;
        eon->flash.name = params->name;
 
-       eon->flash.write = eon_write;
+       eon->flash.write = spi_flash_cmd_write_multi;
        eon->flash.erase = eon_erase;
        eon->flash.read = spi_flash_cmd_read_fast;
+       eon->flash.page_size = params->page_size;
        eon->flash.sector_size = params->page_size * params->pages_per_sector
            * params->sectors_per_block;
        eon->flash.size = params->page_size * params->pages_per_sector

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index 8dacefecb5d3ed3a49b5683a79f3521ee0c24df9..0a56420300d48033d1380160e060c3e4062fd8e1 100644 (file)
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -112,69 +112,6 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
        },
 };
 
-static int macronix_write(struct spi_flash *flash,
-                         u32 offset, size_t len, const void *buf)
-{
-       struct macronix_spi_flash *mcx = to_macronix_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long byte_addr;
-       unsigned long page_size;
-       size_t chunk_len;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-       page_size = mcx->params->page_size;
-       page_addr = offset / page_size;
-       byte_addr = offset % page_size;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = 0;
-       for (actual = 0; actual < len; actual += chunk_len) {
-               chunk_len = min(len - actual, page_size - byte_addr);
-
-               cmd[0] = CMD_MX25XX_PP;
-               cmd[1] = page_addr >> 8;
-               cmd[2] = page_addr;
-               cmd[3] = byte_addr;
-
-               debug
-                   ("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %d\n",
-                    buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
-
-               ret = spi_flash_cmd_write_enable(flash);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-                                         buf + actual, chunk_len);
-               if (ret < 0) {
-                       debug("SF: Macronix Page Program failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret)
-                       break;
-
-               page_addr++;
-               byte_addr = 0;
-       }
-
-       debug("SF: Macronix: Successfully programmed %u bytes @ 0x%x\n",
-             len, offset);
-
-       spi_release_bus(flash->spi);
-       return ret;
-}
-
 static int macronix_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        return spi_flash_cmd_erase(flash, CMD_MX25XX_BE, offset, len);
@@ -208,9 +145,10 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
        mcx->flash.spi = spi;
        mcx->flash.name = params->name;
 
-       mcx->flash.write = macronix_write;
+       mcx->flash.write = spi_flash_cmd_write_multi;
        mcx->flash.erase = macronix_erase;
        mcx->flash.read = spi_flash_cmd_read_fast;
+       mcx->flash.page_size = params->page_size;
        mcx->flash.sector_size = params->page_size * params->pages_per_sector
                * params->sectors_per_block;
        mcx->flash.size = mcx->flash.sector_size * params->nr_blocks;

diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c
index fa4cca162df8ebffd40f8c5c8075156a113c2b65..b219b3cace3aa357cb70e92b575a26876f25ea59 100644 (file)
--- a/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@ -133,69 +133,6 @@ static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
        },
 };
 
-static int spansion_write(struct spi_flash *flash,
-                        u32 offset, size_t len, const void *buf)
-{
-       struct spansion_spi_flash *spsn = to_spansion_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long byte_addr;
-       unsigned long page_size;
-       size_t chunk_len;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-       page_size = spsn->params->page_size;
-       page_addr = offset / page_size;
-       byte_addr = offset % page_size;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = 0;
-       for (actual = 0; actual < len; actual += chunk_len) {
-               chunk_len = min(len - actual, page_size - byte_addr);
-
-               cmd[0] = CMD_S25FLXX_PP;
-               cmd[1] = page_addr >> 8;
-               cmd[2] = page_addr;
-               cmd[3] = byte_addr;
-
-               debug
-                   ("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %d\n",
-                    buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
-
-               ret = spi_flash_cmd_write_enable(flash);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-                                         buf + actual, chunk_len);
-               if (ret < 0) {
-                       debug("SF: SPANSION Page Program failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret)
-                       break;
-
-               page_addr++;
-               byte_addr = 0;
-       }
-
-       debug("SF: SPANSION: Successfully programmed %u bytes @ 0x%x\n",
-             len, offset);
-
-       spi_release_bus(flash->spi);
-       return ret;
-}
-
 static int spansion_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        return spi_flash_cmd_erase(flash, CMD_S25FLXX_SE, offset, len);
@@ -234,9 +171,10 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
        spsn->flash.spi = spi;
        spsn->flash.name = params->name;
 
-       spsn->flash.write = spansion_write;
+       spsn->flash.write = spi_flash_cmd_write_multi;
        spsn->flash.erase = spansion_erase;
        spsn->flash.read = spi_flash_cmd_read_fast;
+       spsn->flash.page_size = params->page_size;
        spsn->flash.sector_size = params->page_size * params->pages_per_sector;
        spsn->flash.size = spsn->flash.sector_size * params->nr_sectors;
 

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 3e0d02d5a6fc1744c3751b4b6e43b9d1db062eab..730c009dea2ce9467b119080d7b8bf075cb72702 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -65,6 +65,63 @@ int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len,
        return spi_flash_read_write(spi, cmd, cmd_len, data, NULL, data_len);
 }
 
+int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
+               size_t len, const void *buf)
+{
+       unsigned long page_addr, byte_addr, page_size;
+       size_t chunk_len, actual;
+       int ret;
+       u8 cmd[4];
+
+       page_size = flash->page_size;
+       page_addr = offset / page_size;
+       byte_addr = offset % page_size;
+
+       ret = spi_claim_bus(flash->spi);
+       if (ret) {
+               debug("SF: unable to claim SPI bus\n");
+               return ret;
+       }
+
+       cmd[0] = CMD_PAGE_PROGRAM;
+       for (actual = 0; actual < len; actual += chunk_len) {
+               chunk_len = min(len - actual, page_size - byte_addr);
+
+               cmd[1] = page_addr >> 8;
+               cmd[2] = page_addr;
+               cmd[3] = byte_addr;
+
+               debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
+                     buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
+
+               ret = spi_flash_cmd_write_enable(flash);
+               if (ret < 0) {
+                       debug("SF: enabling write failed\n");
+                       break;
+               }
+
+               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
+                                         buf + actual, chunk_len);
+               if (ret < 0) {
+                       debug("SF: write failed\n");
+                       break;
+               }
+
+               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
+               if (ret)
+                       break;
+
+               page_addr++;
+               byte_addr = 0;
+       }
+
+       debug("SF: program %s %zu bytes @ %#x\n",
+             ret ? "failure" : "success", len, offset);
+
+       spi_release_bus(flash->spi);
+       return ret;
+}
+
 int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
                size_t cmd_len, void *data, size_t data_len)
 {

diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h
index 6665bed199b45ff81a0cbdd494f9b32cebde4ef3..f80f71771c1f91a10825413fb82475a61e144dd8 100644 (file)
--- a/drivers/mtd/spi/spi_flash_internal.h
+++ b/drivers/mtd/spi/spi_flash_internal.h
@@ -19,6 +19,7 @@
 #define CMD_READ_ARRAY_FAST            0x0b
 #define CMD_READ_ARRAY_LEGACY          0xe8
 
+#define CMD_PAGE_PROGRAM               0x02
 #define CMD_READ_STATUS                        0x05
 #define CMD_WRITE_ENABLE               0x06
 
@@ -45,6 +46,13 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset,
 int spi_flash_cmd_write(struct spi_slave *spi, const u8 *cmd, size_t cmd_len,
                const void *data, size_t data_len);
 
+/*
+ * Write the requested data out breaking it up into multiple write
+ * commands as needed per the write size.
+ */
+int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
+               size_t len, const void *buf);
+
 /*
  * Enable writing on the SPI flash.
  */

diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c
index 80d97b4bba3fa266d96a042c74ecd310e3a7e6c3..8106e7c9e8eff73024f167c9878f56a8efb3f2ee 100644 (file)
--- a/drivers/mtd/spi/stmicro.c
+++ b/drivers/mtd/spi/stmicro.c
@@ -134,69 +134,6 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
        },
 };
 
-static int stmicro_write(struct spi_flash *flash,
-                        u32 offset, size_t len, const void *buf)
-{
-       struct stmicro_spi_flash *stm = to_stmicro_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long byte_addr;
-       unsigned long page_size;
-       size_t chunk_len;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-       page_size = stm->params->page_size;
-       page_addr = offset / page_size;
-       byte_addr = offset % page_size;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       ret = 0;
-       for (actual = 0; actual < len; actual += chunk_len) {
-               chunk_len = min(len - actual, page_size - byte_addr);
-
-               cmd[0] = CMD_M25PXX_PP;
-               cmd[1] = page_addr >> 8;
-               cmd[2] = page_addr;
-               cmd[3] = byte_addr;
-
-               debug
-                   ("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %d\n",
-                    buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
-
-               ret = spi_flash_cmd_write_enable(flash);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-                                         buf + actual, chunk_len);
-               if (ret < 0) {
-                       debug("SF: STMicro Page Program failed\n");
-                       break;
-               }
-
-               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret)
-                       break;
-
-               page_addr++;
-               byte_addr = 0;
-       }
-
-       debug("SF: STMicro: Successfully programmed %u bytes @ 0x%x\n",
-             len, offset);
-
-       spi_release_bus(flash->spi);
-       return ret;
-}
-
 static int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        return spi_flash_cmd_erase(flash, CMD_M25PXX_SE, offset, len);
@@ -243,9 +180,10 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
        stm->flash.spi = spi;
        stm->flash.name = params->name;
 
-       stm->flash.write = stmicro_write;
+       stm->flash.write = spi_flash_cmd_write_multi;
        stm->flash.erase = stmicro_erase;
        stm->flash.read = spi_flash_cmd_read_fast;
+       stm->flash.page_size = params->page_size;
        stm->flash.sector_size = params->page_size * params->pages_per_sector;
        stm->flash.size = stm->flash.sector_size * params->nr_sectors;
 

diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c
index 10fabf5e33ee6040ffb8230ccea3f9f01ab9ece5..3db0cb02248ba4293fd08d6b410b74971dbed820 100644 (file)
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -105,71 +105,6 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
        },
 };
 
-static int winbond_write(struct spi_flash *flash,
-               u32 offset, size_t len, const void *buf)
-{
-       struct winbond_spi_flash *stm = to_winbond_spi_flash(flash);
-       unsigned long page_addr;
-       unsigned long byte_addr;
-       unsigned long page_size;
-       unsigned int page_shift;
-       size_t chunk_len;
-       size_t actual;
-       int ret;
-       u8 cmd[4];
-
-       page_shift = stm->params->l2_page_size;
-       page_size = (1 << page_shift);
-       page_addr = offset / page_size;
-       byte_addr = offset % page_size;
-
-       ret = spi_claim_bus(flash->spi);
-       if (ret) {
-               debug("SF: Unable to claim SPI bus\n");
-               return ret;
-       }
-
-       for (actual = 0; actual < len; actual += chunk_len) {
-               chunk_len = min(len - actual, page_size - byte_addr);
-
-               cmd[0] = CMD_W25_PP;
-               cmd[1] = page_addr >> (16 - page_shift);
-               cmd[2] = page_addr << (page_shift - 8) | (byte_addr >> 8);
-               cmd[3] = byte_addr;
-               debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %d\n",
-                       buf + actual,
-                       cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
-
-               ret = spi_flash_cmd_write_enable(flash);
-               if (ret < 0) {
-                       debug("SF: Enabling Write failed\n");
-                       goto out;
-               }
-
-               ret = spi_flash_cmd_write(flash->spi, cmd, 4,
-                               buf + actual, chunk_len);
-               if (ret < 0) {
-                       debug("SF: Winbond Page Program failed\n");
-                       goto out;
-               }
-
-               ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-               if (ret)
-                       goto out;
-
-               page_addr++;
-               byte_addr = 0;
-       }
-
-       debug("SF: Winbond: Successfully programmed %u bytes @ 0x%x\n",
-                       len, offset);
-       ret = 0;
-
-out:
-       spi_release_bus(flash->spi);
-       return ret;
-}
-
 static int winbond_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        return spi_flash_cmd_erase(flash, CMD_W25_SE, offset, len);
@@ -207,11 +142,11 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
        /* Assuming power-of-two page size initially. */
        page_size = 1 << params->l2_page_size;
 
-       stm->flash.write = winbond_write;
+       stm->flash.write = spi_flash_cmd_write_multi;
        stm->flash.erase = winbond_erase;
        stm->flash.read = spi_flash_cmd_read_fast;
-       stm->flash.sector_size = (1 << stm->params->l2_page_size) *
-               stm->params->pages_per_sector;
+       stm->flash.page_size = page_size;
+       stm->flash.sector_size = page_size * stm->params->pages_per_sector;
        stm->flash.size = page_size * params->pages_per_sector
                                * params->sectors_per_block
                                * params->nr_blocks;

diff --git a/include/spi_flash.h b/include/spi_flash.h
index a384071fbee4b908eff02cd86db82f15677e0d2d..2671ab55398aed94c97a2893a44b1b6dac06a1a9 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -31,8 +31,11 @@ struct spi_flash {
 
        const char      *name;
 
+       /* Total flash size */
        u32             size;
-
+       /* Write (page) size */
+       u32             page_size;
+       /* Erase (sector) size */
        u32             sector_size;
 
        int             (*read)(struct spi_flash *flash, u32 offset,