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

Commit 95fea2f1 authored by Asai Thambi S P's avatar Asai Thambi S P Committed by Jens Axboe
Browse files

mtip32xx: dump tagmap on failure 



Dump tagmap on failure, instead of individual tags.

Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c74b0f58

drivers/block/mtip32xx/mtip32xx.c

+33 −29
Original line number Diff line number Diff line
@@ -525,6 +525,25 @@ static void mtip_restart_port(struct mtip_port *port) 


}



/*

 * Helper function for tag logging

 */

static void print_tags(struct driver_data *dd,

			char *msg,

			unsigned long *tagbits,

			int cnt)

{

	unsigned char tagmap[128];

	int group, tagmap_len = 0;



	memset(tagmap, 0, sizeof(tagmap));

	for (group = SLOTBITS_IN_LONGS; group > 0; group--)

		tagmap_len = sprintf(tagmap + tagmap_len, "%016lX ",

						tagbits[group-1]);

	dev_warn(&dd->pdev->dev,

			"%d command(s) %s: tagmap [%s]", cnt, msg, tagmap);

}



/*

 * Called periodically to see if any read/write commands are

 * taking too long to complete.
@@ -542,7 +561,7 @@ static void mtip_timeout_function(unsigned long int data) 
	int tag, cmdto_cnt = 0;

	unsigned int bit, group;

	unsigned int num_command_slots = port->dd->slot_groups * 32;

	unsigned long to;

	unsigned long to, tagaccum[SLOTBITS_IN_LONGS];



	if (unlikely(!port))

		return;
@@ -552,6 +571,8 @@ static void mtip_timeout_function(unsigned long int data) 
			jiffies + msecs_to_jiffies(30000));

		return;

	}

	/* clear the tag accumulator */

	memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));



	for (tag = 0; tag < num_command_slots; tag++) {

		/*
@@ -569,9 +590,7 @@ static void mtip_timeout_function(unsigned long int data) 
			command = &port->commands[tag];

			fis = (struct host_to_dev_fis *) command->command;



			dev_warn(&port->dd->pdev->dev,

				"Timeout for command tag %d\n", tag);



			set_bit(tag, tagaccum);

			cmdto_cnt++;

			if (cmdto_cnt == 1)

				set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
@@ -608,9 +627,8 @@ static void mtip_timeout_function(unsigned long int data) 
	}



	if (cmdto_cnt && !test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags)) {

		dev_warn(&port->dd->pdev->dev,

			"%d commands timed out: restarting port",

			cmdto_cnt);

		print_tags(port->dd, "timed out", tagaccum, cmdto_cnt);



		mtip_restart_port(port);

		clear_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);

		wake_up_interruptible(&port->svc_wait);
@@ -733,23 +751,6 @@ static void mtip_null_completion(struct mtip_port *port, 
	return;

}



/*

 * Helper function for tag logging

 */

static void print_tags(struct driver_data *dd,

			char *msg,

			unsigned long *tagbits)

{

	unsigned int tag, count = 0;



	for (tag = 0; tag < (dd->slot_groups) * 32; tag++) {

		if (test_bit(tag, tagbits))

			count++;

	}

	if (count)

		dev_info(&dd->pdev->dev, "%s [%i tags]\n", msg, count);

}



static int mtip_read_log_page(struct mtip_port *port, u8 page, u16 *buffer,

				dma_addr_t buffer_dma, unsigned int sectors);

static int mtip_get_smart_attr(struct mtip_port *port, unsigned int id,
@@ -770,6 +771,7 @@ static void mtip_handle_tfe(struct driver_data *dd) 
	u32 completed;

	struct host_to_dev_fis *fis;

	unsigned long tagaccum[SLOTBITS_IN_LONGS];

	unsigned int cmd_cnt = 0;

	unsigned char *buf;

	char *fail_reason = NULL;

	int fail_all_ncq_write = 0, fail_all_ncq_cmds = 0;
@@ -781,6 +783,9 @@ static void mtip_handle_tfe(struct driver_data *dd) 
	/* Stop the timer to prevent command timeouts. */

	del_timer(&port->cmd_timer);



	/* clear the tag accumulator */

	memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));



	/* Set eh_active */

	set_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);
@@ -791,9 +796,6 @@ static void mtip_handle_tfe(struct driver_data *dd) 
		/* clear completed status register in the hardware.*/

		writel(completed, port->completed[group]);



		/* clear the tag accumulator */

		memset(tagaccum, 0, SLOTBITS_IN_LONGS * sizeof(long));



		/* Process successfully completed commands */

		for (bit = 0; bit < 32 && completed; bit++) {

			if (!(completed & (1<<bit)))
@@ -807,6 +809,7 @@ static void mtip_handle_tfe(struct driver_data *dd) 
			cmd = &port->commands[tag];

			if (likely(cmd->comp_func)) {

				set_bit(tag, tagaccum);

				cmd_cnt++;

				atomic_set(&cmd->active, 0);

				cmd->comp_func(port,

					 tag,
@@ -824,7 +827,8 @@ static void mtip_handle_tfe(struct driver_data *dd) 
			}

		}

	}

	print_tags(dd, "TFE tags completed:", tagaccum);



	print_tags(dd, "completed (TFE)", tagaccum, cmd_cnt);



	/* Restart the port */

	mdelay(20);
@@ -934,7 +938,7 @@ static void mtip_handle_tfe(struct driver_data *dd) 
					tag);

		}

	}

	print_tags(dd, "TFE tags reissued:", tagaccum);

	print_tags(dd, "reissued (TFE)", tagaccum, cmd_cnt);



	/* clear eh_active */

	clear_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags);