lpfc 8.3.9: Discovery changes to the lpfc driver.
Subsystems (2)
PATCH 2/6 lpfc 8.3.9: Discovery changes to the lpfc driver.
- Add init_vpi mailbox command before re-registering VPI.
- Add Fast FCF failover support.
Signed-off-by James Smart <[email protected]>
---
lpfc_crtn.h | 8 lpfc_els.c | 16 + lpfc_hbadisc.c | 672 +++++++++++++++++++++++++++++++++++++-------------------- lpfc_hw4.h | 16 + lpfc_init.c | 164 +++++++++++++ lpfc_mbox.c | 70 +++++ lpfc_sli.c | 128 +++++++--- lpfc_sli4.h | 36 ++- 8 files changed, 821 insertions(+), 289 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +8 -0
@@ -78,6 +78,7 @@ void lpfc_set_disctmo(struct lpfc_vportint lpfc_can_disctmo (struct lpfc_vport *);int lpfc_unreg_rpi (struct lpfc_vport *,struct lpfc_nodelist *);void lpfc_unreg_all_rpis (struct lpfc_vport *); +void lpfc_unreg_hba_rpis (struct lpfc_hba *);void lpfc_unreg_default_rpis (struct lpfc_vport *);void lpfc_issue_reg_vpi (struct lpfc_hba *,struct lpfc_vport *);
@@ -202,6 +203,7 @@ void lpfc_reg_fcfi(struct lpfc_hba *, stvoid lpfc_unreg_fcfi (struct lpfcMboxq *,uint16_t );void lpfc_resume_rpi (struct lpfcMboxq *,struct lpfc_nodelist *);int lpfc_check_pending_fcoe_event (struct lpfc_hba *,uint8_t ); +void lpfc_issue_init_vpi (struct lpfc_vport *);void lpfc_config_hbq (struct lpfc_hba *,uint32_t ,struct lpfc_hbq_init *,uint32_t ,LPFC_MBOXQ_t *);
@@ -211,7 +213,11 @@ struct hbq_dmabuf *lpfc_sli4_rb_alloc(stvoid 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_fcf (struct lpfc_hba *); +void lpfc_unregister_fcf_rescan (struct lpfc_hba *);void lpfc_unregister_unused_fcf (struct lpfc_hba *); +int lpfc_sli4_redisc_fcf_table (struct lpfc_hba *); +void lpfc_fcf_redisc_wait_start_timer (struct lpfc_hba *);int lpfc_mem_alloc (struct lpfc_hba *,int align);void lpfc_mem_free (struct lpfc_hba *);
@@ -370,6 +376,8 @@ void lpfc_free_fast_evt(struct lpfc_hbavoid lpfc_create_static_vport (struct lpfc_hba *);void lpfc_stop_hba_timers (struct lpfc_hba *);void lpfc_stop_port (struct lpfc_hba *); +void __lpfc_sli4_stop_fcf_redisc_wait_timer (struct lpfc_hba *); +void lpfc_sli4_stop_fcf_redisc_wait_timer (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);
drivers/scsi/lpfc/lpfc_els.c +14 -2
@@ -589,6 +589,15 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_v vport->fc_flag |=FC_VPORT_NEEDS_REG_VPI ;spin_unlock_irq (shost->host_lock); } +/* +* If VPI is unreged, driver need to do INIT_VPI +* before re-registering +*/ +if (phba->sli_rev ==LPFC_SLI_REV4 ) { +spin_lock_irq (shost->host_lock); + vport->fc_flag |=FC_VPORT_NEEDS_INIT_VPI ; +spin_unlock_irq (shost->host_lock); + } }if (phba->sli_rev <LPFC_SLI_REV4 ) {
@@ -606,7 +615,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vlpfc_start_fdiscs (phba);lpfc_do_scr_ns_plogi (phba, vport); }else if (vport->fc_flag &FC_VFI_REGISTERED ) -lpfc_register_new_vport (phba, vport, ndlp); +lpfc_issue_init_vpi (vport);else lpfc_issue_reg_vfi (vport); }
@@ -6210,10 +6219,13 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phblpfc_mbx_unreg_vpi (vport);spin_lock_irq (shost->host_lock); vport->fc_flag |=FC_VPORT_NEEDS_REG_VPI ; + vport->fc_flag |=FC_VPORT_NEEDS_INIT_VPI ;spin_unlock_irq (shost->host_lock); } -if (vport->fc_flag &FC_VPORT_NEEDS_REG_VPI ) +if (vport->fc_flag &FC_VPORT_NEEDS_INIT_VPI ) +lpfc_issue_init_vpi (vport); +else if (vport->fc_flag &FC_VPORT_NEEDS_REG_VPI )lpfc_register_new_vport (phba, vport, ndlp);else lpfc_do_scr_ns_plogi (phba, vport);
drivers/scsi/lpfc/lpfc_hbadisc.c +446 -226
915 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hw4.h +16 -0
@@ -797,6 +797,7 @@ struct mbox_header {#define LPFC_MBOX_OPCODE_FCOE_ADD_FCF 0x09#define LPFC_MBOX_OPCODE_FCOE_DELETE_FCF 0x0A#define LPFC_MBOX_OPCODE_FCOE_POST_HDR_TEMPLATE 0x0B +#define LPFC_MBOX_OPCODE_FCOE_REDISCOVER_FCF 0x10/* Mailbox command structures */ struct eq_context {
@@ -1297,6 +1298,19 @@ struct lpfc_mbx_del_fcf_tbl_entry {#define lpfc_mbx_del_fcf_tbl_index_WORD word10 }; +struct lpfc_mbx_redisc_fcf_tbl { +struct mbox_header header; +uint32_t word10; +#define lpfc_mbx_redisc_fcf_count_SHIFT 0 +#define lpfc_mbx_redisc_fcf_count_MASK 0x0000FFFF +#define lpfc_mbx_redisc_fcf_count_WORD word10 +uint32_t resvd; +uint32_t word12; +#define lpfc_mbx_redisc_fcf_index_SHIFT 0 +#define lpfc_mbx_redisc_fcf_index_MASK 0x0000FFFF +#define lpfc_mbx_redisc_fcf_index_WORD word12 +}; +struct lpfc_mbx_query_fw_cfg {struct mbox_header header;uint32_t config_number;
@@ -1859,6 +1873,7 @@ struct lpfc_mqe {struct lpfc_mbx_read_fcf_tbl read_fcf_tbl;struct lpfc_mbx_add_fcf_tbl_entry add_fcf_entry;struct lpfc_mbx_del_fcf_tbl_entry del_fcf_entry; +struct lpfc_mbx_redisc_fcf_tbl redisc_fcf_tbl;struct lpfc_mbx_reg_fcfi reg_fcfi;struct lpfc_mbx_unreg_fcfi unreg_fcfi;struct lpfc_mbx_mq_create mq_create;
@@ -1975,6 +1990,7 @@ struct lpfc_acqe_fcoe {#define LPFC_FCOE_EVENT_TYPE_FCF_TABLE_FULL 0x2#define LPFC_FCOE_EVENT_TYPE_FCF_DEAD 0x3#define LPFC_FCOE_EVENT_TYPE_CVL 0x4 +#define LPFC_FCOE_EVENT_TYPE_FCF_PARAM_MOD 0x5uint32_t event_tag;uint32_t trailer; };
drivers/scsi/lpfc/lpfc_init.c +154 -10
229 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_mbox.c +65 -5
84 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli4.h +27 -9
@@ -22,6 +22,10 @@#define LPFC_RELEASE_NOTIFICATION_INTERVAL 32#define LPFC_GET_QE_REL_INT 32#define LPFC_RPI_LOW_WATER_MARK 10 + +/* Amount of time in seconds for waiting FCF rediscovery to complete */ +#define LPFC_FCF_REDISCOVER_WAIT_TMO 2000/* msec */ +/* Number of SGL entries can be posted in a 4KB nonembedded mbox command */ #define LPFC_NEMBED_MBOX_SGL_CNT 254
@@ -129,22 +133,33 @@ struct lpfc_sli4_link {uint16_t logical_speed; }; -struct lpfc_fcf { -uint8_t fabric_name[8 ]; -uint8_t switch_name[8 ]; +struct lpfc_fcf_rec { +uint8_t fabric_name[8 ]; +uint8_t switch_name[8 ];uint8_t mac_addr[6 ];uint16_t fcf_indx; +uint32_t priority; +uint16_t vlan_id; +uint32_t addr_mode; +uint32_t flag; +#define BOOT_ENABLE 0x01 +#define RECORD_VALID 0x02 +}; + +struct lpfc_fcf {uint16_t fcfi;uint32_t fcf_flag;#define FCF_AVAILABLE 0x01/* FCF available for discovery */ #define FCF_REGISTERED 0x02/* FCF registered with FW */ -#define FCF_DISCOVERED 0x04/* FCF discovery started */ -#define FCF_BOOT_ENABLE 0x08/* Boot bios use this FCF */ -#define FCF_IN_USE 0x10/* Atleast one discovery completed */ -#define FCF_VALID_VLAN 0x20/* Use the vlan id specified */ -uint32_t priority; +#define FCF_SCAN_DONE 0x04/* FCF table scan done */ +#define FCF_IN_USE 0x08/* Atleast one discovery completed */ +#define FCF_REDISC_PEND 0x10/* FCF rediscovery pending */ +#define FCF_REDISC_EVT 0x20/* FCF rediscovery event to worker thread */ +#define FCF_REDISC_FOV 0x40/* Post FCF rediscovery fast failover */ uint32_t addr_mode; -uint16_t vlan_id; +struct lpfc_fcf_rec current_rec; +struct lpfc_fcf_rec failover_rec; +struct timer_list redisc_wait; };#define LPFC_REGION23_SIGNATURE "RG23"
@@ -407,6 +422,8 @@ void lpfc_sli4_mbox_cmd_free(struct lpfcvoid lpfc_sli4_mbx_sge_set (struct lpfcMboxq *,uint32_t ,dma_addr_t ,uint32_t );void lpfc_sli4_mbx_sge_get (struct lpfcMboxq *,uint32_t ,struct lpfc_mbx_sge *); +int lpfc_sli4_mbx_read_fcf_record (struct lpfc_hba *,struct lpfcMboxq *, +uint16_t );void lpfc_sli4_hba_reset (struct lpfc_hba *); struct lpfc_queue *lpfc_sli4_queue_alloc(struct lpfc_hba *, uint32_t,
@@ -449,6 +466,7 @@ int lpfc_sli4_alloc_rpi(struct lpfc_hbavoid lpfc_sli4_free_rpi (struct lpfc_hba *,int );void lpfc_sli4_remove_rpis (struct lpfc_hba *);void lpfc_sli4_async_event_proc (struct lpfc_hba *); +void lpfc_sli4_fcf_redisc_event_proc (struct lpfc_hba *);int lpfc_sli4_resume_rpi (struct lpfc_nodelist *);void lpfc_sli4_fcp_xri_abort_event_proc (struct lpfc_hba *);void lpfc_sli4_els_xri_abort_event_proc (struct lpfc_hba *);
drivers/scsi/lpfc/lpfc_sli.c +91 -37
152 lines not on this page · raw message