diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 3484 | 
1 files changed, 2872 insertions, 612 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index f64b65a770b..2df11daad85 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -1,7 +1,7 @@  /*******************************************************************   * This file is part of the Emulex Linux Device Driver for         *   * Fibre Channel Host Bus Adapters.                                * - * Copyright (C) 2004-2009 Emulex.  All rights reserved.           * + * Copyright (C) 2004-2014 Emulex.  All rights reserved.           *   * EMULEX and SLI are trademarks of Emulex.                        *   * www.emulex.com                                                  *   * Portions Copyright (C) 2004-2005 Christoph Hellwig              * @@ -21,8 +21,11 @@  #include <linux/pci.h>  #include <linux/slab.h>  #include <linux/interrupt.h> +#include <linux/export.h>  #include <linux/delay.h>  #include <asm/unaligned.h> +#include <linux/crc-t10dif.h> +#include <net/checksum.h>  #include <scsi/scsi.h>  #include <scsi/scsi_device.h> @@ -38,8 +41,8 @@  #include "lpfc_sli4.h"  #include "lpfc_nl.h"  #include "lpfc_disc.h" -#include "lpfc_scsi.h"  #include "lpfc.h" +#include "lpfc_scsi.h"  #include "lpfc_logmsg.h"  #include "lpfc_crtn.h"  #include "lpfc_vport.h" @@ -47,21 +50,41 @@  #define LPFC_RESET_WAIT  2  #define LPFC_ABORT_WAIT  2 -int _dump_buf_done; +int _dump_buf_done = 1;  static char *dif_op_str[] = { -	"SCSI_PROT_NORMAL", -	"SCSI_PROT_READ_INSERT", -	"SCSI_PROT_WRITE_STRIP", -	"SCSI_PROT_READ_STRIP", -	"SCSI_PROT_WRITE_INSERT", -	"SCSI_PROT_READ_PASS", -	"SCSI_PROT_WRITE_PASS", +	"PROT_NORMAL", +	"PROT_READ_INSERT", +	"PROT_WRITE_STRIP", +	"PROT_READ_STRIP", +	"PROT_WRITE_INSERT", +	"PROT_READ_PASS", +	"PROT_WRITE_PASS", +}; + +struct scsi_dif_tuple { +	__be16 guard_tag;       /* Checksum */ +	__be16 app_tag;         /* Opaque storage */ +	__be32 ref_tag;         /* Target LBA or indirect LBA */  }; + +static struct lpfc_rport_data * +lpfc_rport_data_from_scsi_device(struct scsi_device *sdev) +{ +	struct lpfc_vport *vport = (struct lpfc_vport *)sdev->host->hostdata; + +	if (vport->phba->cfg_fof) +		return ((struct lpfc_device_data *)sdev->hostdata)->rport_data; +	else +		return (struct lpfc_rport_data *)sdev->hostdata; +} +  static void  lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb);  static void  lpfc_release_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb); +static int +lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc);  static void  lpfc_debug_save_data(struct lpfc_hba *phba, struct scsi_cmnd *cmnd) @@ -120,6 +143,30 @@ lpfc_debug_save_dif(struct lpfc_hba *phba, struct scsi_cmnd *cmnd)  	}  } +static inline unsigned +lpfc_cmd_blksize(struct scsi_cmnd *sc) +{ +	return sc->device->sector_size; +} + +#define LPFC_CHECK_PROTECT_GUARD	1 +#define LPFC_CHECK_PROTECT_REF		2 +static inline unsigned +lpfc_cmd_protect(struct scsi_cmnd *sc, int flag) +{ +	return 1; +} + +static inline unsigned +lpfc_cmd_guard_csum(struct scsi_cmnd *sc) +{ +	if (lpfc_prot_group_type(NULL, sc) == LPFC_PG_TYPE_NO_DIF) +		return 0; +	if (scsi_host_get_guard(sc->device->host) == SHOST_DIX_GUARD_IP) +		return 1; +	return 0; +} +  /**   * lpfc_sli4_set_rsp_sgl_last - Set the last bit in the response sge.   * @phba: Pointer to HBA object. @@ -268,9 +315,27 @@ lpfc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)  	unsigned long new_queue_depth, old_queue_depth;  	old_queue_depth = sdev->queue_depth; -	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth); + +	switch (reason) { +	case SCSI_QDEPTH_DEFAULT: +		/* change request from sysfs, fall through */ +	case SCSI_QDEPTH_RAMP_UP: +		scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth); +		break; +	case SCSI_QDEPTH_QFULL: +		if (scsi_track_queue_full(sdev, qdepth) == 0) +			return sdev->queue_depth; + +		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, +				 "0711 detected queue full - lun queue " +				 "depth adjusted to %d.\n", sdev->queue_depth); +		break; +	default: +		return -EOPNOTSUPP; +	} +  	new_queue_depth = sdev->queue_depth; -	rdata = sdev->hostdata; +	rdata = lpfc_rport_data_from_scsi_device(sdev);  	if (rdata)  		lpfc_send_sdev_queuedepth_change_event(phba, vport,  						       rdata->pnode, sdev->lun, @@ -280,6 +345,26 @@ lpfc_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)  }  /** + * lpfc_change_queue_type() - Change a device's scsi tag queuing type + * @sdev: Pointer the scsi device whose queue depth is to change + * @tag_type: Identifier for queue tag type + */ +static int +lpfc_change_queue_type(struct scsi_device *sdev, int tag_type) +{ +	if (sdev->tagged_supported) { +		scsi_set_tag_type(sdev, tag_type); +		if (tag_type) +			scsi_activate_tcq(sdev, sdev->queue_depth); +		else +			scsi_deactivate_tcq(sdev, sdev->queue_depth); +	} else +		tag_type = 0; + +	return tag_type; +} + +/**   * lpfc_rampdown_queue_depth - Post RAMP_DOWN_QUEUE event to worker thread   * @phba: The Hba for which this call is being executed.   * @@ -321,50 +406,6 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)  }  /** - * lpfc_rampup_queue_depth - Post RAMP_UP_QUEUE event for worker thread - * @phba: The Hba for which this call is being executed. - * - * This routine post WORKER_RAMP_UP_QUEUE event for @phba vport. This routine - * post at most 1 event every 5 minute after last_ramp_up_time or - * last_rsrc_error_time.  This routine wakes up worker thread of @phba - * to process WORKER_RAM_DOWN_EVENT event. - * - * This routine should be called with no lock held. - **/ -static inline void -lpfc_rampup_queue_depth(struct lpfc_vport  *vport, -			uint32_t queue_depth) -{ -	unsigned long flags; -	struct lpfc_hba *phba = vport->phba; -	uint32_t evt_posted; -	atomic_inc(&phba->num_cmd_success); - -	if (vport->cfg_lun_queue_depth <= queue_depth) -		return; -	spin_lock_irqsave(&phba->hbalock, flags); -	if (time_before(jiffies, -			phba->last_ramp_up_time + QUEUE_RAMP_UP_INTERVAL) || -	    time_before(jiffies, -			phba->last_rsrc_error_time + QUEUE_RAMP_UP_INTERVAL)) { -		spin_unlock_irqrestore(&phba->hbalock, flags); -		return; -	} -	phba->last_ramp_up_time = jiffies; -	spin_unlock_irqrestore(&phba->hbalock, flags); - -	spin_lock_irqsave(&phba->pport->work_port_lock, flags); -	evt_posted = phba->pport->work_port_events & WORKER_RAMP_UP_QUEUE; -	if (!evt_posted) -		phba->pport->work_port_events |= WORKER_RAMP_UP_QUEUE; -	spin_unlock_irqrestore(&phba->pport->work_port_lock, flags); - -	if (!evt_posted) -		lpfc_worker_wake_up(phba); -	return; -} - -/**   * lpfc_ramp_down_queue_handler - WORKER_RAMP_DOWN_QUEUE event handler   * @phba: The Hba for which this call is being executed.   * @@ -385,6 +426,14 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)  	num_rsrc_err = atomic_read(&phba->num_rsrc_err);  	num_cmd_success = atomic_read(&phba->num_cmd_success); +	/* +	 * The error and success command counters are global per +	 * driver instance.  If another handler has already +	 * operated on this error event, just exit. +	 */ +	if (num_rsrc_err == 0) +		return; +  	vports = lpfc_create_vport_work_array(phba);  	if (vports != NULL)  		for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) { @@ -408,41 +457,6 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)  }  /** - * lpfc_ramp_up_queue_handler - WORKER_RAMP_UP_QUEUE event handler - * @phba: The Hba for which this call is being executed. - * - * This routine is called to  process WORKER_RAMP_UP_QUEUE event for worker - * thread.This routine increases queue depth for all scsi device on each vport - * associated with @phba by 1. This routine also sets @phba num_rsrc_err and - * num_cmd_success to zero. - **/ -void -lpfc_ramp_up_queue_handler(struct lpfc_hba *phba) -{ -	struct lpfc_vport **vports; -	struct Scsi_Host  *shost; -	struct scsi_device *sdev; -	int i; - -	vports = lpfc_create_vport_work_array(phba); -	if (vports != NULL) -		for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) { -			shost = lpfc_shost_from_vport(vports[i]); -			shost_for_each_device(sdev, shost) { -				if (vports[i]->cfg_lun_queue_depth <= -				    sdev->queue_depth) -					continue; -				lpfc_change_queue_depth(sdev, -							sdev->queue_depth+1, -							SCSI_QDEPTH_RAMP_UP); -			} -		} -	lpfc_destroy_vport_work_array(phba, vports); -	atomic_set(&phba->num_rsrc_err, 0); -	atomic_set(&phba->num_cmd_success, 0); -} - -/**   * lpfc_scsi_dev_block - set all scsi hosts to block state   * @phba: Pointer to HBA context object.   * @@ -498,7 +512,16 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)  	dma_addr_t pdma_phys_fcp_rsp;  	dma_addr_t pdma_phys_bpl;  	uint16_t iotag; -	int bcnt; +	int bcnt, bpl_size; + +	bpl_size = phba->cfg_sg_dma_buf_size - +		(sizeof(struct fcp_cmnd) + sizeof(struct fcp_rsp)); + +	lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +			 "9067 ALLOC %d scsi_bufs: %d (%d + %d + %d)\n", +			 num_to_alloc, phba->cfg_sg_dma_buf_size, +			 (int)sizeof(struct fcp_cmnd), +			 (int)sizeof(struct fcp_rsp), bpl_size);  	for (bcnt = 0; bcnt < num_to_alloc; bcnt++) {  		psb = kzalloc(sizeof(struct lpfc_scsi_buf), GFP_KERNEL); @@ -577,7 +600,7 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)  			iocb->un.fcpi64.bdl.addrHigh = 0;  			iocb->ulpBdeCount = 0;  			iocb->ulpLe = 0; -			/* fill in responce BDE */ +			/* fill in response BDE */  			iocb->unsli3.fcp_ext.rbde.tus.f.bdeFlags =  							BUFF_TYPE_BDE_64;  			iocb->unsli3.fcp_ext.rbde.tus.f.bdeSize = @@ -609,6 +632,32 @@ lpfc_new_scsi_buf_s3(struct lpfc_vport *vport, int num_to_alloc)  }  /** + * lpfc_sli4_vport_delete_fcp_xri_aborted -Remove all ndlp references for vport + * @vport: pointer to lpfc vport data structure. + * + * This routine is invoked by the vport cleanup for deletions and the cleanup + * for an ndlp on removal. + **/ +void +lpfc_sli4_vport_delete_fcp_xri_aborted(struct lpfc_vport *vport) +{ +	struct lpfc_hba *phba = vport->phba; +	struct lpfc_scsi_buf *psb, *next_psb; +	unsigned long iflag = 0; + +	spin_lock_irqsave(&phba->hbalock, iflag); +	spin_lock(&phba->sli4_hba.abts_scsi_buf_list_lock); +	list_for_each_entry_safe(psb, next_psb, +				&phba->sli4_hba.lpfc_abts_scsi_buf_list, list) { +		if (psb->rdata && psb->rdata->pnode +			&& psb->rdata->pnode->vport == vport) +			psb->rdata = NULL; +	} +	spin_unlock(&phba->sli4_hba.abts_scsi_buf_list_lock); +	spin_unlock_irqrestore(&phba->hbalock, iflag); +} + +/**   * lpfc_sli4_fcp_xri_aborted - Fast-path process of fcp xri abort   * @phba: pointer to lpfc hba data structure.   * @axri: pointer to the fcp xri abort wcqe structure. @@ -621,10 +670,13 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,  			  struct sli4_wcqe_xri_aborted *axri)  {  	uint16_t xri = bf_get(lpfc_wcqe_xa_xri, axri); +	uint16_t rxid = bf_get(lpfc_wcqe_xa_remote_xid, axri);  	struct lpfc_scsi_buf *psb, *next_psb;  	unsigned long iflag = 0;  	struct lpfc_iocbq *iocbq;  	int i; +	struct lpfc_nodelist *ndlp; +	int rrq_empty = 0;  	struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];  	spin_lock_irqsave(&phba->hbalock, iflag); @@ -637,8 +689,21 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,  			psb->status = IOSTAT_SUCCESS;  			spin_unlock(  				&phba->sli4_hba.abts_scsi_buf_list_lock); +			if (psb->rdata && psb->rdata->pnode) +				ndlp = psb->rdata->pnode; +			else +				ndlp = NULL; + +			rrq_empty = list_empty(&phba->active_rrq_list);  			spin_unlock_irqrestore(&phba->hbalock, iflag); +			if (ndlp) { +				lpfc_set_rrq_active(phba, ndlp, +					psb->cur_iocbq.sli4_lxritag, rxid, 1); +				lpfc_sli4_abts_err_handler(phba, ndlp, axri); +			}  			lpfc_release_scsi_buf_s4(phba, psb); +			if (rrq_empty) +				lpfc_worker_wake_up(phba);  			return;  		}  	} @@ -654,7 +719,7 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,  		psb = container_of(iocbq, struct lpfc_scsi_buf, cur_iocbq);  		psb->exch_busy = 0;  		spin_unlock_irqrestore(&phba->hbalock, iflag); -		if (pring->txq_cnt) +		if (!list_empty(&pring->txq))  			lpfc_worker_wake_up(phba);  		return; @@ -663,65 +728,168 @@ lpfc_sli4_fcp_xri_aborted(struct lpfc_hba *phba,  }  /** - * lpfc_sli4_repost_scsi_sgl_list - Repsot the Scsi buffers sgl pages as block + * lpfc_sli4_post_scsi_sgl_list - Psot blocks of scsi buffer sgls from a list   * @phba: pointer to lpfc hba data structure. + * @post_sblist: pointer to the scsi buffer list.   * - * This routine walks the list of scsi buffers that have been allocated and - * repost them to the HBA by using SGL block post. This is needed after a - * pci_function_reset/warm_start or start. The lpfc_hba_down_post_s4 routine - * is responsible for moving all scsi buffers on the lpfc_abts_scsi_sgl_list - * to the lpfc_scsi_buf_list. If the repost fails, reject all scsi buffers. + * This routine walks a list of scsi buffers that was passed in. It attempts + * to construct blocks of scsi buffer sgls which contains contiguous xris and + * uses the non-embedded SGL block post mailbox commands to post to the port. + * For single SCSI buffer sgl with non-contiguous xri, if any, it shall use + * embedded SGL post mailbox command for posting. The @post_sblist passed in + * must be local list, thus no lock is needed when manipulate the list.   * - * Returns: 0 = success, non-zero failure. + * Returns: 0 = failure, non-zero number of successfully posted buffers.   **/  int -lpfc_sli4_repost_scsi_sgl_list(struct lpfc_hba *phba) +lpfc_sli4_post_scsi_sgl_list(struct lpfc_hba *phba, +			     struct list_head *post_sblist, int sb_count)  { -	struct lpfc_scsi_buf *psb; -	int index, status, bcnt = 0, rcnt = 0, rc = 0; -	LIST_HEAD(sblist); - -	for (index = 0; index < phba->sli4_hba.scsi_xri_cnt; index++) { -		psb = phba->sli4_hba.lpfc_scsi_psb_array[index]; -		if (psb) { -			/* Remove from SCSI buffer list */ -			list_del(&psb->list); -			/* Add it to a local SCSI buffer list */ -			list_add_tail(&psb->list, &sblist); -			if (++rcnt == LPFC_NEMBED_MBOX_SGL_CNT) { -				bcnt = rcnt; -				rcnt = 0; +	struct lpfc_scsi_buf *psb, *psb_next; +	int status, sgl_size; +	int post_cnt = 0, block_cnt = 0, num_posting = 0, num_posted = 0; +	dma_addr_t pdma_phys_bpl1; +	int last_xritag = NO_XRI; +	LIST_HEAD(prep_sblist); +	LIST_HEAD(blck_sblist); +	LIST_HEAD(scsi_sblist); + +	/* sanity check */ +	if (sb_count <= 0) +		return -EINVAL; + +	sgl_size = phba->cfg_sg_dma_buf_size - +		(sizeof(struct fcp_cmnd) + sizeof(struct fcp_rsp)); + +	list_for_each_entry_safe(psb, psb_next, post_sblist, list) { +		list_del_init(&psb->list); +		block_cnt++; +		if ((last_xritag != NO_XRI) && +		    (psb->cur_iocbq.sli4_xritag != last_xritag + 1)) { +			/* a hole in xri block, form a sgl posting block */ +			list_splice_init(&prep_sblist, &blck_sblist); +			post_cnt = block_cnt - 1; +			/* prepare list for next posting block */ +			list_add_tail(&psb->list, &prep_sblist); +			block_cnt = 1; +		} else { +			/* prepare list for next posting block */ +			list_add_tail(&psb->list, &prep_sblist); +			/* enough sgls for non-embed sgl mbox command */ +			if (block_cnt == LPFC_NEMBED_MBOX_SGL_CNT) { +				list_splice_init(&prep_sblist, &blck_sblist); +				post_cnt = block_cnt; +				block_cnt = 0;  			} -		} else -			/* A hole present in the XRI array, need to skip */ -			bcnt = rcnt; +		} +		num_posting++; +		last_xritag = psb->cur_iocbq.sli4_xritag; -		if (index == phba->sli4_hba.scsi_xri_cnt - 1) -			/* End of XRI array for SCSI buffer, complete */ -			bcnt = rcnt; +		/* end of repost sgl list condition for SCSI buffers */ +		if (num_posting == sb_count) { +			if (post_cnt == 0) { +				/* last sgl posting block */ +				list_splice_init(&prep_sblist, &blck_sblist); +				post_cnt = block_cnt; +			} else if (block_cnt == 1) { +				/* last single sgl with non-contiguous xri */ +				if (sgl_size > SGL_PAGE_SIZE) +					pdma_phys_bpl1 = psb->dma_phys_bpl + +								SGL_PAGE_SIZE; +				else +					pdma_phys_bpl1 = 0; +				status = lpfc_sli4_post_sgl(phba, +						psb->dma_phys_bpl, +						pdma_phys_bpl1, +						psb->cur_iocbq.sli4_xritag); +				if (status) { +					/* failure, put on abort scsi list */ +					psb->exch_busy = 1; +				} else { +					/* success, put on SCSI buffer list */ +					psb->exch_busy = 0; +					psb->status = IOSTAT_SUCCESS; +					num_posted++; +				} +				/* success, put on SCSI buffer sgl list */ +				list_add_tail(&psb->list, &scsi_sblist); +			} +		} -		/* Continue until collect up to a nembed page worth of sgls */ -		if (bcnt == 0) +		/* continue until a nembed page worth of sgls */ +		if (post_cnt == 0)  			continue; -		/* Now, post the SCSI buffer list sgls as a block */ -		status = lpfc_sli4_post_scsi_sgl_block(phba, &sblist, bcnt); -		/* Reset SCSI buffer count for next round of posting */ -		bcnt = 0; -		while (!list_empty(&sblist)) { -			list_remove_head(&sblist, psb, struct lpfc_scsi_buf, -					 list); + +		/* post block of SCSI buffer list sgls */ +		status = lpfc_sli4_post_scsi_sgl_block(phba, &blck_sblist, +						       post_cnt); + +		/* don't reset xirtag due to hole in xri block */ +		if (block_cnt == 0) +			last_xritag = NO_XRI; + +		/* reset SCSI buffer post count for next round of posting */ +		post_cnt = 0; + +		/* put posted SCSI buffer-sgl posted on SCSI buffer sgl list */ +		while (!list_empty(&blck_sblist)) { +			list_remove_head(&blck_sblist, psb, +					 struct lpfc_scsi_buf, list);  			if (status) { -				/* Put this back on the abort scsi list */ +				/* failure, put on abort scsi list */  				psb->exch_busy = 1; -				rc++;  			} else { +				/* success, put on SCSI buffer list */  				psb->exch_busy = 0;  				psb->status = IOSTAT_SUCCESS; +				num_posted++;  			} -			/* Put it back into the SCSI buffer list */ -			lpfc_release_scsi_buf_s4(phba, psb); +			list_add_tail(&psb->list, &scsi_sblist);  		}  	} +	/* Push SCSI buffers with sgl posted to the availble list */ +	while (!list_empty(&scsi_sblist)) { +		list_remove_head(&scsi_sblist, psb, +				 struct lpfc_scsi_buf, list); +		lpfc_release_scsi_buf_s4(phba, psb); +	} +	return num_posted; +} + +/** + * lpfc_sli4_repost_scsi_sgl_list - Repsot all the allocated scsi buffer sgls + * @phba: pointer to lpfc hba data structure. + * + * This routine walks the list of scsi buffers that have been allocated and + * repost them to the port by using SGL block post. This is needed after a + * pci_function_reset/warm_start or start. The lpfc_hba_down_post_s4 routine + * is responsible for moving all scsi buffers on the lpfc_abts_scsi_sgl_list + * to the lpfc_scsi_buf_list. If the repost fails, reject all scsi buffers. + * + * Returns: 0 = success, non-zero failure. + **/ +int +lpfc_sli4_repost_scsi_sgl_list(struct lpfc_hba *phba) +{ +	LIST_HEAD(post_sblist); +	int num_posted, rc = 0; + +	/* get all SCSI buffers need to repost to a local list */ +	spin_lock_irq(&phba->scsi_buf_list_get_lock); +	spin_lock(&phba->scsi_buf_list_put_lock); +	list_splice_init(&phba->lpfc_scsi_buf_list_get, &post_sblist); +	list_splice(&phba->lpfc_scsi_buf_list_put, &post_sblist); +	spin_unlock(&phba->scsi_buf_list_put_lock); +	spin_unlock_irq(&phba->scsi_buf_list_get_lock); + +	/* post the list of scsi buffer sgls to port if available */ +	if (!list_empty(&post_sblist)) { +		num_posted = lpfc_sli4_post_scsi_sgl_list(phba, &post_sblist, +						phba->sli4_hba.scsi_xri_cnt); +		/* failed to post any scsi buffer, return error */ +		if (num_posted == 0) +			rc = -EIO; +	}  	return rc;  } @@ -730,12 +898,13 @@ lpfc_sli4_repost_scsi_sgl_list(struct lpfc_hba *phba)   * @vport: The virtual port for which this call being executed.   * @num_to_allocate: The requested number of buffers to allocate.   * - * This routine allocates a scsi buffer for device with SLI-4 interface spec, + * This routine allocates scsi buffers for device with SLI-4 interface spec,   * the scsi buffer contains all the necessary information needed to initiate - * a SCSI I/O. + * a SCSI I/O. After allocating up to @num_to_allocate SCSI buffers and put + * them on a list, it post them to the port by using SGL block post.   *   * Return codes: - *   int - number of scsi buffers that were allocated. + *   int - number of scsi buffers that were allocated and posted.   *   0 = failure, less than num_to_alloc is a partial failure.   **/  static int @@ -747,23 +916,31 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)  	IOCB_t *iocb;  	dma_addr_t pdma_phys_fcp_cmd;  	dma_addr_t pdma_phys_fcp_rsp; -	dma_addr_t pdma_phys_bpl, pdma_phys_bpl1; -	uint16_t iotag, last_xritag = NO_XRI; -	int status = 0, index; -	int bcnt; -	int non_sequential_xri = 0; -	LIST_HEAD(sblist); +	dma_addr_t pdma_phys_bpl; +	uint16_t iotag, lxri = 0; +	int bcnt, num_posted, sgl_size; +	LIST_HEAD(prep_sblist); +	LIST_HEAD(post_sblist); +	LIST_HEAD(scsi_sblist); + +	sgl_size = phba->cfg_sg_dma_buf_size - +		(sizeof(struct fcp_cmnd) + sizeof(struct fcp_rsp)); + +	lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +			 "9068 ALLOC %d scsi_bufs: %d (%d + %d + %d)\n", +			 num_to_alloc, phba->cfg_sg_dma_buf_size, sgl_size, +			 (int)sizeof(struct fcp_cmnd), +			 (int)sizeof(struct fcp_rsp));  	for (bcnt = 0; bcnt < num_to_alloc; bcnt++) {  		psb = kzalloc(sizeof(struct lpfc_scsi_buf), GFP_KERNEL);  		if (!psb)  			break; -  		/* -		 * Get memory from the pci pool to map the virt space to pci bus -		 * space for an I/O.  The DMA buffer includes space for the -		 * struct fcp_cmnd, struct fcp_rsp and the number of bde's -		 * necessary to support the sg_tablesize. +		 * Get memory from the pci pool to map the virt space to +		 * pci bus space for an I/O. The DMA buffer includes space +		 * for the struct fcp_cmnd, struct fcp_rsp and the number +		 * of bde's necessary to support the sg_tablesize.  		 */  		psb->data = pci_pool_alloc(phba->lpfc_scsi_dma_buf_pool,  						GFP_KERNEL, &psb->dma_handle); @@ -771,57 +948,63 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)  			kfree(psb);  			break;  		} - -		/* Initialize virtual ptrs to dma_buf region. */  		memset(psb->data, 0, phba->cfg_sg_dma_buf_size); -		/* Allocate iotag for psb->cur_iocbq. */ -		iotag = lpfc_sli_next_iotag(phba, &psb->cur_iocbq); -		if (iotag == 0) { +		/* +		 * 4K Page alignment is CRITICAL to BlockGuard, double check +		 * to be sure. +		 */ +		if (phba->cfg_enable_bg  && (((unsigned long)(psb->data) & +		    (unsigned long)(SLI4_PAGE_SIZE - 1)) != 0)) {  			pci_pool_free(phba->lpfc_scsi_dma_buf_pool, -				psb->data, psb->dma_handle); +				      psb->data, psb->dma_handle);  			kfree(psb);  			break;  		} -		psb->cur_iocbq.sli4_xritag = lpfc_sli4_next_xritag(phba); -		if (psb->cur_iocbq.sli4_xritag == NO_XRI) { + +		lxri = lpfc_sli4_next_xritag(phba); +		if (lxri == NO_XRI) {  			pci_pool_free(phba->lpfc_scsi_dma_buf_pool,  			      psb->data, psb->dma_handle);  			kfree(psb);  			break;  		} -		if (last_xritag != NO_XRI -			&& psb->cur_iocbq.sli4_xritag != (last_xritag+1)) { -			non_sequential_xri = 1; -		} else -			list_add_tail(&psb->list, &sblist); -		last_xritag = psb->cur_iocbq.sli4_xritag; -		index = phba->sli4_hba.scsi_xri_cnt++; +		/* Allocate iotag for psb->cur_iocbq. */ +		iotag = lpfc_sli_next_iotag(phba, &psb->cur_iocbq); +		if (iotag == 0) { +			pci_pool_free(phba->lpfc_scsi_dma_buf_pool, +				psb->data, psb->dma_handle); +			kfree(psb); +			lpfc_printf_log(phba, KERN_ERR, LOG_FCP, +					"3368 Failed to allocated IOTAG for" +					" XRI:0x%x\n", lxri); +			lpfc_sli4_free_xri(phba, lxri); +			break; +		} +		psb->cur_iocbq.sli4_lxritag = lxri; +		psb->cur_iocbq.sli4_xritag = phba->sli4_hba.xri_ids[lxri];  		psb->cur_iocbq.iocb_flag |= LPFC_IO_FCP; -  		psb->fcp_bpl = psb->data; -		psb->fcp_cmnd = (psb->data + phba->cfg_sg_dma_buf_size) -			- (sizeof(struct fcp_cmnd) + sizeof(struct fcp_rsp)); +		psb->fcp_cmnd = (psb->data + sgl_size);  		psb->fcp_rsp = (struct fcp_rsp *)((uint8_t *)psb->fcp_cmnd +  					sizeof(struct fcp_cmnd));  		/* Initialize local short-hand pointers. */  		sgl = (struct sli4_sge *)psb->fcp_bpl;  		pdma_phys_bpl = psb->dma_handle; -		pdma_phys_fcp_cmd = -			(psb->dma_handle + phba->cfg_sg_dma_buf_size) -			 - (sizeof(struct fcp_cmnd) + sizeof(struct fcp_rsp)); +		pdma_phys_fcp_cmd = (psb->dma_handle + sgl_size);  		pdma_phys_fcp_rsp = pdma_phys_fcp_cmd + sizeof(struct fcp_cmnd);  		/* -		 * The first two bdes are the FCP_CMD and FCP_RSP.  The balance -		 * are sg list bdes.  Initialize the first two and leave the -		 * rest for queuecommand. +		 * The first two bdes are the FCP_CMD and FCP_RSP. +		 * The balance are sg list bdes. Initialize the +		 * first two and leave the rest for queuecommand.  		 */  		sgl->addr_hi = cpu_to_le32(putPaddrHigh(pdma_phys_fcp_cmd));  		sgl->addr_lo = cpu_to_le32(putPaddrLow(pdma_phys_fcp_cmd)); +		sgl->word2 = le32_to_cpu(sgl->word2);  		bf_set(lpfc_sli4_sge_last, sgl, 0);  		sgl->word2 = cpu_to_le32(sgl->word2);  		sgl->sge_len = cpu_to_le32(sizeof(struct fcp_cmnd)); @@ -830,6 +1013,7 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)  		/* Setup the physical region for the FCP RSP */  		sgl->addr_hi = cpu_to_le32(putPaddrHigh(pdma_phys_fcp_rsp));  		sgl->addr_lo = cpu_to_le32(putPaddrLow(pdma_phys_fcp_rsp)); +		sgl->word2 = le32_to_cpu(sgl->word2);  		bf_set(lpfc_sli4_sge_last, sgl, 1);  		sgl->word2 = cpu_to_le32(sgl->word2);  		sgl->sge_len = cpu_to_le32(sizeof(struct fcp_rsp)); @@ -851,48 +1035,27 @@ lpfc_new_scsi_buf_s4(struct lpfc_vport *vport, int num_to_alloc)  		iocb->ulpBdeCount = 1;  		iocb->ulpLe = 1;  		iocb->ulpClass = CLASS3; -		psb->cur_iocbq.context1  = psb; -		if (phba->cfg_sg_dma_buf_size > SGL_PAGE_SIZE) -			pdma_phys_bpl1 = pdma_phys_bpl + SGL_PAGE_SIZE; -		else -			pdma_phys_bpl1 = 0; +		psb->cur_iocbq.context1 = psb;  		psb->dma_phys_bpl = pdma_phys_bpl; -		phba->sli4_hba.lpfc_scsi_psb_array[index] = psb; -		if (non_sequential_xri) { -			status = lpfc_sli4_post_sgl(phba, pdma_phys_bpl, -						pdma_phys_bpl1, -						psb->cur_iocbq.sli4_xritag); -			if (status) { -				/* Put this back on the abort scsi list */ -				psb->exch_busy = 1; -			} else { -				psb->exch_busy = 0; -				psb->status = IOSTAT_SUCCESS; -			} -			/* Put it back into the SCSI buffer list */ -			lpfc_release_scsi_buf_s4(phba, psb); -			break; -		} -	} -	if (bcnt) { -		status = lpfc_sli4_post_scsi_sgl_block(phba, &sblist, bcnt); -		/* Reset SCSI buffer count for next round of posting */ -		while (!list_empty(&sblist)) { -			list_remove_head(&sblist, psb, struct lpfc_scsi_buf, -				 list); -			if (status) { -				/* Put this back on the abort scsi list */ -				psb->exch_busy = 1; -			} else { -				psb->exch_busy = 0; -				psb->status = IOSTAT_SUCCESS; -			} -			/* Put it back into the SCSI buffer list */ -			lpfc_release_scsi_buf_s4(phba, psb); -		} + +		/* add the scsi buffer to a post list */ +		list_add_tail(&psb->list, &post_sblist); +		spin_lock_irq(&phba->scsi_buf_list_get_lock); +		phba->sli4_hba.scsi_xri_cnt++; +		spin_unlock_irq(&phba->scsi_buf_list_get_lock);  	} +	lpfc_printf_log(phba, KERN_INFO, LOG_BG, +			"3021 Allocate %d out of %d requested new SCSI " +			"buffers\n", bcnt, num_to_alloc); + +	/* post the list of scsi buffer sgls to port if available */ +	if (!list_empty(&post_sblist)) +		num_posted = lpfc_sli4_post_scsi_sgl_list(phba, +							  &post_sblist, bcnt); +	else +		num_posted = 0; -	return bcnt + non_sequential_xri; +	return num_posted;  }  /** @@ -914,7 +1077,7 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport, int num_to_alloc)  }  /** - * lpfc_get_scsi_buf - Get a scsi buffer from lpfc_scsi_buf_list of the HBA + * lpfc_get_scsi_buf_s3 - Get a scsi buffer from lpfc_scsi_buf_list of the HBA   * @phba: The HBA for which this call is being executed.   *   * This routine removes a scsi buffer from head of @phba lpfc_scsi_buf_list list @@ -925,22 +1088,92 @@ lpfc_new_scsi_buf(struct lpfc_vport *vport, int num_to_alloc)   *   Pointer to lpfc_scsi_buf - Success   **/  static struct lpfc_scsi_buf* -lpfc_get_scsi_buf(struct lpfc_hba * phba) +lpfc_get_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)  {  	struct  lpfc_scsi_buf * lpfc_cmd = NULL; -	struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list; +	struct list_head *scsi_buf_list_get = &phba->lpfc_scsi_buf_list_get; +	unsigned long iflag = 0; + +	spin_lock_irqsave(&phba->scsi_buf_list_get_lock, iflag); +	list_remove_head(scsi_buf_list_get, lpfc_cmd, struct lpfc_scsi_buf, +			 list); +	if (!lpfc_cmd) { +		spin_lock(&phba->scsi_buf_list_put_lock); +		list_splice(&phba->lpfc_scsi_buf_list_put, +			    &phba->lpfc_scsi_buf_list_get); +		INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list_put); +		list_remove_head(scsi_buf_list_get, lpfc_cmd, +				 struct lpfc_scsi_buf, list); +		spin_unlock(&phba->scsi_buf_list_put_lock); +	} +	spin_unlock_irqrestore(&phba->scsi_buf_list_get_lock, iflag); +	return  lpfc_cmd; +} +/** + * lpfc_get_scsi_buf_s4 - Get a scsi buffer from lpfc_scsi_buf_list of the HBA + * @phba: The HBA for which this call is being executed. + * + * This routine removes a scsi buffer from head of @phba lpfc_scsi_buf_list list + * and returns to caller. + * + * Return codes: + *   NULL - Error + *   Pointer to lpfc_scsi_buf - Success + **/ +static struct lpfc_scsi_buf* +lpfc_get_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) +{ +	struct lpfc_scsi_buf *lpfc_cmd, *lpfc_cmd_next;  	unsigned long iflag = 0; +	int found = 0; -	spin_lock_irqsave(&phba->scsi_buf_list_lock, iflag); -	list_remove_head(scsi_buf_list, lpfc_cmd, struct lpfc_scsi_buf, list); -	if (lpfc_cmd) { -		lpfc_cmd->seg_cnt = 0; -		lpfc_cmd->nonsg_phys = 0; -		lpfc_cmd->prot_seg_cnt = 0; +	spin_lock_irqsave(&phba->scsi_buf_list_get_lock, iflag); +	list_for_each_entry_safe(lpfc_cmd, lpfc_cmd_next, +				 &phba->lpfc_scsi_buf_list_get, list) { +		if (lpfc_test_rrq_active(phba, ndlp, +					 lpfc_cmd->cur_iocbq.sli4_lxritag)) +			continue; +		list_del(&lpfc_cmd->list); +		found = 1; +		break;  	} -	spin_unlock_irqrestore(&phba->scsi_buf_list_lock, iflag); +	if (!found) { +		spin_lock(&phba->scsi_buf_list_put_lock); +		list_splice(&phba->lpfc_scsi_buf_list_put, +			    &phba->lpfc_scsi_buf_list_get); +		INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list_put); +		spin_unlock(&phba->scsi_buf_list_put_lock); +		list_for_each_entry_safe(lpfc_cmd, lpfc_cmd_next, +					 &phba->lpfc_scsi_buf_list_get, list) { +			if (lpfc_test_rrq_active( +				phba, ndlp, lpfc_cmd->cur_iocbq.sli4_lxritag)) +				continue; +			list_del(&lpfc_cmd->list); +			found = 1; +			break; +		} +	} +	spin_unlock_irqrestore(&phba->scsi_buf_list_get_lock, iflag); +	if (!found) +		return NULL;  	return  lpfc_cmd;  } +/** + * lpfc_get_scsi_buf - Get a scsi buffer from lpfc_scsi_buf_list of the HBA + * @phba: The HBA for which this call is being executed. + * + * This routine removes a scsi buffer from head of @phba lpfc_scsi_buf_list list + * and returns to caller. + * + * Return codes: + *   NULL - Error + *   Pointer to lpfc_scsi_buf - Success + **/ +static struct lpfc_scsi_buf* +lpfc_get_scsi_buf(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp) +{ +	return  phba->lpfc_get_scsi_buf(phba, ndlp); +}  /**   * lpfc_release_scsi_buf - Return a scsi buffer back to hba scsi buf list @@ -955,10 +1188,15 @@ lpfc_release_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb)  {  	unsigned long iflag = 0; -	spin_lock_irqsave(&phba->scsi_buf_list_lock, iflag); +	psb->seg_cnt = 0; +	psb->nonsg_phys = 0; +	psb->prot_seg_cnt = 0; + +	spin_lock_irqsave(&phba->scsi_buf_list_put_lock, iflag);  	psb->pCmd = NULL; -	list_add_tail(&psb->list, &phba->lpfc_scsi_buf_list); -	spin_unlock_irqrestore(&phba->scsi_buf_list_lock, iflag); +	psb->cur_iocbq.iocb_flag = LPFC_IO_FCP; +	list_add_tail(&psb->list, &phba->lpfc_scsi_buf_list_put); +	spin_unlock_irqrestore(&phba->scsi_buf_list_put_lock, iflag);  }  /** @@ -976,6 +1214,10 @@ lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb)  {  	unsigned long iflag = 0; +	psb->seg_cnt = 0; +	psb->nonsg_phys = 0; +	psb->prot_seg_cnt = 0; +  	if (psb->exch_busy) {  		spin_lock_irqsave(&phba->sli4_hba.abts_scsi_buf_list_lock,  					iflag); @@ -985,11 +1227,11 @@ lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb)  		spin_unlock_irqrestore(&phba->sli4_hba.abts_scsi_buf_list_lock,  					iflag);  	} else { - -		spin_lock_irqsave(&phba->scsi_buf_list_lock, iflag);  		psb->pCmd = NULL; -		list_add_tail(&psb->list, &phba->lpfc_scsi_buf_list); -		spin_unlock_irqrestore(&phba->scsi_buf_list_lock, iflag); +		psb->cur_iocbq.iocb_flag = LPFC_IO_FCP; +		spin_lock_irqsave(&phba->scsi_buf_list_put_lock, iflag); +		list_add_tail(&psb->list, &phba->lpfc_scsi_buf_list_put); +		spin_unlock_irqrestore(&phba->scsi_buf_list_put_lock, iflag);  	}  } @@ -1063,6 +1305,7 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  			       "dma_map_sg.  Config %d, seg_cnt %d\n",  			       __func__, phba->cfg_sg_seg_cnt,  			       lpfc_cmd->seg_cnt); +			lpfc_cmd->seg_cnt = 0;  			scsi_dma_unmap(scsi_cmnd);  			return 1;  		} @@ -1124,10 +1367,10 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  				     (2 * sizeof(struct ulp_bde64)));  			data_bde->addrHigh = putPaddrHigh(physaddr);  			data_bde->addrLow = putPaddrLow(physaddr); -			/* ebde count includes the responce bde and data bpl */ +			/* ebde count includes the response bde and data bpl */  			iocb_cmd->unsli3.fcp_ext.ebde_count = 2;  		} else { -			/* ebde count includes the responce bde and data bdes */ +			/* ebde count includes the response bde and data bdes */  			iocb_cmd->unsli3.fcp_ext.ebde_count = (num_bde + 1);  		}  	} else { @@ -1145,136 +1388,583 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  	return 0;  } -/* - * Given a scsi cmnd, determine the BlockGuard opcodes to be used with it +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS + +/* Return if if error injection is detected by Initiator */ +#define BG_ERR_INIT	0x1 +/* Return if if error injection is detected by Target */ +#define BG_ERR_TGT	0x2 +/* Return if if swapping CSUM<-->CRC is required for error injection */ +#define BG_ERR_SWAP	0x10 +/* Return if disabling Guard/Ref/App checking is required for error injection */ +#define BG_ERR_CHECK	0x20 + +/** + * lpfc_bg_err_inject - Determine if we should inject an error + * @phba: The Hba for which this call is being executed. + * @sc: The SCSI command to examine + * @reftag: (out) BlockGuard reference tag for transmitted data + * @apptag: (out) BlockGuard application tag for transmitted data + * @new_guard (in) Value to replace CRC with if needed + * + * Returns BG_ERR_* bit mask or 0 if request ignored + **/ +static int +lpfc_bg_err_inject(struct lpfc_hba *phba, struct scsi_cmnd *sc, +		uint32_t *reftag, uint16_t *apptag, uint32_t new_guard) +{ +	struct scatterlist *sgpe; /* s/g prot entry */ +	struct scatterlist *sgde; /* s/g data entry */ +	struct lpfc_scsi_buf *lpfc_cmd = NULL; +	struct scsi_dif_tuple *src = NULL; +	struct lpfc_nodelist *ndlp; +	struct lpfc_rport_data *rdata; +	uint32_t op = scsi_get_prot_op(sc); +	uint32_t blksize; +	uint32_t numblks; +	sector_t lba; +	int rc = 0; +	int blockoff = 0; + +	if (op == SCSI_PROT_NORMAL) +		return 0; + +	sgpe = scsi_prot_sglist(sc); +	sgde = scsi_sglist(sc); +	lba = scsi_get_lba(sc); + +	/* First check if we need to match the LBA */ +	if (phba->lpfc_injerr_lba != LPFC_INJERR_LBA_OFF) { +		blksize = lpfc_cmd_blksize(sc); +		numblks = (scsi_bufflen(sc) + blksize - 1) / blksize; + +		/* Make sure we have the right LBA if one is specified */ +		if ((phba->lpfc_injerr_lba < lba) || +			(phba->lpfc_injerr_lba >= (lba + numblks))) +			return 0; +		if (sgpe) { +			blockoff = phba->lpfc_injerr_lba - lba; +			numblks = sg_dma_len(sgpe) / +				sizeof(struct scsi_dif_tuple); +			if (numblks < blockoff) +				blockoff = numblks; +		} +	} + +	/* Next check if we need to match the remote NPortID or WWPN */ +	rdata = lpfc_rport_data_from_scsi_device(sc->device); +	if (rdata && rdata->pnode) { +		ndlp = rdata->pnode; + +		/* Make sure we have the right NPortID if one is specified */ +		if (phba->lpfc_injerr_nportid  && +			(phba->lpfc_injerr_nportid != ndlp->nlp_DID)) +			return 0; + +		/* +		 * Make sure we have the right WWPN if one is specified. +		 * wwn[0] should be a non-zero NAA in a good WWPN. +		 */ +		if (phba->lpfc_injerr_wwpn.u.wwn[0]  && +			(memcmp(&ndlp->nlp_portname, &phba->lpfc_injerr_wwpn, +				sizeof(struct lpfc_name)) != 0)) +			return 0; +	} + +	/* Setup a ptr to the protection data if the SCSI host provides it */ +	if (sgpe) { +		src = (struct scsi_dif_tuple *)sg_virt(sgpe); +		src += blockoff; +		lpfc_cmd = (struct lpfc_scsi_buf *)sc->host_scribble; +	} + +	/* Should we change the Reference Tag */ +	if (reftag) { +		if (phba->lpfc_injerr_wref_cnt) { +			switch (op) { +			case SCSI_PROT_WRITE_PASS: +				if (src) { +					/* +					 * For WRITE_PASS, force the error +					 * to be sent on the wire. It should +					 * be detected by the Target. +					 * If blockoff != 0 error will be +					 * inserted in middle of the IO. +					 */ + +					lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9076 BLKGRD: Injecting reftag error: " +					"write lba x%lx + x%x oldrefTag x%x\n", +					(unsigned long)lba, blockoff, +					be32_to_cpu(src->ref_tag)); + +					/* +					 * Save the old ref_tag so we can +					 * restore it on completion. +					 */ +					if (lpfc_cmd) { +						lpfc_cmd->prot_data_type = +							LPFC_INJERR_REFTAG; +						lpfc_cmd->prot_data_segment = +							src; +						lpfc_cmd->prot_data = +							src->ref_tag; +					} +					src->ref_tag = cpu_to_be32(0xDEADBEEF); +					phba->lpfc_injerr_wref_cnt--; +					if (phba->lpfc_injerr_wref_cnt == 0) { +						phba->lpfc_injerr_nportid = 0; +						phba->lpfc_injerr_lba = +							LPFC_INJERR_LBA_OFF; +						memset(&phba->lpfc_injerr_wwpn, +						  0, sizeof(struct lpfc_name)); +					} +					rc = BG_ERR_TGT | BG_ERR_CHECK; + +					break; +				} +				/* Drop thru */ +			case SCSI_PROT_WRITE_INSERT: +				/* +				 * For WRITE_INSERT, force the error +				 * to be sent on the wire. It should be +				 * detected by the Target. +				 */ +				/* DEADBEEF will be the reftag on the wire */ +				*reftag = 0xDEADBEEF; +				phba->lpfc_injerr_wref_cnt--; +				if (phba->lpfc_injerr_wref_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +					LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_TGT | BG_ERR_CHECK; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9078 BLKGRD: Injecting reftag error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			case SCSI_PROT_WRITE_STRIP: +				/* +				 * For WRITE_STRIP and WRITE_PASS, +				 * force the error on data +				 * being copied from SLI-Host to SLI-Port. +				 */ +				*reftag = 0xDEADBEEF; +				phba->lpfc_injerr_wref_cnt--; +				if (phba->lpfc_injerr_wref_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_INIT; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9077 BLKGRD: Injecting reftag error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			} +		} +		if (phba->lpfc_injerr_rref_cnt) { +			switch (op) { +			case SCSI_PROT_READ_INSERT: +			case SCSI_PROT_READ_STRIP: +			case SCSI_PROT_READ_PASS: +				/* +				 * For READ_STRIP and READ_PASS, force the +				 * error on data being read off the wire. It +				 * should force an IO error to the driver. +				 */ +				*reftag = 0xDEADBEEF; +				phba->lpfc_injerr_rref_cnt--; +				if (phba->lpfc_injerr_rref_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_INIT; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9079 BLKGRD: Injecting reftag error: " +					"read lba x%lx\n", (unsigned long)lba); +				break; +			} +		} +	} + +	/* Should we change the Application Tag */ +	if (apptag) { +		if (phba->lpfc_injerr_wapp_cnt) { +			switch (op) { +			case SCSI_PROT_WRITE_PASS: +				if (src) { +					/* +					 * For WRITE_PASS, force the error +					 * to be sent on the wire. It should +					 * be detected by the Target. +					 * If blockoff != 0 error will be +					 * inserted in middle of the IO. +					 */ + +					lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9080 BLKGRD: Injecting apptag error: " +					"write lba x%lx + x%x oldappTag x%x\n", +					(unsigned long)lba, blockoff, +					be16_to_cpu(src->app_tag)); + +					/* +					 * Save the old app_tag so we can +					 * restore it on completion. +					 */ +					if (lpfc_cmd) { +						lpfc_cmd->prot_data_type = +							LPFC_INJERR_APPTAG; +						lpfc_cmd->prot_data_segment = +							src; +						lpfc_cmd->prot_data = +							src->app_tag; +					} +					src->app_tag = cpu_to_be16(0xDEAD); +					phba->lpfc_injerr_wapp_cnt--; +					if (phba->lpfc_injerr_wapp_cnt == 0) { +						phba->lpfc_injerr_nportid = 0; +						phba->lpfc_injerr_lba = +							LPFC_INJERR_LBA_OFF; +						memset(&phba->lpfc_injerr_wwpn, +						  0, sizeof(struct lpfc_name)); +					} +					rc = BG_ERR_TGT | BG_ERR_CHECK; +					break; +				} +				/* Drop thru */ +			case SCSI_PROT_WRITE_INSERT: +				/* +				 * For WRITE_INSERT, force the +				 * error to be sent on the wire. It should be +				 * detected by the Target. +				 */ +				/* DEAD will be the apptag on the wire */ +				*apptag = 0xDEAD; +				phba->lpfc_injerr_wapp_cnt--; +				if (phba->lpfc_injerr_wapp_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_TGT | BG_ERR_CHECK; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0813 BLKGRD: Injecting apptag error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			case SCSI_PROT_WRITE_STRIP: +				/* +				 * For WRITE_STRIP and WRITE_PASS, +				 * force the error on data +				 * being copied from SLI-Host to SLI-Port. +				 */ +				*apptag = 0xDEAD; +				phba->lpfc_injerr_wapp_cnt--; +				if (phba->lpfc_injerr_wapp_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_INIT; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0812 BLKGRD: Injecting apptag error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			} +		} +		if (phba->lpfc_injerr_rapp_cnt) { +			switch (op) { +			case SCSI_PROT_READ_INSERT: +			case SCSI_PROT_READ_STRIP: +			case SCSI_PROT_READ_PASS: +				/* +				 * For READ_STRIP and READ_PASS, force the +				 * error on data being read off the wire. It +				 * should force an IO error to the driver. +				 */ +				*apptag = 0xDEAD; +				phba->lpfc_injerr_rapp_cnt--; +				if (phba->lpfc_injerr_rapp_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} +				rc = BG_ERR_INIT; + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0814 BLKGRD: Injecting apptag error: " +					"read lba x%lx\n", (unsigned long)lba); +				break; +			} +		} +	} + + +	/* Should we change the Guard Tag */ +	if (new_guard) { +		if (phba->lpfc_injerr_wgrd_cnt) { +			switch (op) { +			case SCSI_PROT_WRITE_PASS: +				rc = BG_ERR_CHECK; +				/* Drop thru */ + +			case SCSI_PROT_WRITE_INSERT: +				/* +				 * For WRITE_INSERT, force the +				 * error to be sent on the wire. It should be +				 * detected by the Target. +				 */ +				phba->lpfc_injerr_wgrd_cnt--; +				if (phba->lpfc_injerr_wgrd_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} + +				rc |= BG_ERR_TGT | BG_ERR_SWAP; +				/* Signals the caller to swap CRC->CSUM */ + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0817 BLKGRD: Injecting guard error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			case SCSI_PROT_WRITE_STRIP: +				/* +				 * For WRITE_STRIP and WRITE_PASS, +				 * force the error on data +				 * being copied from SLI-Host to SLI-Port. +				 */ +				phba->lpfc_injerr_wgrd_cnt--; +				if (phba->lpfc_injerr_wgrd_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} + +				rc = BG_ERR_INIT | BG_ERR_SWAP; +				/* Signals the caller to swap CRC->CSUM */ + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0816 BLKGRD: Injecting guard error: " +					"write lba x%lx\n", (unsigned long)lba); +				break; +			} +		} +		if (phba->lpfc_injerr_rgrd_cnt) { +			switch (op) { +			case SCSI_PROT_READ_INSERT: +			case SCSI_PROT_READ_STRIP: +			case SCSI_PROT_READ_PASS: +				/* +				 * For READ_STRIP and READ_PASS, force the +				 * error on data being read off the wire. It +				 * should force an IO error to the driver. +				 */ +				phba->lpfc_injerr_rgrd_cnt--; +				if (phba->lpfc_injerr_rgrd_cnt == 0) { +					phba->lpfc_injerr_nportid = 0; +					phba->lpfc_injerr_lba = +						LPFC_INJERR_LBA_OFF; +					memset(&phba->lpfc_injerr_wwpn, +						0, sizeof(struct lpfc_name)); +				} + +				rc = BG_ERR_INIT | BG_ERR_SWAP; +				/* Signals the caller to swap CRC->CSUM */ + +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"0818 BLKGRD: Injecting guard error: " +					"read lba x%lx\n", (unsigned long)lba); +			} +		} +	} + +	return rc; +} +#endif + +/** + * lpfc_sc_to_bg_opcodes - Determine the BlockGuard opcodes to be used with + * the specified SCSI command. + * @phba: The Hba for which this call is being executed.   * @sc: The SCSI command to examine   * @txopt: (out) BlockGuard operation for transmitted data   * @rxopt: (out) BlockGuard operation for received data   *   * Returns: zero on success; non-zero if tx and/or rx op cannot be determined   * - */ + **/  static int  lpfc_sc_to_bg_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		uint8_t *txop, uint8_t *rxop)  { -	uint8_t guard_type = scsi_host_get_guard(sc->device->host);  	uint8_t ret = 0; -	if (guard_type == SHOST_DIX_GUARD_IP) { +	if (lpfc_cmd_guard_csum(sc)) {  		switch (scsi_get_prot_op(sc)) {  		case SCSI_PROT_READ_INSERT:  		case SCSI_PROT_WRITE_STRIP: -			*txop = BG_OP_IN_CSUM_OUT_NODIF;  			*rxop = BG_OP_IN_NODIF_OUT_CSUM; +			*txop = BG_OP_IN_CSUM_OUT_NODIF;  			break;  		case SCSI_PROT_READ_STRIP:  		case SCSI_PROT_WRITE_INSERT: -			*txop = BG_OP_IN_NODIF_OUT_CRC;  			*rxop = BG_OP_IN_CRC_OUT_NODIF; +			*txop = BG_OP_IN_NODIF_OUT_CRC;  			break;  		case SCSI_PROT_READ_PASS:  		case SCSI_PROT_WRITE_PASS: -			*txop = BG_OP_IN_CSUM_OUT_CRC;  			*rxop = BG_OP_IN_CRC_OUT_CSUM; +			*txop = BG_OP_IN_CSUM_OUT_CRC;  			break;  		case SCSI_PROT_NORMAL:  		default:  			lpfc_printf_log(phba, KERN_ERR, LOG_BG, -				"9063 BLKGRD: Bad op/guard:%d/%d combination\n", -					scsi_get_prot_op(sc), guard_type); +				"9063 BLKGRD: Bad op/guard:%d/IP combination\n", +					scsi_get_prot_op(sc));  			ret = 1;  			break;  		} -	} else if (guard_type == SHOST_DIX_GUARD_CRC) { +	} else {  		switch (scsi_get_prot_op(sc)) {  		case SCSI_PROT_READ_STRIP:  		case SCSI_PROT_WRITE_INSERT: -			*txop = BG_OP_IN_NODIF_OUT_CRC;  			*rxop = BG_OP_IN_CRC_OUT_NODIF; +			*txop = BG_OP_IN_NODIF_OUT_CRC;  			break;  		case SCSI_PROT_READ_PASS:  		case SCSI_PROT_WRITE_PASS: -			*txop = BG_OP_IN_CRC_OUT_CRC;  			*rxop = BG_OP_IN_CRC_OUT_CRC; +			*txop = BG_OP_IN_CRC_OUT_CRC;  			break;  		case SCSI_PROT_READ_INSERT:  		case SCSI_PROT_WRITE_STRIP: +			*rxop = BG_OP_IN_NODIF_OUT_CRC; +			*txop = BG_OP_IN_CRC_OUT_NODIF; +			break; +  		case SCSI_PROT_NORMAL:  		default:  			lpfc_printf_log(phba, KERN_ERR, LOG_BG, -				"9075 BLKGRD: Bad op/guard:%d/%d combination\n", -					scsi_get_prot_op(sc), guard_type); +				"9075 BLKGRD: Bad op/guard:%d/CRC combination\n", +					scsi_get_prot_op(sc));  			ret = 1;  			break;  		} -	} else { -		/* unsupported format */ -		BUG();  	}  	return ret;  } -struct scsi_dif_tuple { -	__be16 guard_tag;       /* Checksum */ -	__be16 app_tag;         /* Opaque storage */ -	__be32 ref_tag;         /* Target LBA or indirect LBA */ -}; - -static inline unsigned -lpfc_cmd_blksize(struct scsi_cmnd *sc) -{ -	return sc->device->sector_size; -} - +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS  /** - * lpfc_get_cmd_dif_parms - Extract DIF parameters from SCSI command - * @sc:             in: SCSI command - * @apptagmask:     out: app tag mask - * @apptagval:      out: app tag value - * @reftag:         out: ref tag (reference tag) + * lpfc_bg_err_opcodes - reDetermine the BlockGuard opcodes to be used with + * the specified SCSI command in order to force a guard tag error. + * @phba: The Hba for which this call is being executed. + * @sc: The SCSI command to examine + * @txopt: (out) BlockGuard operation for transmitted data + * @rxopt: (out) BlockGuard operation for received data   * - * Description: - *   Extract DIF parameters from the command if possible.  Otherwise, - *   use default parameters. + * Returns: zero on success; non-zero if tx and/or rx op cannot be determined   *   **/ -static inline void -lpfc_get_cmd_dif_parms(struct scsi_cmnd *sc, uint16_t *apptagmask, -		uint16_t *apptagval, uint32_t *reftag) +static int +lpfc_bg_err_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc, +		uint8_t *txop, uint8_t *rxop)  { -	struct  scsi_dif_tuple *spt; -	unsigned char op = scsi_get_prot_op(sc); -	unsigned int protcnt = scsi_prot_sg_count(sc); -	static int cnt; +	uint8_t ret = 0; + +	if (lpfc_cmd_guard_csum(sc)) { +		switch (scsi_get_prot_op(sc)) { +		case SCSI_PROT_READ_INSERT: +		case SCSI_PROT_WRITE_STRIP: +			*rxop = BG_OP_IN_NODIF_OUT_CRC; +			*txop = BG_OP_IN_CRC_OUT_NODIF; +			break; + +		case SCSI_PROT_READ_STRIP: +		case SCSI_PROT_WRITE_INSERT: +			*rxop = BG_OP_IN_CSUM_OUT_NODIF; +			*txop = BG_OP_IN_NODIF_OUT_CSUM; +			break; -	if (protcnt && (op == SCSI_PROT_WRITE_STRIP || -				op == SCSI_PROT_WRITE_PASS)) { +		case SCSI_PROT_READ_PASS: +		case SCSI_PROT_WRITE_PASS: +			*rxop = BG_OP_IN_CSUM_OUT_CRC; +			*txop = BG_OP_IN_CRC_OUT_CSUM; +			break; -		cnt++; -		spt = page_address(sg_page(scsi_prot_sglist(sc))) + -			scsi_prot_sglist(sc)[0].offset; -		*apptagmask = 0; -		*apptagval = 0; -		*reftag = cpu_to_be32(spt->ref_tag); +		case SCSI_PROT_NORMAL: +		default: +			break; +		}  	} else { -		/* SBC defines ref tag to be lower 32bits of LBA */ -		*reftag = (uint32_t) (0xffffffff & scsi_get_lba(sc)); -		*apptagmask = 0; -		*apptagval = 0; +		switch (scsi_get_prot_op(sc)) { +		case SCSI_PROT_READ_STRIP: +		case SCSI_PROT_WRITE_INSERT: +			*rxop = BG_OP_IN_CSUM_OUT_NODIF; +			*txop = BG_OP_IN_NODIF_OUT_CSUM; +			break; + +		case SCSI_PROT_READ_PASS: +		case SCSI_PROT_WRITE_PASS: +			*rxop = BG_OP_IN_CSUM_OUT_CSUM; +			*txop = BG_OP_IN_CSUM_OUT_CSUM; +			break; + +		case SCSI_PROT_READ_INSERT: +		case SCSI_PROT_WRITE_STRIP: +			*rxop = BG_OP_IN_NODIF_OUT_CSUM; +			*txop = BG_OP_IN_CSUM_OUT_NODIF; +			break; + +		case SCSI_PROT_NORMAL: +		default: +			break; +		}  	} + +	return ret;  } +#endif -/* - * This function sets up buffer list for protection groups of +/** + * lpfc_bg_setup_bpl - Setup BlockGuard BPL with no protection data + * @phba: The Hba for which this call is being executed. + * @sc: pointer to scsi command we're working on + * @bpl: pointer to buffer list for protection groups + * @datacnt: number of segments of data that have been dma mapped + * + * This function sets up BPL buffer list for protection groups of   * type LPFC_PG_TYPE_NO_DIF   *   * This is usually used when the HBA is instructed to generate @@ -1293,12 +1983,11 @@ lpfc_get_cmd_dif_parms(struct scsi_cmnd *sc, uint16_t *apptagmask,   *                                |more Data BDE's ... (opt)|   *                                +-------------------------+   * - * @sc: pointer to scsi command we're working on - * @bpl: pointer to buffer list for protection groups - * @datacnt: number of segments of data that have been dma mapped   *   * Note: Data s/g buffers have been dma mapped - */ + * + * Returns the number of BDEs added to the BPL. + **/  static int  lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		struct ulp_bde64 *bpl, int datasegcnt) @@ -1309,9 +1998,12 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,  	dma_addr_t physaddr;  	int i = 0, num_bde = 0, status;  	int datadir = sc->sc_data_direction; -	unsigned blksize; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	uint32_t rc; +#endif +	uint32_t checking = 1;  	uint32_t reftag; -	uint16_t apptagmask, apptagval; +	unsigned blksize;  	uint8_t txop, rxop;  	status  = lpfc_sc_to_bg_opcodes(phba, sc, &txop, &rxop); @@ -1320,17 +2012,26 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,  	/* extract some info from the scsi command for pde*/  	blksize = lpfc_cmd_blksize(sc); -	lpfc_get_cmd_dif_parms(sc, &apptagmask, &apptagval, &reftag); +	reftag = (uint32_t)scsi_get_lba(sc); /* Truncate LBA */ + +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	rc = lpfc_bg_err_inject(phba, sc, &reftag, NULL, 1); +	if (rc) { +		if (rc & BG_ERR_SWAP) +			lpfc_bg_err_opcodes(phba, sc, &txop, &rxop); +		if (rc & BG_ERR_CHECK) +			checking = 0; +	} +#endif  	/* setup PDE5 with what we have */  	pde5 = (struct lpfc_pde5 *) bpl;  	memset(pde5, 0, sizeof(struct lpfc_pde5));  	bf_set(pde5_type, pde5, LPFC_PDE5_DESCRIPTOR); -	pde5->reftag = reftag;  	/* Endianness conversion if necessary for PDE5 */  	pde5->word0 = cpu_to_le32(pde5->word0); -	pde5->reftag = cpu_to_le32(pde5->reftag); +	pde5->reftag = cpu_to_le32(reftag);  	/* advance bpl and increment bde count */  	num_bde++; @@ -1342,13 +2043,25 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,  	bf_set(pde6_type, pde6, LPFC_PDE6_DESCRIPTOR);  	bf_set(pde6_optx, pde6, txop);  	bf_set(pde6_oprx, pde6, rxop); + +	/* +	 * We only need to check the data on READs, for WRITEs +	 * protection data is automatically generated, not checked. +	 */  	if (datadir == DMA_FROM_DEVICE) { -		bf_set(pde6_ce, pde6, 1); -		bf_set(pde6_re, pde6, 1); -		bf_set(pde6_ae, pde6, 1); +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD)) +			bf_set(pde6_ce, pde6, checking); +		else +			bf_set(pde6_ce, pde6, 0); + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF)) +			bf_set(pde6_re, pde6, checking); +		else +			bf_set(pde6_re, pde6, 0);  	}  	bf_set(pde6_ai, pde6, 1); -	bf_set(pde6_apptagval, pde6, apptagval); +	bf_set(pde6_ae, pde6, 0); +	bf_set(pde6_apptagval, pde6, 0);  	/* Endianness conversion if necessary for PDE6 */  	pde6->word0 = cpu_to_le32(pde6->word0); @@ -1378,9 +2091,16 @@ out:  	return num_bde;  } -/* - * This function sets up buffer list for protection groups of - * type LPFC_PG_TYPE_DIF_BUF +/** + * lpfc_bg_setup_bpl_prot - Setup BlockGuard BPL with protection data + * @phba: The Hba for which this call is being executed. + * @sc: pointer to scsi command we're working on + * @bpl: pointer to buffer list for protection groups + * @datacnt: number of segments of data that have been dma mapped + * @protcnt: number of segment of protection data that have been dma mapped + * + * This function sets up BPL buffer list for protection groups of + * type LPFC_PG_TYPE_DIF   *   * This is usually used when DIFs are in their own buffers,   * separate from the data. The HBA can then by instructed @@ -1405,14 +2125,11 @@ out:   *                                    |          ...            |   *                                    +-------------------------+   * - * @sc: pointer to scsi command we're working on - * @bpl: pointer to buffer list for protection groups - * @datacnt: number of segments of data that have been dma mapped - * @protcnt: number of segment of protection data that have been dma mapped - *   * Note: It is assumed that both data and protection s/g buffers have been   *       mapped for DMA - */ + * + * Returns the number of BDEs added to the BPL. + **/  static int  lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		struct ulp_bde64 *bpl, int datacnt, int protcnt) @@ -1421,18 +2138,22 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  	struct scatterlist *sgpe = NULL; /* s/g prot entry */  	struct lpfc_pde5 *pde5 = NULL;  	struct lpfc_pde6 *pde6 = NULL; -	struct ulp_bde64 *prot_bde = NULL; +	struct lpfc_pde7 *pde7 = NULL;  	dma_addr_t dataphysaddr, protphysaddr;  	unsigned short curr_data = 0, curr_prot = 0; -	unsigned int split_offset, protgroup_len; +	unsigned int split_offset; +	unsigned int protgroup_len, protgroup_offset = 0, protgroup_remainder;  	unsigned int protgrp_blks, protgrp_bytes;  	unsigned int remainder, subtotal;  	int status;  	int datadir = sc->sc_data_direction;  	unsigned char pgdone = 0, alldone = 0;  	unsigned blksize; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	uint32_t rc; +#endif +	uint32_t checking = 1;  	uint32_t reftag; -	uint16_t apptagmask, apptagval;  	uint8_t txop, rxop;  	int num_bde = 0; @@ -1452,19 +2173,32 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  	/* extract some info from the scsi command */  	blksize = lpfc_cmd_blksize(sc); -	lpfc_get_cmd_dif_parms(sc, &apptagmask, &apptagval, &reftag); +	reftag = (uint32_t)scsi_get_lba(sc); /* Truncate LBA */ + +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	rc = lpfc_bg_err_inject(phba, sc, &reftag, NULL, 1); +	if (rc) { +		if (rc & BG_ERR_SWAP) +			lpfc_bg_err_opcodes(phba, sc, &txop, &rxop); +		if (rc & BG_ERR_CHECK) +			checking = 0; +	} +#endif  	split_offset = 0;  	do { +		/* Check to see if we ran out of space */ +		if (num_bde >= (phba->cfg_total_seg_cnt - 2)) +			return num_bde + 3; +  		/* setup PDE5 with what we have */  		pde5 = (struct lpfc_pde5 *) bpl;  		memset(pde5, 0, sizeof(struct lpfc_pde5));  		bf_set(pde5_type, pde5, LPFC_PDE5_DESCRIPTOR); -		pde5->reftag = reftag;  		/* Endianness conversion if necessary for PDE5 */  		pde5->word0 = cpu_to_le32(pde5->word0); -		pde5->reftag = cpu_to_le32(pde5->reftag); +		pde5->reftag = cpu_to_le32(reftag);  		/* advance bpl and increment bde count */  		num_bde++; @@ -1476,11 +2210,20 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		bf_set(pde6_type, pde6, LPFC_PDE6_DESCRIPTOR);  		bf_set(pde6_optx, pde6, txop);  		bf_set(pde6_oprx, pde6, rxop); -		bf_set(pde6_ce, pde6, 1); -		bf_set(pde6_re, pde6, 1); -		bf_set(pde6_ae, pde6, 1); + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD)) +			bf_set(pde6_ce, pde6, checking); +		else +			bf_set(pde6_ce, pde6, 0); + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF)) +			bf_set(pde6_re, pde6, checking); +		else +			bf_set(pde6_re, pde6, 0); +  		bf_set(pde6_ai, pde6, 1); -		bf_set(pde6_apptagval, pde6, apptagval); +		bf_set(pde6_ae, pde6, 0); +		bf_set(pde6_apptagval, pde6, 0);  		/* Endianness conversion if necessary for PDE6 */  		pde6->word0 = cpu_to_le32(pde6->word0); @@ -1492,29 +2235,43 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		bpl++;  		/* setup the first BDE that points to protection buffer */ -		prot_bde = (struct ulp_bde64 *) bpl; -		protphysaddr = sg_dma_address(sgpe); -		prot_bde->addrHigh = le32_to_cpu(putPaddrLow(protphysaddr)); -		prot_bde->addrLow = le32_to_cpu(putPaddrHigh(protphysaddr)); -		protgroup_len = sg_dma_len(sgpe); +		protphysaddr = sg_dma_address(sgpe) + protgroup_offset; +		protgroup_len = sg_dma_len(sgpe) - protgroup_offset;  		/* must be integer multiple of the DIF block length */  		BUG_ON(protgroup_len % 8); +		pde7 = (struct lpfc_pde7 *) bpl; +		memset(pde7, 0, sizeof(struct lpfc_pde7)); +		bf_set(pde7_type, pde7, LPFC_PDE7_DESCRIPTOR); + +		pde7->addrHigh = le32_to_cpu(putPaddrHigh(protphysaddr)); +		pde7->addrLow = le32_to_cpu(putPaddrLow(protphysaddr)); +  		protgrp_blks = protgroup_len / 8;  		protgrp_bytes = protgrp_blks * blksize; -		prot_bde->tus.f.bdeSize = protgroup_len; -		prot_bde->tus.f.bdeFlags = LPFC_PDE7_DESCRIPTOR; -		prot_bde->tus.w = le32_to_cpu(bpl->tus.w); +		/* check if this pde is crossing the 4K boundary; if so split */ +		if ((pde7->addrLow & 0xfff) + protgroup_len > 0x1000) { +			protgroup_remainder = 0x1000 - (pde7->addrLow & 0xfff); +			protgroup_offset += protgroup_remainder; +			protgrp_blks = protgroup_remainder / 8; +			protgrp_bytes = protgrp_blks * blksize; +		} else { +			protgroup_offset = 0; +			curr_prot++; +		} -		curr_prot++;  		num_bde++;  		/* setup BDE's for data blocks associated with DIF data */  		pgdone = 0;  		subtotal = 0; /* total bytes processed for current prot grp */  		while (!pgdone) { +			/* Check to see if we ran out of space */ +			if (num_bde >= phba->cfg_total_seg_cnt) +				return num_bde + 1; +  			if (!sgde) {  				lpfc_printf_log(phba, KERN_ERR, LOG_BG,  					"9065 BLKGRD:%s Invalid data segment\n", @@ -1560,6 +2317,13 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		} +		if (protgroup_offset) { +			/* update the reference tag */ +			reftag += protgrp_blks; +			bpl++; +			continue; +		} +  		/* are we done ? */  		if (curr_prot == protcnt) {  			alldone = 1; @@ -1577,18 +2341,410 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,  		}  	} while (!alldone); -  out:  	return num_bde;  } -/* + +/** + * lpfc_bg_setup_sgl - Setup BlockGuard SGL with no protection data + * @phba: The Hba for which this call is being executed. + * @sc: pointer to scsi command we're working on + * @sgl: pointer to buffer list for protection groups + * @datacnt: number of segments of data that have been dma mapped + * + * This function sets up SGL buffer list for protection groups of + * type LPFC_PG_TYPE_NO_DIF + * + * This is usually used when the HBA is instructed to generate + * DIFs and insert them into data stream (or strip DIF from + * incoming data stream) + * + * The buffer list consists of just one protection group described + * below: + *                                +-------------------------+ + *   start of prot group  -->     |         DI_SEED         | + *                                +-------------------------+ + *                                |         Data SGE        | + *                                +-------------------------+ + *                                |more Data SGE's ... (opt)| + *                                +-------------------------+ + * + * + * Note: Data s/g buffers have been dma mapped + * + * Returns the number of SGEs added to the SGL. + **/ +static int +lpfc_bg_setup_sgl(struct lpfc_hba *phba, struct scsi_cmnd *sc, +		struct sli4_sge *sgl, int datasegcnt) +{ +	struct scatterlist *sgde = NULL; /* s/g data entry */ +	struct sli4_sge_diseed *diseed = NULL; +	dma_addr_t physaddr; +	int i = 0, num_sge = 0, status; +	uint32_t reftag; +	unsigned blksize; +	uint8_t txop, rxop; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	uint32_t rc; +#endif +	uint32_t checking = 1; +	uint32_t dma_len; +	uint32_t dma_offset = 0; + +	status  = lpfc_sc_to_bg_opcodes(phba, sc, &txop, &rxop); +	if (status) +		goto out; + +	/* extract some info from the scsi command for pde*/ +	blksize = lpfc_cmd_blksize(sc); +	reftag = (uint32_t)scsi_get_lba(sc); /* Truncate LBA */ + +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	rc = lpfc_bg_err_inject(phba, sc, &reftag, NULL, 1); +	if (rc) { +		if (rc & BG_ERR_SWAP) +			lpfc_bg_err_opcodes(phba, sc, &txop, &rxop); +		if (rc & BG_ERR_CHECK) +			checking = 0; +	} +#endif + +	/* setup DISEED with what we have */ +	diseed = (struct sli4_sge_diseed *) sgl; +	memset(diseed, 0, sizeof(struct sli4_sge_diseed)); +	bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DISEED); + +	/* Endianness conversion if necessary */ +	diseed->ref_tag = cpu_to_le32(reftag); +	diseed->ref_tag_tran = diseed->ref_tag; + +	/* +	 * We only need to check the data on READs, for WRITEs +	 * protection data is automatically generated, not checked. +	 */ +	if (sc->sc_data_direction == DMA_FROM_DEVICE) { +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD)) +			bf_set(lpfc_sli4_sge_dif_ce, diseed, checking); +		else +			bf_set(lpfc_sli4_sge_dif_ce, diseed, 0); + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF)) +			bf_set(lpfc_sli4_sge_dif_re, diseed, checking); +		else +			bf_set(lpfc_sli4_sge_dif_re, diseed, 0); +	} + +	/* setup DISEED with the rest of the info */ +	bf_set(lpfc_sli4_sge_dif_optx, diseed, txop); +	bf_set(lpfc_sli4_sge_dif_oprx, diseed, rxop); + +	bf_set(lpfc_sli4_sge_dif_ai, diseed, 1); +	bf_set(lpfc_sli4_sge_dif_me, diseed, 0); + +	/* Endianness conversion if necessary for DISEED */ +	diseed->word2 = cpu_to_le32(diseed->word2); +	diseed->word3 = cpu_to_le32(diseed->word3); + +	/* advance bpl and increment sge count */ +	num_sge++; +	sgl++; + +	/* assumption: caller has already run dma_map_sg on command data */ +	scsi_for_each_sg(sc, sgde, datasegcnt, i) { +		physaddr = sg_dma_address(sgde); +		dma_len = sg_dma_len(sgde); +		sgl->addr_lo = cpu_to_le32(putPaddrLow(physaddr)); +		sgl->addr_hi = cpu_to_le32(putPaddrHigh(physaddr)); +		if ((i + 1) == datasegcnt) +			bf_set(lpfc_sli4_sge_last, sgl, 1); +		else +			bf_set(lpfc_sli4_sge_last, sgl, 0); +		bf_set(lpfc_sli4_sge_offset, sgl, dma_offset); +		bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DATA); + +		sgl->sge_len = cpu_to_le32(dma_len); +		dma_offset += dma_len; + +		sgl++; +		num_sge++; +	} + +out: +	return num_sge; +} + +/** + * lpfc_bg_setup_sgl_prot - Setup BlockGuard SGL with protection data + * @phba: The Hba for which this call is being executed. + * @sc: pointer to scsi command we're working on + * @sgl: pointer to buffer list for protection groups + * @datacnt: number of segments of data that have been dma mapped + * @protcnt: number of segment of protection data that have been dma mapped + * + * This function sets up SGL buffer list for protection groups of + * type LPFC_PG_TYPE_DIF + * + * This is usually used when DIFs are in their own buffers, + * separate from the data. The HBA can then by instructed + * to place the DIFs in the outgoing stream.  For read operations, + * The HBA could extract the DIFs and place it in DIF buffers. + * + * The buffer list for this type consists of one or more of the + * protection groups described below: + *                                    +-------------------------+ + *   start of first prot group  -->   |         DISEED          | + *                                    +-------------------------+ + *                                    |      DIF (Prot SGE)     | + *                                    +-------------------------+ + *                                    |        Data SGE         | + *                                    +-------------------------+ + *                                    |more Data SGE's ... (opt)| + *                                    +-------------------------+ + *   start of new  prot group  -->    |         DISEED          | + *                                    +-------------------------+ + *                                    |          ...            | + *                                    +-------------------------+ + * + * Note: It is assumed that both data and protection s/g buffers have been + *       mapped for DMA + * + * Returns the number of SGEs added to the SGL. + **/ +static int +lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc, +		struct sli4_sge *sgl, int datacnt, int protcnt) +{ +	struct scatterlist *sgde = NULL; /* s/g data entry */ +	struct scatterlist *sgpe = NULL; /* s/g prot entry */ +	struct sli4_sge_diseed *diseed = NULL; +	dma_addr_t dataphysaddr, protphysaddr; +	unsigned short curr_data = 0, curr_prot = 0; +	unsigned int split_offset; +	unsigned int protgroup_len, protgroup_offset = 0, protgroup_remainder; +	unsigned int protgrp_blks, protgrp_bytes; +	unsigned int remainder, subtotal; +	int status; +	unsigned char pgdone = 0, alldone = 0; +	unsigned blksize; +	uint32_t reftag; +	uint8_t txop, rxop; +	uint32_t dma_len; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	uint32_t rc; +#endif +	uint32_t checking = 1; +	uint32_t dma_offset = 0; +	int num_sge = 0; + +	sgpe = scsi_prot_sglist(sc); +	sgde = scsi_sglist(sc); + +	if (!sgpe || !sgde) { +		lpfc_printf_log(phba, KERN_ERR, LOG_FCP, +				"9082 Invalid s/g entry: data=0x%p prot=0x%p\n", +				sgpe, sgde); +		return 0; +	} + +	status = lpfc_sc_to_bg_opcodes(phba, sc, &txop, &rxop); +	if (status) +		goto out; + +	/* extract some info from the scsi command */ +	blksize = lpfc_cmd_blksize(sc); +	reftag = (uint32_t)scsi_get_lba(sc); /* Truncate LBA */ + +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	rc = lpfc_bg_err_inject(phba, sc, &reftag, NULL, 1); +	if (rc) { +		if (rc & BG_ERR_SWAP) +			lpfc_bg_err_opcodes(phba, sc, &txop, &rxop); +		if (rc & BG_ERR_CHECK) +			checking = 0; +	} +#endif + +	split_offset = 0; +	do { +		/* Check to see if we ran out of space */ +		if (num_sge >= (phba->cfg_total_seg_cnt - 2)) +			return num_sge + 3; + +		/* setup DISEED with what we have */ +		diseed = (struct sli4_sge_diseed *) sgl; +		memset(diseed, 0, sizeof(struct sli4_sge_diseed)); +		bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DISEED); + +		/* Endianness conversion if necessary */ +		diseed->ref_tag = cpu_to_le32(reftag); +		diseed->ref_tag_tran = diseed->ref_tag; + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD)) { +			bf_set(lpfc_sli4_sge_dif_ce, diseed, checking); + +		} else { +			bf_set(lpfc_sli4_sge_dif_ce, diseed, 0); +			/* +			 * When in this mode, the hardware will replace +			 * the guard tag from the host with a +			 * newly generated good CRC for the wire. +			 * Switch to raw mode here to avoid this +			 * behavior. What the host sends gets put on the wire. +			 */ +			if (txop == BG_OP_IN_CRC_OUT_CRC) { +				txop = BG_OP_RAW_MODE; +				rxop = BG_OP_RAW_MODE; +			} +		} + + +		if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF)) +			bf_set(lpfc_sli4_sge_dif_re, diseed, checking); +		else +			bf_set(lpfc_sli4_sge_dif_re, diseed, 0); + +		/* setup DISEED with the rest of the info */ +		bf_set(lpfc_sli4_sge_dif_optx, diseed, txop); +		bf_set(lpfc_sli4_sge_dif_oprx, diseed, rxop); + +		bf_set(lpfc_sli4_sge_dif_ai, diseed, 1); +		bf_set(lpfc_sli4_sge_dif_me, diseed, 0); + +		/* Endianness conversion if necessary for DISEED */ +		diseed->word2 = cpu_to_le32(diseed->word2); +		diseed->word3 = cpu_to_le32(diseed->word3); + +		/* advance sgl and increment bde count */ +		num_sge++; +		sgl++; + +		/* setup the first BDE that points to protection buffer */ +		protphysaddr = sg_dma_address(sgpe) + protgroup_offset; +		protgroup_len = sg_dma_len(sgpe) - protgroup_offset; + +		/* must be integer multiple of the DIF block length */ +		BUG_ON(protgroup_len % 8); + +		/* Now setup DIF SGE */ +		sgl->word2 = 0; +		bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DIF); +		sgl->addr_hi = le32_to_cpu(putPaddrHigh(protphysaddr)); +		sgl->addr_lo = le32_to_cpu(putPaddrLow(protphysaddr)); +		sgl->word2 = cpu_to_le32(sgl->word2); + +		protgrp_blks = protgroup_len / 8; +		protgrp_bytes = protgrp_blks * blksize; + +		/* check if DIF SGE is crossing the 4K boundary; if so split */ +		if ((sgl->addr_lo & 0xfff) + protgroup_len > 0x1000) { +			protgroup_remainder = 0x1000 - (sgl->addr_lo & 0xfff); +			protgroup_offset += protgroup_remainder; +			protgrp_blks = protgroup_remainder / 8; +			protgrp_bytes = protgrp_blks * blksize; +		} else { +			protgroup_offset = 0; +			curr_prot++; +		} + +		num_sge++; + +		/* setup SGE's for data blocks associated with DIF data */ +		pgdone = 0; +		subtotal = 0; /* total bytes processed for current prot grp */ +		while (!pgdone) { +			/* Check to see if we ran out of space */ +			if (num_sge >= phba->cfg_total_seg_cnt) +				return num_sge + 1; + +			if (!sgde) { +				lpfc_printf_log(phba, KERN_ERR, LOG_BG, +					"9086 BLKGRD:%s Invalid data segment\n", +						__func__); +				return 0; +			} +			sgl++; +			dataphysaddr = sg_dma_address(sgde) + split_offset; + +			remainder = sg_dma_len(sgde) - split_offset; + +			if ((subtotal + remainder) <= protgrp_bytes) { +				/* we can use this whole buffer */ +				dma_len = remainder; +				split_offset = 0; + +				if ((subtotal + remainder) == protgrp_bytes) +					pgdone = 1; +			} else { +				/* must split this buffer with next prot grp */ +				dma_len = protgrp_bytes - subtotal; +				split_offset += dma_len; +			} + +			subtotal += dma_len; + +			sgl->addr_lo = cpu_to_le32(putPaddrLow(dataphysaddr)); +			sgl->addr_hi = cpu_to_le32(putPaddrHigh(dataphysaddr)); +			bf_set(lpfc_sli4_sge_last, sgl, 0); +			bf_set(lpfc_sli4_sge_offset, sgl, dma_offset); +			bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DATA); + +			sgl->sge_len = cpu_to_le32(dma_len); +			dma_offset += dma_len; + +			num_sge++; +			curr_data++; + +			if (split_offset) +				break; + +			/* Move to the next s/g segment if possible */ +			sgde = sg_next(sgde); +		} + +		if (protgroup_offset) { +			/* update the reference tag */ +			reftag += protgrp_blks; +			sgl++; +			continue; +		} + +		/* are we done ? */ +		if (curr_prot == protcnt) { +			bf_set(lpfc_sli4_sge_last, sgl, 1); +			alldone = 1; +		} else if (curr_prot < protcnt) { +			/* advance to next prot buffer */ +			sgpe = sg_next(sgpe); +			sgl++; + +			/* update the reference tag */ +			reftag += protgrp_blks; +		} else { +			/* if we're here, we have a bug */ +			lpfc_printf_log(phba, KERN_ERR, LOG_BG, +				"9085 BLKGRD: bug in %s\n", __func__); +		} + +	} while (!alldone); + +out: + +	return num_sge; +} + +/** + * lpfc_prot_group_type - Get prtotection group type of SCSI command + * @phba: The Hba for which this call is being executed. + * @sc: pointer to scsi command we're working on + *   * Given a SCSI command that supports DIF, determine composition of protection   * groups involved in setting up buffer lists   * - * Returns: - *			      for DIF (for both read and write) - * */ + * Returns: Protection group type (with or without DIF) + * + **/  static int  lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc)  { @@ -1607,21 +2763,67 @@ lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc)  		ret = LPFC_PG_TYPE_DIF_BUF;  		break;  	default: -		lpfc_printf_log(phba, KERN_ERR, LOG_FCP, -				"9021 Unsupported protection op:%d\n", op); +		if (phba) +			lpfc_printf_log(phba, KERN_ERR, LOG_FCP, +					"9021 Unsupported protection op:%d\n", +					op);  		break;  	} -  	return ret;  } -/* +/** + * lpfc_bg_scsi_adjust_dl - Adjust SCSI data length for BlockGuard + * @phba: The Hba for which this call is being executed. + * @lpfc_cmd: The scsi buffer which is going to be adjusted. + * + * Adjust the data length to account for how much data + * is actually on the wire. + * + * returns the adjusted data length + **/ +static int +lpfc_bg_scsi_adjust_dl(struct lpfc_hba *phba, +		       struct lpfc_scsi_buf *lpfc_cmd) +{ +	struct scsi_cmnd *sc = lpfc_cmd->pCmd; +	int fcpdl; + +	fcpdl = scsi_bufflen(sc); + +	/* Check if there is protection data on the wire */ +	if (sc->sc_data_direction == DMA_FROM_DEVICE) { +		/* Read check for protection data */ +		if (scsi_get_prot_op(sc) ==  SCSI_PROT_READ_INSERT) +			return fcpdl; + +	} else { +		/* Write check for protection data */ +		if (scsi_get_prot_op(sc) ==  SCSI_PROT_WRITE_STRIP) +			return fcpdl; +	} + +	/* +	 * If we are in DIF Type 1 mode every data block has a 8 byte +	 * DIF (trailer) attached to it. Must ajust FCP data length +	 * to account for the protection data. +	 */ +	fcpdl += (fcpdl / lpfc_cmd_blksize(sc)) * 8; + +	return fcpdl; +} + +/** + * lpfc_bg_scsi_prep_dma_buf_s3 - DMA mapping for scsi buffer to SLI3 IF spec + * @phba: The Hba for which this call is being executed. + * @lpfc_cmd: The scsi buffer which is going to be prep'ed. + *   * This is the protection/DIF aware version of   * lpfc_scsi_prep_dma_buf(). It may be a good idea to combine the   * two functions eventually, but for now, it's here - */ + **/  static int -lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba, +lpfc_bg_scsi_prep_dma_buf_s3(struct lpfc_hba *phba,  		struct lpfc_scsi_buf *lpfc_cmd)  {  	struct scsi_cmnd *scsi_cmnd = lpfc_cmd->pCmd; @@ -1631,8 +2833,7 @@ lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba,  	uint32_t num_bde = 0;  	int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction;  	int prot_group_type = 0; -	int diflen, fcpdl; -	unsigned blksize; +	int fcpdl;  	/*  	 * Start the lpfc command prep by bumping the bpl beyond fcp_cmnd @@ -1653,28 +2854,28 @@ lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba,  			return 1;  		lpfc_cmd->seg_cnt = datasegcnt; -		if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) { -			lpfc_printf_log(phba, KERN_ERR, LOG_BG, -					"9067 BLKGRD: %s: Too many sg segments" -					" from dma_map_sg.  Config %d, seg_cnt" -					" %d\n", -					__func__, phba->cfg_sg_seg_cnt, -					lpfc_cmd->seg_cnt); -			scsi_dma_unmap(scsi_cmnd); -			return 1; -		} + +		/* First check if data segment count from SCSI Layer is good */ +		if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) +			goto err;  		prot_group_type = lpfc_prot_group_type(phba, scsi_cmnd);  		switch (prot_group_type) {  		case LPFC_PG_TYPE_NO_DIF: + +			/* Here we need to add a PDE5 and PDE6 to the count */ +			if ((lpfc_cmd->seg_cnt + 2) > phba->cfg_total_seg_cnt) +				goto err; +  			num_bde = lpfc_bg_setup_bpl(phba, scsi_cmnd, bpl,  					datasegcnt);  			/* we should have 2 or more entries in buffer list */  			if (num_bde < 2)  				goto err;  			break; -		case LPFC_PG_TYPE_DIF_BUF:{ + +		case LPFC_PG_TYPE_DIF_BUF:  			/*  			 * This type indicates that protection buffers are  			 * passed to the driver, so that needs to be prepared @@ -1689,31 +2890,28 @@ lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba,  			}  			lpfc_cmd->prot_seg_cnt = protsegcnt; -			if (lpfc_cmd->prot_seg_cnt -			    > phba->cfg_prot_sg_seg_cnt) { -				lpfc_printf_log(phba, KERN_ERR, LOG_BG, -					"9068 BLKGRD: %s: Too many prot sg " -					"segments from dma_map_sg.  Config %d," -						"prot_seg_cnt %d\n", __func__, -						phba->cfg_prot_sg_seg_cnt, -						lpfc_cmd->prot_seg_cnt); -				dma_unmap_sg(&phba->pcidev->dev, -					     scsi_prot_sglist(scsi_cmnd), -					     scsi_prot_sg_count(scsi_cmnd), -					     datadir); -				scsi_dma_unmap(scsi_cmnd); -				return 1; -			} + +			/* +			 * There is a minimun of 4 BPLs used for every +			 * protection data segment. +			 */ +			if ((lpfc_cmd->prot_seg_cnt * 4) > +			    (phba->cfg_total_seg_cnt - 2)) +				goto err;  			num_bde = lpfc_bg_setup_bpl_prot(phba, scsi_cmnd, bpl,  					datasegcnt, protsegcnt);  			/* we should have 3 or more entries in buffer list */ -			if (num_bde < 3) +			if ((num_bde < 3) || +			    (num_bde > phba->cfg_total_seg_cnt))  				goto err;  			break; -		} +  		case LPFC_PG_TYPE_INVALID:  		default: +			scsi_dma_unmap(scsi_cmnd); +			lpfc_cmd->seg_cnt = 0; +  			lpfc_printf_log(phba, KERN_ERR, LOG_FCP,  					"9022 Unexpected protection group %i\n",  					prot_group_type); @@ -1732,18 +2930,7 @@ lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba,  	iocb_cmd->ulpBdeCount = 1;  	iocb_cmd->ulpLe = 1; -	fcpdl = scsi_bufflen(scsi_cmnd); - -	if (scsi_get_prot_type(scsi_cmnd) == SCSI_PROT_DIF_TYPE1) { -		/* -		 * We are in DIF Type 1 mode -		 * Every data block has a 8 byte DIF (trailer) -		 * attached to it.  Must ajust FCP data length -		 */ -		blksize = lpfc_cmd_blksize(scsi_cmnd); -		diflen = (fcpdl / blksize) * 8; -		fcpdl += diflen; -	} +	fcpdl = lpfc_bg_scsi_adjust_dl(phba, lpfc_cmd);  	fcp_cmnd->fcpDl = be32_to_cpu(fcpdl);  	/* @@ -1754,14 +2941,234 @@ lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba,  	return 0;  err: +	if (lpfc_cmd->seg_cnt) +		scsi_dma_unmap(scsi_cmnd); +	if (lpfc_cmd->prot_seg_cnt) +		dma_unmap_sg(&phba->pcidev->dev, scsi_prot_sglist(scsi_cmnd), +			     scsi_prot_sg_count(scsi_cmnd), +			     scsi_cmnd->sc_data_direction); +  	lpfc_printf_log(phba, KERN_ERR, LOG_FCP, -			"9023 Could not setup all needed BDE's" -			"prot_group_type=%d, num_bde=%d\n", +			"9023 Cannot setup S/G List for HBA" +			"IO segs %d/%d BPL %d SCSI %d: %d %d\n", +			lpfc_cmd->seg_cnt, lpfc_cmd->prot_seg_cnt, +			phba->cfg_total_seg_cnt, phba->cfg_sg_seg_cnt,  			prot_group_type, num_bde); + +	lpfc_cmd->seg_cnt = 0; +	lpfc_cmd->prot_seg_cnt = 0;  	return 1;  }  /* + * This function calcuates the T10 DIF guard tag + * on the specified data using a CRC algorithmn + * using crc_t10dif. + */ +uint16_t +lpfc_bg_crc(uint8_t *data, int count) +{ +	uint16_t crc = 0; +	uint16_t x; + +	crc = crc_t10dif(data, count); +	x = cpu_to_be16(crc); +	return x; +} + +/* + * This function calcuates the T10 DIF guard tag + * on the specified data using a CSUM algorithmn + * using ip_compute_csum. + */ +uint16_t +lpfc_bg_csum(uint8_t *data, int count) +{ +	uint16_t ret; + +	ret = ip_compute_csum(data, count); +	return ret; +} + +/* + * This function examines the protection data to try to determine + * what type of T10-DIF error occurred. + */ +void +lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd) +{ +	struct scatterlist *sgpe; /* s/g prot entry */ +	struct scatterlist *sgde; /* s/g data entry */ +	struct scsi_cmnd *cmd = lpfc_cmd->pCmd; +	struct scsi_dif_tuple *src = NULL; +	uint8_t *data_src = NULL; +	uint16_t guard_tag, guard_type; +	uint16_t start_app_tag, app_tag; +	uint32_t start_ref_tag, ref_tag; +	int prot, protsegcnt; +	int err_type, len, data_len; +	int chk_ref, chk_app, chk_guard; +	uint16_t sum; +	unsigned blksize; + +	err_type = BGS_GUARD_ERR_MASK; +	sum = 0; +	guard_tag = 0; + +	/* First check to see if there is protection data to examine */ +	prot = scsi_get_prot_op(cmd); +	if ((prot == SCSI_PROT_READ_STRIP) || +	    (prot == SCSI_PROT_WRITE_INSERT) || +	    (prot == SCSI_PROT_NORMAL)) +		goto out; + +	/* Currently the driver just supports ref_tag and guard_tag checking */ +	chk_ref = 1; +	chk_app = 0; +	chk_guard = 0; + +	/* Setup a ptr to the protection data provided by the SCSI host */ +	sgpe = scsi_prot_sglist(cmd); +	protsegcnt = lpfc_cmd->prot_seg_cnt; + +	if (sgpe && protsegcnt) { + +		/* +		 * We will only try to verify guard tag if the segment +		 * data length is a multiple of the blksize. +		 */ +		sgde = scsi_sglist(cmd); +		blksize = lpfc_cmd_blksize(cmd); +		data_src = (uint8_t *)sg_virt(sgde); +		data_len = sgde->length; +		if ((data_len & (blksize - 1)) == 0) +			chk_guard = 1; +		guard_type = scsi_host_get_guard(cmd->device->host); + +		src = (struct scsi_dif_tuple *)sg_virt(sgpe); +		start_ref_tag = (uint32_t)scsi_get_lba(cmd); /* Truncate LBA */ +		start_app_tag = src->app_tag; +		len = sgpe->length; +		while (src && protsegcnt) { +			while (len) { + +				/* +				 * First check to see if a protection data +				 * check is valid +				 */ +				if ((src->ref_tag == 0xffffffff) || +				    (src->app_tag == 0xffff)) { +					start_ref_tag++; +					goto skipit; +				} + +				/* First Guard Tag checking */ +				if (chk_guard) { +					guard_tag = src->guard_tag; +					if (lpfc_cmd_guard_csum(cmd)) +						sum = lpfc_bg_csum(data_src, +								   blksize); +					else +						sum = lpfc_bg_crc(data_src, +								  blksize); +					if ((guard_tag != sum)) { +						err_type = BGS_GUARD_ERR_MASK; +						goto out; +					} +				} + +				/* Reference Tag checking */ +				ref_tag = be32_to_cpu(src->ref_tag); +				if (chk_ref && (ref_tag != start_ref_tag)) { +					err_type = BGS_REFTAG_ERR_MASK; +					goto out; +				} +				start_ref_tag++; + +				/* App Tag checking */ +				app_tag = src->app_tag; +				if (chk_app && (app_tag != start_app_tag)) { +					err_type = BGS_APPTAG_ERR_MASK; +					goto out; +				} +skipit: +				len -= sizeof(struct scsi_dif_tuple); +				if (len < 0) +					len = 0; +				src++; + +				data_src += blksize; +				data_len -= blksize; + +				/* +				 * Are we at the end of the Data segment? +				 * The data segment is only used for Guard +				 * tag checking. +				 */ +				if (chk_guard && (data_len == 0)) { +					chk_guard = 0; +					sgde = sg_next(sgde); +					if (!sgde) +						goto out; + +					data_src = (uint8_t *)sg_virt(sgde); +					data_len = sgde->length; +					if ((data_len & (blksize - 1)) == 0) +						chk_guard = 1; +				} +			} + +			/* Goto the next Protection data segment */ +			sgpe = sg_next(sgpe); +			if (sgpe) { +				src = (struct scsi_dif_tuple *)sg_virt(sgpe); +				len = sgpe->length; +			} else { +				src = NULL; +			} +			protsegcnt--; +		} +	} +out: +	if (err_type == BGS_GUARD_ERR_MASK) { +		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST, +					0x10, 0x1); +		cmd->result = DRIVER_SENSE << 24 +			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION); +		phba->bg_guard_err_cnt++; +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9069 BLKGRD: LBA %lx grd_tag error %x != %x\n", +				(unsigned long)scsi_get_lba(cmd), +				sum, guard_tag); + +	} else if (err_type == BGS_REFTAG_ERR_MASK) { +		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST, +					0x10, 0x3); +		cmd->result = DRIVER_SENSE << 24 +			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION); + +		phba->bg_reftag_err_cnt++; +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9066 BLKGRD: LBA %lx ref_tag error %x != %x\n", +				(unsigned long)scsi_get_lba(cmd), +				ref_tag, start_ref_tag); + +	} else if (err_type == BGS_APPTAG_ERR_MASK) { +		scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST, +					0x10, 0x2); +		cmd->result = DRIVER_SENSE << 24 +			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION); + +		phba->bg_apptag_err_cnt++; +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9041 BLKGRD: LBA %lx app_tag error %x != %x\n", +				(unsigned long)scsi_get_lba(cmd), +				app_tag, start_app_tag); +	} +} + + +/*   * This function checks for BlockGuard errors detected by   * the HBA.  In case of errors, the ASC/ASCQ fields in the   * sense buffer will be set accordingly, paired with @@ -1784,12 +3191,6 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,  	uint32_t bgstat = bgf->bgstat;  	uint64_t failing_sector = 0; -	lpfc_printf_log(phba, KERN_ERR, LOG_BG, "9069 BLKGRD: BG ERROR in cmd" -			" 0x%x lba 0x%llx blk cnt 0x%x " -			"bgstat=0x%x bghm=0x%x\n", -			cmd->cmnd[0], (unsigned long long)scsi_get_lba(cmd), -			blk_rq_sectors(cmd->request), bgstat, bghm); -  	spin_lock(&_dump_buf_lock);  	if (!_dump_buf_done) {  		lpfc_printf_log(phba, KERN_ERR, LOG_BG,  "9070 BLKGRD: Saving" @@ -1812,18 +3213,24 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,  	if (lpfc_bgs_get_invalid_prof(bgstat)) {  		cmd->result = ScsiResult(DID_ERROR, 0); -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, "9072 BLKGRD: Invalid" -			" BlockGuard profile. bgstat:0x%x\n", -			bgstat); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9072 BLKGRD: Invalid BG Profile in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm);  		ret = (-1);  		goto out;  	}  	if (lpfc_bgs_get_uninit_dif_block(bgstat)) {  		cmd->result = ScsiResult(DID_ERROR, 0); -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, "9073 BLKGRD: " -				"Invalid BlockGuard DIF Block. bgstat:0x%x\n", -				bgstat); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9073 BLKGRD: Invalid BG PDIF Block in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm);  		ret = (-1);  		goto out;  	} @@ -1836,8 +3243,12 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,  		cmd->result = DRIVER_SENSE << 24  			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);  		phba->bg_guard_err_cnt++; -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, -			"9055 BLKGRD: guard_tag error\n"); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9055 BLKGRD: Guard Tag error in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm);  	}  	if (lpfc_bgs_get_reftag_err(bgstat)) { @@ -1849,8 +3260,12 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,  			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);  		phba->bg_reftag_err_cnt++; -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, -			"9056 BLKGRD: ref_tag error\n"); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9056 BLKGRD: Ref Tag error in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm);  	}  	if (lpfc_bgs_get_apptag_err(bgstat)) { @@ -1862,32 +3277,60 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,  			| ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);  		phba->bg_apptag_err_cnt++; -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, -			"9061 BLKGRD: app_tag error\n"); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9061 BLKGRD: App Tag error in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm);  	}  	if (lpfc_bgs_get_hi_water_mark_present(bgstat)) {  		/*  		 * setup sense data descriptor 0 per SPC-4 as an information -		 * field, and put the failing LBA in it +		 * field, and put the failing LBA in it. +		 * This code assumes there was also a guard/app/ref tag error +		 * indication.  		 */ -		cmd->sense_buffer[8] = 0;     /* Information */ -		cmd->sense_buffer[9] = 0xa;   /* Add. length */ -		bghm /= cmd->device->sector_size; +		cmd->sense_buffer[7] = 0xc;   /* Additional sense length */ +		cmd->sense_buffer[8] = 0;     /* Information descriptor type */ +		cmd->sense_buffer[9] = 0xa;   /* Additional descriptor length */ +		cmd->sense_buffer[10] = 0x80; /* Validity bit */ + +		/* bghm is a "on the wire" FC frame based count */ +		switch (scsi_get_prot_op(cmd)) { +		case SCSI_PROT_READ_INSERT: +		case SCSI_PROT_WRITE_STRIP: +			bghm /= cmd->device->sector_size; +			break; +		case SCSI_PROT_READ_STRIP: +		case SCSI_PROT_WRITE_INSERT: +		case SCSI_PROT_READ_PASS: +		case SCSI_PROT_WRITE_PASS: +			bghm /= (cmd->device->sector_size + +				sizeof(struct scsi_dif_tuple)); +			break; +		}  		failing_sector = scsi_get_lba(cmd);  		failing_sector += bghm; -		put_unaligned_be64(failing_sector, &cmd->sense_buffer[10]); +		/* Descriptor Information */ +		put_unaligned_be64(failing_sector, &cmd->sense_buffer[12]);  	}  	if (!ret) {  		/* No error was reported - problem in FW? */ -		cmd->result = ScsiResult(DID_ERROR, 0); -		lpfc_printf_log(phba, KERN_ERR, LOG_BG, -			"9057 BLKGRD: no errors reported!\n"); +		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP | LOG_BG, +				"9057 BLKGRD: Unknown error in cmd" +				" 0x%x lba 0x%llx blk cnt 0x%x " +				"bgstat=x%x bghm=x%x\n", cmd->cmnd[0], +				(unsigned long long)scsi_get_lba(cmd), +				blk_rq_sectors(cmd->request), bgstat, bghm); + +		/* Calcuate what type of error it was */ +		lpfc_calc_bg_err(phba, lpfc_cmd);  	} -  out:  	return ret;  } @@ -1911,12 +3354,14 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  	struct scatterlist *sgel = NULL;  	struct fcp_cmnd *fcp_cmnd = lpfc_cmd->fcp_cmnd;  	struct sli4_sge *sgl = (struct sli4_sge *)lpfc_cmd->fcp_bpl; +	struct sli4_sge *first_data_sgl;  	IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;  	dma_addr_t physaddr;  	uint32_t num_bde = 0;  	uint32_t dma_len;  	uint32_t dma_offset = 0;  	int nseg; +	struct ulp_bde64 *bde;  	/*  	 * There are three possibilities here - use scatter-gather segment, use @@ -1941,7 +3386,7 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  		bf_set(lpfc_sli4_sge_last, sgl, 0);  		sgl->word2 = cpu_to_le32(sgl->word2);  		sgl += 1; - +		first_data_sgl = sgl;  		lpfc_cmd->seg_cnt = nseg;  		if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) {  			lpfc_printf_log(phba, KERN_ERR, LOG_BG, "9074 BLKGRD:" @@ -1949,6 +3394,7 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  				"dma_map_sg.  Config %d, seg_cnt %d\n",  				__func__, phba->cfg_sg_seg_cnt,  			       lpfc_cmd->seg_cnt); +			lpfc_cmd->seg_cnt = 0;  			scsi_dma_unmap(scsi_cmnd);  			return 1;  		} @@ -1967,16 +3413,29 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  			dma_len = sg_dma_len(sgel);  			sgl->addr_lo = cpu_to_le32(putPaddrLow(physaddr));  			sgl->addr_hi = cpu_to_le32(putPaddrHigh(physaddr)); +			sgl->word2 = le32_to_cpu(sgl->word2);  			if ((num_bde + 1) == nseg)  				bf_set(lpfc_sli4_sge_last, sgl, 1);  			else  				bf_set(lpfc_sli4_sge_last, sgl, 0);  			bf_set(lpfc_sli4_sge_offset, sgl, dma_offset); +			bf_set(lpfc_sli4_sge_type, sgl, LPFC_SGE_TYPE_DATA);  			sgl->word2 = cpu_to_le32(sgl->word2);  			sgl->sge_len = cpu_to_le32(dma_len);  			dma_offset += dma_len;  			sgl++;  		} +		/* setup the performance hint (first data BDE) if enabled */ +		if (phba->sli3_options & LPFC_SLI4_PERFH_ENABLED) { +			bde = (struct ulp_bde64 *) +					&(iocb_cmd->unsli3.sli3Words[5]); +			bde->addrLow = first_data_sgl->addr_lo; +			bde->addrHigh = first_data_sgl->addr_hi; +			bde->tus.f.bdeSize = +					le32_to_cpu(first_data_sgl->sge_len); +			bde->tus.f.bdeFlags = BUFF_TYPE_BDE_64; +			bde->tus.w = cpu_to_le32(bde->tus.w); +		}  	} else {  		sgl += 1;  		/* clear the last flag in the fcp_rsp map entry */ @@ -1998,10 +3457,175 @@ lpfc_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  	 * we need to set word 4 of IOCB here  	 */  	iocb_cmd->un.fcpi.fcpi_parm = scsi_bufflen(scsi_cmnd); + +	/* +	 * If the OAS driver feature is enabled and the lun is enabled for +	 * OAS, set the oas iocb related flags. +	 */ +	if ((phba->cfg_fof) && ((struct lpfc_device_data *) +		scsi_cmnd->device->hostdata)->oas_enabled) +		lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_OAS;  	return 0;  }  /** + * lpfc_bg_scsi_prep_dma_buf_s4 - DMA mapping for scsi buffer to SLI4 IF spec + * @phba: The Hba for which this call is being executed. + * @lpfc_cmd: The scsi buffer which is going to be mapped. + * + * This is the protection/DIF aware version of + * lpfc_scsi_prep_dma_buf(). It may be a good idea to combine the + * two functions eventually, but for now, it's here + **/ +static int +lpfc_bg_scsi_prep_dma_buf_s4(struct lpfc_hba *phba, +		struct lpfc_scsi_buf *lpfc_cmd) +{ +	struct scsi_cmnd *scsi_cmnd = lpfc_cmd->pCmd; +	struct fcp_cmnd *fcp_cmnd = lpfc_cmd->fcp_cmnd; +	struct sli4_sge *sgl = (struct sli4_sge *)(lpfc_cmd->fcp_bpl); +	IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb; +	uint32_t num_sge = 0; +	int datasegcnt, protsegcnt, datadir = scsi_cmnd->sc_data_direction; +	int prot_group_type = 0; +	int fcpdl; + +	/* +	 * Start the lpfc command prep by bumping the sgl beyond fcp_cmnd +	 *  fcp_rsp regions to the first data sge entry +	 */ +	if (scsi_sg_count(scsi_cmnd)) { +		/* +		 * The driver stores the segment count returned from pci_map_sg +		 * because this a count of dma-mappings used to map the use_sg +		 * pages.  They are not guaranteed to be the same for those +		 * architectures that implement an IOMMU. +		 */ +		datasegcnt = dma_map_sg(&phba->pcidev->dev, +					scsi_sglist(scsi_cmnd), +					scsi_sg_count(scsi_cmnd), datadir); +		if (unlikely(!datasegcnt)) +			return 1; + +		sgl += 1; +		/* clear the last flag in the fcp_rsp map entry */ +		sgl->word2 = le32_to_cpu(sgl->word2); +		bf_set(lpfc_sli4_sge_last, sgl, 0); +		sgl->word2 = cpu_to_le32(sgl->word2); + +		sgl += 1; +		lpfc_cmd->seg_cnt = datasegcnt; + +		/* First check if data segment count from SCSI Layer is good */ +		if (lpfc_cmd->seg_cnt > phba->cfg_sg_seg_cnt) +			goto err; + +		prot_group_type = lpfc_prot_group_type(phba, scsi_cmnd); + +		switch (prot_group_type) { +		case LPFC_PG_TYPE_NO_DIF: +			/* Here we need to add a DISEED to the count */ +			if ((lpfc_cmd->seg_cnt + 1) > phba->cfg_total_seg_cnt) +				goto err; + +			num_sge = lpfc_bg_setup_sgl(phba, scsi_cmnd, sgl, +					datasegcnt); + +			/* we should have 2 or more entries in buffer list */ +			if (num_sge < 2) +				goto err; +			break; + +		case LPFC_PG_TYPE_DIF_BUF: +			/* +			 * This type indicates that protection buffers are +			 * passed to the driver, so that needs to be prepared +			 * for DMA +			 */ +			protsegcnt = dma_map_sg(&phba->pcidev->dev, +					scsi_prot_sglist(scsi_cmnd), +					scsi_prot_sg_count(scsi_cmnd), datadir); +			if (unlikely(!protsegcnt)) { +				scsi_dma_unmap(scsi_cmnd); +				return 1; +			} + +			lpfc_cmd->prot_seg_cnt = protsegcnt; +			/* +			 * There is a minimun of 3 SGEs used for every +			 * protection data segment. +			 */ +			if ((lpfc_cmd->prot_seg_cnt * 3) > +			    (phba->cfg_total_seg_cnt - 2)) +				goto err; + +			num_sge = lpfc_bg_setup_sgl_prot(phba, scsi_cmnd, sgl, +					datasegcnt, protsegcnt); + +			/* we should have 3 or more entries in buffer list */ +			if ((num_sge < 3) || +			    (num_sge > phba->cfg_total_seg_cnt)) +				goto err; +			break; + +		case LPFC_PG_TYPE_INVALID: +		default: +			scsi_dma_unmap(scsi_cmnd); +			lpfc_cmd->seg_cnt = 0; + +			lpfc_printf_log(phba, KERN_ERR, LOG_FCP, +					"9083 Unexpected protection group %i\n", +					prot_group_type); +			return 1; +		} +	} + +	switch (scsi_get_prot_op(scsi_cmnd)) { +	case SCSI_PROT_WRITE_STRIP: +	case SCSI_PROT_READ_STRIP: +		lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_DIF_STRIP; +		break; +	case SCSI_PROT_WRITE_INSERT: +	case SCSI_PROT_READ_INSERT: +		lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_DIF_INSERT; +		break; +	case SCSI_PROT_WRITE_PASS: +	case SCSI_PROT_READ_PASS: +		lpfc_cmd->cur_iocbq.iocb_flag |= LPFC_IO_DIF_PASS; +		break; +	} + +	fcpdl = lpfc_bg_scsi_adjust_dl(phba, lpfc_cmd); +	fcp_cmnd->fcpDl = be32_to_cpu(fcpdl); + +	/* +	 * Due to difference in data length between DIF/non-DIF paths, +	 * we need to set word 4 of IOCB here +	 */ +	iocb_cmd->un.fcpi.fcpi_parm = fcpdl; + +	return 0; +err: +	if (lpfc_cmd->seg_cnt) +		scsi_dma_unmap(scsi_cmnd); +	if (lpfc_cmd->prot_seg_cnt) +		dma_unmap_sg(&phba->pcidev->dev, scsi_prot_sglist(scsi_cmnd), +			     scsi_prot_sg_count(scsi_cmnd), +			     scsi_cmnd->sc_data_direction); + +	lpfc_printf_log(phba, KERN_ERR, LOG_FCP, +			"9084 Cannot setup S/G List for HBA" +			"IO segs %d/%d SGL %d SCSI %d: %d %d\n", +			lpfc_cmd->seg_cnt, lpfc_cmd->prot_seg_cnt, +			phba->cfg_total_seg_cnt, phba->cfg_sg_seg_cnt, +			prot_group_type, num_sge); + +	lpfc_cmd->seg_cnt = 0; +	lpfc_cmd->prot_seg_cnt = 0; +	return 1; +} + +/**   * lpfc_scsi_prep_dma_buf - Wrapper function for DMA mapping of scsi buffer   * @phba: The Hba for which this call is being executed.   * @lpfc_cmd: The scsi buffer which is going to be mapped. @@ -2020,6 +3644,25 @@ lpfc_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)  }  /** + * lpfc_bg_scsi_prep_dma_buf - Wrapper function for DMA mapping of scsi buffer + * using BlockGuard. + * @phba: The Hba for which this call is being executed. + * @lpfc_cmd: The scsi buffer which is going to be mapped. + * + * This routine wraps the actual DMA mapping function pointer from the + * lpfc_hba struct. + * + * Return codes: + *	1 - Error + *	0 - Success + **/ +static inline int +lpfc_bg_scsi_prep_dma_buf(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd) +{ +	return phba->lpfc_bg_scsi_prep_dma_buf(phba, lpfc_cmd); +} + +/**   * lpfc_send_scsi_error_event - Posts an event when there is SCSI error   * @phba: Pointer to hba context object.   * @vport: Pointer to vport object. @@ -2211,8 +3854,15 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	}  	lp = (uint32_t *)cmnd->sense_buffer; -	if (!scsi_status && (resp_info & RESID_UNDER)) -		logit = LOG_FCP; +	/* special handling for under run conditions */ +	if (!scsi_status && (resp_info & RESID_UNDER)) { +		/* don't log under runs if fcp set... */ +		if (vport->cfg_log_verbose & LOG_FCP) +			logit = LOG_FCP_ERROR; +		/* unless operator says so */ +		if (vport->cfg_log_verbose & LOG_FCP_UNDER) +			logit = LOG_FCP_UNDER; +	}  	lpfc_printf_vlog(vport, KERN_WARNING, logit,  			 "9024 FCP command x%x failed: x%x SNS x%x x%x " @@ -2228,7 +3878,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	if (resp_info & RESID_UNDER) {  		scsi_set_resid(cmnd, be32_to_cpu(fcprsp->rspResId)); -		lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +		lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP_UNDER,  				 "9025 FCP Read Underrun, expected %d, "  				 "residual %d Data: x%x x%x x%x\n",  				 be32_to_cpu(fcpcmd->fcpDl), @@ -2255,7 +3905,7 @@ lpfc_handle_fcp_err(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  		}  		/*  		 * The cmnd->underflow is the minimum number of bytes that must -		 * be transfered for this command.  Provided a sense condition +		 * be transferred for this command.  Provided a sense condition  		 * is not present, make sure the actual amount transferred is at  		 * least the underflow value or fail.  		 */ @@ -2329,12 +3979,12 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  	struct lpfc_nodelist *pnode = rdata->pnode;  	struct scsi_cmnd *cmd;  	int result; -	struct scsi_device *tmp_sdev;  	int depth;  	unsigned long flags;  	struct lpfc_fast_path_event *fast_path_evt;  	struct Scsi_Host *shost;  	uint32_t queue_depth, scsi_id; +	uint32_t logit = LOG_FCP;  	/* Sanity check on return of outstanding command */  	if (!(lpfc_cmd->pCmd)) @@ -2342,11 +3992,42 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  	cmd = lpfc_cmd->pCmd;  	shost = cmd->device->host; -	lpfc_cmd->result = pIocbOut->iocb.un.ulpWord[4]; +	lpfc_cmd->result = (pIocbOut->iocb.un.ulpWord[4] & IOERR_PARAM_MASK);  	lpfc_cmd->status = pIocbOut->iocb.ulpStatus;  	/* pick up SLI4 exhange busy status from HBA */  	lpfc_cmd->exch_busy = pIocbOut->iocb_flag & LPFC_EXCHANGE_BUSY; +#ifdef CONFIG_SCSI_LPFC_DEBUG_FS +	if (lpfc_cmd->prot_data_type) { +		struct scsi_dif_tuple *src = NULL; + +		src =  (struct scsi_dif_tuple *)lpfc_cmd->prot_data_segment; +		/* +		 * Used to restore any changes to protection +		 * data for error injection. +		 */ +		switch (lpfc_cmd->prot_data_type) { +		case LPFC_INJERR_REFTAG: +			src->ref_tag = +				lpfc_cmd->prot_data; +			break; +		case LPFC_INJERR_APPTAG: +			src->app_tag = +				(uint16_t)lpfc_cmd->prot_data; +			break; +		case LPFC_INJERR_GUARD: +			src->guard_tag = +				(uint16_t)lpfc_cmd->prot_data; +			break; +		default: +			break; +		} + +		lpfc_cmd->prot_data = 0; +		lpfc_cmd->prot_data_type = 0; +		lpfc_cmd->prot_data_segment = NULL; +	} +#endif  	if (pnode && NLP_CHK_NODE_ACT(pnode))  		atomic_dec(&pnode->cmd_pending); @@ -2356,16 +4037,28 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  			lpfc_cmd->status = IOSTAT_DRIVER_REJECT;  		else if (lpfc_cmd->status >= IOSTAT_CNT)  			lpfc_cmd->status = IOSTAT_DEFAULT; - -		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, -				 "9030 FCP cmd x%x failed <%d/%d> " -				 "status: x%x result: x%x Data: x%x x%x\n", -				 cmd->cmnd[0], -				 cmd->device ? cmd->device->id : 0xffff, -				 cmd->device ? cmd->device->lun : 0xffff, -				 lpfc_cmd->status, lpfc_cmd->result, -				 pIocbOut->iocb.ulpContext, -				 lpfc_cmd->cur_iocbq.iocb.ulpIoTag); +		if (lpfc_cmd->status == IOSTAT_FCP_RSP_ERROR && +		    !lpfc_cmd->fcp_rsp->rspStatus3 && +		    (lpfc_cmd->fcp_rsp->rspStatus2 & RESID_UNDER) && +		    !(vport->cfg_log_verbose & LOG_FCP_UNDER)) +			logit = 0; +		else +			logit = LOG_FCP | LOG_FCP_UNDER; +		lpfc_printf_vlog(vport, KERN_WARNING, logit, +			 "9030 FCP cmd x%x failed <%d/%d> " +			 "status: x%x result: x%x " +			 "sid: x%x did: x%x oxid: x%x " +			 "Data: x%x x%x\n", +			 cmd->cmnd[0], +			 cmd->device ? cmd->device->id : 0xffff, +			 cmd->device ? cmd->device->lun : 0xffff, +			 lpfc_cmd->status, lpfc_cmd->result, +			 vport->fc_myDID, +			 (pnode) ? pnode->nlp_DID : 0, +			 phba->sli_rev == LPFC_SLI_REV4 ? +			     lpfc_cmd->cur_iocbq.sli4_xritag : 0xffff, +			 pIocbOut->iocb.ulpContext, +			 lpfc_cmd->cur_iocbq.iocb.ulpIoTag);  		switch (lpfc_cmd->status) {  		case IOSTAT_FCP_RSP_ERROR: @@ -2401,6 +4094,16 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  			lpfc_worker_wake_up(phba);  			break;  		case IOSTAT_LOCAL_REJECT: +		case IOSTAT_REMOTE_STOP: +			if (lpfc_cmd->result == IOERR_ELXSEC_KEY_UNWRAP_ERROR || +			    lpfc_cmd->result == +					IOERR_ELXSEC_KEY_UNWRAP_COMPARE_ERROR || +			    lpfc_cmd->result == IOERR_ELXSEC_CRYPTO_ERROR || +			    lpfc_cmd->result == +					IOERR_ELXSEC_CRYPTO_COMPARE_ERROR) { +				cmd->result = ScsiResult(DID_NO_CONNECT, 0); +				break; +			}  			if (lpfc_cmd->result == IOERR_INVALID_RPI ||  			    lpfc_cmd->result == IOERR_NO_RESOURCES ||  			    lpfc_cmd->result == IOERR_ABORT_REQUESTED || @@ -2408,7 +4111,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  				cmd->result = ScsiResult(DID_REQUEUE, 0);  				break;  			} -  			if ((lpfc_cmd->result == IOERR_RX_DMA_FAILED ||  			     lpfc_cmd->result == IOERR_TX_DMA_FAILED) &&  			     pIocbOut->iocb.unsli3.sli3_bg.bgstat) { @@ -2427,7 +4129,17 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  							"on unprotected cmd\n");  				}  			} - +			if ((lpfc_cmd->status == IOSTAT_REMOTE_STOP) +				&& (phba->sli_rev == LPFC_SLI_REV4) +				&& (pnode && NLP_CHK_NODE_ACT(pnode))) { +				/* This IO was aborted by the target, we don't +				 * know the rxid and because we did not send the +				 * ABTS we cannot generate and RRQ. +				 */ +				lpfc_set_rrq_active(phba, pnode, +					lpfc_cmd->cur_iocbq.sli4_lxritag, +					0, 0); +			}  		/* else: fall through */  		default:  			cmd->result = ScsiResult(DID_ERROR, 0); @@ -2438,9 +4150,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  		    || (pnode->nlp_state != NLP_STE_MAPPED_NODE))  			cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED,  						 SAM_STAT_BUSY); -	} else { +	} else  		cmd->result = ScsiResult(DID_OK, 0); -	}  	if (cmd->result || lpfc_cmd->fcp_rsp->rspSnsLen) {  		uint32_t *lp = (uint32_t *)cmd->sense_buffer; @@ -2496,12 +4207,15 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  	cmd->scsi_done(cmd);  	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { +		spin_lock_irqsave(&phba->hbalock, flags); +		lpfc_cmd->pCmd = NULL; +		spin_unlock_irqrestore(&phba->hbalock, flags); +  		/*  		 * If there is a thread waiting for command completion  		 * wake up the thread.  		 */  		spin_lock_irqsave(shost->host_lock, flags); -		lpfc_cmd->pCmd = NULL;  		if (lpfc_cmd->waitq)  			wake_up(lpfc_cmd->waitq);  		spin_unlock_irqrestore(shost->host_lock, flags); @@ -2509,38 +4223,15 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,  		return;  	} -	if (!result) -		lpfc_rampup_queue_depth(vport, queue_depth); - -	/* -	 * Check for queue full.  If the lun is reporting queue full, then -	 * back off the lun queue depth to prevent target overloads. -	 */ -	if (result == SAM_STAT_TASK_SET_FULL && pnode && -	    NLP_CHK_NODE_ACT(pnode)) { -		shost_for_each_device(tmp_sdev, shost) { -			if (tmp_sdev->id != scsi_id) -				continue; -			depth = scsi_track_queue_full(tmp_sdev, -						      tmp_sdev->queue_depth-1); -			if (depth <= 0) -				continue; -			lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, -					 "0711 detected queue full - lun queue " -					 "depth adjusted to %d.\n", depth); -			lpfc_send_sdev_queuedepth_change_event(phba, vport, -							       pnode, -							       tmp_sdev->lun, -							       depth+1, depth); -		} -	} +	spin_lock_irqsave(&phba->hbalock, flags); +	lpfc_cmd->pCmd = NULL; +	spin_unlock_irqrestore(&phba->hbalock, flags);  	/*  	 * If there is a thread waiting for command completion  	 * wake up the thread.  	 */  	spin_lock_irqsave(shost->host_lock, flags); -	lpfc_cmd->pCmd = NULL;  	if (lpfc_cmd->waitq)  		wake_up(lpfc_cmd->waitq);  	spin_unlock_irqrestore(shost->host_lock, flags); @@ -2586,6 +4277,9 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	struct lpfc_iocbq *piocbq = &(lpfc_cmd->cur_iocbq);  	int datadir = scsi_cmnd->sc_data_direction;  	char tag[2]; +	uint8_t *ptr; +	bool sli4; +	uint32_t fcpdl;  	if (!pnode || !NLP_CHK_NODE_ACT(pnode))  		return; @@ -2597,7 +4291,12 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	int_to_scsilun(lpfc_cmd->pCmd->device->lun,  			&lpfc_cmd->fcp_cmnd->fcp_lun); -	memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16); +	ptr = &fcp_cmnd->fcpCdb[0]; +	memcpy(ptr, scsi_cmnd->cmnd, scsi_cmnd->cmd_len); +	if (scsi_cmnd->cmd_len < LPFC_FCP_CDB_LEN) { +		ptr += scsi_cmnd->cmd_len; +		memset(ptr, 0, (LPFC_FCP_CDB_LEN - scsi_cmnd->cmd_len)); +	}  	if (scsi_populate_tag_msg(scsi_cmnd, tag)) {  		switch (tag[0]) { @@ -2612,7 +4311,10 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  			break;  		}  	} else -		fcp_cmnd->fcpCntl1 = 0; +		fcp_cmnd->fcpCntl1 = SIMPLE_Q; + +	sli4 = (phba->sli_rev == LPFC_SLI_REV4); +	piocbq->iocb.un.fcpi.fcpi_XRdy = 0;  	/*  	 * There are three possibilities here - use scatter-gather segment, use @@ -2623,11 +4325,16 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	if (scsi_sg_count(scsi_cmnd)) {  		if (datadir == DMA_TO_DEVICE) {  			iocb_cmd->ulpCommand = CMD_FCP_IWRITE64_CR; -			if (phba->sli_rev < LPFC_SLI_REV4) { -				iocb_cmd->un.fcpi.fcpi_parm = 0; -				iocb_cmd->ulpPU = 0; -			} else -				iocb_cmd->ulpPU = PARM_READ_CHECK; +			iocb_cmd->ulpPU = PARM_READ_CHECK; +			if (vport->cfg_first_burst_size && +			    (pnode->nlp_flag & NLP_FIRSTBURST)) { +				fcpdl = scsi_bufflen(scsi_cmnd); +				if (fcpdl < vport->cfg_first_burst_size) +					piocbq->iocb.un.fcpi.fcpi_XRdy = fcpdl; +				else +					piocbq->iocb.un.fcpi.fcpi_XRdy = +						vport->cfg_first_burst_size; +			}  			fcp_cmnd->fcpCntl3 = WRITE_DATA;  			phba->fc4OutputRequests++;  		} else { @@ -2651,6 +4358,9 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  	 * of the scsi_cmnd request_buffer  	 */  	piocbq->iocb.ulpContext = pnode->nlp_rpi; +	if (sli4) +		piocbq->iocb.ulpContext = +		  phba->sli4_hba.rpi_ids[pnode->nlp_rpi];  	if (pnode->nlp_fcp_info & NLP_FCP_2_DEVICE)  		piocbq->iocb.ulpFCP2Rcvy = 1;  	else @@ -2664,7 +4374,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,  }  /** - * lpfc_scsi_prep_task_mgmt_cmnd - Convert SLI3 scsi TM cmd to FCP info unit + * lpfc_scsi_prep_task_mgmt_cmd - Convert SLI3 scsi TM cmd to FCP info unit   * @vport: The virtual port for which this call is being executed.   * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure.   * @lun: Logical unit number. @@ -2708,10 +4418,14 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,  		lpfc_fcpcmd_to_iocb(piocb->unsli3.fcp_ext.icd, fcp_cmnd);  	piocb->ulpCommand = CMD_FCP_ICMND64_CR;  	piocb->ulpContext = ndlp->nlp_rpi; -	if (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) { -		piocb->ulpFCP2Rcvy = 1; +	if (vport->phba->sli_rev == LPFC_SLI_REV4) { +		piocb->ulpContext = +		  vport->phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];  	} +	piocb->ulpFCP2Rcvy = (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) ? 1 : 0;  	piocb->ulpClass = (ndlp->nlp_fcp_info & 0x0f); +	piocb->ulpPU = 0; +	piocb->un.fcpi.fcpi_parm = 0;  	/* ulpTimeout is only one byte */  	if (lpfc_cmd->timeout > 0xff) { @@ -2730,7 +4444,7 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc_vport *vport,  }  /** - * lpfc_scsi_api_table_setup - Set up scsi api fucntion jump table + * lpfc_scsi_api_table_setup - Set up scsi api function jump table   * @phba: The hba struct for which this call is being executed.   * @dev_grp: The HBA PCI-Device group number.   * @@ -2744,18 +4458,21 @@ lpfc_scsi_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)  	phba->lpfc_scsi_unprep_dma_buf = lpfc_scsi_unprep_dma_buf;  	phba->lpfc_scsi_prep_cmnd = lpfc_scsi_prep_cmnd; -	phba->lpfc_get_scsi_buf = lpfc_get_scsi_buf;  	switch (dev_grp) {  	case LPFC_PCI_DEV_LP:  		phba->lpfc_new_scsi_buf = lpfc_new_scsi_buf_s3;  		phba->lpfc_scsi_prep_dma_buf = lpfc_scsi_prep_dma_buf_s3; +		phba->lpfc_bg_scsi_prep_dma_buf = lpfc_bg_scsi_prep_dma_buf_s3;  		phba->lpfc_release_scsi_buf = lpfc_release_scsi_buf_s3; +		phba->lpfc_get_scsi_buf = lpfc_get_scsi_buf_s3;  		break;  	case LPFC_PCI_DEV_OC:  		phba->lpfc_new_scsi_buf = lpfc_new_scsi_buf_s4;  		phba->lpfc_scsi_prep_dma_buf = lpfc_scsi_prep_dma_buf_s4; +		phba->lpfc_bg_scsi_prep_dma_buf = lpfc_bg_scsi_prep_dma_buf_s4;  		phba->lpfc_release_scsi_buf = lpfc_release_scsi_buf_s4; +		phba->lpfc_get_scsi_buf = lpfc_get_scsi_buf_s4;  		break;  	default:  		lpfc_printf_log(phba, KERN_ERR, LOG_INIT, @@ -2764,7 +4481,6 @@ lpfc_scsi_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)  		return -ENODEV;  		break;  	} -	phba->lpfc_get_scsi_buf = lpfc_get_scsi_buf;  	phba->lpfc_rampdown_queue_depth = lpfc_rampdown_queue_depth;  	phba->lpfc_scsi_cmd_iocb_cmpl = lpfc_scsi_cmd_iocb_cmpl;  	return 0; @@ -2805,7 +4521,7 @@ lpfc_info(struct Scsi_Host *host)  {  	struct lpfc_vport *vport = (struct lpfc_vport *) host->hostdata;  	struct lpfc_hba   *phba = vport->phba; -	int len; +	int len, link_speed = 0;  	static char  lpfcinfobuf[384];  	memset(lpfcinfobuf,0,384); @@ -2826,12 +4542,18 @@ lpfc_info(struct Scsi_Host *host)  				 phba->Port);  		}  		len = strlen(lpfcinfobuf); -		if (phba->sli4_hba.link_state.logical_speed) { -			snprintf(lpfcinfobuf + len, -				 384-len, -				 " Logical Link Speed: %d Mbps", -				 phba->sli4_hba.link_state.logical_speed * 10); +		if (phba->sli_rev <= LPFC_SLI_REV3) { +			link_speed = lpfc_sli_port_speed_get(phba); +		} else { +			if (phba->sli4_hba.link_state.logical_speed) +				link_speed = +				      phba->sli4_hba.link_state.logical_speed; +			else +				link_speed = phba->sli4_hba.link_state.speed;  		} +		if (link_speed != 0) +			snprintf(lpfcinfobuf + len, 384-len, +				 " Logical Link Speed: %d Mbps", link_speed);  	}  	return lpfcinfobuf;  } @@ -2848,7 +4570,7 @@ static __inline__ void lpfc_poll_rearm_timer(struct lpfc_hba * phba)  	unsigned long  poll_tmo_expires =  		(jiffies + msecs_to_jiffies(phba->cfg_poll_tmo)); -	if (phba->sli.ring[LPFC_FCP_RING].txcmplq_cnt) +	if (!list_empty(&phba->sli.ring[LPFC_FCP_RING].txcmplq))  		mod_timer(&phba->fcp_poll_timer,  			  poll_tmo_expires);  } @@ -2899,17 +4621,17 @@ void lpfc_poll_timeout(unsigned long ptr)   *   SCSI_MLQUEUE_HOST_BUSY - Block all devices served by this host temporarily.   **/  static int -lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) +lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd)  { -	struct Scsi_Host  *shost = cmnd->device->host;  	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;  	struct lpfc_hba   *phba = vport->phba; -	struct lpfc_rport_data *rdata = cmnd->device->hostdata; +	struct lpfc_rport_data *rdata;  	struct lpfc_nodelist *ndlp;  	struct lpfc_scsi_buf *lpfc_cmd;  	struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));  	int err; +	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);  	err = fc_remote_port_chkready(rport);  	if (err) {  		cmnd->result = err; @@ -2917,8 +4639,8 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))  	}  	ndlp = rdata->pnode; -	if (!(phba->sli3_options & LPFC_SLI3_BG_ENABLED) && -		scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) { +	if ((scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) && +		(!(phba->sli3_options & LPFC_SLI3_BG_ENABLED))) {  		lpfc_printf_log(phba, KERN_ERR, LOG_BG,  				"9058 BLKGRD: ERROR: rcvd protected cmd:%02x" @@ -2933,14 +4655,12 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))  	 * Catch race where our node has transitioned, but the  	 * transport is still transitioning.  	 */ -	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) { -		cmnd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0); -		goto out_fail_command; -	} +	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) +		goto out_tgt_busy;  	if (atomic_read(&ndlp->cmd_pending) >= ndlp->cmd_qdepth) -		goto out_host_busy; +		goto out_tgt_busy; -	lpfc_cmd = lpfc_get_scsi_buf(phba); +	lpfc_cmd = lpfc_get_scsi_buf(phba, ndlp);  	if (lpfc_cmd == NULL) {  		lpfc_rampdown_queue_depth(phba); @@ -2959,68 +4679,30 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))  	lpfc_cmd->timeout = 0;  	lpfc_cmd->start_time = jiffies;  	cmnd->host_scribble = (unsigned char *)lpfc_cmd; -	cmnd->scsi_done = done;  	if (scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) {  		if (vport->phba->cfg_enable_bg) { -			lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -				"9033 BLKGRD: rcvd protected cmd:%02x op:%02x " -				"str=%s\n", -				cmnd->cmnd[0], scsi_get_prot_op(cmnd), -				dif_op_str[scsi_get_prot_op(cmnd)]); -			lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -				"9034 BLKGRD: CDB: %02x %02x %02x %02x %02x " -				"%02x %02x %02x %02x %02x\n", -				cmnd->cmnd[0], cmnd->cmnd[1], cmnd->cmnd[2], -				cmnd->cmnd[3], cmnd->cmnd[4], cmnd->cmnd[5], -				cmnd->cmnd[6], cmnd->cmnd[7], cmnd->cmnd[8], -				cmnd->cmnd[9]); -			if (cmnd->cmnd[0] == READ_10) -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					"9035 BLKGRD: READ @ sector %llu, " -					"count %u\n", -					(unsigned long long)scsi_get_lba(cmnd), -					blk_rq_sectors(cmnd->request)); -			else if (cmnd->cmnd[0] == WRITE_10) -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					"9036 BLKGRD: WRITE @ sector %llu, " -					"count %u cmd=%p\n", -					(unsigned long long)scsi_get_lba(cmnd), -					blk_rq_sectors(cmnd->request), -					cmnd); +			lpfc_printf_vlog(vport, +					 KERN_INFO, LOG_SCSI_CMD, +					 "9033 BLKGRD: rcvd %s cmd:x%x " +					 "sector x%llx cnt %u pt %x\n", +					 dif_op_str[scsi_get_prot_op(cmnd)], +					 cmnd->cmnd[0], +					 (unsigned long long)scsi_get_lba(cmnd), +					 blk_rq_sectors(cmnd->request), +					 (cmnd->cmnd[1]>>5));  		} -  		err = lpfc_bg_scsi_prep_dma_buf(phba, lpfc_cmd);  	} else {  		if (vport->phba->cfg_enable_bg) { -			lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					"9038 BLKGRD: rcvd unprotected cmd:" -					"%02x op:%02x str=%s\n", -					cmnd->cmnd[0], scsi_get_prot_op(cmnd), -					dif_op_str[scsi_get_prot_op(cmnd)]); -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					"9039 BLKGRD: CDB: %02x %02x %02x " -					"%02x %02x %02x %02x %02x %02x %02x\n", -					cmnd->cmnd[0], cmnd->cmnd[1], -					cmnd->cmnd[2], cmnd->cmnd[3], -					cmnd->cmnd[4], cmnd->cmnd[5], -					cmnd->cmnd[6], cmnd->cmnd[7], -					cmnd->cmnd[8], cmnd->cmnd[9]); -			if (cmnd->cmnd[0] == READ_10) -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					"9040 dbg: READ @ sector %llu, " -					"count %u\n", -					(unsigned long long)scsi_get_lba(cmnd), -					 blk_rq_sectors(cmnd->request)); -			else if (cmnd->cmnd[0] == WRITE_10) -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					 "9041 dbg: WRITE @ sector %llu, " -					 "count %u cmd=%p\n", +			lpfc_printf_vlog(vport, +					 KERN_INFO, LOG_SCSI_CMD, +					 "9038 BLKGRD: rcvd PROT_NORMAL cmd: " +					 "x%x sector x%llx cnt %u pt %x\n", +					 cmnd->cmnd[0],  					 (unsigned long long)scsi_get_lba(cmnd), -					 blk_rq_sectors(cmnd->request), cmnd); -			else -				lpfc_printf_vlog(vport, KERN_WARNING, LOG_BG, -					 "9042 dbg: parser not implemented\n"); +					 blk_rq_sectors(cmnd->request), +					 (cmnd->cmnd[1]>>5));  		}  		err = lpfc_scsi_prep_dma_buf(phba, lpfc_cmd);  	} @@ -3035,14 +4717,30 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))  				  &lpfc_cmd->cur_iocbq, SLI_IOCB_RET_IOCB);  	if (err) {  		atomic_dec(&ndlp->cmd_pending); +		lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +				 "3376 FCP could not issue IOCB err %x" +				 "FCP cmd x%x <%d/%d> " +				 "sid: x%x did: x%x oxid: x%x " +				 "Data: x%x x%x x%x x%x\n", +				 err, cmnd->cmnd[0], +				 cmnd->device ? cmnd->device->id : 0xffff, +				 cmnd->device ? cmnd->device->lun : 0xffff, +				 vport->fc_myDID, ndlp->nlp_DID, +				 phba->sli_rev == LPFC_SLI_REV4 ? +				 lpfc_cmd->cur_iocbq.sli4_xritag : 0xffff, +				 lpfc_cmd->cur_iocbq.iocb.ulpContext, +				 lpfc_cmd->cur_iocbq.iocb.ulpIoTag, +				 lpfc_cmd->cur_iocbq.iocb.ulpTimeout, +				 (uint32_t) +				 (cmnd->request->timeout / 1000)); + +  		goto out_host_busy_free_buf;  	}  	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) { -		spin_unlock(shost->host_lock);  		lpfc_sli_handle_fast_ring_event(phba,  			&phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ); -		spin_lock(shost->host_lock);  		if (phba->cfg_poll & DISABLE_FCP_RING_INT)  			lpfc_poll_rearm_timer(phba);  	} @@ -3055,11 +4753,15 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))   out_host_busy:  	return SCSI_MLQUEUE_HOST_BUSY; + out_tgt_busy: +	return SCSI_MLQUEUE_TARGET_BUSY; +   out_fail_command: -	done(cmnd); +	cmnd->scsi_done(cmnd);  	return 0;  } +  /**   * lpfc_abort_handler - scsi_host_template eh_abort_handler entry point   * @cmnd: Pointer to scsi_cmnd data structure. @@ -3080,41 +4782,77 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)  	struct lpfc_iocbq *abtsiocb;  	struct lpfc_scsi_buf *lpfc_cmd;  	IOCB_t *cmd, *icmd; -	int ret = SUCCESS; +	int ret = SUCCESS, status = 0; +	struct lpfc_sli_ring *pring_s4; +	int ring_number, ret_val; +	unsigned long flags, iflags;  	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq); -	ret = fc_block_scsi_eh(cmnd); -	if (ret) -		return ret; +	status = fc_block_scsi_eh(cmnd); +	if (status != 0 && status != SUCCESS) +		return status; + +	spin_lock_irqsave(&phba->hbalock, flags); +	/* driver queued commands are in process of being flushed */ +	if (phba->hba_flag & HBA_FCP_IOQ_FLUSH) { +		spin_unlock_irqrestore(&phba->hbalock, flags); +		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, +			"3168 SCSI Layer abort requested I/O has been " +			"flushed by LLD.\n"); +		return FAILED; +	} +  	lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble; -	if (!lpfc_cmd) { +	if (!lpfc_cmd || !lpfc_cmd->pCmd) { +		spin_unlock_irqrestore(&phba->hbalock, flags);  		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP,  			 "2873 SCSI Layer I/O Abort Request IO CMPL Status " -			 "x%x ID %d " -			 "LUN %d snum %#lx\n", ret, cmnd->device->id, -			 cmnd->device->lun, cmnd->serial_number); +			 "x%x ID %d LUN %d\n", +			 SUCCESS, cmnd->device->id, cmnd->device->lun);  		return SUCCESS;  	} +	iocb = &lpfc_cmd->cur_iocbq; +	/* the command is in process of being cancelled */ +	if (!(iocb->iocb_flag & LPFC_IO_ON_TXCMPLQ)) { +		spin_unlock_irqrestore(&phba->hbalock, flags); +		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, +			"3169 SCSI Layer abort requested I/O has been " +			"cancelled by LLD.\n"); +		return FAILED; +	}  	/*  	 * If pCmd field of the corresponding lpfc_scsi_buf structure  	 * points to a different SCSI command, then the driver has  	 * already completed this command, but the midlayer did not -	 * see the completion before the eh fired.  Just return -	 * SUCCESS. +	 * see the completion before the eh fired. Just return SUCCESS.  	 */ -	iocb = &lpfc_cmd->cur_iocbq; -	if (lpfc_cmd->pCmd != cmnd) -		goto out; +	if (lpfc_cmd->pCmd != cmnd) { +		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, +			"3170 SCSI Layer abort requested I/O has been " +			"completed by LLD.\n"); +		goto out_unlock; +	}  	BUG_ON(iocb->context1 != lpfc_cmd); -	abtsiocb = lpfc_sli_get_iocbq(phba); +	/* abort issued in recovery is still in progress */ +	if (iocb->iocb_flag & LPFC_DRIVER_ABORTED) { +		lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, +			 "3389 SCSI Layer I/O Abort Request is pending\n"); +		spin_unlock_irqrestore(&phba->hbalock, flags); +		goto wait_for_cmpl; +	} + +	abtsiocb = __lpfc_sli_get_iocbq(phba);  	if (abtsiocb == NULL) {  		ret = FAILED; -		goto out; +		goto out_unlock;  	} +	/* Indicate the IO is being aborted by the driver. */ +	iocb->iocb_flag |= LPFC_DRIVER_ABORTED; +  	/*  	 * The scsi command can not be in txq and it is in flight because the  	 * pCmd is still pointig at the SCSI command we have to abort. There @@ -3144,8 +4882,23 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)  	abtsiocb->iocb_cmpl = lpfc_sli_abort_fcp_cmpl;  	abtsiocb->vport = vport; -	if (lpfc_sli_issue_iocb(phba, LPFC_FCP_RING, abtsiocb, 0) == -	    IOCB_ERROR) { +	if (phba->sli_rev == LPFC_SLI_REV4) { +		ring_number = MAX_SLI3_CONFIGURED_RINGS + iocb->fcp_wqidx; +		pring_s4 = &phba->sli.ring[ring_number]; +		/* Note: both hbalock and ring_lock must be set here */ +		spin_lock_irqsave(&pring_s4->ring_lock, iflags); +		ret_val = __lpfc_sli_issue_iocb(phba, pring_s4->ringno, +						abtsiocb, 0); +		spin_unlock_irqrestore(&pring_s4->ring_lock, iflags); +	} else { +		ret_val = __lpfc_sli_issue_iocb(phba, LPFC_FCP_RING, +						abtsiocb, 0); +	} +	/* no longer need the lock after this point */ +	spin_unlock_irqrestore(&phba->hbalock, flags); + + +	if (ret_val == IOCB_ERROR) {  		lpfc_sli_release_iocbq(phba, abtsiocb);  		ret = FAILED;  		goto out; @@ -3155,31 +4908,35 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)  		lpfc_sli_handle_fast_ring_event(phba,  			&phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ); +wait_for_cmpl:  	lpfc_cmd->waitq = &waitq;  	/* Wait for abort to complete */  	wait_event_timeout(waitq,  			  (lpfc_cmd->pCmd != cmnd), -			   (2*vport->cfg_devloss_tmo*HZ)); +			   msecs_to_jiffies(2*vport->cfg_devloss_tmo*1000)); -	spin_lock_irq(shost->host_lock); +	spin_lock_irqsave(shost->host_lock, flags);  	lpfc_cmd->waitq = NULL; -	spin_unlock_irq(shost->host_lock); +	spin_unlock_irqrestore(shost->host_lock, flags);  	if (lpfc_cmd->pCmd == cmnd) {  		ret = FAILED;  		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,  				 "0748 abort handler timed out waiting " -				 "for abort to complete: ret %#x, ID %d, " -				 "LUN %d, snum %#lx\n", -				 ret, cmnd->device->id, cmnd->device->lun, -				 cmnd->serial_number); +				 "for abortng I/O (xri:x%x) to complete: " +				 "ret %#x, ID %d, LUN %d\n", +				 iocb->sli4_xritag, ret, +				 cmnd->device->id, cmnd->device->lun);  	} +	goto out; - out: +out_unlock: +	spin_unlock_irqrestore(&phba->hbalock, flags); +out:  	lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP,  			 "0749 SCSI Layer I/O Abort Request Status x%x ID %d " -			 "LUN %d snum %#lx\n", ret, cmnd->device->id, -			 cmnd->device->lun, cmnd->serial_number); +			 "LUN %d\n", ret, cmnd->device->id, +			 cmnd->device->lun);  	return ret;  } @@ -3206,6 +4963,73 @@ lpfc_taskmgmt_name(uint8_t task_mgmt_cmd)  	}  } + +/** + * lpfc_check_fcp_rsp - check the returned fcp_rsp to see if task failed + * @vport: The virtual port for which this call is being executed. + * @lpfc_cmd: Pointer to lpfc_scsi_buf data structure. + * + * This routine checks the FCP RSP INFO to see if the tsk mgmt command succeded + * + * Return code : + *   0x2003 - Error + *   0x2002 - Success + **/ +static int +lpfc_check_fcp_rsp(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd) +{ +	struct fcp_rsp *fcprsp = lpfc_cmd->fcp_rsp; +	uint32_t rsp_info; +	uint32_t rsp_len; +	uint8_t  rsp_info_code; +	int ret = FAILED; + + +	if (fcprsp == NULL) +		lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +				 "0703 fcp_rsp is missing\n"); +	else { +		rsp_info = fcprsp->rspStatus2; +		rsp_len = be32_to_cpu(fcprsp->rspRspLen); +		rsp_info_code = fcprsp->rspInfo3; + + +		lpfc_printf_vlog(vport, KERN_INFO, +				 LOG_FCP, +				 "0706 fcp_rsp valid 0x%x," +				 " rsp len=%d code 0x%x\n", +				 rsp_info, +				 rsp_len, rsp_info_code); + +		if ((fcprsp->rspStatus2&RSP_LEN_VALID) && (rsp_len == 8)) { +			switch (rsp_info_code) { +			case RSP_NO_FAILURE: +				lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +						 "0715 Task Mgmt No Failure\n"); +				ret = SUCCESS; +				break; +			case RSP_TM_NOT_SUPPORTED: /* TM rejected */ +				lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +						 "0716 Task Mgmt Target " +						"reject\n"); +				break; +			case RSP_TM_NOT_COMPLETED: /* TM failed */ +				lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +						 "0717 Task Mgmt Target " +						"failed TM\n"); +				break; +			case RSP_TM_INVALID_LU: /* TM to invalid LU! */ +				lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP, +						 "0718 Task Mgmt to invalid " +						"LUN\n"); +				break; +			} +		} +	} +	return ret; +} + +  /**   * lpfc_send_taskmgmt - Generic SCSI Task Mgmt Handler   * @vport: The virtual port for which this call is being executed. @@ -3237,10 +5061,10 @@ lpfc_send_taskmgmt(struct lpfc_vport *vport, struct lpfc_rport_data *rdata,  	if (!pnode || !NLP_CHK_NODE_ACT(pnode))  		return FAILED; -	lpfc_cmd = lpfc_get_scsi_buf(phba); +	lpfc_cmd = lpfc_get_scsi_buf(phba, rdata->pnode);  	if (lpfc_cmd == NULL)  		return FAILED; -	lpfc_cmd->timeout = 60; +	lpfc_cmd->timeout = phba->cfg_task_mgmt_tmo;  	lpfc_cmd->rdata = rdata;  	status = lpfc_scsi_prep_task_mgmt_cmd(vport, lpfc_cmd, lun_id, @@ -3256,30 +5080,41 @@ lpfc_send_taskmgmt(struct lpfc_vport *vport, struct lpfc_rport_data *rdata,  		lpfc_release_scsi_buf(phba, lpfc_cmd);  		return FAILED;  	} +	iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl;  	lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP,  			 "0702 Issue %s to TGT %d LUN %d " -			 "rpi x%x nlp_flag x%x\n", +			 "rpi x%x nlp_flag x%x Data: x%x x%x\n",  			 lpfc_taskmgmt_name(task_mgmt_cmd), tgt_id, lun_id, -			 pnode->nlp_rpi, pnode->nlp_flag); +			 pnode->nlp_rpi, pnode->nlp_flag, iocbq->sli4_xritag, +			 iocbq->iocb_flag);  	status = lpfc_sli_issue_iocb_wait(phba, LPFC_FCP_RING,  					  iocbq, iocbqrsp, lpfc_cmd->timeout); -	if (status != IOCB_SUCCESS) { -		if (status == IOCB_TIMEDOUT) { -			iocbq->iocb_cmpl = lpfc_tskmgmt_def_cmpl; -			ret = TIMEOUT_ERROR; -		} else -			ret = FAILED; -		lpfc_cmd->status = IOSTAT_DRIVER_REJECT; +	if ((status != IOCB_SUCCESS) || +	    (iocbqrsp->iocb.ulpStatus != IOSTAT_SUCCESS)) {  		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP, -			 "0727 TMF %s to TGT %d LUN %d failed (%d, %d)\n", +			 "0727 TMF %s to TGT %d LUN %d failed (%d, %d) " +			 "iocb_flag x%x\n",  			 lpfc_taskmgmt_name(task_mgmt_cmd),  			 tgt_id, lun_id, iocbqrsp->iocb.ulpStatus, -			 iocbqrsp->iocb.un.ulpWord[4]); -	} else if (status == IOCB_BUSY) -		ret = FAILED; -	else +			 iocbqrsp->iocb.un.ulpWord[4], +			 iocbq->iocb_flag); +		/* if ulpStatus != IOCB_SUCCESS, then status == IOCB_SUCCESS */ +		if (status == IOCB_SUCCESS) { +			if (iocbqrsp->iocb.ulpStatus == IOSTAT_FCP_RSP_ERROR) +				/* Something in the FCP_RSP was invalid. +				 * Check conditions */ +				ret = lpfc_check_fcp_rsp(vport, lpfc_cmd); +			else +				ret = FAILED; +		} else if (status == IOCB_TIMEDOUT) { +			ret = TIMEOUT_ERROR; +		} else { +			ret = FAILED; +		} +		lpfc_cmd->status = IOSTAT_DRIVER_REJECT; +	} else  		ret = SUCCESS;  	lpfc_sli_release_iocbq(phba, iocbqrsp); @@ -3305,10 +5140,11 @@ lpfc_send_taskmgmt(struct lpfc_vport *vport, struct lpfc_rport_data *rdata,  static int  lpfc_chk_tgt_mapped(struct lpfc_vport *vport, struct scsi_cmnd *cmnd)  { -	struct lpfc_rport_data *rdata = cmnd->device->hostdata; +	struct lpfc_rport_data *rdata;  	struct lpfc_nodelist *pnode;  	unsigned long later; +	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);  	if (!rdata) {  		lpfc_printf_vlog(vport, KERN_INFO, LOG_FCP,  			"0797 Tgt Map rport failure: rdata x%p\n", rdata); @@ -3326,7 +5162,7 @@ lpfc_chk_tgt_mapped(struct lpfc_vport *vport, struct scsi_cmnd *cmnd)  		if (pnode->nlp_state == NLP_STE_MAPPED_NODE)  			return SUCCESS;  		schedule_timeout_uninterruptible(msecs_to_jiffies(500)); -		rdata = cmnd->device->hostdata; +		rdata = lpfc_rport_data_from_scsi_device(cmnd->device);  		if (!rdata)  			return FAILED;  		pnode = rdata->pnode; @@ -3363,8 +5199,9 @@ lpfc_reset_flush_io_context(struct lpfc_vport *vport, uint16_t tgt_id,  	cnt = lpfc_sli_sum_iocb(vport, tgt_id, lun_id, context);  	if (cnt) -		lpfc_sli_abort_iocb(vport, &phba->sli.ring[phba->sli.fcp_ring], -				    tgt_id, lun_id, context); +		lpfc_sli_abort_taskmgmt(vport, +					&phba->sli.ring[phba->sli.fcp_ring], +					tgt_id, lun_id, context);  	later = msecs_to_jiffies(2 * vport->cfg_devloss_tmo * 1000) + jiffies;  	while (time_after(later, jiffies) && cnt) {  		schedule_timeout_uninterruptible(msecs_to_jiffies(20)); @@ -3398,13 +5235,14 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)  {  	struct Scsi_Host  *shost = cmnd->device->host;  	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -	struct lpfc_rport_data *rdata = cmnd->device->hostdata; +	struct lpfc_rport_data *rdata;  	struct lpfc_nodelist *pnode;  	unsigned tgt_id = cmnd->device->id;  	unsigned int lun_id = cmnd->device->lun;  	struct lpfc_scsi_event_header scsi_event;  	int status; +	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);  	if (!rdata) {  		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,  			"0798 Device Reset rport failure: rdata x%p\n", rdata); @@ -3412,7 +5250,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)  	}  	pnode = rdata->pnode;  	status = fc_block_scsi_eh(cmnd); -	if (status) +	if (status != 0 && status != SUCCESS)  		return status;  	status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -3444,8 +5282,10 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd)  	 * So, continue on.  	 * We will report success if all the i/o aborts successfully.  	 */ -	status = lpfc_reset_flush_io_context(vport, tgt_id, lun_id, +	if (status == SUCCESS) +		status = lpfc_reset_flush_io_context(vport, tgt_id, lun_id,  						LPFC_CTX_LUN); +  	return status;  } @@ -3465,13 +5305,14 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)  {  	struct Scsi_Host  *shost = cmnd->device->host;  	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; -	struct lpfc_rport_data *rdata = cmnd->device->hostdata; +	struct lpfc_rport_data *rdata;  	struct lpfc_nodelist *pnode;  	unsigned tgt_id = cmnd->device->id;  	unsigned int lun_id = cmnd->device->lun;  	struct lpfc_scsi_event_header scsi_event;  	int status; +	rdata = lpfc_rport_data_from_scsi_device(cmnd->device);  	if (!rdata) {  		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP,  			"0799 Target Reset rport failure: rdata x%p\n", rdata); @@ -3479,7 +5320,7 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)  	}  	pnode = rdata->pnode;  	status = fc_block_scsi_eh(cmnd); -	if (status) +	if (status != 0 && status != SUCCESS)  		return status;  	status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -3511,8 +5352,9 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd)  	 * So, continue on.  	 * We will report success if all the i/o aborts successfully.  	 */ -	status = lpfc_reset_flush_io_context(vport, tgt_id, lun_id, -					LPFC_CTX_TGT); +	if (status == SUCCESS) +		status = lpfc_reset_flush_io_context(vport, tgt_id, lun_id, +					  LPFC_CTX_TGT);  	return status;  } @@ -3546,9 +5388,9 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)  	fc_host_post_vendor_event(shost, fc_get_event_number(),  		sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID); -	ret = fc_block_scsi_eh(cmnd); -	if (ret) -		return ret; +	status = fc_block_scsi_eh(cmnd); +	if (status != 0 && status != SUCCESS) +		return status;  	/*  	 * Since the driver manages a single bus device, reset all @@ -3562,6 +5404,9 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)  		list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {  			if (!NLP_CHK_NODE_ACT(ndlp))  				continue; +			if (vport->phba->cfg_fcp2_no_tgt_reset && +			    (ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE)) +				continue;  			if (ndlp->nlp_state == NLP_STE_MAPPED_NODE &&  			    ndlp->nlp_sid == i &&  			    ndlp->rport) { @@ -3600,6 +5445,51 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)  }  /** + * lpfc_host_reset_handler - scsi_host_template eh_host_reset_handler entry pt + * @cmnd: Pointer to scsi_cmnd data structure. + * + * This routine does host reset to the adaptor port. It brings the HBA + * offline, performs a board restart, and then brings the board back online. + * The lpfc_offline calls lpfc_sli_hba_down which will abort and local + * reject all outstanding SCSI commands to the host and error returned + * back to SCSI mid-level. As this will be SCSI mid-level's last resort + * of error handling, it will only return error if resetting of the adapter + * is not successful; in all other cases, will return success. + * + * Return code : + *  0x2003 - Error + *  0x2002 - Success + **/ +static int +lpfc_host_reset_handler(struct scsi_cmnd *cmnd) +{ +	struct Scsi_Host *shost = cmnd->device->host; +	struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; +	struct lpfc_hba *phba = vport->phba; +	int rc, ret = SUCCESS; + +	lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP, +			 "3172 SCSI layer issued Host Reset Data:\n"); + +	lpfc_offline_prep(phba, LPFC_MBX_WAIT); +	lpfc_offline(phba); +	rc = lpfc_sli_brdrestart(phba); +	if (rc) +		ret = FAILED; +	rc = lpfc_online(phba); +	if (rc) +		ret = FAILED; +	lpfc_unblock_mgmt_io(phba); + +	if (ret == FAILED) { +		lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP, +				 "3323 Failed host reset, bring it offline\n"); +		lpfc_sli4_offline_eratt(phba); +	} +	return ret; +} + +/**   * lpfc_slave_alloc - scsi_host_template slave_alloc entry point   * @sdev: Pointer to scsi_device.   * @@ -3622,11 +5512,45 @@ lpfc_slave_alloc(struct scsi_device *sdev)  	uint32_t num_to_alloc = 0;  	int num_allocated = 0;  	uint32_t sdev_cnt; +	struct lpfc_device_data *device_data; +	unsigned long flags; +	struct lpfc_name target_wwpn;  	if (!rport || fc_remote_port_chkready(rport))  		return -ENXIO; -	sdev->hostdata = rport->dd_data; +	if (phba->cfg_fof) { + +		/* +		 * Check to see if the device data structure for the lun +		 * exists.  If not, create one. +		 */ + +		u64_to_wwn(rport->port_name, target_wwpn.u.wwn); +		spin_lock_irqsave(&phba->devicelock, flags); +		device_data = __lpfc_get_device_data(phba, +						     &phba->luns, +						     &vport->fc_portname, +						     &target_wwpn, +						     sdev->lun); +		if (!device_data) { +			spin_unlock_irqrestore(&phba->devicelock, flags); +			device_data = lpfc_create_device_data(phba, +							&vport->fc_portname, +							&target_wwpn, +							sdev->lun, true); +			if (!device_data) +				return -ENOMEM; +			spin_lock_irqsave(&phba->devicelock, flags); +			list_add_tail(&device_data->listentry, &phba->luns); +		} +		device_data->rport_data = rport->dd_data; +		device_data->available = true; +		spin_unlock_irqrestore(&phba->devicelock, flags); +		sdev->hostdata = device_data; +	} else { +		sdev->hostdata = rport->dd_data; +	}  	sdev_cnt = atomic_inc_return(&phba->sdev_cnt);  	/* @@ -3662,11 +5586,11 @@ lpfc_slave_alloc(struct scsi_device *sdev)  	}  	num_allocated = lpfc_new_scsi_buf(vport, num_to_alloc);  	if (num_to_alloc != num_allocated) { -			lpfc_printf_vlog(vport, KERN_WARNING, LOG_FCP, -				 "0708 Allocation request of %d " -				 "command buffers did not succeed.  " -				 "Allocated %d buffers.\n", -				 num_to_alloc, num_allocated); +			lpfc_printf_vlog(vport, KERN_ERR, LOG_FCP, +					 "0708 Allocation request of %d " +					 "command buffers did not succeed.  " +					 "Allocated %d buffers.\n", +					 num_to_alloc, num_allocated);  	}  	if (num_allocated > 0)  		phba->total_scsi_bufs += num_allocated; @@ -3716,11 +5640,344 @@ lpfc_slave_destroy(struct scsi_device *sdev)  {  	struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata;  	struct lpfc_hba   *phba = vport->phba; +	unsigned long flags; +	struct lpfc_device_data *device_data = sdev->hostdata; +  	atomic_dec(&phba->sdev_cnt); +	if ((phba->cfg_fof) && (device_data)) { +		spin_lock_irqsave(&phba->devicelock, flags); +		device_data->available = false; +		if (!device_data->oas_enabled) +			lpfc_delete_device_data(phba, device_data); +		spin_unlock_irqrestore(&phba->devicelock, flags); +	}  	sdev->hostdata = NULL;  	return;  } +/** + * lpfc_create_device_data - creates and initializes device data structure for OAS + * @pha: Pointer to host bus adapter structure. + * @vport_wwpn: Pointer to vport's wwpn information + * @target_wwpn: Pointer to target's wwpn information + * @lun: Lun on target + * @atomic_create: Flag to indicate if memory should be allocated using the + *		  GFP_ATOMIC flag or not. + * + * This routine creates a device data structure which will contain identifying + * information for the device (host wwpn, target wwpn, lun), state of OAS, + * whether or not the corresponding lun is available by the system, + * and pointer to the rport data. + * + * Return codes: + *   NULL - Error + *   Pointer to lpfc_device_data - Success + **/ +struct lpfc_device_data* +lpfc_create_device_data(struct lpfc_hba *phba, struct lpfc_name *vport_wwpn, +			struct lpfc_name *target_wwpn, uint64_t lun, +			bool atomic_create) +{ + +	struct lpfc_device_data *lun_info; +	int memory_flags; + +	if (unlikely(!phba) || !vport_wwpn || !target_wwpn  || +	    !(phba->cfg_fof)) +		return NULL; + +	/* Attempt to create the device data to contain lun info */ + +	if (atomic_create) +		memory_flags = GFP_ATOMIC; +	else +		memory_flags = GFP_KERNEL; +	lun_info = mempool_alloc(phba->device_data_mem_pool, memory_flags); +	if (!lun_info) +		return NULL; +	INIT_LIST_HEAD(&lun_info->listentry); +	lun_info->rport_data  = NULL; +	memcpy(&lun_info->device_id.vport_wwpn, vport_wwpn, +	       sizeof(struct lpfc_name)); +	memcpy(&lun_info->device_id.target_wwpn, target_wwpn, +	       sizeof(struct lpfc_name)); +	lun_info->device_id.lun = lun; +	lun_info->oas_enabled = false; +	lun_info->available = false; +	return lun_info; +} + +/** + * lpfc_delete_device_data - frees a device data structure for OAS + * @pha: Pointer to host bus adapter structure. + * @lun_info: Pointer to device data structure to free. + * + * This routine frees the previously allocated device data structure passed. + * + **/ +void +lpfc_delete_device_data(struct lpfc_hba *phba, +			struct lpfc_device_data *lun_info) +{ + +	if (unlikely(!phba) || !lun_info  || +	    !(phba->cfg_fof)) +		return; + +	if (!list_empty(&lun_info->listentry)) +		list_del(&lun_info->listentry); +	mempool_free(lun_info, phba->device_data_mem_pool); +	return; +} + +/** + * __lpfc_get_device_data - returns the device data for the specified lun + * @pha: Pointer to host bus adapter structure. + * @list: Point to list to search. + * @vport_wwpn: Pointer to vport's wwpn information + * @target_wwpn: Pointer to target's wwpn information + * @lun: Lun on target + * + * This routine searches the list passed for the specified lun's device data. + * This function does not hold locks, it is the responsibility of the caller + * to ensure the proper lock is held before calling the function. + * + * Return codes: + *   NULL - Error + *   Pointer to lpfc_device_data - Success + **/ +struct lpfc_device_data* +__lpfc_get_device_data(struct lpfc_hba *phba, struct list_head *list, +		       struct lpfc_name *vport_wwpn, +		       struct lpfc_name *target_wwpn, uint64_t lun) +{ + +	struct lpfc_device_data *lun_info; + +	if (unlikely(!phba) || !list || !vport_wwpn || !target_wwpn || +	    !phba->cfg_fof) +		return NULL; + +	/* Check to see if the lun is already enabled for OAS. */ + +	list_for_each_entry(lun_info, list, listentry) { +		if ((memcmp(&lun_info->device_id.vport_wwpn, vport_wwpn, +			    sizeof(struct lpfc_name)) == 0) && +		    (memcmp(&lun_info->device_id.target_wwpn, target_wwpn, +			    sizeof(struct lpfc_name)) == 0) && +		    (lun_info->device_id.lun == lun)) +			return lun_info; +	} + +	return NULL; +} + +/** + * lpfc_find_next_oas_lun - searches for the next oas lun + * @pha: Pointer to host bus adapter structure. + * @vport_wwpn: Pointer to vport's wwpn information + * @target_wwpn: Pointer to target's wwpn information + * @starting_lun: Pointer to the lun to start searching for + * @found_vport_wwpn: Pointer to the found lun's vport wwpn information + * @found_target_wwpn: Pointer to the found lun's target wwpn information + * @found_lun: Pointer to the found lun. + * @found_lun_status: Pointer to status of the found lun. + * + * This routine searches the luns list for the specified lun + * or the first lun for the vport/target.  If the vport wwpn contains + * a zero value then a specific vport is not specified. In this case + * any vport which contains the lun will be considered a match.  If the + * target wwpn contains a zero value then a specific target is not specified. + * In this case any target which contains the lun will be considered a + * match.  If the lun is found, the lun, vport wwpn, target wwpn and lun status + * are returned.  The function will also return the next lun if available. + * If the next lun is not found, starting_lun parameter will be set to + * NO_MORE_OAS_LUN. + * + * Return codes: + *   non-0 - Error + *   0 - Success + **/ +bool +lpfc_find_next_oas_lun(struct lpfc_hba *phba, struct lpfc_name *vport_wwpn, +		       struct lpfc_name *target_wwpn, uint64_t *starting_lun, +		       struct lpfc_name *found_vport_wwpn, +		       struct lpfc_name *found_target_wwpn, +		       uint64_t *found_lun, +		       uint32_t *found_lun_status) +{ + +	unsigned long flags; +	struct lpfc_device_data *lun_info; +	struct lpfc_device_id *device_id; +	uint64_t lun; +	bool found = false; + +	if (unlikely(!phba) || !vport_wwpn || !target_wwpn || +	    !starting_lun || !found_vport_wwpn || +	    !found_target_wwpn || !found_lun || !found_lun_status || +	    (*starting_lun == NO_MORE_OAS_LUN) || +	    !phba->cfg_fof) +		return false; + +	lun = *starting_lun; +	*found_lun = NO_MORE_OAS_LUN; +	*starting_lun = NO_MORE_OAS_LUN; + +	/* Search for lun or the lun closet in value */ + +	spin_lock_irqsave(&phba->devicelock, flags); +	list_for_each_entry(lun_info, &phba->luns, listentry) { +		if (((wwn_to_u64(vport_wwpn->u.wwn) == 0) || +		     (memcmp(&lun_info->device_id.vport_wwpn, vport_wwpn, +			    sizeof(struct lpfc_name)) == 0)) && +		    ((wwn_to_u64(target_wwpn->u.wwn) == 0) || +		     (memcmp(&lun_info->device_id.target_wwpn, target_wwpn, +			    sizeof(struct lpfc_name)) == 0)) && +		    (lun_info->oas_enabled)) { +			device_id = &lun_info->device_id; +			if ((!found) && +			    ((lun == FIND_FIRST_OAS_LUN) || +			     (device_id->lun == lun))) { +				*found_lun = device_id->lun; +				memcpy(found_vport_wwpn, +				       &device_id->vport_wwpn, +				       sizeof(struct lpfc_name)); +				memcpy(found_target_wwpn, +				       &device_id->target_wwpn, +				       sizeof(struct lpfc_name)); +				if (lun_info->available) +					*found_lun_status = +						OAS_LUN_STATUS_EXISTS; +				else +					*found_lun_status = 0; +				if (phba->cfg_oas_flags & OAS_FIND_ANY_VPORT) +					memset(vport_wwpn, 0x0, +					       sizeof(struct lpfc_name)); +				if (phba->cfg_oas_flags & OAS_FIND_ANY_TARGET) +					memset(target_wwpn, 0x0, +					       sizeof(struct lpfc_name)); +				found = true; +			} else if (found) { +				*starting_lun = device_id->lun; +				memcpy(vport_wwpn, &device_id->vport_wwpn, +				       sizeof(struct lpfc_name)); +				memcpy(target_wwpn, &device_id->target_wwpn, +				       sizeof(struct lpfc_name)); +				break; +			} +		} +	} +	spin_unlock_irqrestore(&phba->devicelock, flags); +	return found; +} + +/** + * lpfc_enable_oas_lun - enables a lun for OAS operations + * @pha: Pointer to host bus adapter structure. + * @vport_wwpn: Pointer to vport's wwpn information + * @target_wwpn: Pointer to target's wwpn information + * @lun: Lun + * + * This routine enables a lun for oas operations.  The routines does so by + * doing the following : + * + *   1) Checks to see if the device data for the lun has been created. + *   2) If found, sets the OAS enabled flag if not set and returns. + *   3) Otherwise, creates a device data structure. + *   4) If successfully created, indicates the device data is for an OAS lun, + *   indicates the lun is not available and add to the list of luns. + * + * Return codes: + *   false - Error + *   true - Success + **/ +bool +lpfc_enable_oas_lun(struct lpfc_hba *phba, struct lpfc_name *vport_wwpn, +		    struct lpfc_name *target_wwpn, uint64_t lun) +{ + +	struct lpfc_device_data *lun_info; +	unsigned long flags; + +	if (unlikely(!phba) || !vport_wwpn || !target_wwpn || +	    !phba->cfg_fof) +		return false; + +	spin_lock_irqsave(&phba->devicelock, flags); + +	/* Check to see if the device data for the lun has been created */ +	lun_info = __lpfc_get_device_data(phba, &phba->luns, vport_wwpn, +					  target_wwpn, lun); +	if (lun_info) { +		if (!lun_info->oas_enabled) +			lun_info->oas_enabled = true; +		spin_unlock_irqrestore(&phba->devicelock, flags); +		return true; +	} + +	/* Create an lun info structure and add to list of luns */ +	lun_info = lpfc_create_device_data(phba, vport_wwpn, target_wwpn, lun, +					   false); +	if (lun_info) { +		lun_info->oas_enabled = true; +		lun_info->available = false; +		list_add_tail(&lun_info->listentry, &phba->luns); +		spin_unlock_irqrestore(&phba->devicelock, flags); +		return true; +	} +	spin_unlock_irqrestore(&phba->devicelock, flags); +	return false; +} + +/** + * lpfc_disable_oas_lun - disables a lun for OAS operations + * @pha: Pointer to host bus adapter structure. + * @vport_wwpn: Pointer to vport's wwpn information + * @target_wwpn: Pointer to target's wwpn information + * @lun: Lun + * + * This routine disables a lun for oas operations.  The routines does so by + * doing the following : + * + *   1) Checks to see if the device data for the lun is created. + *   2) If present, clears the flag indicating this lun is for OAS. + *   3) If the lun is not available by the system, the device data is + *   freed. + * + * Return codes: + *   false - Error + *   true - Success + **/ +bool +lpfc_disable_oas_lun(struct lpfc_hba *phba, struct lpfc_name *vport_wwpn, +		     struct lpfc_name *target_wwpn, uint64_t lun) +{ + +	struct lpfc_device_data *lun_info; +	unsigned long flags; + +	if (unlikely(!phba) || !vport_wwpn || !target_wwpn || +	    !phba->cfg_fof) +		return false; + +	spin_lock_irqsave(&phba->devicelock, flags); + +	/* Check to see if the lun is available. */ +	lun_info = __lpfc_get_device_data(phba, +					  &phba->luns, vport_wwpn, +					  target_wwpn, lun); +	if (lun_info) { +		lun_info->oas_enabled = false; +		if (!lun_info->available) +			lpfc_delete_device_data(phba, lun_info); +		spin_unlock_irqrestore(&phba->devicelock, flags); +		return true; +	} + +	spin_unlock_irqrestore(&phba->devicelock, flags); +	return false; +}  struct scsi_host_template lpfc_template = {  	.module			= THIS_MODULE, @@ -3731,6 +5988,7 @@ struct scsi_host_template lpfc_template = {  	.eh_device_reset_handler = lpfc_device_reset_handler,  	.eh_target_reset_handler = lpfc_target_reset_handler,  	.eh_bus_reset_handler	= lpfc_bus_reset_handler, +	.eh_host_reset_handler  = lpfc_host_reset_handler,  	.slave_alloc		= lpfc_slave_alloc,  	.slave_configure	= lpfc_slave_configure,  	.slave_destroy		= lpfc_slave_destroy, @@ -3743,6 +6001,7 @@ struct scsi_host_template lpfc_template = {  	.max_sectors		= 0xFFFF,  	.vendor_id		= LPFC_NL_VENDOR_ID,  	.change_queue_depth	= lpfc_change_queue_depth, +	.change_queue_type	= lpfc_change_queue_type,  };  struct scsi_host_template lpfc_vport_template = { @@ -3765,4 +6024,5 @@ struct scsi_host_template lpfc_vport_template = {  	.shost_attrs		= lpfc_vport_attrs,  	.max_sectors		= 0xFFFF,  	.change_queue_depth	= lpfc_change_queue_depth, +	.change_queue_type	= lpfc_change_queue_type,  };  | 
