lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 464/917] mt76: mt7921: fix survey-dump reporting
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit 64ed76d118c656907ec1155f2cdd24de778470a2 ]

    Fix MIB tx-rx MIB counters for survey-dump reporting.

    Fixes: 163f4d22c118d ("mt76: mt7921: add MAC support")
    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 ++++
    drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 8 ++++++--
    2 files changed, 10 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    index a9ce10b988273..52d40385fab6c 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
    @@ -106,6 +106,10 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
    mt76_set(dev, MT_WF_RMAC_MIB_TIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);
    mt76_set(dev, MT_WF_RMAC_MIB_AIRTIME0(band), MT_WF_RMAC_MIB_RXTIME_EN);

    + /* enable MIB tx-rx time reporting */
    + mt76_set(dev, MT_MIB_SCR1(band), MT_MIB_TXDUR_EN);
    + mt76_set(dev, MT_MIB_SCR1(band), MT_MIB_RXDUR_EN);
    +
    mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 1536);
    /* disable rx rate report by default due to hw issues */
    mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);
    diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
    index b6944c867a573..26fb118237626 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
    +++ b/drivers/net/wireless/mediatek/mt76/mt7921/regs.h
    @@ -96,6 +96,10 @@
    #define MT_WF_MIB_BASE(_band) ((_band) ? 0xa4800 : 0x24800)
    #define MT_WF_MIB(_band, ofs) (MT_WF_MIB_BASE(_band) + (ofs))

    +#define MT_MIB_SCR1(_band) MT_WF_MIB(_band, 0x004)
    +#define MT_MIB_TXDUR_EN BIT(8)
    +#define MT_MIB_RXDUR_EN BIT(9)
    +
    #define MT_MIB_SDR3(_band) MT_WF_MIB(_band, 0x698)
    #define MT_MIB_SDR3_FCS_ERR_MASK GENMASK(31, 16)

    @@ -108,9 +112,9 @@
    #define MT_MIB_SDR34(_band) MT_WF_MIB(_band, 0x090)
    #define MT_MIB_MU_BF_TX_CNT GENMASK(15, 0)

    -#define MT_MIB_SDR36(_band) MT_WF_MIB(_band, 0x098)
    +#define MT_MIB_SDR36(_band) MT_WF_MIB(_band, 0x054)
    #define MT_MIB_SDR36_TXTIME_MASK GENMASK(23, 0)
    -#define MT_MIB_SDR37(_band) MT_WF_MIB(_band, 0x09c)
    +#define MT_MIB_SDR37(_band) MT_WF_MIB(_band, 0x058)
    #define MT_MIB_SDR37_RXTIME_MASK GENMASK(23, 0)

    #define MT_MIB_DR8(_band) MT_WF_MIB(_band, 0x0c0)
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:33    [W:4.027 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site