samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

qcacld-3.0: Add qdf references in place of cdf

Bladeren bron 
Replace CDF references with QDF references.

Change-Id: Ifb4571174719b5fce61dd305545d05628265f317
CRs-Fixed: 981188
This commit is contained in:
Anurag Chouhan
2016-03-03 10:12:12 +05:30
gecommit door Gerrit - the friendly Code Review server
bovenliggende cbc6d72570
commit f04e84f24a
82 gewijzigde bestanden met toevoegingen van 884 en 876 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
core/bmi/inc/bmi.h
Bestand weergeven

@@ -38,7 +38,7 @@
#include "hif.h"
struct ol_context;
QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx);
QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx);
void ol_cds_free(void);
/**

28
core/bmi/src/bmi.c
Bestand weergeven

@@ -60,7 +60,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
{
struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
struct hif_opaque_softc *scn = ol_ctx->scn;
qdf_device_t cdf_dev = ol_ctx->cdf_dev;
qdf_device_t qdf_dev = ol_ctx->qdf_dev;
if (!scn) {
BMI_ERR("Invalid scn Context");
@@ -68,7 +68,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
return QDF_STATUS_NOT_INITIALIZED;
}
if (!cdf_dev->dev) {
if (!qdf_dev->dev) {
BMI_ERR("%s: Invalid Device Pointer", __func__);
return QDF_STATUS_NOT_INITIALIZED;
}
@@ -77,7 +77,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
if (!info->bmi_cmd_buff) {
info->bmi_cmd_buff =
qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
&info->bmi_cmd_da);
if (!info->bmi_cmd_buff) {
BMI_ERR("No Memory for BMI Command");
@@ -87,7 +87,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
if (!info->bmi_rsp_buff) {
info->bmi_rsp_buff =
qdf_mem_alloc_consistent(cdf_dev, cdf_dev->dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_alloc_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
&info->bmi_rsp_da);
if (!info->bmi_rsp_buff) {
BMI_ERR("No Memory for BMI Response");
@@ -96,7 +96,7 @@ QDF_STATUS bmi_init(struct ol_context *ol_ctx)
}
return QDF_STATUS_SUCCESS;
end:
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev, MAX_BMI_CMDBUF_SZ,
info->bmi_cmd_buff, info->bmi_cmd_da, 0);
info->bmi_cmd_buff = NULL;
return QDF_STATUS_E_NOMEM;
@@ -105,22 +105,24 @@ end:
void bmi_cleanup(struct ol_context *ol_ctx)
{
struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
qdf_device_t cdf_dev = ol_ctx->cdf_dev;
qdf_device_t qdf_dev = ol_ctx->qdf_dev;
if (!cdf_dev->dev) {
if (!qdf_dev->dev) {
BMI_ERR("%s: Invalid Device Pointer", __func__);
return;
}
if (info->bmi_cmd_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_cmd_buff, info->bmi_cmd_da, 0);
info->bmi_cmd_buff = NULL;
info->bmi_cmd_da = 0;
}
if (info->bmi_rsp_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_rsp_buff, info->bmi_rsp_da, 0);
info->bmi_rsp_buff = NULL;
info->bmi_rsp_da = 0;
@@ -517,12 +519,12 @@ end:
/**
* ol_cds_init() - API to initialize global CDS OL Context
* @cdf_dev: QDF Device
* @qdf_dev: QDF Device
* @hif_ctx: HIF Context
*
* Return: Success/Failure
*/
QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx)
QDF_STATUS ol_cds_init(qdf_device_t qdf_dev, void *hif_ctx)
{
struct ol_context *ol_info;
QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -539,11 +541,11 @@ QDF_STATUS ol_cds_init(qdf_device_t cdf_dev, void *hif_ctx)
return status;
}
ol_info->cdf_dev = cdf_dev;
ol_info->qdf_dev = qdf_dev;
ol_info->scn = hif_ctx;
ol_info->tgt_def.targetdef = hif_get_targetdef(hif_ctx);
qdf_create_work(cdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info);
qdf_create_work(qdf_dev, &ol_info->ramdump_work, ramdump_work_handler, ol_info);
return status;
}

10
core/bmi/src/bmi_1.c
Bestand weergeven

@@ -289,7 +289,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
int status;
uint32_t cid;
struct bmi_info *info;
qdf_device_t cdf_dev = ol_ctx->cdf_dev;
qdf_device_t qdf_dev = ol_ctx->qdf_dev;
qdf_dma_addr_t cmd, rsp;
if (!scn) {
@@ -298,7 +298,7 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
return QDF_STATUS_NOT_INITIALIZED;
}
if (!cdf_dev->dev) {
if (!qdf_dev->dev) {
BMI_ERR("%s: Invalid device pointer", __func__);
return QDF_STATUS_NOT_INITIALIZED;
}
@@ -333,14 +333,16 @@ QDF_STATUS bmi_done_local(struct ol_context *ol_ctx)
}
if (info->bmi_cmd_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_cmd_buff, info->bmi_cmd_da, 0);
info->bmi_cmd_buff = NULL;
info->bmi_cmd_da = 0;
}
if (info->bmi_rsp_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_rsp_buff, info->bmi_rsp_da, 0);
info->bmi_rsp_buff = NULL;
info->bmi_rsp_da = 0;

10
core/bmi/src/bmi_2.c
Bestand weergeven

@@ -88,7 +88,7 @@ bmi_done_local(struct ol_context *ol_ctx)
struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
qdf_device_t cdf_dev = ol_ctx->cdf_dev;
qdf_device_t qdf_dev = ol_ctx->qdf_dev;
qdf_dma_addr_t cmd = info->bmi_cmd_da;
qdf_dma_addr_t rsp = info->bmi_rsp_da;
@@ -102,7 +102,7 @@ bmi_done_local(struct ol_context *ol_ctx)
return QDF_STATUS_NOT_INITIALIZED;
}
if (!cdf_dev->dev) {
if (!qdf_dev->dev) {
BMI_ERR("%s Invalid Device pointer", __func__);
return QDF_STATUS_NOT_INITIALIZED;
}
@@ -127,14 +127,16 @@ bmi_done_local(struct ol_context *ol_ctx)
}
if (info->bmi_cmd_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_cmd_buff, info->bmi_cmd_da, 0);
info->bmi_cmd_buff = NULL;
info->bmi_cmd_da = 0;
}
if (info->bmi_rsp_buff) {
qdf_mem_free_consistent(cdf_dev, MAX_BMI_CMDBUF_SZ,
qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
MAX_BMI_CMDBUF_SZ,
info->bmi_rsp_buff, info->bmi_rsp_da, 0);
info->bmi_rsp_buff = NULL;
info->bmi_rsp_da = 0;

4
core/bmi/src/i_bmi.h
Bestand weergeven

@@ -146,7 +146,7 @@ struct bmi_info {
* struct ol_context - Structure to hold OL context
* @bmi: BMI info
* @cal_in_flash: For Firmware Flash Download
* @cdf_dev: QDF Device
* @qdf_dev: QDF Device
* @scn: HIF Context
* @ramdump_work: WorkQueue for Ramdump collection
* @tgt_def: Target Defnition pointer
@@ -157,7 +157,7 @@ struct ol_context {
struct bmi_info bmi;
struct ol_config_info cfg_info;
uint8_t *cal_in_flash;
qdf_device_t cdf_dev;
qdf_device_t qdf_dev;
qdf_work_t ramdump_work;
struct hif_opaque_softc *scn;
struct targetdef_t {

6
core/bmi/src/ol_fw.c
Bestand weergeven

@@ -151,7 +151,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
struct hif_target_info *tgt_info = hif_get_target_info_handle(scn);
uint32_t target_type = tgt_info->target_type;
struct bmi_info *bmi_ctx = GET_BMI_CONTEXT(ol_ctx);
qdf_device_t cdf_dev = ol_ctx->cdf_dev;
qdf_device_t qdf_dev = ol_ctx->qdf_dev;
switch (file) {
default:
@@ -251,7 +251,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
break;
}
if (request_firmware(&fw_entry, filename, cdf_dev->dev) != 0) {
if (request_firmware(&fw_entry, filename, qdf_dev->dev) != 0) {
BMI_ERR("%s: Failed to get %s", __func__, filename);
if (file == ATH_OTP_FILE)
@@ -265,7 +265,7 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, ATH_BIN_FILE file,
BMI_INFO("%s: Trying to load default %s",
__func__, filename);
if (request_firmware(&fw_entry, filename,
cdf_dev->dev) != 0) {
qdf_dev->dev) != 0) {
BMI_ERR("%s: Failed to get %s",
__func__, filename);
return -1;