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

Commit 51162264 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'scsi-target-for-v4.10' of... 

Merge branch 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux

Pull SCSI target fixes from Bart Van Assche:

 - two small fixes for the ibmvscsis driver

 - ten patches with bug fixes for the target mode of the qla2xxx driver

 - four patches that avoid that the "sparse" and "smatch" static
   analyzer tools report false positives for the qla2xxx code base

* 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux:
  qla2xxx: Disable out-of-order processing by default in firmware
  qla2xxx: Fix erroneous invalid handle message
  qla2xxx: Reduce exess wait during chip reset
  qla2xxx: Terminate exchange if corrupted
  qla2xxx: Fix crash due to null pointer access
  qla2xxx: Collect additional information to debug fw dump
  qla2xxx: Reset reserved field in firmware options to 0
  qla2xxx: Set tcm_qla2xxx version to automatically track qla2xxx version
  qla2xxx: Include ATIO queue in firmware dump when in target mode
  qla2xxx: Fix wrong IOCB type assumption
  qla2xxx: Avoid that building with W=1 triggers complaints about set-but-not-used variables
  qla2xxx: Move two arrays from header files to .c files
  qla2xxx: Declare an array with file scope static
  qla2xxx: Fix indentation
  ibmvscsis: Fix sleeping in interrupt context
  ibmvscsis: Fix max transfer length
parents e3737b91 300af14b

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+4 −3
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#define	INITIAL_SRP_LIMIT	800

#define	DEFAULT_MAX_SECTORS	256

#define MAX_TXU			1024 * 1024



static uint max_vdma_size = MAX_H_COPY_RDMA;
@@ -1391,7 +1392,7 @@ static long ibmvscsis_adapter_info(struct scsi_info *vscsi, 
	}



	info = dma_alloc_coherent(&vscsi->dma_dev->dev, sizeof(*info), &token,

				  GFP_KERNEL);

				  GFP_ATOMIC);

	if (!info) {

		dev_err(&vscsi->dev, "bad dma_alloc_coherent %p\n",

			iue->target);
@@ -1443,7 +1444,7 @@ static long ibmvscsis_adapter_info(struct scsi_info *vscsi, 
	info->mad_version = cpu_to_be32(MAD_VERSION_1);

	info->os_type = cpu_to_be32(LINUX);

	memset(&info->port_max_txu[0], 0, sizeof(info->port_max_txu));

	info->port_max_txu[0] = cpu_to_be32(128 * PAGE_SIZE);

	info->port_max_txu[0] = cpu_to_be32(MAX_TXU);



	dma_wmb();

	rc = h_copy_rdma(sizeof(*info), vscsi->dds.window[LOCAL].liobn,
@@ -1509,7 +1510,7 @@ static int ibmvscsis_cap_mad(struct scsi_info *vscsi, struct iu_entry *iue) 
	}



	cap = dma_alloc_coherent(&vscsi->dma_dev->dev, olen, &token,

				 GFP_KERNEL);

				 GFP_ATOMIC);

	if (!cap) {

		dev_err(&vscsi->dev, "bad dma_alloc_coherent %p\n",

			iue->target);

drivers/scsi/qla2xxx/qla_attr.c

+1 −2
Original line number Diff line number Diff line
@@ -761,7 +761,6 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj, 
	struct scsi_qla_host *vha = shost_priv(dev_to_shost(container_of(kobj,

	    struct device, kobj)));

	int type;

	int rval = 0;

	port_id_t did;



	type = simple_strtol(buf, NULL, 10);
@@ -775,7 +774,7 @@ qla2x00_issue_logo(struct file *filp, struct kobject *kobj, 


	ql_log(ql_log_info, vha, 0x70e4, "%s: %d\n", __func__, type);



	rval = qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did);

	qla24xx_els_dcmd_iocb(vha, ELS_DCMD_LOGO, did);

	return count;

}

drivers/scsi/qla2xxx/qla_def.h

+2 −1
Original line number Diff line number Diff line
@@ -1556,7 +1556,8 @@ typedef struct { 
struct atio {

	uint8_t		entry_type;		/* Entry type. */

	uint8_t		entry_count;		/* Entry count. */

	uint8_t		data[58];

	__le16		attr_n_length;

	uint8_t		data[56];

	uint32_t	signature;

#define ATIO_PROCESSED 0xDEADDEAD		/* Signature */

};

drivers/scsi/qla2xxx/qla_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha) 


	/* Wait for soft-reset to complete. */

	RD_REG_DWORD(&reg->ctrl_status);

	for (cnt = 0; cnt < 6000000; cnt++) {

	for (cnt = 0; cnt < 60; cnt++) {

		barrier();

		if ((RD_REG_DWORD(&reg->ctrl_status) &

		    CSRX_ISP_SOFT_RESET) == 0)
@@ -1234,7 +1234,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha) 
	RD_REG_DWORD(&reg->hccr);



	RD_REG_WORD(&reg->mailbox0);

	for (cnt = 6000000; RD_REG_WORD(&reg->mailbox0) != 0 &&

	for (cnt = 60; RD_REG_WORD(&reg->mailbox0) != 0 &&

	    rval == QLA_SUCCESS; cnt--) {

		barrier();

		if (cnt)

drivers/scsi/qla2xxx/qla_isr.c

+4 −0
Original line number Diff line number Diff line
@@ -2492,6 +2492,10 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) 
	if (pkt->entry_status & RF_BUSY)

		res = DID_BUS_BUSY << 16;



	if (pkt->entry_type == NOTIFY_ACK_TYPE &&

	    pkt->handle == QLA_TGT_SKIP_HANDLE)

		return;



	sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);

	if (sp) {

		sp->done(ha, sp, res);