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

Commit 5390cfc3 authored by scameron@beardog.cca.cpqcorp.net's avatar scameron@beardog.cca.cpqcorp.net Committed by Jens Axboe
Browse files

cciss: factor out core of sendcmd_withirq() for use by SCSI error handling code 



Factor the core of sendcmd_withirq out to provide a simpler interface
which provides access to full error information.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cca.cpqcorp.net>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 40df6ae4

drivers/block/cciss.c

+96 −87
Original line number Diff line number Diff line
@@ -2278,92 +2278,79 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, size_ 
	return status;

}



static int sendcmd_withirq(__u8 cmd,

			   int ctlr,

			   void *buff,

			   size_t size,

			   unsigned int use_unit_num,

			   unsigned int log_unit, __u8 page_code, int cmd_type)

static int sendcmd_withirq_core(ctlr_info_t *h, CommandList_struct *c)

{

	ctlr_info_t *h = hba[ctlr];

	CommandList_struct *c;

	DECLARE_COMPLETION_ONSTACK(wait);

	u64bit buff_dma_handle;

	unsigned long flags;

	int return_status;

	DECLARE_COMPLETION_ONSTACK(wait);

	int return_status = IO_OK;



	if ((c = cmd_alloc(h, 0)) == NULL)

		return -ENOMEM;

	return_status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num,

				 log_unit, page_code, NULL, cmd_type);

	if (return_status != IO_OK) {

		cmd_free(h, c, 0);

		return return_status;

	}

resend_cmd2:

	c->waiting = &wait;



	/* Put the request on the tail of the queue and send it */

	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);

	spin_lock_irqsave(CCISS_LOCK(h->ctlr), flags);

	addQ(&h->reqQ, c);

	h->Qdepth++;

	start_io(h);

	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);

	spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags);



	wait_for_completion(&wait);



	if (c->err_info->CommandStatus != 0) {	/* an error has occurred */

	if (c->err_info->CommandStatus == 0)

		goto command_done;



	switch (c->err_info->CommandStatus) {

	case CMD_TARGET_STATUS:

			printk(KERN_WARNING "cciss: cmd %p has "

			       " completed with errors\n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x "

		"has completed with errors\n", c->Request.CDB[0]);

		if (c->err_info->ScsiStatus) {

				printk(KERN_WARNING "cciss: cmd %p "

			printk(KERN_WARNING "cciss: cmd 0x%02x "

			       "has SCSI Status = %x\n",

				       c, c->err_info->ScsiStatus);

			       c->Request.CDB[0], c->err_info->ScsiStatus);

		}



		break;

	case CMD_DATA_UNDERRUN:

	case CMD_DATA_OVERRUN:

			/* expected for inquire and report lun commands */

		/* expected for inquiry and report lun commands */

		break;

	case CMD_INVALID:

			printk(KERN_WARNING "cciss: Cmd %p is "

			       "reported invalid\n", c);

		printk(KERN_WARNING "cciss: Cmd 0x%02x is "

		       "reported invalid\n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_PROTOCOL_ERR:

			printk(KERN_WARNING "cciss: cmd %p has "

			       "protocol error \n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x has "

		       "protocol error \n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_HARDWARE_ERR:

			printk(KERN_WARNING "cciss: cmd %p had "

			       " hardware error\n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x had "

		       " hardware error\n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_CONNECTION_LOST:

			printk(KERN_WARNING "cciss: cmd %p had "

			       "connection lost\n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x had "

		       "connection lost\n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_ABORTED:

			printk(KERN_WARNING "cciss: cmd %p was "

			       "aborted\n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x was "

		       "aborted\n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_ABORT_FAILED:

			printk(KERN_WARNING "cciss: cmd %p reports "

			       "abort failed\n", c);

		printk(KERN_WARNING "cciss: cmd 0x%02x reports "

		       "abort failed\n", c->Request.CDB[0]);

		return_status = IO_ERROR;

		break;

	case CMD_UNSOLICITED_ABORT:

		printk(KERN_WARNING

			       "cciss%d: unsolicited abort %p\n", ctlr, c);

		       "cciss%d: unsolicited abort 0x%02x\n", h->ctlr,

			c->Request.CDB[0]);

		if (c->retry_count < MAX_CMD_RETRIES) {

			printk(KERN_WARNING

				       "cciss%d: retrying %p\n", ctlr, c);

			       "cciss%d: retrying 0x%02x\n", h->ctlr,

				c->Request.CDB[0]);

			c->retry_count++;

			/* erase the old error information */

			memset(c->err_info, 0,
@@ -2375,17 +2362,39 @@ static int sendcmd_withirq(__u8 cmd, 
		return_status = IO_ERROR;

		break;

	default:

			printk(KERN_WARNING "cciss: cmd %p returned "

			       "unknown status %x\n", c,

		printk(KERN_WARNING "cciss: cmd 0x%02x returned "

		       "unknown status %x\n", c->Request.CDB[0],

		       c->err_info->CommandStatus);

		return_status = IO_ERROR;

	}

	}



command_done:

	/* unlock the buffers from DMA */

	buff_dma_handle.val32.lower = c->SG[0].Addr.lower;

	buff_dma_handle.val32.upper = c->SG[0].Addr.upper;

	pci_unmap_single(h->pdev, (dma_addr_t) buff_dma_handle.val,

			 c->SG[0].Len, PCI_DMA_BIDIRECTIONAL);

	return return_status;

}



static int sendcmd_withirq(__u8 cmd,

			   int ctlr,

			   void *buff,

			   size_t size,

			   unsigned int use_unit_num,

			   unsigned int log_unit, __u8 page_code, int cmd_type)

{

	ctlr_info_t *h = hba[ctlr];

	CommandList_struct *c;

	int return_status;



	c = cmd_alloc(h, 0);

	if (!c)

		return -ENOMEM;

	return_status = fill_cmd(c, cmd, ctlr, buff, size, use_unit_num,

				 log_unit, page_code, NULL, cmd_type);

	if (return_status == IO_OK)

		return_status = sendcmd_withirq_core(h, c);

	cmd_free(h, c, 0);

	return return_status;

}