6.1-stable patches

added patches:
	ata-ahci-revert-ata-ahci-add-tiger-lake-up-3-4-ahci-controller.patch

diff --git a/queue-6.1/ata-ahci-revert-ata-ahci-add-tiger-lake-up-3-4-ahci-controller.patch b/queue-6.1/ata-ahci-revert-ata-ahci-add-tiger-lake-up-3-4-ahci-controller.patch
new file mode 100644 (file)
index 0000000..9c2f36b
--- /dev/null
+++ b/queue-6.1/ata-ahci-revert-ata-ahci-add-tiger-lake-up-3-4-ahci-controller.patch
@@ -0,0 +1,33 @@
+From 6210038aeaf49c395c2da57572246d93ec67f6d4 Mon Sep 17 00:00:00 2001
+From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Date: Fri, 3 Mar 2023 18:29:07 +0900
+Subject: ata: ahci: Revert "ata: ahci: Add Tiger Lake UP{3,4} AHCI controller"
+
+From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+
+commit 6210038aeaf49c395c2da57572246d93ec67f6d4 upstream.
+
+Commit 104ff59af73a ("ata: ahci: Add Tiger Lake UP{3,4} AHCI
+controller") enabled low power mode for the Tiger Lake AHIC adapter in
+the author system but created regressions for others. Revert this patch
+for now until a better solution is found to make this adapter
+eco-friendly.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=217114
+CC: stable@vger.kernel.org
+Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/ahci.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -422,7 +422,6 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(INTEL, 0x34d3), board_ahci_low_power }, /* Ice Lake LP AHCI */
+       { PCI_VDEVICE(INTEL, 0x02d3), board_ahci_low_power }, /* Comet Lake PCH-U AHCI */
+       { PCI_VDEVICE(INTEL, 0x02d7), board_ahci_low_power }, /* Comet Lake PCH RAID */
+-      { PCI_VDEVICE(INTEL, 0xa0d3), board_ahci_low_power }, /* Tiger Lake UP{3,4} AHCI */
+ 
+       /* JMicron 360/1/3/5/6, match class to avoid IDE function */
+       { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

diff --git a/queue-6.1/series b/queue-6.1/series
index 5c7ab7bf8499524a76b4a75961e3827c9ac02688..88c73ea38ebc978557f656b7cccf492f23ed57d5 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -1,3 +1,4 @@
 hid-asus-use-spinlock-to-protect-concurrent-accesses.patch
 hid-asus-use-spinlock-to-safely-schedule-workers.patch
 powerpc-mm-rearrange-if-else-block-to-avoid-clang-warning.patch
+ata-ahci-revert-ata-ahci-add-tiger-lake-up-3-4-ahci-controller.patch