On 04/03/2019 12:23 AM, Rakesh Pillai wrote:
> Firmware sends peer sta kickout event to the driver
> along with the reason code for a particular peer.
>
> Currently the sta kickout event is delivered to the
> upper layer without checking if the reason code is
> valid or not. This causes frequent disconnection of
> the STA.
>
> Report low ack rssi event to mac80211 only if the reason
> code is valid.
>
> Tested HW: WCN3990
> Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
>
> Signed-off-by: Rakesh Pillai <pillair@xxxxxxxxxxxxxx>
> ---
> Changes from v1:
> - Added reason code in tlv structure, so that it does not break non-tlv wmi event parsing.
> ---
> drivers/net/wireless/ath/ath10k/wmi-tlv.c | 4 +++-
> drivers/net/wireless/ath/ath10k/wmi-tlv.h | 5 +++++
> drivers/net/wireless/ath/ath10k/wmi.c | 9 ++++++---
> drivers/net/wireless/ath/ath10k/wmi.h | 11 +++++++++++
> 4 files changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
> index 582fb11..9d6ee92 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
> @@ -876,7 +876,7 @@ static int ath10k_wmi_tlv_op_pull_peer_kick_ev(struct ath10k *ar,
> struct wmi_peer_kick_ev_arg *arg)
> {
> const void **tb;
> - const struct wmi_peer_sta_kickout_event *ev;
> + const struct wmi_tlv_peer_sta_kickout_event *ev;
> int ret;
>
> tb = ath10k_wmi_tlv_parse_alloc(ar, skb->data, skb->len, GFP_ATOMIC);
> @@ -893,6 +893,8 @@ static int ath10k_wmi_tlv_op_pull_peer_kick_ev(struct ath10k *ar,
> }
>
> arg->mac_addr = ev->peer_macaddr.addr;
> + arg->reason = __le32_to_cpu(ev->reason);
> + arg->reason_code_valid = true;
>
> kfree(tb);
> return 0;
> diff --git a/drivers/net/wireless/ath/ath10k/wmi-tlv.h b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
> index 65e6aa5..be68ac6 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.h
> @@ -1984,6 +1984,11 @@ struct wmi_tlv_diag_data_ev {
> __le32 num_items;
> } __packed;
>
> +struct wmi_tlv_peer_sta_kickout_event {
> + struct wmi_mac_addr peer_macaddr;
> + __le32 reason;
> +} __packed;
> +
> struct wmi_tlv_sta_keepalive_cmd {
> __le32 vdev_id;
> __le32 enabled;
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
> index 98a90e4..6603c31 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -3428,9 +3428,6 @@ void ath10k_wmi_event_peer_sta_kickout(struct ath10k *ar, struct sk_buff *skb)
> return;
> }
>
> - ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event peer sta kickout %pM\n",
> - arg.mac_addr);
> -
> rcu_read_lock();
>
> sta = ieee80211_find_sta_by_ifaddr(ar->hw, arg.mac_addr, NULL);
> @@ -3440,6 +3437,12 @@ void ath10k_wmi_event_peer_sta_kickout(struct ath10k *ar, struct sk_buff *skb)
> goto exit;
> }
>
> + if (arg.reason_code_valid &&
> + arg.reason == WMI_PEER_STA_KICKOUT_REASON_UNSPECIFIED)
> + goto exit;
> +
Why do we want this event not to be delivered to user space?
> + ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi event peer sta kickout %pM reason code %d\n",
> + arg.mac_addr, arg.reason);
> ieee80211_report_low_ack(sta, 10);
>
> exit:
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
> index e1c40bb..3ccd79e 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> @@ -6797,6 +6797,8 @@ struct wmi_vdev_start_ev_arg {
>
> struct wmi_peer_kick_ev_arg {
> const u8 *mac_addr;
> + u32 reason;
> + bool reason_code_valid;
> };
>
Adding extra members to this structure breaks structure consistency
between FW and host driver since FW doesn't have such members.
Peter
