Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / drivers / net / benet / be_cmds.h

diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index 763dc199e337255bbb55f30c8f612c96f723abb5..bdc10a28cfda9feb11ffdecee141a6e333a9e92d 100644 (file)
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -124,6 +124,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_CQ_CREATE                                12
 #define OPCODE_COMMON_EQ_CREATE                                13
 #define OPCODE_COMMON_MCC_CREATE                       21
+#define OPCODE_COMMON_SET_QOS                          28
 #define OPCODE_COMMON_SEEPROM_READ                     30
 #define OPCODE_COMMON_NTWK_RX_FILTER                   34
 #define OPCODE_COMMON_GET_FW_VERSION                   35
@@ -144,6 +145,7 @@ struct be_mcc_mailbox {
 #define OPCODE_COMMON_ENABLE_DISABLE_BEACON            69
 #define OPCODE_COMMON_GET_BEACON_STATE                 70
 #define OPCODE_COMMON_READ_TRANSRECV_DATA              73
+#define OPCODE_COMMON_GET_PHY_DETAILS                  102
 
 #define OPCODE_ETH_ACPI_CONFIG                         2
 #define OPCODE_ETH_PROMISCUOUS                         3
@@ -747,7 +749,7 @@ struct be_cmd_resp_query_fw_cfg {
        u32 be_config_number;
        u32 asic_revision;
        u32 phys_port;
-       u32 function_cap;
+       u32 function_mode;
        u32 rsvd[26];
 };
 
@@ -869,6 +871,46 @@ struct be_cmd_resp_seeprom_read {
        u8 seeprom_data[BE_READ_SEEPROM_LEN];
 };
 
+enum {
+       PHY_TYPE_CX4_10GB = 0,
+       PHY_TYPE_XFP_10GB,
+       PHY_TYPE_SFP_1GB,
+       PHY_TYPE_SFP_PLUS_10GB,
+       PHY_TYPE_KR_10GB,
+       PHY_TYPE_KX4_10GB,
+       PHY_TYPE_BASET_10GB,
+       PHY_TYPE_BASET_1GB,
+       PHY_TYPE_DISABLED = 255
+};
+
+struct be_cmd_req_get_phy_info {
+       struct be_cmd_req_hdr hdr;
+       u8 rsvd0[24];
+};
+struct be_cmd_resp_get_phy_info {
+       struct be_cmd_req_hdr hdr;
+       u16 phy_type;
+       u16 interface_type;
+       u32 misc_params;
+       u32 future_use[4];
+};
+
+/*********************** Set QOS ***********************/
+
+#define BE_QOS_BITS_NIC                                1
+
+struct be_cmd_req_set_qos {
+       struct be_cmd_req_hdr hdr;
+       u32 valid_bits;
+       u32 max_bps_nic;
+       u32 rsvd[7];
+};
+
+struct be_cmd_resp_set_qos {
+       struct be_cmd_resp_hdr hdr;
+       u32 rsvd;
+};
+
 extern int be_pci_fnum_get(struct be_adapter *adapter);
 extern int be_cmd_POST(struct be_adapter *adapter);
 extern int be_cmd_mac_addr_query(struct be_adapter *adapter, u8 *mac_addr,
@@ -947,4 +989,8 @@ extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
                                struct be_dma_mem *nonemb_cmd);
 extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
                                u8 loopback_type, u8 enable);
+extern int be_cmd_get_phy_info(struct be_adapter *adapter,
+               struct be_dma_mem *cmd);
+extern int be_cmd_set_qos(struct be_adapter *adapter, u32 bps, u32 domain);
+extern void be_dump_ue(struct be_adapter *adapter);