Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[karo-tx-linux.git] / drivers / net / ethernet / qlogic / netxen / netxen_nic_hdr.h

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
index b1a897cd9a8d54366b39dcd46bcb943dae575356..28e076960bcb5c8400e13eb62ac8d29c7d2f0841 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h
@@ -776,6 +776,7 @@ enum {
 #define CRB_SW_INT_MASK_3              (NETXEN_NIC_REG(0x1e8))
 
 #define CRB_FW_CAPABILITIES_1          (NETXEN_CAM_RAM(0x128))
+#define CRB_FW_CAPABILITIES_2          (NETXEN_CAM_RAM(0x12c))
 #define CRB_MAC_BLOCK_START            (NETXEN_CAM_RAM(0x1c0))
 
 /*
@@ -955,6 +956,31 @@ enum {
 #define NX_CRB_DEV_REF_COUNT           (NETXEN_CAM_RAM(0x138))
 #define NX_CRB_DEV_STATE               (NETXEN_CAM_RAM(0x140))
 
+/* MiniDIMM related macros */
+#define NETXEN_DIMM_CAPABILITY         (NETXEN_CAM_RAM(0x258))
+#define NETXEN_DIMM_PRESENT                    0x1
+#define NETXEN_DIMM_MEMTYPE_DDR2_SDRAM 0x2
+#define NETXEN_DIMM_SIZE                       0x4
+#define NETXEN_DIMM_MEMTYPE(VAL)               ((VAL >> 3) & 0xf)
+#define        NETXEN_DIMM_NUMROWS(VAL)                ((VAL >> 7) & 0xf)
+#define        NETXEN_DIMM_NUMCOLS(VAL)                ((VAL >> 11) & 0xf)
+#define        NETXEN_DIMM_NUMRANKS(VAL)               ((VAL >> 15) & 0x3)
+#define NETXEN_DIMM_DATAWIDTH(VAL)             ((VAL >> 18) & 0x3)
+#define NETXEN_DIMM_NUMBANKS(VAL)              ((VAL >> 21) & 0xf)
+#define NETXEN_DIMM_TYPE(VAL)          ((VAL >> 25) & 0x3f)
+#define NETXEN_DIMM_VALID_FLAG         0x80000000
+
+#define NETXEN_DIMM_MEM_DDR2_SDRAM     0x8
+
+#define NETXEN_DIMM_STD_MEM_SIZE       512
+
+#define NETXEN_DIMM_TYPE_RDIMM 0x1
+#define NETXEN_DIMM_TYPE_UDIMM 0x2
+#define NETXEN_DIMM_TYPE_SO_DIMM       0x4
+#define NETXEN_DIMM_TYPE_Micro_DIMM    0x8
+#define NETXEN_DIMM_TYPE_Mini_RDIMM    0x10
+#define NETXEN_DIMM_TYPE_Mini_UDIMM    0x20
+
 /* Device State */
 #define NX_DEV_COLD            1
 #define NX_DEV_INITALIZING     2