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

Commit 6ceae7c6 authored by Xiangliang Yu's avatar Xiangliang Yu Committed by James Bottomley
Browse files

[SCSI] mvsas: fix expander link error 



Expanders fail to link when the phy rates are mismatched.

Signed-off-by: default avatarXiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 983d3fdd

drivers/scsi/mvsas/mv_sas.c

+3 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int mvs_task_prep_smp(struct mvs_info *mvi, 
	/* generate open address frame hdr (first 12 bytes) */

	/* initiator, SMP, ftype 1h */

	buf_oaf[0] = (1 << 7) | (PROTOCOL_SMP << 4) | 0x01;

	buf_oaf[1] = dev->linkrate & 0xf;

	buf_oaf[1] = min(sas_port->linkrate, dev->linkrate) & 0xf;

	*(u16 *)(buf_oaf + 2) = 0xFFFF;		/* SAS SPEC */

	memcpy(buf_oaf + 4, dev->sas_addr, SAS_ADDR_SIZE);
@@ -541,7 +541,7 @@ static int mvs_task_prep_ata(struct mvs_info *mvi, 
	/* generate open address frame hdr (first 12 bytes) */

	/* initiator, STP, ftype 1h */

	buf_oaf[0] = (1 << 7) | (PROTOCOL_STP << 4) | 0x1;

	buf_oaf[1] = dev->linkrate & 0xf;

	buf_oaf[1] = min(sas_port->linkrate, dev->linkrate) & 0xf;

	*(u16 *)(buf_oaf + 2) = cpu_to_be16(mvi_dev->device_id + 1);

	memcpy(buf_oaf + 4, dev->sas_addr, SAS_ADDR_SIZE);
@@ -649,7 +649,7 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, 
	/* generate open address frame hdr (first 12 bytes) */

	/* initiator, SSP, ftype 1h */

	buf_oaf[0] = (1 << 7) | (PROTOCOL_SSP << 4) | 0x1;

	buf_oaf[1] = dev->linkrate & 0xf;

	buf_oaf[1] = min(sas_port->linkrate, dev->linkrate) & 0xf;

	*(u16 *)(buf_oaf + 2) = cpu_to_be16(mvi_dev->device_id + 1);

	memcpy(buf_oaf + 4, dev->sas_addr, SAS_ADDR_SIZE);