aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Thomson <git@johnthomson.fastmail.com.au>2021-09-28 20:51:56 +1000
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2022-06-29 12:34:49 +0200
commitef69ab7a35a2ef5257aa2f718875b24856947c34 (patch)
tree0fb469977130a3e58e8d370411917cd65252577b /target/linux/ramips
parentaae3a8a254275f8be5c45d766ac7b5afb82a9fe6 (diff)
downloadupstream-ef69ab7a35a2ef5257aa2f718875b24856947c34.tar.gz
upstream-ef69ab7a35a2ef5257aa2f718875b24856947c34.tar.bz2
upstream-ef69ab7a35a2ef5257aa2f718875b24856947c34.zip
kernel: cut broken SPI_NOR 4K eraseblock LIMIT patch
Since 4e0c54bc5bc8 ("kernel: add support for kernel 5.4"), the spi-nor limit 4k erasesize to spi-nor chips below a configured size patch has not functioned as intended. For uniform erasesize SPI-NOR devices, both nor->erase_opcode & mtd->erasesize are used in erase operations. These are set before, and not modified by, this CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT patch. Thus, an SPI-NOR device with CONFIG_MTD_SPI_NOR_USE_4K_SECTORS will always use 4k erasesize (where the device supports it). If this patch was fixed to function as intended, there would be cases where devices change from a 4K to a 64K erasesize. Signed-off-by: John Thomson <git@johnthomson.fastmail.com.au>
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/mt7620/config-5.101
-rw-r--r--target/linux/ramips/rt305x/config-5.101
-rw-r--r--target/linux/ramips/rt3883/config-5.101
3 files changed, 0 insertions, 3 deletions
diff --git a/target/linux/ramips/mt7620/config-5.10 b/target/linux/ramips/mt7620/config-5.10
index bb7e50da5d..8fae1adc37 100644
--- a/target/linux/ramips/mt7620/config-5.10
+++ b/target/linux/ramips/mt7620/config-5.10
@@ -116,7 +116,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
CONFIG_MTD_SPLIT_JIMAGE_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_TPLINK_FW=y
diff --git a/target/linux/ramips/rt305x/config-5.10 b/target/linux/ramips/rt305x/config-5.10
index c3c4cf6b0d..b41ddb22ac 100644
--- a/target/linux/ramips/rt305x/config-5.10
+++ b/target/linux/ramips/rt305x/config-5.10
@@ -106,7 +106,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
CONFIG_MTD_SPLIT_JIMAGE_FW=y
CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y
diff --git a/target/linux/ramips/rt3883/config-5.10 b/target/linux/ramips/rt3883/config-5.10
index cb1db1ab82..b59ad98b60 100644
--- a/target/linux/ramips/rt3883/config-5.10
+++ b/target/linux/ramips/rt3883/config-5.10
@@ -104,7 +104,6 @@ CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_SPI_NOR=y
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
-CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=16384
CONFIG_MTD_SPLIT_SEAMA_FW=y
CONFIG_MTD_SPLIT_UIMAGE_FW=y
CONFIG_NEED_DMA_MAP_STATE=y