2020-05-20 05:24:26

by Tony Chuang

Subject: [PATCH 6/7] rtw88: 8821c: add false alarm statistics

From: Tzu-En Huang <[email protected]>

This ops is used to do statistics of false alarm periodically,
and then fine tune RX initial gain to adaptive different
circumstance.
Implement check false alarm statistics for 8821c.

Signed-off-by: Tzu-En Huang <[email protected]>
Signed-off-by: Yan-Hsuan Chuang <[email protected]>
---
drivers/net/wireless/realtek/rtw88/rtw8821c.c | 49 +++++++++++++++++++
drivers/net/wireless/realtek/rtw88/rtw8821c.h | 8 +++
2 files changed, 57 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.c b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
index ce75715a0e83..7169e6fb9ca9 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
@@ -507,6 +507,54 @@ static void rtw8821c_set_tx_power_index(struct rtw_dev *rtwdev)
}
}

+static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev)
+{
+ struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+ u32 cck_enable;
+ u32 cck_fa_cnt;
+ u32 ofdm_fa_cnt;
+ u32 crc32_cnt;
+ u32 cca32_cnt;
+
+ cck_enable = rtw_read32(rtwdev, REG_RXPSEL) & BIT(28);
+ cck_fa_cnt = rtw_read16(rtwdev, REG_FA_CCK);
+ ofdm_fa_cnt = rtw_read16(rtwdev, REG_FA_OFDM);
+
+ dm_info->cck_fa_cnt = cck_fa_cnt;
+ dm_info->ofdm_fa_cnt = ofdm_fa_cnt;
+ dm_info->total_fa_cnt = ofdm_fa_cnt;
+ dm_info->total_fa_cnt += cck_enable ? cck_fa_cnt : 0;
+
+ crc32_cnt = rtw_read32(rtwdev, REG_CRC_CCK);
+ dm_info->cck_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
+ dm_info->cck_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);
+ crc32_cnt = rtw_read32(rtwdev, REG_CRC_OFDM);
+ dm_info->ofdm_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
+ dm_info->ofdm_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);
+ crc32_cnt = rtw_read32(rtwdev, REG_CRC_HT);
+ dm_info->ht_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
+ dm_info->ht_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);
+ crc32_cnt = rtw_read32(rtwdev, REG_CRC_VHT);
+ dm_info->vht_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
+ dm_info->vht_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);
+
+ cca32_cnt = rtw_read32(rtwdev, REG_CCA_OFDM);
+ dm_info->ofdm_cca_cnt = FIELD_GET(GENMASK(31, 16), cca32_cnt);
+ dm_info->total_cca_cnt = dm_info->ofdm_cca_cnt;
+ if (cck_enable) {
+ cca32_cnt = rtw_read32(rtwdev, 0xfcc);
+ dm_info->cck_cca_cnt = FIELD_GET(GENMASK(15, 0), cca32_cnt);
+ dm_info->total_cca_cnt += dm_info->cck_cca_cnt;
+ }
+
+ rtw_write32_set(rtwdev, REG_FAS, BIT(17));
+ rtw_write32_clr(rtwdev, REG_FAS, BIT(17));
+ rtw_write32_clr(rtwdev, REG_RXDESC, BIT(15));
+ rtw_write32_set(rtwdev, REG_RXDESC, BIT(15));
+ rtw_write32_set(rtwdev, 0xb58, BIT(0));
+ rtw_write32_clr(rtwdev, 0xb58, BIT(0));
+}
+
static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8821c[] = {
{0x0086,
RTW_PWR_CUT_ALL_MSK,
@@ -944,6 +992,7 @@ static struct rtw_chip_ops rtw8821c_ops = {
.set_antenna = NULL,
.set_tx_power_index = rtw8821c_set_tx_power_index,
.cfg_ldo25 = rtw8821c_cfg_ldo25,
+ .false_alarm_statistics = rtw8821c_false_alarm_statistics,
};

struct rtw_chip_info rtw8821c_hw_spec = {
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821c.h b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
index fbf71f71b6ad..962132226615 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
@@ -183,10 +183,12 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
#define REG_ACBB0 0x948
#define REG_ACBBRXFIR 0x94c
#define REG_ACGG2TBL 0x958
+#define REG_FAS 0x9a4
#define REG_RXSB 0xa00
#define REG_ADCINI 0xa04
#define REG_TXSF2 0xa24
#define REG_TXSF6 0xa28
+#define REG_FA_CCK 0xa5c
#define REG_RXDESC 0xa2c
#define REG_ENTXCCK 0xa80
#define REG_AGCTR_A 0xc08
@@ -200,6 +202,12 @@ _rtw_write32s_mask(struct rtw_dev *rtwdev, u32 addr, u32 mask, u32 data)
#define REG_RFEINV 0xcbc
#define REG_AGCTR_B 0xe08
#define REG_RXIGI_B 0xe50
+#define REG_CRC_CCK 0xf04
+#define REG_CRC_OFDM 0xf14
+#define REG_CRC_HT 0xf10
+#define REG_CRC_VHT 0xf0c
+#define REG_CCA_OFDM 0xf08
+#define REG_FA_OFDM 0xf48
#define REG_ANTWT 0x1904
#define REG_IQKFAILMSK 0x1bf0

--
2.17.1

2020-05-28 16:23:06

by Sebastian Andrzej Siewior

Subject: Re: [PATCH 6/7] rtw88: 8821c: add false alarm statistics

On 2020-05-20 13:23:34 [+0800], [email protected] wrote:
> From: Tzu-En Huang <[email protected]>
>
> This ops is used to do statistics of false alarm periodically,
> and then fine tune RX initial gain to adaptive different
> circumstance.
> Implement check false alarm statistics for 8821c.

I would use rtw_chip_ops::false_alarm_statistics() or so. Very nice.

> Signed-off-by: Tzu-En Huang <[email protected]>
> Signed-off-by: Yan-Hsuan Chuang <[email protected]>
> ---
…
> --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
> @@ -507,6 +507,54 @@ static void rtw8821c_set_tx_power_index(struct rtw_dev *rtwdev)
> }
> }
>
> +static void rtw8821c_false_alarm_statistics(struct rtw_dev *rtwdev)
> +{
> + struct rtw_dm_info *dm_info = &rtwdev->dm_info;
> + u32 cck_enable;
> + u32 cck_fa_cnt;
> + u32 ofdm_fa_cnt;
> + u32 crc32_cnt;
> + u32 cca32_cnt;
> +
> + cck_enable = rtw_read32(rtwdev, REG_RXPSEL) & BIT(28);
> + cck_fa_cnt = rtw_read16(rtwdev, REG_FA_CCK);
> + ofdm_fa_cnt = rtw_read16(rtwdev, REG_FA_OFDM);
> +
> + dm_info->cck_fa_cnt = cck_fa_cnt;
> + dm_info->ofdm_fa_cnt = ofdm_fa_cnt;

> + dm_info->total_fa_cnt = ofdm_fa_cnt;
> + dm_info->total_fa_cnt += cck_enable ? cck_fa_cnt : 0;

Since ofdm_fa_cnt isn't used otherwise you could do

if (cck_enable)
ofdm_fa_cnt += cck_fa_cnt;
dm_info->total_fa_cnt = ofdm_fa_cnt;

> + crc32_cnt = rtw_read32(rtwdev, REG_CRC_CCK);
> + dm_info->cck_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
> + dm_info->cck_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);

a space please

> + crc32_cnt = rtw_read32(rtwdev, REG_CRC_OFDM);
> + dm_info->ofdm_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
> + dm_info->ofdm_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);

a space please
> + crc32_cnt = rtw_read32(rtwdev, REG_CRC_HT);
> + dm_info->ht_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
> + dm_info->ht_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);

a space please
> + crc32_cnt = rtw_read32(rtwdev, REG_CRC_VHT);
> + dm_info->vht_ok_cnt = FIELD_GET(GENMASK(15, 0), crc32_cnt);
> + dm_info->vht_err_cnt = FIELD_GET(GENMASK(31, 16), crc32_cnt);
> +
> + cca32_cnt = rtw_read32(rtwdev, REG_CCA_OFDM);
> + dm_info->ofdm_cca_cnt = FIELD_GET(GENMASK(31, 16), cca32_cnt);
> + dm_info->total_cca_cnt = dm_info->ofdm_cca_cnt;
> + if (cck_enable) {
> + cca32_cnt = rtw_read32(rtwdev, 0xfcc);

would a register for 0xfcc look good?

> + dm_info->cck_cca_cnt = FIELD_GET(GENMASK(15, 0), cca32_cnt);
> + dm_info->total_cca_cnt += dm_info->cck_cca_cnt;
> + }
> +
> + rtw_write32_set(rtwdev, REG_FAS, BIT(17));
> + rtw_write32_clr(rtwdev, REG_FAS, BIT(17));
> + rtw_write32_clr(rtwdev, REG_RXDESC, BIT(15));
> + rtw_write32_set(rtwdev, REG_RXDESC, BIT(15));
> + rtw_write32_set(rtwdev, 0xb58, BIT(0));
> + rtw_write32_clr(rtwdev, 0xb58, BIT(0));
> +}
> +
> static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8821c[] = {
> {0x0086,
> RTW_PWR_CUT_ALL_MSK,

Sebastian