p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: hisi_sas: Add SATA FIS check for v3 hw 

Add a check ERR bit of status to decide whether there is something wrong
with initial register-D2H FIS. If error exist, PHY link reset the channel
to restart OOB.

Directly call work HISI_PHYE_LINK_RESET replacing disable_phy_vx_hw() and
enable_phy_vx_hw().

Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Xiang Chen 2018-07-18 22:14:33 +08:00 committed by Martin K. Petersen
parent 1c09b66316
commit f4e34f2a5d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
View File

@ -3240,8 +3240,7 @@ static irqreturn_t sata_int_v2_hw(int irq_no, void *p)
if (fis->status & ATA_ERR) { if (fis->status & ATA_ERR) {
dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", phy_no, dev_warn(dev, "sata int: phy%d FIS status: 0x%x\n", phy_no,
fis->status); fis->status);
disable_phy_v2_hw(hisi_hba, phy_no); hisi_sas_notify_phy_event(phy, HISI_PHYE_LINK_RESET);
enable_phy_v2_hw(hisi_hba, phy_no);
res = IRQ_NONE; res = IRQ_NONE;
goto end; goto end;
} }

10
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
View File

@ -1191,6 +1191,16 @@ 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); dev_info(dev, "phyup: phy%d link_rate=%d(sata)\n", phy_no, link_rate);
initial_fis = &hisi_hba->initial_fis[phy_no]; initial_fis = &hisi_hba->initial_fis[phy_no];
fis = &initial_fis->fis; 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; sas_phy->oob_mode = SATA_OOB_MODE;
attached_sas_addr[0] = 0x50; attached_sas_addr[0] = 0x50;
attached_sas_addr[7] = phy_no; attached_sas_addr[7] = phy_no;