[SCSI] sas: add flag for locally attached PHYs

Add a flag to mark a PHY as attached to the HBA as opposed to beeing on
an expander.  This is needed because various features are only supported
on those.  This is a crude hack, the proper fix would be to use
different classes for host-attached vs expander phys.  I'm looking into
that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 6512027bc69..dcdf0380be8 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -760,7 +760,7 @@ mptsas_parse_device_info(struct sas_identify *identify,
 }
 
 static int mptsas_probe_one_phy(struct device *dev,
-                struct mptsas_phyinfo *phy_info, int index)
+                struct mptsas_phyinfo *phy_info, int index, int local)
 {
         struct sas_phy *port;
         int error;
@@ -853,6 +853,9 @@ static int mptsas_probe_one_phy(struct device *dev,
                 break;
         }
 
+        if (local)
+                port->local_attached = 1;
+
         error = sas_phy_add(port);
         if (error) {
                 sas_phy_free(port);
@@ -918,7 +921,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc, int *index)
                 }
 
                 mptsas_probe_one_phy(&ioc->sh->shost_gendev,
-                                     &port_info->phy_info[i], *index);
+                                     &port_info->phy_info[i], *index, 1);
                 (*index)++;
         }
 
@@ -989,7 +992,8 @@ mptsas_probe_expander_phys(MPT_ADAPTER *ioc, u32 *handle, int *index)
                         }
                 }
 
-                mptsas_probe_one_phy(parent, &port_info->phy_info[i], *index);
+                mptsas_probe_one_phy(parent, &port_info->phy_info[i],
+                                     *index, 0);
                 (*index)++;
         }
 
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 63445f90097..f5618c1116f 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -266,6 +266,9 @@ show_sas_phy_##field(struct class_device *cdev, char *buf)		\
         struct sas_internal *i = to_sas_internal(shost->transportt);    \
         int error;                                                      \
                                                                         \
+        if (!phy->local_attached)                                       \
+                return -EINVAL;                                         \
+                                                                        \
         error = i->f->get_linkerrors(phy);                              \
         if (error)                                                      \
                 return error;                                           \