1 files changed, 38 insertions, 20 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index c4483feb8b71..c7217d579e0f 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -137,9 +137,11 @@ struct lpfc_sli4_link {
         uint8_t speed;
         uint8_t duplex;
         uint8_t status;
-        uint8_t physical;
+        uint8_t type;
+        uint8_t number;
         uint8_t fault;
         uint16_t logical_speed;
+        uint16_t topology;
 };
 
 struct lpfc_fcf_rec {
@@ -367,23 +369,39 @@ struct lpfc_sli4_hba {
                                              PCI BAR1, control registers */
         void __iomem *drbl_regs_memmap_p; /* Kernel memory mapped address for
                                              PCI BAR2, doorbell registers */
-        /* BAR0 PCI config space register memory map */
-        void __iomem *UERRLOregaddr; /* Address to UERR_STATUS_LO register */
-        void __iomem *UERRHIregaddr; /* Address to UERR_STATUS_HI register */
-        void __iomem *UEMASKLOregaddr; /* Address to UE_MASK_LO register */
-        void __iomem *UEMASKHIregaddr; /* Address to UE_MASK_HI register */
-        void __iomem *SLIINTFregaddr; /* Address to SLI_INTF register */
-        /* BAR1 FCoE function CSR register memory map */
-        void __iomem *STAregaddr;    /* Address to HST_STATE register */
-        void __iomem *ISRregaddr;    /* Address to HST_ISR register */
-        void __iomem *IMRregaddr;    /* Address to HST_IMR register */
-        void __iomem *ISCRregaddr;   /* Address to HST_ISCR register */
-        /* BAR2 VF-0 doorbell register memory map */
-        void __iomem *RQDBregaddr;   /* Address to RQ_DOORBELL register */
-        void __iomem *WQDBregaddr;   /* Address to WQ_DOORBELL register */
-        void __iomem *EQCQDBregaddr; /* Address to EQCQ_DOORBELL register */
-        void __iomem *MQDBregaddr;   /* Address to MQ_DOORBELL register */
-        void __iomem *BMBXregaddr;   /* Address to BootStrap MBX register */
+        union {
+                struct {
+                        /* IF Type 0, BAR 0 PCI cfg space reg mem map */
+                        void __iomem *UERRLOregaddr;
+                        void __iomem *UERRHIregaddr;
+                        void __iomem *UEMASKLOregaddr;
+                        void __iomem *UEMASKHIregaddr;
+                } if_type0;
+                struct {
+                        /* IF Type 2, BAR 0 PCI cfg space reg mem map. */
+                        void __iomem *STATUSregaddr;
+                        void __iomem *CTRLregaddr;
+                        void __iomem *ERR1regaddr;
+                        void __iomem *ERR2regaddr;
+                } if_type2;
+        } u;
+
+        /* IF type 0, BAR1 and if type 2, Bar 0 CSR register memory map */
+        void __iomem *PSMPHRregaddr;
+
+        /* Well-known SLI INTF register memory map. */
+        void __iomem *SLIINTFregaddr;
+
+        /* IF type 0, BAR 1 function CSR register memory map */
+        void __iomem *ISRregaddr;       /* HST_ISR register */
+        void __iomem *IMRregaddr;       /* HST_IMR register */
+        void __iomem *ISCRregaddr;      /* HST_ISCR register */
+        /* IF type 0, BAR 0 and if type 2, BAR 0 doorbell register memory map */
+        void __iomem *RQDBregaddr;      /* RQ_DOORBELL register */
+        void __iomem *WQDBregaddr;      /* WQ_DOORBELL register */
+        void __iomem *EQCQDBregaddr;    /* EQCQ_DOORBELL register */
+        void __iomem *MQDBregaddr;      /* MQ_DOORBELL register */
+        void __iomem *BMBXregaddr;      /* BootStrap MBX register */
 
         uint32_t ue_mask_lo;
         uint32_t ue_mask_hi;
@@ -466,6 +484,7 @@ struct lpfc_sglq {
         struct list_head clist;
         enum lpfc_sge_type buff_type; /* is this a scsi sgl */
         enum lpfc_sgl_state state;
+        struct lpfc_nodelist *ndlp; /* ndlp associated with IO */
         uint16_t iotag;         /* pre-assigned IO tag */
         uint16_t sli4_xritag;   /* pre-assigned XRI, (OXID) tag. */
         struct sli4_sge *sgl;   /* pre-assigned SGL */
@@ -532,7 +551,6 @@ int lpfc_sli4_post_all_rpi_hdrs(struct lpfc_hba *);
 struct lpfc_rpi_hdr *lpfc_sli4_create_rpi_hdr(struct lpfc_hba *);
 void lpfc_sli4_remove_rpi_hdrs(struct lpfc_hba *);
 int lpfc_sli4_alloc_rpi(struct lpfc_hba *);
-void __lpfc_sli4_free_rpi(struct lpfc_hba *, int);
 void 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 *);
@@ -548,7 +566,7 @@ int lpfc_sli4_brdreset(struct lpfc_hba *);
 int lpfc_sli4_add_fcf_record(struct lpfc_hba *, struct fcf_record *);
 void lpfc_sli_remove_dflt_fcf(struct lpfc_hba *);
 int lpfc_sli4_get_els_iocb_cnt(struct lpfc_hba *);
-int lpfc_sli4_init_vpi(struct lpfc_hba *, uint16_t);
+int lpfc_sli4_init_vpi(struct lpfc_vport *);
 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);