RinCat/RTL88x2BU-Linux-Driver
1
0
Fork 0
mirror of https://github.com/RinCat/RTL88x2BU-Linux-Driver.git synced 2026-01-19 10:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 5.6.1.5

Browse Source
This commit is contained in:
Rin Cat
2019-11-14 18:16:30 -05:00
parent 20fba52b05
commit c8ee6e0746
63 changed files with 41239 additions and 40294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
hal/phydm/halrf/halrf.c
View File

@@ -952,6 +952,12 @@ void halrf_support_ability_debug(void *dm_void, char input[][16], u32 *_used,
"04. (( %s ))HAL_RF_TXGAPK\n",
((rf->rf_supportability & HAL_RF_TXGAPK) ? ("V") :
(".")));
#if (RTL8192F_SUPPORT == 1)
PDM_SNPF(out_len, used, output + used, out_len - used,
"07. (( %s ))HAL_2GBAND_SHIFT\n",
((rf->rf_supportability & HAL_2GBAND_SHIFT) ? ("V") :
(".")));
#endif
} else {
if (dm_value[1] == 1) /* enable */
rf->rf_supportability |= BIT(dm_value[0]);
@@ -968,6 +974,48 @@ void halrf_support_ability_debug(void *dm_void, char input[][16], u32 *_used,
*_out_len = out_len;
}
void halrf_support_band_shift_debug(void *dm_void, char input[][16], u32 *_used,
char *output, u32 *_out_len)
{
struct dm_struct *dm = (struct dm_struct *)dm_void;
struct _hal_rf_ *rf = &dm->rf_table;
//u32 band_value[2] = {00};
u32 dm_value[10] = {0};
u32 used = *_used;
u32 out_len = *_out_len;
u8 i;
#if (RTL8192F_SUPPORT == 1)
for (i = 0; i < 7; i++)
if (input[i + 1])
PHYDM_SSCANF(input[i + 2], DCMD_DECIMAL, &dm_value[i]);
if (!(rf->rf_supportability & HAL_2GBAND_SHIFT)) {
PDM_SNPF(out_len, used, output + used, out_len - used,
"\nCurr-RF_supportability[07. (( . ))HAL_2GBAND_SHIFT]\nNo RF Band Shift,default: 2.4G!\n");
} else {
if (dm_value[0] == 01) {
rf->rf_shift_band = HAL_RF_2P3;
PDM_SNPF(out_len, used, output + used, out_len - used,
"\n[rf_shift_band] = %d\nRF Band Shift to 2.3G!\n",
rf->rf_shift_band);
} else if (dm_value[0] == 02) {
rf->rf_shift_band = HAL_RF_2P5;
PDM_SNPF(out_len, used, output + used, out_len - used,
"\n[rf_shift_band] = %d\nRF Band Shift to 2.5G!\n",
rf->rf_shift_band);
} else {
rf->rf_shift_band = HAL_RF_2P4;
PDM_SNPF(out_len, used, output + used, out_len - used,
"\n[rf_shift_band] = %d\nNo RF Band Shift,default: 2.4G!\n",
rf->rf_shift_band);
}
}
*_used = used;
*_out_len = out_len;
#endif
}
void halrf_cmn_info_init(void *dm_void, enum halrf_cmninfo_init cmn_info,
u32 value)
{
@@ -1134,6 +1182,18 @@ void halrf_supportability_init_mp(void *dm_void)
0;
break;
#endif
#if (RTL8192F_SUPPORT == 1)
case ODM_RTL8192F:
rf->rf_supportability =
HAL_RF_TX_PWR_TRACK |
HAL_RF_IQK |
HAL_RF_LCK |
HAL_2GBAND_SHIFT |
/*@HAL_RF_DPK |*/
/*@HAL_RF_TXGAPK |*/
0;
break;
#endif
#if (RTL8195B_SUPPORT == 1)
case ODM_RTL8195B:
rf->rf_supportability =
@@ -1209,6 +1269,18 @@ void halrf_supportability_init(void *dm_void)
0;
break;
#endif
#if (RTL8192F_SUPPORT == 1)
case ODM_RTL8192F:
rf->rf_supportability =
HAL_RF_TX_PWR_TRACK |
HAL_RF_IQK |
HAL_RF_LCK |
HAL_2GBAND_SHIFT |
/*@HAL_RF_DPK |*/
/*@HAL_RF_TXGAPK |*/
0;
break;
#endif
#if (RTL8195B_SUPPORT == 1)
case ODM_RTL8195B:
rf->rf_supportability =

13
hal/phydm/halrf/halrf.h
View File

@@ -371,6 +371,7 @@ enum halrf_func_idx { /*F_XXX = PHYDM XXX function*/
RF03_DPK = 3,
RF04_TXGAPK = 4,
RF05_DACK = 5,
RF07_2GBAND_SHIFT = 7
};
enum halrf_ability {
@@ -379,7 +380,14 @@ enum halrf_ability {
HAL_RF_LCK = BIT(RF02_LCK),
HAL_RF_DPK = BIT(RF03_DPK),
HAL_RF_TXGAPK = BIT(RF04_TXGAPK),
HAL_RF_DACK = BIT(RF05_DACK)
HAL_RF_DACK = BIT(RF05_DACK),
HAL_2GBAND_SHIFT = BIT(RF07_2GBAND_SHIFT)
};
enum halrf_shift_band {
HAL_RF_2P4 = 0,
HAL_RF_2P3 = 1,
HAL_RF_2P5 = 2
};
enum halrf_dbg_comp {
@@ -430,6 +438,7 @@ struct _hal_rf_ {
/*update*/
u32 rf_supportability;
u8 rf_shift_band;
u8 eeprom_thermal;
u8 dpk_en; /*Enable Function DPK OFF/ON = 0/1*/
@@ -468,6 +477,8 @@ u8 halrf_match_iqk_version(void *dm_void);
void halrf_support_ability_debug(void *dm_void, char input[][16], u32 *_used,
char *output, u32 *_out_len);
void halrf_support_band_shift_debug(void *dm_void, char input[][16], u32 *_used,
char *output, u32 *_out_len);
void halrf_cmn_info_init(void *dm_void, enum halrf_cmninfo_init cmn_info,
u32 value);

6
hal/phydm/halrf/halrf_debug.c
View File

@@ -139,6 +139,7 @@ enum halrf_CMD_ID {
HALRF_IQK_INFO,
HALRF_IQK,
HALRF_IQK_DEBUG,
HAL_BAND_SHIFT,
};
struct halrf_command halrf_cmd_ary[] = {
@@ -149,6 +150,7 @@ struct halrf_command halrf_cmd_ary[] = {
{"iqk_info", HALRF_IQK_INFO},
{"iqk", HALRF_IQK},
{"iqk_dbg", HALRF_IQK_DEBUG},
{"band_shift", HAL_BAND_SHIFT},
};
void halrf_cmd_parser(void *dm_void, char input[][16], u32 *_used, char *output,
@@ -192,6 +194,10 @@ void halrf_cmd_parser(void *dm_void, char input[][16], u32 *_used, char *output,
halrf_support_ability_debug(dm, &input[0], &used, output,
&out_len);
break;
case HAL_BAND_SHIFT:
halrf_support_band_shift_debug(dm, &input[0], &used, output,
&out_len);
break;
case HALRF_DBG_COMP:
halrf_debug_trace(dm, &input[0], &used, output, &out_len);
break;

14
hal/phydm/halrf/rtl8822b/halrf_iqk_8822b.c
View File

@@ -318,13 +318,13 @@ void _iqk_restore_rf_8822b(struct dm_struct *dm, u32 *backup_rf_reg,
odm_set_rf_reg(dm, RF_PATH_B, RF_0xef, MASK20BITS, 0x0);
/*0xdf[4]=0*/
_iqk_rf_set_check_8822b(dm, RF_PATH_A, 0xdf,
RF_backup[0][RF_PATH_A] & (!BIT(4)));
RF_backup[0][RF_PATH_A] & (~BIT(4)));
_iqk_rf_set_check_8822b(dm, RF_PATH_B, 0xdf,
RF_backup[0][RF_PATH_B] & (!BIT(4)));
RF_backup[0][RF_PATH_B] & (~BIT(4)));
#if 0
/*odm_set_rf_reg(dm, RF_PATH_A, RF_0xdf, MASK20BITS, RF_backup[0][RF_PATH_A] & (!BIT(4)));*/
/*odm_set_rf_reg(dm, RF_PATH_B, RF_0xdf, MASK20BITS, RF_backup[0][RF_PATH_B] & (!BIT(4)));*/
/*odm_set_rf_reg(dm, RF_PATH_A, RF_0xdf, MASK20BITS, RF_backup[0][RF_PATH_A] & (~BIT(4)));*/
/*odm_set_rf_reg(dm, RF_PATH_B, RF_0xdf, MASK20BITS, RF_backup[0][RF_PATH_B] & (~BIT(4)));*/
#endif
for (i = 1; i < RF_REG_NUM_8822B; i++) {
@@ -443,11 +443,11 @@ void _iqk_reload_iqk_setting_8822b(struct dm_struct *dm, u8 ch,
odm_write_4byte(dm, 0x1bd8, data);
}
if (idx == 0) {
report = !(iqk->iqk_fail_report[ch][path][idx]);
report = ~(iqk->iqk_fail_report[ch][path][idx]);
odm_set_bb_reg(dm, iqk_apply[path],
BIT(0), report);
} else {
report = !(iqk->iqk_fail_report[ch][path][idx]);
report = ~(iqk->iqk_fail_report[ch][path][idx]);
odm_set_bb_reg(dm, iqk_apply[path],
BIT(10), report);
}
@@ -528,7 +528,7 @@ void _iqk_rf_setting_8822b(struct dm_struct *dm)
/*0xdf:B11 = 1,B4 = 0, B1 = 1*/
tmp = odm_get_rf_reg(dm, (enum rf_path)path,
RF_0xdf, MASK20BITS);
tmp = (tmp & (!BIT(4))) | BIT(1) | BIT(11);
tmp = (tmp & (~BIT(4))) | BIT(1) | BIT(11);
_iqk_rf_set_check_8822b(dm, (enum rf_path)path, 0xdf, tmp);
#if 0
/*odm_set_rf_reg(dm, (enum rf_path)path, RF_0xdf, MASK20BITS, tmp);*/

10
hal/phydm/phydm.c
View File

@@ -2809,6 +2809,11 @@ void odm_cancel_all_timers(struct dm_struct *dm)
#if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY))
odm_ant_div_timers(dm, CANCEL_ANTDIV_TIMMER);
#endif
#ifdef PHYDM_TDMA_DIG_SUPPORT
#ifdef IS_USE_NEW_TDMA
phydm_tdma_dig_timers(dm, CANCEL_TDMA_DIG_TIMMER);
#endif
#endif
#ifdef CONFIG_ADAPTIVE_SOML
phydm_adaptive_soml_timers(dm, CANCEL_SOML_TIMMER);
#endif
@@ -2837,6 +2842,11 @@ void odm_release_all_timers(struct dm_struct *dm)
#if (defined(CONFIG_PHYDM_ANTENNA_DIVERSITY))
odm_ant_div_timers(dm, RELEASE_ANTDIV_TIMMER);
#endif
#ifdef PHYDM_TDMA_DIG_SUPPORT
#ifdef IS_USE_NEW_TDMA
phydm_tdma_dig_timers(dm, RELEASE_TDMA_DIG_TIMMER);
#endif
#endif
#ifdef CONFIG_ADAPTIVE_SOML
phydm_adaptive_soml_timers(dm, RELEASE_SOML_TIMMER);
#endif

2
hal/phydm/phydm_ccx.c
View File

@@ -250,7 +250,7 @@ void phydm_fahm_set_th_by_igi(void *dm_void, u8 igi)
odm_set_bb_reg(dm, R_0x970, MASKDWORD, val);
val = BYTE_2_DWORD(f_th[7], f_th[6], f_th[5], f_th[4]);
odm_set_bb_reg(dm, R_0x974, MASKDWORD, val);
BYTE_2_DWORD(0, f_th[10], f_th[9], f_th[8]);
val = BYTE_2_DWORD(0, f_th[10], f_th[9], f_th[8]);
odm_set_bb_reg(dm, R_0x978, 0xffffff, val);
}
}

59
hal/phydm/phydm_dig.c
View File

@@ -776,9 +776,9 @@ void phydm_dig_init(void *dm_void)
#ifdef PHYDM_TDMA_DIG_SUPPORT
#if (DM_ODM_SUPPORT_TYPE & (ODM_WIN | ODM_CE))
dm->original_dig_restore = true;
dm->tdma_dig_timer_ms = DIG_TIMER_MS;
dm->tdma_dig_state_number = DIG_NUM_OF_TDMA_STATES;
dm->original_dig_restore = true;
dm->tdma_dig_state_number = DIG_NUM_OF_TDMA_STATES;
dm->tdma_dig_timer_ms = DIG_TIMER_MS;
#endif
#endif
#ifdef CFG_DIG_DAMPING_CHK
@@ -1666,9 +1666,9 @@ void phydm_tdma_dig_timer_check(void *dm_void)
dig_t->tdma_dig_cnt == dig_t->pre_tdma_dig_cnt) {
if (dm->support_ability & ODM_BB_DIG) {
#ifdef IS_USE_NEW_TDMA
if (dm->support_ic_type &
(ODM_RTL8198F | ODM_RTL8814B | ODM_RTL8822B |
ODM_RTL8812F)) {
if (dm->support_ic_type & (ODM_RTL8198F | ODM_RTL8814B |
ODM_RTL8812F | ODM_RTL8822B | ODM_RTL8192F |
ODM_RTL8821C)) {
PHYDM_DBG(dm, DBG_DIG,
"Check fail, Restart timer\n\n");
phydm_false_alarm_counter_reset(dm);
@@ -1676,7 +1676,7 @@ void phydm_tdma_dig_timer_check(void *dm_void)
dm->tdma_dig_timer_ms);
} else {
PHYDM_DBG(dm, DBG_DIG,
"Not 98F/14B/12F no SW timer\n");
"Not 98F/14B/12F/22B/92F/21C no SW timer\n");
}
#else
/*@if interrupt mask info is got.*/
@@ -1724,12 +1724,12 @@ void phydm_tdma_dig(void *dm_void)
u32 reg_c50 = 0;
#if (RTL8198F_SUPPORT || RTL8814B_SUPPORT || RTL8812F_SUPPORT ||\
RTL8822B_SUPPORT)
RTL8822B_SUPPORT || RTL8192F_SUPPORT || RTL8821C_SUPPORT)
#ifdef IS_USE_NEW_TDMA
if (dm->support_ic_type &
(ODM_RTL8198F | ODM_RTL8814B | ODM_RTL8812F |
ODM_RTL8822B)) {
PHYDM_DBG(dm, DBG_DIG, "98F/14B/12F, new tdma\n");
(ODM_RTL8198F | ODM_RTL8814B | ODM_RTL8812F | ODM_RTL8822B |
ODM_RTL8192F | ODM_RTL8821C)) {
PHYDM_DBG(dm, DBG_DIG, "98F/14B/12F/22B/92F/21C, new tdma\n");
return;
}
#endif
@@ -1940,6 +1940,25 @@ void phydm_false_alarm_counter_reset(void *dm_void)
dig_t->fa_end_timestamp = timestamp;
}
void phydm_tdma_dig_para_upd(void *dm_void, enum upd_type type, u8 input)
{
struct dm_struct *dm = (struct dm_struct *)dm_void;
switch (type) {
case ENABLE_TDMA:
dm->original_dig_restore = !((boolean)input);
break;
case MODE_DECISION:
if (input == MODE_PERFORMANCE)
dm->tdma_dig_state_number = DIG_NUM_OF_TDMA_STATES + 2;
else if (input == MODE_COVERAGE)
dm->tdma_dig_state_number = DIG_NUM_OF_TDMA_STATES;
else
dm->tdma_dig_state_number = DIG_NUM_OF_TDMA_STATES;
break;
}
}
#ifdef IS_USE_NEW_TDMA
void phydm_tdma_dig_timers(void *dm_void, u8 state)
{
@@ -2009,24 +2028,6 @@ u8 get_new_igi_bound(struct dm_struct *dm, u8 igi, u32 fa_cnt, u8 *rx_gain_max,
#endif
#endif
PHYDM_DBG(dm, DBG_DIG, "First connect: foce IGI=0x%x\n", igi);
} else if (dm->is_linked) {
PHYDM_DBG(dm, DBG_DIG, "Adjust IGI @ linked\n");
/* @4 Abnormal # beacon case */
/*#if (DM_ODM_SUPPORT_TYPE & (ODM_WIN | ODM_CE))
*if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 &&
*fa_cnt < DM_DIG_FA_TH1 && dm->bsta_state &&
*dm->support_ic_type != ODM_RTL8723D) {
*rx_gain_min = 0x1c;
*igi = *rx_gain_min;
*PHYDM_DBG(dm, DBG_DIG, "Beacon_num=%d,force igi=0x%x\n",
*dm->phy_dbg_info.num_qry_beacon_pkt, igi);
* } else {
*igi = phydm_new_igi_by_fa(dm, igi, fa_cnt, step);
*}
*#else
*igi = phydm_new_igi_by_fa(dm, igi, fa_cnt, step);
*#endif
*/
} else {
/* @2 Before link */
PHYDM_DBG(dm, DBG_DIG, "Adjust IGI before link\n");

17
hal/phydm/phydm_dig.h
View File

@@ -92,6 +92,17 @@ enum phydm_dig_mode {
PHYDM_DIG_COVERAGE_MODE = 1,
};
#ifdef PHYDM_TDMA_DIG_SUPPORT
enum upd_type {
ENABLE_TDMA,
MODE_DECISION
};
enum tdma_opmode {
MODE_PERFORMANCE = 1,
MODE_COVERAGE = 2
};
#ifdef IS_USE_NEW_TDMA
enum tdma_dig_timer {
INIT_TDMA_DIG_TIMMER,
@@ -105,6 +116,7 @@ enum tdma_dig_state {
NORMAL_DIG = 2
};
#endif
#endif
/*@--------------------Define Struct-----------------------------------*/
#ifdef CFG_DIG_DAMPING_CHK
@@ -145,7 +157,8 @@ struct phydm_dig_struct {
u16 fa_th[3];
#if (RTL8822B_SUPPORT || RTL8197F_SUPPORT || RTL8821C_SUPPORT ||\
RTL8198F_SUPPORT || RTL8192F_SUPPORT || RTL8195B_SUPPORT ||\
RTL8822C_SUPPORT || RTL8814B_SUPPORT || RTL8721D_SUPPORT)
RTL8822C_SUPPORT || RTL8814B_SUPPORT || RTL8721D_SUPPORT ||\
RTL8812F_SUPPORT || RTL8197G_SUPPORT)
u8 rf_gain_idx;
u8 agc_table_idx;
u8 big_jump_lmt[16];
@@ -291,6 +304,8 @@ void phydm_false_alarm_counter_acc(void *dm_void, boolean rssi_dump_en);
void phydm_false_alarm_counter_acc_reset(void *dm_void);
void phydm_tdma_dig_para_upd(void *dm_void, enum upd_type type, u8 input);
#ifdef IS_USE_NEW_TDMA
void phydm_tdma_dig_timers(void *dm_void, u8 state);

5
hal/phydm/phydm_features_ce.h
View File

@@ -51,12 +51,13 @@
/*@#define PHYDM_TDMA_DIG_SUPPORT*/
#if (RTL8822B_SUPPORT)
/*#define IS_USE_NEW_TDMA*/
#if (RTL8822B_SUPPORT || RTL8192F_SUPPORT || RTL8821C_SUPPORT)
#ifdef CONFIG_TDMADIG
#define PHYDM_TDMA_DIG_SUPPORT
#ifdef PHYDM_TDMA_DIG_SUPPORT
#define IS_USE_NEW_TDMA /*new tdma dig test*/
#endif
#endif
#endif
#if (RTL8814B_SUPPORT)

6
hal/phydm/phydm_precomp.h
View File

@@ -411,6 +411,9 @@ rtw_phydm_cfg_phy_para(
#endif
#if (RTL8192F_SUPPORT == 1)
#if (DM_ODM_SUPPORT_TYPE == ODM_CE)
#include "rtl8192f_hal.h"/*need to before rf.h*/
#endif
#include "rtl8192f/halhwimg8192f_mac.h"
#include "rtl8192f/halhwimg8192f_rf.h"
#include "rtl8192f/halhwimg8192f_bb.h"
@@ -422,9 +425,6 @@ rtw_phydm_cfg_phy_para(
#if (DM_ODM_SUPPORT_TYPE == ODM_AP)
#include "halrf/rtl8192f/halrf_dpk_8192f.h"
#endif
#if (DM_ODM_SUPPORT_TYPE == ODM_CE)
#include "rtl8192f_hal.h"
#endif
#endif
#if (RTL8721D_SUPPORT == 1)

8
hal/phydm/rtl8822b/halhwimg8822b_bb.c
View File

@@ -23,12 +23,10 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#include "mp_precomp.h"
#include "../phydm_precomp.h"
#define D_S_SIZE DELTA_SWINGIDX_SIZE
#if (RTL8822B_SUPPORT == 1)
static boolean
check_positive(struct dm_struct *dm,
@@ -10190,7 +10188,7 @@ odm_read_and_config_mp_8822b_agc_tab(struct dm_struct *dm)
u32
odm_get_version_mp_8822b_agc_tab(void)
{
return 112;
return 113;
}
/******************************************************************************
@@ -11756,7 +11754,7 @@ odm_read_and_config_mp_8822b_phy_reg(struct dm_struct *dm)
u32
odm_get_version_mp_8822b_phy_reg(void)
{
return 112;
return 113;
}
/******************************************************************************

2
hal/phydm/rtl8822b/halhwimg8822b_bb.h
View File

@@ -23,7 +23,7 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#if (RTL8822B_SUPPORT == 1)
#ifndef __INC_MP_BB_HW_IMG_8822B_H
#define __INC_MP_BB_HW_IMG_8822B_H

6
hal/phydm/rtl8822b/halhwimg8822b_mac.c
View File

@@ -23,12 +23,10 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#include "mp_precomp.h"
#include "../phydm_precomp.h"
#define D_S_SIZE DELTA_SWINGIDX_SIZE
#if (RTL8822B_SUPPORT == 1)
static boolean
check_positive(struct dm_struct *dm,
@@ -311,7 +309,7 @@ odm_read_and_config_mp_8822b_mac_reg(struct dm_struct *dm)
u32
odm_get_version_mp_8822b_mac_reg(void)
{
return 112;
return 113;
}
#endif /* end of HWIMG_SUPPORT*/

2
hal/phydm/rtl8822b/halhwimg8822b_mac.h
View File

@@ -23,7 +23,7 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#if (RTL8822B_SUPPORT == 1)
#ifndef __INC_MP_MAC_HW_IMG_8822B_H
#define __INC_MP_MAC_HW_IMG_8822B_H

116
hal/phydm/rtl8822b/halhwimg8822b_rf.c
View File

@@ -23,11 +23,12 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#include "mp_precomp.h"
#include "../phydm_precomp.h"
#define D_S_SIZE DELTA_SWINGIDX_SIZE
#define D_ST_SIZE DELTA_SWINTSSI_SIZE
#if (RTL8822B_SUPPORT == 1)
static boolean
@@ -4409,6 +4410,29 @@ const u32 array_mp_8822b_radioa[] = {
0x03F, 0x00000039,
0x033, 0x0000000A,
0x03F, 0x0000003C,
0x9300000c, 0x00000000, 0x40000000, 0x00000000,
0x033, 0x00000000,
0x03F, 0x0005142C,
0x033, 0x00000001,
0x03F, 0x0005144B,
0x033, 0x00000002,
0x03F, 0x0005144E,
0x033, 0x00000003,
0x03F, 0x00051C69,
0x033, 0x00000004,
0x03F, 0x00051C6C,
0x033, 0x00000005,
0x03F, 0x00051CE8,
0x033, 0x00000006,
0x03F, 0x00051CEB,
0x033, 0x00000007,
0x03F, 0x00051CEE,
0x033, 0x00000008,
0x03F, 0x00051CF1,
0x033, 0x00000009,
0x03F, 0x00051CF4,
0x033, 0x0000000A,
0x03F, 0x00051CF7,
0x93000012, 0x00000000, 0x40000000, 0x00000000,
0x033, 0x00000000,
0x03F, 0x00000002,
@@ -4672,6 +4696,7 @@ const u32 array_mp_8822b_radioa[] = {
0x0B0, 0x000FF0FC,
0x0C4, 0x00081402,
0x0CC, 0x00082000,
0x059, 0x00020000,
};
@@ -4738,7 +4763,7 @@ odm_read_and_config_mp_8822b_radioa(struct dm_struct *dm)
u32
odm_get_version_mp_8822b_radioa(void)
{
return 112;
return 113;
}
/******************************************************************************
@@ -8631,7 +8656,7 @@ const u32 array_mp_8822b_radiob[] = {
0x033, 0x00000004,
0x03F, 0x00051CA8,
0x033, 0x00000005,
0x03F, 0x00051CAB,
0x03F, 0x00051CE8,
0x033, 0x00000006,
0x03F, 0x00051CEB,
0x033, 0x00000007,
@@ -8829,6 +8854,7 @@ const u32 array_mp_8822b_radiob[] = {
0x03E, 0x00005934,
0x03F, 0x0005AFCF,
0x0EF, 0x00000000,
0x059, 0x00020000,
};
@@ -8895,7 +8921,7 @@ odm_read_and_config_mp_8822b_radiob(struct dm_struct *dm)
u32
odm_get_version_mp_8822b_radiob(void)
{
return 112;
return 113;
}
/******************************************************************************
@@ -16995,8 +17021,8 @@ odm_read_and_config_mp_8822b_txpwr_lmt_type4(struct dm_struct *dm)
#ifdef CONFIG_8822B_TYPE5
const char *array_mp_8822b_txpwr_lmt_type5[] = {
"FCC", "2.4G", "20M", "CCK", "1T", "01", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "01", "28",
"FCC", "2.4G", "20M", "CCK", "1T", "01", "30",
"ETSI", "2.4G", "20M", "CCK", "1T", "01", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "01", "30",
"IC", "2.4G", "20M", "CCK", "1T", "01", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "01", "34",
@@ -17004,7 +17030,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "01", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "01", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "02", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "02", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "02", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "02", "30",
"IC", "2.4G", "20M", "CCK", "1T", "02", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "02", "34",
@@ -17012,7 +17038,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "02", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "02", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "03", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "03", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "03", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "03", "30",
"IC", "2.4G", "20M", "CCK", "1T", "03", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "03", "34",
@@ -17020,7 +17046,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "03", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "03", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "04", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "04", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "04", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "04", "30",
"IC", "2.4G", "20M", "CCK", "1T", "04", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "04", "34",
@@ -17028,7 +17054,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "04", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "04", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "05", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "05", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "05", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "05", "30",
"IC", "2.4G", "20M", "CCK", "1T", "05", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "05", "34",
@@ -17036,7 +17062,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "05", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "05", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "06", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "06", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "06", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "06", "30",
"IC", "2.4G", "20M", "CCK", "1T", "06", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "06", "34",
@@ -17044,7 +17070,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "06", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "06", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "07", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "07", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "07", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "07", "30",
"IC", "2.4G", "20M", "CCK", "1T", "07", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "07", "34",
@@ -17052,7 +17078,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "07", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "07", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "08", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "08", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "08", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "08", "30",
"IC", "2.4G", "20M", "CCK", "1T", "08", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "08", "34",
@@ -17060,7 +17086,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "08", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "08", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "09", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "09", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "09", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "09", "30",
"IC", "2.4G", "20M", "CCK", "1T", "09", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "09", "34",
@@ -17068,31 +17094,31 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "09", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "09", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "10", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "10", "28",
"ETSI", "2.4G", "20M", "CCK", "1T", "10", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "10", "30",
"IC", "2.4G", "20M", "CCK", "1T", "10", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "10", "34",
"ACMA", "2.4G", "20M", "CCK", "1T", "10", "28",
"CHILE", "2.4G", "20M", "CCK", "1T", "10", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "10", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "11", "32",
"ETSI", "2.4G", "20M", "CCK", "1T", "11", "28",
"FCC", "2.4G", "20M", "CCK", "1T", "11", "30",
"ETSI", "2.4G", "20M", "CCK", "1T", "11", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "11", "30",
"IC", "2.4G", "20M", "CCK", "1T", "11", "32",
"KCC", "2.4G", "20M", "CCK", "1T", "11", "34",
"ACMA", "2.4G", "20M", "CCK", "1T", "11", "28",
"CHILE", "2.4G", "20M", "CCK", "1T", "11", "32",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "11", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "12", "26",
"ETSI", "2.4G", "20M", "CCK", "1T", "12", "28",
"FCC", "2.4G", "20M", "CCK", "1T", "12", "24",
"ETSI", "2.4G", "20M", "CCK", "1T", "12", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "12", "30",
"IC", "2.4G", "20M", "CCK", "1T", "12", "26",
"KCC", "2.4G", "20M", "CCK", "1T", "12", "34",
"ACMA", "2.4G", "20M", "CCK", "1T", "12", "28",
"CHILE", "2.4G", "20M", "CCK", "1T", "12", "26",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "12", "30",
"FCC", "2.4G", "20M", "CCK", "1T", "13", "20",
"ETSI", "2.4G", "20M", "CCK", "1T", "13", "28",
"FCC", "2.4G", "20M", "CCK", "1T", "13", "18",
"ETSI", "2.4G", "20M", "CCK", "1T", "13", "24",
"MKK", "2.4G", "20M", "CCK", "1T", "13", "28",
"IC", "2.4G", "20M", "CCK", "1T", "13", "20",
"KCC", "2.4G", "20M", "CCK", "1T", "13", "34",
@@ -17108,95 +17134,95 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "CCK", "1T", "14", "63",
"UKRAINE", "2.4G", "20M", "CCK", "1T", "14", "63",
"FCC", "2.4G", "20M", "OFDM", "1T", "01", "26",
"ETSI", "2.4G", "20M", "OFDM", "1T", "01", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "01", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "01", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "01", "26",
"KCC", "2.4G", "20M", "OFDM", "1T", "01", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "01", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "01", "26",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "01", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "02", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "02", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "02", "28",
"ETSI", "2.4G", "20M", "OFDM", "1T", "02", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "02", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "02", "30",
"KCC", "2.4G", "20M", "OFDM", "1T", "02", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "02", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "02", "30",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "02", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "03", "32",
"ETSI", "2.4G", "20M", "OFDM", "1T", "03", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "03", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "03", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "03", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "03", "32",
"KCC", "2.4G", "20M", "OFDM", "1T", "03", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "03", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "03", "32",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "03", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "04", "34",
"ETSI", "2.4G", "20M", "OFDM", "1T", "04", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "04", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "04", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "04", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "04", "34",
"KCC", "2.4G", "20M", "OFDM", "1T", "04", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "04", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "04", "34",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "04", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "05", "34",
"ETSI", "2.4G", "20M", "OFDM", "1T", "05", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "05", "32",
"ETSI", "2.4G", "20M", "OFDM", "1T", "05", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "05", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "05", "34",
"KCC", "2.4G", "20M", "OFDM", "1T", "05", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "05", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "05", "34",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "05", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "06", "34",
"ETSI", "2.4G", "20M", "OFDM", "1T", "06", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "06", "32",
"ETSI", "2.4G", "20M", "OFDM", "1T", "06", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "06", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "06", "34",
"KCC", "2.4G", "20M", "OFDM", "1T", "06", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "06", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "06", "34",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "06", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "07", "34",
"ETSI", "2.4G", "20M", "OFDM", "1T", "07", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "07", "32",
"ETSI", "2.4G", "20M", "OFDM", "1T", "07", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "07", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "07", "34",
"KCC", "2.4G", "20M", "OFDM", "1T", "07", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "07", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "07", "34",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "07", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "08", "34",
"ETSI", "2.4G", "20M", "OFDM", "1T", "08", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "08", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "08", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "08", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "08", "34",
"KCC", "2.4G", "20M", "OFDM", "1T", "08", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "08", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "08", "34",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "08", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "09", "32",
"ETSI", "2.4G", "20M", "OFDM", "1T", "09", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "09", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "09", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "09", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "09", "32",
"KCC", "2.4G", "20M", "OFDM", "1T", "09", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "09", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "09", "32",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "09", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "10", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "10", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "10", "28",
"ETSI", "2.4G", "20M", "OFDM", "1T", "10", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "10", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "10", "30",
"KCC", "2.4G", "20M", "OFDM", "1T", "10", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "10", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "10", "30",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "10", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "11", "28",
"ETSI", "2.4G", "20M", "OFDM", "1T", "11", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "11", "26",
"ETSI", "2.4G", "20M", "OFDM", "1T", "11", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "11", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "11", "28",
"KCC", "2.4G", "20M", "OFDM", "1T", "11", "34",
"ACMA", "2.4G", "20M", "OFDM", "1T", "11", "30",
"CHILE", "2.4G", "20M", "OFDM", "1T", "11", "28",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "11", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "12", "22",
"ETSI", "2.4G", "20M", "OFDM", "1T", "12", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "12", "20",
"ETSI", "2.4G", "20M", "OFDM", "1T", "12", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "12", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "12", "22",
"KCC", "2.4G", "20M", "OFDM", "1T", "12", "34",
@@ -17204,7 +17230,7 @@ const char *array_mp_8822b_txpwr_lmt_type5[] = {
"CHILE", "2.4G", "20M", "OFDM", "1T", "12", "22",
"UKRAINE", "2.4G", "20M", "OFDM", "1T", "12", "30",
"FCC", "2.4G", "20M", "OFDM", "1T", "13", "14",
"ETSI", "2.4G", "20M", "OFDM", "1T", "13", "30",
"ETSI", "2.4G", "20M", "OFDM", "1T", "13", "24",
"MKK", "2.4G", "20M", "OFDM", "1T", "13", "34",
"IC", "2.4G", "20M", "OFDM", "1T", "13", "14",
"KCC", "2.4G", "20M", "OFDM", "1T", "13", "34",

2
hal/phydm/rtl8822b/halhwimg8822b_rf.h
View File

@@ -23,7 +23,7 @@
*
*****************************************************************************/
/*Image2HeaderVersion: R3 1.4.5*/
/*Image2HeaderVersion: R3 1.5.3*/
#if (RTL8822B_SUPPORT == 1)
#ifndef __INC_MP_RF_HW_IMG_8822B_H
#define __INC_MP_RF_HW_IMG_8822B_H

6
hal/phydm/rtl8822b/phydm_hal_api8822b.c
View File

@@ -2240,9 +2240,6 @@ config_phydm_switch_bandwidth_8822b(struct dm_struct *dm,
/* @Modify RX DFIR parameters */
phydm_rxdfirpar_by_bw_8822b(dm, bandwidth);
/* Toggle IGI to let RF enter RX mode */
phydm_igi_toggle_8822b(dm);
/* @Modify CCA parameters */
phydm_ccapar_by_rfe_8822b(dm);
@@ -2263,6 +2260,9 @@ config_phydm_switch_bandwidth_8822b(struct dm_struct *dm,
odm_set_bb_reg(dm, R_0x808, MASKBYTE0, (dm->rx_ant_status |
(dm->rx_ant_status << 4)));
/* Toggle IGI to let RF enter RX mode */
phydm_igi_toggle_8822b(dm);
PHYDM_DBG(dm, ODM_PHY_CONFIG, "Success\n");
return true;
}

4
hal/phydm/rtl8822b/version_rtl8822b.h
View File

@@ -29,6 +29,6 @@
* You do not need to fill up the version.h anymore,
* only the maintenance supervisor fills it before formal release.
*/
#define RELEASE_DATE_8822B 20181002
#define RELEASE_DATE_8822B 20181129
#define COMMIT_BY_8822B "BB_Colin"
#define RELEASE_VERSION_8822B 112
#define RELEASE_VERSION_8822B 113