[openwrt/openwrt] kernel: move Toshiba-TC58NVG0S3H patch to ipq40xx redux

[LEDE Commits]

chunkeey pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ac2166b1358b1cfe5b6397f027556f7327063c3e

commit ac2166b1358b1cfe5b6397f027556f7327063c3e
Author: Christian Lamparter <chunkeey at gmail.com>
AuthorDate: Mon Jun 6 21:41:07 2022 +0200

    kernel: move Toshiba-TC58NVG0S3H patch to ipq40xx redux
    
    Linux' upstream MTD-Maintainer Miquèl Raynal noted:
    |Reverting seems the safest option here, not knowing how many devices
    |have these damaged/counterfeit chips. If it is just a couple and only on
    |Fritzboxes, as suggested in the Github issue this patch could be
    |carried through OpenWrt and that would seem more future proof IMHO.
    
    This patch follows up with the first patch. It actually
    moves the patches out of target/linux/generic/pending into
    the ipq40xx's patch heap and adds a little note what happend.
    
    For more information, discussions or reports about bad TC58NVG0S3Hs,
    please visit the OpenWrt's Github Issue #9962:
    <https://github.com/openwrt/openwrt/issues/9962>
    
    Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 ...44-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch | 9 +++------
 ...44-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch b/target/linux/ipq40xx/patches-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
similarity index 84%
rename from target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
rename to target/linux/ipq40xx/patches-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
index bafdaccd25..91919b2894 100644
--- a/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
+++ b/target/linux/ipq40xx/patches-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
@@ -13,19 +13,16 @@ has 128 bytes OOB. This adds a static NAND ID entry to correct this.
 Tested on FRITZ!Box 7530 flashed with OpenWrt.
 
 Signed-off-by: Andreas Böhler <dev at aboehler.at>
-(changed id_len to 8)
+(changed id_len to 8, added comment about possible counterfeits)
 ---
- drivers/mtd/nand/raw/nand_ids.c | 3 +++
- 1 file changed, 3 insertions(+)
-
 --- a/drivers/mtd/nand/raw/nand_ids.c
 +++ b/drivers/mtd/nand/raw/nand_ids.c
 @@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] =
  	{"TC58NVG0S3E 1G 3.3V 8-bit",
  		{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
  		  SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
-+	{"TC58NVG0S3HTA00 1G 3.3V 8-bit",
-+		{ .id = {0x98, 0xf1, 0x80, 0x15} },
++	{"TC58NVG0S3HTA00 1G 3.3V 8-bit", /* possibly counterfeit chip - see commit */
++		{ .id = {0x98, 0xf1, 0x80, 0x15} }, /* should be more bytes */
 +		  SZ_2K, SZ_128, SZ_128K, 0, 8, 128, NAND_ECC_INFO(8, SZ_512), },
  	{"TC58NVG2S0F 4G 3.3V 8-bit",
  		{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },
diff --git a/target/linux/generic/pending-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch b/target/linux/ipq40xx/patches-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
similarity index 84%
rename from target/linux/generic/pending-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
rename to target/linux/ipq40xx/patches-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
index bafdaccd25..91919b2894 100644
--- a/target/linux/generic/pending-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
+++ b/target/linux/ipq40xx/patches-5.15/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch
@@ -13,19 +13,16 @@ has 128 bytes OOB. This adds a static NAND ID entry to correct this.
 Tested on FRITZ!Box 7530 flashed with OpenWrt.
 
 Signed-off-by: Andreas Böhler <dev at aboehler.at>
-(changed id_len to 8)
+(changed id_len to 8, added comment about possible counterfeits)
 ---
- drivers/mtd/nand/raw/nand_ids.c | 3 +++
- 1 file changed, 3 insertions(+)
-
 --- a/drivers/mtd/nand/raw/nand_ids.c
 +++ b/drivers/mtd/nand/raw/nand_ids.c
 @@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] =
  	{"TC58NVG0S3E 1G 3.3V 8-bit",
  		{ .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} },
  		  SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), },
-+	{"TC58NVG0S3HTA00 1G 3.3V 8-bit",
-+		{ .id = {0x98, 0xf1, 0x80, 0x15} },
++	{"TC58NVG0S3HTA00 1G 3.3V 8-bit", /* possibly counterfeit chip - see commit */
++		{ .id = {0x98, 0xf1, 0x80, 0x15} }, /* should be more bytes */
 +		  SZ_2K, SZ_128, SZ_128K, 0, 8, 128, NAND_ECC_INFO(8, SZ_512), },
  	{"TC58NVG2S0F 4G 3.3V 8-bit",
  		{ .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} },