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

Commit 0b33ce72 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "Eight mostly minor fixes for recently discovered issues in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: ILLEGAL REQUEST + ASC==27 => target failure
  scsi: aacraid: Add a small delay after IOP reset
  scsi: scsi_transport_fc: Also check for NOTPRESENT in fc_remote_port_add()
  scsi: scsi_transport_fc: set scsi_target_id upon rescan
  scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
  scsi: aacraid: error: testing array offset 'bus' after use
  scsi: lpfc: Don't return internal MBXERR_ERROR code from probe function
  scsi: aacraid: Fix 2T+ drives on SmartIOC-2000
parents 74d83ec2 d0b7a909

drivers/scsi/aacraid/aachba.c

+6 −6
Original line number Diff line number Diff line
@@ -699,14 +699,14 @@ static void _aac_probe_container1(void * context, struct fib * fibptr) 
	int status;



	dresp = (struct aac_mount *) fib_data(fibptr);

	if (!(fibptr->dev->supplement_adapter_info.supported_options2 &

	    AAC_OPTION_VARIABLE_BLOCK_SIZE))

	if (!aac_supports_2T(fibptr->dev)) {

		dresp->mnt[0].capacityhigh = 0;

	if ((le32_to_cpu(dresp->status) != ST_OK) ||

		if ((le32_to_cpu(dresp->status) == ST_OK) &&

			(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE)) {

			_aac_probe_container2(context, fibptr);

			return;

		}

	}

	scsicmd = (struct scsi_cmnd *) context;



	if (!aac_valid_context(scsicmd, fibptr))

drivers/scsi/aacraid/aacraid.h

+5 −0
Original line number Diff line number Diff line
@@ -2701,6 +2701,11 @@ static inline int aac_is_src(struct aac_dev *dev) 
	return 0;

}



static inline int aac_supports_2T(struct aac_dev *dev)

{

	return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);

}



char * get_container_type(unsigned type);

extern int numacb;

extern char aac_driver_version[];

drivers/scsi/aacraid/linit.c

+12 −8
Original line number Diff line number Diff line
@@ -906,12 +906,14 @@ static int aac_eh_dev_reset(struct scsi_cmnd *cmd) 


	bus = aac_logical_to_phys(scmd_channel(cmd));

	cid = scmd_id(cmd);

	info = &aac->hba_map[bus][cid];

	if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||

	    info->devtype != AAC_DEVTYPE_NATIVE_RAW)



	if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)

		return FAILED;



	if (info->reset_state > 0)

	info = &aac->hba_map[bus][cid];



	if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&

	    info->reset_state > 0)

		return FAILED;



	pr_err("%s: Host adapter reset request. SCSI hang ?\n",
@@ -962,12 +964,14 @@ static int aac_eh_target_reset(struct scsi_cmnd *cmd) 


	bus = aac_logical_to_phys(scmd_channel(cmd));

	cid = scmd_id(cmd);

	info = &aac->hba_map[bus][cid];

	if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS ||

	    info->devtype != AAC_DEVTYPE_NATIVE_RAW)



	if (bus >= AAC_MAX_BUSES || cid >= AAC_MAX_TARGETS)

		return FAILED;



	if (info->reset_state > 0)

	info = &aac->hba_map[bus][cid];



	if (info->devtype != AAC_DEVTYPE_NATIVE_RAW &&

	    info->reset_state > 0)

		return FAILED;



	pr_err("%s: Host adapter reset request. SCSI hang ?\n",

drivers/scsi/aacraid/src.c

+2 −0
Original line number Diff line number Diff line
@@ -740,6 +740,8 @@ static void aac_send_iop_reset(struct aac_dev *dev) 
	aac_set_intx_mode(dev);



	src_writel(dev, MUnit.IDR, IOP_SRC_RESET_MASK);



	msleep(5000);

}



static void aac_send_hardware_soft_reset(struct aac_dev *dev)

drivers/scsi/lpfc/lpfc_init.c

+1 −0
Original line number Diff line number Diff line
@@ -6131,6 +6131,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
				"Extents and RPI headers enabled.\n");

		}

		mempool_free(mboxq, phba->mbox_mem_pool);

		rc = -EIO;

		goto out_free_bsmbx;

	}