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

[SCSI] lpfc 8.3.21: Debugfs additions 



- Add the driver debugfs framework for supporting debugfs read and write
  operations, and iDiag command structure.
- Add read and write to SLI4 device PCI config space registers.
- Add the driver support of debugfs PCI config space register bits set/clear
  methods to the provided bitmask.
- Add iDiag driver support for SLI4 device queue diagnostic.

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 <James.Bottomley@suse.de>
parent ab56dc2e

drivers/scsi/lpfc/lpfc.h

+5 −1
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *

 * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -799,6 +799,10 @@ struct lpfc_hba { 
	struct dentry *debug_slow_ring_trc;

	struct lpfc_debugfs_trc *slow_ring_trc;

	atomic_t slow_ring_trc_cnt;

	/* iDiag debugfs sub-directory */

	struct dentry *idiag_root;

	struct dentry *idiag_pci_cfg;

	struct dentry *idiag_que_info;

#endif



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

drivers/scsi/lpfc/lpfc_debugfs.c

+902 −52

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_debugfs.h

+59 −1
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2007 Emulex.  All rights reserved.                *

 * Copyright (C) 2007-2011 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *

 * www.emulex.com                                                  *

 *                                                                 *
@@ -22,6 +22,44 @@ 
#define _H_LPFC_DEBUG_FS



#ifdef CONFIG_SCSI_LPFC_DEBUG_FS



/* size of output line, for discovery_trace and slow_ring_trace */

#define LPFC_DEBUG_TRC_ENTRY_SIZE 100



/* nodelist output buffer size */

#define LPFC_NODELIST_SIZE 8192

#define LPFC_NODELIST_ENTRY_SIZE 120



/* dumpHBASlim output buffer size */

#define LPFC_DUMPHBASLIM_SIZE 4096



/* dumpHostSlim output buffer size */

#define LPFC_DUMPHOSTSLIM_SIZE 4096



/* hbqinfo output buffer size */

#define LPFC_HBQINFO_SIZE 8192



/* rdPciConf output buffer size */

#define LPFC_PCI_CFG_SIZE 4096

#define LPFC_PCI_CFG_RD_BUF_SIZE (LPFC_PCI_CFG_SIZE/2)

#define LPFC_PCI_CFG_RD_SIZE (LPFC_PCI_CFG_SIZE/4)



/* queue info output buffer size */

#define LPFC_QUE_INFO_GET_BUF_SIZE 2048



#define SIZE_U8  sizeof(uint8_t)

#define SIZE_U16 sizeof(uint16_t)

#define SIZE_U32 sizeof(uint32_t)



struct lpfc_debug {

	char *i_private;

	char op;

#define LPFC_IDIAG_OP_RD 1

#define LPFC_IDIAG_OP_WR 2

	char *buffer;

	int  len;

};



struct lpfc_debugfs_trc {

	char *fmt;

	uint32_t data1;
@@ -30,6 +68,26 @@ struct lpfc_debugfs_trc { 
	uint32_t seq_cnt;

	unsigned long jif;

};



struct lpfc_idiag_offset {

	uint32_t last_rd;

};



#define LPFC_IDIAG_CMD_DATA_SIZE 4

struct lpfc_idiag_cmd {

	uint32_t opcode;

#define LPFC_IDIAG_CMD_PCICFG_RD 0x00000001

#define LPFC_IDIAG_CMD_PCICFG_WR 0x00000002

#define LPFC_IDIAG_CMD_PCICFG_ST 0x00000003

#define LPFC_IDIAG_CMD_PCICFG_CL 0x00000004

	uint32_t data[LPFC_IDIAG_CMD_DATA_SIZE];

};



struct lpfc_idiag {

	uint32_t active;

	struct lpfc_idiag_cmd cmd;

	struct lpfc_idiag_offset offset;

};

#endif



/* Mask for discovery_trace */

drivers/scsi/lpfc/lpfc_sli.c

+5 −0
Original line number Diff line number Diff line
@@ -10471,6 +10471,7 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq, 
	cq->type = type;

	cq->subtype = subtype;

	cq->queue_id = bf_get(lpfc_mbx_cq_create_q_id, &cq_create->u.response);

	cq->assoc_qid = eq->queue_id;

	cq->host_index = 0;

	cq->hba_index = 0;
@@ -10665,6 +10666,7 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq, 
		goto out;

	}

	mq->type = LPFC_MQ;

	mq->assoc_qid = cq->queue_id;

	mq->subtype = subtype;

	mq->host_index = 0;

	mq->hba_index = 0;
@@ -10752,6 +10754,7 @@ lpfc_wq_create(struct lpfc_hba *phba, struct lpfc_queue *wq, 
		goto out;

	}

	wq->type = LPFC_WQ;

	wq->assoc_qid = cq->queue_id;

	wq->subtype = subtype;

	wq->host_index = 0;

	wq->hba_index = 0;
@@ -10869,6 +10872,7 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq, 
		goto out;

	}

	hrq->type = LPFC_HRQ;

	hrq->assoc_qid = cq->queue_id;

	hrq->subtype = subtype;

	hrq->host_index = 0;

	hrq->hba_index = 0;
@@ -10929,6 +10933,7 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq, 
		goto out;

	}

	drq->type = LPFC_DRQ;

	drq->assoc_qid = cq->queue_id;

	drq->subtype = subtype;

	drq->host_index = 0;

	drq->hba_index = 0;

drivers/scsi/lpfc/lpfc_sli4.h

+1 −1
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ struct lpfc_queue { 
	uint32_t entry_count;	/* Number of entries to support on the queue */

	uint32_t entry_size;	/* Size of each queue entry. */

	uint32_t queue_id;	/* Queue ID assigned by the hardware */

	uint32_t assoc_qid;     /* Queue ID associated with, for CQ/WQ/MQ */

	struct list_head page_list;

	uint32_t page_count;	/* Number of pages allocated for this queue */



	uint32_t host_index;	/* The host's index for putting or getting */

	uint32_t hba_index;	/* The last known hba index for get or put */

	union sli4_qe qe[1];	/* array to index entries (must be last) */