Commit 41d4c60f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata: libata-scsi: rework ata_dump_status to avoid using pr_cont() 



pr_cont() has the problem that individual calls will be disrupted
under high load, causing each call to end up on a single line and
thereby mangling the output.
So rework ata_dump_status() to have just one call to ata_port_warn()
and avoid this problem.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent cbc59b8c

drivers/ata/libata-scsi.c

+23 −28
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc) 


/**

 *	ata_dump_status - user friendly display of error info

 *	@id: id of the port in question

 *	@ap: the port in question

 *	@tf: ptr to filled out taskfile

 *

 *	Decode and dump the ATA error/status registers for the user so
@@ -678,37 +678,32 @@ static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc) 
 *	LOCKING:

 *	inherited from caller

 */

static void ata_dump_status(unsigned id, struct ata_taskfile *tf)

static void ata_dump_status(struct ata_port *ap, struct ata_taskfile *tf)

{

	u8 stat = tf->command, err = tf->feature;



	pr_warn("ata%u: status=0x%02x { ", id, stat);

	if (stat & ATA_BUSY) {

		pr_cont("Busy }\n");	/* Data is not valid in this case */

		ata_port_warn(ap, "status=0x%02x {Busy} ", stat);

	} else {

		if (stat & ATA_DRDY)	pr_cont("DriveReady ");

		if (stat & ATA_DF)	pr_cont("DeviceFault ");

		if (stat & ATA_DSC)	pr_cont("SeekComplete ");

		if (stat & ATA_DRQ)	pr_cont("DataRequest ");

		if (stat & ATA_CORR)	pr_cont("CorrectedError ");

		if (stat & ATA_SENSE)	pr_cont("Sense ");

		if (stat & ATA_ERR)	pr_cont("Error ");

		pr_cont("}\n");



		if (err) {

			pr_warn("ata%u: error=0x%02x { ", id, err);

			if (err & ATA_ABORTED)	pr_cont("DriveStatusError ");

			if (err & ATA_ICRC) {

				if (err & ATA_ABORTED)

						pr_cont("BadCRC ");

				else		pr_cont("Sector ");

			}

			if (err & ATA_UNC)	pr_cont("UncorrectableError ");

			if (err & ATA_IDNF)	pr_cont("SectorIdNotFound ");

			if (err & ATA_TRK0NF)	pr_cont("TrackZeroNotFound ");

			if (err & ATA_AMNF)	pr_cont("AddrMarkNotFound ");

			pr_cont("}\n");

		}

		ata_port_warn(ap, "status=0x%02x { %s%s%s%s%s%s%s} ", stat,

			      stat & ATA_DRDY ? "DriveReady " : "",

			      stat & ATA_DF ? "DeviceFault " : "",

			      stat & ATA_DSC ? "SeekComplete " : "",

			      stat & ATA_DRQ ? "DataRequest " : "",

			      stat & ATA_CORR ? "CorrectedError " : "",

			      stat & ATA_SENSE ? "Sense " : "",

			      stat & ATA_ERR ? "Error " : "");

		if (err)

			ata_port_warn(ap, "error=0x%02x {%s%s%s%s%s%s", err,

				      err & ATA_ABORTED ?

				      "DriveStatusError " : "",

				      err & ATA_ICRC ?

				      (err & ATA_ABORTED ?

				       "BadCRC " : "Sector ") : "",

				      err & ATA_UNC ? "UncorrectableError " : "",

				      err & ATA_IDNF ? "SectorIdNotFound " : "",

				      err & ATA_TRK0NF ? "TrackZeroNotFound " : "",

				      err & ATA_AMNF ? "AddrMarkNotFound " : "");

	}

}
@@ -1662,7 +1657,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) 
		cmd->result = SAM_STAT_GOOD;



	if (need_sense && !ap->ops->error_handler)

		ata_dump_status(ap->print_id, &qc->result_tf);

		ata_dump_status(ap, &qc->result_tf);



	ata_qc_done(qc);

}