Commit 6d2e62e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fixes from Damien Le Moal:
 "Three small fixes for 6.2 final:

   - Disable READ LOG DMA EXT for Samsung MZ7LH drives as these drives
     choke on that command, from Patrick.

   - Add Intel Tiger Lake UP{3,4} to the list of supported AHCI
     controllers (this is not technically a bug fix, but it is trivial
     enough that I add it here), from Simon.

   - Fix code comments in the pata_octeon_cf driver as incorrect
     formatting was causing warnings from kernel-doc, from Randy"

* tag 'ata-6.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: pata_octeon_cf: drop kernel-doc notation
  ata: ahci: Add Tiger Lake UP{3,4} AHCI controller
  ata: libata-core: Disable READ LOG DMA EXT for Samsung MZ7LH
parents bda6cfae 1aff53b2

drivers/ata/ahci.c

+1 −0
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ 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,

drivers/ata/libata-core.c

+3 −0
Original line number Diff line number Diff line
@@ -4045,6 +4045,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "Samsung SSD 870*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI },

	{ "SAMSUNG*MZ7LH*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI, },

	{ "FCCT*M500*",			NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM },

drivers/ata/pata_octeon_cf.c

+8 −8
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ module_param(enable_dma, int, 0444); 
MODULE_PARM_DESC(enable_dma,

		 "Enable use of DMA on interfaces that support it (0=no dma [default], 1=use dma)");



/**

/*

 * Convert nanosecond based time to setting used in the

 * boot bus timing register, based on timing multiple

 */
@@ -114,7 +114,7 @@ static void octeon_cf_set_boot_reg_cfg(int cs, unsigned int multiplier) 
	cvmx_write_csr(CVMX_MIO_BOOT_REG_CFGX(cs), reg_cfg.u64);

}



/**

/*

 * Called after libata determines the needed PIO mode. This

 * function programs the Octeon bootbus regions to support the

 * timing requirements of the PIO mode.
@@ -278,7 +278,7 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev) 
	cvmx_write_csr(cf_port->dma_base + DMA_TIM, dma_tim.u64);

}



/**

/*

 * Handle an 8 bit I/O request.

 *

 * @qc:         Queued command
@@ -317,7 +317,7 @@ static unsigned int octeon_cf_data_xfer8(struct ata_queued_cmd *qc, 
	return buflen;

}



/**

/*

 * Handle a 16 bit I/O request.

 *

 * @qc:         Queued command
@@ -372,7 +372,7 @@ static unsigned int octeon_cf_data_xfer16(struct ata_queued_cmd *qc, 
	return buflen;

}



/**

/*

 * Read the taskfile for 16bit non-True IDE only.

 */

static void octeon_cf_tf_read16(struct ata_port *ap, struct ata_taskfile *tf)
@@ -453,7 +453,7 @@ static int octeon_cf_softreset16(struct ata_link *link, unsigned int *classes, 
	return 0;

}



/**

/*

 * Load the taskfile for 16bit non-True IDE only.  The device_addr is

 * not loaded, we do this as part of octeon_cf_exec_command16.

 */
@@ -525,7 +525,7 @@ static void octeon_cf_dma_setup(struct ata_queued_cmd *qc) 
	ap->ops->sff_exec_command(ap, &qc->tf);

}



/**

/*

 * Start a DMA transfer that was already setup

 *

 * @qc:     Information about the DMA
@@ -580,7 +580,7 @@ static void octeon_cf_dma_start(struct ata_queued_cmd *qc) 
	cvmx_write_csr(cf_port->dma_base + DMA_CFG, mio_boot_dma_cfg.u64);

}



/**

/*

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)