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

qcacld-3.0: Replace soc level references of hw mode transition event

Browse Source 
Replace the obsolete WMI event WMI_SOC_HW_MODE_TRANSITION_EVENTID
with WMI_PDEV_HW_MODE_TRANSITION_EVENTID. The new event additionally
carries the pdev id.

Change-Id: Ic5d04ce63fbc582dbecb9052f490189c83094bb5
CRs-Fixed: 989502
This commit is contained in:
Manishekar Chandrasekaran
2016-04-27 12:59:20 +05:30
committed by Gerrit - the friendly Code Review server
parent 5d46f70d35
commit 05fd26715d
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/mac/src/include/sir_params.h
View File

@@ -589,7 +589,7 @@ typedef struct sSirMbMsgP2p {
#define SIR_HAL_START_STOP_LOGGING (SIR_HAL_ITC_MSG_TYPES_BEGIN + 328) #define SIR_HAL_START_STOP_LOGGING (SIR_HAL_ITC_MSG_TYPES_BEGIN + 328)
#define SIR_HAL_PDEV_SET_HW_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 329) #define SIR_HAL_PDEV_SET_HW_MODE (SIR_HAL_ITC_MSG_TYPES_BEGIN + 329)
#define SIR_HAL_PDEV_SET_HW_MODE_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 330) #define SIR_HAL_PDEV_SET_HW_MODE_RESP (SIR_HAL_ITC_MSG_TYPES_BEGIN + 330)
#define SIR_HAL_SOC_HW_MODE_TRANS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 331) #define SIR_HAL_PDEV_HW_MODE_TRANS_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 331)
#define SIR_HAL_SET_RSSI_MONITOR_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 333) #define SIR_HAL_SET_RSSI_MONITOR_REQ (SIR_HAL_ITC_MSG_TYPES_BEGIN + 333)
#define SIR_HAL_SET_IE_INFO (SIR_HAL_ITC_MSG_TYPES_BEGIN + 334) #define SIR_HAL_SET_IE_INFO (SIR_HAL_ITC_MSG_TYPES_BEGIN + 334)

2
core/mac/src/pe/lim/lim_process_message_queue.c
View File

@@ -2051,7 +2051,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
qdf_mem_free((void *)msg->bodyptr); qdf_mem_free((void *)msg->bodyptr);
msg->bodyptr = NULL; msg->bodyptr = NULL;
break; break;
case SIR_HAL_SOC_HW_MODE_TRANS_IND: case SIR_HAL_PDEV_HW_MODE_TRANS_IND:
lim_process_hw_mode_trans_ind(mac_ctx, msg->bodyptr); lim_process_hw_mode_trans_ind(mac_ctx, msg->bodyptr);
qdf_mem_free((void *)msg->bodyptr); qdf_mem_free((void *)msg->bodyptr);
msg->bodyptr = NULL; msg->bodyptr = NULL;

37
core/wma/src/wma_main.c
View File

@@ -2401,26 +2401,26 @@ fail:
} }
/** /**
* wma_soc_hw_mode_transition_evt_handler() - HW mode transition evt handler * wma_pdev_hw_mode_transition_evt_handler() - HW mode transition evt handler
* @handle: WMI handle * @handle: WMI handle
* @event: Event recevied from FW * @event: Event recevied from FW
* @len: Length of the event * @len: Length of the event
* *
* Event handler for WMI_SOC_HW_MODE_TRANSITION_EVENTID that indicates an * Event handler for WMI_PDEV_HW_MODE_TRANSITION_EVENTID that indicates an
* asynchronous hardware mode transition. This event notifies the host driver * asynchronous hardware mode transition. This event notifies the host driver
* that firmware independently changed the hardware mode for some reason, such * that firmware independently changed the hardware mode for some reason, such
* as Coex, LFR 3.0, etc * as Coex, LFR 3.0, etc
* *
* Return: Success on receiving valid params from FW * Return: Success on receiving valid params from FW
*/ */
static int wma_soc_hw_mode_transition_evt_handler(void *handle, static int wma_pdev_hw_mode_transition_evt_handler(void *handle,
uint8_t *event, uint8_t *event,
uint32_t len) uint32_t len)
{ {
uint32_t i; uint32_t i;
WMI_SOC_HW_MODE_TRANSITION_EVENTID_param_tlvs *param_buf; WMI_PDEV_HW_MODE_TRANSITION_EVENTID_param_tlvs *param_buf;
wmi_soc_hw_mode_transition_event_fixed_param *wmi_event; wmi_pdev_hw_mode_transition_event_fixed_param *wmi_event;
wmi_soc_set_hw_mode_response_vdev_mac_entry *vdev_mac_entry; wmi_pdev_set_hw_mode_response_vdev_mac_entry *vdev_mac_entry;
struct sir_hw_mode_trans_ind *hw_mode_trans_ind; struct sir_hw_mode_trans_ind *hw_mode_trans_ind;
tp_wma_handle wma = (tp_wma_handle) handle; tp_wma_handle wma = (tp_wma_handle) handle;
@@ -2430,10 +2430,10 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle,
return QDF_STATUS_E_NULL_VALUE; return QDF_STATUS_E_NULL_VALUE;
} }
param_buf = (WMI_SOC_HW_MODE_TRANSITION_EVENTID_param_tlvs *) event; param_buf = (WMI_PDEV_HW_MODE_TRANSITION_EVENTID_param_tlvs *) event;
if (!param_buf) { if (!param_buf) {
/* This is an async event. So, not sending any event to LIM */ /* This is an async event. So, not sending any event to LIM */
WMA_LOGE("Invalid WMI_SOC_HW_MODE_TRANSITION_EVENTID event"); WMA_LOGE("Invalid WMI_PDEV_HW_MODE_TRANSITION_EVENTID event");
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} }
@@ -2453,13 +2453,22 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle,
wmi_event->new_hw_mode_index, wmi_event->num_vdev_mac_entries); wmi_event->new_hw_mode_index, wmi_event->num_vdev_mac_entries);
vdev_mac_entry = vdev_mac_entry =
param_buf->wmi_soc_set_hw_mode_response_vdev_mac_mapping; param_buf->wmi_pdev_set_hw_mode_response_vdev_mac_mapping;
/* Store the vdev-mac map in WMA and prepare to send to HDD */ /* Store the vdev-mac map in WMA and prepare to send to HDD */
for (i = 0; i < wmi_event->num_vdev_mac_entries; i++) { for (i = 0; i < wmi_event->num_vdev_mac_entries; i++) {
uint32_t vdev_id, mac_id; uint32_t vdev_id, mac_id, pdev_id;
vdev_id = vdev_mac_entry[i].vdev_id; vdev_id = vdev_mac_entry[i].vdev_id;
mac_id = vdev_mac_entry[i].mac_id; pdev_id = vdev_mac_entry[i].pdev_id;
if (pdev_id == WMI_PDEV_ID_SOC) {
WMA_LOGE("%s: soc level id received for mac id)",
__func__);
QDF_BUG(0);
return QDF_STATUS_E_FAILURE;
}
mac_id = WMA_PDEV_TO_MAC_MAP(vdev_mac_entry[i].pdev_id);
WMA_LOGI("%s: vdev_id:%d mac_id:%d", WMA_LOGI("%s: vdev_id:%d mac_id:%d",
__func__, vdev_id, mac_id); __func__, vdev_id, mac_id);
@@ -2476,7 +2485,7 @@ static int wma_soc_hw_mode_transition_evt_handler(void *handle,
__func__, wma->old_hw_mode_index, wma->new_hw_mode_index); __func__, wma->old_hw_mode_index, wma->new_hw_mode_index);
/* Pass the message to PE */ /* Pass the message to PE */
wma_send_msg(wma, SIR_HAL_SOC_HW_MODE_TRANS_IND, wma_send_msg(wma, SIR_HAL_PDEV_HW_MODE_TRANS_IND,
(void *) hw_mode_trans_ind, 0); (void *) hw_mode_trans_ind, 0);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
@@ -2803,8 +2812,8 @@ QDF_STATUS wma_start(void *cds_ctx)
/* Initialize the WMI_SOC_HW_MODE_TRANSITION_EVENTID event handler */ /* Initialize the WMI_SOC_HW_MODE_TRANSITION_EVENTID event handler */
status = wmi_unified_register_event_handler(wma_handle->wmi_handle, status = wmi_unified_register_event_handler(wma_handle->wmi_handle,
WMI_SOC_HW_MODE_TRANSITION_EVENTID, WMI_PDEV_HW_MODE_TRANSITION_EVENTID,
wma_soc_hw_mode_transition_evt_handler, wma_pdev_hw_mode_transition_evt_handler,
WMA_RX_SERIALIZER_CTX); WMA_RX_SERIALIZER_CTX);
if (status != QDF_STATUS_SUCCESS) { if (status != QDF_STATUS_SUCCESS) {
WMA_LOGE("Failed to register hw mode transition event cb"); WMA_LOGE("Failed to register hw mode transition event cb");