scsi: libsas: no need to join wide port again in sas_ex_discover_dev()

Since we are processing events synchronously now, the second call of
sas_ex_join_wide_port() in sas_ex_discover_dev() is not needed. There will
be no races with other works in disco workqueue. So remove the second
sas_ex_join_wide_port().

I did not change the return value of 'res' to error when discover failed
because we need to continue to discover other phys if one phy discover
failed. So let's keep that logic as before and just add a debug log to
detect the failure. And directly return if second fanout expander attatched
to the parent expander because it has nothing to do after the phy is
disabled.

Signed-off-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 76ea83d..fd16a3d 100644 (file)
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1090,7 +1090,7 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)
                                 SAS_ADDR(dev->sas_addr),
                                 phy_id);
                        sas_ex_disable_phy(dev, phy_id);
-                       break;
+                       return res;
                } else
                        memcpy(dev->port->disc.fanout_sas_addr,
                               ex_phy->attached_sas_addr, SAS_ADDR_SIZE);
@@ -1102,27 +1102,9 @@ static int sas_ex_discover_dev(struct domain_device *dev, int phy_id)
                break;
        }
 
-       if (child) {
-               int i;
-
-               for (i = 0; i < ex->num_phys; i++) {
-                       if (ex->ex_phy[i].phy_state == PHY_VACANT ||
-                           ex->ex_phy[i].phy_state == PHY_NOT_PRESENT)
-                               continue;
-                       /*
-                        * Due to races, the phy might not get added to the
-                        * wide port, so we add the phy to the wide port here.
-                        */
-                       if (SAS_ADDR(ex->ex_phy[i].attached_sas_addr) ==
-                           SAS_ADDR(child->sas_addr)) {
-                               ex->ex_phy[i].phy_state= PHY_DEVICE_DISCOVERED;
-                               if (sas_ex_join_wide_port(dev, i))
-                                       pr_debug("Attaching ex phy%02d to wide port %016llx\n",
-                                                i, SAS_ADDR(ex->ex_phy[i].attached_sas_addr));
-                       }
-               }
-       }
-
+       if (!child)
+               pr_notice("ex %016llx phy%02d failed to discover\n",
+                         SAS_ADDR(dev->sas_addr), phy_id);
        return res;
 }