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

Commit f314878a authored by Maggie Zhang's avatar Maggie Zhang Committed by James Bottomley
Browse files

[SCSI] bfa: remove all SCSI IO callbacks 



Remove SCSI IO callbacks, and as a result remove bfa_cb_ioim.h.

Signed-off-by: default avatarMaggie Zhang <xmzhang@brocade.com>
Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e3e7d3ee

drivers/scsi/bfa/bfa_cb_ioim.h

deleted100644 → 0
+0 −169
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

 * All rights reserved

 * www.brocade.com

 *

 * Linux driver for Brocade Fibre Channel Host Bus Adapter.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License (GPL) Version 2 as

 * published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */



#ifndef __BFA_HCB_IOIM_H__

#define __BFA_HCB_IOIM_H__



#include "bfa_os_inc.h"

/*

 * task attribute values in FCP-2 FCP_CMND IU

 */

#define SIMPLE_Q    0

#define HEAD_OF_Q   1

#define ORDERED_Q   2

#define ACA_Q	    4

#define UNTAGGED    5



static inline lun_t

bfad_int_to_lun(u32 luno)

{

	union {

		__be16	scsi_lun[4];

		lun_t		bfa_lun;

	} lun;



	lun.bfa_lun     = 0;

	lun.scsi_lun[0] = cpu_to_be16(luno);



	return lun.bfa_lun;

}



/*

 * Get LUN for the I/O request

 */

#define bfa_cb_ioim_get_lun(__dio)	\

	bfad_int_to_lun(((struct scsi_cmnd *)__dio)->device->lun)



/*

 * Get CDB for the I/O request

 */

static inline u8 *

bfa_cb_ioim_get_cdb(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;



	return (u8 *) cmnd->cmnd;

}



/*

 * Get I/O direction (read/write) for the I/O request

 */

static inline enum fcp_iodir

bfa_cb_ioim_get_iodir(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;

	enum dma_data_direction dmadir;



	dmadir = cmnd->sc_data_direction;

	if (dmadir == DMA_TO_DEVICE)

		return FCP_IODIR_WRITE;

	else if (dmadir == DMA_FROM_DEVICE)

		return FCP_IODIR_READ;

	else

		return FCP_IODIR_NONE;

}



/*

 * Get IO size in bytes for the I/O request

 */

static inline u32

bfa_cb_ioim_get_size(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;



	return scsi_bufflen(cmnd);

}



/*

 * Get timeout for the I/O request

 */

static inline u8

bfa_cb_ioim_get_timeout(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;

	/*

	 * TBD: need a timeout for scsi passthru

	 */

	if (cmnd->device->host == NULL)

		return 4;



	return 0;

}



/*

 * Get Command Reference Number for the I/O request. 0 if none.

 */

static inline u8

bfa_cb_ioim_get_crn(struct bfad_ioim_s *dio)

{

	return 0;

}



/*

 * Get SAM-3 priority for the I/O request. 0 is default.

 */

static inline u8

bfa_cb_ioim_get_priority(struct bfad_ioim_s *dio)

{

	return 0;

}



/*

 * Get task attributes for the I/O request. Default is FCP_TASK_ATTR_SIMPLE(0).

 */

static inline u8

bfa_cb_ioim_get_taskattr(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;

	u8	task_attr = UNTAGGED;



	if (cmnd->device->tagged_supported) {

		switch (cmnd->tag) {

		case HEAD_OF_QUEUE_TAG:

			task_attr = HEAD_OF_Q;

			break;

		case ORDERED_QUEUE_TAG:

			task_attr = ORDERED_Q;

			break;

		default:

			task_attr = SIMPLE_Q;

			break;

		}

	}



	return task_attr;

}



/*

 * Get CDB length in bytes for the I/O request. Default is FCP_CMND_CDB_LEN(16).

 */

static inline u8

bfa_cb_ioim_get_cdblen(struct bfad_ioim_s *dio)

{

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;



	return cmnd->cmd_len;

}



/*

 * Assign queue to be used for the I/O request. This value depends on whether

 * the driver wants to use the queues via any specific algorithm. Currently,

 * this is not supported.

 */

#define bfa_cb_ioim_get_reqq(__dio) BFA_FALSE



#endif /* __BFA_HCB_IOIM_H__ */

drivers/scsi/bfa/bfa_defs.h

+2 −2
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ enum bfa_boot_bootopt { 
 */

struct bfa_boot_bootlun_s {

	wwn_t   pwwn;		/*  port wwn of target */

	lun_t   lun;    /*  64-bit lun */

	struct scsi_lun   lun;  /*  64-bit lun */

};

#pragma pack()

drivers/scsi/bfa/bfa_fc.h

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include "bfa_os_inc.h"



typedef u64 wwn_t;

typedef u64 lun_t;



#define WWN_NULL	(0)

#define FC_SYMNAME_MAX	256	/*  max name server symbolic name size */
@@ -1176,7 +1175,7 @@ struct fc_srr_s { 
#define FCP_CMND_LUN_LEN    8



struct fcp_cmnd_s {

	lun_t           lun;		/* 64-bit LU number */

	struct scsi_lun		lun;	/* 64-bit LU number */

	u8			crn;	/* command reference number */

#ifdef __BIGENDIAN

	u8         resvd:1,

drivers/scsi/bfa/bfa_fcpim.c

+33 −20
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */



#include "bfa_modules.h"

#include "bfa_cb_ioim.h"

#include "bfa_os_inc.h"



BFA_TRC_FILE(HAL, FCPIM);

BFA_MODULE(fcpim);
@@ -263,7 +263,7 @@ static void bfa_ioim_sm_cmnd_retry(struct bfa_ioim_s *ioim, 
static void     __bfa_cb_tskim_done(void *cbarg, bfa_boolean_t complete);

static void     __bfa_cb_tskim_failed(void *cbarg, bfa_boolean_t complete);

static bfa_boolean_t bfa_tskim_match_scope(struct bfa_tskim_s *tskim,

					lun_t lun);

					struct scsi_lun lun);

static void     bfa_tskim_gather_ios(struct bfa_tskim_s *tskim);

static void     bfa_tskim_cleanp_comp(void *tskim_cbarg);

static void     bfa_tskim_cleanup_ios(struct bfa_tskim_s *tskim);
@@ -2315,7 +2315,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
{

	struct bfa_itnim_s *itnim = ioim->itnim;

	struct bfi_ioim_req_s *m;

	static struct fcp_cmnd_s cmnd_z0 = { 0 };

	static struct fcp_cmnd_s cmnd_z0 = {{{0}}};

	struct bfi_sge_s *sge, *sgpge;

	u32	pgdlen = 0;

	u32	fcp_dl;
@@ -2324,6 +2324,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	struct bfa_sgpg_s *sgpg;

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *) ioim->dio;

	u32 i, sge_id, pgcumsz;

	enum dma_data_direction dmadir;



	/*

	 * check for room in queue to send request now
@@ -2341,7 +2342,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	 */

	m->io_tag = cpu_to_be16(ioim->iotag);

	m->rport_hdl = ioim->itnim->rport->fw_handle;

	m->io_timeout = bfa_cb_ioim_get_timeout(ioim->dio);

	m->io_timeout = 0;



	sge = &m->sges[0];

	sgpg = ioim->sgpg;
@@ -2412,10 +2413,17 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	 * set up I/O command parameters

	 */

	m->cmnd = cmnd_z0;

	m->cmnd.lun = bfa_cb_ioim_get_lun(ioim->dio);

	m->cmnd.iodir = bfa_cb_ioim_get_iodir(ioim->dio);

	m->cmnd.cdb = *(scsi_cdb_t *)bfa_cb_ioim_get_cdb(ioim->dio);

	fcp_dl = bfa_cb_ioim_get_size(ioim->dio);

	int_to_scsilun(cmnd->device->lun, &m->cmnd.lun);

	dmadir = cmnd->sc_data_direction;

	if (dmadir == DMA_TO_DEVICE)

		m->cmnd.iodir = FCP_IODIR_WRITE;

	else if (dmadir == DMA_FROM_DEVICE)

		m->cmnd.iodir = FCP_IODIR_READ;

	else

		m->cmnd.iodir = FCP_IODIR_NONE;



	m->cmnd.cdb = *(scsi_cdb_t *) cmnd->cmnd;

	fcp_dl = scsi_bufflen(cmnd);

	m->cmnd.fcp_dl = cpu_to_be32(fcp_dl);



	/*
@@ -2439,7 +2447,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
		bfi_h2i_set(m->mh, BFI_MC_IOIM_IO, 0, bfa_lpuid(ioim->bfa));

	}

	if (itnim->seq_rec ||

	    (bfa_cb_ioim_get_size(ioim->dio) & (sizeof(u32) - 1)))

	    (scsi_bufflen(cmnd) & (sizeof(u32) - 1)))

		bfi_h2i_set(m->mh, BFI_MC_IOIM_IO, 0, bfa_lpuid(ioim->bfa));



	/*
@@ -2769,7 +2777,8 @@ bfa_ioim_profile_start(struct bfa_ioim_s *ioim) 
void

bfa_ioim_profile_comp(struct bfa_ioim_s *ioim)

{

	u32 fcp_dl = bfa_cb_ioim_get_size(ioim->dio);

	struct scsi_cmnd *cmnd = (struct scsi_cmnd *) ioim->dio;

	u32 fcp_dl = scsi_bufflen(cmnd);

	u32 index = bfa_ioim_get_index(fcp_dl);

	u64 end_time = jiffies;

	struct bfa_itnim_latency_s *io_lat =
@@ -2895,8 +2904,7 @@ bfa_ioim_start(struct bfa_ioim_s *ioim) 
	 * Obtain the queue over which this request has to be issued

	 */

	ioim->reqq = bfa_fcpim_ioredirect_enabled(ioim->bfa) ?

			bfa_cb_ioim_get_reqq(ioim->dio) :

			bfa_itnim_get_reqq(ioim);

			BFA_FALSE : bfa_itnim_get_reqq(ioim);



	bfa_sm_send_event(ioim, BFA_IOIM_SM_START);

}
@@ -3186,7 +3194,7 @@ __bfa_cb_tskim_failed(void *cbarg, bfa_boolean_t complete) 
}



static	bfa_boolean_t

bfa_tskim_match_scope(struct bfa_tskim_s *tskim, lun_t lun)

bfa_tskim_match_scope(struct bfa_tskim_s *tskim, struct scsi_lun lun)

{

	switch (tskim->tm_cmnd) {

	case FCP_TM_TARGET_RESET:
@@ -3196,7 +3204,7 @@ bfa_tskim_match_scope(struct bfa_tskim_s *tskim, lun_t lun) 
	case FCP_TM_CLEAR_TASK_SET:

	case FCP_TM_LUN_RESET:

	case FCP_TM_CLEAR_ACA:

		return (tskim->lun == lun);

		return (!memcmp(&tskim->lun, &lun, sizeof(lun)));



	default:

		bfa_assert(0);
@@ -3214,6 +3222,8 @@ bfa_tskim_gather_ios(struct bfa_tskim_s *tskim) 
	struct bfa_itnim_s *itnim = tskim->itnim;

	struct bfa_ioim_s *ioim;

	struct list_head *qe, *qen;

	struct scsi_cmnd *cmnd;

	struct scsi_lun scsilun;



	INIT_LIST_HEAD(&tskim->io_q);
@@ -3222,8 +3232,9 @@ bfa_tskim_gather_ios(struct bfa_tskim_s *tskim) 
	 */

	list_for_each_safe(qe, qen, &itnim->io_q) {

		ioim = (struct bfa_ioim_s *) qe;

		if (bfa_tskim_match_scope

			(tskim, bfa_cb_ioim_get_lun(ioim->dio))) {

		cmnd = (struct scsi_cmnd *) ioim->dio;

		int_to_scsilun(cmnd->device->lun, &scsilun);

		if (bfa_tskim_match_scope(tskim, scsilun)) {

			list_del(&ioim->qe);

			list_add_tail(&ioim->qe, &tskim->io_q);

		}
@@ -3234,8 +3245,9 @@ bfa_tskim_gather_ios(struct bfa_tskim_s *tskim) 
	 */

	list_for_each_safe(qe, qen, &itnim->pending_q) {

		ioim = (struct bfa_ioim_s *) qe;

		if (bfa_tskim_match_scope

			(tskim, bfa_cb_ioim_get_lun(ioim->dio))) {

		cmnd = (struct scsi_cmnd *) ioim->dio;

		int_to_scsilun(cmnd->device->lun, &scsilun);

		if (bfa_tskim_match_scope(tskim, scsilun)) {

			list_del(&ioim->qe);

			list_add_tail(&ioim->qe, &ioim->fcpim->ioim_comp_q);

			bfa_ioim_tov(ioim);
@@ -3494,7 +3506,8 @@ bfa_tskim_free(struct bfa_tskim_s *tskim) 
 * @return None.

 */

void

bfa_tskim_start(struct bfa_tskim_s *tskim, struct bfa_itnim_s *itnim, lun_t lun,

bfa_tskim_start(struct bfa_tskim_s *tskim, struct bfa_itnim_s *itnim,

			struct scsi_lun lun,

			enum fcp_tm_cmnd tm_cmnd, u8 tsecs)

{

	tskim->itnim	= itnim;

drivers/scsi/bfa/bfa_fcpim.h

+4 −4
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct bfa_tskim_s { 
	struct bfa_itnim_s	*itnim;	/*  i-t-n nexus for this IO  */

	struct bfad_tskim_s	*dtsk;  /*  driver task mgmt cmnd	*/

	bfa_boolean_t	notify;		/*  notify itnim on TM comp  */

	lun_t	lun;	/*  lun if applicable	*/

	struct scsi_lun		lun;	/*  lun if applicable	*/

	enum fcp_tm_cmnd	tm_cmnd;	/*  task management command  */

	u16	tsk_tag;	/*  FWI IO tag	*/

	u8	tsecs;	/*  timeout in seconds	*/
@@ -389,7 +389,7 @@ struct bfa_tskim_s *bfa_tskim_alloc(struct bfa_s *bfa, 
					struct bfad_tskim_s *dtsk);

void		bfa_tskim_free(struct bfa_tskim_s *tskim);

void		bfa_tskim_start(struct bfa_tskim_s *tskim,

				struct bfa_itnim_s *itnim, lun_t lun,

				struct bfa_itnim_s *itnim, struct scsi_lun lun,

				enum fcp_tm_cmnd tm, u8 t_secs);

void		bfa_cb_tskim_done(void *bfad, struct bfad_tskim_s *dtsk,

				  enum bfi_tskim_status tsk_status);