Commit 61f90a8e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'libata-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull libata updates from Damien Le Moal:

 - Remove duplicated AHCI adapter PCI device IDs (from Krzysztof)

 - Cleanup of device DMA state checking to consistantly use
   ata_dma_enabled() (from Reimar)

* tag 'libata-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  pata_radisys: fix checking of DMA state
  pata_optidma: fix checking of DMA state
  pata_amd: fix checking of DMA state
  pata_ali: fix checking of DMA state
  libata-scsi: fix checking of DMA state
  libata: fix checking of DMA state
  Add AHCI support for ASM1062+JBM575 cards
  ahci: remove duplicated PCI device IDs
parents cc0356d6 1af5f7af

drivers/ata/ahci.c

+5 −8
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */

	{ PCI_VDEVICE(INTEL, 0x2821), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci_nosntf }, /* ICH8/Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */
@@ -316,7 +316,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */

	{ PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG/Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e02), board_ahci }, /* Panther Point AHCI */

	{ PCI_VDEVICE(INTEL, 0x1e03), board_ahci_mobile }, /* Panther M AHCI */
@@ -358,8 +358,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1f37), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3e), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg/Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg/Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x43d4), board_ahci }, /* Rocket Lake PCH-H RAID */

	{ PCI_VDEVICE(INTEL, 0x43d5), board_ahci }, /* Rocket Lake PCH-H RAID */

	{ PCI_VDEVICE(INTEL, 0x43d6), board_ahci }, /* Rocket Lake PCH-H RAID */
@@ -394,10 +394,6 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0xa106), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa107), board_ahci_mobile }, /* Sunrise M RAID */

	{ PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa1d2), board_ahci }, /* Lewisburg RAID*/
@@ -592,6 +588,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */

	{ PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */

	{ PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci },   /* ASM1062R */

	{ PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */



	/*

	 * Samsung SSDs found on some macbooks.  NCQ times out if MSI is

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2007,7 +2007,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log, 


retry:

	ata_tf_init(dev, &tf);

	if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&

	if (ata_dma_enabled(dev) && ata_id_has_read_log_dma_ext(dev->id) &&

	    !(dev->horkage & ATA_HORKAGE_NO_DMA_LOG)) {

		tf.command = ATA_CMD_READ_LOG_DMA_EXT;

		tf.protocol = ATA_PROT_DMA;

drivers/ata/libata-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -3005,7 +3005,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc) 
	ata_qc_set_pc_nbytes(qc);



	/* We may not issue DMA commands if no DMA mode is set */

	if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0) {

	if (tf->protocol == ATA_PROT_DMA && !ata_dma_enabled(dev)) {

		fp = 1;

		goto invalid_fld;

	}
@@ -3155,7 +3155,7 @@ static unsigned int ata_scsi_write_same_xlat(struct ata_queued_cmd *qc) 
	u8 unmap = cdb[1] & 0x8;



	/* we may not issue DMA commands if no DMA mode is set */

	if (unlikely(!dev->dma_mode))

	if (unlikely(!ata_dma_enabled(dev)))

		goto invalid_opcode;



	/*

drivers/ata/pata_ali.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static void ali_set_piomode(struct ata_port *ap, struct ata_device *adev) 
		struct ata_timing p;

		ata_timing_compute(pair, pair->pio_mode, &p, T, 1);

		ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

		if (pair->dma_mode) {

		if (ata_dma_enabled(pair)) {

			ata_timing_compute(pair, pair->dma_mode, &p, T, 1);

			ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

		}
@@ -264,7 +264,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev) 
			struct ata_timing p;

			ata_timing_compute(pair, pair->pio_mode, &p, T, 1);

			ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

			if (pair->dma_mode) {

			if (ata_dma_enabled(pair)) {

				ata_timing_compute(pair, pair->dma_mode, &p, T, 1);

				ata_timing_merge(&p, &t, &t, ATA_TIMING_SETUP|ATA_TIMING_8BIT);

			}

drivers/ata/pata_amd.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse 


	if (peer) {

		/* This may be over conservative */

		if (peer->dma_mode) {

		if (ata_dma_enabled(peer)) {

			ata_timing_compute(peer, peer->dma_mode, &apeer, T, UT);

			ata_timing_merge(&apeer, &at, &at, ATA_TIMING_8BIT);

		}