sf: Add bank addr code in CONFIG_SPI_FLASH_BAR

Defined bank addr code on CONFIG_SPI_FLASH_BAR macro, to reduce the
size for existing boards which has < 16Mbytes SPI flashes.

It's upto user which has provision to use the bank addr code for
flashes which has > 16Mbytes.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index cd0336c3c887a2efdaac7c4c8ed3092f2b08e276..6db33c46d19a4550873607af3d02eba1d55839e4 100644 (file)
--- a/README
+++ b/README
@@ -2509,6 +2509,11 @@ CBFS (Coreboot Filesystem) support
                Define this option to include a destructive SPI flash
                test ('sf test').
 
+               CONFIG_SPI_FLASH_BAR            Ban/Extended Addr Reg
+
+               Define this option to use the Bank addr/Extended addr
+               support on SPI flashes which has size > 16Mbytes.
+
 - SystemACE Support:
                CONFIG_SYSTEMACE
 

diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c
index 562f6adb58f9070b5d4986e5574964fd31f17129..f05f8f4d9faae7e18c83c35bb40ec4e798092e50 100644 (file)
--- a/drivers/mtd/spi/spi_flash.c
+++ b/drivers/mtd/spi/spi_flash.c
@@ -74,7 +74,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
        unsigned long page_addr, byte_addr, page_size;
        size_t chunk_len, actual;
        int ret;
-       u8 cmd[4], bank_sel;
+       u8 cmd[4];
 
        page_size = flash->page_size;
 
@@ -86,6 +86,9 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
 
        cmd[0] = CMD_PAGE_PROGRAM;
        for (actual = 0; actual < len; actual += chunk_len) {
+#ifdef CONFIG_SPI_FLASH_BAR
+               u8 bank_sel;
+
                bank_sel = offset / SPI_FLASH_16MB_BOUN;
 
                ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
@@ -93,7 +96,7 @@ int spi_flash_cmd_write_multi(struct spi_flash *flash, u32 offset,
                        debug("SF: fail to set bank%d\n", bank_sel);
                        return ret;
                }
-
+#endif
                page_addr = offset / page_size;
                byte_addr = offset % page_size;
                chunk_len = min(len - actual, page_size - byte_addr);
@@ -148,7 +151,7 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
 int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset,
                size_t len, void *data)
 {
-       u8 cmd[5], bank_sel;
+       u8 cmd[5], bank_sel = 0;
        u32 remain_len, read_len;
        int ret = -1;
 
@@ -162,6 +165,7 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset,
        cmd[4] = 0x00;
 
        while (len) {
+#ifdef CONFIG_SPI_FLASH_BAR
                bank_sel = offset / SPI_FLASH_16MB_BOUN;
 
                ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
@@ -169,7 +173,7 @@ int spi_flash_cmd_read_fast(struct spi_flash *flash, u32 offset,
                        debug("SF: fail to set bank%d\n", bank_sel);
                        return ret;
                }
-
+#endif
                remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1) - offset);
                if (len < remain_len)
                        read_len = len;
@@ -240,7 +244,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
 {
        u32 erase_size;
        int ret;
-       u8 cmd[4], bank_sel;
+       u8 cmd[4];
 
        erase_size = flash->sector_size;
        if (offset % erase_size || len % erase_size) {
@@ -260,6 +264,9 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
                cmd[0] = CMD_ERASE_64K;
 
        while (len) {
+#ifdef CONFIG_SPI_FLASH_BAR
+               u8 bank_sel;
+
                bank_sel = offset / SPI_FLASH_16MB_BOUN;
 
                ret = spi_flash_cmd_bankaddr_write(flash, bank_sel);
@@ -267,7 +274,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u32 offset, size_t len)
                        debug("SF: fail to set bank%d\n", bank_sel);
                        return ret;
                }
-
+#endif
                spi_flash_addr(offset, cmd);
 
                debug("SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],
@@ -321,6 +328,7 @@ int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr)
        return 0;
 }
 
+#ifdef CONFIG_SPI_FLASH_BAR
 int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel)
 {
        u8 cmd;
@@ -389,6 +397,7 @@ int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0)
 
        return 0;
 }
+#endif
 
 #ifdef CONFIG_OF_CONTROL
 int spi_flash_decode_fdt(const void *blob, struct spi_flash *flash)
@@ -534,10 +543,12 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
                goto err_manufacturer_probe;
        }
 
+#ifdef CONFIG_SPI_FLASH_BAR
        /* Configure the BAR - disover bank cmds and read current bank  */
        ret = spi_flash_bank_config(flash, *idp);
        if (ret < 0)
                goto err_manufacturer_probe;
+#endif
 
 #ifdef CONFIG_OF_CONTROL
        if (spi_flash_decode_fdt(gd->fdt_blob, flash)) {

diff --git a/drivers/mtd/spi/spi_flash_internal.h b/drivers/mtd/spi/spi_flash_internal.h
index 00ed1ee79bdca939835f825e904a821805594ecd..e613ef3ab7d02d06b1fadbac7e25253092ada4c0 100644 (file)
--- a/drivers/mtd/spi/spi_flash_internal.h
+++ b/drivers/mtd/spi/spi_flash_internal.h
@@ -35,11 +35,13 @@
 #define SPI_FLASH_STMICRO_IDCODE0      0x20
 #define SPI_FLASH_WINBOND_IDCODE0      0xef
 
+#ifdef CONFIG_SPI_FLASH_BAR
 /* Bank addr access commands */
-#define CMD_BANKADDR_BRWR              0x17
-#define CMD_BANKADDR_BRRD              0x16
-#define CMD_EXTNADDR_WREAR             0xC5
-#define CMD_EXTNADDR_RDEAR             0xC8
+# define CMD_BANKADDR_BRWR             0x17
+# define CMD_BANKADDR_BRRD             0x16
+# define CMD_EXTNADDR_WREAR            0xC5
+# define CMD_EXTNADDR_RDEAR            0xC8
+#endif
 
 /* Common status */
 #define STATUS_WIP                     0x01
@@ -90,11 +92,13 @@ static inline int spi_flash_cmd_write_disable(struct spi_flash *flash)
 /* Program the status register. */
 int spi_flash_cmd_write_status(struct spi_flash *flash, u8 sr);
 
+#ifdef CONFIG_SPI_FLASH_BAR
 /* Program the bank address register */
 int spi_flash_cmd_bankaddr_write(struct spi_flash *flash, u8 bank_sel);
 
 /* Configure the BAR - discover the bank cmds */
 int spi_flash_bank_config(struct spi_flash *flash, u8 idcode0);
+#endif
 
 /*
  * Same as spi_flash_cmd_read() except it also claims/releases the SPI

diff --git a/include/spi_flash.h b/include/spi_flash.h
index 91b43ee9df3a4b64cd017cb439653b5aa50cd9aa..e22d698af425bd0ef6e06a73faee4a94bb2deecd 100644 (file)
--- a/include/spi_flash.h
+++ b/include/spi_flash.h
@@ -38,13 +38,14 @@ struct spi_flash {
        u32             page_size;
        /* Erase (sector) size */
        u32             sector_size;
+#ifdef CONFIG_SPI_FLASH_BAR
        /* Bank read cmd */
        u8              bank_read_cmd;
        /* Bank write cmd */
        u8              bank_write_cmd;
        /* Current flash bank */
        u8              bank_curr;
-
+#endif
        void *memory_map;       /* Address of read-only SPI flash access */
        int             (*read)(struct spi_flash *flash, u32 offset,
                                size_t len, void *buf);