A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Pass correct data length in oem data response msg

Browse source 
Add data length information in oem data response messages. Currently
maximum response size is passed to upper layers.

Change-Id: Id74d44e03755af9a5402e5409ee5f6b5e7abbb7c
CRs-Fixed: 942260
This commit is contained in:
Krishna Kumaar Natarajan 2015-12-14 18:17:27 -08:00 • committed by Vishwajith Upendra
commit 608291e13b
7 changed files with 96 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/mac/inc/sir_api.h
View file

@ -916,7 +916,8 @@ typedef struct sSirOemDataRsp {
uint16_t messageType;
uint16_t length;
bool target_rsp;
uint8_t oemDataRsp[OEM_DATA_RSP_SIZE];
uint32_t rsp_len;
uint8_t *oem_data_rsp;
} tSirOemDataRsp, *tpSirOemDataRsp;
#endif /* FEATURE_OEM_DATA_SUPPORT */

3
core/mac/src/pe/include/lim_global.h
View file

@ -305,7 +305,8 @@ typedef struct sLimMlmOemDataReq {
typedef struct sLimMlmOemDataRsp {
bool target_rsp;
uint8_t oemDataRsp[OEM_DATA_RSP_SIZE];
uint32_t rsp_len;
uint8_t *oem_data_rsp;
} tLimMlmOemDataRsp, *tpLimMlmOemDataRsp;
#endif

32
core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
View file

@ -809,16 +809,30 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf,
/* get the pointer to the mlm message */
pMlmOemDataRsp = (tLimMlmOemDataRsp *) (pMsgBuf);
msgLength = sizeof(tSirOemDataRsp);
msgLength = sizeof(*pSirSmeOemDataRsp);
/* now allocate memory for the char buffer */
pSirSmeOemDataRsp = qdf_mem_malloc(msgLength);
pSirSmeOemDataRsp = qdf_mem_malloc(sizeof(*pSirSmeOemDataRsp));
if (NULL == pSirSmeOemDataRsp) {
lim_log(pMac, LOGP,
FL
("call to AllocateMemory failed for pSirSmeOemDataRsp"));
FL("malloc failed for pSirSmeOemDataRsp"));
qdf_mem_free(pMlmOemDataRsp->oem_data_rsp);
qdf_mem_free(pMlmOemDataRsp);
return;
}
if (pMlmOemDataRsp->rsp_len) {
pSirSmeOemDataRsp->oem_data_rsp =
qdf_mem_malloc(pMlmOemDataRsp->rsp_len);
if (!pSirSmeOemDataRsp->oem_data_rsp) {
lim_log(pMac, LOGE,
FL("malloc failed for oem_data_rsp"));
qdf_mem_free(pSirSmeOemDataRsp);
qdf_mem_free(pMlmOemDataRsp->oem_data_rsp);
qdf_mem_free(pMlmOemDataRsp);
return;
}
}
#if defined (ANI_LITTLE_BYTE_ENDIAN)
sir_store_u16_n((uint8_t *) &pSirSmeOemDataRsp->length, msgLength);
sir_store_u16_n((uint8_t *) &pSirSmeOemDataRsp->messageType,
@ -828,10 +842,14 @@ void lim_send_sme_oem_data_rsp(tpAniSirGlobal pMac, uint32_t *pMsgBuf,
pSirSmeOemDataRsp->messageType = eWNI_SME_OEM_DATA_RSP;
#endif
pSirSmeOemDataRsp->target_rsp = pMlmOemDataRsp->target_rsp;
qdf_mem_copy(pSirSmeOemDataRsp->oemDataRsp, pMlmOemDataRsp->oemDataRsp,
OEM_DATA_RSP_SIZE);
pSirSmeOemDataRsp->rsp_len = pMlmOemDataRsp->rsp_len;
if (pSirSmeOemDataRsp->rsp_len)
qdf_mem_copy(pSirSmeOemDataRsp->oem_data_rsp,
pMlmOemDataRsp->oem_data_rsp,
pSirSmeOemDataRsp->rsp_len);
/* Now free the memory from MLM Rsp Message */
qdf_mem_free(pMlmOemDataRsp->oem_data_rsp);
qdf_mem_free(pMlmOemDataRsp);
mmhMsg.type = eWNI_SME_OEM_DATA_RSP;

4
core/sme/inc/oem_data_api.h
View file

@ -49,6 +49,7 @@
/* message subtype for internal purpose */
#define OEM_MESSAGE_SUBTYPE_INTERNAL 0xdeadbeef
#define OEM_MESSAGE_SUBTYPE_LEN 4
/* Structure for defining req sent to the PE */
typedef struct tagOemDataReq {
@ -58,7 +59,8 @@ typedef struct tagOemDataReq {
} tOemDataReq, tOemDataReqConfig;
typedef struct tagOemDataRsp {
uint8_t oemDataRsp[OEM_DATA_RSP_SIZE];
uint8_t rsp_len;
uint8_t *oem_data_rsp;
} tOemDataRsp;
typedef enum {

5
core/sme/src/oem_data/oem_data_api.c
View file

@ -351,12 +351,13 @@ QDF_STATUS sme_handle_oem_data_rsp(tHalHandle hHal, uint8_t *pMsg)
FL("received target oem data resp"));
if (pMac->oemData.oem_data_rsp_callback != NULL)
pMac->oemData.oem_data_rsp_callback(
sizeof(tOemDataRsp),
&pOemDataRsp->oemDataRsp[0]);
pOemDataRsp->rsp_len,
pOemDataRsp->oem_data_rsp);
} else {
sms_log(pMac, LOG1,
FL("received internal oem data resp"));
}
qdf_mem_free(pOemDataRsp->oem_data_rsp);
} while (0);
return status;

7
core/wma/inc/wma_if.h
View file

@ -680,11 +680,14 @@ typedef struct {
/**
* struct tStartOemDataRsp - start OEM Data response
* @oemDataRsp: OEM Data response
* @target_rsp: Indicates if the rsp is from Target or WMA generated.
* @rsp_len: oem data response length
* @oem_data_rsp: pointer to OEM Data response
*/
typedef struct {
bool target_rsp;
uint8_t oemDataRsp[OEM_DATA_RSP_SIZE];
uint32_t rsp_len;
uint8_t *oem_data_rsp;
} tStartOemDataRsp, *tpStartOemDataRsp;
#endif /* FEATURE_OEM_DATA_SUPPORT */

79
core/wma/src/wma_features.c
View file

@ -1253,11 +1253,12 @@ int wma_oem_capability_event_callback(void *handle,
return -EINVAL;
}
/* wma puts 4 bytes prefix for msg subtype, so length
/*
* wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@ -1268,15 +1269,23 @@ int wma_oem_capability_event_callback(void *handle,
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
if (!pStartOemDataRsp->oem_data_rsp) {
WMA_LOGE(FL("malloc failed for oem_data_rsp"));
qdf_mem_free(pStartOemDataRsp);
return -ENOMEM;
}
qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_CAPABILITY_RSP;
qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
/* copy data after msg sub type */
qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
data, datalen);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
__func__, datalen);
__func__, pStartOemDataRsp->rsp_len);
wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)pStartOemDataRsp, 0);
return 0;
@ -1315,11 +1324,12 @@ int wma_oem_measurement_report_event_callback(void *handle,
return -EINVAL;
}
/* wma puts 4 bytes prefix for msg subtype, so length
/*
* wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@ -1330,12 +1340,20 @@ int wma_oem_measurement_report_event_callback(void *handle,
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
if (!pStartOemDataRsp->oem_data_rsp) {
WMA_LOGE(FL("malloc failed for oem_data_rsp"));
qdf_mem_free(pStartOemDataRsp);
return -ENOMEM;
}
qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_MEASUREMENT_RSP;
qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
/* copy data after msg sub type */
qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
data, pStartOemDataRsp->rsp_len);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
__func__, datalen);
@ -1376,11 +1394,12 @@ int wma_oem_error_report_event_callback(void *handle,
return -EINVAL;
}
/* wma puts 4 bytes prefix for msg subtype, so length
/*
* wma puts 4 bytes prefix for msg subtype, so length
* of data received from target should be 4 bytes less
* then max allowed
*/
if (datalen > (OEM_DATA_RSP_SIZE - 4)) {
if (datalen > (OEM_DATA_RSP_SIZE - OEM_MESSAGE_SUBTYPE_LEN)) {
WMA_LOGE("%s: Received data len (%d) exceeds max value (%d)",
__func__, datalen, (OEM_DATA_RSP_SIZE - 4));
return -EINVAL;
@ -1391,12 +1410,20 @@ int wma_oem_error_report_event_callback(void *handle,
WMA_LOGE("%s: Failed to alloc pStartOemDataRsp", __func__);
return -ENOMEM;
}
pStartOemDataRsp->rsp_len = datalen + OEM_MESSAGE_SUBTYPE_LEN;
pStartOemDataRsp->oem_data_rsp = qdf_mem_malloc(datalen);
if (!pStartOemDataRsp->oem_data_rsp) {
WMA_LOGE(FL("malloc failed for oem_data_rsp"));
qdf_mem_free(pStartOemDataRsp);
return -ENOMEM;
}
qdf_mem_zero(pStartOemDataRsp, sizeof(tStartOemDataRsp));
pStartOemDataRsp->target_rsp = true;
msg_subtype = (uint32_t *) (&pStartOemDataRsp->oemDataRsp[0]);
msg_subtype = (uint32_t *) pStartOemDataRsp->oem_data_rsp;
*msg_subtype = WMI_OEM_ERROR_REPORT_RSP;
qdf_mem_copy(&pStartOemDataRsp->oemDataRsp[4], data, datalen);
/* copy data after msg sub type */
qdf_mem_copy(pStartOemDataRsp->oem_data_rsp + OEM_MESSAGE_SUBTYPE_LEN,
data, pStartOemDataRsp->rsp_len);
WMA_LOGI("%s: Sending WMA_START_OEM_DATA_RSP, data len (%d)",
__func__, datalen);
@ -1420,7 +1447,7 @@ int wma_oem_data_response_handler(void *handle,
WMI_OEM_RESPONSE_EVENTID_param_tlvs *param_buf;
uint8_t *data;
uint32_t datalen;
tStartOemDataRsp *oem_data_rsp;
tStartOemDataRsp *oem_rsp;
param_buf = (WMI_OEM_RESPONSE_EVENTID_param_tlvs *) datap;
if (!param_buf) {
@ -1442,19 +1469,25 @@ int wma_oem_data_response_handler(void *handle,
return -EINVAL;
}
oem_data_rsp = qdf_mem_malloc(sizeof(*oem_data_rsp));
if (!oem_data_rsp) {
oem_rsp = qdf_mem_malloc(sizeof(*oem_rsp));
if (!oem_rsp) {
WMA_LOGE(FL("Failed to alloc oem_data_rsp"));
return -ENOMEM;
}
oem_rsp->rsp_len = datalen;
oem_rsp->oem_data_rsp = qdf_mem_malloc(datalen);
if (!oem_rsp->rsp_len) {
WMA_LOGE(FL("malloc failed for oem_data_rsp"));
qdf_mem_free(oem_rsp);
return -ENOMEM;
}
qdf_mem_zero(oem_data_rsp, sizeof(tStartOemDataRsp));
oem_data_rsp->target_rsp = true;
qdf_mem_copy(&oem_data_rsp->oemDataRsp[0], data, datalen);
oem_rsp->target_rsp = true;
qdf_mem_copy(oem_rsp->oem_data_rsp, data, datalen);
WMA_LOGI(FL("Sending WMA_START_OEM_DATA_RSP, data len %d"), datalen);
wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_data_rsp, 0);
wma_send_msg(wma, WMA_START_OEM_DATA_RSP, (void *)oem_rsp, 0);
return 0;
}