Commit a0d8b0ed 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 small fixes, all in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: pm80xx: Fix drives missing during rmmod/insmod loop
  scsi: qla2xxx: Fix error return code in qla82xx_write_flash_dword()
  scsi: qedf: Add pointer checks in qedf_update_link_speed()
  scsi: ufs: core: Increase the usable queue depth
  scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic
  scsi: ufs: ufs-mediatek: Fix power down spec violation
parents a0eb553b d1acd81b

drivers/scsi/BusLogic.c

+3 −3
Original line number Diff line number Diff line
@@ -2926,11 +2926,11 @@ static int blogic_qcmd_lck(struct scsi_cmnd *command, 
		ccb->opcode = BLOGIC_INITIATOR_CCB_SG;

		ccb->datalen = count * sizeof(struct blogic_sg_seg);

		if (blogic_multimaster_type(adapter))

			ccb->data = (void *)((unsigned int) ccb->dma_handle +

			ccb->data = (unsigned int) ccb->dma_handle +

					((unsigned long) &ccb->sglist -

					(unsigned long) ccb));

					(unsigned long) ccb);

		else

			ccb->data = ccb->sglist;

			ccb->data = virt_to_32bit_virt(ccb->sglist);



		scsi_for_each_sg(command, sg, count, i) {

			ccb->sglist[i].segbytes = sg_dma_len(sg);

drivers/scsi/BusLogic.h

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ struct blogic_ccb { 
	unsigned char cdblen;				/* Byte 2 */

	unsigned char sense_datalen;			/* Byte 3 */

	u32 datalen;					/* Bytes 4-7 */

	void *data;					/* Bytes 8-11 */

	u32 data;					/* Bytes 8-11 */

	unsigned char:8;				/* Byte 12 */

	unsigned char:8;				/* Byte 13 */

	enum blogic_adapter_status adapter_status;	/* Byte 14 */

drivers/scsi/pm8001/pm8001_hwi.c

+6 −4
Original line number Diff line number Diff line
@@ -3765,11 +3765,13 @@ static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	case HW_EVENT_PHY_START_STATUS:

		pm8001_dbg(pm8001_ha, MSG, "HW_EVENT_PHY_START_STATUS status = %x\n",

			   status);

		if (status == 0) {

		if (status == 0)

			phy->phy_state = 1;



		if (pm8001_ha->flags == PM8001F_RUN_TIME &&

					phy->enable_completion != NULL)

				phy->enable_completion != NULL) {

			complete(phy->enable_completion);

			phy->enable_completion = NULL;

		}

		break;

	case HW_EVENT_SAS_PHY_UP:

drivers/scsi/pm8001/pm8001_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1151,8 +1151,8 @@ static int pm8001_pci_probe(struct pci_dev *pdev, 
		goto err_out_shost;

	}

	list_add_tail(&pm8001_ha->list, &hba_list);

	scsi_scan_host(pm8001_ha->shost);

	pm8001_ha->flags = PM8001F_RUN_TIME;

	scsi_scan_host(pm8001_ha->shost);

	return 0;



err_out_shost:

drivers/scsi/pm8001/pm8001_sas.c

+6 −1
Original line number Diff line number Diff line
@@ -264,12 +264,17 @@ void pm8001_scan_start(struct Scsi_Host *shost) 
	int i;

	struct pm8001_hba_info *pm8001_ha;

	struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost);

	DECLARE_COMPLETION_ONSTACK(completion);

	pm8001_ha = sha->lldd_ha;

	/* SAS_RE_INITIALIZATION not available in SPCv/ve */

	if (pm8001_ha->chip_id == chip_8001)

		PM8001_CHIP_DISP->sas_re_init_req(pm8001_ha);

	for (i = 0; i < pm8001_ha->chip->n_phy; ++i)

	for (i = 0; i < pm8001_ha->chip->n_phy; ++i) {

		pm8001_ha->phy[i].enable_completion = &completion;

		PM8001_CHIP_DISP->phy_start_req(pm8001_ha, i);

		wait_for_completion(&completion);

		msleep(300);

	}

}



int pm8001_scan_finished(struct Scsi_Host *shost, unsigned long time)