qualcommax: remove upstreamed TRIM quirks

TRIM disable quirks for eMMC-s were merged upstreamed and backported to
stable in 6.1.39, however they were not dropped during the kernel update
and quilt is not complaining at all.

So, lets manually remove them as they are part of 6.1.39 [1] [2].

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/mmc/core/quirks.h?h=v6.1.39&id=182bf07a24c4c1022bf83c90be619d60427745c3
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/mmc/core/quirks.h?h=v6.1.39&id=69bc3203513c4fcd6ca84b0185de454bacf87883

Fixes: fec22f8375b4 ("kernel: bump 6.1 to 6.1.39")
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/patches-6.1/0132-mmc-core-disable-TRIM-on-Micron-MTFC4GACAJCN-1M.patch b/target/linux/qualcommax/patches-6.1/0132-mmc-core-disable-TRIM-on-Micron-MTFC4GACAJCN-1M.patch
deleted file mode 100644 (file)
index 0da71f1..0000000
--- a/target/linux/qualcommax/patches-6.1/0132-mmc-core-disable-TRIM-on-Micron-MTFC4GACAJCN-1M.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f5aaf6669bd4f1f0218dd7fd5dc90941267ad860 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Tue, 30 May 2023 23:26:30 +0200
-Subject: [PATCH] mmc: core: disable TRIM on Micron MTFC4GACAJCN-1M
-
-It seems that Micron MTFC4GACAJCN-1M despite advertising TRIM support does
-not work when the core is trying to use REQ_OP_WRITE_ZEROES.
-
-We are seeing the following errors in OpenWrt under 6.1 on Qnap Qhora 301W
-that we did not previously have and tracked it down to REQ_OP_WRITE_ZEROES:
-[   18.085950] I/O error, dev loop0, sector 596 op 0x9:(WRITE_ZEROES) flags 0x800 phys_seg 0 prio class 2
-
-Disabling TRIM makes the error go away, so lets add a quirk for this eMMC
-to disable TRIM.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
- drivers/mmc/core/quirks.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mmc/core/quirks.h
-+++ b/drivers/mmc/core/quirks.h
-@@ -124,6 +124,13 @@ static const struct mmc_fixup __maybe_un
-                 MMC_QUIRK_TRIM_BROKEN),
- 
-       /*
-+       * Micron MTFC4GACAJCN-1M advertises TRIM but it does not seems to
-+       * support being used to offload WRITE_ZEROES.
-+       */
-+      MMC_FIXUP("Q2J54A", CID_MANFID_MICRON, 0x014e, add_quirk_mmc,
-+                MMC_QUIRK_TRIM_BROKEN),
-+
-+      /*
-        * Some SD cards reports discard support while they don't
-        */
-       MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,

diff --git a/target/linux/qualcommax/patches-6.1/0133-mmc-core-disable-TRIM-on-Kingston-EMMC04G-M627.patch b/target/linux/qualcommax/patches-6.1/0133-mmc-core-disable-TRIM-on-Kingston-EMMC04G-M627.patch
deleted file mode 100644 (file)
index cc6f29e..0000000
--- a/target/linux/qualcommax/patches-6.1/0133-mmc-core-disable-TRIM-on-Kingston-EMMC04G-M627.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 26c97b6fb7d291f55e0e4a410d266d1355118ed9 Mon Sep 17 00:00:00 2001
-From: Robert Marko <robimarko@gmail.com>
-Date: Wed, 31 May 2023 20:21:26 +0200
-Subject: [PATCH] mmc: core: disable TRIM on Kingston EMMC04G-M627
-
-It seems that Kingston EMMC04G-M627 despite advertising TRIM support does
-not work when the core is trying to use REQ_OP_WRITE_ZEROES.
-
-We are seeing I/O errors in OpenWrt under 6.1 on Zyxel NBG7815 that we did
-not previously have and tracked it down to REQ_OP_WRITE_ZEROES.
-
-Trying to use fstrim seems to also throw errors like:
-[93010.835112] I/O error, dev loop0, sector 16902 op 0x3:(DISCARD) flags 0x800 phys_seg 1 prio class 2
-
-Disabling TRIM makes the error go away, so lets add a quirk for this eMMC
-to disable TRIM.
-
-Signed-off-by: Robert Marko <robimarko@gmail.com>
----
- drivers/mmc/core/quirks.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mmc/core/quirks.h
-+++ b/drivers/mmc/core/quirks.h
-@@ -131,6 +131,13 @@ static const struct mmc_fixup __maybe_un
-                 MMC_QUIRK_TRIM_BROKEN),
- 
-       /*
-+       * Kingston EMMC04G-M627 advertises TRIM but it does not seems to
-+       * support being used to offload WRITE_ZEROES.
-+       */
-+      MMC_FIXUP("M62704", CID_MANFID_KINGSTON, 0x0100, add_quirk_mmc,
-+                MMC_QUIRK_TRIM_BROKEN),
-+
-+      /*
-        * Some SD cards reports discard support while they don't
-        */
-       MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,