Commit 93f3321f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "This is a batch of changes that didn't make it in the initial pull
  request because the lpfc series had to be rebased to redo an incorrect
  split.

  It's basically driver updates to lpfc, target, bnx2fc and ufs with the
  rest being minor updates except the sr_block_release one which fixes a
  use after free introduced by the removal of the global mutex in the
  first patch set"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (35 commits)
  scsi: core: Add DID_ALLOC_FAILURE and DID_MEDIUM_ERROR to hostbyte_table
  scsi: ufs: Use ufshcd_config_pwr_mode() when scaling gear
  scsi: bnx2fc: fix boolreturn.cocci warnings
  scsi: zfcp: use fallthrough;
  scsi: aacraid: do not overwrite retval in aac_reset_adapter()
  scsi: sr: Fix sr_block_release()
  scsi: aic7xxx: Remove more FreeBSD-specific code
  scsi: mpt3sas: Fix kernel panic observed on soft HBA unplug
  scsi: ufs: set device as active power mode after resetting device
  scsi: iscsi: Report unbind session event when the target has been removed
  scsi: lpfc: Change default SCSI LUN QD to 64
  scsi: libfc: rport state move to PLOGI if all PRLI retry exhausted
  scsi: libfc: If PRLI rejected, move rport to PLOGI state
  scsi: bnx2fc: Update the driver version to 2.12.13
  scsi: bnx2fc: Fix SCSI command completion after cleanup is posted
  scsi: bnx2fc: Process the RQE with CQE in interrupt context
  scsi: target: use the stack for XCOPY passthrough cmds
  scsi: target: increase XCOPY I/O size
  scsi: target: avoid per-loop XCOPY buffer allocations
  scsi: target: drop xcopy DISK BLOCK LENGTH debug
  ...
parents f8693b3e 1b55940b

drivers/s390/scsi/zfcp_erp.c

+5 −5
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want, 
			return 0;

		if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		p_status = atomic_read(&port->status);

		if (!(p_status & ZFCP_STATUS_COMMON_OPEN))

			need = ZFCP_ERP_ACTION_REOPEN_PORT;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT:

		p_status = atomic_read(&port->status);

		if (p_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -196,7 +196,7 @@ static enum zfcp_erp_act_type zfcp_erp_required_act(enum zfcp_erp_act_type want, 
			return need;

		if (!(a_status & ZFCP_STATUS_COMMON_UNBLOCKED))

			need = ZFCP_ERP_ACTION_REOPEN_ADAPTER;

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_ADAPTER:

		a_status = atomic_read(&adapter->status);

		if (a_status & ZFCP_STATUS_COMMON_ERP_INUSE)
@@ -1086,7 +1086,7 @@ static enum zfcp_erp_act_result zfcp_erp_lun_strategy( 
		if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)

			return zfcp_erp_lun_strategy_close(erp_action);

		/* already closed */

		/* fall through */

		fallthrough;

	case ZFCP_ERP_STEP_LUN_CLOSING:

		if (atomic_read(&zfcp_sdev->status) & ZFCP_STATUS_COMMON_OPEN)

			return ZFCP_ERP_FAILED;
@@ -1415,7 +1415,7 @@ static void zfcp_erp_action_cleanup(struct zfcp_erp_action *act, 
		if (act->step != ZFCP_ERP_STEP_UNINITIALIZED)

			if (result == ZFCP_ERP_SUCCEEDED)

				zfcp_erp_try_rport_unblock(port);

		/* fall through */

		fallthrough;

	case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:

		put_device(&port->dev);

		break;

drivers/s390/scsi/zfcp_fsf.c

+11 −12
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req) 
	case FSF_TOPO_AL:

		fc_host_port_type(shost) = FC_PORTTYPE_NLPORT;

		fc_host_fabric_name(shost) = 0;

		/* fall through */

		fallthrough;

	default:

		fc_host_fabric_name(shost) = 0;

		dev_err(&adapter->ccw_device->dev,
@@ -1032,7 +1032,7 @@ static void zfcp_fsf_abort_fcp_command_handler(struct zfcp_fsf_req *req) 
		switch (fsq->word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -1127,7 +1127,7 @@ static void zfcp_fsf_send_ct_handler(struct zfcp_fsf_req *req) 
		break;

	case FSF_PORT_HANDLE_NOT_VALID:

		zfcp_erp_adapter_reopen(adapter, 0, "fsscth1");

		/* fall through */

		fallthrough;

	case FSF_GENERIC_COMMAND_REJECTED:

	case FSF_PAYLOAD_SIZE_MISMATCH:

	case FSF_REQUEST_SIZE_TOO_LARGE:
@@ -1313,7 +1313,7 @@ static void zfcp_fsf_send_els_handler(struct zfcp_fsf_req *req) 
		break;

	case FSF_SBAL_MISMATCH:

		/* should never occur, avoided in zfcp_fsf_send_els */

		/* fall through */

		fallthrough;

	default:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		break;
@@ -1736,7 +1736,7 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req) 
		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			/* no zfcp_fc_test_link() with failed open port */

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

		case FSF_SQ_NO_RETRY_POSSIBLE:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;
@@ -1909,14 +1909,14 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) 
	case FSF_MAXIMUM_NUMBER_OF_PORTS_EXCEEDED:

		dev_warn(&req->adapter->ccw_device->dev,

			 "Opening WKA port 0x%x failed\n", wka_port->d_id);

		/* fall through */

		fallthrough;

	case FSF_ADAPTER_STATUS_AVAILABLE:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE;

		break;

	case FSF_GOOD:

		wka_port->handle = header->port_handle;

		/* fall through */

		fallthrough;

	case FSF_PORT_ALREADY_OPEN:

		wka_port->status = ZFCP_FC_WKA_PORT_ONLINE;

	}
@@ -2059,7 +2059,6 @@ static void zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *req) 
	case FSF_ADAPTER_STATUS_AVAILABLE:

		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			/* fall through */

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -2144,7 +2143,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 


	case FSF_PORT_HANDLE_NOT_VALID:

		zfcp_erp_adapter_reopen(adapter, 0, "fsouh_1");

		/* fall through */

		fallthrough;

	case FSF_LUN_ALREADY_OPEN:

		break;

	case FSF_PORT_BOXED:
@@ -2175,7 +2174,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 
			 (unsigned long long)zfcp_scsi_dev_lun(sdev),

			 (unsigned long long)zfcp_sdev->port->wwpn);

		zfcp_erp_set_lun_status(sdev, ZFCP_STATUS_COMMON_ERP_FAILED);

		/* fall through */

		fallthrough;

	case FSF_INVALID_COMMAND_OPTION:

		req->status |= ZFCP_STATUS_FSFREQ_ERROR;

		break;
@@ -2183,7 +2182,7 @@ static void zfcp_fsf_open_lun_handler(struct zfcp_fsf_req *req) 
		switch (header->fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;
@@ -2277,7 +2276,7 @@ static void zfcp_fsf_close_lun_handler(struct zfcp_fsf_req *req) 
		switch (req->qtcb->header.fsf_status_qual.word[0]) {

		case FSF_SQ_INVOKE_LINK_TEST_PROCEDURE:

			zfcp_fc_test_link(zfcp_sdev->port);

			/* fall through */

			fallthrough;

		case FSF_SQ_ULP_DEPENDENT_ERP_REQUIRED:

			req->status |= ZFCP_STATUS_FSFREQ_ERROR;

			break;

drivers/scsi/aacraid/commsup.c

+4 −3
Original line number Diff line number Diff line
@@ -1626,7 +1626,7 @@ out: 
int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type)

{

	unsigned long flagv = 0;

	int retval;

	int retval, unblock_retval;

	struct Scsi_Host *host = aac->scsi_host_ptr;

	int bled;
@@ -1656,8 +1656,9 @@ int aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	retval = _aac_reset_adapter(aac, bled, reset_type);

	spin_unlock_irqrestore(host->host_lock, flagv);



	retval = scsi_host_unblock(host, SDEV_RUNNING);



	unblock_retval = scsi_host_unblock(host, SDEV_RUNNING);

	if (!retval)

		retval = unblock_retval;

	if ((forced < 2) && (retval == -ENODEV)) {

		/* Unwind aac_send_shutdown() IOP_RESET unsupported/disabled */

		struct fib * fibctx = aac_fib_alloc(aac);

drivers/scsi/aic7xxx/aic7xxx_core.c

+0 −23
Original line number Diff line number Diff line
@@ -1834,21 +1834,6 @@ ahc_handle_scsiint(struct ahc_softc *ahc, u_int intstat) 
				printerror = 0;

			} else if (ahc_sent_msg(ahc, AHCMSG_1B,

						MSG_BUS_DEV_RESET, TRUE)) {

#ifdef __FreeBSD__

				/*

				 * Don't mark the user's request for this BDR

				 * as completing with CAM_BDR_SENT.  CAM3

				 * specifies CAM_REQ_CMP.

				 */

				if (scb != NULL

				 && scb->io_ctx->ccb_h.func_code== XPT_RESET_DEV

				 && ahc_match_scb(ahc, scb, target, channel,

						  CAM_LUN_WILDCARD,

						  SCB_LIST_NULL,

						  ROLE_INITIATOR)) {

					ahc_set_transaction_status(scb, CAM_REQ_CMP);

				}

#endif

				ahc_compile_devinfo(&devinfo,

						    initiator_role_id,

						    target,
@@ -4399,22 +4384,16 @@ ahc_alloc(void *platform_arg, char *name) 
	struct  ahc_softc *ahc;

	int	i;



#ifndef	__FreeBSD__

	ahc = kmalloc(sizeof(*ahc), GFP_ATOMIC);

	if (!ahc) {

		printk("aic7xxx: cannot malloc softc!\n");

		kfree(name);

		return NULL;

	}

#else

	ahc = device_get_softc((device_t)platform_arg);

#endif

	memset(ahc, 0, sizeof(*ahc));

	ahc->seep_config = kmalloc(sizeof(*ahc->seep_config), GFP_ATOMIC);

	if (ahc->seep_config == NULL) {

#ifndef	__FreeBSD__

		kfree(ahc);

#endif

		kfree(name);

		return (NULL);

	}
@@ -4540,9 +4519,7 @@ ahc_free(struct ahc_softc *ahc) 
		kfree(ahc->name);

	if (ahc->seep_config != NULL)

		kfree(ahc->seep_config);

#ifndef __FreeBSD__

	kfree(ahc);

#endif

	return;

}

drivers/scsi/bnx2fc/bnx2fc.h

+9 −4
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#include "bnx2fc_constants.h"



#define BNX2FC_NAME		"bnx2fc"

#define BNX2FC_VERSION		"2.12.10"

#define BNX2FC_VERSION		"2.12.13"



#define PFX			"bnx2fc: "
@@ -482,7 +482,10 @@ struct io_bdt { 
struct bnx2fc_work {

	struct list_head list;

	struct bnx2fc_rport *tgt;

	struct fcoe_task_ctx_entry *task;

	unsigned char rq_data[BNX2FC_RQ_BUF_SZ];

	u16 wqe;

	u8 num_rq;

};

struct bnx2fc_unsol_els {

	struct fc_lport *lport;
@@ -550,7 +553,7 @@ void bnx2fc_rport_event_handler(struct fc_lport *lport, 
				enum fc_rport_event event);

void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,

				   struct fcoe_task_ctx_entry *task,

				   u8 num_rq);

				   u8 num_rq, unsigned char *rq_data);

void bnx2fc_process_cleanup_compl(struct bnx2fc_cmd *io_req,

			       struct fcoe_task_ctx_entry *task,

			       u8 num_rq);
@@ -559,7 +562,7 @@ void bnx2fc_process_abts_compl(struct bnx2fc_cmd *io_req, 
			       u8 num_rq);

void bnx2fc_process_tm_compl(struct bnx2fc_cmd *io_req,

			     struct fcoe_task_ctx_entry *task,

			     u8 num_rq);

			     u8 num_rq, unsigned char *rq_data);

void bnx2fc_process_els_compl(struct bnx2fc_cmd *els_req,

			      struct fcoe_task_ctx_entry *task,

			      u8 num_rq);
@@ -577,7 +580,9 @@ struct fc_seq *bnx2fc_elsct_send(struct fc_lport *lport, u32 did, 
				      void *arg, u32 timeout);

void bnx2fc_arm_cq(struct bnx2fc_rport *tgt);

int bnx2fc_process_new_cqes(struct bnx2fc_rport *tgt);

void bnx2fc_process_cq_compl(struct bnx2fc_rport *tgt, u16 wqe);

void bnx2fc_process_cq_compl(struct bnx2fc_rport *tgt, u16 wqe,

			     unsigned char *rq_data, u8 num_rq,

			     struct fcoe_task_ctx_entry *task);

struct bnx2fc_rport *bnx2fc_tgt_lookup(struct fcoe_port *port,

					     u32 port_id);

void bnx2fc_process_l2_frame_compl(struct bnx2fc_rport *tgt,

CRA Git | Maintained and supported by SUSTech CRA and CCSE