Commit 73a4925d authored by Xiang Chen's avatar Xiang Chen Committed by Martin K. Petersen

scsi: hisi_sas: Update all the registers after suspend and resume

After suspend and resume, the HW registers will be set back to their
initial value. We use init_reg_v3_hw() to set some registers, but some
registers are set via firmware in ACPI "_RST" method, so add reset handler
before init_reg_v3_hw().

Link: https://lore.kernel.org/r/1567774537-20003-7-git-send-email-john.garry@huawei.comSigned-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 b45e05aa
...@@ -3283,15 +3283,21 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev) ...@@ -3283,15 +3283,21 @@ static int hisi_sas_v3_resume(struct pci_dev *pdev)
pci_enable_wake(pdev, PCI_D0, 0); pci_enable_wake(pdev, PCI_D0, 0);
pci_restore_state(pdev); pci_restore_state(pdev);
rc = pci_enable_device(pdev); rc = pci_enable_device(pdev);
if (rc) if (rc) {
dev_err(dev, "enable device failed during resume (%d)\n", rc); dev_err(dev, "enable device failed during resume (%d)\n", rc);
return rc;
}
pci_set_master(pdev); pci_set_master(pdev);
scsi_unblock_requests(shost); scsi_unblock_requests(shost);
clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags); clear_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags);
sas_prep_resume_ha(sha); sas_prep_resume_ha(sha);
init_reg_v3_hw(hisi_hba); rc = hw_init_v3_hw(hisi_hba);
if (rc) {
scsi_remove_host(shost);
pci_disable_device(pdev);
}
hisi_hba->hw->phys_init(hisi_hba); hisi_hba->hw->phys_init(hisi_hba);
sas_resume_ha(sha); sas_resume_ha(sha);
clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags); clear_bit(HISI_SAS_RESET_BIT, &hisi_hba->flags);
......
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