Commit 3ed7df08 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:
 "These are mostly minor updates.

  There are two drivers (lpfc and mpi3mr) which missed the initial
  pull and a core change to retry a start/stop unit which affect
  suspend/resume"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (32 commits)
  scsi: lpfc: Update lpfc version to 14.4.0.5
  scsi: lpfc: Support loopback tests with VMID enabled
  scsi: lpfc: Revise TRACE_EVENT log flag severities from KERN_ERR to KERN_WARNING
  scsi: lpfc: Ensure DA_ID handling completion before deleting an NPIV instance
  scsi: lpfc: Fix kref imbalance on fabric ndlps from dev_loss_tmo handler
  scsi: lpfc: Restrict support for 32 byte CDBs to specific HBAs
  scsi: lpfc: Update phba link state conditional before sending CMF_SYNC_WQE
  scsi: lpfc: Add ELS_RSP cmd to the list of WQEs to flush in lpfc_els_flush_cmd()
  scsi: mpi3mr: Update driver version to 8.12.0.0.50
  scsi: mpi3mr: Improve wait logic while controller transitions to READY state
  scsi: mpi3mr: Update MPI Headers to revision 34
  scsi: mpi3mr: Use firmware-provided timestamp update interval
  scsi: mpi3mr: Enhance the Enable Controller retry logic
  scsi: sd: Fix off-by-one error in sd_read_block_characteristics()
  scsi: pm8001: Do not overwrite PCI queue mapping
  scsi: scsi_debug: Remove a useless memset()
  scsi: pmcraid: Convert comma to semicolon
  scsi: sd: Retry START STOP UNIT commands
  scsi: mpi3mr: A performance fix
  scsi: ufs: qcom: Update MODE_MAX cfg_bw value
  ...
parents 9f9a5347 359aeb86

drivers/message/fusion/mptctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1609,7 +1609,7 @@ mptctl_eventreport (MPT_ADAPTER *ioc, unsigned long arg) 
	maxEvents = numBytes/sizeof(MPT_IOCTL_EVENTS);





	max = MPTCTL_EVENT_LOG_SIZE < maxEvents ? MPTCTL_EVENT_LOG_SIZE : maxEvents;

	max = min(maxEvents, MPTCTL_EVENT_LOG_SIZE);



	/* If fewer than 1 event is requested, there must have

	 * been some type of error.

drivers/scsi/cxgbi/libcxgbi.h

+0 −3
Original line number Diff line number Diff line
@@ -485,7 +485,6 @@ struct cxgbi_device { 
	unsigned char nmtus;

	unsigned char nports;

	struct pci_dev *pdev;

	struct dentry *debugfs_root;

	struct iscsi_transport *itp;

	struct module *owner;
@@ -499,7 +498,6 @@ struct cxgbi_device { 
	unsigned int rxq_idx_cntr;

	struct cxgbi_ports_map pmap;



	void (*dev_ddp_cleanup)(struct cxgbi_device *);

	struct cxgbi_ppm* (*cdev2ppm)(struct cxgbi_device *);

	int (*csk_ddp_set_map)(struct cxgbi_ppm *, struct cxgbi_sock *,

			       struct cxgbi_task_tag_info *);
@@ -512,7 +510,6 @@ struct cxgbi_device { 
				   unsigned int, int);



	void (*csk_release_offload_resources)(struct cxgbi_sock *);

	int (*csk_rx_pdu_ready)(struct cxgbi_sock *, struct sk_buff *);

	u32 (*csk_send_rx_credits)(struct cxgbi_sock *, u32);

	int (*csk_push_tx_frames)(struct cxgbi_sock *, int);

	void (*csk_send_abort_req)(struct cxgbi_sock *);

drivers/scsi/ibmvscsi/ibmvfc.c

+18 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static unsigned int default_timeout = IBMVFC_DEFAULT_TIMEOUT; 
static u64 max_lun = IBMVFC_MAX_LUN;

static unsigned int max_targets = IBMVFC_MAX_TARGETS;

static unsigned int max_requests = IBMVFC_MAX_REQUESTS_DEFAULT;

static u16 max_sectors = IBMVFC_MAX_SECTORS;

static u16 scsi_qdepth = IBMVFC_SCSI_QDEPTH;

static unsigned int disc_threads = IBMVFC_MAX_DISC_THREADS;

static unsigned int ibmvfc_debug = IBMVFC_DEBUG;
@@ -83,6 +84,9 @@ MODULE_PARM_DESC(default_timeout, 
module_param_named(max_requests, max_requests, uint, S_IRUGO);

MODULE_PARM_DESC(max_requests, "Maximum requests for this adapter. "

		 "[Default=" __stringify(IBMVFC_MAX_REQUESTS_DEFAULT) "]");

module_param_named(max_sectors, max_sectors, ushort, S_IRUGO);

MODULE_PARM_DESC(max_sectors, "Maximum sectors for this adapter. "

		 "[Default=" __stringify(IBMVFC_MAX_SECTORS) "]");

module_param_named(scsi_qdepth, scsi_qdepth, ushort, S_IRUGO);

MODULE_PARM_DESC(scsi_qdepth, "Maximum scsi command depth per adapter queue. "

		 "[Default=" __stringify(IBMVFC_SCSI_QDEPTH) "]");
@@ -1494,7 +1498,7 @@ static void ibmvfc_set_login_info(struct ibmvfc_host *vhost) 
	memset(login_info, 0, sizeof(*login_info));



	login_info->ostype = cpu_to_be32(IBMVFC_OS_LINUX);

	login_info->max_dma_len = cpu_to_be64(IBMVFC_MAX_SECTORS << 9);

	login_info->max_dma_len = cpu_to_be64(max_sectors << 9);

	login_info->max_payload = cpu_to_be32(sizeof(struct ibmvfc_fcp_cmd_iu));

	login_info->max_response = cpu_to_be32(sizeof(struct ibmvfc_fcp_rsp));

	login_info->partition_num = cpu_to_be32(vhost->partition_number);
@@ -5230,7 +5234,7 @@ static void ibmvfc_npiv_login_done(struct ibmvfc_event *evt) 
	}



	vhost->logged_in = 1;

	npiv_max_sectors = min((uint)(be64_to_cpu(rsp->max_dma_len) >> 9), IBMVFC_MAX_SECTORS);

	npiv_max_sectors = min((uint)(be64_to_cpu(rsp->max_dma_len) >> 9), max_sectors);

	dev_info(vhost->dev, "Host partition: %s, device: %s %s %s max sectors %u\n",

		 rsp->partition_name, rsp->device_name, rsp->port_loc_code,

		 rsp->drc_name, npiv_max_sectors);
@@ -6329,7 +6333,7 @@ static int ibmvfc_probe(struct vio_dev *vdev, const struct vio_device_id *id) 
	shost->can_queue = scsi_qdepth;

	shost->max_lun = max_lun;

	shost->max_id = max_targets;

	shost->max_sectors = IBMVFC_MAX_SECTORS;

	shost->max_sectors = max_sectors;

	shost->max_cmd_len = IBMVFC_MAX_CDB_LEN;

	shost->unique_id = shost->host_no;

	shost->nr_hw_queues = mq_enabled ? min(max_scsi_queues, nr_scsi_hw_queues) : 1;
@@ -6556,6 +6560,7 @@ static struct fc_function_template ibmvfc_transport_functions = { 
 **/

static int __init ibmvfc_module_init(void)

{

	int min_max_sectors = PAGE_SIZE >> 9;

	int rc;



	if (!firmware_has_feature(FW_FEATURE_VIO))
@@ -6564,6 +6569,16 @@ static int __init ibmvfc_module_init(void) 
	printk(KERN_INFO IBMVFC_NAME": IBM Virtual Fibre Channel Driver version: %s %s\n",

	       IBMVFC_DRIVER_VERSION, IBMVFC_DRIVER_DATE);



	/*

	 * Range check the max_sectors module parameter. The upper bounds is

	 * implicity checked since the parameter is a ushort.

	 */

	if (max_sectors < min_max_sectors) {

		printk(KERN_ERR IBMVFC_NAME ": max_sectors must be at least %d.\n",

			min_max_sectors);

		max_sectors = min_max_sectors;

	}



	ibmvfc_transport_template = fc_attach_transport(&ibmvfc_transport_functions);

	if (!ibmvfc_transport_template)

		return -ENOMEM;

drivers/scsi/ibmvscsi/ibmvfc.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#define IBMVFC_DEBUG			0

#define IBMVFC_MAX_TARGETS		1024

#define IBMVFC_MAX_LUN			0xffffffff

#define IBMVFC_MAX_SECTORS		0xffffu

#define IBMVFC_MAX_SECTORS		2048

#define IBMVFC_MAX_DISC_THREADS	4

#define IBMVFC_TGT_MEMPOOL_SZ		64

#define IBMVFC_MAX_CMDS_PER_LUN	64

drivers/scsi/lpfc/lpfc_bsg.c

+3 −0
Original line number Diff line number Diff line
@@ -3208,6 +3208,9 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job) 
	cmdiocbq->num_bdes = num_bde;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LOOPBACK;

	if (phba->cfg_vmid_app_header)

		cmdiocbq->cmd_flag |= LPFC_IO_VMID;



	cmdiocbq->vport = phba->pport;

	cmdiocbq->cmd_cmpl = NULL;

	cmdiocbq->bpl_dmabuf = txbmp;