Commit 83633ed7 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:
 "Varions small  fixes, all  in drivers.

  Some of these arrived during the merge window and got held over to
  make sure of testing on the -rc tree.

  The biggest change is for standards conformance in the target driver,
  closely followed by a set of bug fixes in megaraid_sas"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (21 commits)
  scsi: ufs: core: Fix typo in comment
  scsi: mpi3mr: Select CONFIG_SCSI_SAS_ATTRS
  scsi: ufs: core: Fix typo for register name in comments
  scsi: pm80xx: Display proc_name in sysfs
  scsi: ufs: core: Fix the error log in ufshcd_query_flag_retry()
  scsi: ufs: core: Remove unneeded casts from void *
  scsi: lpfc: Fix spelling mistake "unsolicted" -> "unsolicited"
  scsi: qla2xxx: Use transport-defined speed mask for supported_speeds
  scsi: target: iblock: Fold iblock_emulate_read_cap_with_block_size() into iblock_get_blocks()
  scsi: qla2xxx: Fix serialization of DCBX TLV data request
  scsi: ufs: qcom: Remove redundant dev_err() call
  scsi: megaraid_sas: Move megasas_dbg_lvl init to megasas_init()
  scsi: megaraid_sas: Remove unnecessary memset()
  scsi: megaraid_sas: Simplify megasas_update_device_list
  scsi: megaraid_sas: Correct an error message
  scsi: megaraid_sas: Correct value passed to scsi_device_lookup()
  scsi: target: core: UA on all LUNs after reset
  scsi: target: core: New key must be used for moved PR
  scsi: target: core: Abort all preempted regs if requested
  scsi: target: core: Fix memory leak in preempt_and_abort
  ...
parents c6e0e874 307539ee

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -2582,7 +2582,7 @@ static int lpfcdiag_loop_self_unreg(struct lpfc_hba *phba, uint16_t rpi) 
 *

 * This function obtains the transmit and receive ids required to send

 * an unsolicited ct command with a payload. A special lpfc FsType and CmdRsp

 * flags are used to the unsolicted response handler is able to process

 * flags are used to the unsolicited response handler is able to process

 * the ct command sent on the same port.

 **/

static int lpfcdiag_loop_get_xri(struct lpfc_hba *phba, uint16_t rpi,
@@ -2874,7 +2874,7 @@ diag_cmd_data_alloc(struct lpfc_hba *phba, 
 * @len: Number of data bytes

 *

 * This function allocates and posts a data buffer of sufficient size to receive

 * an unsolicted CT command.

 * an unsolicited CT command.

 **/

static int lpfcdiag_sli3_loop_post_rxbufs(struct lpfc_hba *phba, uint16_t rxxri,

					  size_t len)

drivers/scsi/lpfc/lpfc_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ lpfc_ct_ignore_hbq_buffer(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq, 
				get_job_ulpstatus(phba, piocbq));

	}

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"0145 Ignoring unsolicted CT HBQ Size:%d "

			"0145 Ignoring unsolicited CT HBQ Size:%d "

			"status = x%x\n",

			size, get_job_ulpstatus(phba, piocbq));

}

drivers/scsi/megaraid/megaraid_sas_base.c

+8 −19
Original line number Diff line number Diff line
@@ -5874,10 +5874,6 @@ static void megasas_setup_reply_map(struct megasas_instance *instance) 
static

int megasas_get_device_list(struct megasas_instance *instance)

{

	memset(instance->pd_list, 0,

	       (MEGASAS_MAX_PD * sizeof(struct megasas_pd_list)));

	memset(instance->ld_ids, 0xff, MEGASAS_MAX_LD_IDS);



	if (instance->enable_fw_dev_list) {

		if (megasas_host_device_list_query(instance, true))

			return FAILED;
@@ -7220,7 +7216,7 @@ int megasas_alloc_ctrl_dma_buffers(struct megasas_instance *instance) 


		if (!fusion->ioc_init_request) {

			dev_err(&pdev->dev,

				"Failed to allocate PD list buffer\n");

				"Failed to allocate ioc init request\n");

			return -ENOMEM;

		}
@@ -7439,7 +7435,6 @@ static inline void megasas_init_ctrl_params(struct megasas_instance *instance) 
	    (instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0071SKINNY))

		instance->flag_ieee = 1;



	megasas_dbg_lvl = 0;

	instance->flag = 0;

	instance->unload = 1;

	instance->last_time = 0;
@@ -8762,33 +8757,26 @@ static 
int megasas_update_device_list(struct megasas_instance *instance,

			       int event_type)

{

	int dcmd_ret = DCMD_SUCCESS;

	int dcmd_ret;



	if (instance->enable_fw_dev_list) {

		dcmd_ret = megasas_host_device_list_query(instance, false);

		if (dcmd_ret != DCMD_SUCCESS)

			goto out;

		return megasas_host_device_list_query(instance, false);

	} else {

		if (event_type & SCAN_PD_CHANNEL) {

			dcmd_ret = megasas_get_pd_list(instance);



			if (dcmd_ret != DCMD_SUCCESS)

				goto out;

				return dcmd_ret;

		}



		if (event_type & SCAN_VD_CHANNEL) {

			if (!instance->requestorId ||

			megasas_get_ld_vf_affiliation(instance, 0)) {

				dcmd_ret = megasas_ld_list_query(instance,

				return megasas_ld_list_query(instance,

						MR_LD_QUERY_TYPE_EXPOSED_TO_HOST);

				if (dcmd_ret != DCMD_SUCCESS)

					goto out;

			}

		}

	}



out:

	return dcmd_ret;

	return DCMD_SUCCESS;

}



/**
@@ -8918,7 +8906,7 @@ megasas_aen_polling(struct work_struct *work) 
			sdev1 = scsi_device_lookup(instance->host,

						   MEGASAS_MAX_PD_CHANNELS +

						   (ld_target_id / MEGASAS_MAX_DEV_PER_CHANNEL),

						   (ld_target_id - MEGASAS_MAX_DEV_PER_CHANNEL),

						   (ld_target_id % MEGASAS_MAX_DEV_PER_CHANNEL),

						   0);

			if (sdev1)

				megasas_remove_scsi_device(sdev1);
@@ -9016,6 +9004,7 @@ static int __init megasas_init(void) 
	 */

	pr_info("megasas: %s\n", MEGASAS_VERSION);



	megasas_dbg_lvl = 0;

	support_poll_for_event = 2;

	support_device_change = 1;

	support_nvme_encapsulation = true;

drivers/scsi/mpi3mr/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ config SCSI_MPI3MR 
	tristate "Broadcom MPI3 Storage Controller Device Driver"

	depends on PCI && SCSI

	select BLK_DEV_BSGLIB

	select SCSI_SAS_ATTRS

	help

	MPI3 based Storage & RAID Controllers Driver.

drivers/scsi/pm8001/pm8001_init.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static void pm8001_map_queues(struct Scsi_Host *shost) 
static struct scsi_host_template pm8001_sht = {

	.module			= THIS_MODULE,

	.name			= DRV_NAME,

	.proc_name		= DRV_NAME,

	.queuecommand		= sas_queuecommand,

	.dma_need_drain		= ata_scsi_dma_need_drain,

	.target_alloc		= sas_target_alloc,