lpfc 8.3.10: Added round robin FCF failover
Subsystems (2)
PATCH 6/7 lpfc 8.3.10: Added round robin FCF failover
- Added round robin FCF failover on initial or FCF rediscovery FLOGI failure.
Signed-off-by James Smart <[email protected]>
---
lpfc_crtn.h | 4 lpfc_els.c | 91 +++++++++- lpfc_hbadisc.c | 488 +++++++++++++++++++++++++++++++++++++++++++++------------ lpfc_init.c | 123 +++++++++++--- lpfc_logmsg.h | 1 lpfc_mbox.c | 8 lpfc_sli.c | 218 +++++++++++++++++++++++-- lpfc_sli4.h | 33 ++- 8 files changed, 803 insertions(+), 163 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +4 -0
@@ -63,6 +63,7 @@ void lpfc_linkdown_port(struct lpfc_vporvoid lpfc_port_link_failure (struct lpfc_vport *);void lpfc_mbx_cmpl_read_la (struct lpfc_hba *,LPFC_MBOXQ_t *);void lpfc_init_vpi_cmpl (struct lpfc_hba *,LPFC_MBOXQ_t *); +void lpfc_cancel_all_vport_retry_delay_timer (struct lpfc_hba *);void lpfc_retry_pport_discovery (struct lpfc_hba *);void lpfc_mbx_cmpl_reg_login (struct lpfc_hba *,LPFC_MBOXQ_t *);
@@ -222,6 +223,9 @@ void lpfc_unregister_unused_fcf(struct lint lpfc_sli4_redisc_fcf_table (struct lpfc_hba *);void lpfc_fcf_redisc_wait_start_timer (struct lpfc_hba *);void lpfc_sli4_fcf_dead_failthrough (struct lpfc_hba *); +uint16_t lpfc_sli4_fcf_rr_next_index_get (struct lpfc_hba *); +int lpfc_sli4_fcf_rr_index_set (struct lpfc_hba *,uint16_t ); +void lpfc_sli4_fcf_rr_index_clear (struct lpfc_hba *,uint16_t );int lpfc_mem_alloc (struct lpfc_hba *,int align);void lpfc_mem_free (struct lpfc_hba *);
drivers/scsi/lpfc/lpfc_els.c +82 -9
136 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_hbadisc.c +389 -99
665 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_init.c +95 -28
235 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_logmsg.h +1 -0
@@ -35,6 +35,7 @@#define LOG_VPORT 0x00004000/* NPIV events */ #define LOF_SECURITY 0x00008000/* Security events */ #define LOG_EVENT 0x00010000/* CT,TEMP,DUMP, logging */ +#define LOG_FIP 0x00020000/* FIP events */ #define LOG_ALL_MSG 0xffffffff/* LOG all messages */ #define lpfc_printf_vlog(vport, level, mask, fmt, arg...) \
drivers/scsi/lpfc/lpfc_mbox.c +4 -4
@@ -1748,7 +1748,7 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hb }/** -* lpfc_sli4_mbx_read_fcf_record - Allocate and construct read fcf mbox cmd +* lpfc_sli4_mbx_read_fcf_rec - Allocate and construct read fcf mbox cmd * @phba: pointer to lpfc hba data structure. * @fcf_index: index to fcf table. *
@@ -1759,9 +1759,9 @@ lpfc_sli4_mbox_opcode_get(struct lpfc_hb* NULL. **/ int -lpfc_sli4_mbx_read_fcf_record (struct lpfc_hba *phba, -struct lpfcMboxq *mboxq, -uint16_t fcf_index) +lpfc_sli4_mbx_read_fcf_rec (struct lpfc_hba *phba, +struct lpfcMboxq *mboxq, +uint16_t fcf_index) {void *virt_addr;dma_addr_t phys_addr;
drivers/scsi/lpfc/lpfc_sli4.h +24 -9
@@ -153,17 +153,27 @@ struct lpfc_fcf {#define FCF_REGISTERED 0x02/* FCF registered with FW */ #define FCF_SCAN_DONE 0x04/* FCF table scan done */ #define FCF_IN_USE 0x08/* Atleast one discovery completed */ -#define FCF_DEAD_FOVER 0x10/* FCF DEAD triggered fast FCF failover */ -#define FCF_CVL_FOVER 0x20/* CVL triggered fast FCF failover */ -#define FCF_REDISC_PEND 0x40/* FCF rediscovery pending */ -#define FCF_REDISC_EVT 0x80/* FCF rediscovery event to worker thread */ -#define FCF_REDISC_FOV 0x100/* Post FCF rediscovery fast failover */ +#define FCF_INIT_DISC 0x10/* Initial FCF discovery */ +#define FCF_DEAD_DISC 0x20/* FCF DEAD fast FCF failover discovery */ +#define FCF_ACVL_DISC 0x40/* All CVL fast FCF failover discovery */ +#define FCF_DISCOVERY (FCF_INIT_DISC | FCF_DEAD_DISC | FCF_ACVL_DISC) +#define FCF_REDISC_PEND 0x80/* FCF rediscovery pending */ +#define FCF_REDISC_EVT 0x100/* FCF rediscovery event to worker thread */ +#define FCF_REDISC_FOV 0x200/* Post FCF rediscovery fast failover */ uint32_t addr_mode; +uint16_t fcf_rr_init_indx;struct lpfc_fcf_rec current_rec;struct lpfc_fcf_rec failover_rec;struct timer_list redisc_wait; +unsigned long *fcf_rr_bmask;/* Eligible FCF indexes for RR failover */ }; +/* +* Maximum FCF table index, it is for driver internal book keeping, it +* just needs to be no less than the supported HBA's FCF table size. +*/ +#define LPFC_SLI4_FCF_TBL_INDX_MAX 32 +#define LPFC_REGION23_SIGNATURE "RG23"#define LPFC_REGION23_VERSION 1#define LPFC_REGION23_LAST_REC 0xff
@@ -472,8 +482,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 ); +int lpfc_sli4_mbx_read_fcf_rec (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,
@@ -532,8 +542,13 @@ int lpfc_sli4_init_vpi(struct lpfc_hba *uint32_t lpfc_sli4_cq_release (struct lpfc_queue *,bool );uint32_t lpfc_sli4_eq_release (struct lpfc_queue *,bool );void lpfc_sli4_fcfi_unreg (struct lpfc_hba *,uint16_t ); -int lpfc_sli4_read_fcf_record (struct lpfc_hba *,uint16_t ); -void lpfc_mbx_cmpl_read_fcf_record (struct lpfc_hba *,LPFC_MBOXQ_t *); +int lpfc_sli4_fcf_scan_read_fcf_rec (struct lpfc_hba *,uint16_t ); +int lpfc_sli4_fcf_rr_read_fcf_rec (struct lpfc_hba *,uint16_t ); +int lpfc_sli4_read_fcf_rec (struct lpfc_hba *,uint16_t ); +void lpfc_mbx_cmpl_fcf_scan_read_fcf_rec (struct lpfc_hba *,LPFC_MBOXQ_t *); +void lpfc_mbx_cmpl_fcf_rr_read_fcf_rec (struct lpfc_hba *,LPFC_MBOXQ_t *); +void lpfc_mbx_cmpl_read_fcf_rec (struct lpfc_hba *,LPFC_MBOXQ_t *); +int lpfc_sli4_unregister_fcf (struct lpfc_hba *);int lpfc_sli4_post_status_check (struct lpfc_hba *);uint8_t lpfc_sli4_mbox_opcode_get (struct lpfc_hba *,struct lpfcMboxq *);
drivers/scsi/lpfc/lpfc_sli.c +204 -14
289 lines not on this page · raw message