Commit 1eb8eeac authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen

scsi: hisi_sas: us start_phy in PHY_FUNC_LINK_RESET

When a PHY_FUNC_LINK_RESET is issued, we need to fill the transport
identify_frame to SAS controller before the PHYs are enabled.

Without this, we may find that if a PHY which belonged to a wideport
before the reset may generate a new port id.
Signed-off-by: default avatarXiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3297ded1
...@@ -198,7 +198,7 @@ struct hisi_sas_hw { ...@@ -198,7 +198,7 @@ struct hisi_sas_hw {
int (*slot_complete)(struct hisi_hba *hisi_hba, int (*slot_complete)(struct hisi_hba *hisi_hba,
struct hisi_sas_slot *slot); struct hisi_sas_slot *slot);
void (*phys_init)(struct hisi_hba *hisi_hba); void (*phys_init)(struct hisi_hba *hisi_hba);
void (*phy_enable)(struct hisi_hba *hisi_hba, int phy_no); void (*phy_start)(struct hisi_hba *hisi_hba, int phy_no);
void (*phy_disable)(struct hisi_hba *hisi_hba, int phy_no); void (*phy_disable)(struct hisi_hba *hisi_hba, int phy_no);
void (*phy_hard_reset)(struct hisi_hba *hisi_hba, int phy_no); void (*phy_hard_reset)(struct hisi_hba *hisi_hba, int phy_no);
void (*get_events)(struct hisi_hba *hisi_hba, int phy_no); void (*get_events)(struct hisi_hba *hisi_hba, int phy_no);
......
...@@ -765,7 +765,7 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func, ...@@ -765,7 +765,7 @@ static int hisi_sas_control_phy(struct asd_sas_phy *sas_phy, enum phy_func func,
case PHY_FUNC_LINK_RESET: case PHY_FUNC_LINK_RESET:
hisi_hba->hw->phy_disable(hisi_hba, phy_no); hisi_hba->hw->phy_disable(hisi_hba, phy_no);
msleep(100); msleep(100);
hisi_hba->hw->phy_enable(hisi_hba, phy_no); hisi_hba->hw->phy_start(hisi_hba, phy_no);
break; break;
case PHY_FUNC_DISABLE: case PHY_FUNC_DISABLE:
......
...@@ -1857,7 +1857,7 @@ static const struct hisi_sas_hw hisi_sas_v1_hw = { ...@@ -1857,7 +1857,7 @@ static const struct hisi_sas_hw hisi_sas_v1_hw = {
.start_delivery = start_delivery_v1_hw, .start_delivery = start_delivery_v1_hw,
.slot_complete = slot_complete_v1_hw, .slot_complete = slot_complete_v1_hw,
.phys_init = phys_init_v1_hw, .phys_init = phys_init_v1_hw,
.phy_enable = enable_phy_v1_hw, .phy_start = start_phy_v1_hw,
.phy_disable = disable_phy_v1_hw, .phy_disable = disable_phy_v1_hw,
.phy_hard_reset = phy_hard_reset_v1_hw, .phy_hard_reset = phy_hard_reset_v1_hw,
.phy_set_linkrate = phy_set_linkrate_v1_hw, .phy_set_linkrate = phy_set_linkrate_v1_hw,
......
...@@ -3463,7 +3463,7 @@ static const struct hisi_sas_hw hisi_sas_v2_hw = { ...@@ -3463,7 +3463,7 @@ static const struct hisi_sas_hw hisi_sas_v2_hw = {
.start_delivery = start_delivery_v2_hw, .start_delivery = start_delivery_v2_hw,
.slot_complete = slot_complete_v2_hw, .slot_complete = slot_complete_v2_hw,
.phys_init = phys_init_v2_hw, .phys_init = phys_init_v2_hw,
.phy_enable = enable_phy_v2_hw, .phy_start = start_phy_v2_hw,
.phy_disable = disable_phy_v2_hw, .phy_disable = disable_phy_v2_hw,
.phy_hard_reset = phy_hard_reset_v2_hw, .phy_hard_reset = phy_hard_reset_v2_hw,
.get_events = phy_get_events_v2_hw, .get_events = phy_get_events_v2_hw,
......
...@@ -1781,7 +1781,7 @@ static const struct hisi_sas_hw hisi_sas_v3_hw = { ...@@ -1781,7 +1781,7 @@ static const struct hisi_sas_hw hisi_sas_v3_hw = {
.start_delivery = start_delivery_v3_hw, .start_delivery = start_delivery_v3_hw,
.slot_complete = slot_complete_v3_hw, .slot_complete = slot_complete_v3_hw,
.phys_init = phys_init_v3_hw, .phys_init = phys_init_v3_hw,
.phy_enable = enable_phy_v3_hw, .phy_start = start_phy_v3_hw,
.phy_disable = disable_phy_v3_hw, .phy_disable = disable_phy_v3_hw,
.phy_hard_reset = phy_hard_reset_v3_hw, .phy_hard_reset = phy_hard_reset_v3_hw,
.phy_get_max_linkrate = phy_get_max_linkrate_v3_hw, .phy_get_max_linkrate = phy_get_max_linkrate_v3_hw,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment