1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
From ea92cbb50a78404e29de2cc3999a240615ffb1c8 Mon Sep 17 00:00:00 2001
From: Chuanhong Guo <gch981213@gmail.com>
Date: Mon, 6 Apr 2020 17:58:48 +0800
Subject: [PATCH] mtd: spi-nor: rework broken-flash-reset support
Instead of resetting flash to 3B address on remove hook, this
implementation only enters 4B mode when needed, which prevents
more unexpected reboot stuck. This implementation makes it only
break when a kernel panic happens during flash operation on 16M+
areas.
*OpenWrt only*: silent broken-flash-reset warning. We are not dealing
with vendors and it's unpleasant for users to se that unnecessary
and long WARN_ON print.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---
drivers/mtd/spi-nor/spi-nor.c | 52 +++++++++++++++++++++++++++++++++--
1 file changed, 49 insertions(+), 3 deletions(-)
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -616,6 +616,22 @@ static void spi_nor_set_4byte_opcodes(st
}
}
+static int spi_nor_check_set_addr_width(struct spi_nor *nor, loff_t addr)
+{
+ u8 addr_width;
+
+ if ((nor->flags & (SNOR_F_4B_OPCODES | SNOR_F_BROKEN_RESET)) !=
+ SNOR_F_BROKEN_RESET)
+ return 0;
+
+ addr_width = addr & 0xff000000 ? 4 : 3;
+ if (nor->addr_width == addr_width)
+ return 0;
+
+ nor->addr_width = addr_width;
+ return nor->params.set_4byte(nor, addr_width == 4);
+}
+
static int macronix_set_4byte(struct spi_nor *nor, bool enable)
{
if (nor->spimem) {
@@ -1259,6 +1275,10 @@ static int spi_nor_erase(struct mtd_info
if (ret)
return ret;
+ ret = spi_nor_check_set_addr_width(nor, instr->addr + instr->len);
+ if (ret < 0)
+ return ret;
+
/* whole-chip erase? */
if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
unsigned long timeout;
@@ -1315,6 +1335,7 @@ static int spi_nor_erase(struct mtd_info
write_disable(nor);
erase_err:
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
return ret;
@@ -1621,7 +1642,9 @@ static int spi_nor_lock(struct mtd_info
if (ret)
return ret;
+ spi_nor_check_set_addr_width(nor, ofs + len);
ret = nor->params.locking_ops->lock(nor, ofs, len);
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK);
return ret;
@@ -1636,7 +1659,9 @@ static int spi_nor_unlock(struct mtd_inf
if (ret)
return ret;
+ spi_nor_check_set_addr_width(nor, ofs + len);
ret = nor->params.locking_ops->unlock(nor, ofs, len);
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret;
@@ -1651,7 +1676,9 @@ static int spi_nor_is_locked(struct mtd_
if (ret)
return ret;
+ spi_nor_check_set_addr_width(nor, ofs + len);
ret = nor->params.locking_ops->is_locked(nor, ofs, len);
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret;
@@ -2557,6 +2584,10 @@ static int spi_nor_read(struct mtd_info
if (ret)
return ret;
+ ret = spi_nor_check_set_addr_width(nor, from + len);
+ if (ret < 0)
+ return ret;
+
while (len) {
loff_t addr = from;
@@ -2580,6 +2611,7 @@ static int spi_nor_read(struct mtd_info
ret = 0;
read_err:
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret;
}
@@ -2597,6 +2629,10 @@ static int sst_write(struct mtd_info *mt
if (ret)
return ret;
+ ret = spi_nor_check_set_addr_width(nor, to + len);
+ if (ret < 0)
+ return ret;
+
write_enable(nor);
nor->sst_write_second = false;
@@ -2659,6 +2695,7 @@ static int sst_write(struct mtd_info *mt
}
sst_write_err:
*retlen += actual;
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
@@ -2681,6 +2718,10 @@ static int spi_nor_write(struct mtd_info
if (ret)
return ret;
+ ret = spi_nor_check_set_addr_width(nor, to + len);
+ if (ret < 0)
+ return ret;
+
for (i = 0; i < len; ) {
ssize_t written;
loff_t addr = to + i;
@@ -2720,6 +2761,7 @@ static int spi_nor_write(struct mtd_info
}
write_err:
+ spi_nor_check_set_addr_width(nor, 0);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
@@ -4726,9 +4768,13 @@ static int spi_nor_init(struct spi_nor *
* reboots (e.g., crashes). Warn the user (or hopefully, system
* designer) that this is bad.
*/
- WARN_ONCE(nor->flags & SNOR_F_BROKEN_RESET,
- "enabling reset hack; may not recover from unexpected reboots\n");
- nor->params.set_4byte(nor, true);
+ if (nor->flags & SNOR_F_BROKEN_RESET) {
+ dev_warn(nor->dev,
+ "enabling reset hack; may not recover from unexpected reboots\n");
+ nor->addr_width = 3;
+ } else {
+ nor->params.set_4byte(nor, true);
+ }
}
return 0;
|
