Commit 278712d2 authored by Xingui Yang's avatar Xingui Yang Committed by Martin K. Petersen
Browse files

scsi: Revert "scsi: libsas: Fix exp-attached device scan after probe failure... 


scsi: Revert "scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed"

This reverts commit ab2068a6.

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: default avatarXingui Yang <yangxingui@huawei.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://patch.msgid.link/20251202065627.140361-1-yangxingui@huawei.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d98b4d52

drivers/scsi/libsas/sas_internal.h

+0 −14
Original line number Diff line number Diff line
@@ -145,20 +145,6 @@ static inline void sas_fail_probe(struct domain_device *dev, const char *func, i 
		func, dev->parent ? "exp-attached" :

		"direct-attached",

		SAS_ADDR(dev->sas_addr), err);



	/*

	 * If the device probe failed, the expander phy attached address

	 * needs to be reset so that the phy will not be treated as flutter

	 * in the next revalidation

	 */

	if (dev->parent && !dev_is_expander(dev->dev_type)) {

		struct sas_phy *phy = dev->phy;

		struct domain_device *parent = dev->parent;

		struct ex_phy *ex_phy = &parent->ex_dev.ex_phy[phy->number];



		memset(ex_phy->attached_sas_addr, 0, SAS_ADDR_SIZE);

	}



	sas_unregister_dev(dev->port, dev);

}