Commit 0e3231fc authored by Xiaofei Tan's avatar Xiaofei Tan Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: check PHY state in get_wideport_bitmap_v3_hw() 



We should check register PHY_STATE when getting the bitmap of a
wideport, as, if the PHY is not ready, the value of register
PHY_PORT_NUM_MA is not valid.

V2 hw has done this check, and v3 hw should do this check too.

Signed-off-by: default avatarXiaofei Tan <tanxiaofei@huawei.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 729428ca

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -755,10 +755,12 @@ static int get_wideport_bitmap_v3_hw(struct hisi_hba *hisi_hba, int port_id) 
{

{

	int i, bitmap = 0;

	int i, bitmap = 0;

	u32 phy_port_num_ma = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);

	u32 phy_port_num_ma = hisi_sas_read32(hisi_hba, PHY_PORT_NUM_MA);

	u32 phy_state = hisi_sas_read32(hisi_hba, PHY_STATE);





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

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

		if (phy_state & BIT(i))

			if (((phy_port_num_ma >> (i * 4)) & 0xf) == port_id)

			if (((phy_port_num_ma >> (i * 4)) & 0xf) == port_id)

			bitmap |= 1 << i;

				bitmap |= BIT(i);





	return bitmap;

	return bitmap;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE