diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2018-08-30 15:41:49 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2018-08-30 15:41:49 +0200 |
| commit | f3c831174c720d69e93053abe82a2075a0d04300 (patch) | |
| tree | 2bbc9a22ac13de0e52b07c9f6a4d9b0a1cafd283 | |
| parent | 3f8c8b1bcaafa76aacc1a33a8dfbf829fcdbddde (diff) | |
Revert "scsi: hisi_sas: Add SATA FIS check for v3 hw"next-master-20180830
This reverts commit f4e34f2a5dd9c0db19baad3f015c3abd5f2e0343.
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index cc03af7b160b..159576e560d7 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -3235,7 +3235,8 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p) if (fis->status & ATA_ERR) { dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", phy_no, fis->status); - hisi_sas_notify_phy_event(phy, HISI_PHYE_LINK_RESET); + disable_phy_v2_hw(hisi_hba, phy_no); + enable_phy_v2_hw(hisi_hba, phy_no); res = IRQ_NONE; goto end; } diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index 0937e86dad13..71cf3b022aa1 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -1172,16 +1172,6 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba) dev_info(dev, "phyup: phy%d link_rate=%d(sata)\n", phy_no, link_rate); initial_fis = &hisi_hba->initial_fis[phy_no]; fis = &initial_fis->fis; - - /* check ERR bit of Status Register */ - if (fis->status & ATA_ERR) { - dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", - phy_no, fis->status); - hisi_sas_notify_phy_event(phy, HISI_PHYE_LINK_RESET); - res = IRQ_NONE; - goto end; - } - sas_phy->oob_mode = SATA_OOB_MODE; attached_sas_addr[0] = 0x50; attached_sas_addr[7] = phy_no; |