1 files changed, 307 insertions, 43 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index fe3ddce64087..f8e644d54aa7 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -129,6 +129,9 @@ struct wmi {
         u8 ht_allowed[A_NUM_BANDS];
         u8 traffic_class;
         bool is_probe_ssid;
+
+        u8 *last_mgmt_tx_frame;
+        size_t last_mgmt_tx_frame_len;
 };
 
 struct host_app_area {
@@ -490,17 +493,61 @@ enum wmi_cmd_id {
         WMI_SET_PASSPHRASE_CMDID,
         WMI_SEND_ASSOC_RES_CMDID,
         WMI_SET_ASSOC_REQ_RELAY_CMDID,
-        WMI_GET_RFKILL_MODE_CMDID,
 
         /* ACS command, consists of sub-commands */
         WMI_ACS_CTRL_CMDID,
+        WMI_SET_EXCESS_TX_RETRY_THRES_CMDID,
+        WMI_SET_TBD_TIME_CMDID, /*added for wmiconfig command for TBD */
+
+        /* Pktlog cmds */
+        WMI_PKTLOG_ENABLE_CMDID,
+        WMI_PKTLOG_DISABLE_CMDID,
+
+        /* More P2P Cmds */
+        WMI_P2P_GO_NEG_REQ_RSP_CMDID,
+        WMI_P2P_GRP_INIT_CMDID,
+        WMI_P2P_GRP_FORMATION_DONE_CMDID,
+        WMI_P2P_INVITE_CMDID,
+        WMI_P2P_INVITE_REQ_RSP_CMDID,
+        WMI_P2P_PROV_DISC_REQ_CMDID,
+        WMI_P2P_SET_CMDID,
+
+        WMI_GET_RFKILL_MODE_CMDID,
+        WMI_SET_RFKILL_MODE_CMDID,
+        WMI_AP_SET_APSD_CMDID,
+        WMI_AP_APSD_BUFFERED_TRAFFIC_CMDID,
 
+        WMI_P2P_SDPD_TX_CMDID, /* F05C */
+        WMI_P2P_STOP_SDPD_CMDID,
+        WMI_P2P_CANCEL_CMDID,
         /* Ultra low power store / recall commands */
         WMI_STORERECALL_CONFIGURE_CMDID,
         WMI_STORERECALL_RECALL_CMDID,
         WMI_STORERECALL_HOST_READY_CMDID,
         WMI_FORCE_TARGET_ASSERT_CMDID,
-        WMI_SET_EXCESS_TX_RETRY_THRES_CMDID,
+
+        WMI_SET_PROBED_SSID_EX_CMDID,
+        WMI_SET_NETWORK_LIST_OFFLOAD_CMDID,
+        WMI_SET_ARP_NS_OFFLOAD_CMDID,
+        WMI_ADD_WOW_EXT_PATTERN_CMDID,
+        WMI_GTK_OFFLOAD_OP_CMDID,
+        WMI_REMAIN_ON_CHNL_CMDID,
+        WMI_CANCEL_REMAIN_ON_CHNL_CMDID,
+        WMI_SEND_ACTION_CMDID,
+        WMI_PROBE_REQ_REPORT_CMDID,
+        WMI_DISABLE_11B_RATES_CMDID,
+        WMI_SEND_PROBE_RESPONSE_CMDID,
+        WMI_GET_P2P_INFO_CMDID,
+        WMI_AP_JOIN_BSS_CMDID,
+};
+
+enum wmi_mgmt_frame_type {
+        WMI_FRAME_BEACON = 0,
+        WMI_FRAME_PROBE_REQ,
+        WMI_FRAME_PROBE_RESP,
+        WMI_FRAME_ASSOC_REQ,
+        WMI_FRAME_ASSOC_RESP,
+        WMI_NUM_MGMT_FRAME
 };
 
 /* WMI_CONNECT_CMDID  */
@@ -519,11 +566,6 @@ enum dot11_auth_mode {
         LEAP_AUTH = 0x04,
 };
 
-enum {
-        AUTH_IDLE,
-        AUTH_OPEN_IN_PROGRESS,
-};
-
 enum auth_mode {
         NONE_AUTH = 0x01,
         WPA_AUTH = 0x02,
@@ -1179,15 +1221,26 @@ enum wmi_event_id {
         WMI_WAC_START_WPS_EVENTID,
         WMI_WAC_CTRL_REQ_REPLY_EVENTID,
 
+        WMI_REPORT_WMM_PARAMS_EVENTID,
+        WMI_WAC_REJECT_WPS_EVENTID,
+
+        /* More P2P Events */
+        WMI_P2P_GO_NEG_REQ_EVENTID,
+        WMI_P2P_INVITE_REQ_EVENTID,
+        WMI_P2P_INVITE_RCVD_RESULT_EVENTID,
+        WMI_P2P_INVITE_SENT_RESULT_EVENTID,
+        WMI_P2P_PROV_DISC_RESP_EVENTID,
+        WMI_P2P_PROV_DISC_REQ_EVENTID,
+
         /* RFKILL Events */
         WMI_RFKILL_STATE_CHANGE_EVENTID,
         WMI_RFKILL_GET_MODE_CMD_EVENTID,
-        WMI_THIN_RESERVED_START_EVENTID = 0x8000,
 
-        /*
-         * Events in this range are reserved for thinmode
-         * See wmi_thin.h for actual definitions
-         */
+        WMI_P2P_START_SDPD_EVENTID,
+        WMI_P2P_SDPD_RX_EVENTID,
+
+        WMI_THIN_RESERVED_START_EVENTID = 0x8000,
+        /* Events in this range are reserved for thinmode */
         WMI_THIN_RESERVED_END_EVENTID = 0x8fff,
 
         WMI_SET_CHANNEL_EVENTID,
@@ -1195,7 +1248,17 @@ enum wmi_event_id {
 
         /* Generic ACS event */
         WMI_ACS_EVENTID,
-        WMI_REPORT_WMM_PARAMS_EVENTID
+        WMI_STORERECALL_STORE_EVENTID,
+        WMI_WOW_EXT_WAKE_EVENTID,
+        WMI_GTK_OFFLOAD_STATUS_EVENTID,
+        WMI_NETWORK_LIST_OFFLOAD_EVENTID,
+        WMI_REMAIN_ON_CHNL_EVENTID,
+        WMI_CANCEL_REMAIN_ON_CHNL_EVENTID,
+        WMI_TX_STATUS_EVENTID,
+        WMI_RX_PROBE_REQ_EVENTID,
+        WMI_P2P_CAPABILITIES_EVENTID,
+        WMI_RX_ACTION_EVENTID,
+        WMI_P2P_INFO_EVENTID,
 };
 
 struct wmi_ready_event_2 {
@@ -1207,11 +1270,30 @@ struct wmi_ready_event_2 {
 
 /* Connect Event */
 struct wmi_connect_event {
-        __le16 ch;
-        u8 bssid[ETH_ALEN];
-        __le16 listen_intvl;
-        __le16 beacon_intvl;
-        __le32 nw_type;
+        union {
+                struct {
+                        __le16 ch;
+                        u8 bssid[ETH_ALEN];
+                        __le16 listen_intvl;
+                        __le16 beacon_intvl;
+                        __le32 nw_type;
+                } sta;
+                struct {
+                        u8 phymode;
+                        u8 aid;
+                        u8 mac_addr[ETH_ALEN];
+                        u8 auth;
+                        u8 keymgmt;
+                        __le16 cipher;
+                        u8 apsd_info;
+                        u8 unused[3];
+                } ap_sta;
+                struct {
+                        __le16 ch;
+                        u8 bssid[ETH_ALEN];
+                        u8 unused[8];
+                } ap_bss;
+        } u;
         u8 beacon_ie_len;
         u8 assoc_req_len;
         u8 assoc_resp_len;
@@ -1238,6 +1320,12 @@ enum wmi_disconnect_reason {
         IBSS_MERGE = 0xe,
 };
 
+#define ATH6KL_COUNTRY_RD_SHIFT        16
+
+struct ath6kl_wmi_regdomain {
+        __le32 reg_code;
+};
+
 struct wmi_disconnect_event {
         /* reason code, see 802.11 spec. */
         __le16 proto_reason_status;
@@ -1265,33 +1353,54 @@ enum wmi_bi_ftype {
         PROBEREQ_FTYPE,
 };
 
-struct wmi_bss_info_hdr {
-        __le16 ch;
+#define DEF_LRSSI_SCAN_PERIOD            5
+#define DEF_LRSSI_ROAM_THRESHOLD        20
+#define DEF_LRSSI_ROAM_FLOOR            60
+#define DEF_SCAN_FOR_ROAM_INTVL          2
 
-        /* see, enum wmi_bi_ftype */
-        u8 frame_type;
+enum wmi_roam_ctrl {
+        WMI_FORCE_ROAM = 1,
+        WMI_SET_ROAM_MODE,
+        WMI_SET_HOST_BIAS,
+        WMI_SET_LRSSI_SCAN_PARAMS,
+};
 
-        u8 snr;
-        a_sle16 rssi;
+struct bss_bias {
         u8 bssid[ETH_ALEN];
-        __le32 ie_mask;
+        u8  bias;
 } __packed;
 
-/*
- * BSS INFO HDR version 2.0
- * With 6 bytes HTC header and 6 bytes of WMI header
- * WMI_BSS_INFO_HDR cannot be accommodated in the removed 802.11 management
- * header space.
- * - Reduce the ie_mask to 2 bytes as only two bit flags are used
- * - Remove rssi and compute it on the host. rssi = snr - 95
- */
+struct bss_bias_info {
+        u8 num_bss;
+        struct bss_bias bss_bias[1];
+} __packed;
+
+struct low_rssi_scan_params {
+        __le16 lrssi_scan_period;
+        a_sle16 lrssi_scan_threshold;
+        a_sle16 lrssi_roam_threshold;
+        u8 roam_rssi_floor;
+        u8 reserved[1];
+} __packed;
+
+struct roam_ctrl_cmd {
+        union {
+                u8 bssid[ETH_ALEN];
+                u8 roam_mode;
+                struct bss_bias_info bss;
+                struct low_rssi_scan_params params;
+        } __packed info;
+        u8 roam_ctrl;
+} __packed;
+
+/* BSS INFO HDR version 2.0 */
 struct wmi_bss_info_hdr2 {
-        __le16 ch;
+        __le16 ch; /* frequency in MHz */
 
         /* see, enum wmi_bi_ftype */
         u8 frame_type;
 
-        u8 snr;
+        u8 snr; /* note: rssi = snr - 95 dBm */
         u8 bssid[ETH_ALEN];
         __le16 ie_mask;
 } __packed;
@@ -1330,6 +1439,16 @@ enum wmi_bss_flags {
         WMI_PMKID_VALID_BSS = 0x02,
 };
 
+struct wmi_neighbor_info {
+        u8 bssid[ETH_ALEN];
+        u8 bss_flags; /* enum wmi_bss_flags */
+} __packed;
+
+struct wmi_neighbor_report_event {
+        u8 num_neighbors;
+        struct wmi_neighbor_info neighbor[0];
+} __packed;
+
 /* TKIP MIC Error Event */
 struct wmi_tkip_micerr_event {
         u8 key_id;
@@ -1642,6 +1761,12 @@ struct wmi_get_keepalive_cmd {
         u8 keep_alive_intvl;
 } __packed;
 
+struct wmi_set_appie_cmd {
+        u8 mgmt_frm_type; /* enum wmi_mgmt_frame_type */
+        u8 ie_len;
+        u8 ie_info[0];
+} __packed;
+
 /* Notify the WSC registration status to the target */
 #define WSC_REG_ACTIVE     1
 #define WSC_REG_INACTIVE   0
@@ -1789,8 +1914,26 @@ struct wmi_tx_complete_event {
 
 /* Used with WMI_AP_SET_NUM_STA_CMDID */
 
+/*
+ * Used with WMI_AP_SET_MLME_CMDID
+ */
+
+/* MLME Commands */
+#define WMI_AP_MLME_ASSOC       1   /* associate station */
+#define WMI_AP_DISASSOC         2   /* disassociate station */
+#define WMI_AP_DEAUTH           3   /* deauthenticate station */
+#define WMI_AP_MLME_AUTHORIZE   4   /* authorize station */
+#define WMI_AP_MLME_UNAUTHORIZE 5   /* unauthorize station */
+
+struct wmi_ap_set_mlme_cmd {
+        u8 mac[ETH_ALEN];
+        __le16 reason;          /* 802.11 reason code */
+        u8 cmd;                 /* operation to perform (WMI_AP_*) */
+} __packed;
+
 struct wmi_ap_set_pvb_cmd {
         __le32 flag;
+        __le16 rsvd;
         __le16 aid;
 } __packed;
 
@@ -1840,6 +1983,100 @@ struct wmi_ap_mode_stat {
 
 /* End of AP mode definitions */
 
+struct wmi_remain_on_chnl_cmd {
+        __le32 freq;
+        __le32 duration;
+} __packed;
+
+struct wmi_send_action_cmd {
+        __le32 id;
+        __le32 freq;
+        __le32 wait;
+        __le16 len;
+        u8 data[0];
+} __packed;
+
+struct wmi_tx_status_event {
+        __le32 id;
+        u8 ack_status;
+} __packed;
+
+struct wmi_probe_req_report_cmd {
+        u8 enable;
+} __packed;
+
+struct wmi_disable_11b_rates_cmd {
+        u8 disable;
+} __packed;
+
+struct wmi_set_appie_extended_cmd {
+        u8 role_id;
+        u8 mgmt_frm_type;
+        u8 ie_len;
+        u8 ie_info[0];
+} __packed;
+
+struct wmi_remain_on_chnl_event {
+        __le32 freq;
+        __le32 duration;
+} __packed;
+
+struct wmi_cancel_remain_on_chnl_event {
+        __le32 freq;
+        __le32 duration;
+        u8 status;
+} __packed;
+
+struct wmi_rx_action_event {
+        __le32 freq;
+        __le16 len;
+        u8 data[0];
+} __packed;
+
+struct wmi_p2p_capabilities_event {
+        __le16 len;
+        u8 data[0];
+} __packed;
+
+struct wmi_p2p_rx_probe_req_event {
+        __le32 freq;
+        __le16 len;
+        u8 data[0];
+} __packed;
+
+#define P2P_FLAG_CAPABILITIES_REQ   (0x00000001)
+#define P2P_FLAG_MACADDR_REQ        (0x00000002)
+#define P2P_FLAG_HMODEL_REQ         (0x00000002)
+
+struct wmi_get_p2p_info {
+        __le32 info_req_flags;
+} __packed;
+
+struct wmi_p2p_info_event {
+        __le32 info_req_flags;
+        __le16 len;
+        u8 data[0];
+} __packed;
+
+struct wmi_p2p_capabilities {
+        u8 go_power_save;
+} __packed;
+
+struct wmi_p2p_macaddr {
+        u8 mac_addr[ETH_ALEN];
+} __packed;
+
+struct wmi_p2p_hmodel {
+        u8 p2p_model;
+} __packed;
+
+struct wmi_p2p_probe_response_cmd {
+        __le32 freq;
+        u8 destination_addr[ETH_ALEN];
+        __le16 len;
+        u8 data[0];
+} __packed;
+
 /* Extended WMI (WMIX)
  *
  * Extended WMIX commands are encapsulated in a WMI message with
@@ -1898,6 +2135,11 @@ struct wmix_hb_challenge_resp_cmd {
         __le32 source;
 } __packed;
 
+struct ath6kl_wmix_dbglog_cfg_module_cmd {
+        __le32 valid;
+        __le32 config;
+} __packed;
+
 /* End of Extended WMI (WMIX) */
 
 enum wmi_sync_flag {
@@ -1925,14 +2167,11 @@ int ath6kl_wmi_data_hdr_add(struct wmi *wmi, struct sk_buff *skb,
 
 int ath6kl_wmi_dot11_hdr_remove(struct wmi *wmi, struct sk_buff *skb);
 int ath6kl_wmi_dot3_2_dix(struct sk_buff *skb);
-int ath6kl_wmi_data_hdr_remove(struct wmi *wmi, struct sk_buff *skb);
 int ath6kl_wmi_implicit_create_pstream(struct wmi *wmi, struct sk_buff *skb,
                                        u32 layer2_priority, bool wmm_enabled,
                                        u8 *ac);
 
 int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb);
-struct bss *ath6kl_wmi_find_node(struct wmi *wmi, const u8 *mac_addr);
-void ath6kl_wmi_node_free(struct wmi *wmi, const u8 *mac_addr);
 
 int ath6kl_wmi_cmd_send(struct wmi *wmi, struct sk_buff *skb,
                         enum wmi_cmd_id cmd_id, enum wmi_sync_flag sync_flag);
@@ -1978,6 +2217,7 @@ int ath6kl_wmi_set_lpreamble_cmd(struct wmi *wmi, u8 status,
                                  u8 preamble_policy);
 
 int ath6kl_wmi_get_challenge_resp_cmd(struct wmi *wmi, u32 cookie, u32 source);
+int ath6kl_wmi_config_debug_module_cmd(struct wmi *wmi, u32 valid, u32 config);
 
 int ath6kl_wmi_get_stats_cmd(struct wmi *wmi);
 int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 key_index,
@@ -1995,23 +2235,47 @@ int ath6kl_wmi_get_tx_pwr_cmd(struct wmi *wmi);
 
 int ath6kl_wmi_set_wmm_txop(struct wmi *wmi, enum wmi_txop_cfg cfg);
 int ath6kl_wmi_set_keepalive_cmd(struct wmi *wmi, u8 keep_alive_intvl);
+int ath6kl_wmi_test_cmd(struct wmi *wmi, void *buf, size_t len);
 
 s32 ath6kl_wmi_get_rate(s8 rate_index);
 
 int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, struct wmi_set_ip_cmd *ip_cmd);
+int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi);
 
-struct bss *ath6kl_wmi_find_ssid_node(struct wmi *wmi, u8 *ssid,
-                                      u32 ssid_len, bool is_wpa2,
-                                      bool match_ssid);
+/* AP mode */
+int ath6kl_wmi_ap_profile_commit(struct wmi *wmip, struct wmi_connect_cmd *p);
 
-void ath6kl_wmi_node_return(struct wmi *wmi, struct bss *bss);
+int ath6kl_wmi_ap_set_mlme(struct wmi *wmip, u8 cmd, const u8 *mac, u16 reason);
 
-/* AP mode */
 int ath6kl_wmi_set_pvb_cmd(struct wmi *wmi, u16 aid, bool flag);
 
 int ath6kl_wmi_set_rx_frame_format_cmd(struct wmi *wmi, u8 rx_meta_version,
                                        bool rx_dot11_hdr, bool defrag_on_host);
 
+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,
+                             u8 ie_len);
+
+/* P2P */
+int ath6kl_wmi_disable_11b_rates_cmd(struct wmi *wmi, bool disable);
+
+int ath6kl_wmi_remain_on_chnl_cmd(struct wmi *wmi, u32 freq, u32 dur);
+
+int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u32 id, u32 freq, u32 wait,
+                               const u8 *data, u16 data_len);
+
+int ath6kl_wmi_send_probe_response_cmd(struct wmi *wmi, u32 freq,
+                                       const u8 *dst,
+                                       const u8 *data, u16 data_len);
+
+int ath6kl_wmi_probe_report_req_cmd(struct wmi *wmi, bool enable);
+
+int ath6kl_wmi_info_req_cmd(struct wmi *wmi, u32 info_req_flags);
+
+int ath6kl_wmi_cancel_remain_on_chnl_cmd(struct wmi *wmi);
+
+int ath6kl_wmi_set_appie_cmd(struct wmi *wmi, u8 mgmt_frm_type, const u8 *ie,
+                             u8 ie_len);
+
 void *ath6kl_wmi_init(struct ath6kl *devt);
 void ath6kl_wmi_shutdown(struct wmi *wmi);