[SCSI] lpfc 8.3.11: Driver management improvements via BSG

- Add BSG support for PCI loopback testing.
- Add BSG support for extended mailbox commands.

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

1 files changed, 44 insertions, 6 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index dd879a7d04a3..2f7018821531 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4891,9 +4891,34 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
         mb->mbxOwner = OWN_CHIP;
 
         if (psli->sli_flag & LPFC_SLI_ACTIVE) {
-                /* First copy command data to host SLIM area */
+                /* Populate mbox extension offset word. */
+                if (pmbox->in_ext_byte_len || pmbox->out_ext_byte_len) {
+                        *(((uint32_t *)mb) + pmbox->mbox_offset_word)
+                                = (uint8_t *)phba->mbox_ext
+                                  - (uint8_t *)phba->mbox;
+                }
+
+                /* Copy the mailbox extension data */
+                if (pmbox->in_ext_byte_len && pmbox->context2) {
+                        lpfc_sli_pcimem_bcopy(pmbox->context2,
+                                (uint8_t *)phba->mbox_ext,
+                                pmbox->in_ext_byte_len);
+                }
+                /* Copy command data to host SLIM area */
                 lpfc_sli_pcimem_bcopy(mb, phba->mbox, MAILBOX_CMD_SIZE);
         } else {
+                /* Populate mbox extension offset word. */
+                if (pmbox->in_ext_byte_len || pmbox->out_ext_byte_len)
+                        *(((uint32_t *)mb) + pmbox->mbox_offset_word)
+                                = MAILBOX_HBA_EXT_OFFSET;
+
+                /* Copy the mailbox extension data */
+                if (pmbox->in_ext_byte_len && pmbox->context2) {
+                        lpfc_memcpy_to_slim(phba->MBslimaddr +
+                                MAILBOX_HBA_EXT_OFFSET,
+                                pmbox->context2, pmbox->in_ext_byte_len);
+
+                }
                 if (mb->mbxCommand == MBX_CONFIG_PORT) {
                         /* copy command data into host mbox for cmpl */
                         lpfc_sli_pcimem_bcopy(mb, phba->mbox, MAILBOX_CMD_SIZE);
@@ -5003,15 +5028,22 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
                 if (psli->sli_flag & LPFC_SLI_ACTIVE) {
                         /* copy results back to user */
                         lpfc_sli_pcimem_bcopy(phba->mbox, mb, MAILBOX_CMD_SIZE);
+                        /* Copy the mailbox extension data */
+                        if (pmbox->out_ext_byte_len && pmbox->context2) {
+                                lpfc_sli_pcimem_bcopy(phba->mbox_ext,
+                                                      pmbox->context2,
+                                                      pmbox->out_ext_byte_len);
+                        }
                 } else {
                         /* First copy command data */
                         lpfc_memcpy_from_slim(mb, phba->MBslimaddr,
                                                         MAILBOX_CMD_SIZE);
-                        if ((mb->mbxCommand == MBX_DUMP_MEMORY) &&
-                                pmbox->context2) {
-                                lpfc_memcpy_from_slim((void *)pmbox->context2,
-                                      phba->MBslimaddr + DMP_RSP_OFFSET,
-                                                      mb->un.varDmp.word_cnt);
+                        /* Copy the mailbox extension data */
+                        if (pmbox->out_ext_byte_len && pmbox->context2) {
+                                lpfc_memcpy_from_slim(pmbox->context2,
+                                        phba->MBslimaddr +
+                                        MAILBOX_HBA_EXT_OFFSET,
+                                        pmbox->out_ext_byte_len);
                         }
                 }
 
@@ -8133,6 +8165,12 @@ lpfc_sli_sp_intr_handler(int irq, void *dev_id)
                                 if (pmb->mbox_cmpl) {
                                         lpfc_sli_pcimem_bcopy(mbox, pmbox,
                                                         MAILBOX_CMD_SIZE);
+                                        if (pmb->out_ext_byte_len &&
+                                                pmb->context2)
+                                                lpfc_sli_pcimem_bcopy(
+                                                phba->mbox_ext,
+                                                pmb->context2,
+                                                pmb->out_ext_byte_len);
                                 }
                                 if (pmb->mbox_flag & LPFC_MBX_IMED_UNREG) {
                                         pmb->mbox_flag &= ~LPFC_MBX_IMED_UNREG;