Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76f2dc9 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.25: Enhancements to Debug infrastructure 



Enhancements to Debug infrastructure

- debugfs additions for new hardware.
- Correct stack overflow in lpfc_debugfs_dumpHBASlim_data()
- Correct warning on uninitialized reg_val in lpfc_idiag_drbacc_write()
- Separated the iDiag command for capturing mailbox commands for generic
  issue mailbox command entry point and for BSG multi-buffer handling.
- Added capturing dumping capabiliy of mailbox command and external buffer
  for the completion of the mailbox command so that the outcome can be
  examined.
- Changed all the iDiag command structure data array indexing introduced so
  far with properly defined macros.
- Added SLI4 device PCI BAR memory mapped register read/browse, write-by-
  value, set-bit, and clear-bit methods for both interface type 0 and
  interface type 2.
- Corrected warnings on mbxstatus being uninitialized in error paths in
  lpfc_bsg.c

Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 0a96e975

drivers/scsi/lpfc/lpfc.h

+4 −0
Original line number Diff line number Diff line
@@ -851,9 +851,13 @@ struct lpfc_hba { 
	/* iDiag debugfs sub-directory */

	struct dentry *idiag_root;

	struct dentry *idiag_pci_cfg;

	struct dentry *idiag_bar_acc;

	struct dentry *idiag_que_info;

	struct dentry *idiag_que_acc;

	struct dentry *idiag_drb_acc;

	struct dentry *idiag_ctl_acc;

	struct dentry *idiag_mbx_acc;

	struct dentry *idiag_ext_acc;

#endif



	/* Used for deferred freeing of ELS data buffers */

drivers/scsi/lpfc/lpfc_attr.c

+9 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ static ssize_t 
lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode)

{

	struct completion online_compl;

	struct pci_dev *pdev = phba->pcidev;

	uint32_t reg_val;

	int status = 0;

	int rc;
@@ -822,6 +823,14 @@ lpfc_sli4_pdev_reg_request(struct lpfc_hba *phba, uint32_t opcode) 
	     LPFC_SLI_INTF_IF_TYPE_2))

		return -EPERM;



	if (!pdev->is_physfn)

		return -EPERM;



	/* Disable SR-IOV virtual functions if enabled */

	if (phba->cfg_sriov_nr_virtfn) {

		pci_disable_sriov(pdev);

		phba->cfg_sriov_nr_virtfn = 0;

	}

	status = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);



	if (status != 0)

drivers/scsi/lpfc/lpfc_bsg.c

+35 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "lpfc.h"

#include "lpfc_logmsg.h"

#include "lpfc_crtn.h"

#include "lpfc_debugfs.h"

#include "lpfc_vport.h"

#include "lpfc_version.h"
@@ -1566,7 +1567,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job) 
	uint32_t link_flags;

	uint32_t timeout;

	LPFC_MBOXQ_t *pmboxq;

	int mbxstatus;

	int mbxstatus = MBX_SUCCESS;

	int i = 0;

	int rc = 0;
@@ -1740,7 +1741,7 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job) 
	uint32_t link_flags, timeout, req_len, alloc_len;

	struct lpfc_mbx_set_link_diag_loopback *link_diag_loopback;

	LPFC_MBOXQ_t *pmboxq = NULL;

	int mbxstatus, i, rc = 0;

	int mbxstatus = MBX_SUCCESS, i, rc = 0;



	/* no data to return just the return code */

	job->reply->reply_payload_rcv_len = 0;
@@ -3177,6 +3178,11 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) 
				"(x%x/x%x) complete bsg job done, bsize:%d\n",

				phba->mbox_ext_buf_ctx.nembType,

				phba->mbox_ext_buf_ctx.mboxType, size);

		lpfc_idiag_mbxacc_dump_bsg_mbox(phba,

					phba->mbox_ext_buf_ctx.nembType,

					phba->mbox_ext_buf_ctx.mboxType,

					dma_ebuf, sta_pos_addr,

					phba->mbox_ext_buf_ctx.mbx_dmabuf, 0);

	} else

		spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
@@ -3429,6 +3435,10 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job, 
				"ext_buf_cnt:%d\n", ext_buf_cnt);

	}



	/* before dma descriptor setup */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, nemb_tp, mbox_rd, dma_mbox,

					sta_pre_addr, dmabuf, ext_buf_cnt);



	/* reject non-embedded mailbox command with none external buffer */

	if (ext_buf_cnt == 0) {

		rc = -EPERM;
@@ -3476,6 +3486,10 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job, 
		}

	}



	/* after dma descriptor setup */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, nemb_tp, mbox_rd, dma_mbox,

					sta_pos_addr, dmabuf, ext_buf_cnt);



	/* construct base driver mbox command */

	pmb = &pmboxq->u.mb;

	pmbx = (uint8_t *)dmabuf->virt;
@@ -3590,12 +3604,20 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job, 
				"ext_buf_cnt:%d\n", ext_buf_cnt);

	}



	/* before dma buffer descriptor setup */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, nemb_tp, mbox_wr, dma_mbox,

					sta_pre_addr, dmabuf, ext_buf_cnt);



	if (ext_buf_cnt == 0)

		return -EPERM;



	/* for the first external buffer */

	lpfc_bsg_sli_cfg_dma_desc_setup(phba, nemb_tp, 0, dmabuf, dmabuf);



	/* after dma descriptor setup */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, nemb_tp, mbox_wr, dma_mbox,

					sta_pos_addr, dmabuf, ext_buf_cnt);



	/* log for looking forward */

	for (i = 1; i < ext_buf_cnt; i++) {

		if (nemb_tp == nemb_mse)
@@ -3844,6 +3866,12 @@ lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct fc_bsg_job *job) 
	dmabuf = list_first_entry(&phba->mbox_ext_buf_ctx.ext_dmabuf_list,

				  struct lpfc_dmabuf, list);

	list_del_init(&dmabuf->list);



	/* after dma buffer descriptor setup */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, phba->mbox_ext_buf_ctx.nembType,

					mbox_rd, dma_ebuf, sta_pos_addr,

					dmabuf, index);



	pbuf = (uint8_t *)dmabuf->virt;

	job->reply->reply_payload_rcv_len =

		sg_copy_from_buffer(job->reply_payload.sg_list,
@@ -3926,6 +3954,11 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job, 
					dmabuf);

	list_add_tail(&dmabuf->list, &phba->mbox_ext_buf_ctx.ext_dmabuf_list);



	/* after write dma buffer */

	lpfc_idiag_mbxacc_dump_bsg_mbox(phba, phba->mbox_ext_buf_ctx.nembType,

					mbox_wr, dma_ebuf, sta_pos_addr,

					dmabuf, index);



	if (phba->mbox_ext_buf_ctx.seqNum == phba->mbox_ext_buf_ctx.numBuf) {

		lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,

				"2968 SLI_CONFIG ext-buffer wr all %d "

drivers/scsi/lpfc/lpfc_crtn.h

+8 −0
Original line number Diff line number Diff line
@@ -371,6 +371,10 @@ extern struct lpfc_hbq_init *lpfc_hbq_defs[]; 
/* SLI4 if_type 2 externs. */

int lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *);

int lpfc_sli4_dealloc_resource_identifiers(struct lpfc_hba *);

int lpfc_sli4_get_allocated_extnts(struct lpfc_hba *, uint16_t,

				   uint16_t *, uint16_t *);

int lpfc_sli4_get_avail_extnt_rsrc(struct lpfc_hba *, uint16_t,

					  uint16_t *, uint16_t *);



/* externs BlockGuard */

extern char *_dump_buf_data;
@@ -437,6 +441,10 @@ void lpfc_cleanup_wt_rrqs(struct lpfc_hba *); 
void lpfc_cleanup_vports_rrqs(struct lpfc_vport *, struct lpfc_nodelist *);

struct lpfc_node_rrq *lpfc_get_active_rrq(struct lpfc_vport *, uint16_t,

	uint32_t);

void lpfc_idiag_mbxacc_dump_bsg_mbox(struct lpfc_hba *, enum nemb_type,

	enum mbox_type, enum dma_type, enum sta_type,

	struct lpfc_dmabuf *, uint32_t);

void lpfc_idiag_mbxacc_dump_issue_mbox(struct lpfc_hba *, MAILBOX_t *);

int lpfc_wr_object(struct lpfc_hba *, struct list_head *, uint32_t, uint32_t *);

/* functions to support SR-IOV */

int lpfc_sli_probe_sriov_nr_virtfn(struct lpfc_hba *, int);

drivers/scsi/lpfc/lpfc_debugfs.c

+1377 −79

File changed.

Preview size limit exceeded, changes collapsed.