Merge tag 'libata-5.9-2020-09-04' of git://git.kernel.dk/linux-block (d824e080) · Commits · 戴 / test

drivers/ata/ahci.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -807,8 +807,7 @@ static int ahci_avn_hardreset(struct ata_link link, unsigned int class,
		(sstatus & 0xf) != 1)
		break;

		ata_link_printk(link, KERN_INFO, "avn bounce port%d\n",
		port);
		ata_link_info(link, "avn bounce port%d\n", port);

		pci_read_config_word(pdev, 0x92, &val);
		val &= ~(1 << port);

+2 −3

Original line number	Diff line number	Diff line
		@@ -3868,9 +3868,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
		/* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */
		{ "C300-CTFDDAC128MAG", "0001", ATA_HORKAGE_NONCQ, },

		/* Some Sandisk SSDs lock up hard with NCQ enabled. Reported on
		SD7SN6S256G and SD8SN8U256G */
		{ "SanDisk SD[78]SN*G", NULL, ATA_HORKAGE_NONCQ, },
		/* Sandisk SD7/8/9s lock up hard on large trims */
		{ "SanDisk SD[789]*", NULL, ATA_HORKAGE_MAX_TRIM_128M, },

		/* devices which puke on READ_NATIVE_MAX */
		{ "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, },

+7 −1

Original line number	Diff line number	Diff line
		@@ -2080,6 +2080,7 @@ static unsigned int ata_scsiop_inq_89(struct ata_scsi_args args, u8 rbuf)

		static unsigned int ata_scsiop_inq_b0(struct ata_scsi_args args, u8 rbuf)
		{
		struct ata_device *dev = args->dev;
		u16 min_io_sectors;

		rbuf[1] = 0xb0;
		@@ -2105,7 +2106,12 @@ static unsigned int ata_scsiop_inq_b0(struct ata_scsi_args args, u8 rbuf)
		* with the unmap bit set.
		*/
		if (ata_id_has_trim(args->id)) {
		put_unaligned_be64(65535 * ATA_MAX_TRIM_RNUM, &rbuf[36]);
		u64 max_blocks = 65535 * ATA_MAX_TRIM_RNUM;

		if (dev->horkage & ATA_HORKAGE_MAX_TRIM_128M)
		max_blocks = 128 << (20 - SECTOR_SHIFT);

		put_unaligned_be64(max_blocks, &rbuf[36]);
		put_unaligned_be32(1, &rbuf[28]);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,7 @@ enum {
		ATA_HORKAGE_NO_DMA_LOG = (1 << 23), /* don't use DMA for log read */
		ATA_HORKAGE_NOTRIM = (1 << 24), /* don't use TRIM */
		ATA_HORKAGE_MAX_SEC_1024 = (1 << 25), /* Limit max sects to 1024 */
		ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */

		/* DMA mask for user DMA control: User visible values; DO NOT
		renumber */