cxgb4: update FW definitions

[~andy/linux] / drivers / net / cxgb4 / t4fw_api.h

diff --git a/drivers/net/cxgb4/t4fw_api.h b/drivers/net/cxgb4/t4fw_api.h
index 63991d68950e2efdc2d0d04e22fb86e840875358..111c2a5763e49b265628be515f7ad598109a1b2d 100644 (file)
--- a/drivers/net/cxgb4/t4fw_api.h
+++ b/drivers/net/cxgb4/t4fw_api.h
@@ -475,7 +475,13 @@ enum fw_params_param_pfvf {
        FW_PARAMS_PARAM_PFVF_PBL_END    = 0x12,
        FW_PARAMS_PARAM_PFVF_L2T_START = 0x13,
        FW_PARAMS_PARAM_PFVF_L2T_END = 0x14,
+       FW_PARAMS_PARAM_PFVF_SQRQ_START = 0x15,
+       FW_PARAMS_PARAM_PFVF_SQRQ_END   = 0x16,
+       FW_PARAMS_PARAM_PFVF_CQ_START   = 0x17,
+       FW_PARAMS_PARAM_PFVF_CQ_END     = 0x18,
        FW_PARAMS_PARAM_PFVF_SCHEDCLASS_ETH = 0x20,
+       FW_PARAMS_PARAM_PFVF_VIID       = 0x24,
+       FW_PARAMS_PARAM_PFVF_CPMASK     = 0x25,
 };
 
 /*
@@ -804,16 +810,16 @@ struct fw_eq_ofld_cmd {
 struct fw_vi_cmd {
        __be32 op_to_vfn;
        __be32 alloc_to_len16;
-       __be16 viid_pkd;
+       __be16 type_viid;
        u8 mac[6];
        u8 portid_pkd;
        u8 nmac;
        u8 nmac0[6];
        __be16 rsssize_pkd;
        u8 nmac1[6];
-       __be16 r7;
+       __be16 idsiiq_pkd;
        u8 nmac2[6];
-       __be16 r8;
+       __be16 idseiq_pkd;
        u8 nmac3[6];
        __be64 r9;
        __be64 r10;
@@ -824,6 +830,7 @@ struct fw_vi_cmd {
 #define FW_VI_CMD_ALLOC (1U << 31)
 #define FW_VI_CMD_FREE (1U << 30)
 #define FW_VI_CMD_VIID(x) ((x) << 0)
+#define FW_VI_CMD_VIID_GET(x) ((x) & 0xfff)
 #define FW_VI_CMD_PORTID(x) ((x) << 4)
 #define FW_VI_CMD_RSSSIZE_GET(x) (((x) >> 0) & 0x7ff)
 
@@ -1136,6 +1143,11 @@ struct fw_port_cmd {
                        __be32 lstatus_to_modtype;
                        __be16 pcap;
                        __be16 acap;
+                       __be16 mtu;
+                       __u8   cbllen;
+                       __u8   r9;
+                       __be32 r10;
+                       __be64 r11;
                } info;
                struct fw_port_ppp {
                        __be32 pppen_to_ncsich;
@@ -1196,14 +1208,17 @@ struct fw_port_cmd {
 #define FW_PORT_CMD_NCSICH(x) ((x) << 4)
 
 enum fw_port_type {
-       FW_PORT_TYPE_FIBER,
-       FW_PORT_TYPE_KX4,
+       FW_PORT_TYPE_FIBER_XFI,
+       FW_PORT_TYPE_FIBER_XAUI,
        FW_PORT_TYPE_BT_SGMII,
-       FW_PORT_TYPE_KX,
+       FW_PORT_TYPE_BT_XFI,
        FW_PORT_TYPE_BT_XAUI,
-       FW_PORT_TYPE_KR,
+       FW_PORT_TYPE_KX4,
        FW_PORT_TYPE_CX4,
-       FW_PORT_TYPE_TWINAX,
+       FW_PORT_TYPE_KX,
+       FW_PORT_TYPE_KR,
+       FW_PORT_TYPE_SFP,
+       FW_PORT_TYPE_BP_AP,
 
        FW_PORT_TYPE_NONE = FW_PORT_CMD_PTYPE_MASK
 };
@@ -1213,6 +1228,9 @@ enum fw_port_module_type {
        FW_PORT_MOD_TYPE_LR,
        FW_PORT_MOD_TYPE_SR,
        FW_PORT_MOD_TYPE_ER,
+       FW_PORT_MOD_TYPE_TWINAX_PASSIVE,
+       FW_PORT_MOD_TYPE_TWINAX_ACTIVE,
+       FW_PORT_MOD_TYPE_LRM,
 
        FW_PORT_MOD_TYPE_NONE = FW_PORT_CMD_MODTYPE_MASK
 };