Commit d8649fc1 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: libsas: Do discovery on empty PHY to update PHY info 



When we discover the PHY is empty in sas_rediscover_dev(), the PHY
information (like negotiated linkrate) is not updated.

As such, for a user examining sysfs for that PHY, they would see
incorrect values:

root@(none)$ cd /sys/class/sas_phy/phy-0:0:20
root@(none)$ more negotiated_linkrate
3.0 Gbit
root@(none)$ echo 0 > enable
root@(none)$ more negotiated_linkrate
3.0 Gbit

So fix this, simply discover the PHY again, even though we know it's empty;
in the above example, this gives us:

root@(none)$ more negotiated_linkrate
Phy disabled

We must do this after unregistering the device associated with the PHY
(in sas_unregister_devs_sas_addr()).

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 085f104a

drivers/scsi/libsas/sas_expander.c

+5 −0
Original line number Diff line number Diff line
@@ -2068,6 +2068,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, 
	if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {

		phy->phy_state = PHY_EMPTY;

		sas_unregister_devs_sas_addr(dev, phy_id, last);

		/*

		 * Even though the PHY is empty, for convenience we discover

		 * the PHY to update the PHY info, like negotiated linkrate.

		 */

		sas_ex_phy_discover(dev, phy_id);

		return res;

	} else if (SAS_ADDR(sas_addr) == SAS_ADDR(phy->attached_sas_addr) &&

		   dev_type_flutter(type, phy->attached_dev_type)) {