* [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor [not found] <cover.1661018051.git.namcaov@gmail.com> @ 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: hdegoede Cc: Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging, lkp, namcaov because this function is not used. Also remove function odm_InbandNoise_Monitor_NSeries because it is a static function which is only called from ODM_InbandNoise_Monitor. Signed-off-by: Nam Cao <namcaov@gmail.com> --- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- 2 files changed, 118 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c index 392cc8a398f5..b85b323cf5bd 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c @@ -17,114 +17,3 @@ #define Valid_Min -35 #define Valid_Max 10 #define ValidCnt 5 - -static s16 odm_InbandNoise_Monitor_NSeries( - struct dm_odm_t *pDM_Odm, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -) -{ - u32 tmp4b; - u8 max_rf_path = 0, rf_path; - u8 reg_c50, reg_c58, valid_done = 0; - struct noise_level noise_data; - u32 start = 0; - - pDM_Odm->noise_level.noise_all = 0; - - max_rf_path = 1; - - memset(&noise_data, 0, sizeof(struct noise_level)); - - /* */ - /* Step 1. Disable DIG && Set initial gain. */ - /* */ - - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); - /* */ - /* Step 2. Disable all power save for read registers */ - /* */ - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ - - /* */ - /* Step 3. Get noise power level */ - /* */ - start = jiffies; - while (1) { - - /* Stop updating idle time pwer report (for driver read) */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); - - /* Read Noise Floor Report */ - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); - - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ - /* if (max_rf_path == 2) */ - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ - - /* update idle time pwer report per 5us */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); - - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; - noise_data.sval[rf_path] /= 2; - } - /* mdelay(10); */ - /* msleep(10); */ - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { - noise_data.valid_cnt[rf_path]++; - noise_data.sum[rf_path] += noise_data.sval[rf_path]; - if (noise_data.valid_cnt[rf_path] == ValidCnt) { - valid_done++; - } - - } - - } - - /* printk("####### valid_done:%d #############\n", valid_done); */ - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ - if (noise_data.valid_cnt[rf_path]) - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; - else - noise_data.sum[rf_path] = 0; - } - break; - } - } - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); - reg_c50 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; - - if (max_rf_path == 2) { - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); - reg_c58 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; - } - pDM_Odm->noise_level.noise_all /= max_rf_path; - - /* */ - /* Step 4. Recover the Dig */ - /* */ - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); - - return pDM_Odm->noise_level.noise_all; - -} - -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) -{ - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); -} diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h index ab114543f39c..01c5c524d4e0 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h @@ -29,11 +29,4 @@ struct odm_noise_monitor { s16 noise_all; }; -s16 ODM_InbandNoise_Monitor( - void *pDM_VOID, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -); - #endif -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor @ 2022-08-20 18:00 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 4850 bytes --] because this function is not used. Also remove function odm_InbandNoise_Monitor_NSeries because it is a static function which is only called from ODM_InbandNoise_Monitor. Signed-off-by: Nam Cao <namcaov@gmail.com> --- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- 2 files changed, 118 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c index 392cc8a398f5..b85b323cf5bd 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c @@ -17,114 +17,3 @@ #define Valid_Min -35 #define Valid_Max 10 #define ValidCnt 5 - -static s16 odm_InbandNoise_Monitor_NSeries( - struct dm_odm_t *pDM_Odm, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -) -{ - u32 tmp4b; - u8 max_rf_path = 0, rf_path; - u8 reg_c50, reg_c58, valid_done = 0; - struct noise_level noise_data; - u32 start = 0; - - pDM_Odm->noise_level.noise_all = 0; - - max_rf_path = 1; - - memset(&noise_data, 0, sizeof(struct noise_level)); - - /* */ - /* Step 1. Disable DIG && Set initial gain. */ - /* */ - - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); - /* */ - /* Step 2. Disable all power save for read registers */ - /* */ - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ - - /* */ - /* Step 3. Get noise power level */ - /* */ - start = jiffies; - while (1) { - - /* Stop updating idle time pwer report (for driver read) */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); - - /* Read Noise Floor Report */ - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); - - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ - /* if (max_rf_path == 2) */ - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ - - /* update idle time pwer report per 5us */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); - - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; - noise_data.sval[rf_path] /= 2; - } - /* mdelay(10); */ - /* msleep(10); */ - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { - noise_data.valid_cnt[rf_path]++; - noise_data.sum[rf_path] += noise_data.sval[rf_path]; - if (noise_data.valid_cnt[rf_path] == ValidCnt) { - valid_done++; - } - - } - - } - - /* printk("####### valid_done:%d #############\n", valid_done); */ - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ - if (noise_data.valid_cnt[rf_path]) - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; - else - noise_data.sum[rf_path] = 0; - } - break; - } - } - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); - reg_c50 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; - - if (max_rf_path == 2) { - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); - reg_c58 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; - } - pDM_Odm->noise_level.noise_all /= max_rf_path; - - /* */ - /* Step 4. Recover the Dig */ - /* */ - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); - - return pDM_Odm->noise_level.noise_all; - -} - -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) -{ - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); -} diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h index ab114543f39c..01c5c524d4e0 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h @@ -29,11 +29,4 @@ struct odm_noise_monitor { s16 noise_all; }; -s16 ODM_InbandNoise_Monitor( - void *pDM_VOID, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -); - #endif -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor 2022-08-20 18:00 ` Nam Cao @ 2022-08-20 18:44 ` Nam Cao -1 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:44 UTC (permalink / raw) To: hdegoede Cc: Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging, lkp Please ignore these emails. They are detached from the thread for some reason. On Sat, Aug 20, 2022 at 8:00 PM Nam Cao <namcaov@gmail.com> wrote: > > because this function is not used. Also remove function > odm_InbandNoise_Monitor_NSeries because it is a static function > which is only called from ODM_InbandNoise_Monitor. > > Signed-off-by: Nam Cao <namcaov@gmail.com> > --- > .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ > .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- > 2 files changed, 118 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > index 392cc8a398f5..b85b323cf5bd 100644 > --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > @@ -17,114 +17,3 @@ > #define Valid_Min -35 > #define Valid_Max 10 > #define ValidCnt 5 > - > -static s16 odm_InbandNoise_Monitor_NSeries( > - struct dm_odm_t *pDM_Odm, > - u8 bPauseDIG, > - u8 IGIValue, > - u32 max_time > -) > -{ > - u32 tmp4b; > - u8 max_rf_path = 0, rf_path; > - u8 reg_c50, reg_c58, valid_done = 0; > - struct noise_level noise_data; > - u32 start = 0; > - > - pDM_Odm->noise_level.noise_all = 0; > - > - max_rf_path = 1; > - > - memset(&noise_data, 0, sizeof(struct noise_level)); > - > - /* */ > - /* Step 1. Disable DIG && Set initial gain. */ > - /* */ > - > - if (bPauseDIG) > - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); > - /* */ > - /* Step 2. Disable all power save for read registers */ > - /* */ > - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ > - > - /* */ > - /* Step 3. Get noise power level */ > - /* */ > - start = jiffies; > - while (1) { > - > - /* Stop updating idle time pwer report (for driver read) */ > - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); > - > - /* Read Noise Floor Report */ > - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); > - > - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ > - /* if (max_rf_path == 2) */ > - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ > - > - /* update idle time pwer report per 5us */ > - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); > - > - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); > - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); > - > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; > - noise_data.sval[rf_path] /= 2; > - } > - /* mdelay(10); */ > - /* msleep(10); */ > - > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { > - noise_data.valid_cnt[rf_path]++; > - noise_data.sum[rf_path] += noise_data.sval[rf_path]; > - if (noise_data.valid_cnt[rf_path] == ValidCnt) { > - valid_done++; > - } > - > - } > - > - } > - > - /* printk("####### valid_done:%d #############\n", valid_done); */ > - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ > - if (noise_data.valid_cnt[rf_path]) > - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; > - else > - noise_data.sum[rf_path] = 0; > - } > - break; > - } > - } > - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); > - reg_c50 &= ~BIT7; > - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; > - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; > - > - if (max_rf_path == 2) { > - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); > - reg_c58 &= ~BIT7; > - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; > - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; > - } > - pDM_Odm->noise_level.noise_all /= max_rf_path; > - > - /* */ > - /* Step 4. Recover the Dig */ > - /* */ > - if (bPauseDIG) > - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); > - > - return pDM_Odm->noise_level.noise_all; > - > -} > - > -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) > -{ > - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); > -} > diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > index ab114543f39c..01c5c524d4e0 100644 > --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > @@ -29,11 +29,4 @@ struct odm_noise_monitor { > s16 noise_all; > }; > > -s16 ODM_InbandNoise_Monitor( > - void *pDM_VOID, > - u8 bPauseDIG, > - u8 IGIValue, > - u32 max_time > -); > - > #endif > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor @ 2022-08-20 18:44 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:44 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 6398 bytes --] Please ignore these emails. They are detached from the thread for some reason. On Sat, Aug 20, 2022 at 8:00 PM Nam Cao <namcaov@gmail.com> wrote: > > because this function is not used. Also remove function > odm_InbandNoise_Monitor_NSeries because it is a static function > which is only called from ODM_InbandNoise_Monitor. > > Signed-off-by: Nam Cao <namcaov@gmail.com> > --- > .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ > .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- > 2 files changed, 118 deletions(-) > > diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > index 392cc8a398f5..b85b323cf5bd 100644 > --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c > @@ -17,114 +17,3 @@ > #define Valid_Min -35 > #define Valid_Max 10 > #define ValidCnt 5 > - > -static s16 odm_InbandNoise_Monitor_NSeries( > - struct dm_odm_t *pDM_Odm, > - u8 bPauseDIG, > - u8 IGIValue, > - u32 max_time > -) > -{ > - u32 tmp4b; > - u8 max_rf_path = 0, rf_path; > - u8 reg_c50, reg_c58, valid_done = 0; > - struct noise_level noise_data; > - u32 start = 0; > - > - pDM_Odm->noise_level.noise_all = 0; > - > - max_rf_path = 1; > - > - memset(&noise_data, 0, sizeof(struct noise_level)); > - > - /* */ > - /* Step 1. Disable DIG && Set initial gain. */ > - /* */ > - > - if (bPauseDIG) > - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); > - /* */ > - /* Step 2. Disable all power save for read registers */ > - /* */ > - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ > - > - /* */ > - /* Step 3. Get noise power level */ > - /* */ > - start = jiffies; > - while (1) { > - > - /* Stop updating idle time pwer report (for driver read) */ > - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); > - > - /* Read Noise Floor Report */ > - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); > - > - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ > - /* if (max_rf_path == 2) */ > - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ > - > - /* update idle time pwer report per 5us */ > - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); > - > - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); > - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); > - > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; > - noise_data.sval[rf_path] /= 2; > - } > - /* mdelay(10); */ > - /* msleep(10); */ > - > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { > - noise_data.valid_cnt[rf_path]++; > - noise_data.sum[rf_path] += noise_data.sval[rf_path]; > - if (noise_data.valid_cnt[rf_path] == ValidCnt) { > - valid_done++; > - } > - > - } > - > - } > - > - /* printk("####### valid_done:%d #############\n", valid_done); */ > - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { > - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { > - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ > - if (noise_data.valid_cnt[rf_path]) > - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; > - else > - noise_data.sum[rf_path] = 0; > - } > - break; > - } > - } > - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); > - reg_c50 &= ~BIT7; > - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; > - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; > - > - if (max_rf_path == 2) { > - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); > - reg_c58 &= ~BIT7; > - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; > - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; > - } > - pDM_Odm->noise_level.noise_all /= max_rf_path; > - > - /* */ > - /* Step 4. Recover the Dig */ > - /* */ > - if (bPauseDIG) > - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); > - > - return pDM_Odm->noise_level.noise_all; > - > -} > - > -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) > -{ > - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); > -} > diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > index ab114543f39c..01c5c524d4e0 100644 > --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h > @@ -29,11 +29,4 @@ struct odm_noise_monitor { > s16 noise_all; > }; > > -s16 ODM_InbandNoise_Monitor( > - void *pDM_VOID, > - u8 bPauseDIG, > - u8 IGIValue, > - u32 max_time > -); > - > #endif > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor 2022-08-20 18:44 ` Nam Cao @ 2022-08-22 8:21 ` Dan Carpenter -1 siblings, 0 replies; 12+ messages in thread From: Dan Carpenter @ 2022-08-22 8:21 UTC (permalink / raw) To: Nam Cao Cc: hdegoede, Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging, lkp On Sat, Aug 20, 2022 at 08:44:19PM +0200, Nam Cao wrote: > Please ignore these emails. They are detached from the thread for some reason. > It's actually normally better to just start a new thread when you resend. We used to tell people to use --in-reply-to but that ends up being a pain. The threads get messy. Also these days some subsystems use patchwork and patchwork does not like --in-reply-to. regards, dan carpenter ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor @ 2022-08-22 8:21 ` Dan Carpenter 0 siblings, 0 replies; 12+ messages in thread From: Dan Carpenter @ 2022-08-22 8:21 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 442 bytes --] On Sat, Aug 20, 2022 at 08:44:19PM +0200, Nam Cao wrote: > Please ignore these emails. They are detached from the thread for some reason. > It's actually normally better to just start a new thread when you resend. We used to tell people to use --in-reply-to but that ends up being a pain. The threads get messy. Also these days some subsystems use patchwork and patchwork does not like --in-reply-to. regards, dan carpenter ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 2/3] staging: rtl8723bs: remove member noise_level from struct dm_odm_t [not found] <cover.1661018051.git.namcaov@gmail.com> @ 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: hdegoede Cc: Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging, lkp, namcaov because it is not used. Signed-off-by: Nam Cao <namcaov@gmail.com> --- drivers/staging/rtl8723bs/hal/odm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 19cfc2915458..033f22b0f394 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -863,7 +863,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ u8 Adaptivity_IGI_upper; u8 NHM_cnt_0; - struct odm_noise_monitor noise_level;/* ODM_MAX_CHANNEL_NUM]; */ /* */ /* 2 Define STA info. */ /* _ODM_STA_INFO */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 2/3] staging: rtl8723bs: remove member noise_level from struct dm_odm_t @ 2022-08-20 18:00 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 647 bytes --] because it is not used. Signed-off-by: Nam Cao <namcaov@gmail.com> --- drivers/staging/rtl8723bs/hal/odm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 19cfc2915458..033f22b0f394 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -863,7 +863,6 @@ struct dm_odm_t { /* DM_Out_Source_Dynamic_Mechanism_Structure */ u8 Adaptivity_IGI_upper; u8 NHM_cnt_0; - struct odm_noise_monitor noise_level;/* ODM_MAX_CHANNEL_NUM]; */ /* */ /* 2 Define STA info. */ /* _ODM_STA_INFO */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 3/3] staging: rtl8723bs: remove odm_NoiseMonitor.h and odm_NoiseMonitor.c [not found] <cover.1661018051.git.namcaov@gmail.com> @ 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2022-08-20 18:00 ` Nam Cao 2 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: hdegoede Cc: Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging, lkp, namcaov because the content of these files is not used. Signed-off-by: Nam Cao <namcaov@gmail.com> --- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/hal/odm.h | 1 - .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 19 ----------- .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 32 ------------------- drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - 5 files changed, 54 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs/Makefile index 159ca1b9016b..bc7ff1dd14f9 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -33,7 +33,6 @@ r8723bs-y = \ hal/odm_DynamicTxPower.o \ hal/odm_EdcaTurboCheck.o \ hal/odm_HWConfig.o \ - hal/odm_NoiseMonitor.o \ hal/odm_RegConfig8723B.o \ hal/rtl8723b_cmd.o \ hal/rtl8723b_dm.o \ diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 033f22b0f394..fe9782d2d4fd 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -14,7 +14,6 @@ #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h" -#include "odm_NoiseMonitor.h" #define TP_MODE 0 #define RSSI_MODE 1 diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c deleted file mode 100644 index b85b323cf5bd..000000000000 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - ******************************************************************************/ - -#include "odm_precomp.h" - -/* This function is for inband noise test utility only */ -/* To obtain the inband noise level(dbm), do the following. */ -/* 1. disable DIG and Power Saving */ -/* 2. Set initial gain = 0x1a */ -/* 3. Stop updating idle time pwer report (for driver read) */ -/* - 0x80c[25] */ - -#define Valid_Min -35 -#define Valid_Max 10 -#define ValidCnt 5 diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h deleted file mode 100644 index 01c5c524d4e0..000000000000 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *****************************************************************************/ -#ifndef __ODMNOISEMONITOR_H__ -#define __ODMNOISEMONITOR_H__ - -#define ODM_MAX_CHANNEL_NUM 38/* 14+24 */ -struct noise_level { - /* u8 value_a, value_b; */ - u8 value[MAX_RF_PATH]; - /* s8 sval_a, sval_b; */ - s8 sval[MAX_RF_PATH]; - - /* s32 noise_a = 0, noise_b = 0, sum_a = 0, sum_b = 0; */ - /* s32 noise[ODM_RF_PATH_MAX]; */ - s32 sum[MAX_RF_PATH]; - /* u8 valid_cnt_a = 0, valid_cnt_b = 0, */ - u8 valid[MAX_RF_PATH]; - u8 valid_cnt[MAX_RF_PATH]; - -}; - - -struct odm_noise_monitor { - s8 noise[MAX_RF_PATH]; - s16 noise_all; -}; - -#endif diff --git a/drivers/staging/rtl8723bs/hal/odm_precomp.h b/drivers/staging/rtl8723bs/hal/odm_precomp.h index edce506022a5..2987857a8761 100644 --- a/drivers/staging/rtl8723bs/hal/odm_precomp.h +++ b/drivers/staging/rtl8723bs/hal/odm_precomp.h @@ -33,7 +33,6 @@ #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h" -#include "odm_NoiseMonitor.h" #include "HalPhyRf.h" #include "HalPhyRf_8723B.h"/* for IQK, LCK, Power-tracking */ #include "rtl8723b_hal.h" -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 3/3] staging: rtl8723bs: remove odm_NoiseMonitor.h and odm_NoiseMonitor.c @ 2022-08-20 18:00 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 4049 bytes --] because the content of these files is not used. Signed-off-by: Nam Cao <namcaov@gmail.com> --- drivers/staging/rtl8723bs/Makefile | 1 - drivers/staging/rtl8723bs/hal/odm.h | 1 - .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 19 ----------- .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 32 ------------------- drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 - 5 files changed, 54 deletions(-) delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h diff --git a/drivers/staging/rtl8723bs/Makefile b/drivers/staging/rtl8723bs/Makefile index 159ca1b9016b..bc7ff1dd14f9 100644 --- a/drivers/staging/rtl8723bs/Makefile +++ b/drivers/staging/rtl8723bs/Makefile @@ -33,7 +33,6 @@ r8723bs-y = \ hal/odm_DynamicTxPower.o \ hal/odm_EdcaTurboCheck.o \ hal/odm_HWConfig.o \ - hal/odm_NoiseMonitor.o \ hal/odm_RegConfig8723B.o \ hal/rtl8723b_cmd.o \ hal/rtl8723b_dm.o \ diff --git a/drivers/staging/rtl8723bs/hal/odm.h b/drivers/staging/rtl8723bs/hal/odm.h index 033f22b0f394..fe9782d2d4fd 100644 --- a/drivers/staging/rtl8723bs/hal/odm.h +++ b/drivers/staging/rtl8723bs/hal/odm.h @@ -14,7 +14,6 @@ #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h" -#include "odm_NoiseMonitor.h" #define TP_MODE 0 #define RSSI_MODE 1 diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c deleted file mode 100644 index b85b323cf5bd..000000000000 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - ******************************************************************************/ - -#include "odm_precomp.h" - -/* This function is for inband noise test utility only */ -/* To obtain the inband noise level(dbm), do the following. */ -/* 1. disable DIG and Power Saving */ -/* 2. Set initial gain = 0x1a */ -/* 3. Stop updating idle time pwer report (for driver read) */ -/* - 0x80c[25] */ - -#define Valid_Min -35 -#define Valid_Max 10 -#define ValidCnt 5 diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h deleted file mode 100644 index 01c5c524d4e0..000000000000 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ /dev/null @@ -1,32 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - *****************************************************************************/ -#ifndef __ODMNOISEMONITOR_H__ -#define __ODMNOISEMONITOR_H__ - -#define ODM_MAX_CHANNEL_NUM 38/* 14+24 */ -struct noise_level { - /* u8 value_a, value_b; */ - u8 value[MAX_RF_PATH]; - /* s8 sval_a, sval_b; */ - s8 sval[MAX_RF_PATH]; - - /* s32 noise_a = 0, noise_b = 0, sum_a = 0, sum_b = 0; */ - /* s32 noise[ODM_RF_PATH_MAX]; */ - s32 sum[MAX_RF_PATH]; - /* u8 valid_cnt_a = 0, valid_cnt_b = 0, */ - u8 valid[MAX_RF_PATH]; - u8 valid_cnt[MAX_RF_PATH]; - -}; - - -struct odm_noise_monitor { - s8 noise[MAX_RF_PATH]; - s16 noise_all; -}; - -#endif diff --git a/drivers/staging/rtl8723bs/hal/odm_precomp.h b/drivers/staging/rtl8723bs/hal/odm_precomp.h index edce506022a5..2987857a8761 100644 --- a/drivers/staging/rtl8723bs/hal/odm_precomp.h +++ b/drivers/staging/rtl8723bs/hal/odm_precomp.h @@ -33,7 +33,6 @@ #include "odm_DynamicBBPowerSaving.h" #include "odm_DynamicTxPower.h" #include "odm_CfoTracking.h" -#include "odm_NoiseMonitor.h" #include "HalPhyRf.h" #include "HalPhyRf_8723B.h"/* for IQK, LCK, Power-tracking */ #include "rtl8723b_hal.h" -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 0/3] remove useless files
@ 2022-08-20 18:00 Nam Cao
2022-08-20 18:34 ` Nam Cao
0 siblings, 1 reply; 12+ messages in thread
From: Nam Cao @ 2022-08-20 18:00 UTC (permalink / raw)
To: hdegoede
Cc: Larry.Finger, gregkh, kbuild-all, linux-kernel, linux-staging,
lkp, namcaov
Delete odm_NoiseMonitor.c and odm_NoiseMonitor.h because they are
useless. The first 2 commits are preparation, and the final commit is
actual removal.
v2: Add new patch to remove the file from Makefile, otherwise there is
build error as reported by kernel test bot.
v3: Squash some commits together. The patchset functionally remains
the same.
Nam Cao (3):
staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor
staging: rtl8723bs: remove member noise_level from struct dm_odm_t
staging: rtl8723bs: remove odm_NoiseMonitor.h and odm_NoiseMonitor.c
drivers/staging/rtl8723bs/Makefile | 1 -
drivers/staging/rtl8723bs/hal/odm.h | 2 -
.../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 130 ------------------
.../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 39 ------
drivers/staging/rtl8723bs/hal/odm_precomp.h | 1 -
5 files changed, 173 deletions(-)
delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c
delete mode 100644 drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h
--
2.25.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor 2022-08-20 18:00 [PATCH v3 0/3] remove useless files Nam Cao @ 2022-08-20 18:34 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:34 UTC (permalink / raw) To: namcaov Cc: Larry.Finger, gregkh, hdegoede, kbuild-all, linux-kernel, linux-staging, lkp because this function is not used. Also remove function odm_InbandNoise_Monitor_NSeries because it is a static function which is only called from ODM_InbandNoise_Monitor. Signed-off-by: Nam Cao <namcaov@gmail.com> --- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- 2 files changed, 118 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c index 392cc8a398f5..b85b323cf5bd 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c @@ -17,114 +17,3 @@ #define Valid_Min -35 #define Valid_Max 10 #define ValidCnt 5 - -static s16 odm_InbandNoise_Monitor_NSeries( - struct dm_odm_t *pDM_Odm, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -) -{ - u32 tmp4b; - u8 max_rf_path = 0, rf_path; - u8 reg_c50, reg_c58, valid_done = 0; - struct noise_level noise_data; - u32 start = 0; - - pDM_Odm->noise_level.noise_all = 0; - - max_rf_path = 1; - - memset(&noise_data, 0, sizeof(struct noise_level)); - - /* */ - /* Step 1. Disable DIG && Set initial gain. */ - /* */ - - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); - /* */ - /* Step 2. Disable all power save for read registers */ - /* */ - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ - - /* */ - /* Step 3. Get noise power level */ - /* */ - start = jiffies; - while (1) { - - /* Stop updating idle time pwer report (for driver read) */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); - - /* Read Noise Floor Report */ - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); - - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ - /* if (max_rf_path == 2) */ - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ - - /* update idle time pwer report per 5us */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); - - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; - noise_data.sval[rf_path] /= 2; - } - /* mdelay(10); */ - /* msleep(10); */ - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { - noise_data.valid_cnt[rf_path]++; - noise_data.sum[rf_path] += noise_data.sval[rf_path]; - if (noise_data.valid_cnt[rf_path] == ValidCnt) { - valid_done++; - } - - } - - } - - /* printk("####### valid_done:%d #############\n", valid_done); */ - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ - if (noise_data.valid_cnt[rf_path]) - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; - else - noise_data.sum[rf_path] = 0; - } - break; - } - } - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); - reg_c50 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; - - if (max_rf_path == 2) { - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); - reg_c58 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; - } - pDM_Odm->noise_level.noise_all /= max_rf_path; - - /* */ - /* Step 4. Recover the Dig */ - /* */ - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); - - return pDM_Odm->noise_level.noise_all; - -} - -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) -{ - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); -} diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h index ab114543f39c..01c5c524d4e0 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h @@ -29,11 +29,4 @@ struct odm_noise_monitor { s16 noise_all; }; -s16 ODM_InbandNoise_Monitor( - void *pDM_VOID, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -); - #endif -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor @ 2022-08-20 18:34 ` Nam Cao 0 siblings, 0 replies; 12+ messages in thread From: Nam Cao @ 2022-08-20 18:34 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 4850 bytes --] because this function is not used. Also remove function odm_InbandNoise_Monitor_NSeries because it is a static function which is only called from ODM_InbandNoise_Monitor. Signed-off-by: Nam Cao <namcaov@gmail.com> --- .../staging/rtl8723bs/hal/odm_NoiseMonitor.c | 111 ------------------ .../staging/rtl8723bs/hal/odm_NoiseMonitor.h | 7 -- 2 files changed, 118 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c index 392cc8a398f5..b85b323cf5bd 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c @@ -17,114 +17,3 @@ #define Valid_Min -35 #define Valid_Max 10 #define ValidCnt 5 - -static s16 odm_InbandNoise_Monitor_NSeries( - struct dm_odm_t *pDM_Odm, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -) -{ - u32 tmp4b; - u8 max_rf_path = 0, rf_path; - u8 reg_c50, reg_c58, valid_done = 0; - struct noise_level noise_data; - u32 start = 0; - - pDM_Odm->noise_level.noise_all = 0; - - max_rf_path = 1; - - memset(&noise_data, 0, sizeof(struct noise_level)); - - /* */ - /* Step 1. Disable DIG && Set initial gain. */ - /* */ - - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_PAUSE_DIG, IGIValue); - /* */ - /* Step 2. Disable all power save for read registers */ - /* */ - /* dcmd_DebugControlPowerSave(padapter, PSDisable); */ - - /* */ - /* Step 3. Get noise power level */ - /* */ - start = jiffies; - while (1) { - - /* Stop updating idle time pwer report (for driver read) */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 1); - - /* Read Noise Floor Report */ - tmp4b = PHY_QueryBBReg(pDM_Odm->Adapter, 0x8f8, bMaskDWord); - - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0, TestInitialGain); */ - /* if (max_rf_path == 2) */ - /* PHY_SetBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0, TestInitialGain); */ - - /* update idle time pwer report per 5us */ - PHY_SetBBReg(pDM_Odm->Adapter, rFPGA0_TxGainStage, BIT25, 0); - - noise_data.value[RF_PATH_A] = (u8)(tmp4b&0xff); - noise_data.value[RF_PATH_B] = (u8)((tmp4b&0xff00)>>8); - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - noise_data.sval[rf_path] = (s8)noise_data.value[rf_path]; - noise_data.sval[rf_path] /= 2; - } - /* mdelay(10); */ - /* msleep(10); */ - - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - if ((noise_data.valid_cnt[rf_path] < ValidCnt) && (noise_data.sval[rf_path] < Valid_Max && noise_data.sval[rf_path] >= Valid_Min)) { - noise_data.valid_cnt[rf_path]++; - noise_data.sum[rf_path] += noise_data.sval[rf_path]; - if (noise_data.valid_cnt[rf_path] == ValidCnt) { - valid_done++; - } - - } - - } - - /* printk("####### valid_done:%d #############\n", valid_done); */ - if ((valid_done == max_rf_path) || (jiffies_to_msecs(jiffies - start) > max_time)) { - for (rf_path = RF_PATH_A; rf_path < max_rf_path; rf_path++) { - /* printk("%s PATH_%d - sum = %d, valid_cnt = %d\n", __func__, rf_path, noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ - if (noise_data.valid_cnt[rf_path]) - noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; - else - noise_data.sum[rf_path] = 0; - } - break; - } - } - reg_c50 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XAAGCCore1, bMaskByte0); - reg_c50 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_A] = -110 + reg_c50 + noise_data.sum[RF_PATH_A]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_A]; - - if (max_rf_path == 2) { - reg_c58 = (s32)PHY_QueryBBReg(pDM_Odm->Adapter, rOFDM0_XBAGCCore1, bMaskByte0); - reg_c58 &= ~BIT7; - pDM_Odm->noise_level.noise[RF_PATH_B] = -110 + reg_c58 + noise_data.sum[RF_PATH_B]; - pDM_Odm->noise_level.noise_all += pDM_Odm->noise_level.noise[RF_PATH_B]; - } - pDM_Odm->noise_level.noise_all /= max_rf_path; - - /* */ - /* Step 4. Recover the Dig */ - /* */ - if (bPauseDIG) - odm_PauseDIG(pDM_Odm, ODM_RESUME_DIG, IGIValue); - - return pDM_Odm->noise_level.noise_all; - -} - -s16 ODM_InbandNoise_Monitor(void *pDM_VOID, u8 bPauseDIG, u8 IGIValue, u32 max_time) -{ - return odm_InbandNoise_Monitor_NSeries(pDM_VOID, bPauseDIG, IGIValue, max_time); -} diff --git a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h index ab114543f39c..01c5c524d4e0 100644 --- a/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h +++ b/drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h @@ -29,11 +29,4 @@ struct odm_noise_monitor { s16 noise_all; }; -s16 ODM_InbandNoise_Monitor( - void *pDM_VOID, - u8 bPauseDIG, - u8 IGIValue, - u32 max_time -); - #endif -- 2.25.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-08-22 8:21 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1661018051.git.namcaov@gmail.com>
2022-08-20 18:00 ` [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor Nam Cao
2022-08-20 18:00 ` Nam Cao
2022-08-20 18:44 ` Nam Cao
2022-08-20 18:44 ` Nam Cao
2022-08-22 8:21 ` Dan Carpenter
2022-08-22 8:21 ` Dan Carpenter
2022-08-20 18:00 ` [PATCH v3 2/3] staging: rtl8723bs: remove member noise_level from struct dm_odm_t Nam Cao
2022-08-20 18:00 ` Nam Cao
2022-08-20 18:00 ` [PATCH v3 3/3] staging: rtl8723bs: remove odm_NoiseMonitor.h and odm_NoiseMonitor.c Nam Cao
2022-08-20 18:00 ` Nam Cao
2022-08-20 18:00 [PATCH v3 0/3] remove useless files Nam Cao
2022-08-20 18:34 ` [PATCH v3 1/3] staging: rtl8723bs: remove unused function ODM_InbandNoise_Monitor Nam Cao
2022-08-20 18:34 ` Nam Cao
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.