Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 100 insertions, 90 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 89ff7c09e298..e654d01dad24 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1565,95 +1565,83 @@ enum lpfc_protgrp_type {
 };
 
 /* PDE Descriptors */
-#define LPFC_PDE1_DESCRIPTOR            0x81
-#define LPFC_PDE2_DESCRIPTOR            0x82
-#define LPFC_PDE3_DESCRIPTOR            0x83
-
-/* BlockGuard Profiles */
-enum lpfc_bg_prof_codes {
-        LPFC_PROF_INVALID,
-        LPFC_PROF_A1    = 128,  /* Full Protection                            */
-        LPFC_PROF_A2,           /* Disabled Protection Checks:A2~A4           */
-        LPFC_PROF_A3,
-        LPFC_PROF_A4,
-        LPFC_PROF_B1,           /* Embedded DIFs: B1~B3                       */
-        LPFC_PROF_B2,
-        LPFC_PROF_B3,
-        LPFC_PROF_C1,           /* Separate DIFs: C1~C3                       */
-        LPFC_PROF_C2,
-        LPFC_PROF_C3,
-        LPFC_PROF_D1,           /* Full Protection                            */
-        LPFC_PROF_D2,           /* Partial Protection & Check Disabling       */
-        LPFC_PROF_D3,
-        LPFC_PROF_E1,           /* E1~E4:out - check-only, in - update apptag */
-        LPFC_PROF_E2,
-        LPFC_PROF_E3,
-        LPFC_PROF_E4,
-        LPFC_PROF_F1,           /* Full Translation - F1 Prot Descriptor      */
-                                /* F1 Translation BDE                         */
-        LPFC_PROF_ANT1,         /* TCP checksum, DIF inline with data buffers */
-        LPFC_PROF_AST1,         /* TCP checksum, DIF split from data buffer   */
-        LPFC_PROF_ANT2,
-        LPFC_PROF_AST2
+#define LPFC_PDE5_DESCRIPTOR            0x85
+#define LPFC_PDE6_DESCRIPTOR            0x86
+#define LPFC_PDE7_DESCRIPTOR            0x87
+
+/* BlockGuard Opcodes */
+#define BG_OP_IN_NODIF_OUT_CRC          0x0
+#define BG_OP_IN_CRC_OUT_NODIF          0x1
+#define BG_OP_IN_NODIF_OUT_CSUM         0x2
+#define BG_OP_IN_CSUM_OUT_NODIF         0x3
+#define BG_OP_IN_CRC_OUT_CRC            0x4
+#define BG_OP_IN_CSUM_OUT_CSUM          0x5
+#define BG_OP_IN_CRC_OUT_CSUM           0x6
+#define BG_OP_IN_CSUM_OUT_CRC           0x7
+
+struct lpfc_pde5 {
+        uint32_t word0;
+#define pde5_type_SHIFT         24
+#define pde5_type_MASK          0x000000ff
+#define pde5_type_WORD          word0
+#define pde5_rsvd0_SHIFT        0
+#define pde5_rsvd0_MASK         0x00ffffff
+#define pde5_rsvd0_WORD         word0
+        uint32_t reftag;        /* Reference Tag Value                  */
+        uint32_t reftagtr;      /* Reference Tag Translation Value      */
 };
 
-/* BlockGuard error-control defines */
-#define BG_EC_STOP_ERR                  0x00
-#define BG_EC_CONT_ERR                  0x01
-#define BG_EC_IGN_UNINIT_STOP_ERR       0x10
-#define BG_EC_IGN_UNINIT_CONT_ERR       0x11
-
-/* PDE (Protection Descriptor Entry) word 0 bit masks and shifts */
-#define PDE_DESC_TYPE_MASK              0xff000000
-#define PDE_DESC_TYPE_SHIFT             24
-#define PDE_BG_PROFILE_MASK             0x00ff0000
-#define PDE_BG_PROFILE_SHIFT            16
-#define PDE_BLOCK_LEN_MASK              0x0000fffc
-#define PDE_BLOCK_LEN_SHIFT             2
-#define PDE_ERR_CTRL_MASK               0x00000003
-#define PDE_ERR_CTRL_SHIFT              0
-/* PDE word 1 bit masks and shifts */
-#define PDE_APPTAG_MASK_MASK            0xffff0000
-#define PDE_APPTAG_MASK_SHIFT           16
-#define PDE_APPTAG_VAL_MASK             0x0000ffff
-#define PDE_APPTAG_VAL_SHIFT            0
-struct lpfc_pde {
-        uint32_t parms;     /* bitfields of descriptor, prof, len, and ec */
-        uint32_t apptag;    /* bitfields of app tag maskand app tag value */
-        uint32_t reftag;    /* reference tag occupying all 32 bits        */
+struct lpfc_pde6 {
+        uint32_t word0;
+#define pde6_type_SHIFT         24
+#define pde6_type_MASK          0x000000ff
+#define pde6_type_WORD          word0
+#define pde6_rsvd0_SHIFT        0
+#define pde6_rsvd0_MASK         0x00ffffff
+#define pde6_rsvd0_WORD         word0
+        uint32_t word1;
+#define pde6_rsvd1_SHIFT        26
+#define pde6_rsvd1_MASK         0x0000003f
+#define pde6_rsvd1_WORD         word1
+#define pde6_na_SHIFT           25
+#define pde6_na_MASK            0x00000001
+#define pde6_na_WORD            word1
+#define pde6_rsvd2_SHIFT        16
+#define pde6_rsvd2_MASK         0x000001FF
+#define pde6_rsvd2_WORD         word1
+#define pde6_apptagtr_SHIFT     0
+#define pde6_apptagtr_MASK      0x0000ffff
+#define pde6_apptagtr_WORD      word1
+        uint32_t word2;
+#define pde6_optx_SHIFT         28
+#define pde6_optx_MASK          0x0000000f
+#define pde6_optx_WORD          word2
+#define pde6_oprx_SHIFT         24
+#define pde6_oprx_MASK          0x0000000f
+#define pde6_oprx_WORD          word2
+#define pde6_nr_SHIFT           23
+#define pde6_nr_MASK            0x00000001
+#define pde6_nr_WORD            word2
+#define pde6_ce_SHIFT           22
+#define pde6_ce_MASK            0x00000001
+#define pde6_ce_WORD            word2
+#define pde6_re_SHIFT           21
+#define pde6_re_MASK            0x00000001
+#define pde6_re_WORD            word2
+#define pde6_ae_SHIFT           20
+#define pde6_ae_MASK            0x00000001
+#define pde6_ae_WORD            word2
+#define pde6_ai_SHIFT           19
+#define pde6_ai_MASK            0x00000001
+#define pde6_ai_WORD            word2
+#define pde6_bs_SHIFT           16
+#define pde6_bs_MASK            0x00000007
+#define pde6_bs_WORD            word2
+#define pde6_apptagval_SHIFT    0
+#define pde6_apptagval_MASK     0x0000ffff
+#define pde6_apptagval_WORD     word2
 };
 
-/* inline function to set fields in parms of PDE */
-static inline void
-lpfc_pde_set_bg_parms(struct lpfc_pde *p, u8 desc, u8 prof, u16 len, u8 ec)
-{
-        uint32_t *wp = &p->parms;
-
-        /* spec indicates that adapter appends two 0's to length field */
-        len = len >> 2;
-
-        *wp &= 0;
-        *wp |= ((desc << PDE_DESC_TYPE_SHIFT) & PDE_DESC_TYPE_MASK);
-        *wp |= ((prof << PDE_BG_PROFILE_SHIFT) & PDE_BG_PROFILE_MASK);
-        *wp |= ((len << PDE_BLOCK_LEN_SHIFT) & PDE_BLOCK_LEN_MASK);
-        *wp |= ((ec << PDE_ERR_CTRL_SHIFT) & PDE_ERR_CTRL_MASK);
-        *wp = le32_to_cpu(*wp);
-}
-
-/* inline function to set apptag and reftag fields of PDE */
-static inline void
-lpfc_pde_set_dif_parms(struct lpfc_pde *p, u16 apptagmask, u16 apptagval,
-                u32 reftag)
-{
-        uint32_t *wp = &p->apptag;
-        *wp &= 0;
-        *wp |= ((apptagmask << PDE_APPTAG_MASK_SHIFT) & PDE_APPTAG_MASK_MASK);
-        *wp |= ((apptagval << PDE_APPTAG_VAL_SHIFT) & PDE_APPTAG_VAL_MASK);
-        *wp = le32_to_cpu(*wp);
-        wp = &p->reftag;
-        *wp = le32_to_cpu(reftag);
-}
-
 
 /* Structure for MB Command LOAD_SM and DOWN_LOAD */
 
@@ -1744,6 +1732,17 @@ typedef struct {
         } un;
 } BIU_DIAG_VAR;
 
+/* Structure for MB command READ_EVENT_LOG (0x38) */
+struct READ_EVENT_LOG_VAR {
+        uint32_t word1;
+#define lpfc_event_log_SHIFT    29
+#define lpfc_event_log_MASK     0x00000001
+#define lpfc_event_log_WORD     word1
+#define USE_MAILBOX_RESPONSE    1
+        uint32_t offset;
+        struct ulp_bde64 rcv_bde64;
+};
+
 /* Structure for MB Command INIT_LINK (05) */
 
 typedef struct {
@@ -2487,8 +2486,8 @@ typedef struct {
 #define  DMP_VPORT_REGION_SIZE   0x200
 #define  DMP_MBOX_OFFSET_WORD    0x5
 
-#define  DMP_REGION_23           0x17   /* fcoe param  and port state region */
-#define  DMP_RGN23_SIZE          0x400
+#define  DMP_REGION_23           0x17   /* fcoe param  and port state region */
+#define  DMP_RGN23_SIZE          0x400
 
 #define  WAKE_UP_PARMS_REGION_ID    4
 #define  WAKE_UP_PARMS_WORD_SIZE   15
@@ -2503,9 +2502,9 @@ struct vport_rec {
 #define VPORT_INFO_REV 0x1
 #define MAX_STATIC_VPORT_COUNT 16
 struct static_vport_info {
-        uint32_t                signature;
+        uint32_t                signature;
         uint32_t                rev;
-        struct vport_rec        vport_list[MAX_STATIC_VPORT_COUNT];
+        struct vport_rec        vport_list[MAX_STATIC_VPORT_COUNT];
         uint32_t                resvd[66];
 };
 
@@ -2934,6 +2933,12 @@ typedef struct {
 /* Union of all Mailbox Command types */
 #define MAILBOX_CMD_WSIZE       32
 #define MAILBOX_CMD_SIZE        (MAILBOX_CMD_WSIZE * sizeof(uint32_t))
+/* ext_wsize times 4 bytes should not be greater than max xmit size */
+#define MAILBOX_EXT_WSIZE       512
+#define MAILBOX_EXT_SIZE        (MAILBOX_EXT_WSIZE * sizeof(uint32_t))
+#define MAILBOX_HBA_EXT_OFFSET  0x100
+/* max mbox xmit size is a page size for sysfs IO operations */
+#define MAILBOX_MAX_XMIT_SIZE   PAGE_SIZE
 
 typedef union {
         uint32_t varWords[MAILBOX_CMD_WSIZE - 1]; /* first word is type/
@@ -2972,6 +2977,9 @@ typedef union {
         REG_VPI_VAR varRegVpi;          /* cmd = 0x96 (REG_VPI) */
         UNREG_VPI_VAR varUnregVpi;      /* cmd = 0x97 (UNREG_VPI) */
         ASYNCEVT_ENABLE_VAR varCfgAsyncEvent; /*cmd = x33 (CONFIG_ASYNC) */
+        struct READ_EVENT_LOG_VAR varRdEventLog;        /* cmd = 0x38
+                                                         * (READ_EVENT_LOG)
+                                                         */
         struct config_msi_var varCfgMSI;/* cmd = x30 (CONFIG_MSI)     */
 } MAILVARIANTS;
 
@@ -3652,7 +3660,8 @@ typedef struct _IOCB {	/* IOCB structure */
 /* Maximum IOCBs that will fit in SLI2 slim */
 #define MAX_SLI2_IOCB    498
 #define MAX_SLIM_IOCB_SIZE (SLI2_SLIM_SIZE - \
-                            (sizeof(MAILBOX_t) + sizeof(PCB_t)))
+                            (sizeof(MAILBOX_t) + sizeof(PCB_t) + \
+                            sizeof(uint32_t) * MAILBOX_EXT_WSIZE))
 
 /* HBQ entries are 4 words each = 4k */
 #define LPFC_TOTAL_HBQ_SIZE (sizeof(struct lpfc_hbq_entry) *  \
@@ -3660,6 +3669,7 @@ typedef struct _IOCB {	/* IOCB structure */
 
 struct lpfc_sli2_slim {
         MAILBOX_t mbx;
+        uint32_t  mbx_ext_words[MAILBOX_EXT_WSIZE];
         PCB_t pcb;
         IOCB_t IOCBs[MAX_SLIM_IOCB_SIZE];
 };