ath10k: Strip the QoS header only for QoS data frames
PATCH 1/3 ath10k: Strip the QoS header only for QoS data frames
From: Sujith Manoharan <[email protected]>
Also, use ieee80211_hdrlen() to simplify things.
--- drivers/net/wireless/ath/ath10k/mac.c | 50 +++++++---------------------------- 1 file changed, 9 insertions(+), 41 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +9 -41
@@ -1176,56 +1176,24 @@ static void ath10k_reg_notifier(struct wiphy *wiphy,/* TX handlers */ /***************/ +/* +* Frames sent to the FW have to be in "Native Wifi" format. +* Strip the QoS field from the 802.11 header. +*/ static void ath10k_tx_h_qos_workaround (struct ieee80211_hw *hw,struct ieee80211_tx_control *control,struct sk_buff *skb) {struct ieee80211_hdr *hdr = (void *)skb->data; -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -struct ath10k_vif *arvif;u8 *qos_ctl; -/* This is FW issue. It injects QoS Control to frames when WMM is -* active (as far as FW is concerned). We either strip out _our_ QoS -* Control so FW can append it on its own or we upgrade a Data frame to -* a QoS Data frame */ - -if (!ieee80211_is_data (hdr->frame_control)) -return ; - -if (!info->control.vif) +if (!ieee80211_is_data_qos (hdr->frame_control))return ; - arvif =ath10k_vif_to_arvif (info->control.vif); - -switch (arvif->vdev_type) { -case WMI_VDEV_TYPE_STA : -case WMI_VDEV_TYPE_IBSS : -if (!info->control.vif->bss_conf.qos) -return ; -break ; -case WMI_VDEV_TYPE_AP : -if (!control->sta) -return ; - -if (!control->sta->wme) -return ; -break ; -default : -return ; - } - -if (!ieee80211_is_data_qos (hdr->frame_control)) { - hdr->frame_control =__cpu_to_le16 ( -__le16_to_cpu (hdr->frame_control) | -IEEE80211_STYPE_QOS_DATA ); - }else { - qos_ctl =ieee80211_get_qos_ctl (hdr); -memmove (qos_ctl, qos_ctl +IEEE80211_QOS_CTL_LEN , - skb->len - - (qos_ctl +IEEE80211_QOS_CTL_LEN - skb->data)); -skb_trim (skb, skb->len -IEEE80211_QOS_CTL_LEN ); - } + qos_ctl =ieee80211_get_qos_ctl (hdr); +memmove (qos_ctl, qos_ctl +IEEE80211_QOS_CTL_LEN , + skb->len -ieee80211_hdrlen (hdr->frame_control)); +skb_trim (skb, skb->len -IEEE80211_QOS_CTL_LEN ); }static void ath10k_tx_h_update_wep_key (struct sk_buff *skb)
Signature · 1 line
1.8.2.2
PATCH 2/3 ath10k: FW API update for version .629
From: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath10k/hw.h | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 18 ------------- drivers/net/wireless/ath/ath10k/wmi.h | 49 ++++++++++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 25 deletions(-)
drivers/net/wireless/ath/ath10k/hw.h +1 -1
@@ -24,7 +24,7 @@#define SUPPORTED_FW_MAJOR 1#define SUPPORTED_FW_MINOR 0#define SUPPORTED_FW_RELEASE 0 -#define SUPPORTED_FW_BUILD 614 +#define SUPPORTED_FW_BUILD 629/* QCA988X 1.0 definitions */ #define QCA988X_HW_1_0_VERSION 0x4000002c
drivers/net/wireless/ath/ath10k/wmi.c +0 -18
@@ -415,18 +415,6 @@ static void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar,complete (&ar->vdev_setup_done); } -static void ath10k_wmi_event_vdev_standby_req (struct ath10k *ar, -struct sk_buff *skb) -{ -ath10k_dbg (ATH10K_DBG_WMI ,"WMI_VDEV_STANDBY_REQ_EVENTID\n" ); -} - -static void ath10k_wmi_event_vdev_resume_req (struct ath10k *ar, -struct sk_buff *skb) -{ -ath10k_dbg (ATH10K_DBG_WMI ,"WMI_VDEV_RESUME_REQ_EVENTID\n" ); -} -static void ath10k_wmi_event_vdev_stopped (struct ath10k *ar,struct sk_buff *skb) {
@@ -971,12 +959,6 @@ static void ath10k_wmi_event_process(struct ath10k *ar, struct sk_buff *skb)case WMI_VDEV_START_RESP_EVENTID :ath10k_wmi_event_vdev_start_resp (ar, skb);break ; -case WMI_VDEV_STANDBY_REQ_EVENTID : -ath10k_wmi_event_vdev_standby_req (ar, skb); -break ; -case WMI_VDEV_RESUME_REQ_EVENTID : -ath10k_wmi_event_vdev_resume_req (ar, skb); -break ;case WMI_VDEV_STOPPED_EVENTID :ath10k_wmi_event_vdev_stopped (ar, skb);break ;
drivers/net/wireless/ath/ath10k/wmi.h +43 -6
128 lines not on this page · raw message
Signature · 1 line
1.8.2.2
PATCH 2/3 ath10k: FW API update for version .629
Quoted 193 lines · Sujith Manoharan
From: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>--- drivers/net/wireless/ath/ath10k/hw.h | 2 +- drivers/net/wireless/ath/ath10k/wmi.c | 18 ------------- drivers/net/wireless/ath/ath10k/wmi.h | 49 ++++++++++++++++++++++++++++++----- 3 files changed, 44 insertions(+), 25 deletions(-)drivers/net/wireless/ath/ath10k/hw.h +1
-1@@ -24,7 +24,7 @@#define SUPPORTED_FW_MAJOR 1#define SUPPORTED_FW_MINOR 0#define SUPPORTED_FW_RELEASE 0 -#define SUPPORTED_FW_BUILD 614 +#define SUPPORTED_FW_BUILD 629/* QCA988X 1.0 definitions */ #define QCA988X_HW_1_0_VERSION 0x4000002cdrivers/net/wireless/ath/ath10k/wmi.c +0
-18@@ -415,18 +415,6 @@ static void ath10k_wmi_event_vdev_start_resp(struct ath10k *ar,complete (&ar->vdev_setup_done); } -static void ath10k_wmi_event_vdev_standby_req (struct ath10k *ar, -struct sk_buff *skb) -{ -ath10k_dbg (ATH10K_DBG_WMI ,"WMI_VDEV_STANDBY_REQ_EVENTID\n" ); -} - -static void ath10k_wmi_event_vdev_resume_req (struct ath10k *ar, -struct sk_buff *skb) -{ -ath10k_dbg (ATH10K_DBG_WMI ,"WMI_VDEV_RESUME_REQ_EVENTID\n" ); -} -static void ath10k_wmi_event_vdev_stopped (struct ath10k *ar,struct sk_buff *skb) {@@ -971,12 +959,6 @@ static void ath10k_wmi_event_process(struct ath10k *ar, struct sk_buff *skb)case WMI_VDEV_START_RESP_EVENTID :ath10k_wmi_event_vdev_start_resp (ar, skb);break ; -case WMI_VDEV_STANDBY_REQ_EVENTID : -ath10k_wmi_event_vdev_standby_req (ar, skb); -break ; -case WMI_VDEV_RESUME_REQ_EVENTID : -ath10k_wmi_event_vdev_resume_req (ar, skb); -break ;case WMI_VDEV_STOPPED_EVENTID :ath10k_wmi_event_vdev_stopped (ar, skb);break ;drivers/net/wireless/ath/ath10k/wmi.h +37
-6@@ -99,6 +99,11 @@ enum wmi_service_id {WMI_SERVICE_CHATTER ,/* Chatter service */ WMI_SERVICE_COEX_FREQAVOID ,/* FW report freq range to avoid */ WMI_SERVICE_PACKET_POWER_SAVE ,/* packet power save service */ +WMI_SERVICE_FORCE_FW_HANG ,/* To test firmware recovery mechanism */ +WMI_SERVICE_GPIO ,/* GPIO service */ +WMI_SERVICE_STA_DTIM_PS_MODULATED_DTIM ,/* Modulated DTIM support */ +WMI_STA_UAPSD_BASIC_AUTO_TRIG ,/* UAPSD AC Trigger Generation Method */ +WMI_STA_UAPSD_VAR_AUTO_TRIG ,/* -do- */ WMI_SERVICE_LAST ,WMI_MAX_SERVICE =64 /* max service */ @@ -153,6 +158,10 @@ static inline char *wmi_service_name(int service_id)return "COEX_FREQAVOID" ;case WMI_SERVICE_PACKET_POWER_SAVE :return "PACKET_POWER_SAVE" ; +case WMI_SERVICE_FORCE_FW_HANG : +return "FORCE FW HANG" ; +case WMI_SERVICE_GPIO : +return "GPIO" ;default :return "UNKNOWN SERVICE\n" ; }@@ -216,6 +225,7 @@ enum wmi_cmd_group {WMI_GRP_CHATTER ,WMI_GRP_TID_ADDBA ,WMI_GRP_MISC , + WMI_GRP_GPIO, };#define WMI_CMD_GRP (grp_id) (((grp_id) << 12) | 0x1)@@ -244,6 +254,7 @@ enum wmi_cmd_id {WMI_PDEV_SET_QUIET_MODE_CMDID ,WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID ,WMI_PDEV_GET_TPC_CONFIG_CMDID , +WMI_PDEV_SET_BASE_MACADDR_CMDID ,/* VDEV (virtual device) specific commands */ WMI_VDEV_CREATE_CMDID = WMI_CMD_GRP(WMI_GRP_VDEV),@@ -253,8 +264,6 @@ enum wmi_cmd_id {WMI_VDEV_UP_CMDID ,WMI_VDEV_STOP_CMDID ,WMI_VDEV_DOWN_CMDID , -WMI_VDEV_STANDBY_RESPONSE_CMDID , -WMI_VDEV_RESUME_RESPONSE_CMDID ,WMI_VDEV_SET_PARAM_CMDID , WMI_VDEV_INSTALL_KEY_CMDID,@@ -374,14 +383,23 @@ enum wmi_cmd_id {WMI_PEER_TID_ADDBA_CMDID =WMI_CMD_GRP (WMI_GRP_TID_ADDBA ),WMI_PEER_TID_DELBA_CMDID , +/* set station mimo powersave method */ +WMI_STA_DTIM_PS_METHOD_CMDID , +/* Configure the Station UAPSD AC Auto Trigger Parameters */ +WMI_STA_UAPSD_AUTO_TRIG_CMDID , +/* misc command group */ WMI_ECHO_CMDID =WMI_CMD_GRP (WMI_GRP_MISC ), +WMI_PDEV_UTF_CMDID ,WMI_DBGLOG_CFG_CMDID ,WMI_PDEV_QVIT_CMDID ,WMI_PDEV_FTM_INTG_CMDID ,WMI_VDEV_SET_KEEPALIVE_CMDID ,WMI_VDEV_GET_KEEPALIVE_CMDID , - WMI_PDEV_UTF_CMDID, + +/* GPIO Configuration */ +WMI_GPIO_CONFIG_CMDID =WMI_CMD_GRP (WMI_GRP_GPIO ), + WMI_GPIO_OUTPUT_CMDID, }; enum wmi_event_id {@@ -398,8 +416,6 @@ enum wmi_event_id {/* VDEV specific events */ WMI_VDEV_START_RESP_EVENTID =WMI_EVT_GRP_START_ID (WMI_GRP_VDEV ), -WMI_VDEV_STANDBY_REQ_EVENTID , -WMI_VDEV_RESUME_REQ_EVENTID ,WMI_VDEV_STOPPED_EVENTID , WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID,@@ -436,6 +452,7 @@ enum wmi_event_id {/* Misc events */ WMI_ECHO_EVENTID =WMI_EVT_GRP_START_ID (WMI_GRP_MISC ), +WMI_PDEV_UTF_EVENTID ,WMI_DEBUG_MESG_EVENTID ,WMI_UPDATE_STATS_EVENTID , WMI_DEBUG_PRINT_EVENTID,@@ -445,7 +462,9 @@ enum wmi_event_id {WMI_PDEV_FTM_INTG_EVENTID ,WMI_WLAN_FREQ_AVOID_EVENTID ,WMI_VDEV_GET_KEEPALIVE_EVENTID , - WMI_PDEV_UTF_EVENTID, + +/* GPIO Event */ + WMI_GPIO_INPUT_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_GPIO), }; enum wmi_phy_mode {@@ -1500,6 +1519,14 @@ enum wmi_pdev_param {WMI_PDEV_PARAM_DCS ,/* Enable/Disable ANI on target */ WMI_PDEV_PARAM_ANI_ENABLE , +/* configure the ANI polling period */ +WMI_PDEV_PARAM_ANI_POLL_PERIOD , +/* configure the ANI listening period */ +WMI_PDEV_PARAM_ANI_LISTEN_PERIOD , +/* configure OFDM immunity level */ +WMI_PDEV_PARAM_ANI_OFDM_LEVEL , +/* configure CCK immunity level */ +WMI_PDEV_PARAM_ANI_CCK_LEVEL ,/* Enable/Disable CDD for 1x1 STAs in rate control module */ WMI_PDEV_PARAM_DYNTXCHAIN,/* Enable/Disable proxy STA */ @@ -2076,6 +2103,10 @@ enum wmi_vdev_param {WMI_VDEV_PARAM_ATIM_WINDOW ,/* BMISS max */ WMI_VDEV_PARAM_BMISS_COUNT_MAX , +/* BMISS first time */ +WMI_VDEV_PARAM_BMISS_FIRST_BCNT , +/* BMISS final time */ +WMI_VDEV_PARAM_BMISS_FINAL_BCNT ,/* WMM enables/disabled */ WMI_VDEV_PARAM_FEATURE_WMM,/* Channel width */ @@ -2148,6 +2179,12 @@ enum wmi_vdev_param {/* Set packet power save */
drivers/net/wireless/ath/ath10k/wmi.h enum wmi_vdev_param { · line 2190
Quoted 10 lines
drivers/net/wireless/ath/ath10k/wmi.h +6
-0WMI_VDEV_PARAM_PACKET_POWERSAVE , + +/* +* Drops un-encrypted packets if eceived in an encrypted connection +* otherwise forwards to host. +*/ + WMI_VDEV_PARAM_DROP_UNENCRY, };/* slot time long */
I think it would be a good idea to include the adequate cmdid structures too, e.g. for WMI_PDEV_SET_BASE_MACADDR_CMDID.
-- Pozdrawiam / Best regards, Michal Kazior.
PATCH 2/3 ath10k: FW API update for version .629
Quoted 2 lines · Michal Kazior
I think it would be a good idea to include the adequate cmdid structures too, e.g. for
WMI_PDEV_SET_BASE_MACADDR_CMDID.
Sure, feel free to add them. I was tracking only the command IDs.
Sujith
PATCH 3/3 ath10k: Set the default TX encapsulation type
In reply to Sujith ManoharanFrom: Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath10k/mac.c | 6 ++++++ drivers/net/wireless/ath/ath10k/wmi.h | 8 ++++++++ 2 files changed, 14 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +6 -0
@@ -1674,6 +1674,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw,if (ret)ath10k_warn ("Failed to set default keyid: %d\n" , ret); + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, +WMI_VDEV_PARAM_TX_ENCAP_TYPE , +ATH10K_HW_TXRX_NATIVE_WIFI ); +if (ret) +ath10k_warn ("Failed to set TX encap: %d\n" , ret); +if (arvif->vdev_type ==WMI_VDEV_TYPE_AP ) { ret =ath10k_peer_create (ar, arvif->vdev_id, vif->addr);if (ret) {
drivers/net/wireless/ath/ath10k/wmi.h +8 -0
@@ -104,6 +104,7 @@ enum wmi_service_id {WMI_SERVICE_STA_DTIM_PS_MODULATED_DTIM ,/* Modulated DTIM support */ WMI_STA_UAPSD_BASIC_AUTO_TRIG ,/* UAPSD AC Trigger Generation Method */ WMI_STA_UAPSD_VAR_AUTO_TRIG ,/* -do- */ +WMI_SERVICE_TX_ENCAP ,/* Packet type for TX encapsulation */ WMI_SERVICE_LAST ,WMI_MAX_SERVICE =64 /* max service */
@@ -162,6 +163,8 @@ static inline char *wmi_service_name(int service_id)return "FORCE FW HANG" ;case WMI_SERVICE_GPIO :return "GPIO" ; +case WMI_SERVICE_TX_ENCAP : +return "TX ENCAP" ;default :return "UNKNOWN SERVICE\n" ; }
@@ -2185,6 +2188,11 @@ enum wmi_vdev_param {* otherwise forwards to host. */ WMI_VDEV_PARAM_DROP_UNENCRY , + +/* +* Set the encapsulation type for frames. +*/ + WMI_VDEV_PARAM_TX_ENCAP_TYPE, };/* slot time long */
Signature · 1 line
1.8.2.2
PATCH 3/3 ath10k: Set the default TX encapsulation type
Quoted 3 lines · Sujith Manoharan
From: Sujith Manoharan <[email protected]>
Signed-off-by Sujith Manoharan <[email protected]>
Needs a proper commit log answering: Why? What is the change user sees from this patch?
Signature · 1 line
Kalle Valo
PATCH 1/3 ath10k: Strip the QoS header only for QoS data frames
In reply to Sujith ManoharanQuoted 5 lines · Sujith Manoharan
From: Sujith Manoharan <[email protected]>
Also, use
ieee80211_hdrlen()to simplify things.Signed-off-by Sujith Manoharan <[email protected]>
Is this related to the firmware update? If yes, please mention that in the commit log (with the exact firmware version).
Signature · 1 line
Kalle Valo