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

Commit 78062c50 authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Tejun Heo
Browse files

libata: cleanup SAT error translation 



- Remove duplicate Medium Error Entry.

- Fix translations to match SAT2 translation table.

- Remove warning messages when translation is not found when decoding
  error or status register.

- Goes through status register decoding when only ABRT bit is set in
  error register.

Tested: When a disk fails, it sets

  Status = 0x71 [DRDY DF ERR] , Error = 0x4 [ABRT]

This patch will make the sense key HARDWARE_ERROR instead.

When there is a simple command syntax error:

  Status = 0x51 [DRDY ERR] , Error = 0x4 [ABRT]

The sense key remains ABORTED_COMMAND.

tj: Some updates to the description and comments.

Signed-off-by: default avatarGwendal Grignou <gwendal@google.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 1e8f5f76

drivers/ata/libata-scsi.c

+17 −20
Original line number Diff line number Diff line
@@ -850,14 +850,13 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, 
		{0x01, 		MEDIUM_ERROR, 0x13, 0x00}, 	// Address mark not found       Address mark not found for data field

		/* TRK0 */

		{0x02, 		HARDWARE_ERROR, 0x00, 0x00}, 	// Track 0 not found		Hardware error

		/* Abort & !ICRC */

		{0x04, 		ABORTED_COMMAND, 0x00, 0x00}, 	// Aborted command              Aborted command

		/* Abort: 0x04 is not translated here, see below */

		/* Media change request */

		{0x08, 		NOT_READY, 0x04, 0x00}, 	// Media change request	  FIXME: faking offline

		/* SRV */

		{0x10, 		ABORTED_COMMAND, 0x14, 0x00}, 	// ID not found                 Recorded entity not found

		/* Media change */

		{0x08,  	NOT_READY, 0x04, 0x00}, 	// Media change		  FIXME: faking offline

		/* SRV/IDNF */

		{0x10, 		ILLEGAL_REQUEST, 0x21, 0x00}, 	// ID not found                 Logical address out of range

		/* MC */

		{0x20, 		UNIT_ATTENTION, 0x28, 0x00}, 	// Media Changed		Not ready to ready change, medium may have changed

		/* ECC */

		{0x40, 		MEDIUM_ERROR, 0x11, 0x04}, 	// Uncorrectable ECC error      Unrecovered read error

		/* BBD - block marked bad */
@@ -867,7 +866,7 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, 
	static const unsigned char stat_table[][4] = {

		/* Must be first because BUSY means no other bits valid */

		{0x80, 		ABORTED_COMMAND, 0x47, 0x00},	// Busy, fake parity for now

		{0x20, 		HARDWARE_ERROR,  0x00, 0x00}, 	// Device fault

		{0x20, 		HARDWARE_ERROR,  0x44, 0x00}, 	// Device fault, internal target failure

		{0x08, 		ABORTED_COMMAND, 0x47, 0x00},	// Timed out in xfer, fake parity for now

		{0x04, 		RECOVERED_ERROR, 0x11, 0x00},	// Recovered ECC error	  Medium error, recovered

		{0xFF, 0xFF, 0xFF, 0xFF}, // END mark
@@ -892,13 +891,13 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, 
				goto translate_done;

			}

		}

		/* No immediate match */

		if (verbose)

			printk(KERN_WARNING "ata%u: no sense translation for "

			       "error 0x%02x\n", id, drv_err);

	}



	/* Fall back to interpreting status bits */

	/*

	 * Fall back to interpreting status bits.  Note that if the drv_err

	 * has only the ABRT bit set, we decode drv_stat.  ABRT by itself

	 * is not descriptive enough.

	 */

	for (i = 0; stat_table[i][0] != 0xFF; i++) {

		if (stat_table[i][0] & drv_stat) {

			*sk = stat_table[i][1];
@@ -907,13 +906,11 @@ static void ata_to_sense_error(unsigned id, u8 drv_stat, u8 drv_err, u8 *sk, 
			goto translate_done;

		}

	}

	/* No error?  Undecoded? */

	if (verbose)

		printk(KERN_WARNING "ata%u: no sense translation for "

		       "status: 0x%02x\n", id, drv_stat);



	/* We need a sensible error return here, which is tricky, and one

	   that won't cause people to do things like return a disk wrongly */

	/*

	 * We need a sensible error return here, which is tricky, and one

	 * that won't cause people to do things like return a disk wrongly.

	 */

	*sk = ABORTED_COMMAND;

	*asc = 0x00;

	*ascq = 0x00;