generic: mtd: backport SPI_NOR_HAS_LOCK
[openwrt/openwrt.git] / target / linux / layerscape / patches-4.4 / 1103-mtd-spi-nor-Support-R-W-for-S25FS-S-family-flash.patch
1 From 0878404f549021e7fe0a49ae0454cf53fd452add Mon Sep 17 00:00:00 2001
2 From: Yunhui Cui <yunhui.cui@nxp.com>
3 Date: Tue, 2 Feb 2016 12:00:27 +0800
4 Subject: [PATCH 103/113] mtd: spi-nor: Support R/W for S25FS-S family flash
5
6 With the physical sectors combination, S25FS-S family flash
7 requires some special operations for read/write functions.
8
9 Signed-off-by: Yunhui Cui <yunhui.cui@nxp.com>
10 ---
11 drivers/mtd/spi-nor/spi-nor.c | 60 +++++++++++++++++++++++++++++++++++++++++
12 1 file changed, 60 insertions(+)
13
14 --- a/drivers/mtd/spi-nor/spi-nor.c
15 +++ b/drivers/mtd/spi-nor/spi-nor.c
16 @@ -40,6 +40,10 @@
17 #define SPI_NOR_MAX_ID_LEN 6
18 #define SPI_NOR_MAX_ADDR_WIDTH 4
19 #define SPI_NOR_MICRON_WRITE_ENABLE 0x7f
20 +/* Added for S25FS-S family flash */
21 +#define SPINOR_CONFIG_REG3_OFFSET 0x800004
22 +#define CR3V_4KB_ERASE_UNABLE 0x8
23 +#define SPINOR_S25FS_FAMILY_ID 0x81
24
25 struct flash_info {
26 char *name;
27 @@ -74,6 +78,8 @@ struct flash_info {
28 };
29
30 #define JEDEC_MFR(info) ((info)->id[0])
31 +#define EXT_ID(info) ((info)->id[5])
32 +
33
34 static const struct flash_info *spi_nor_match_id(const char *name);
35
36 @@ -786,6 +792,7 @@ static const struct flash_info spi_nor_i
37 */
38 { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
39 { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
40 + { "s25fs256s1", INFO6(0x010219, 0x4d0181, 64 * 1024, 512, 0)},
41 { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
42 { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
43 { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
44 @@ -910,6 +917,53 @@ static const struct flash_info *spi_nor_
45 return ERR_PTR(-ENODEV);
46 }
47
48 +/*
49 + * The S25FS-S family physical sectors may be configured as a
50 + * hybrid combination of eight 4-kB parameter sectors
51 + * at the top or bottom of the address space with all
52 + * but one of the remaining sectors being uniform size.
53 + * The Parameter Sector Erase commands (20h or 21h) must
54 + * be used to erase the 4-kB parameter sectors individually.
55 + * The Sector (uniform sector) Erase commands (D8h or DCh)
56 + * must be used to erase any of the remaining
57 + * sectors, including the portion of highest or lowest address
58 + * sector that is not overlaid by the parameter sectors.
59 + * The uniform sector erase command has no effect on parameter sectors.
60 + */
61 +static int spansion_s25fs_disable_4kb_erase(struct spi_nor *nor)
62 +{
63 + struct fsl_qspi *q;
64 + u32 cr3v_addr = SPINOR_CONFIG_REG3_OFFSET;
65 + u8 cr3v = 0x0;
66 + int ret = 0x0;
67 +
68 + q = nor->priv;
69 +
70 + nor->cmd_buf[2] = cr3v_addr >> 16;
71 + nor->cmd_buf[1] = cr3v_addr >> 8;
72 + nor->cmd_buf[0] = cr3v_addr >> 0;
73 +
74 + ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
75 + if (ret)
76 + return ret;
77 + if (cr3v & CR3V_4KB_ERASE_UNABLE)
78 + return 0;
79 + ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
80 + if (ret)
81 + return ret;
82 + cr3v = CR3V_4KB_ERASE_UNABLE;
83 + nor->program_opcode = SPINOR_OP_SPANSION_WRAR;
84 + nor->write(nor, cr3v_addr, 1, &cr3v);
85 +
86 + ret = nor->read_reg(nor, SPINOR_OP_SPANSION_RDAR, &cr3v, 1);
87 + if (ret)
88 + return ret;
89 + if (!(cr3v & CR3V_4KB_ERASE_UNABLE))
90 + return -EPERM;
91 +
92 + return 0;
93 +}
94 +
95 static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len,
96 size_t *retlen, u_char *buf)
97 {
98 @@ -1248,6 +1302,12 @@ int spi_nor_scan(struct spi_nor *nor, co
99 write_sr(nor, ret);
100 }
101
102 + if (EXT_ID(info) == SPINOR_S25FS_FAMILY_ID) {
103 + ret = spansion_s25fs_disable_4kb_erase(nor);
104 + if (ret)
105 + return ret;
106 + }
107 +
108 if (!mtd->name)
109 mtd->name = dev_name(dev);
110 mtd->priv = nor;