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

Commit bd2cdd5e authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: NVME Initiator: Add debugfs support 



NVME Initiator: Add debugfs support

Adds debugfs snippets to cover the new NVME initiator functionality

Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 01649561

drivers/scsi/lpfc/lpfc.h

+55 −0
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ struct lpfc_vport { 
#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	struct dentry *debug_disc_trc;

	struct dentry *debug_nodelist;

	struct dentry *debug_nvmestat;

	struct dentry *debug_nvmektime;

	struct dentry *debug_cpucheck;

	struct dentry *vport_debugfs_root;

	struct lpfc_debugfs_trc *disc_trc;

	atomic_t disc_trc_cnt;
@@ -984,6 +987,12 @@ struct lpfc_hba { 
	struct dentry *debug_readApp;    /* inject read app_tag errors */

	struct dentry *debug_readRef;    /* inject read ref_tag errors */



	struct dentry *debug_nvmeio_trc;

	struct lpfc_debugfs_nvmeio_trc *nvmeio_trc;

	atomic_t nvmeio_trc_cnt;

	uint32_t nvmeio_trc_size;

	uint32_t nvmeio_trc_output_idx;



	/* T10 DIF error injection */

	uint32_t lpfc_injerr_wgrd_cnt;

	uint32_t lpfc_injerr_wapp_cnt;
@@ -1011,6 +1020,7 @@ struct lpfc_hba { 
	struct dentry *idiag_ext_acc;

	uint8_t lpfc_idiag_last_eq;

#endif

	uint16_t nvmeio_trc_on;



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

	struct list_head elsbuf;
@@ -1083,6 +1093,51 @@ struct lpfc_hba { 
#define LPFC_TRANSGRESSION_LOW_RXPOWER		0x4000

	uint16_t sfp_alarm;

	uint16_t sfp_warning;



#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

#define LPFC_CHECK_CPU_CNT    32

	uint32_t cpucheck_rcv_io[LPFC_CHECK_CPU_CNT];

	uint32_t cpucheck_xmt_io[LPFC_CHECK_CPU_CNT];

	uint32_t cpucheck_cmpl_io[LPFC_CHECK_CPU_CNT];

	uint32_t cpucheck_ccmpl_io[LPFC_CHECK_CPU_CNT];

	uint16_t cpucheck_on;

#define LPFC_CHECK_OFF		0

#define LPFC_CHECK_NVME_IO	1

	uint16_t ktime_on;

	uint64_t ktime_data_samples;

	uint64_t ktime_status_samples;

	uint64_t ktime_last_cmd;

	uint64_t ktime_seg1_total;

	uint64_t ktime_seg1_min;

	uint64_t ktime_seg1_max;

	uint64_t ktime_seg2_total;

	uint64_t ktime_seg2_min;

	uint64_t ktime_seg2_max;

	uint64_t ktime_seg3_total;

	uint64_t ktime_seg3_min;

	uint64_t ktime_seg3_max;

	uint64_t ktime_seg4_total;

	uint64_t ktime_seg4_min;

	uint64_t ktime_seg4_max;

	uint64_t ktime_seg5_total;

	uint64_t ktime_seg5_min;

	uint64_t ktime_seg5_max;

	uint64_t ktime_seg6_total;

	uint64_t ktime_seg6_min;

	uint64_t ktime_seg6_max;

	uint64_t ktime_seg7_total;

	uint64_t ktime_seg7_min;

	uint64_t ktime_seg7_max;

	uint64_t ktime_seg8_total;

	uint64_t ktime_seg8_min;

	uint64_t ktime_seg8_max;

	uint64_t ktime_seg9_total;

	uint64_t ktime_seg9_min;

	uint64_t ktime_seg9_max;

	uint64_t ktime_seg10_total;

	uint64_t ktime_seg10_min;

	uint64_t ktime_seg10_max;

#endif

};



static inline struct Scsi_Host *

drivers/scsi/lpfc/lpfc_crtn.h

+4 −2
Original line number Diff line number Diff line
@@ -396,6 +396,8 @@ extern void lpfc_debugfs_disc_trc(struct lpfc_vport *, int, char *, uint32_t, 
				  uint32_t, uint32_t);

extern void lpfc_debugfs_slow_ring_trc(struct lpfc_hba *, char *, uint32_t,

				       uint32_t, uint32_t);

extern void lpfc_debugfs_nvme_trc(struct lpfc_hba *phba, char *fmt,

				uint16_t data1, uint16_t data2, uint32_t data3);

extern struct lpfc_hbq_init *lpfc_hbq_defs[];



/* SLI4 if_type 2 externs. */

drivers/scsi/lpfc/lpfc_ct.c

+24 −3
Original line number Diff line number Diff line
@@ -465,6 +465,10 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) 
		ndlp = lpfc_setup_disc_node(vport, Did);



		if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {

			lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,

				"Parse GID_FTrsp: did:x%x flg:x%x x%x",

				Did, ndlp->nlp_flag, vport->fc_flag);



			/* By default, the driver expects to support FCP FC4 */

			if (fc4_type == FC_TYPE_FCP)

				ndlp->nlp_fc4_type |= NLP_FC4_FCP;
@@ -478,16 +482,24 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) 
					 ndlp->nlp_flag, ndlp->nlp_fc4_type,

					 vport->fc_flag,

					 vport->fc_rscn_id_cnt);

		} else

		} else {

			lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,

				"Skip1 GID_FTrsp: did:x%x flg:x%x cnt:%d",

				Did, vport->fc_flag, vport->fc_rscn_id_cnt);



			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "0239 Skip x%06x NameServer Rsp "

					 "Data: x%x x%x\n", Did,

					 vport->fc_flag,

					 vport->fc_rscn_id_cnt);



		}

	} else {

		if (!(vport->fc_flag & FC_RSCN_MODE) ||

		    lpfc_rscn_payload_check(vport, Did)) {

			lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,

				"Query GID_FTrsp: did:x%x flg:x%x cnt:%d",

				Did, vport->fc_flag, vport->fc_rscn_id_cnt);



			/*

			 * This NPortID was previously a FCP target,

			 * Don't even bother to send GFF_ID.
@@ -509,7 +521,11 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) 
				else

					lpfc_setup_disc_node(vport, Did);

			}

		} else

		} else {

			lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,

				"Skip2 GID_FTrsp: did:x%x flg:x%x cnt:%d",

				Did, vport->fc_flag, vport->fc_rscn_id_cnt);



			lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

					 "0245 Skip x%06x NameServer Rsp "

					 "Data: x%x x%x\n", Did,
@@ -517,6 +533,7 @@ lpfc_prep_node_fc4type(struct lpfc_vport *vport, uint32_t Did, uint8_t fc4_type) 
					 vport->fc_rscn_id_cnt);

		}

	}

}



static int

lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint8_t fc4_type,
@@ -892,6 +909,10 @@ lpfc_cmpl_ct_cmd_gft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	did = ((struct lpfc_sli_ct_request *)inp->virt)->un.gft.PortId;

	did = be32_to_cpu(did);



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,

			      "GFT_ID cmpl: status:x%x/x%x did:x%x",

			      irsp->ulpStatus, irsp->un.ulpWord[4], did);



	if (irsp->ulpStatus == IOSTAT_SUCCESS) {

		/* Good status, continue checking */

		CTrsp = (struct lpfc_sli_ct_request *)outp->virt;

drivers/scsi/lpfc/lpfc_debugfs.c

+1041 −119

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_debugfs.h

+21 −0
Original line number Diff line number Diff line
@@ -50,6 +50,14 @@ enum { 
	DUMP_NVMELS,

};



/* nvmestat output buffer size */

#define LPFC_NVMESTAT_SIZE 8192

#define LPFC_NVMEKTIME_SIZE 8192

#define LPFC_CPUCHECK_SIZE 8192

#define LPFC_NVMEIO_TRC_SIZE 8192



#define LPFC_DEBUG_OUT_LINE_SZ	80



/*

 * For SLI4 iDiag debugfs diagnostics tool

 */
@@ -196,6 +204,12 @@ enum { 
#define SIZE_U16 sizeof(uint16_t)

#define SIZE_U32 sizeof(uint32_t)



#define lpfc_nvmeio_data(phba, fmt, arg...) \

	{ \

	if (phba->nvmeio_trc_on) \

		lpfc_debugfs_nvme_trc(phba, fmt, ##arg); \

	}



struct lpfc_debug {

	char *i_private;

	char op;
@@ -214,6 +228,13 @@ struct lpfc_debugfs_trc { 
	unsigned long jif;

};



struct lpfc_debugfs_nvmeio_trc {

	char *fmt;

	uint16_t data1;

	uint16_t data2;

	uint32_t data3;

};



struct lpfc_idiag_offset {

	uint32_t last_rd;

};