[SCSI] lpfc 8.3.28: Miscellaneous fixes in sysfs and mgmt interfaces

Miscellaneous fixes in sysfs and mgmt interfaces:

- Added SLI4 INTF_TYPE and SLI_FAMILY as sub-field to the fwrev sysfs
  attribute (CR 124103)
- Added a sysfs attribute "protocol" to report SLI4 port link protocol
  type (CR 124102)
- Increment mix-and-match minor number by 1 for added "protocol" sysfs
  attribute. (124102)
- Move the link speed check into the generic sli3/sli4 code
  path. (CR 124185, 124122)
- Deleted check for inExtWLen (CR 122523)
- Add the word "offline" to message 2889 (CR 124385)
- Conditionalize the firmware upgrade/downgrade so that it is only
  attempted for SLI4 type 2 boards (CR 124406)
- Return an error if the mbox sysfs is called. (CR 124210)
- When port_state is less than LPFC_VPORT_READY, report
  FC_PORTSTATE_BYPASSED (CR 120018)
- Added driver support for performing persistent linkdown based on
  configure region 23 (CR 124534)
- Added restore state and error log when sysfs board_mode attribute
  access failed (CR 124158)
- Added support for SLI4_CONFIG non-embedded COMN_GET_CNTL_ADDL_ATTR
  pass-through (CR 124466)
- Rejecting un-supported multi-buffer mailbox commands (CR 124771)
- Byte swap the extended data request and response data for extended
  mailbox data (CR 125081)

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 122 insertions, 27 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 4d4104f38c98..1be13e757eda 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4566,7 +4566,7 @@ lpfc_sli4_read_fcoe_params(struct lpfc_hba *phba,
         phba->fc_map[2] = LPFC_FCOE_FCF_MAP2;
 
         mqe = &mboxq->u.mqe;
-        if (lpfc_dump_fcoe_param(phba, mboxq))
+        if (lpfc_sli4_dump_cfg_rg23(phba, mboxq))
                 return -ENOMEM;
 
         mp = (struct lpfc_dmabuf *) mboxq->context1;
@@ -6205,7 +6205,11 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
                 rc = 0;
                 phba->fcf.fcfi = bf_get(lpfc_reg_fcfi_fcfi,
                                         &mboxq->u.mqe.un.reg_fcfi);
+
+                /* Check if the port is configured to be disabled */
+                lpfc_sli_read_link_ste(phba);
         }
+
         /*
          * The port is ready, set the host's link state to LINK_DOWN
          * in preparation for link interrupts.
@@ -6213,7 +6217,19 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
         spin_lock_irq(&phba->hbalock);
         phba->link_state = LPFC_LINK_DOWN;
         spin_unlock_irq(&phba->hbalock);
-        if (phba->cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {
+        if (!(phba->hba_flag & HBA_FCOE_MODE) &&
+            (phba->hba_flag & LINK_DISABLED)) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,
+                                "3103 Adapter Link is disabled.\n");
+                lpfc_down_link(phba, mboxq);
+                rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);
+                if (rc != MBX_SUCCESS) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_SLI,
+                                        "3104 Adapter failed to issue "
+                                        "DOWN_LINK mbox cmd, rc:x%x\n", rc);
+                        goto out_unset_queue;
+                }
+        } else if (phba->cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {
                 rc = phba->lpfc_hba_init_link(phba, MBX_NOWAIT);
                 if (rc)
                         goto out_unset_queue;
@@ -15252,45 +15268,42 @@ lpfc_sli4_fcf_dead_failthrough(struct lpfc_hba *phba)
 }
 
 /**
- * lpfc_sli_read_link_ste - Read region 23 to decide if link is disabled.
+ * lpfc_sli_get_config_region23 - Get sli3 port region 23 data.
  * @phba: pointer to lpfc hba data structure.
+ * @rgn23_data: pointer to configure region 23 data.
  *
- * This function read region 23 and parse TLV for port status to
- * decide if the user disaled the port. If the TLV indicates the
- * port is disabled, the hba_flag is set accordingly.
+ * This function gets SLI3 port configure region 23 data through memory dump
+ * mailbox command. When it successfully retrieves data, the size of the data
+ * will be returned, otherwise, 0 will be returned.
  **/
-void
-lpfc_sli_read_link_ste(struct lpfc_hba *phba)
+static uint32_t
+lpfc_sli_get_config_region23(struct lpfc_hba *phba, char *rgn23_data)
 {
         LPFC_MBOXQ_t *pmb = NULL;
         MAILBOX_t *mb;
-        uint8_t *rgn23_data = NULL;
-        uint32_t offset = 0, data_size, sub_tlv_len, tlv_offset;
+        uint32_t offset = 0;
         int rc;
 
+        if (!rgn23_data)
+                return 0;
+
         pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
         if (!pmb) {
                 lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                        "2600 lpfc_sli_read_serdes_param failed to"
-                        " allocate mailbox memory\n");
-                goto out;
+                                "2600 failed to allocate mailbox memory\n");
+                return 0;
         }
         mb = &pmb->u.mb;
 
-        /* Get adapter Region 23 data */
-        rgn23_data = kzalloc(DMP_RGN23_SIZE, GFP_KERNEL);
-        if (!rgn23_data)
-                goto out;
-
         do {
                 lpfc_dump_mem(phba, pmb, offset, DMP_REGION_23);
                 rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
 
                 if (rc != MBX_SUCCESS) {
                         lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
-                                "2601 lpfc_sli_read_link_ste failed to"
-                                " read config region 23 rc 0x%x Status 0x%x\n",
-                                rc, mb->mbxStatus);
+                                        "2601 failed to read config "
+                                        "region 23, rc 0x%x Status 0x%x\n",
+                                        rc, mb->mbxStatus);
                         mb->un.varDmp.word_cnt = 0;
                 }
                 /*
@@ -15303,13 +15316,96 @@ lpfc_sli_read_link_ste(struct lpfc_hba *phba)
                         mb->un.varDmp.word_cnt = DMP_RGN23_SIZE - offset;
 
                 lpfc_sli_pcimem_bcopy(((uint8_t *)mb) + DMP_RSP_OFFSET,
-                        rgn23_data + offset,
-                        mb->un.varDmp.word_cnt);
+                                       rgn23_data + offset,
+                                       mb->un.varDmp.word_cnt);
                 offset += mb->un.varDmp.word_cnt;
         } while (mb->un.varDmp.word_cnt && offset < DMP_RGN23_SIZE);
 
-        data_size = offset;
-        offset = 0;
+        mempool_free(pmb, phba->mbox_mem_pool);
+        return offset;
+}
+
+/**
+ * lpfc_sli4_get_config_region23 - Get sli4 port region 23 data.
+ * @phba: pointer to lpfc hba data structure.
+ * @rgn23_data: pointer to configure region 23 data.
+ *
+ * This function gets SLI4 port configure region 23 data through memory dump
+ * mailbox command. When it successfully retrieves data, the size of the data
+ * will be returned, otherwise, 0 will be returned.
+ **/
+static uint32_t
+lpfc_sli4_get_config_region23(struct lpfc_hba *phba, char *rgn23_data)
+{
+        LPFC_MBOXQ_t *mboxq = NULL;
+        struct lpfc_dmabuf *mp = NULL;
+        struct lpfc_mqe *mqe;
+        uint32_t data_length = 0;
+        int rc;
+
+        if (!rgn23_data)
+                return 0;
+
+        mboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+        if (!mboxq) {
+                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                "3105 failed to allocate mailbox memory\n");
+                return 0;
+        }
+
+        if (lpfc_sli4_dump_cfg_rg23(phba, mboxq))
+                goto out;
+        mqe = &mboxq->u.mqe;
+        mp = (struct lpfc_dmabuf *) mboxq->context1;
+        rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_POLL);
+        if (rc)
+                goto out;
+        data_length = mqe->un.mb_words[5];
+        if (data_length == 0)
+                goto out;
+        if (data_length > DMP_RGN23_SIZE) {
+                data_length = 0;
+                goto out;
+        }
+        lpfc_sli_pcimem_bcopy((char *)mp->virt, rgn23_data, data_length);
+out:
+        mempool_free(mboxq, phba->mbox_mem_pool);
+        if (mp) {
+                lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                kfree(mp);
+        }
+        return data_length;
+}
+
+/**
+ * lpfc_sli_read_link_ste - Read region 23 to decide if link is disabled.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This function read region 23 and parse TLV for port status to
+ * decide if the user disaled the port. If the TLV indicates the
+ * port is disabled, the hba_flag is set accordingly.
+ **/
+void
+lpfc_sli_read_link_ste(struct lpfc_hba *phba)
+{
+        uint8_t *rgn23_data = NULL;
+        uint32_t if_type, data_size, sub_tlv_len, tlv_offset;
+        uint32_t offset = 0;
+
+        /* Get adapter Region 23 data */
+        rgn23_data = kzalloc(DMP_RGN23_SIZE, GFP_KERNEL);
+        if (!rgn23_data)
+                goto out;
+
+        if (phba->sli_rev < LPFC_SLI_REV4)
+                data_size = lpfc_sli_get_config_region23(phba, rgn23_data);
+        else {
+                if_type = bf_get(lpfc_sli_intf_if_type,
+                                 &phba->sli4_hba.sli_intf);
+                if (if_type == LPFC_SLI_INTF_IF_TYPE_0)
+                        goto out;
+                data_size = lpfc_sli4_get_config_region23(phba, rgn23_data);
+        }
 
         if (!data_size)
                 goto out;
@@ -15373,9 +15469,8 @@ lpfc_sli_read_link_ste(struct lpfc_hba *phba)
                         goto out;
                 }
         }
+
 out:
-        if (pmb)
-                mempool_free(pmb, phba->mbox_mem_pool);
         kfree(rgn23_data);
         return;
 }