1 files changed, 44 insertions, 4 deletions

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index d31e6fa466f7..dc70c180e115 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -667,8 +667,9 @@ static struct domain_device *sas_ex_discover_end_dev(
         return child;
 
  out_list_del:
+        sas_rphy_free(child->rphy);
+        child->rphy = NULL;
         list_del(&child->dev_list_node);
-        sas_rphy_free(rphy);
  out_free:
         sas_port_delete(phy->port);
  out_err:
@@ -677,6 +678,29 @@ static struct domain_device *sas_ex_discover_end_dev(
         return NULL;
 }
 
+/* See if this phy is part of a wide port */
+static int sas_ex_join_wide_port(struct domain_device *parent, int phy_id)
+{
+        struct ex_phy *phy = &parent->ex_dev.ex_phy[phy_id];
+        int i;
+
+        for (i = 0; i < parent->ex_dev.num_phys; i++) {
+                struct ex_phy *ephy = &parent->ex_dev.ex_phy[i];
+
+                if (ephy == phy)
+                        continue;
+
+                if (!memcmp(phy->attached_sas_addr, ephy->attached_sas_addr,
+                            SAS_ADDR_SIZE) && ephy->port) {
+                        sas_port_add_phy(ephy->port, phy->phy);
+                        phy->phy_state = PHY_DEVICE_DISCOVERED;
+                        return 0;
+                }
+        }
+
+        return -ENODEV;
+}
+
 static struct domain_device *sas_ex_discover_expander(
         struct domain_device *parent, int phy_id)
 {
@@ -809,6 +833,13 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)
                 return res;
         }
 
+        res = sas_ex_join_wide_port(dev, phy_id);
+        if (!res) {
+                SAS_DPRINTK("Attaching ex phy%d to wide port %016llx\n",
+                            phy_id, SAS_ADDR(ex_phy->attached_sas_addr));
+                return res;
+        }
+
         switch (ex_phy->attached_dev_type) {
         case SAS_END_DEV:
                 child = sas_ex_discover_end_dev(dev, phy_id);
@@ -1431,14 +1462,23 @@ int sas_discover_root_expander(struct domain_device *dev)
         int res;
         struct sas_expander_device *ex = rphy_to_expander_device(dev->rphy);
 
-        sas_rphy_add(dev->rphy);
+        res = sas_rphy_add(dev->rphy);
+        if (res)
+                goto out_err;
 
         ex->level = dev->port->disc.max_level; /* 0 */
         res = sas_discover_expander(dev);
-        if (!res)
-                sas_ex_bfs_disc(dev->port);
+        if (res)
+                goto out_err2;
+
+        sas_ex_bfs_disc(dev->port);
 
         return res;
+
+out_err2:
+        sas_rphy_remove(dev->rphy);
+out_err:
+        return res;
 }
 
 /* ---------- Domain revalidation ---------- */