PATCH 02/20] lpfc 8.3.31: Correct handling of SLI4-port XRI resource-provisioning profile change
Subsystems (2)
Correct handling of SLI4-port XRI resource-provisioning profile change
Signed-off-by Alex Iannicelli <[email protected]>
Signed-off-by James Smart <[email protected]>
---
lpfc_crtn.h | 7 lpfc_hw4.h | 10 lpfc_init.c | 367 +++++++++++++++++++++--------------- lpfc_scsi.c | 298 +++++++++++++++++------------ lpfc_sli.c | 607 +++++++++++++++++++----------------------------------------- lpfc_sli4.h | 9 6 files changed, 595 insertions(+), 703 deletions(-)
drivers/scsi/lpfc/lpfc_crtn.h +4 -3
@@ -460,6 +460,7 @@ int lpfc_hba_init_link_fc_topology(strucint lpfc_issue_reg_vfi (struct lpfc_vport *);int lpfc_issue_unreg_vfi (struct lpfc_vport *);int lpfc_selective_reset (struct lpfc_hba *); -int lpfc_sli4_read_config (struct lpfc_hba *phba); -int lpfc_scsi_buf_update (struct lpfc_hba *phba); -void lpfc_sli4_node_prep (struct lpfc_hba *phba); +int lpfc_sli4_read_config (struct lpfc_hba *); +void lpfc_sli4_node_prep (struct lpfc_hba *); +int lpfc_sli4_xri_sgl_update (struct lpfc_hba *); +void lpfc_free_sgl_list (struct lpfc_hba *,struct list_head *);
drivers/scsi/lpfc/lpfc_hw4.h +3 -7
@@ -228,19 +228,15 @@ struct lpfc_sli4_flags {#define lpfc_idx_rsrc_rdy_MASK 0x00000001#define lpfc_idx_rsrc_rdy_WORD word0#define LPFC_IDX_RSRC_RDY 1 -#define lpfc_xri_rsrc_rdy_SHIFT 1 -#define lpfc_xri_rsrc_rdy_MASK 0x00000001 -#define lpfc_xri_rsrc_rdy_WORD word0 -#define LPFC_XRI_RSRC_RDY 1 -#define lpfc_rpi_rsrc_rdy_SHIFT 2 +#define lpfc_rpi_rsrc_rdy_SHIFT 1#define lpfc_rpi_rsrc_rdy_MASK 0x00000001#define lpfc_rpi_rsrc_rdy_WORD word0#define LPFC_RPI_RSRC_RDY 1 -#define lpfc_vpi_rsrc_rdy_SHIFT 3 +#define lpfc_vpi_rsrc_rdy_SHIFT 2#define lpfc_vpi_rsrc_rdy_MASK 0x00000001#define lpfc_vpi_rsrc_rdy_WORD word0#define LPFC_VPI_RSRC_RDY 1 -#define lpfc_vfi_rsrc_rdy_SHIFT 4 +#define lpfc_vfi_rsrc_rdy_SHIFT 3#define lpfc_vfi_rsrc_rdy_MASK 0x00000001#define lpfc_vfi_rsrc_rdy_WORD word0#define LPFC_VFI_RSRC_RDY 1
drivers/scsi/lpfc/lpfc_init.c +218 -149
461 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_scsi.c +173 -125
374 lines not on this page · raw message
drivers/scsi/lpfc/lpfc_sli4.h +1 -8
@@ -493,14 +493,12 @@ struct lpfc_sli4_hba {uint16_t next_rpi;uint16_t scsi_xri_max;uint16_t scsi_xri_cnt; +uint16_t els_xri_cnt;uint16_t scsi_xri_start;struct list_head lpfc_free_sgl_list;struct list_head lpfc_sgl_list; -struct lpfc_sglq **lpfc_els_sgl_array;struct list_head lpfc_abts_els_sgl_list; -struct lpfc_scsi_buf **lpfc_scsi_psb_array;struct list_head lpfc_abts_scsi_buf_list; -uint32_t total_sglq_bufs;struct lpfc_sglq **lpfc_sglq_active_list;struct list_head lpfc_rpi_hdr_list;unsigned long *rpi_bmask;
@@ -509,7 +507,6 @@ struct lpfc_sli4_hba {struct list_head lpfc_rpi_blk_list;unsigned long *xri_bmask;uint16_t *xri_ids; -uint16_t xri_count;struct list_head lpfc_xri_blk_list;unsigned long *vfi_bmask;uint16_t *vfi_ids;
@@ -614,11 +611,7 @@ int lpfc_sli4_post_sgl(struct lpfc_hba *int lpfc_sli4_repost_scsi_sgl_list (struct lpfc_hba *);uint16_t lpfc_sli4_next_xritag (struct lpfc_hba *);int lpfc_sli4_post_async_mbox (struct lpfc_hba *); -int lpfc_sli4_post_els_sgl_list (struct lpfc_hba *phba); -int lpfc_sli4_post_els_sgl_list_ext (struct lpfc_hba *phba);int lpfc_sli4_post_scsi_sgl_block (struct lpfc_hba *,struct list_head *,int ); -int lpfc_sli4_post_scsi_sgl_blk_ext (struct lpfc_hba *,struct list_head *, -int );struct lpfc_cq_event *__lpfc_sli4_cq_event_alloc (struct lpfc_hba *);struct lpfc_cq_event *lpfc_sli4_cq_event_alloc (struct lpfc_hba *);void __lpfc_sli4_cq_event_release (struct lpfc_hba *,struct lpfc_cq_event *);
drivers/scsi/lpfc/lpfc_sli.c +196 -411
773 lines not on this page · raw message