Reapply "ata: libata-scsi: Honor the D_SENSE bit for CK_COND=1 and no error"

xanmod · xanmod · commit bc497dfc4bcc · 2024-08-19T16:47:13.000Z
This reverts commit 3de895d.
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
@@ -941,11 +941,8 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
 				   &sense_key, &asc, &ascq);
 		ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);
 	} else {
-		/*
-		 * ATA PASS-THROUGH INFORMATION AVAILABLE
-		 * Always in descriptor format sense.
-		 */
-		scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D);
+		/* ATA PASS-THROUGH INFORMATION AVAILABLE */
+		ata_scsi_set_sense(qc->dev, cmd, RECOVERED_ERROR, 0, 0x1D);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -941,11 +941,8 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)`
`941`	`941`	`&sense_key, &asc, &ascq);`
`942`	`942`	`ata_scsi_set_sense(qc->dev, cmd, sense_key, asc, ascq);`
`943`	`943`	`} else {`
`944`		`- /*`
`945`		`- * ATA PASS-THROUGH INFORMATION AVAILABLE`
`946`		`- * Always in descriptor format sense.`
`947`		`- */`
`948`		`- scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D);`
	`944`	`+ /* ATA PASS-THROUGH INFORMATION AVAILABLE */`
	`945`	`+ ata_scsi_set_sense(qc->dev, cmd, RECOVERED_ERROR, 0, 0x1D);`
`949`	`946`	`}`
`950`	`947`	`}`
`951`	`948`