Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 492bf621 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Tejun Heo
Browse files

libata-eh: Set 'information' field for autosense 



If NCQ autosense or the sense data reporting feature is enabled
the LBA of the offending command should be stored in the sense
data 'information' field.

tj: s/(u64)-1/U64_MAX/

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent cf8b49b0

drivers/ata/libata-eh.c

+2 −0
Original line number Diff line number Diff line
@@ -1856,6 +1856,8 @@ void ata_eh_analyze_ncq_error(struct ata_link *link) 
		asc = (qc->result_tf.auxiliary >> 8) & 0xff;

		ascq = qc->result_tf.auxiliary & 0xff;

		ata_scsi_set_sense(qc->scsicmd, sense_key, asc, ascq);

		ata_scsi_set_sense_information(dev, qc->scsicmd,

					       &qc->result_tf);

		qc->flags |= ATA_QCFLAG_SENSE_VALID;

	}

drivers/ata/libata-scsi.c

+17 −0
Original line number Diff line number Diff line
@@ -280,6 +280,23 @@ void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq) 
	scsi_build_sense_buffer(0, cmd->sense_buffer, sk, asc, ascq);

}



void ata_scsi_set_sense_information(struct ata_device *dev,

				    struct scsi_cmnd *cmd,

				    const struct ata_taskfile *tf)

{

	u64 information;



	if (!cmd)

		return;



	information = ata_tf_read_block(tf, dev);

	if (information == U64_MAX)

		return;



	scsi_set_sense_information(cmd->sense_buffer,

				   SCSI_SENSE_BUFFERSIZE, information);

}



static ssize_t

ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t count)

drivers/ata/libata.h

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ extern int ata_scsi_add_hosts(struct ata_host *host, 
extern void ata_scsi_scan_host(struct ata_port *ap, int sync);

extern int ata_scsi_offline_dev(struct ata_device *dev);

extern void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq);

extern void ata_scsi_set_sense_information(struct ata_device *dev,

					   struct scsi_cmnd *cmd,

					   const struct ata_taskfile *tf);

extern void ata_scsi_media_change_notify(struct ata_device *dev);

extern void ata_scsi_hotplug(struct work_struct *work);

extern void ata_schedule_scsi_eh(struct Scsi_Host *shost);