Commit e38d9e83 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

scsi: sd: Use cached ATA Information VPD page 

Since the ATA Information VPD is now cached at device discovery time it is
no longer necessary to request this page when we configure WRITE SAME.
Instead use the cached information to determine if this disk sits behind a
SCSI-ATA translation layer.

Link: https://lore.kernel.org/r/20220302053559.32147-7-martin.petersen@oracle.com


Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d657700c

drivers/scsi/sd.c

+5 −3
Original line number Diff line number Diff line
@@ -2996,8 +2996,7 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer) 
	}



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, INQUIRY) < 0) {

		/* too large values might cause issues with arcmsr */

		int vpd_buf_len = 64;

		struct scsi_vpd *vpd;



		sdev->no_report_opcodes = 1;
@@ -3005,8 +3004,11 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer) 
		 * CODES is unsupported and the device has an ATA

		 * Information VPD page (SAT).

		 */

		if (!scsi_get_vpd_page(sdev, 0x89, buffer, vpd_buf_len))

		rcu_read_lock();

		vpd = rcu_dereference(sdev->vpd_pg89);

		if (vpd)

			sdev->no_write_same = 1;

		rcu_read_unlock();

	}



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, WRITE_SAME_16) == 1)