[4/6] scsi: hisi_sas: Set PHY linkrate when disconnected

Message ID 1551365462-128193-5-git-send-email-john.garry@huawei.com
State New
Headers show
  • Untitled series #18926
Related show

Commit Message

John Garry Feb. 28, 2019, 2:51 p.m.
When the PHY comes down, we currently do not set the negotiated linkrate:
root@(none)$ pwd
root@(none)$ more enable
root@(none)$ more negotiated_linkrate
12.0 Gbit
root@(none)$ echo 0 > enable
root@(none)$ more negotiated_linkrate
12.0 Gbit

This patch fixes the driver code to set it properly when the PHY comes

If the PHY had been enabled, then set unknown; otherwise, flag as

The logical place to set the negotiated linkrate for this scenario is PHY
down routine, which is called from the PHY down ISR.

However, it is not possible to know if the PHY comes down due to PHY
disable or loss of link, as sas_phy.enabled member is not set until after
the transport disable routine is complete, which races with the PHY down

As an imperfect solution, use sas_phy_data.enable as the flag to know if
the PHY is down due to disable. It's imperfect, as sas_phy_data is
internal to libsas.

I can't see another way without adding a new field to hisi_sas_phy and
managing it, or changing SCSI SAS transport.

Signed-off-by: John Garry <john.garry@huawei.com>

 drivers/scsi/hisi_sas/hisi_sas_main.c | 10 ++++++++++
 1 file changed, 10 insertions(+)



diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index dd03dcbd3786..d8204bc3931b 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -10,6 +10,7 @@ 
 #include "hisi_sas.h"
+#include "../libsas/sas_internal.h"
 #define DRV_NAME "hisi_sas"
 #define DEV_IS_GONE(dev) \
@@ -2126,9 +2127,18 @@  static int hisi_sas_write_gpio(struct sas_ha_struct *sha, u8 reg_type,
 static void hisi_sas_phy_disconnected(struct hisi_sas_phy *phy)
+	struct asd_sas_phy *sas_phy = &phy->sas_phy;
+	struct sas_phy *sphy = sas_phy->phy;
+	struct sas_phy_data *d = sphy->hostdata;
 	phy->phy_attached = 0;
 	phy->phy_type = 0;
 	phy->port = NULL;
+	if (d->enable)
+		sphy->negotiated_linkrate = SAS_LINK_RATE_UNKNOWN;
+	else
+		sphy->negotiated_linkrate = SAS_PHY_DISABLED;
 void hisi_sas_phy_down(struct hisi_hba *hisi_hba, int phy_no, int rdy)