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

Commit 895a1067 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:
 "The only new stuff which missed the first pull request is an update to
  the UFS driver.

  The rest is an assortment of bug fixes and minor tweaks which appeared
  recently (some are fixes for recent code and some are stuff spotted
  recently by the checkers or the new gcc-6 compiler [most of Arnd's
  stuff])"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (32 commits)
  scsi_common: do not clobber fixed sense information
  scsi: ufs: select CONFIG_NLS
  scsi: fc: use get/put_unaligned64 for wwn access
  fnic: move printk()s outside of the critical code section.
  qla2xxx: avoid maybe_uninitialized warning
  megaraid_sas: add missing curly braces in ioctl handler
  lpfc: fix misleading indentation
  scsi_transport_sas: add 'scsi_target_id' sysfs attribute
  scsi_dh_alua: uninitialized variable in alua_check_vpd()
  scsi: ufs-qcom: add printouts of testbus debug registers
  scsi: ufs-qcom: enable/disable the device ref clock
  scsi: ufs-qcom: set PA_Local_TX_LCC_Enable before link startup
  scsi: ufs: add device quirk delay before putting UFS rails in LPM
  scsi: ufs: fix leakage during link off state
  scsi: ufs: tune UniPro parameters to optimize hibern8 exit time
  scsi: ufs: handle non spec compliant bkops behaviour by device
  scsi: ufs: add retry for query descriptors
  scsi: ufs: add error recovery after DL NAC error
  scsi: ufs: make error handling bit faster
  scsi: ufs: disable vccq if it's not needed by UFS device
  ...
parents 02fc59a0 c6986be4

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ Optional properties: 
			  defined or a value in the array is "0" then it is assumed

			  that the frequency is set by the parent clock or a

			  fixed rate clock source.

-lanes-per-direction	: number of lanes available per direction - either 1 or 2.

			  Note that it is assume same number of lanes is used both

			  directions at once. If not specified, default is 2 lanes per direction.



Note: If above properties are not defined it can be assumed that the supply

regulators or clocks are always on.

drivers/scsi/device_handler/scsi_dh_alua.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int alua_check_vpd(struct scsi_device *sdev, struct alua_dh_data *h, 
{

	int rel_port = -1, group_id;

	struct alua_port_group *pg, *old_pg = NULL;

	bool pg_updated;

	bool pg_updated = false;

	unsigned long flags;



	group_id = scsi_vpd_tpg_id(sdev, &rel_port);

drivers/scsi/fnic/fnic_scsi.c

+6 −7
Original line number Diff line number Diff line
@@ -958,23 +958,22 @@ static void fnic_fcpio_icmnd_cmpl_handler(struct fnic *fnic, 
	case FCPIO_INVALID_PARAM:    /* some parameter in request invalid */

	case FCPIO_REQ_NOT_SUPPORTED:/* request type is not supported */

	default:

		shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",

			     fnic_fcpio_status_to_str(hdr_status));

		sc->result = (DID_ERROR << 16) | icmnd_cmpl->scsi_status;

		break;

	}



	if (hdr_status != FCPIO_SUCCESS) {

		atomic64_inc(&fnic_stats->io_stats.io_failures);

		shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",

			     fnic_fcpio_status_to_str(hdr_status));

	}

	/* Break link with the SCSI command */

	CMD_SP(sc) = NULL;

	CMD_FLAGS(sc) |= FNIC_IO_DONE;



	spin_unlock_irqrestore(io_lock, flags);



	if (hdr_status != FCPIO_SUCCESS) {

		atomic64_inc(&fnic_stats->io_stats.io_failures);

		shost_printk(KERN_ERR, fnic->lport->host, "hdr status = %s\n",

			     fnic_fcpio_status_to_str(hdr_status));

	}



	fnic_release_ioreq_buf(fnic, io_req, sc);



	mempool_free(io_req, fnic->io_req_pool);

drivers/scsi/lpfc/lpfc_init.c

+3 −2
Original line number Diff line number Diff line
@@ -2860,7 +2860,7 @@ lpfc_online(struct lpfc_hba *phba) 
	}



	vports = lpfc_create_vport_work_array(phba);

	if (vports != NULL)

	if (vports != NULL) {

		for (i = 0; i <= phba->max_vports && vports[i] != NULL; i++) {

			struct Scsi_Host *shost;

			shost = lpfc_shost_from_vport(vports[i]);
@@ -2877,6 +2877,7 @@ lpfc_online(struct lpfc_hba *phba) 
			}

			spin_unlock_irq(shost->host_lock);

		}

	}

	lpfc_destroy_vport_work_array(phba, vports);



	lpfc_unblock_mgmt_io(phba);

drivers/scsi/megaraid/megaraid_sas.h

+1 −1
Original line number Diff line number Diff line
@@ -2097,7 +2097,7 @@ struct megasas_instance { 
	u8 UnevenSpanSupport;



	u8 supportmax256vd;

	u8 allow_fw_scan;

	u8 pd_list_not_supported;

	u16 fw_supported_vd_count;

	u16 fw_supported_pd_count;