Skip to content

Commit 278712d

Browse files
Xingui Yangmartinkpetersen
authored andcommitted
scsi: Revert "scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed"
This reverts commit ab2068a. When probing the exp-attached sata device, libsas/libata will issue a hard reset in sas_probe_sata() -> ata_sas_async_probe(), then a broadcast event will be received after the disk probe fails, and this commit causes the probe will be re-executed on the disk, and a faulty disk may get into an indefinite loop of probe. Therefore, revert this commit, although it can fix some temporary issues with disk probe failure. Signed-off-by: Xingui Yang <yangxingui@huawei.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com> Link: https://patch.msgid.link/20251202065627.140361-1-yangxingui@huawei.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent d98b4d5 commit 278712d

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

drivers/scsi/libsas/sas_internal.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,6 @@ static inline void sas_fail_probe(struct domain_device *dev, const char *func, i
145145
func, dev->parent ? "exp-attached" :
146146
"direct-attached",
147147
SAS_ADDR(dev->sas_addr), err);
148-
149-
/*
150-
* If the device probe failed, the expander phy attached address
151-
* needs to be reset so that the phy will not be treated as flutter
152-
* in the next revalidation
153-
*/
154-
if (dev->parent && !dev_is_expander(dev->dev_type)) {
155-
struct sas_phy *phy = dev->phy;
156-
struct domain_device *parent = dev->parent;
157-
struct ex_phy *ex_phy = &parent->ex_dev.ex_phy[phy->number];
158-
159-
memset(ex_phy->attached_sas_addr, 0, SAS_ADDR_SIZE);
160-
}
161-
162148
sas_unregister_dev(dev->port, dev);
163149
}
164150

0 commit comments

Comments
 (0)