Commit c5fe7a97 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:
 "Six small and reasonably obvious fixes, all in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: pm80xx: Set stopped phy's linkrate to Disabled
  scsi: pm80xx: Fix 'Unknown' max/min linkrate
  scsi: ufs: core: Fix missing clk change notification on host reset
  scsi: ufs: core: Drop loglevel of WriteBoost message
  scsi: megaraid: Clear READ queue map's nr_queues
  scsi: target: Fix WRITE_SAME No Data Buffer crash
parents 6bca047e 355bf2e0

drivers/scsi/megaraid/megaraid_sas_base.c

+3 −0
Original line number Diff line number Diff line
@@ -3195,6 +3195,9 @@ static int megasas_map_queues(struct Scsi_Host *shost) 
	qoff += map->nr_queues;

	offset += map->nr_queues;



	/* we never use READ queue, so can't cheat blk-mq */

	shost->tag_set.map[HCTX_TYPE_READ].nr_queues = 0;



	/* Setup Poll hctx */

	map = &shost->tag_set.map[HCTX_TYPE_POLL];

	map->nr_queues = instance->iopoll_q_count;

drivers/scsi/pm8001/pm8001_hwi.c

+3 −16
Original line number Diff line number Diff line
@@ -3145,15 +3145,6 @@ void pm8001_bytes_dmaed(struct pm8001_hba_info *pm8001_ha, int i) 
	if (!phy->phy_attached)

		return;



	if (sas_phy->phy) {

		struct sas_phy *sphy = sas_phy->phy;

		sphy->negotiated_linkrate = sas_phy->linkrate;

		sphy->minimum_linkrate = phy->minimum_linkrate;

		sphy->minimum_linkrate_hw = SAS_LINK_RATE_1_5_GBPS;

		sphy->maximum_linkrate = phy->maximum_linkrate;

		sphy->maximum_linkrate_hw = phy->maximum_linkrate;

	}



	if (phy->phy_type & PORT_TYPE_SAS) {

		struct sas_identify_frame *id;

		id = (struct sas_identify_frame *)phy->frame_rcvd;
@@ -3177,26 +3168,22 @@ void pm8001_get_lrate_mode(struct pm8001_phy *phy, u8 link_rate) 
	switch (link_rate) {

	case PHY_SPEED_120:

		phy->sas_phy.linkrate = SAS_LINK_RATE_12_0_GBPS;

		phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_12_0_GBPS;

		break;

	case PHY_SPEED_60:

		phy->sas_phy.linkrate = SAS_LINK_RATE_6_0_GBPS;

		phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_6_0_GBPS;

		break;

	case PHY_SPEED_30:

		phy->sas_phy.linkrate = SAS_LINK_RATE_3_0_GBPS;

		phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_3_0_GBPS;

		break;

	case PHY_SPEED_15:

		phy->sas_phy.linkrate = SAS_LINK_RATE_1_5_GBPS;

		phy->sas_phy.phy->negotiated_linkrate = SAS_LINK_RATE_1_5_GBPS;

		break;

	}

	sas_phy->negotiated_linkrate = phy->sas_phy.linkrate;

	sas_phy->maximum_linkrate_hw = SAS_LINK_RATE_6_0_GBPS;

	sas_phy->maximum_linkrate_hw = phy->maximum_linkrate;

	sas_phy->minimum_linkrate_hw = SAS_LINK_RATE_1_5_GBPS;

	sas_phy->maximum_linkrate = SAS_LINK_RATE_6_0_GBPS;

	sas_phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS;

	sas_phy->maximum_linkrate = phy->maximum_linkrate;

	sas_phy->minimum_linkrate = phy->minimum_linkrate;

}



/**

drivers/scsi/pm8001/pm8001_init.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id) 
	struct asd_sas_phy *sas_phy = &phy->sas_phy;

	phy->phy_state = PHY_LINK_DISABLE;

	phy->pm8001_ha = pm8001_ha;

	phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS;

	phy->maximum_linkrate = SAS_LINK_RATE_6_0_GBPS;

	sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0;

	sas_phy->class = SAS;

	sas_phy->iproto = SAS_PROTOCOL_ALL;

drivers/scsi/pm8001/pm80xx_hwi.c

+5 −1
Original line number Diff line number Diff line
@@ -3723,8 +3723,12 @@ static int mpi_phy_stop_resp(struct pm8001_hba_info *pm8001_ha, void *piomb) 
	pm8001_dbg(pm8001_ha, MSG, "phy:0x%x status:0x%x\n",

		   phyid, status);

	if (status == PHY_STOP_SUCCESS ||

		status == PHY_STOP_ERR_DEVICE_ATTACHED)

		status == PHY_STOP_ERR_DEVICE_ATTACHED) {

		phy->phy_state = PHY_LINK_DISABLE;

		phy->sas_phy.phy->negotiated_linkrate = SAS_PHY_DISABLED;

		phy->sas_phy.linkrate = SAS_PHY_DISABLED;

	}



	return 0;

}

drivers/target/target_core_file.c

+3 −0
Original line number Diff line number Diff line
@@ -448,6 +448,9 @@ fd_execute_write_same(struct se_cmd *cmd) 
		return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;

	}



	if (!cmd->t_data_nents)

		return TCM_INVALID_CDB_FIELD;



	if (cmd->t_data_nents > 1 ||

	    cmd->t_data_sg[0].length != cmd->se_dev->dev_attrib.block_size) {

		pr_err("WRITE_SAME: Illegal SGL t_data_nents: %u length: %u"