[SCSI] libsas: fix definition of wideport, include local sas address

To date libsas has only looked at the attached sas address when
determining the formation of wide ports.  The specification and some
hardware expects that phys with different addresses will not form a wide
port unless the local peer phys also match each other.  Introduce a flag
to select stricter behavior at sas_register_ha() time.  The flag can be
dropped once it is known that all libsas users expect the same behavior.

Current drivers just initialize this field to zero and get the
traditional behavior.

Reported-by: Patrick Thomson <patrick.s.thomson@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 15 insertions, 5 deletions

diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index fe8b74c706d2..5257fdfe699a 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -28,6 +28,17 @@
 #include <scsi/scsi_transport_sas.h>
 #include "../scsi_sas_internal.h"
 
+static bool phy_is_wideport_member(struct asd_sas_port *port, struct asd_sas_phy *phy)
+{
+        struct sas_ha_struct *sas_ha = phy->ha;
+
+        if (memcmp(port->attached_sas_addr, phy->attached_sas_addr,
+                   SAS_ADDR_SIZE) != 0 || (sas_ha->strict_wide_ports &&
+             memcmp(port->sas_addr, phy->sas_addr, SAS_ADDR_SIZE) != 0))
+                return false;
+        return true;
+}
+
 /**
  * sas_form_port -- add this phy to a port
  * @phy: the phy of interest
@@ -45,8 +56,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
         unsigned long flags;
 
         if (port) {
-                if (memcmp(port->attached_sas_addr, phy->attached_sas_addr,
-                           SAS_ADDR_SIZE) != 0)
+                if (!phy_is_wideport_member(port, phy))
                         sas_deform_port(phy);
                 else {
                         SAS_DPRINTK("%s: phy%d belongs to port%d already(%d)!\n",
@@ -62,9 +72,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
                 port = sas_ha->sas_port[i];
                 spin_lock(&port->phy_list_lock);
                 if (*(u64 *) port->sas_addr &&
-                    memcmp(port->attached_sas_addr,
-                           phy->attached_sas_addr, SAS_ADDR_SIZE) == 0 &&
-                    port->num_phys > 0) {
+                    phy_is_wideport_member(port, phy) && port->num_phys > 0) {
                         /* wide port */
                         SAS_DPRINTK("phy%d matched wide port%d\n", phy->id,
                                     port->id);
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 90ce527ecf3d..8f6bb9c7f3eb 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -361,6 +361,8 @@ struct sas_ha_struct {
         /* The class calls this to send a task for execution. */
         int lldd_max_execute_num;
         int lldd_queue_size;
+        int strict_wide_ports; /* both sas_addr and attached_sas_addr must match
+                                * their siblings when forming wide ports */
 
         /* LLDD calls these to notify the class of an event. */
         void (*notify_ha_event)(struct sas_ha_struct *, enum ha_event);