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

Commit b86c75fd authored by James Bottomley's avatar James Bottomley
Browse files

Merge remote-tracking branch 'mkp-scsi/4.6/scsi-queue' into misc

parents a7dee8f4 cdc43ae3

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/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;

drivers/scsi/megaraid/megaraid_sas_base.c

+10 −4
Original line number Diff line number Diff line
@@ -1838,7 +1838,7 @@ static int megasas_slave_configure(struct scsi_device *sdev) 
	struct megasas_instance *instance;



	instance = megasas_lookup_instance(sdev->host->host_no);

	if (instance->allow_fw_scan) {

	if (instance->pd_list_not_supported) {

		if (sdev->channel < MEGASAS_MAX_PD_CHANNELS &&

			sdev->type == TYPE_DISK) {

			pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) +
@@ -1874,7 +1874,8 @@ static int megasas_slave_alloc(struct scsi_device *sdev) 
		pd_index =

			(sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) +

			sdev->id;

		if ((instance->allow_fw_scan || instance->pd_list[pd_index].driveState ==

		if ((instance->pd_list_not_supported ||

			instance->pd_list[pd_index].driveState ==

			MR_PD_STATE_SYSTEM)) {

			goto scan_target;

		}
@@ -4087,7 +4088,13 @@ megasas_get_pd_list(struct megasas_instance *instance) 


	switch (ret) {

	case DCMD_FAILED:

		dev_info(&instance->pdev->dev, "MR_DCMD_PD_LIST_QUERY "

			"failed/not supported by firmware\n");



		if (instance->ctrl_context)

			megaraid_sas_kill_hba(instance);

		else

			instance->pd_list_not_supported = 1;

		break;

	case DCMD_TIMEOUT:
@@ -5034,7 +5041,6 @@ static int megasas_init_fw(struct megasas_instance *instance) 
	case PCI_DEVICE_ID_DELL_PERC5:

	default:

		instance->instancet = &megasas_instance_template_xscale;

		instance->allow_fw_scan = 1;

		break;

	}

drivers/scsi/scsi_sas_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#define SAS_HOST_ATTRS		0

#define SAS_PHY_ATTRS		17

#define SAS_PORT_ATTRS		1

#define SAS_RPORT_ATTRS		7

#define SAS_RPORT_ATTRS		8

#define SAS_END_DEV_ATTRS	5

#define SAS_EXPANDER_ATTRS	7