6.1-stable patches

added patches:
	ahci-extend-asm1061-43-bit-dma-address-quirk-to-other-asm106x-parts.patch
	ata-ahci-add-identifiers-for-asm2116-series-adapters.patch

diff --git a/queue-6.1/ahci-extend-asm1061-43-bit-dma-address-quirk-to-other-asm106x-parts.patch b/queue-6.1/ahci-extend-asm1061-43-bit-dma-address-quirk-to-other-asm106x-parts.patch
new file mode 100644 (file)
index 0000000..ef60f98
--- /dev/null
+++ b/queue-6.1/ahci-extend-asm1061-43-bit-dma-address-quirk-to-other-asm106x-parts.patch
@@ -0,0 +1,46 @@
+From 51af8f255bdaca6d501afc0d085b808f67b44d91 Mon Sep 17 00:00:00 2001
+From: Lennert Buytenhek <kernel@wantstofly.org>
+Date: Tue, 30 Jan 2024 15:21:51 +0200
+Subject: ahci: Extend ASM1061 43-bit DMA address quirk to other ASM106x parts
+
+From: Lennert Buytenhek <kernel@wantstofly.org>
+
+commit 51af8f255bdaca6d501afc0d085b808f67b44d91 upstream.
+
+ASMedia have confirmed that all ASM106x parts currently listed in
+ahci_pci_tbl[] suffer from the 43-bit DMA address limitation that we ran
+into on the ASM1061, and therefore, we need to apply the quirk added by
+commit 20730e9b2778 ("ahci: add 43-bit DMA address quirk for ASMedia
+ASM1061 controllers") to the other supported ASM106x parts as well.
+
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/linux-ide/ZbopwKZJAKQRA4Xv@x1-carbon/
+Signed-off-by: Lennert Buytenhek <kernel@wantstofly.org>
+[cassel: add link to ASMedia confirmation email]
+Signed-off-by: Niklas Cassel <cassel@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/ahci.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -606,13 +606,13 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(PROMISE, 0x3781), board_ahci },   /* FastTrak TX8660 ahci-mode */
+ 
+       /* ASMedia */
+-      { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci },   /* ASM1060 */
+-      { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci },   /* ASM1060 */
++      { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci_43bit_dma }, /* ASM1060 */
++      { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci_43bit_dma }, /* ASM1060 */
+       { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma }, /* ASM1061 */
+       { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma }, /* ASM1061/1062 */
+-      { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */
+-      { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci },   /* ASM1062R */
+-      { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */
++      { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci_43bit_dma }, /* ASM1061R */
++      { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci_43bit_dma }, /* ASM1062R */
++      { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci_43bit_dma }, /* ASM1062+JMB575 */
+       { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci },   /* ASM1062A */
+       { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci },   /* ASM1064 */
+       { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci },   /* ASM1164 */

diff --git a/queue-6.1/ata-ahci-add-identifiers-for-asm2116-series-adapters.patch b/queue-6.1/ata-ahci-add-identifiers-for-asm2116-series-adapters.patch
new file mode 100644 (file)
index 0000000..0a2ba12
--- /dev/null
+++ b/queue-6.1/ata-ahci-add-identifiers-for-asm2116-series-adapters.patch
@@ -0,0 +1,33 @@
+From 3bf6141060948e27b62b13beb216887f2e54591e Mon Sep 17 00:00:00 2001
+From: Szuying Chen <chensiying21@gmail.com>
+Date: Thu, 21 Sep 2023 17:33:51 +0800
+Subject: ata: ahci: add identifiers for ASM2116 series adapters
+
+From: Szuying Chen <chensiying21@gmail.com>
+
+commit 3bf6141060948e27b62b13beb216887f2e54591e upstream.
+
+Add support for PCIe SATA adapter cards based on Asmedia 2116 controllers.
+These cards can provide up to 10 SATA ports on PCIe card.
+
+Signed-off-by: Szuying Chen <Chloe_Chen@asmedia.com.tw>
+Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/ata/ahci.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -613,6 +613,11 @@ static const struct pci_device_id ahci_p
+       { PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */
+       { PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci },   /* ASM1062R */
+       { PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */
++      { PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci },   /* ASM1062A */
++      { PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci },   /* ASM1064 */
++      { PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci },   /* ASM1164 */
++      { PCI_VDEVICE(ASMEDIA, 0x1165), board_ahci },   /* ASM1165 */
++      { PCI_VDEVICE(ASMEDIA, 0x1166), board_ahci },   /* ASM1166 */
+ 
+       /*
+        * Samsung SSDs found on some macbooks.  NCQ times out if MSI is

diff --git a/queue-6.1/series b/queue-6.1/series
index b23d629ad249541d275ddf1e1beb8df032e3b5a4..847a39908333afb0059e05d5ca34f15467bd4329 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -190,3 +190,5 @@ fs-aio-restrict-kiocb_set_cancel_fn-to-i-o-submitted-via-libaio.patch
 mm-zswap-fix-missing-folio-cleanup-in-writeback-race-path.patch
 mptcp-userspace-pm-send-rm_addr-for-id-0.patch
 mptcp-add-needs_id-for-netlink-appending-addr.patch
+ata-ahci-add-identifiers-for-asm2116-series-adapters.patch
+ahci-extend-asm1061-43-bit-dma-address-quirk-to-other-asm106x-parts.patch