]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[SCSI] mpt2sas: Added expander phy control support
authorKashyap, Desai <kashyap.desai@lsi.com>
Thu, 17 Jun 2010 08:04:31 +0000 (13:34 +0530)
committerJames Bottomley <James.Bottomley@suse.de>
Tue, 27 Jul 2010 17:02:10 +0000 (12:02 -0500)
Added support to send link resets, hard resets, enable/disable phys, and
changing link rates for for expanders.  This will be exported to
attributes within the sas transport layer.  A new wrapper function was
added for sending SMP passthru to expanders for phy control.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/mpt2sas/mpt2sas_transport.c

index a96501fdba0c806f370af4d32937b381d292a941..6c94deeb7be713ff364eb2c8d97e3374193d5f9c 100644 (file)
@@ -940,16 +940,6 @@ rphy_to_ioc(struct sas_rphy *rphy)
        return shost_priv(shost);
 }
 
-static struct _sas_phy *
-_transport_find_local_phy(struct MPT2SAS_ADAPTER *ioc, struct sas_phy *phy)
-{
-       int i;
-
-       for (i = 0; i < ioc->sas_hba.num_phys; i++)
-               if (ioc->sas_hba.phy[i].phy == phy)
-                       return(&ioc->sas_hba.phy[i]);
-       return NULL;
-}
 
 /* report phy error log structure */
 struct phy_error_log_request{
@@ -1270,32 +1260,260 @@ _transport_get_bay_identifier(struct sas_rphy *rphy)
        return sas_device->slot;
 }
 
+/* phy control request structure */
+struct phy_control_request{
+       u8 smp_frame_type; /* 0x40 */
+       u8 function; /* 0x91 */
+       u8 allocated_response_length;
+       u8 request_length; /* 0x09 */
+       u16 expander_change_count;
+       u8 reserved_1[3];
+       u8 phy_identifier;
+       u8 phy_operation;
+       u8 reserved_2[13];
+       u64 attached_device_name;
+       u8 programmed_min_physical_link_rate;
+       u8 programmed_max_physical_link_rate;
+       u8 reserved_3[6];
+};
+
+/* phy control reply structure */
+struct phy_control_reply{
+       u8 smp_frame_type; /* 0x41 */
+       u8 function; /* 0x11 */
+       u8 function_result;
+       u8 response_length;
+};
+
+#define SMP_PHY_CONTROL_LINK_RESET     (0x01)
+#define SMP_PHY_CONTROL_HARD_RESET     (0x02)
+#define SMP_PHY_CONTROL_DISABLE                (0x03)
+
+/**
+ * _transport_expander_phy_control - expander phy control
+ * @ioc: per adapter object
+ * @phy: The sas phy object
+ *
+ * Returns 0 for success, non-zero for failure.
+ *
+ */
+static int
+_transport_expander_phy_control(struct MPT2SAS_ADAPTER *ioc,
+    struct sas_phy *phy, u8 phy_operation)
+{
+       Mpi2SmpPassthroughRequest_t *mpi_request;
+       Mpi2SmpPassthroughReply_t *mpi_reply;
+       struct phy_control_request *phy_control_request;
+       struct phy_control_reply *phy_control_reply;
+       int rc;
+       u16 smid;
+       u32 ioc_state;
+       unsigned long timeleft;
+       void *psge;
+       u32 sgl_flags;
+       u8 issue_reset = 0;
+       void *data_out = NULL;
+       dma_addr_t data_out_dma;
+       u32 sz;
+       u64 *sas_address_le;
+       u16 wait_state_count;
+
+       if (ioc->shost_recovery) {
+               printk(MPT2SAS_INFO_FMT "%s: host reset in progress!\n",
+                   __func__, ioc->name);
+               return -EFAULT;
+       }
+
+       mutex_lock(&ioc->transport_cmds.mutex);
+
+       if (ioc->transport_cmds.status != MPT2_CMD_NOT_USED) {
+               printk(MPT2SAS_ERR_FMT "%s: transport_cmds in use\n",
+                   ioc->name, __func__);
+               rc = -EAGAIN;
+               goto out;
+       }
+       ioc->transport_cmds.status = MPT2_CMD_PENDING;
+
+       wait_state_count = 0;
+       ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
+       while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {
+               if (wait_state_count++ == 10) {
+                       printk(MPT2SAS_ERR_FMT
+                           "%s: failed due to ioc not operational\n",
+                           ioc->name, __func__);
+                       rc = -EFAULT;
+                       goto out;
+               }
+               ssleep(1);
+               ioc_state = mpt2sas_base_get_iocstate(ioc, 1);
+               printk(MPT2SAS_INFO_FMT "%s: waiting for "
+                   "operational state(count=%d)\n", ioc->name,
+                   __func__, wait_state_count);
+       }
+       if (wait_state_count)
+               printk(MPT2SAS_INFO_FMT "%s: ioc is operational\n",
+                   ioc->name, __func__);
+
+       smid = mpt2sas_base_get_smid(ioc, ioc->transport_cb_idx);
+       if (!smid) {
+               printk(MPT2SAS_ERR_FMT "%s: failed obtaining a smid\n",
+                   ioc->name, __func__);
+               rc = -EAGAIN;
+               goto out;
+       }
+
+       mpi_request = mpt2sas_base_get_msg_frame(ioc, smid);
+       ioc->transport_cmds.smid = smid;
+
+       sz = sizeof(struct phy_control_request) +
+           sizeof(struct phy_control_reply);
+       data_out = pci_alloc_consistent(ioc->pdev, sz, &data_out_dma);
+       if (!data_out) {
+               printk(KERN_ERR "failure at %s:%d/%s()!\n", __FILE__,
+                   __LINE__, __func__);
+               rc = -ENOMEM;
+               mpt2sas_base_free_smid(ioc, smid);
+               goto out;
+       }
+
+       rc = -EINVAL;
+       memset(data_out, 0, sz);
+       phy_control_request = data_out;
+       phy_control_request->smp_frame_type = 0x40;
+       phy_control_request->function = 0x91;
+       phy_control_request->request_length = 9;
+       phy_control_request->allocated_response_length = 0;
+       phy_control_request->phy_identifier = phy->number;
+       phy_control_request->phy_operation = phy_operation;
+       phy_control_request->programmed_min_physical_link_rate =
+           phy->minimum_linkrate << 4;
+       phy_control_request->programmed_max_physical_link_rate =
+           phy->maximum_linkrate << 4;
+
+       memset(mpi_request, 0, sizeof(Mpi2SmpPassthroughRequest_t));
+       mpi_request->Function = MPI2_FUNCTION_SMP_PASSTHROUGH;
+       mpi_request->PhysicalPort = 0xFF;
+       mpi_request->VF_ID = 0; /* TODO */
+       mpi_request->VP_ID = 0;
+       sas_address_le = (u64 *)&mpi_request->SASAddress;
+       *sas_address_le = cpu_to_le64(phy->identify.sas_address);
+       mpi_request->RequestDataLength =
+           cpu_to_le16(sizeof(struct phy_error_log_request));
+       psge = &mpi_request->SGL;
+
+       /* WRITE sgel first */
+       sgl_flags = (MPI2_SGE_FLAGS_SIMPLE_ELEMENT |
+           MPI2_SGE_FLAGS_END_OF_BUFFER | MPI2_SGE_FLAGS_HOST_TO_IOC);
+       sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
+       ioc->base_add_sg_single(psge, sgl_flags |
+           sizeof(struct phy_control_request), data_out_dma);
+
+       /* incr sgel */
+       psge += ioc->sge_size;
+
+       /* READ sgel last */
+       sgl_flags = (MPI2_SGE_FLAGS_SIMPLE_ELEMENT |
+           MPI2_SGE_FLAGS_LAST_ELEMENT | MPI2_SGE_FLAGS_END_OF_BUFFER |
+           MPI2_SGE_FLAGS_END_OF_LIST);
+       sgl_flags = sgl_flags << MPI2_SGE_FLAGS_SHIFT;
+       ioc->base_add_sg_single(psge, sgl_flags |
+           sizeof(struct phy_control_reply), data_out_dma +
+           sizeof(struct phy_control_request));
+
+       dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "phy_control - "
+           "send to sas_addr(0x%016llx), phy(%d), opcode(%d)\n", ioc->name,
+           (unsigned long long)phy->identify.sas_address, phy->number,
+           phy_operation));
+       mpt2sas_base_put_smid_default(ioc, smid);
+       init_completion(&ioc->transport_cmds.done);
+       timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
+           10*HZ);
+
+       if (!(ioc->transport_cmds.status & MPT2_CMD_COMPLETE)) {
+               printk(MPT2SAS_ERR_FMT "%s: timeout\n",
+                   ioc->name, __func__);
+               _debug_dump_mf(mpi_request,
+                   sizeof(Mpi2SmpPassthroughRequest_t)/4);
+               if (!(ioc->transport_cmds.status & MPT2_CMD_RESET))
+                       issue_reset = 1;
+               goto issue_host_reset;
+       }
+
+       dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT "phy_control - "
+           "complete\n", ioc->name));
+
+       if (ioc->transport_cmds.status & MPT2_CMD_REPLY_VALID) {
+
+               mpi_reply = ioc->transport_cmds.reply;
+
+               dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT
+                   "phy_control - reply data transfer size(%d)\n",
+                   ioc->name, le16_to_cpu(mpi_reply->ResponseDataLength)));
+
+               if (le16_to_cpu(mpi_reply->ResponseDataLength) !=
+                   sizeof(struct phy_control_reply))
+                       goto out;
+
+               phy_control_reply = data_out +
+                   sizeof(struct phy_control_request);
+
+               dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT
+                   "phy_control - function_result(%d)\n",
+                   ioc->name, phy_control_reply->function_result));
+
+               rc = 0;
+       } else
+               dtransportprintk(ioc, printk(MPT2SAS_INFO_FMT
+                   "phy_control - no reply\n", ioc->name));
+
+ issue_host_reset:
+       if (issue_reset)
+               mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP,
+                   FORCE_BIG_HAMMER);
+ out:
+       ioc->transport_cmds.status = MPT2_CMD_NOT_USED;
+       if (data_out)
+               pci_free_consistent(ioc->pdev, sz, data_out, data_out_dma);
+
+       mutex_unlock(&ioc->transport_cmds.mutex);
+       return rc;
+}
+
 /**
  * _transport_phy_reset -
  * @phy: The sas phy object
  * @hard_reset:
  *
- * Only support sas_host direct attached phys.
  * Returns 0 for success, non-zero for failure.
  */
 static int
 _transport_phy_reset(struct sas_phy *phy, int hard_reset)
 {
        struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy);
-       struct _sas_phy *mpt2sas_phy;
        Mpi2SasIoUnitControlReply_t mpi_reply;
        Mpi2SasIoUnitControlRequest_t mpi_request;
+       unsigned long flags;
 
-       mpt2sas_phy = _transport_find_local_phy(ioc, phy);
-
-       if (!mpt2sas_phy) /* this phy not on sas_host */
+       spin_lock_irqsave(&ioc->sas_node_lock, flags);
+       if (_transport_sas_node_find_by_sas_address(ioc,
+           phy->identify.sas_address) == NULL) {
+               spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
                return -EINVAL;
+       }
+       spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
 
+       /* handle expander phys */
+       if (phy->identify.sas_address != ioc->sas_hba.sas_address)
+               return _transport_expander_phy_control(ioc, phy,
+                   (hard_reset == 1) ? SMP_PHY_CONTROL_HARD_RESET :
+                   SMP_PHY_CONTROL_LINK_RESET);
+
+       /* handle hba phys */
        memset(&mpi_request, 0, sizeof(Mpi2SasIoUnitControlReply_t));
        mpi_request.Function = MPI2_FUNCTION_SAS_IO_UNIT_CONTROL;
        mpi_request.Operation = hard_reset ?
            MPI2_SAS_OP_PHY_HARD_RESET : MPI2_SAS_OP_PHY_LINK_RESET;
-       mpi_request.PhyNum = mpt2sas_phy->phy_id;
+       mpi_request.PhyNum = phy->number;
 
        if ((mpt2sas_base_sas_iounit_control(ioc, &mpi_reply, &mpi_request))) {
                printk(MPT2SAS_ERR_FMT "failure at %s:%d/%s()!\n",
@@ -1306,8 +1524,7 @@ _transport_phy_reset(struct sas_phy *phy, int hard_reset)
        if (mpi_reply.IOCStatus || mpi_reply.IOCLogInfo)
                printk(MPT2SAS_INFO_FMT "phy(%d), ioc_status"
                    "(0x%04x), loginfo(0x%08x)\n", ioc->name,
-                   mpt2sas_phy->phy_id,
-                   le16_to_cpu(mpi_reply.IOCStatus),
+                   phy->number, le16_to_cpu(mpi_reply.IOCStatus),
                    le32_to_cpu(mpi_reply.IOCLogInfo));
 
        return 0;
@@ -1325,17 +1542,28 @@ static int
 _transport_phy_enable(struct sas_phy *phy, int enable)
 {
        struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy);
-       struct _sas_phy *mpt2sas_phy;
        Mpi2SasIOUnitPage1_t *sas_iounit_pg1 = NULL;
        Mpi2ConfigReply_t mpi_reply;
        u16 ioc_status;
        u16 sz;
        int rc = 0;
+       unsigned long flags;
 
-       mpt2sas_phy = _transport_find_local_phy(ioc, phy);
-
-       if (!mpt2sas_phy) /* this phy not on sas_host */
+       spin_lock_irqsave(&ioc->sas_node_lock, flags);
+       if (_transport_sas_node_find_by_sas_address(ioc,
+           phy->identify.sas_address) == NULL) {
+               spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
                return -EINVAL;
+       }
+       spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
+
+       /* handle expander phys */
+       if (phy->identify.sas_address != ioc->sas_hba.sas_address)
+               return _transport_expander_phy_control(ioc, phy,
+                   (enable == 1) ? SMP_PHY_CONTROL_LINK_RESET :
+                   SMP_PHY_CONTROL_DISABLE);
+
+       /* handle hba phys */
 
        /* sas_iounit page 1 */
        sz = offsetof(Mpi2SasIOUnitPage1_t, PhyData) + (ioc->sas_hba.num_phys *
@@ -1364,14 +1592,18 @@ _transport_phy_enable(struct sas_phy *phy, int enable)
        }
 
        if (enable)
-               sas_iounit_pg1->PhyData[mpt2sas_phy->phy_id].PhyFlags
+               sas_iounit_pg1->PhyData[phy->number].PhyFlags
                    &= ~MPI2_SASIOUNIT1_PHYFLAGS_PHY_DISABLE;
        else
-               sas_iounit_pg1->PhyData[mpt2sas_phy->phy_id].PhyFlags
+               sas_iounit_pg1->PhyData[phy->number].PhyFlags
                    |= MPI2_SASIOUNIT1_PHYFLAGS_PHY_DISABLE;
 
        mpt2sas_config_set_sas_iounit_pg1(ioc, &mpi_reply, sas_iounit_pg1, sz);
 
+       /* link reset */
+       if (enable)
+               _transport_phy_reset(phy, 0);
+
  out:
        kfree(sas_iounit_pg1);
        return rc;
@@ -1389,7 +1621,6 @@ static int
 _transport_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates)
 {
        struct MPT2SAS_ADAPTER *ioc = phy_to_ioc(phy);
-       struct _sas_phy *mpt2sas_phy;
        Mpi2SasIOUnitPage1_t *sas_iounit_pg1 = NULL;
        Mpi2SasPhyPage0_t phy_pg0;
        Mpi2ConfigReply_t mpi_reply;
@@ -1397,11 +1628,15 @@ _transport_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates)
        u16 sz;
        int i;
        int rc = 0;
+       unsigned long flags;
 
-       mpt2sas_phy = _transport_find_local_phy(ioc, phy);
-
-       if (!mpt2sas_phy) /* this phy not on sas_host */
+       spin_lock_irqsave(&ioc->sas_node_lock, flags);
+       if (_transport_sas_node_find_by_sas_address(ioc,
+           phy->identify.sas_address) == NULL) {
+               spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
                return -EINVAL;
+       }
+       spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
 
        if (!rates->minimum_linkrate)
                rates->minimum_linkrate = phy->minimum_linkrate;
@@ -1413,6 +1648,16 @@ _transport_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates)
        else if (rates->maximum_linkrate > phy->maximum_linkrate_hw)
                rates->maximum_linkrate = phy->maximum_linkrate_hw;
 
+       /* handle expander phys */
+       if (phy->identify.sas_address != ioc->sas_hba.sas_address) {
+               phy->minimum_linkrate = rates->minimum_linkrate;
+               phy->maximum_linkrate = rates->maximum_linkrate;
+               return _transport_expander_phy_control(ioc, phy,
+                   SMP_PHY_CONTROL_LINK_RESET);
+       }
+
+       /* handle hba phys */
+
        /* sas_iounit page 1 */
        sz = offsetof(Mpi2SasIOUnitPage1_t, PhyData) + (ioc->sas_hba.num_phys *
            sizeof(Mpi2SasIOUnit1PhyData_t));
@@ -1440,7 +1685,7 @@ _transport_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates)
        }
 
        for (i = 0; i < ioc->sas_hba.num_phys; i++) {
-               if (mpt2sas_phy->phy_id != i) {
+               if (phy->number != i) {
                        sas_iounit_pg1->PhyData[i].MaxMinLinkRate =
                            (ioc->sas_hba.phy[i].phy->minimum_linkrate +
                            (ioc->sas_hba.phy[i].phy->maximum_linkrate << 4));
@@ -1464,7 +1709,7 @@ _transport_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates)
 
        /* read phy page 0, then update the rates in the sas transport phy */
        if (!mpt2sas_config_get_phy_pg0(ioc, &mpi_reply, &phy_pg0,
-           mpt2sas_phy->phy_id)) {
+           phy->number)) {
                phy->minimum_linkrate = _transport_convert_phy_link_rate(
                    phy_pg0.ProgrammedLinkRate & MPI2_SAS_PRATE_MIN_RATE_MASK);
                phy->maximum_linkrate = _transport_convert_phy_link_rate(