6 files changed, 24 insertions, 6 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 29593275201a..fdac7c2fef37 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -906,6 +906,7 @@ int asd_control_phy(struct asd_sas_phy *phy, enum phy_func func, void *arg)
 
         switch (func) {
         case PHY_FUNC_CLEAR_ERROR_LOG:
+        case PHY_FUNC_GET_EVENTS:
                 return -ENOSYS;
         case PHY_FUNC_SET_LINK_RATE:
                 rates = arg;
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index 430fc8ff014a..ab48bb11eab0 100644
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -1313,6 +1313,17 @@ int isci_phy_control(struct asd_sas_phy *sas_phy,
                 ret = isci_port_perform_hard_reset(ihost, iport, iphy);
 
                 break;
+        case PHY_FUNC_GET_EVENTS: {
+                struct scu_link_layer_registers __iomem *r;
+                struct sas_phy *phy = sas_phy->phy;
+
+                r = iphy->link_layer_registers;
+                phy->running_disparity_error_count = readl(&r->running_disparity_error_count);
+                phy->loss_of_dword_sync_count = readl(&r->loss_of_sync_error_count);
+                phy->phy_reset_problem_count = readl(&r->phy_reset_problem_count);
+                phy->invalid_dword_count = readl(&r->invalid_dword_counter);
+                break;
+        }
 
         default:
                 dev_dbg(&ihost->pdev->dev,
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index dd56ea827665..d81c3b1989f7 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -177,10 +177,15 @@ int sas_unregister_ha(struct sas_ha_struct *sas_ha)
 
 static int sas_get_linkerrors(struct sas_phy *phy)
 {
-        if (scsi_is_sas_phy_local(phy))
-                /* FIXME: we have no local phy stats
-                 * gathering at this time */
-                return -EINVAL;
+        if (scsi_is_sas_phy_local(phy)) {
+                struct Scsi_Host *shost = dev_to_shost(phy->dev.parent);
+                struct sas_ha_struct *sas_ha = SHOST_TO_SAS_HA(shost);
+                struct asd_sas_phy *asd_phy = sas_ha->sas_phy[phy->number];
+                struct sas_internal *i =
+                        to_sas_internal(sas_ha->core.shost->transportt);
+
+                return i->dft->lldd_control_phy(asd_phy, PHY_FUNC_GET_EVENTS, NULL);
+        }
 
         return sas_smp_get_phy_events(phy);
 }
diff --git a/drivers/scsi/mvsas/mv_sas.c b/drivers/scsi/mvsas/mv_sas.c
index d4475d350847..a4884a57cf79 100644
--- a/drivers/scsi/mvsas/mv_sas.c
+++ b/drivers/scsi/mvsas/mv_sas.c
@@ -214,7 +214,7 @@ int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
                 break;
         case PHY_FUNC_RELEASE_SPINUP_HOLD:
         default:
-                rc = -EOPNOTSUPP;
+                rc = -ENOSYS;
         }
         msleep(200);
         return rc;
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c
index 5ac90c3d4cc1..fb3dc9978861 100644
--- a/drivers/scsi/pm8001/pm8001_sas.c
+++ b/drivers/scsi/pm8001/pm8001_sas.c
@@ -210,7 +210,7 @@ int pm8001_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
                 PM8001_CHIP_DISP->phy_stop_req(pm8001_ha, phy_id);
                 break;
         default:
-                rc = -EOPNOTSUPP;
+                rc = -ENOSYS;
         }
         msleep(300);
         return rc;
diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index cfdbe9501593..3673d685e6ad 100644
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -122,6 +122,7 @@ enum phy_func {
         PHY_FUNC_TX_SATA_PS_SIGNAL,
         PHY_FUNC_RELEASE_SPINUP_HOLD = 0x10, /* LOCAL PORT ONLY! */
         PHY_FUNC_SET_LINK_RATE,
+        PHY_FUNC_GET_EVENTS,
 };
 
 /* SAS LLDD would need to report only _very_few_ of those, like BROADCAST.