Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <a22524899498365b0d136f399438306568e77064.1684163657.git.deren.wu@mediatek.com>
In-Reply-To: <a22524899498365b0d136f399438306568e77064.1684163657.git.deren.wu@mediatek.com>
From:   Sean Wang <sean.wang@kernel.org>
Date:   Tue, 16 May 2023 14:29:24 -0700
Message-ID: <CAGp9LzrN0Hz2J0QzYCpq1sHN4CANNHPrhtGj326b9wC6YO+15A@mail.gmail.com>
Subject: Re: [PATCH] wifi: mt76: mt7921e: report tx retries/failed counts in
 tx free event
To:     Deren Wu <deren.wu@mediatek.com>
Cc:     Felix Fietkau <nbd@nbd.name>,
        Lorenzo Bianconi <lorenzo@kernel.org>,
        Sean Wang <sean.wang@mediatek.com>,
        Soul Huang <Soul.Huang@mediatek.com>,
        Ming Yen Hsieh <mingyen.hsieh@mediatek.com>,
        Leon Yen <Leon.Yen@mediatek.com>,
        Eric-SY Chang <Eric-SY.Chang@mediatek.com>,
        KM Lin <km.lin@mediatek.com>,
        Robin Chiu <robin.chiu@mediatek.com>,
        CH Yeh <ch.yeh@mediatek.com>, Posh Sun <posh.sun@mediatek.com>,
        Stella Chang <Stella.Chang@mediatek.com>,
        Quan Zhou <quan.zhou@mediatek.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        Shayne Chen <shayne.chen@mediatek.com>,
        linux-wireless <linux-wireless@vger.kernel.org>,
        linux-mediatek <linux-mediatek@lists.infradead.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Deren,

On Mon, May 15, 2023 at 8:20=E2=80=AFAM Deren Wu <deren.wu@mediatek.com> wr=
ote:
>
> Get missing tx retries/failed counts from txfree done events and report
> them via mt7921_sta_statistics().
>
> Signed-off-by: Deren Wu <deren.wu@mediatek.com>

Reviewed-by: Sean Wang <sean.wang@mediatek.com>

> ---
> v1: based on "[v3,1/6] wifi: mt76: mt7915: report tx retries/failed count=
s for non-WED path"
> https://patchwork.kernel.org/project/linux-wireless/patch/e3cddf1cff5f060=
478c2de9e4e4021541549e750.1683670255.git.ryder.lee@mediatek.com/
> ---
>  drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h | 2 +-
>  drivers/net/wireless/mediatek/mt76/mt7921/mac.c       | 8 +++++++-
>  drivers/net/wireless/mediatek/mt76/mt7921/main.c      | 6 ++++++
>  3 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h b/driv=
ers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
> index a5ec0f631385..cb612d7c7616 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
> +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h
> @@ -34,7 +34,7 @@ enum {
>
>  #define MT_TX_FREE_MSDU_CNT            GENMASK(9, 0)
>  #define MT_TX_FREE_WLAN_ID             GENMASK(23, 14)
> -#define MT_TX_FREE_LATENCY             GENMASK(12, 0)
> +#define MT_TX_FREE_COUNT               GENMASK(12, 0)
>  /* 0: success, others: dropped */
>  #define MT_TX_FREE_STATUS              GENMASK(14, 13)
>  #define MT_TX_FREE_MSDU_ID             GENMASK(30, 16)
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/ne=
t/wireless/mediatek/mt76/mt7921/mac.c
> index 1675bf520481..a3d31b69217b 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
> @@ -614,6 +614,7 @@ static void mt7921_mac_tx_free(struct mt7921_dev *dev=
, void *data, int len)
>         struct mt76_dev *mdev =3D &dev->mt76;
>         struct mt76_txwi_cache *txwi;
>         struct ieee80211_sta *sta =3D NULL;
> +       struct mt76_wcid *wcid =3D NULL;
>         struct sk_buff *skb, *tmp;
>         void *end =3D data + len;
>         LIST_HEAD(free_list);
> @@ -637,7 +638,6 @@ static void mt7921_mac_tx_free(struct mt7921_dev *dev=
, void *data, int len)
>                  */
>                 if (info & MT_TX_FREE_PAIR) {
>                         struct mt7921_sta *msta;
> -                       struct mt76_wcid *wcid;
>                         u16 idx;
>
>                         count++;
> @@ -658,6 +658,12 @@ static void mt7921_mac_tx_free(struct mt7921_dev *de=
v, void *data, int len)
>                 msdu =3D FIELD_GET(MT_TX_FREE_MSDU_ID, info);
>                 stat =3D FIELD_GET(MT_TX_FREE_STATUS, info);
>
> +               if (wcid) {
> +                       wcid->stats.tx_retries +=3D
> +                               FIELD_GET(MT_TX_FREE_COUNT, info) - 1;
> +                       wcid->stats.tx_failed +=3D !!stat;
> +               }
> +
>                 txwi =3D mt76_token_release(mdev, msdu, &wake);
>                 if (!txwi)
>                         continue;
> diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/n=
et/wireless/mediatek/mt76/mt7921/main.c
> index 0c9a472bc81a..418a1fa67477 100644
> --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
> @@ -1400,6 +1400,12 @@ static void mt7921_sta_statistics(struct ieee80211=
_hw *hw,
>                 sinfo->txrate.he_dcm =3D txrate->he_dcm;
>                 sinfo->txrate.he_ru_alloc =3D txrate->he_ru_alloc;
>         }
> +       sinfo->tx_failed =3D msta->wcid.stats.tx_failed;
> +       sinfo->filled |=3D BIT_ULL(NL80211_STA_INFO_TX_FAILED);
> +
> +       sinfo->tx_retries =3D msta->wcid.stats.tx_retries;
> +       sinfo->filled |=3D BIT_ULL(NL80211_STA_INFO_TX_RETRIES);
> +
>         sinfo->txrate.flags =3D txrate->flags;
>         sinfo->filled |=3D BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
>
> --
> 2.18.0
>