From: David Bauer Date: Tue, 6 Apr 2021 20:50:51 +0000 (+0200) Subject: ath79: update spi-nor patches X-Git-Tag: v22.03.0-rc1~2764 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28623cab32c0ca4e709375f80288471d5ca06ee0;p=openwrt%2Fstaging%2Fhauke.git ath79: update spi-nor patches Update the 4 bit BP patches for Ubiquiti boards with the second iteration sent upstream. Signed-off-by: David Bauer --- diff --git a/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-add-block-protection-flags-to-macronix.patch b/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-add-block-protection-flags-to-macronix.patch deleted file mode 100644 index d416276f0d..0000000000 --- a/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-add-block-protection-flags-to-macronix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 158f9796335b393980afb8e9796eb8d44106652a Mon Sep 17 00:00:00 2001 -From: David Bauer -Date: Mon, 26 Oct 2020 15:10:47 +0100 -Subject: [PATCH 1/2] mtd: spi-nor: add block protection flags to macronix - -Macronix flash chips support block protection by using BP bits in the -read status register. Add the corresponding flag to indicate block -protection support. - -Otherwise, locked blocks are not unlocked when requested. - -Signed-off-by: David Bauer ---- - drivers/mtd/spi-nor/macronix.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/mtd/spi-nor/macronix.c -+++ b/drivers/mtd/spi-nor/macronix.c -@@ -94,6 +94,7 @@ static const struct flash_info macronix_ - - static void macronix_default_init(struct spi_nor *nor) - { -+ nor->flags |= SNOR_F_HAS_LOCK; - nor->params->quad_enable = spi_nor_sr1_bit6_quad_enable; - nor->params->set_4byte_addr_mode = spi_nor_set_4byte_addr_mode; - nor->flags |= SNOR_F_HAS_LOCK; diff --git a/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch b/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch new file mode 100644 index 0000000000..e27a95d9e9 --- /dev/null +++ b/target/linux/ath79/patches-5.10/0052-mtd-spi-nor-use-4-bit-locking-for-MX25L12805D.patch @@ -0,0 +1,38 @@ +From a449cd03db4d0e1d292b3734f7676634cfd94f53 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Sun, 25 Oct 2020 01:14:22 +0200 +Subject: [PATCH] mtd: spi-nor: use 4 bit locking for MX25L12805D + +Macronix MX25L12805D supports locking with 4 block +protection bits in its status register. Add the corresponding +flag in order to clear these bits when unloking the flash. + +Otherwise, the flash might not be writable depending on the state +left by the bootloader. + +Tested-on: Ubiquiti UniFi AC Lite (ath79) + +Fixes commit 62593cf40b23 ("mtd: spi-nor: refactor block protection functions") + +Signed-off-by: David Bauer +--- + drivers/mtd/spi-nor/macronix.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/mtd/spi-nor/macronix.c b/drivers/mtd/spi-nor/macronix.c +index 2d39dd32a64e..ed8b56a0102f 100644 +--- a/drivers/mtd/spi-nor/macronix.c ++++ b/drivers/mtd/spi-nor/macronix.c +@@ -50,7 +50,8 @@ static const struct flash_info macronix_parts[] = { + { "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) }, + { "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) }, + { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, +- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K) }, ++ { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K | ++ SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP) }, + { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, + { "mx25r1635f", INFO(0xc22815, 0, 64 * 1024, 32, + SECT_4K | SPI_NOR_DUAL_READ | +-- +2.31.1 + diff --git a/target/linux/ath79/patches-5.10/0053-mtd-spi-nor-use-4-bit-BP-for-large-Macronix-flash.patch b/target/linux/ath79/patches-5.10/0053-mtd-spi-nor-use-4-bit-BP-for-large-Macronix-flash.patch deleted file mode 100644 index bb393e52eb..0000000000 --- a/target/linux/ath79/patches-5.10/0053-mtd-spi-nor-use-4-bit-BP-for-large-Macronix-flash.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 59f88b8d4447be809d0b5e7a283290d06848d3bc Mon Sep 17 00:00:00 2001 -From: David Bauer -Date: Sun, 25 Oct 2020 01:14:22 +0200 -Subject: [PATCH 2/2] mtd: spi-nor: use 4 bit BP for large Macronix flash - -Macronix SPI-NOR chips with 128 or more 64k blocks have 4 block -protection bits in their status register. Add the corresponding -flag in order to clear these bits when unloking the flash. - -Otherwise, the flash might not be writable depending on the state the -bootloader left the flash in. - -Fixes commit 62593cf40b23 ("mtd: spi-nor: refactor block protection functions") - -Signed-off-by: David Bauer ---- - drivers/mtd/spi-nor/macronix.c | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - ---- a/drivers/mtd/spi-nor/macronix.c -+++ b/drivers/mtd/spi-nor/macronix.c -@@ -50,8 +50,8 @@ static const struct flash_info macronix_ - { "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) }, - { "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) }, - { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, -- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K) }, -- { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, -+ { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_4BIT_BP) }, -+ { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, SPI_NOR_4BIT_BP) }, - { "mx25r1635f", INFO(0xc22815, 0, 64 * 1024, 32, - SECT_4K | SPI_NOR_DUAL_READ | - SPI_NOR_QUAD_READ) }, -@@ -60,36 +60,41 @@ static const struct flash_info macronix_ - SPI_NOR_QUAD_READ) }, - { "mx25u12835f", INFO(0xc22538, 0, 64 * 1024, 256, - SECT_4K | SPI_NOR_DUAL_READ | -- SPI_NOR_QUAD_READ) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4BIT_BP) }, - { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, -- SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) -+ SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -+ SPI_NOR_4BIT_BP) - .fixups = &mx25l25635_fixups }, - { "mx25u25635f", INFO(0xc22539, 0, 64 * 1024, 512, -- SECT_4K | SPI_NOR_4B_OPCODES) }, -+ SECT_4K | SPI_NOR_4B_OPCODES | -+ SPI_NOR_4BIT_BP) }, - { "mx25u51245g", INFO(0xc2253a, 0, 64 * 1024, 1024, - SECT_4K | SPI_NOR_DUAL_READ | -- SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES | -+ SPI_NOR_4BIT_BP) }, - { "mx25v8035f", INFO(0xc22314, 0, 64 * 1024, 16, - SECT_4K | SPI_NOR_DUAL_READ | - SPI_NOR_QUAD_READ) }, -- { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, -+ { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, SPI_NOR_4BIT_BP) }, - { "mx25l51245g", INFO(0xc2201a, 0, 64 * 1024, 1024, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -- SPI_NOR_4B_OPCODES) }, -+ SPI_NOR_4B_OPCODES | SPI_NOR_4BIT_BP) }, - { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, - SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | -- SPI_NOR_4B_OPCODES) }, -+ SPI_NOR_4B_OPCODES | SPI_NOR_4BIT_BP) }, - { "mx66u51235f", INFO(0xc2253a, 0, 64 * 1024, 1024, - SECT_4K | SPI_NOR_DUAL_READ | -- SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES | -+ SPI_NOR_4BIT_BP) }, - { "mx66l1g45g", INFO(0xc2201b, 0, 64 * 1024, 2048, - SECT_4K | SPI_NOR_DUAL_READ | -- SPI_NOR_QUAD_READ) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4BIT_BP) }, - { "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, -- SPI_NOR_QUAD_READ) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4BIT_BP) }, - { "mx66u2g45g", INFO(0xc2253c, 0, 64 * 1024, 4096, - SECT_4K | SPI_NOR_DUAL_READ | -- SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, -+ SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES | -+ SPI_NOR_4BIT_BP) }, - }; - - static void macronix_default_init(struct spi_nor *nor)