wil6210 patches
v3 cover wil6210 patches
Changes from v2:
Removal of the following patches:
- wil6210: use country specific board file upon reg domain change
- wil6210: force EDMG channel through debugfs
Changes from v1:
Updated the commit text of "wil6210: force EDMG channel through debugfs"
The following patches include multiple wil6210 fixes.
Ahmad Masri (1):
wil6210: align to latest auto generated wmi.h
Alexei Avshalom Lazar (2):
wil6210: disable tracing config option
wil6210: Initialize reply struct of the WMI commands
Dedy Lansky (3):
wil6210: move WMI functionality out of wil_cfg80211_mgmt_tx
wil6210: remove unused rx_reorder members
wil6210: rate limit wil_rx_refill error
Lior David (2):
wil6210: fix call to wil6210_disconnect during unload
wil6210: change reply_size arg to u16 in wmi_call
drivers/net/wireless/ath/wil6210/Kconfig | 2 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 61 ++-- drivers/net/wireless/ath/wil6210/debugfs.c | 5 +- drivers/net/wireless/ath/wil6210/main.c | 2 + drivers/net/wireless/ath/wil6210/netdev.c | 8 +- drivers/net/wireless/ath/wil6210/rx_reorder.c | 7 +- drivers/net/wireless/ath/wil6210/txrx.c | 12 +- drivers/net/wireless/ath/wil6210/wil6210.h | 13 +- drivers/net/wireless/ath/wil6210/wmi.c | 152 +++++++--- drivers/net/wireless/ath/wil6210/wmi.h | 387 ++++++++++++++++++++++++-- 10 files changed, 519 insertions(+), 130 deletions(-)
Signature · 1 line
1.9.1
PATCH v3 5/8 wil6210: move WMI functionality out of wil_cfg80211_mgmt_tx
From: Dedy Lansky <[email protected]>
Rearrange the code by having new function wmi_mgmt_tx() to take care of the WMI part of wil_cfg80211_mgmt_tx().
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 39 +++--------------------- drivers/net/wireless/ath/wil6210/wil6210.h | 1 + drivers/net/wireless/ath/wil6210/wmi.c | 47 +++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 35 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +4 -35
@@ -1081,17 +1081,11 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, u64 *cookie) {const u8 *buf = params->buf; -size_t len = params->len, total; +size_t len = params->len;struct wil6210_priv *wil =wiphy_to_wil (wiphy);struct wil6210_vif *vif =wdev_to_vif (wil, wdev);int rc; -bool tx_status = false; -struct ieee80211_mgmt *mgmt_frame = (void *)buf; -struct wmi_sw_tx_req_cmd *cmd; -struct { -struct wmi_cmd_hdr wmi; -struct wmi_sw_tx_complete_event evt; - } __packed evt; +bool tx_status;/* Note, currently we do not support the "wait" parameter, user-space * must call remain_on_channel before mgmt_tx or listen on a channel
@@ -1100,34 +1094,9 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,* different from currently "listened" channel and fail if it is. */ -wil_dbg_misc (wil,"mgmt_tx mid %d\n" , vif->mid); -wil_hex_dump_misc ("mgmt tx frame " ,DUMP_PREFIX_OFFSET ,16 ,1 , buf, - len, true); - -if (len <sizeof (struct ieee80211_hdr_3addr )) -return -EINVAL ; - - total =sizeof (*cmd) + len; -if (total < len) -return -EINVAL ; - - cmd =kmalloc (total,GFP_KERNEL ); -if (!cmd) { - rc = -ENOMEM ; - goto out; - } - -memcpy (cmd->dst_mac, mgmt_frame->da,WMI_MAC_LEN ); - cmd->len =cpu_to_le16 (len); -memcpy (cmd->payload, buf, len); - - rc =wmi_call (wil,WMI_SW_TX_REQ_CMDID , vif->mid, cmd, total, -WMI_SW_TX_COMPLETE_EVENTID , &evt,sizeof (evt),2000 ); -if (rc ==0 ) - tx_status = !evt.evt.status; + rc =wmi_mgmt_tx (vif, buf, len); + tx_status = (rc ==0 ); -kfree (cmd); - out:cfg80211_mgmt_tx_status (wdev, cookie ? *cookie :0 , buf, len, tx_status,GFP_KERNEL );return rc;
drivers/net/wireless/ath/wil6210/wil6210.h +1 -0
@@ -1150,5 +1150,6 @@ int wil_request_firmware(struct wil6210_priv *wil, const char *name,int wmi_start_sched_scan (struct wil6210_priv *wil,struct cfg80211_sched_scan_request *request);int wmi_stop_sched_scan (struct wil6210_priv *wil); +int wmi_mgmt_tx (struct wil6210_vif *vif,const u8 *buf,size_t len);#endif /* __WIL6210_H__ */
drivers/net/wireless/ath/wil6210/wmi.c +47 -0
50 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v3 8/8 wil6210: rate limit wil_rx_refill error
In reply to Maya ErezFrom: Dedy Lansky <[email protected]>
wil_err inside wil_rx_refill can flood the log buffer. Replace it with wil_err_ratelimited.
--- drivers/net/wireless/ath/wil6210/txrx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/txrx.c +2 -2
@@ -652,8 +652,8 @@ static int wil_rx_refill(struct wil6210_priv *wil, int count) v->swtail = next_tail) { rc =wil_vring_alloc_skb (wil, v, v->swtail, headroom);if (unlikely (rc)) { -wil_err (wil,"Error %d in wil_rx_refill[%d]\n" , - rc, v->swtail); +wil_err_ratelimited (wil,"Error %d in rx refill[%d]\n" , + rc, v->swtail);break ; } }
Signature · 1 line
1.9.1
PATCH v3 4/8 wil6210: change reply_size arg to u16 in wmi_call
In reply to Maya ErezFrom: Lior David <[email protected]>
Change the type of the argument reply_size from u8 to u16 in order to support reply sizes > 255 bytes. The driver already supports u16 reply size in all other places, this was the only missing change.
--- drivers/net/wireless/ath/wil6210/wil6210.h | 2 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/wil6210/wil6210.h +1 -1
@@ -986,7 +986,7 @@ int wmi_read_hdr(struct wil6210_priv *wil, __le32 ptr,int wmi_send (struct wil6210_priv *wil,u16 cmdid,u8 mid,void *buf,u16 len);void wmi_recv_cmd (struct wil6210_priv *wil);int wmi_call (struct wil6210_priv *wil,u16 cmdid,u8 mid,void *buf,u16 len, -u16 reply_id,void *reply,u8 reply_size,int to_msec); +u16 reply_id,void *reply,u16 reply_size,int to_msec);void wmi_event_worker (struct work_struct *work);void wmi_event_flush (struct wil6210_priv *wil);int wmi_set_ssid (struct wil6210_vif *vif,u8 ssid_len,const void *ssid);
drivers/net/wireless/ath/wil6210/wmi.c +1 -1
@@ -1416,7 +1416,7 @@ void wmi_recv_cmd(struct wil6210_priv *wil) }int wmi_call (struct wil6210_priv *wil,u16 cmdid,u8 mid,void *buf,u16 len, -u16 reply_id,void *reply,u8 reply_size,int to_msec) +u16 reply_id,void *reply,u16 reply_size,int to_msec) {int rc;unsigned long remain;
Signature · 1 line
1.9.1
PATCH v3 7/8 wil6210: remove unused rx_reorder members
In reply to Maya ErezFrom: Dedy Lansky <[email protected]>
Remove unused members from struct wil_tid_ampdu_rx
--- drivers/net/wireless/ath/wil6210/debugfs.c | 3 +-- drivers/net/wireless/ath/wil6210/rx_reorder.c | 7 +------ drivers/net/wireless/ath/wil6210/wil6210.h | 10 ---------- 3 files changed, 2 insertions(+), 18 deletions(-)
drivers/net/wireless/ath/wil6210/debugfs.c +1 -2
@@ -1379,8 +1379,7 @@ static void wil_print_rxtid(struct seq_file *s, struct wil_tid_ampdu_rx *r)u16 index = ((r->head_seq_num - r->ssn) &0xfff ) % r->buf_size;unsigned long long drop_dup = r->drop_dup, drop_old = r->drop_old; -seq_printf (s,"([%2d] %3d TU) 0x%03x [" , r->buf_size, r->timeout, - r->head_seq_num); +seq_printf (s,"([%2d]) 0x%03x [" , r->buf_size, r->head_seq_num);for (i =0 ; i < r->buf_size; i++) {if (i == index)seq_printf (s,"%c" , r->reorder_buf[i] ?'O' :'|' );
drivers/net/wireless/ath/wil6210/rx_reorder.c +1 -6
@@ -206,7 +206,6 @@ void wil_rx_reorder(struct wil6210_priv *wil, struct sk_buff *skb)/* put the frame in the reordering buffer */ r->reorder_buf[index] = skb; - r->reorder_time[index] = jiffies; r->stored_mpdu_num++;wil_reorder_release (ndev, r);
@@ -252,11 +251,8 @@ struct wil_tid_ampdu_rx *wil_tid_ampdu_rx_alloc(struct wil6210_priv *wil, r->reorder_buf =kcalloc (size,sizeof (struct sk_buff *),GFP_KERNEL ); - r->reorder_time = -kcalloc (size,sizeof (unsigned long ),GFP_KERNEL ); -if (!r->reorder_buf || !r->reorder_time) { +if (!r->reorder_buf) {kfree (r->reorder_buf); -kfree (r->reorder_time);kfree (r);return NULL ; }
@@ -286,7 +282,6 @@ void wil_tid_ampdu_rx_free(struct wil6210_priv *wil,kfree_skb (r->reorder_buf[i]);kfree (r->reorder_buf); -kfree (r->reorder_time);kfree (r); }
drivers/net/wireless/ath/wil6210/wil6210.h +0 -10
@@ -493,38 +493,28 @@ enum { /* for wil6210_priv.status */* struct tid_ampdu_rx - TID aggregation information (Rx). * * @reorder_buf: buffer to reorder incoming aggregated MPDUs -* @reorder_time: jiffies when skb was added -* @session_timer: check if peer keeps Tx-ing on the TID (by timeout value) -* @reorder_timer: releases expired frames from the reorder buffer. * @last_rx: jiffies of last rx activity * @head_seq_num: head sequence number in reordering buffer. * @stored_mpdu_num: number of MPDUs in reordering buffer * @ssn: Starting Sequence Number expected to be aggregated. * @buf_size: buffer size for incoming A-MPDUs -* @timeout: reset timer value (in TUs). * @ssn_last_drop: SSN of the last dropped frame * @total: total number of processed incoming frames * @drop_dup: duplicate frames dropped for this reorder buffer * @drop_old: old frames dropped for this reorder buffer -* @dialog_token: dialog token for aggregation session * @first_time: true when this buffer used 1-st time */ struct wil_tid_ampdu_rx {struct sk_buff **reorder_buf; -unsigned long *reorder_time; -struct timer_list session_timer; -struct timer_list reorder_timer;unsigned long last_rx;u16 head_seq_num;u16 stored_mpdu_num;u16 ssn;u16 buf_size; -u16 timeout;u16 ssn_last_drop;unsigned long long total;/* frames processed */ unsigned long long drop_dup;unsigned long long drop_old; -u8 dialog_token;bool first_time;/* is it 1-st time this buffer used? */ };
Signature · 1 line
1.9.1
PATCH v3 1/8 wil6210: disable tracing config option
In reply to Maya ErezFrom: Alexei Avshalom Lazar <[email protected]>
Disable WIL6210_TRACING by default to avoid its performance overhead.
--- drivers/net/wireless/ath/wil6210/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/wil6210/Kconfig +1 -1
@@ -33,7 +33,7 @@ config WIL6210_TRACING bool "wil6210 tracing support" depends on WIL6210 depends on EVENT_TRACING - default y + default n ---help--- Say Y here to enable tracepoints for the wil6210 driver using the kernel tracing infrastructure. Select this
Signature · 1 line
1.9.1
PATCH v3 3/8 wil6210: fix call to wil6210_disconnect during unload
In reply to Maya ErezFrom: Lior David <[email protected]>
Move the call to wil6210_disconnect so it will be called before unregister_netdevice. This is because it calls netif_carrier_off which is forbidden to call on an unregistered net device. Calling netif_carrier_off can add a link watch event which might be handled after net device was freed, causing a kernel oops.
--- drivers/net/wireless/ath/wil6210/netdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/wil6210/netdev.c +4 -4
@@ -457,16 +457,16 @@ void wil_vif_remove(struct wil6210_priv *wil, u8 mid)return ; } +mutex_lock (&wil->mutex); +wil6210_disconnect (vif,NULL ,WLAN_REASON_DEAUTH_LEAVING , false); +mutex_unlock (&wil->mutex); + ndev =vif_to_ndev (vif);/* during unregister_netdevice cfg80211_leave may perform operations * such as stop AP, disconnect, so we only clear the VIF afterwards */ unregister_netdevice (ndev); -mutex_lock (&wil->mutex); -wil6210_disconnect (vif,NULL ,WLAN_REASON_DEAUTH_LEAVING , false); -mutex_unlock (&wil->mutex); -if (any_active && vif->mid !=0 )wmi_port_delete (wil, vif->mid);
Signature · 1 line
1.9.1
PATCH v3 6/8 wil6210: Initialize reply struct of the WMI commands
In reply to Maya ErezFrom: Alexei Avshalom Lazar <[email protected]>
WMI command reply saved in uninitialized struct. In order to avoid accessing unset values from FW initialize the reply struct.
--- drivers/net/wireless/ath/wil6210/cfg80211.c | 22 ++++--- drivers/net/wireless/ath/wil6210/debugfs.c | 2 + drivers/net/wireless/ath/wil6210/main.c | 2 + drivers/net/wireless/ath/wil6210/txrx.c | 8 ++- drivers/net/wireless/ath/wil6210/wmi.c | 97 ++++++++++++++++++----------- 5 files changed, 85 insertions(+), 46 deletions(-)
drivers/net/wireless/ath/wil6210/cfg80211.c +14 -8
@@ -276,6 +276,8 @@ int wil_cid_fill_sinfo(struct wil6210_vif *vif, int cid,struct wil_net_stats *stats = &wil->sta[cid].stats;int rc; +memset (&reply,0 ,sizeof (reply)); + rc =wmi_call (wil,WMI_NOTIFY_REQ_CMDID , vif->mid, &cmd,sizeof (cmd),WMI_NOTIFY_REQ_DONE_EVENTID , &reply,sizeof (reply),20 );if (rc)
@@ -2246,7 +2248,9 @@ static int wil_rf_sector_get_cfg(struct wiphy *wiphy,struct {struct wmi_cmd_hdr wmi;struct wmi_get_rf_sector_params_done_event evt; - } __packed reply; + } __packed reply = { + .evt = {.status =WMI_RF_SECTOR_STATUS_NOT_SUPPORTED_ERROR }, + };struct sk_buff *msg;struct nlattr *nl_cfgs, *nl_cfg;u32 i;
@@ -2292,7 +2296,6 @@ static int wil_rf_sector_get_cfg(struct wiphy *wiphy, cmd.sector_idx =cpu_to_le16 (sector_index); cmd.sector_type = sector_type; cmd.rf_modules_vec = rf_modules_vec &0xFF ; -memset (&reply,0 ,sizeof (reply)); rc = wmi_call(wil, WMI_GET_RF_SECTOR_PARAMS_CMDID, vif->mid, &cmd, sizeof(cmd), WMI_GET_RF_SECTOR_PARAMS_DONE_EVENTID, &reply, sizeof(reply),
@@ -2367,7 +2370,9 @@ static int wil_rf_sector_set_cfg(struct wiphy *wiphy,struct {struct wmi_cmd_hdr wmi;struct wmi_set_rf_sector_params_done_event evt; - } __packed reply; + } __packed reply = { + .evt = {.status =WMI_RF_SECTOR_STATUS_NOT_SUPPORTED_ERROR }, + };struct nlattr *nl_cfg;struct wmi_rf_sector_info *si;
@@ -2450,7 +2455,6 @@ static int wil_rf_sector_set_cfg(struct wiphy *wiphy, } cmd.rf_modules_vec = rf_modules_vec &0xFF ; -memset (&reply,0 ,sizeof (reply)); rc = wmi_call(wil, WMI_SET_RF_SECTOR_PARAMS_CMDID, vif->mid, &cmd, sizeof(cmd), WMI_SET_RF_SECTOR_PARAMS_DONE_EVENTID, &reply, sizeof(reply),
@@ -2474,7 +2478,9 @@ static int wil_rf_sector_get_selected(struct wiphy *wiphy,struct {struct wmi_cmd_hdr wmi;struct wmi_get_selected_rf_sector_index_done_event evt; - } __packed reply; + } __packed reply = { + .evt = {.status =WMI_RF_SECTOR_STATUS_NOT_SUPPORTED_ERROR }, + };struct sk_buff *msg;if (!test_bit (WMI_FW_CAPABILITY_RF_SECTORS , wil->fw_capabilities))
@@ -2514,7 +2520,6 @@ static int wil_rf_sector_get_selected(struct wiphy *wiphy,memset (&cmd,0 ,sizeof (cmd)); cmd.cid = (u8 )cid; cmd.sector_type = sector_type; -memset (&reply,0 ,sizeof (reply)); rc = wmi_call(wil, WMI_GET_SELECTED_RF_SECTOR_INDEX_CMDID, vif->mid, &cmd, sizeof(cmd), WMI_GET_SELECTED_RF_SECTOR_INDEX_DONE_EVENTID,
@@ -2555,14 +2560,15 @@ static int wil_rf_sector_wmi_set_selected(struct wil6210_priv *wil,struct {struct wmi_cmd_hdr wmi;struct wmi_set_selected_rf_sector_index_done_event evt; - } __packed reply; + } __packed reply = { + .evt = {.status =WMI_RF_SECTOR_STATUS_NOT_SUPPORTED_ERROR }, + };int rc;memset (&cmd,0 ,sizeof (cmd)); cmd.sector_idx =cpu_to_le16 (sector_index); cmd.sector_type = sector_type; cmd.cid = (u8 )cid; -memset (&reply,0 ,sizeof (reply)); rc = wmi_call(wil, WMI_SET_SELECTED_RF_SECTOR_INDEX_CMDID, mid, &cmd, sizeof(cmd), WMI_SET_SELECTED_RF_SECTOR_INDEX_DONE_EVENTID,
drivers/net/wireless/ath/wil6210/debugfs.c +2 -0
@@ -1078,6 +1078,8 @@ static int wil_bf_debugfs_show(struct seq_file *s, void *data)struct wmi_notify_req_done_event evt; }__packed reply; +memset (&reply,0 ,sizeof (reply)); +for (i =0 ; i <ARRAY_SIZE (wil->sta); i++) {u32 status;
drivers/net/wireless/ath/wil6210/main.c +2 -0
@@ -342,6 +342,8 @@ void wil_disconnect_worker(struct work_struct *work)/* already disconnected */ return ; +memset (&reply,0 ,sizeof (reply)); + rc =wmi_call (wil,WMI_DISCONNECT_CMDID , vif->mid,NULL ,0 ,WMI_DISCONNECT_EVENTID , &reply,sizeof (reply),WIL6210_DISCONNECT_TO_MS );
drivers/net/wireless/ath/wil6210/txrx.c +6 -2
@@ -963,7 +963,9 @@ int wil_vring_init_tx(struct wil6210_vif *vif, int id, int size,struct {struct wmi_cmd_hdr wmi;struct wmi_vring_cfg_done_event cmd; - } __packed reply; + } __packed reply = { + .cmd = {.status =WMI_FW_STATUS_FAILURE }, + };struct vring *vring = &wil->vring_tx[id];struct vring_tx_data *txdata = &wil->vring_tx_data[id];
@@ -1045,7 +1047,9 @@ int wil_vring_init_bcast(struct wil6210_vif *vif, int id, int size)struct {struct wmi_cmd_hdr wmi;struct wmi_vring_cfg_done_event cmd; - } __packed reply; + } __packed reply = { + .cmd = {.status =WMI_FW_STATUS_FAILURE }, + };struct vring *vring = &wil->vring_tx[id];struct vring_tx_data *txdata = &wil->vring_tx_data[id];
drivers/net/wireless/ath/wil6210/wmi.c +61 -36
268 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v3 2/8 wil6210: align to latest auto generated wmi.h
In reply to Maya ErezFrom: Ahmad Masri <[email protected]>
Align to latest version of the auto generated wmi file describing the interface with FW
--- drivers/net/wireless/ath/wil6210/wmi.c | 6 +- drivers/net/wireless/ath/wil6210/wmi.h | 387 +++++++++++++++++++++++++++++++-- 2 files changed, 371 insertions(+), 22 deletions(-)
drivers/net/wireless/ath/wil6210/wmi.c +4 -2
@@ -1554,7 +1554,9 @@ int wmi_pcp_start(struct wil6210_vif *vif, .pcp_max_assoc_sta = max_assoc_sta, .hidden_ssid = hidden_ssid, .is_go = is_go, - .disable_ap_sme = disable_ap_sme, + .ap_sme_offload_mode = disable_ap_sme ? +WMI_AP_SME_OFFLOAD_PARTIAL : + WMI_AP_SME_OFFLOAD_FULL, .abft_len = wil->abft_len, };struct {
@@ -1574,7 +1576,7 @@ int wmi_pcp_start(struct wil6210_vif *vif, }if (disable_ap_sme && - !test_bit (WMI_FW_CAPABILITY_DISABLE_AP_SME , + !test_bit (WMI_FW_CAPABILITY_AP_SME_OFFLOAD_PARTIAL , wil->fw_capabilities)) {wil_err (wil,"disable_ap_sme not supported by FW\n" );return -EOPNOTSUPP ;
drivers/net/wireless/ath/wil6210/wmi.h +367 -20
689 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [v3,1/8] wil6210: disable tracing config option
In reply to Maya ErezQuoted 5 lines · Maya Erez
Disable
WIL6210_TRACINGby default to avoid its performance overhead.Signed-off-by Alexei Avshalom Lazar <[email protected]>Signed-off-by Maya Erez <[email protected]>Signed-off-by Kalle Valo <[email protected]>
8 patches applied to ath-next branch of ath.git, thanks.
777b4690fc4a wil6210: disable tracing config option 8a4fa21438e3 wil6210: align to latest auto generated wmi.h 9861bf3b818f wil6210: fix call to wil6210_disconnect during unload 5f85c7e702d2 wil6210: change reply_size arg to u16 in wmi_call 1c21cc5fc4df wil6210: move WMI functionality out of wil_cfg80211_mgmt_tx 807b086053df wil6210: Initialize reply struct of the WMI commands 37f8d26d8347 wil6210: remove unused rx_reorder members 3d6b72729cc2 wil6210: rate limit wil_rx_refill error
Signature · 3 lines
https://patchwork.kernel.org/patch/10388987/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches