Commit ac013ed1 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] isci: export phy events via ->lldd_control_phy() 



Allow the sas-transport-class to update events for local phys via a new
PHY_FUNC_GET_EVENTS command to ->lldd_control_phy().  Fixup drivers that
are not prepared for new enum phy_func values, and unify
->lldd_control_phy() error codes.

These are the SAS defined phy events that are reported in a
smp-report-phy-error-log command:
 * /sys/class/sas_phy/<phyX>/invalid_dword_count
 * /sys/class/sas_phy/<phyX>/running_disparity_error_count
 * /sys/class/sas_phy/<phyX>/loss_of_dword_sync_count
 * /sys/class/sas_phy/<phyX>/phy_reset_problem_count

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent cdd05f05

drivers/scsi/aic94xx/aic94xx_scb.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/isci/phy.c

+11 −0
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/libsas/sas_init.c

+9 −4
Original line number Diff line number Diff line
@@ -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);

}

drivers/scsi/mvsas/mv_sas.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/pm8001/pm8001_sas.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE