Commit 7a7aecd9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata fix from Niklas Cassel:

 - Fix the handling of ATA commands that timeout (command that did not
   receive a completion interrupt within the configured timeout time).

   Commands that timeout, while also having either the FAILFAST flag
   set, or the command being a passthrough command, should never be
   retried. Restore this behavior (as it was before v6.12-rc1).

* tag 'ata-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: libata: Set DID_TIME_OUT for commands that actually timed out
parents 01154cc3 8e59a2a5

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, 
			/* the scmd has an associated qc */

			if (!(qc->flags & ATA_QCFLAG_EH)) {

				/* which hasn't failed yet, timeout */

				set_host_byte(scmd, DID_TIME_OUT);

				qc->err_mask |= AC_ERR_TIMEOUT;

				qc->flags |= ATA_QCFLAG_EH;

				nr_timedout++;