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

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

[SCSI] lpfc 8.3.2 : Addition of SLI4 Interface - Base Support 



Adds new hardware and interface definitions.

Adds new interface routines - utilizing the reorganized layout of the
driver. Adds SLI-4 specific functions for attachment, initialization,
teardown, etc.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 3772a991

drivers/scsi/lpfc/lpfc.h

+44 −5
Original line number Diff line number Diff line
@@ -105,9 +105,11 @@ struct lpfc_dma_pool { 
};



struct hbq_dmabuf {

	struct lpfc_dmabuf hbuf;

	struct lpfc_dmabuf dbuf;

	uint32_t size;

	uint32_t tag;

	struct lpfc_rcqe rcqe;

};



/* Priority bit.  Set value to exceed low water mark in lpfc_mem. */
@@ -141,7 +143,10 @@ typedef struct lpfc_vpd { 
	} rev;

	struct {

#ifdef __BIG_ENDIAN_BITFIELD

		uint32_t rsvd2  :24;  /* Reserved                             */

		uint32_t rsvd3  :19;  /* Reserved                             */

		uint32_t cdss	: 1;  /* Configure Data Security SLI          */

		uint32_t rsvd2	: 3;  /* Reserved                             */

		uint32_t cbg	: 1;  /* Configure BlockGuard                 */

		uint32_t cmv	: 1;  /* Configure Max VPIs                   */

		uint32_t ccrp   : 1;  /* Config Command Ring Polling          */

		uint32_t csah   : 1;  /* Configure Synchronous Abort Handling */
@@ -159,7 +164,10 @@ typedef struct lpfc_vpd { 
		uint32_t csah   : 1;  /* Configure Synchronous Abort Handling */

		uint32_t ccrp   : 1;  /* Config Command Ring Polling          */

		uint32_t cmv	: 1;  /* Configure Max VPIs                   */

		uint32_t rsvd2  :24;  /* Reserved                             */

		uint32_t cbg	: 1;  /* Configure BlockGuard                 */

		uint32_t rsvd2	: 3;  /* Reserved                             */

		uint32_t cdss	: 1;  /* Configure Data Security SLI          */

		uint32_t rsvd3  :19;  /* Reserved                             */

#endif

	} sli3Feat;

} lpfc_vpd_t;
@@ -280,6 +288,9 @@ struct lpfc_vport { 
	enum discovery_state port_state;



	uint16_t vpi;

	uint16_t vfi;

	uint8_t vfi_state;

#define LPFC_VFI_REGISTERED	0x1



	uint32_t fc_flag;	/* FC flags */

/* Several of these flags are HBA centric and should be moved to
@@ -392,6 +403,9 @@ struct lpfc_vport { 
#endif

	uint8_t stat_data_enabled;

	uint8_t stat_data_blocked;

	struct list_head rcv_buffer_list;

	uint32_t vport_flag;

#define STATIC_VPORT	1

};



struct hbq_s {
@@ -494,6 +508,7 @@ struct lpfc_hba { 
#define LPFC_SLI3_CRP_ENABLED		0x08

#define LPFC_SLI3_INB_ENABLED		0x10

#define LPFC_SLI3_BG_ENABLED		0x20

#define LPFC_SLI3_DSS_ENABLED		0x40

	uint32_t iocb_cmd_size;

	uint32_t iocb_rsp_size;
@@ -507,8 +522,13 @@ struct lpfc_hba { 


	uint32_t hba_flag;	/* hba generic flags */

#define HBA_ERATT_HANDLED	0x1 /* This flag is set when eratt handled */



#define DEFER_ERATT		0x4 /* Deferred error attention in progress */

#define DEFER_ERATT		0x2 /* Deferred error attention in progress */

#define HBA_FCOE_SUPPORT	0x4 /* HBA function supports FCOE */

#define HBA_RECEIVE_BUFFER	0x8 /* Rcv buffer posted to worker thread */

#define HBA_POST_RECEIVE_BUFFER 0x10 /* Rcv buffers need to be posted */

#define FCP_XRI_ABORT_EVENT	0x20

#define ELS_XRI_ABORT_EVENT	0x40

#define ASYNC_EVENT		0x80

	struct lpfc_dmabuf slim2p;



	MAILBOX_t *mbox;
@@ -567,6 +587,9 @@ struct lpfc_hba { 
	uint32_t cfg_poll;

	uint32_t cfg_poll_tmo;

	uint32_t cfg_use_msi;

	uint32_t cfg_fcp_imax;

	uint32_t cfg_fcp_wq_count;

	uint32_t cfg_fcp_eq_count;

	uint32_t cfg_sg_seg_cnt;

	uint32_t cfg_prot_sg_seg_cnt;

	uint32_t cfg_sg_dma_buf_size;
@@ -576,6 +599,8 @@ struct lpfc_hba { 
	uint32_t cfg_enable_hba_reset;

	uint32_t cfg_enable_hba_heartbeat;

	uint32_t cfg_enable_bg;

	uint32_t cfg_enable_fip;

	uint32_t cfg_log_verbose;



	lpfc_vpd_t vpd;		/* vital product data */
@@ -659,7 +684,8 @@ struct lpfc_hba { 
	/* pci_mem_pools */

	struct pci_pool *lpfc_scsi_dma_buf_pool;

	struct pci_pool *lpfc_mbuf_pool;

	struct pci_pool *lpfc_hbq_pool;

	struct pci_pool *lpfc_hrb_pool;	/* header receive buffer pool */

	struct pci_pool *lpfc_drb_pool; /* data receive buffer pool */

	struct lpfc_dma_pool lpfc_mbuf_safety_pool;



	mempool_t *mbox_mem_pool;
@@ -675,6 +701,14 @@ struct lpfc_hba { 
	struct lpfc_vport *pport;	/* physical lpfc_vport pointer */

	uint16_t max_vpi;		/* Maximum virtual nports */

#define LPFC_MAX_VPI 0xFFFF		/* Max number of VPI supported */

	uint16_t max_vports;            /*

					 * For IOV HBAs max_vpi can change

					 * after a reset. max_vports is max

					 * number of vports present. This can

					 * be greater than max_vpi.

					 */

	uint16_t vpi_base;

	uint16_t vfi_base;

	unsigned long *vpi_bmask;	/* vpi allocation table */



	/* Data structure used by fabric iocb scheduler */
@@ -733,6 +767,11 @@ struct lpfc_hba { 
/* Maximum number of events that can be outstanding at any time*/

#define LPFC_MAX_EVT_COUNT 512

	atomic_t fast_event_count;

	struct lpfc_fcf fcf;

	uint8_t fc_map[3];

	uint8_t valid_vlan;

	uint16_t vlan_id;

	struct list_head fcf_conn_rec_list;

};



static inline struct Scsi_Host *

drivers/scsi/lpfc/lpfc_attr.c

+67 −16
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ 
#include <scsi/scsi_tcq.h>

#include <scsi/scsi_transport_fc.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"

#include "lpfc_sli.h"

#include "lpfc_sli4.h"

#include "lpfc_nl.h"

#include "lpfc_disc.h"

#include "lpfc_scsi.h"
@@ -828,6 +830,24 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
		return 0;

	}



	if (phba->sli_rev == LPFC_SLI_REV4) {

		rd_config = &pmboxq->u.mqe.un.rd_config;

		if (mrpi)

			*mrpi = bf_get(lpfc_mbx_rd_conf_rpi_count, rd_config);

		if (arpi)

			*arpi = bf_get(lpfc_mbx_rd_conf_rpi_count, rd_config) -

					phba->sli4_hba.max_cfg_param.rpi_used;

		if (mxri)

			*mxri = bf_get(lpfc_mbx_rd_conf_xri_count, rd_config);

		if (axri)

			*axri = bf_get(lpfc_mbx_rd_conf_xri_count, rd_config) -

					phba->sli4_hba.max_cfg_param.xri_used;

		if (mvpi)

			*mvpi = bf_get(lpfc_mbx_rd_conf_vpi_count, rd_config);

		if (avpi)

			*avpi = bf_get(lpfc_mbx_rd_conf_vpi_count, rd_config) -

					phba->sli4_hba.max_cfg_param.vpi_used;

	} else {

		if (mrpi)

			*mrpi = pmb->un.varRdConfig.max_rpi;

		if (arpi)
@@ -840,6 +860,7 @@ lpfc_get_hba_info(struct lpfc_hba *phba, 
			*mvpi = pmb->un.varRdConfig.max_vpi;

		if (avpi)

			*avpi = pmb->un.varRdConfig.avail_vpi;

	}



	mempool_free(pmboxq, phba->mbox_mem_pool);

	return 1;
@@ -2844,14 +2865,38 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255, 
/*

# lpfc_use_msi: Use MSI (Message Signaled Interrupts) in systems that

#		support this feature

#       0  = MSI disabled

#       0  = MSI disabled (default)

#       1  = MSI enabled

#       2  = MSI-X enabled (default)

# Value range is [0,2]. Default value is 2.

#       2  = MSI-X enabled

# Value range is [0,2]. Default value is 0.

*/

LPFC_ATTR_R(use_msi, 2, 0, 2, "Use Message Signaled Interrupts (1) or "

LPFC_ATTR_R(use_msi, 0, 0, 2, "Use Message Signaled Interrupts (1) or "

	    "MSI-X (2), if possible");



/*

# lpfc_fcp_imax: Set the maximum number of fast-path FCP interrupts per second

#

# Value range is [636,651042]. Default value is 10000.

*/

LPFC_ATTR_R(fcp_imax, LPFC_FP_DEF_IMAX, LPFC_MIM_IMAX, LPFC_DMULT_CONST,

	    "Set the maximum number of fast-path FCP interrupts per second");



/*

# lpfc_fcp_wq_count: Set the number of fast-path FCP work queues

#

# Value range is [1,31]. Default value is 4.

*/

LPFC_ATTR_R(fcp_wq_count, LPFC_FP_WQN_DEF, LPFC_FP_WQN_MIN, LPFC_FP_WQN_MAX,

	    "Set the number of fast-path FCP work queues, if possible");



/*

# lpfc_fcp_eq_count: Set the number of fast-path FCP event queues

#

# Value range is [1,7]. Default value is 1.

*/

LPFC_ATTR_R(fcp_eq_count, LPFC_FP_EQN_DEF, LPFC_FP_EQN_MIN, LPFC_FP_EQN_MAX,

	    "Set the number of fast-path FCP event queues, if possible");



/*

# lpfc_enable_hba_reset: Allow or prevent HBA resets to the hardware.

#       0  = HBA resets disabled
@@ -2969,6 +3014,9 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_poll,

	&dev_attr_lpfc_poll_tmo,

	&dev_attr_lpfc_use_msi,

	&dev_attr_lpfc_fcp_imax,

	&dev_attr_lpfc_fcp_wq_count,

	&dev_attr_lpfc_fcp_eq_count,

	&dev_attr_lpfc_enable_bg,

	&dev_attr_lpfc_soft_wwnn,

	&dev_attr_lpfc_soft_wwpn,
@@ -4105,6 +4153,9 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	lpfc_poll_tmo_init(phba, lpfc_poll_tmo);

	lpfc_enable_npiv_init(phba, lpfc_enable_npiv);

	lpfc_use_msi_init(phba, lpfc_use_msi);

	lpfc_fcp_imax_init(phba, lpfc_fcp_imax);

	lpfc_fcp_wq_count_init(phba, lpfc_fcp_wq_count);

	lpfc_fcp_eq_count_init(phba, lpfc_fcp_eq_count);

	lpfc_enable_hba_reset_init(phba, lpfc_enable_hba_reset);

	lpfc_enable_hba_heartbeat_init(phba, lpfc_enable_hba_heartbeat);

	lpfc_enable_bg_init(phba, lpfc_enable_bg);

drivers/scsi/lpfc/lpfc_crtn.h

+48 −11
Original line number Diff line number Diff line
@@ -35,17 +35,19 @@ int lpfc_config_msi(struct lpfc_hba *, LPFC_MBOXQ_t *); 
int lpfc_read_sparam(struct lpfc_hba *, LPFC_MBOXQ_t *, int);

void lpfc_read_config(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_read_lnk_stat(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_reg_login(struct lpfc_hba *, uint16_t, uint32_t, uint8_t *,

int lpfc_reg_rpi(struct lpfc_hba *, uint16_t, uint32_t, uint8_t *,

		 LPFC_MBOXQ_t *, uint32_t);

void lpfc_unreg_login(struct lpfc_hba *, uint16_t, uint32_t, LPFC_MBOXQ_t *);

void lpfc_unreg_did(struct lpfc_hba *, uint16_t, uint32_t, LPFC_MBOXQ_t *);

void lpfc_reg_vpi(struct lpfc_hba *, uint16_t, uint32_t, LPFC_MBOXQ_t *);

void lpfc_reg_vpi(struct lpfc_vport *, LPFC_MBOXQ_t *);

void lpfc_unreg_vpi(struct lpfc_hba *, uint16_t, LPFC_MBOXQ_t *);

void lpfc_init_link(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t, uint32_t);

void lpfc_request_features(struct lpfc_hba *, struct lpfcMboxq *);



struct lpfc_vport *lpfc_find_vport_by_did(struct lpfc_hba *, uint32_t);

void lpfc_cleanup_rpis(struct lpfc_vport *, int);

int lpfc_linkdown(struct lpfc_hba *);

void lpfc_linkdown_port(struct lpfc_vport *);

void lpfc_port_link_failure(struct lpfc_vport *);

void lpfc_mbx_cmpl_read_la(struct lpfc_hba *, LPFC_MBOXQ_t *);
@@ -54,6 +56,7 @@ void lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *, LPFC_MBOXQ_t *); 
void lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_enqueue_node(struct lpfc_vport *, struct lpfc_nodelist *);

void lpfc_dequeue_node(struct lpfc_vport *, struct lpfc_nodelist *);

struct lpfc_nodelist *lpfc_enable_node(struct lpfc_vport *,
@@ -149,15 +152,19 @@ int lpfc_online(struct lpfc_hba *); 
void lpfc_unblock_mgmt_io(struct lpfc_hba *);

void lpfc_offline_prep(struct lpfc_hba *);

void lpfc_offline(struct lpfc_hba *);

void lpfc_reset_hba(struct lpfc_hba *);



int lpfc_sli_setup(struct lpfc_hba *);

int lpfc_sli_queue_setup(struct lpfc_hba *);



void lpfc_handle_eratt(struct lpfc_hba *);

void lpfc_handle_latt(struct lpfc_hba *);

irqreturn_t lpfc_intr_handler(int, void *);

irqreturn_t lpfc_sp_intr_handler(int, void *);

irqreturn_t lpfc_fp_intr_handler(int, void *);

irqreturn_t lpfc_sli_intr_handler(int, void *);

irqreturn_t lpfc_sli_sp_intr_handler(int, void *);

irqreturn_t lpfc_sli_fp_intr_handler(int, void *);

irqreturn_t lpfc_sli4_intr_handler(int, void *);

irqreturn_t lpfc_sli4_sp_intr_handler(int, void *);

irqreturn_t lpfc_sli4_fp_intr_handler(int, void *);



void lpfc_read_rev(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_config_ring(struct lpfc_hba *, int, LPFC_MBOXQ_t *);
@@ -165,16 +172,32 @@ void lpfc_config_port(struct lpfc_hba *, LPFC_MBOXQ_t *); 
void lpfc_kill_board(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbox_put(struct lpfc_hba *, LPFC_MBOXQ_t *);

LPFC_MBOXQ_t *lpfc_mbox_get(struct lpfc_hba *);

void __lpfc_mbox_cmpl_put(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_mbox_cmpl_put(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_mbox_cmd_check(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_mbox_dev_check(struct lpfc_hba *);

int lpfc_mbox_tmo_val(struct lpfc_hba *, int);

void lpfc_init_vfi(struct lpfcMboxq *, struct lpfc_vport *);

void lpfc_reg_vfi(struct lpfcMboxq *, struct lpfc_vport *, dma_addr_t);

void lpfc_init_vpi(struct lpfcMboxq *, uint16_t);

void lpfc_unreg_vfi(struct lpfcMboxq *, uint16_t);

void lpfc_reg_fcfi(struct lpfc_hba *, struct lpfcMboxq *);

void lpfc_unreg_fcfi(struct lpfcMboxq *, uint16_t);

void lpfc_resume_rpi(struct lpfcMboxq *, struct lpfc_nodelist *);



void lpfc_config_hbq(struct lpfc_hba *, uint32_t, struct lpfc_hbq_init *,

	uint32_t , LPFC_MBOXQ_t *);

struct hbq_dmabuf *lpfc_els_hbq_alloc(struct lpfc_hba *);

void lpfc_els_hbq_free(struct lpfc_hba *, struct hbq_dmabuf *);

struct hbq_dmabuf *lpfc_sli4_rb_alloc(struct lpfc_hba *);

void lpfc_sli4_rb_free(struct lpfc_hba *, struct hbq_dmabuf *);

void lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *, struct fcf_record *,

			uint16_t);

void lpfc_unregister_unused_fcf(struct lpfc_hba *);



int lpfc_mem_alloc(struct lpfc_hba *);

int lpfc_mem_alloc(struct lpfc_hba *, int align);

void lpfc_mem_free(struct lpfc_hba *);

void lpfc_mem_free_all(struct lpfc_hba *);

void lpfc_stop_vport_timers(struct lpfc_vport *);



void lpfc_poll_timeout(unsigned long ptr);
@@ -198,12 +221,13 @@ int lpfc_sli_host_down(struct lpfc_vport *); 
int lpfc_sli_hba_down(struct lpfc_hba *);

int lpfc_sli_issue_mbox(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);

int lpfc_sli_handle_mb_event(struct lpfc_hba *);

int lpfc_sli_flush_mbox_queue(struct lpfc_hba *);

void lpfc_sli_mbox_sys_shutdown(struct lpfc_hba *);

int lpfc_sli_check_eratt(struct lpfc_hba *);

int lpfc_sli_handle_slow_ring_event(struct lpfc_hba *,

void lpfc_sli_handle_slow_ring_event(struct lpfc_hba *,

				    struct lpfc_sli_ring *, uint32_t);

int lpfc_sli4_handle_received_buffer(struct lpfc_hba *);

void lpfc_sli_def_mbox_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_sli_issue_iocb(struct lpfc_hba *, struct lpfc_sli_ring *,

int lpfc_sli_issue_iocb(struct lpfc_hba *, uint32_t,

			struct lpfc_iocbq *, uint32_t);

void lpfc_sli_pcimem_bcopy(void *, void *, uint32_t);

void lpfc_sli_abort_iocb_ring(struct lpfc_hba *, struct lpfc_sli_ring *);
@@ -237,7 +261,7 @@ struct lpfc_nodelist *lpfc_findnode_wwpn(struct lpfc_vport *, 


int lpfc_sli_issue_mbox_wait(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);



int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, struct lpfc_sli_ring *,

int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, uint32_t,

			     struct lpfc_iocbq *, struct lpfc_iocbq *,

			     uint32_t);

void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,
@@ -254,6 +278,12 @@ void lpfc_in_buf_free(struct lpfc_hba *, struct lpfc_dmabuf *); 
const char* lpfc_info(struct Scsi_Host *);

int lpfc_scan_finished(struct Scsi_Host *, unsigned long);



int lpfc_init_api_table_setup(struct lpfc_hba *, uint8_t);

int lpfc_sli_api_table_setup(struct lpfc_hba *, uint8_t);

int lpfc_scsi_api_table_setup(struct lpfc_hba *, uint8_t);

int lpfc_mbox_api_table_setup(struct lpfc_hba *, uint8_t);

int lpfc_api_table_setup(struct lpfc_hba *, uint8_t);



void lpfc_get_cfgparam(struct lpfc_hba *);

void lpfc_get_vport_cfgparam(struct lpfc_vport *);

int lpfc_alloc_sysfs_attr(struct lpfc_vport *);
@@ -314,8 +344,15 @@ lpfc_send_els_failure_event(struct lpfc_hba *, struct lpfc_iocbq *, 
				struct lpfc_iocbq *);

struct lpfc_fast_path_event *lpfc_alloc_fast_evt(struct lpfc_hba *);

void lpfc_free_fast_evt(struct lpfc_hba *, struct lpfc_fast_path_event *);

void lpfc_create_static_vport(struct lpfc_hba *);

void lpfc_stop_hba_timers(struct lpfc_hba *);

void lpfc_stop_port(struct lpfc_hba *);

void lpfc_parse_fcoe_conf(struct lpfc_hba *, uint8_t *, uint32_t);

int lpfc_parse_vpd(struct lpfc_hba *, uint8_t *, int);

void lpfc_start_fdiscs(struct lpfc_hba *phba);



#define ScsiResult(host_code, scsi_code) (((host_code) << 16) | scsi_code)

#define HBA_EVENT_RSCN                   5

#define HBA_EVENT_LINK_UP                2

#define HBA_EVENT_LINK_DOWN              3

drivers/scsi/lpfc/lpfc_ct.c

+2 −0
Original line number Diff line number Diff line
@@ -32,8 +32,10 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_fc.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"

#include "lpfc_sli.h"

#include "lpfc_sli4.h"

#include "lpfc_nl.h"

#include "lpfc_disc.h"

#include "lpfc_scsi.h"

drivers/scsi/lpfc/lpfc_debugfs.c

+2 −0
Original line number Diff line number Diff line
@@ -33,8 +33,10 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_fc.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"

#include "lpfc_sli.h"

#include "lpfc_sli4.h"

#include "lpfc_nl.h"

#include "lpfc_disc.h"

#include "lpfc_scsi.h"