[SCSI] lpfc 8.3.29: T10 Diff fixes and enhancements

T10 Diff fixes and enhancements:

- Add SLI4 Lancer support for T10 DIF / BlockGuard (121980)
- Fix SLI4 BlockGuard behavior when protection data is generated by HBA (121980)
- Enhance debugfs for injecting T10 DIF errors (123966, 132966)
- Fix Incorrect usage of bghm for BlockGuard errors (127022)

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 825f9307417a..5fc044ff656e 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -534,6 +534,7 @@ struct lpfc_hba {
         void (*lpfc_scsi_prep_cmnd)
                 (struct lpfc_vport *, struct lpfc_scsi_buf *,
                  struct lpfc_nodelist *);
+
         /* IOCB interface function jump table entries */
         int (*__lpfc_sli_issue_iocb)
                 (struct lpfc_hba *, uint32_t,
@@ -541,8 +542,6 @@ struct lpfc_hba {
         void (*__lpfc_sli_release_iocbq)(struct lpfc_hba *,
                          struct lpfc_iocbq *);
         int (*lpfc_hba_down_post)(struct lpfc_hba *phba);
-
-
         IOCB_t * (*lpfc_get_iocb_from_iocbq)
                 (struct lpfc_iocbq *);
         void (*lpfc_scsi_cmd_iocb_cmpl)
@@ -551,10 +550,12 @@ struct lpfc_hba {
         /* MBOX interface function jump table entries */
         int (*lpfc_sli_issue_mbox)
                 (struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);
+
         /* Slow-path IOCB process function jump table entries */
         void (*lpfc_sli_handle_slow_ring_event)
                 (struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                  uint32_t mask);
+
         /* INIT device interface function jump table entries */
         int (*lpfc_sli_hbq_to_firmware)
                 (struct lpfc_hba *, uint32_t, struct hbq_dmabuf *);
@@ -573,6 +574,10 @@ struct lpfc_hba {
         int (*lpfc_selective_reset)
                 (struct lpfc_hba *);
 
+        int (*lpfc_bg_scsi_prep_dma_buf)
+                (struct lpfc_hba *, struct lpfc_scsi_buf *);
+        /* Add new entries here */
+
         /* SLI4 specific HBA data structure */
         struct lpfc_sli4_hba sli4_hba;
 
@@ -838,6 +843,7 @@ struct lpfc_hba {
         struct dentry *debug_writeGuard; /* inject write guard_tag errors */
         struct dentry *debug_writeApp;   /* inject write app_tag errors */
         struct dentry *debug_writeRef;   /* inject write ref_tag errors */
+        struct dentry *debug_readGuard;  /* inject read guard_tag errors */
         struct dentry *debug_readApp;    /* inject read app_tag errors */
         struct dentry *debug_readRef;    /* inject read ref_tag errors */
 
@@ -845,10 +851,11 @@ struct lpfc_hba {
         uint32_t lpfc_injerr_wgrd_cnt;
         uint32_t lpfc_injerr_wapp_cnt;
         uint32_t lpfc_injerr_wref_cnt;
+        uint32_t lpfc_injerr_rgrd_cnt;
         uint32_t lpfc_injerr_rapp_cnt;
         uint32_t lpfc_injerr_rref_cnt;
         sector_t lpfc_injerr_lba;
-#define LPFC_INJERR_LBA_OFF     (sector_t)0xffffffffffffffff
+#define LPFC_INJERR_LBA_OFF     (sector_t)(-1)
 
         struct dentry *debug_slow_ring_trc;
         struct lpfc_debugfs_trc *slow_ring_trc;