Commit 760bb2ab authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Kalle Valo
Browse files

rtw88: add CCK_PD debug log 



In order to help debugging in field, we add some log messages.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201109090123.9254-2-pkshih@realtek.com
parent 8f0cb24c

drivers/net/wireless/realtek/rtw88/phy.c

+6 −0
Original line number Diff line number Diff line
@@ -541,6 +541,12 @@ static void rtw_phy_cck_pd(struct rtw_dev *rtwdev) 
	else

		dm_info->cck_fa_avg = (dm_info->cck_fa_avg * 3 + cck_fa) >> 2;



	rtw_dbg(rtwdev, RTW_DBG_PHY, "IGI=0x%x, rssi_min=%d, cck_fa=%d\n",

		dm_info->igi_history[0], dm_info->min_rssi,

		dm_info->fa_history[0]);

	rtw_dbg(rtwdev, RTW_DBG_PHY, "cck_fa_avg=%d, cck_pd_default=%d\n",

		dm_info->cck_fa_avg, dm_info->cck_pd_default);



	level = rtw_phy_cck_pd_lv(rtwdev);



	if (level >= CCK_PD_LV_MAX)

drivers/net/wireless/realtek/rtw88/reg.h

+2 −0
Original line number Diff line number Diff line
@@ -489,6 +489,8 @@ 
#define REG_2ND_CCA_CTRL	0x0976



#define REG_CCK0_FAREPORT	0xa2c

#define BIT_CCK0_2RX		BIT(18)

#define BIT_CCK0_MRC		BIT(22)



#define REG_DIS_DPD		0x0a70

#define DIS_DPD_MASK		GENMASK(9, 0)

drivers/net/wireless/realtek/rtw88/rtw8723d.c

+12 −0
Original line number Diff line number Diff line
@@ -1503,10 +1503,22 @@ static void rtw8723d_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) 
{

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	u8 pd[CCK_PD_LV_MAX] = {3, 7, 13, 13, 13};

	u8 cck_n_rx;



	rtw_dbg(rtwdev, RTW_DBG_PHY, "lv: (%d) -> (%d)\n",

		dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A], new_lvl);



	if (dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A] == new_lvl)

		return;



	cck_n_rx = (rtw_read8_mask(rtwdev, REG_CCK0_FAREPORT, BIT_CCK0_2RX) &&

		    rtw_read8_mask(rtwdev, REG_CCK0_FAREPORT, BIT_CCK0_MRC)) ? 2 : 1;

	rtw_dbg(rtwdev, RTW_DBG_PHY,

		"is_linked=%d, lv=%d, n_rx=%d, cs_ratio=0x%x, pd_th=0x%x, cck_fa_avg=%d\n",

		rtw_is_assoc(rtwdev), new_lvl, cck_n_rx,

		dm_info->cck_pd_default + new_lvl * 2,

		pd[new_lvl], dm_info->cck_fa_avg);



	dm_info->cck_fa_avg = CCK_FA_AVG_RESET;



	dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A] = new_lvl;

drivers/net/wireless/realtek/rtw88/rtw8821c.c

+12 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) 
{

	struct rtw_dm_info *dm_info = &rtwdev->dm_info;

	u8 pd[CCK_PD_LV_MAX] = {3, 7, 13, 13, 13};

	u8 cck_n_rx;



	if (dm_info->min_rssi > 60) {

		new_lvl = 4;
@@ -1027,9 +1028,20 @@ static void rtw8821c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) 
		goto set_cck_pd;

	}



	rtw_dbg(rtwdev, RTW_DBG_PHY, "lv: (%d) -> (%d)\n",

		dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A], new_lvl);



	if (dm_info->cck_pd_lv[RTW_CHANNEL_WIDTH_20][RF_PATH_A] == new_lvl)

		return;



	cck_n_rx = (rtw_read8_mask(rtwdev, REG_CCK0_FAREPORT, BIT_CCK0_2RX) &&

		    rtw_read8_mask(rtwdev, REG_CCK0_FAREPORT, BIT_CCK0_MRC)) ? 2 : 1;

	rtw_dbg(rtwdev, RTW_DBG_PHY,

		"is_linked=%d, lv=%d, n_rx=%d, cs_ratio=0x%x, pd_th=0x%x, cck_fa_avg=%d\n",

		rtw_is_assoc(rtwdev), new_lvl, cck_n_rx,

		dm_info->cck_pd_default + new_lvl * 2,

		pd[new_lvl], dm_info->cck_fa_avg);



	dm_info->cck_fa_avg = CCK_FA_AVG_RESET;



set_cck_pd:

drivers/net/wireless/realtek/rtw88/rtw8822c.c

+8 −0
Original line number Diff line number Diff line
@@ -3454,6 +3454,10 @@ rtw8822c_phy_cck_pd_set_reg(struct rtw_dev *rtwdev, 
			 rtw8822c_cck_pd_reg[bw][nrx].reg_cs,

			 rtw8822c_cck_pd_reg[bw][nrx].mask_cs,

			 cs);



	rtw_dbg(rtwdev, RTW_DBG_PHY,

		"is_linked=%d, bw=%d, nrx=%d, cs_ratio=0x%x, pd_th=0x%x\n",

		rtw_is_assoc(rtwdev), bw, nrx, cs, pd);

}



static void rtw8822c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl)
@@ -3467,6 +3471,10 @@ static void rtw8822c_phy_cck_pd_set(struct rtw_dev *rtwdev, u8 new_lvl) 
	nrx = (u8)rtw_read32_mask(rtwdev, 0x1a2c, 0x60000);

	bw = (u8)rtw_read32_mask(rtwdev, 0x9b0, 0xc);



	rtw_dbg(rtwdev, RTW_DBG_PHY, "lv: (%d) -> (%d) bw=%d nr=%d cck_fa_avg=%d\n",

		dm_info->cck_pd_lv[bw][nrx], new_lvl, bw, nrx,

		dm_info->cck_fa_avg);



	if (dm_info->cck_pd_lv[bw][nrx] == new_lvl)

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE