Commit 3036cd0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata fix from Niklas Cassel:

 - Add a quirk for JMicron JMB582/JMB585 AHCI controllers such that
   they only use 32-bit DMA addresses.

   While these controllers do report that they support 64-bit DMA
   addresses, a user reports that using 64-bit DMA addresses cause
   silent corruption even on modern x86 systems (Arthur)

* tag 'ata-7.0-final' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: ahci: force 32-bit DMA for JMicron JMB582/JMB585
parents 86782c16 105c4256

drivers/ata/ahci.c

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ enum board_ids { 
	/* board IDs for specific chipsets in alphabetical order */

	board_ahci_al,

	board_ahci_avn,

	board_ahci_jmb585,

	board_ahci_mcp65,

	board_ahci_mcp77,

	board_ahci_mcp89,
@@ -212,6 +213,15 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_avn_ops,

	},

	/* JMicron JMB582/585: 64-bit DMA is broken, force 32-bit */

	[board_ahci_jmb585] = {

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR |

				 AHCI_HFLAG_32BIT_ONLY),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_mcp65] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP |

				 AHCI_HFLAG_YES_NCQ),
@@ -439,6 +449,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	/* Elkhart Lake IDs 0x4b60 & 0x4b62 https://sata-io.org/product/8803 not tested yet */

	{ PCI_VDEVICE(INTEL, 0x4b63), board_ahci_pcs_quirk }, /* Elkhart Lake AHCI */



	/* JMicron JMB582/585: force 32-bit DMA (broken 64-bit implementation) */

	{ PCI_VDEVICE(JMICRON, 0x0582), board_ahci_jmb585 },

	{ PCI_VDEVICE(JMICRON, 0x0585), board_ahci_jmb585 },



	/* 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,

	  PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci_ign_iferr },