Commit f4ad7b58 authored by James Bottomley's avatar James Bottomley Committed by James Bottomley

[SCSI] scsi_transport_sas: remove local_attached flag

This flag denotes local attachment of the phy.  There are two problems
with it:

1) It's actually redundant ... you can get the same information simply
by seeing whether a host is the phys parent
2) we condition a lot of phy parameters on it on the false assumption
that we can only control local phys.  I'm wiring up phy resets in the
aic94xx now, and it will be able to reset non-local phys as well.

I fixed 2) by moving the local check into the reset and stats function
of the mptsas, since that seems to be the only HBA that can't
(currently) control non-local phys.
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 8ce7a9c1
...@@ -852,6 +852,10 @@ static int mptsas_get_linkerrors(struct sas_phy *phy) ...@@ -852,6 +852,10 @@ static int mptsas_get_linkerrors(struct sas_phy *phy)
dma_addr_t dma_handle; dma_addr_t dma_handle;
int error; int error;
/* FIXME: only have link errors on local phys */
if (!scsi_is_sas_phy_local(phy))
return -EINVAL;
hdr.PageVersion = MPI_SASPHY1_PAGEVERSION; hdr.PageVersion = MPI_SASPHY1_PAGEVERSION;
hdr.ExtPageLength = 0; hdr.ExtPageLength = 0;
hdr.PageNumber = 1 /* page number 1*/; hdr.PageNumber = 1 /* page number 1*/;
...@@ -924,6 +928,10 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset) ...@@ -924,6 +928,10 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
unsigned long timeleft; unsigned long timeleft;
int error = -ERESTARTSYS; int error = -ERESTARTSYS;
/* FIXME: fusion doesn't allow non-local phy reset */
if (!scsi_is_sas_phy_local(phy))
return -EINVAL;
/* not implemented for expanders */ /* not implemented for expanders */
if (phy->identify.target_port_protocols & SAS_PROTOCOL_SMP) if (phy->identify.target_port_protocols & SAS_PROTOCOL_SMP)
return -ENXIO; return -ENXIO;
...@@ -1570,9 +1578,6 @@ static int mptsas_probe_one_phy(struct device *dev, ...@@ -1570,9 +1578,6 @@ static int mptsas_probe_one_phy(struct device *dev,
if (!phy_info->phy) { if (!phy_info->phy) {
if (local)
phy->local_attached = 1;
error = sas_phy_add(phy); error = sas_phy_add(phy);
if (error) { if (error) {
sas_phy_free(phy); sas_phy_free(phy);
......
...@@ -266,9 +266,6 @@ show_sas_phy_##field(struct class_device *cdev, char *buf) \ ...@@ -266,9 +266,6 @@ show_sas_phy_##field(struct class_device *cdev, char *buf) \
struct sas_internal *i = to_sas_internal(shost->transportt); \ struct sas_internal *i = to_sas_internal(shost->transportt); \
int error; \ int error; \
\ \
if (!phy->local_attached) \
return -EINVAL; \
\
error = i->f->get_linkerrors ? i->f->get_linkerrors(phy) : 0; \ error = i->f->get_linkerrors ? i->f->get_linkerrors(phy) : 0; \
if (error) \ if (error) \
return error; \ return error; \
...@@ -299,9 +296,6 @@ static ssize_t do_sas_phy_reset(struct class_device *cdev, ...@@ -299,9 +296,6 @@ static ssize_t do_sas_phy_reset(struct class_device *cdev,
struct sas_internal *i = to_sas_internal(shost->transportt); struct sas_internal *i = to_sas_internal(shost->transportt);
int error; int error;
if (!phy->local_attached)
return -EINVAL;
error = i->f->phy_reset(phy, hard_reset); error = i->f->phy_reset(phy, hard_reset);
if (error) if (error)
return error; return error;
...@@ -849,7 +843,7 @@ show_sas_rphy_enclosure_identifier(struct class_device *cdev, char *buf) ...@@ -849,7 +843,7 @@ show_sas_rphy_enclosure_identifier(struct class_device *cdev, char *buf)
* Only devices behind an expander are supported, because the * Only devices behind an expander are supported, because the
* enclosure identifier is a SMP feature. * enclosure identifier is a SMP feature.
*/ */
if (phy->local_attached) if (scsi_is_sas_phy_local(phy))
return -EINVAL; return -EINVAL;
error = i->f->get_enclosure_identifier(rphy, &identifier); error = i->f->get_enclosure_identifier(rphy, &identifier);
...@@ -870,7 +864,7 @@ show_sas_rphy_bay_identifier(struct class_device *cdev, char *buf) ...@@ -870,7 +864,7 @@ show_sas_rphy_bay_identifier(struct class_device *cdev, char *buf)
struct sas_internal *i = to_sas_internal(shost->transportt); struct sas_internal *i = to_sas_internal(shost->transportt);
int val; int val;
if (phy->local_attached) if (scsi_is_sas_phy_local(phy))
return -EINVAL; return -EINVAL;
val = i->f->get_bay_identifier(rphy); val = i->f->get_bay_identifier(rphy);
......
...@@ -57,9 +57,6 @@ struct sas_phy { ...@@ -57,9 +57,6 @@ struct sas_phy {
enum sas_linkrate maximum_linkrate_hw; enum sas_linkrate maximum_linkrate_hw;
enum sas_linkrate maximum_linkrate; enum sas_linkrate maximum_linkrate;
/* internal state */
unsigned int local_attached : 1;
/* link error statistics */ /* link error statistics */
u32 invalid_dword_count; u32 invalid_dword_count;
u32 running_disparity_error_count; u32 running_disparity_error_count;
...@@ -196,4 +193,6 @@ scsi_is_sas_expander_device(struct device *dev) ...@@ -196,4 +193,6 @@ scsi_is_sas_expander_device(struct device *dev)
rphy->identify.device_type == SAS_EDGE_EXPANDER_DEVICE; rphy->identify.device_type == SAS_EDGE_EXPANDER_DEVICE;
} }
#define scsi_is_sas_phy_local(phy) scsi_is_host_device((phy)->dev.parent)
#endif /* SCSI_TRANSPORT_SAS_H */ #endif /* SCSI_TRANSPORT_SAS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment