samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Send AFC power update event during AFC power event failure

Browse Source 
When the target indicates a non-success status in the fw_status_code
as part of the AFC power event, the control is exited from
reg_process_afc_power_event without updating the super_chan_list,
and sending the AFC power update complete event.

Therefore, send AFC power update complete event during AFC power
event failure.

Change-Id: Iab3a73955cf6df8d999122f1ef36bf249e86d3bb
CRs-Fixed: 3298839
This commit is contained in:
Hariharan Basuthkar
2022-09-06 18:16:44 +05:30
committed by Madan Koyyalamudi
parent 76dd8f5ce7
commit 9af22d0f7b
1 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
umac/regulatory/core/src/reg_build_chan_list.c
View File

@@ -4290,6 +4290,22 @@ reg_client_afc_populate_channels(struct wlan_objmgr_psoc *psoc,
} }
#endif #endif
/**
* reg_reset_chan_list_and_power_event() - Reset AFC master chan list and
* super channel list. Set is_6g_afc_power_event_received to false
* @pdev_priv_obj: Pointer to pdev_priv_obj
*
* Return: void
*/
static void reg_reset_chan_list_and_power_event(
struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj)
{
reg_debug("Resetting the afc mas chan list and disabling SP channels");
pdev_priv_obj->is_6g_afc_power_event_received = false;
reg_disable_afc_mas_chan_list_channels(pdev_priv_obj);
reg_disable_sp_channels_in_super_chan_list(pdev_priv_obj);
}
/** /**
* reg_process_afc_expiry_event() - Process the afc expiry event and get the * reg_process_afc_expiry_event() - Process the afc expiry event and get the
* afc request id * afc request id
@@ -4357,9 +4373,7 @@ reg_process_afc_expiry_event(struct afc_regulatory_info *afc_info)
break; break;
case REG_AFC_EXPIRY_EVENT_SWITCH_TO_LPI: case REG_AFC_EXPIRY_EVENT_SWITCH_TO_LPI:
case REG_AFC_EXPIRY_EVENT_STOP_TX: case REG_AFC_EXPIRY_EVENT_STOP_TX:
pdev_priv_obj->is_6g_afc_power_event_received = false; reg_reset_chan_list_and_power_event(pdev_priv_obj);
reg_disable_afc_mas_chan_list_channels(pdev_priv_obj);
reg_disable_sp_channels_in_super_chan_list(pdev_priv_obj);
reg_client_afc_populate_channels(psoc, pdev); reg_client_afc_populate_channels(psoc, pdev);
if (tx_ops->trigger_acs_for_afc) if (tx_ops->trigger_acs_for_afc)
tx_ops->trigger_acs_for_afc(pdev); tx_ops->trigger_acs_for_afc(pdev);
@@ -4965,13 +4979,6 @@ reg_process_afc_power_event(struct afc_regulatory_info *afc_info)
QDF_TRACE(QDF_MODULE_ID_AFC, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_AFC, QDF_TRACE_LEVEL_DEBUG,
"Processing AFC Power event"); "Processing AFC Power event");
if (afc_info->power_info->fw_status_code !=
REG_FW_AFC_POWER_EVENT_SUCCESS) {
reg_err_rl("AFC Power event failure status code %d",
afc_info->power_info->fw_status_code);
return QDF_STATUS_E_FAILURE;
}
psoc = afc_info->psoc; psoc = afc_info->psoc;
soc_reg = reg_get_psoc_obj(psoc); soc_reg = reg_get_psoc_obj(psoc);
@@ -4993,13 +5000,6 @@ reg_process_afc_power_event(struct afc_regulatory_info *afc_info)
else else
dbg_id = WLAN_REGULATORY_SB_ID; dbg_id = WLAN_REGULATORY_SB_ID;
reg_debug("process reg afc master chan list");
this_mchan_params = &soc_reg->mas_chan_params[phy_id];
afc_mas_chan_list = this_mchan_params->mas_chan_list_6g_afc;
qdf_mem_zero(afc_mas_chan_list,
NUM_6GHZ_CHANNELS * sizeof(struct regulatory_channel));
reg_init_6ghz_master_chan(afc_mas_chan_list, soc_reg);
soc_reg->mas_chan_params[phy_id].is_6g_afc_power_event_received = true;
pdev = wlan_objmgr_get_pdev_by_id(psoc, pdev_id, dbg_id); pdev = wlan_objmgr_get_pdev_by_id(psoc, pdev_id, dbg_id);
if (!pdev) { if (!pdev) {
@@ -5015,6 +5015,24 @@ reg_process_afc_power_event(struct afc_regulatory_info *afc_info)
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
if (afc_info->power_info->fw_status_code !=
REG_FW_AFC_POWER_EVENT_SUCCESS) {
reg_err_rl("AFC Power event failure status code %d",
afc_info->power_info->fw_status_code);
reg_reset_chan_list_and_power_event(pdev_priv_obj);
reg_send_afc_power_event(pdev, afc_info->power_info);
wlan_objmgr_pdev_release_ref(pdev, dbg_id);
return QDF_STATUS_E_FAILURE;
}
reg_debug("process reg afc master chan list");
this_mchan_params = &soc_reg->mas_chan_params[phy_id];
afc_mas_chan_list = this_mchan_params->mas_chan_list_6g_afc;
qdf_mem_zero(afc_mas_chan_list,
NUM_6GHZ_CHANNELS * sizeof(struct regulatory_channel));
reg_init_6ghz_master_chan(afc_mas_chan_list, soc_reg);
soc_reg->mas_chan_params[phy_id].is_6g_afc_power_event_received = true;
reg_init_pdev_super_chan_list(pdev_priv_obj); reg_init_pdev_super_chan_list(pdev_priv_obj);
reg_init_6ghz_master_chan(pdev_priv_obj->afc_chan_list, soc_reg); reg_init_6ghz_master_chan(pdev_priv_obj->afc_chan_list, soc_reg);
/* Free the old power_info event if it was allocated */ /* Free the old power_info event if it was allocated */