Merge tag 'iommu-updates-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_sli4.h

diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index a966cde..26f19c9 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -549,6 +549,14 @@ struct lpfc_pc_sli4_params {
        uint32_t hdr_pp_align;
        uint32_t sgl_pages_max;
        uint32_t sgl_pp_align;
+       uint32_t mib_size;
+       uint16_t mi_ver;
+#define LPFC_MIB1_SUPPORT      1
+#define LPFC_MIB2_SUPPORT      2
+#define LPFC_MIB3_SUPPORT      3
+       uint16_t mi_value;
+#define LPFC_DFLT_MIB_VAL      2
+       uint8_t mib_bde_cnt;
        uint8_t cqv;
        uint8_t mqv;
        uint8_t wqv;
@@ -920,8 +928,9 @@ struct lpfc_sli4_hba {
        struct list_head sp_queue_event;
        struct list_head sp_cqe_event_pool;
        struct list_head sp_asynce_work_queue;
-       struct list_head sp_fcp_xri_aborted_work_queue;
+       spinlock_t asynce_list_lock; /* protect sp_asynce_work_queue list */
        struct list_head sp_els_xri_aborted_work_queue;
+       spinlock_t els_xri_abrt_list_lock; /* protect els_xri_aborted list */
        struct list_head sp_unsol_work_queue;
        struct lpfc_sli4_link link_state;
        struct lpfc_sli4_lnk_info lnk_info;
@@ -1103,8 +1112,7 @@ 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 (*)(struct lpfc_hba *, LPFC_MBOXQ_t *), void *);
-void lpfc_sli4_fcp_xri_abort_event_proc(struct lpfc_hba *);
-void lpfc_sli4_els_xri_abort_event_proc(struct lpfc_hba *);
+void lpfc_sli4_els_xri_abort_event_proc(struct lpfc_hba *phba);
 void lpfc_sli4_nvme_xri_aborted(struct lpfc_hba *phba,
                                struct sli4_wcqe_xri_aborted *axri,
                                struct lpfc_io_buf *lpfc_ncmd);