drop ata quirk patch

diff --git a/queue-6.12/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch b/queue-6.12/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
deleted file mode 100644 (file)
index 48b8d8d..0000000
--- a/queue-6.12/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cc77e2ce187d26cc66af3577bf896d7410eb25ab Mon Sep 17 00:00:00 2001
-From: Daniel Baumann <daniel@debian.org>
-Date: Sat, 18 Jan 2025 06:36:43 +0100
-Subject: ata: libata-core: Add ATA_QUIRK_NOLPM for Samsung SSD 870 QVO drives
-
-From: Daniel Baumann <daniel@debian.org>
-
-commit cc77e2ce187d26cc66af3577bf896d7410eb25ab upstream.
-
-Disabling link power management on Samsung SSD 870 QVO drives
-to make them work again after the switch of the default LPM
-policy to low.
-
-Testing so far has shown that regular Samsung SSD 870
-(the non QVO variants) do not need it and work fine with
-the default LPM policy.
-
-Cc: stable@vger.kernel.org
-Fixes: 7627a0edef54 ("ata: ahci: Drop low power policy board type")
-Signed-off-by: Daniel Baumann <daniel@debian.org>
-Link: https://lore.kernel.org/linux-ide/ac64a484-022c-42a0-95bc-1520333b1536@debian.org/
-Signed-off-by: Niklas Cassel <cassel@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/ata/libata-core.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -4143,6 +4143,10 @@ static const struct ata_dev_quirks_entry
-       { "Samsung SSD 860*",           NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-                                               ATA_QUIRK_ZERO_AFTER_TRIM |
-                                               ATA_QUIRK_NO_NCQ_ON_ATI },
-+      { "Samsung SSD 870 QVO*",       NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-+                                              ATA_QUIRK_ZERO_AFTER_TRIM |
-+                                              ATA_QUIRK_NO_NCQ_ON_ATI |
-+                                              ATA_QUIRK_NOLPM },
-       { "Samsung SSD 870*",           NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-                                               ATA_QUIRK_ZERO_AFTER_TRIM |
-                                               ATA_QUIRK_NO_NCQ_ON_ATI },

diff --git a/queue-6.12/series b/queue-6.12/series
index 21fbcc54666e0801fed2a0946062af33a3eb45b8..2fff838c89b66e5ccbca1354a1ddaff5cf0486d6 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -342,7 +342,6 @@ mm-gup-fix-infinite-loop-within-__get_longterm_locked.patch
 mm-vmscan-accumulate-nr_demoted-for-accurate-demotion-statistics.patch
 mm-hugetlb-fix-hugepage-allocation-for-interleaved-memory-nodes.patch
 mm-compaction-fix-ubsan-shift-out-of-bounds-warning.patch
-ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
 ata-libata-sff-ensure-that-we-cannot-write-outside-the-allocated-buffer.patch
 irqchip-irq-mvebu-icu-fix-access-to-msi_data-from-irq_domain-host_data.patch
 crypto-qce-fix-goto-jump-in-error-path.patch

diff --git a/queue-6.13/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch b/queue-6.13/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
deleted file mode 100644 (file)
index 48b8d8d..0000000
--- a/queue-6.13/ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From cc77e2ce187d26cc66af3577bf896d7410eb25ab Mon Sep 17 00:00:00 2001
-From: Daniel Baumann <daniel@debian.org>
-Date: Sat, 18 Jan 2025 06:36:43 +0100
-Subject: ata: libata-core: Add ATA_QUIRK_NOLPM for Samsung SSD 870 QVO drives
-
-From: Daniel Baumann <daniel@debian.org>
-
-commit cc77e2ce187d26cc66af3577bf896d7410eb25ab upstream.
-
-Disabling link power management on Samsung SSD 870 QVO drives
-to make them work again after the switch of the default LPM
-policy to low.
-
-Testing so far has shown that regular Samsung SSD 870
-(the non QVO variants) do not need it and work fine with
-the default LPM policy.
-
-Cc: stable@vger.kernel.org
-Fixes: 7627a0edef54 ("ata: ahci: Drop low power policy board type")
-Signed-off-by: Daniel Baumann <daniel@debian.org>
-Link: https://lore.kernel.org/linux-ide/ac64a484-022c-42a0-95bc-1520333b1536@debian.org/
-Signed-off-by: Niklas Cassel <cassel@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/ata/libata-core.c |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -4143,6 +4143,10 @@ static const struct ata_dev_quirks_entry
-       { "Samsung SSD 860*",           NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-                                               ATA_QUIRK_ZERO_AFTER_TRIM |
-                                               ATA_QUIRK_NO_NCQ_ON_ATI },
-+      { "Samsung SSD 870 QVO*",       NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-+                                              ATA_QUIRK_ZERO_AFTER_TRIM |
-+                                              ATA_QUIRK_NO_NCQ_ON_ATI |
-+                                              ATA_QUIRK_NOLPM },
-       { "Samsung SSD 870*",           NULL,   ATA_QUIRK_NO_NCQ_TRIM |
-                                               ATA_QUIRK_ZERO_AFTER_TRIM |
-                                               ATA_QUIRK_NO_NCQ_ON_ATI },

diff --git a/queue-6.13/series b/queue-6.13/series
index b6c0a6315e50abb6fbc01d3f476a0cfc1544dd5c..a3b50bdfce16a2fc38809d147e49f984971b85d7 100644 (file)
--- a/queue-6.13/series
+++ b/queue-6.13/series
@@ -379,7 +379,6 @@ mm-gup-fix-infinite-loop-within-__get_longterm_locked.patch
 mm-vmscan-accumulate-nr_demoted-for-accurate-demotion-statistics.patch
 mm-hugetlb-fix-hugepage-allocation-for-interleaved-memory-nodes.patch
 mm-compaction-fix-ubsan-shift-out-of-bounds-warning.patch
-ata-libata-core-add-ata_quirk_nolpm-for-samsung-ssd-870-qvo-drives.patch
 ata-libata-sff-ensure-that-we-cannot-write-outside-the-allocated-buffer.patch
 irqchip-irq-mvebu-icu-fix-access-to-msi_data-from-irq_domain-host_data.patch
 crypto-qce-fix-goto-jump-in-error-path.patch