From: Greg Kroah-Hartman Date: Thu, 11 May 2017 12:35:16 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.4.68~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=871469494ae853f11075049606944d1efa35d0eb;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: wlcore-add-rx_ba_win_size_change_event-event.patch wlcore-pass-win_size-taken-from-ieee80211_sta-to-fw.patch --- diff --git a/queue-4.9/series b/queue-4.9/series index 6bfcc1520f7..2900b62b1a2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -97,3 +97,5 @@ bpf-don-t-let-ldimm64-leak-map-addresses-on-unprivileged.patch net-mdio-mux-bcm-iproc-call-mdiobus_free-in-error-path.patch f2fs-sanity-check-segment-count.patch xen-revert-commits-da72ff5bfcb0-and-72a9b186292d.patch +wlcore-pass-win_size-taken-from-ieee80211_sta-to-fw.patch +wlcore-add-rx_ba_win_size_change_event-event.patch diff --git a/queue-4.9/wlcore-add-rx_ba_win_size_change_event-event.patch b/queue-4.9/wlcore-add-rx_ba_win_size_change_event-event.patch new file mode 100644 index 00000000000..117080f8e92 --- /dev/null +++ b/queue-4.9/wlcore-add-rx_ba_win_size_change_event-event.patch @@ -0,0 +1,87 @@ +From e7ee74b56f23ba447d3124f2eccc32033cca501d Mon Sep 17 00:00:00 2001 +From: Maxim Altshul +Date: Sun, 21 Aug 2016 14:24:25 +0300 +Subject: wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event + +From: Maxim Altshul + +commit e7ee74b56f23ba447d3124f2eccc32033cca501d upstream. + +This event is used by the Firmware to limit the RX BA win size +for a specific link. + +The event handler updates the new size in the mac's sta->sta struct. + +BA sessions opened for that link will use the new restricted +win_size. This limitation remains until a new update is received or +until the link is closed. + +Signed-off-by: Maxim Altshul +Signed-off-by: Kalle Valo +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ti/wl18xx/event.c | 28 ++++++++++++++++++++++++++++ + drivers/net/wireless/ti/wl18xx/event.h | 1 + + drivers/net/wireless/ti/wl18xx/main.c | 3 ++- + 3 files changed, 31 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ti/wl18xx/event.c ++++ b/drivers/net/wireless/ti/wl18xx/event.c +@@ -218,5 +218,33 @@ int wl18xx_process_mailbox_events(struct + if (vector & FW_LOGGER_INDICATION) + wlcore_event_fw_logger(wl); + ++ if (vector & RX_BA_WIN_SIZE_CHANGE_EVENT_ID) { ++ struct wl12xx_vif *wlvif; ++ struct ieee80211_vif *vif; ++ struct ieee80211_sta *sta; ++ u8 link_id = mbox->rx_ba_link_id; ++ u8 win_size = mbox->rx_ba_win_size; ++ const u8 *addr; ++ ++ wlvif = wl->links[link_id].wlvif; ++ vif = wl12xx_wlvif_to_vif(wlvif); ++ ++ /* Update RX aggregation window size and call ++ * MAC routine to stop active RX aggregations for this link ++ */ ++ if (wlvif->bss_type != BSS_TYPE_AP_BSS) ++ addr = vif->bss_conf.bssid; ++ else ++ addr = wl->links[link_id].addr; ++ ++ sta = ieee80211_find_sta(vif, addr); ++ if (sta) { ++ sta->max_rx_aggregation_subframes = win_size; ++ ieee80211_stop_rx_ba_session(vif, ++ wl->links[link_id].ba_bitmap, ++ addr); ++ } ++ } ++ + return 0; + } +--- a/drivers/net/wireless/ti/wl18xx/event.h ++++ b/drivers/net/wireless/ti/wl18xx/event.h +@@ -38,6 +38,7 @@ enum { + REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID = BIT(18), + DFS_CHANNELS_CONFIG_COMPLETE_EVENT = BIT(19), + PERIODIC_SCAN_REPORT_EVENT_ID = BIT(20), ++ RX_BA_WIN_SIZE_CHANGE_EVENT_ID = BIT(21), + SMART_CONFIG_SYNC_EVENT_ID = BIT(22), + SMART_CONFIG_DECODE_EVENT_ID = BIT(23), + TIME_SYNC_EVENT_ID = BIT(24), +--- a/drivers/net/wireless/ti/wl18xx/main.c ++++ b/drivers/net/wireless/ti/wl18xx/main.c +@@ -1041,7 +1041,8 @@ static int wl18xx_boot(struct wl1271 *wl + SMART_CONFIG_SYNC_EVENT_ID | + SMART_CONFIG_DECODE_EVENT_ID | + TIME_SYNC_EVENT_ID | +- FW_LOGGER_INDICATION; ++ FW_LOGGER_INDICATION | ++ RX_BA_WIN_SIZE_CHANGE_EVENT_ID; + + wl->ap_event_mask = MAX_TX_FAILURE_EVENT_ID; + diff --git a/queue-4.9/wlcore-pass-win_size-taken-from-ieee80211_sta-to-fw.patch b/queue-4.9/wlcore-pass-win_size-taken-from-ieee80211_sta-to-fw.patch new file mode 100644 index 00000000000..1b8bf078dcb --- /dev/null +++ b/queue-4.9/wlcore-pass-win_size-taken-from-ieee80211_sta-to-fw.patch @@ -0,0 +1,83 @@ +From 42c7372a111630dab200c2f959424f5ec3bf79a4 Mon Sep 17 00:00:00 2001 +From: Maxim Altshul +Date: Sun, 21 Aug 2016 14:24:24 +0300 +Subject: wlcore: Pass win_size taken from ieee80211_sta to FW + +From: Maxim Altshul + +commit 42c7372a111630dab200c2f959424f5ec3bf79a4 upstream. + +When starting a new BA session, we must pass the win_size to the FW. + +To do this we take max_rx_aggregation_subframes (BA RX win size) +which is stored in ieee80211_sta structure (e.g per link and not per HW) + +We will use the value stored per link when passing the win_size to +firmware through the ACX_BA_SESSION_RX_SETUP command. + +Signed-off-by: Maxim Altshul +Signed-off-by: Kalle Valo +Signed-off-by: Amit Pundir +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ti/wlcore/acx.c | 5 +++-- + drivers/net/wireless/ti/wlcore/acx.h | 3 ++- + drivers/net/wireless/ti/wlcore/main.c | 6 ++++-- + 3 files changed, 9 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/ti/wlcore/acx.c ++++ b/drivers/net/wireless/ti/wlcore/acx.c +@@ -1419,7 +1419,8 @@ out: + + /* setup BA session receiver setting in the FW. */ + int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, +- u16 ssn, bool enable, u8 peer_hlid) ++ u16 ssn, bool enable, u8 peer_hlid, ++ u8 win_size) + { + struct wl1271_acx_ba_receiver_setup *acx; + int ret; +@@ -1435,7 +1436,7 @@ int wl12xx_acx_set_ba_receiver_session(s + acx->hlid = peer_hlid; + acx->tid = tid_index; + acx->enable = enable; +- acx->win_size = wl->conf.ht.rx_ba_win_size; ++ acx->win_size = win_size; + acx->ssn = ssn; + + ret = wlcore_cmd_configure_failsafe(wl, ACX_BA_SESSION_RX_SETUP, acx, +--- a/drivers/net/wireless/ti/wlcore/acx.h ++++ b/drivers/net/wireless/ti/wlcore/acx.h +@@ -1113,7 +1113,8 @@ int wl1271_acx_set_ht_information(struct + int wl12xx_acx_set_ba_initiator_policy(struct wl1271 *wl, + struct wl12xx_vif *wlvif); + int wl12xx_acx_set_ba_receiver_session(struct wl1271 *wl, u8 tid_index, +- u16 ssn, bool enable, u8 peer_hlid); ++ u16 ssn, bool enable, u8 peer_hlid, ++ u8 win_size); + int wl12xx_acx_tsf_info(struct wl1271 *wl, struct wl12xx_vif *wlvif, + u64 *mactime); + int wl1271_acx_ps_rx_streaming(struct wl1271 *wl, struct wl12xx_vif *wlvif, +--- a/drivers/net/wireless/ti/wlcore/main.c ++++ b/drivers/net/wireless/ti/wlcore/main.c +@@ -5285,7 +5285,9 @@ static int wl1271_op_ampdu_action(struct + } + + ret = wl12xx_acx_set_ba_receiver_session(wl, tid, *ssn, true, +- hlid); ++ hlid, ++ params->buf_size); ++ + if (!ret) { + *ba_bitmap |= BIT(tid); + wl->ba_rx_session_count++; +@@ -5306,7 +5308,7 @@ static int wl1271_op_ampdu_action(struct + } + + ret = wl12xx_acx_set_ba_receiver_session(wl, tid, 0, false, +- hlid); ++ hlid, 0); + if (!ret) { + *ba_bitmap &= ~BIT(tid); + wl->ba_rx_session_count--;