Unverified Commit 592d168b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13239 scsi: pm80xx: Set phy->enable_completion only when we wait for it 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zicheng Qu <quzicheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/VFGB3V5P2L56QBJM22JBBINJ4DLUMKE3/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAVU94 
 
Link:https://gitee.com/openeuler/kernel/pulls/13239

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 560586e5 6af1cb36

drivers/scsi/pm8001/pm8001_sas.c

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 
	unsigned long flags;

	pm8001_ha = sas_phy->ha->lldd_ha;

	phy = &pm8001_ha->phy[phy_id];

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

	switch (func) {

	case PHY_FUNC_SET_LINK_RATE:

		rates = funcdata;
@@ -176,6 +175,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 
				rates->maximum_linkrate;

		}

		if (pm8001_ha->phy[phy_id].phy_state ==  PHY_LINK_DISABLE) {

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

			PM8001_CHIP_DISP->phy_start_req(pm8001_ha, phy_id);

			wait_for_completion(&completion);

		}
@@ -184,6 +184,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 
		break;

	case PHY_FUNC_HARD_RESET:

		if (pm8001_ha->phy[phy_id].phy_state == PHY_LINK_DISABLE) {

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

			PM8001_CHIP_DISP->phy_start_req(pm8001_ha, phy_id);

			wait_for_completion(&completion);

		}
@@ -192,6 +193,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func, 
		break;

	case PHY_FUNC_LINK_RESET:

		if (pm8001_ha->phy[phy_id].phy_state == PHY_LINK_DISABLE) {

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

			PM8001_CHIP_DISP->phy_start_req(pm8001_ha, phy_id);

			wait_for_completion(&completion);

		}