1 From 3af3addee645bd81537be1ddee49969f8dfc64ee Mon Sep 17 00:00:00 2001
2 From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
3 Date: Sun, 13 Oct 2013 15:24:56 +0200
4 Subject: sf: add support for 4-byte addressing
6 Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
8 diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h
9 index 732ddf8..c5e8eb1 100644
10 --- a/drivers/mtd/spi/sf_internal.h
11 +++ b/drivers/mtd/spi/sf_internal.h
13 #define CMD_READ_ID 0x9f
15 /* Bank addr access commands */
16 -#ifdef CONFIG_SPI_FLASH_BAR
17 -# define CMD_BANKADDR_BRWR 0x17
18 -# define CMD_BANKADDR_BRRD 0x16
19 -# define CMD_EXTNADDR_WREAR 0xC5
20 -# define CMD_EXTNADDR_RDEAR 0xC8
22 +#define CMD_BANKADDR_BRWR 0x17
23 +#define CMD_BANKADDR_BRRD 0x16
24 +#define CMD_EXTNADDR_WREAR 0xC5
25 +#define CMD_EXTNADDR_RDEAR 0xC8
27 +/* Macronix style 4-byte addressing */
28 +#define CMD_EN4B 0xb7
29 +#define CMD_EX4B 0xe9
32 #define STATUS_WIP 0x01
33 diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
34 index 207adf5..1d072f8 100644
35 --- a/drivers/mtd/spi/sf_ops.c
36 +++ b/drivers/mtd/spi/sf_ops.c
37 @@ -21,6 +21,7 @@ static void spi_flash_addr(const struct spi_flash *flash, u32 addr, u8 *cmd)
38 cmd[1] = addr >> (flash->addr_width * 8 - 8);
39 cmd[2] = addr >> (flash->addr_width * 8 - 16);
40 cmd[3] = addr >> (flash->addr_width * 8 - 24);
41 + cmd[4] = addr >> (flash->addr_width * 8 - 32);
44 static int spi_flash_cmdsz(const struct spi_flash *flash)
45 @@ -163,7 +164,7 @@ int spi_flash_write_common(struct spi_flash *flash, const u8 *cmd,
46 int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
53 erase_size = flash->erase_size;
54 @@ -188,8 +189,8 @@ int spi_flash_cmd_erase_ops(struct spi_flash *flash, u32 offset, size_t len)
55 spi_flash_addr(flash, offset, cmd);
56 cmd_len = spi_flash_cmdsz(flash);
58 - debug("SF: erase %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],
59 - cmd[2], cmd[3], offset);
60 + debug("SF: erase %2x %2x %2x %2x %2x (%x)\n", cmd[0], cmd[1],
61 + cmd[2], cmd[3], cmd[4], offset);
63 ret = spi_flash_write_common(flash, cmd, cmd_len, NULL, 0);
65 @@ -212,7 +213,7 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
67 unsigned long byte_addr, page_size;
68 size_t chunk_len, actual;
73 ret = spi_claim_bus(flash->spi);
74 @@ -239,8 +240,8 @@ int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
75 spi_flash_addr(flash, offset, cmd);
76 cmd_len = spi_flash_cmdsz(flash);
78 - debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
79 - buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
80 + debug("PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x%02x } chunk_len = %zu\n",
81 + buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], chunk_len);
83 ret = spi_flash_write_common(flash, cmd, cmd_len,
84 buf + actual, chunk_len);
85 @@ -276,9 +277,13 @@ int spi_flash_read_common(struct spi_flash *flash, const u8 *cmd,
86 int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
87 size_t len, void *data)
89 - u8 cmd[5], cmd_len, bank_sel = 0;
90 - u32 remain_len, read_len;
94 +#ifdef CONFIG_SPI_FLASH_BAR
99 ret = spi_claim_bus(flash->spi);
101 @@ -305,12 +310,15 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
102 debug("SF: fail to set bank%d\n", bank_sel);
107 remain_len = (SPI_FLASH_16MB_BOUN * (bank_sel + 1)) - offset;
108 if (len < remain_len)
111 read_len = remain_len;
116 spi_flash_addr(flash, offset, cmd);
117 cmd_len = spi_flash_cmdsz(flash);
118 diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c
119 index 84289db..ac44287 100644
120 --- a/drivers/mtd/spi/sf_probe.c
121 +++ b/drivers/mtd/spi/sf_probe.c
122 @@ -153,6 +153,25 @@ static const struct spi_flash_params spi_flash_params_table[] = {
126 +int spi_flash_4byte_set(struct spi_flash *flash, u8 idcode0, int enable)
134 + /* Macronix style */
135 + cmd = enable ? CMD_EN4B : CMD_EX4B;
136 + return spi_flash_cmd(flash->spi, cmd, NULL, 0);
138 + /* Spansion style */
139 + cmd = CMD_BANKADDR_BRWR;
140 + bankaddr = enable << 7;
141 + return spi_flash_cmd_write(flash->spi, &cmd, 1, &bankaddr, 1);
145 static int spi_flash_validate_params(struct spi_flash *flash,
148 @@ -218,8 +237,18 @@ static int spi_flash_validate_params(struct spi_flash *flash,
149 flash->poll_cmd = CMD_FLAG_STATUS;
152 +#ifndef CONFIG_SPI_FLASH_BAR
153 + /* enable 4-byte addressing if the device exceeds 16MiB */
154 + if (flash->size > SPI_FLASH_16MB_BOUN) {
155 + flash->addr_width = 4;
156 + spi_flash_4byte_set(flash, idcode[0], 1);
158 + flash->addr_width = 3;
161 /* Configure default 3-byte addressing */
162 flash->addr_width = 3;
165 /* Configure the BAR - discover bank cmds and read current bank */
166 #ifdef CONFIG_SPI_FLASH_BAR