samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

qcacld-3.0: Free ipa uc tx buffer pool with adaptive method

Selaa lähdekoodia 
If do not define QCA_WIFI_3_0, it alloc ipa uc tx buffer by
qdf_nbuf_alloc, but free by qdf_mem_free_consistent, which cause
memory leak. Solution is freeing with corresponding method.

Change-Id: I407712e545acfe5aeef8c8afa58785e42556ca02
CRs-Fixed: 2061922
This commit is contained in:
Wu Gao
2017-06-28 18:00:50 +08:00
committed by snandini
vanhempi 511043a2fe
commit 5f107a05ad
1 muutettua tiedostoa jossa 37 lisäystä ja 11 poistoa
Download Patch File Download Diff File Expand all files Collapse all files

48
core/dp/htt/htt_tx.c
Näytä tiedosto

@@ -1164,6 +1164,29 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
return tx_buffer_count_pwr2;
}
/**
* htt_tx_buf_pool_free() - Free tx buffer pool
* @pdev: htt context
*
* Free memory in tx buffer pool
*
* Return: 0 success
*/
static void htt_tx_buf_pool_free(struct htt_pdev_t *pdev)
{
uint16_t idx;
for (idx = 0; idx < pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt; idx++) {
if (pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx]) {
qdf_mem_free_consistent(
pdev->osdev, pdev->osdev->dev,
ol_cfg_ipa_uc_tx_buf_size(pdev->ctrl_pdev),
pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx],
pdev->ipa_uc_tx_rsc.paddr_strg[idx], 0);
}
}
}
#else
static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
unsigned int uc_tx_buf_sz,
@@ -1266,6 +1289,19 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
return tx_buffer_count_pwr2;
}
static void htt_tx_buf_pool_free(struct htt_pdev_t *pdev)
{
uint16_t idx;
void *buffer_vaddr;
for (idx = 0; idx < pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt; idx++) {
buffer_vaddr = pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx];
if (buffer_vaddr) {
qdf_nbuf_free(buffer_vaddr);
}
}
}
#endif
/**
@@ -1370,8 +1406,6 @@ free_tx_ce_idx:
*/
int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
{
uint16_t idx;
if (pdev->ipa_uc_tx_rsc.tx_ce_idx.vaddr) {
qdf_mem_free_consistent(
pdev->osdev, pdev->osdev->dev,
@@ -1396,15 +1430,7 @@ int htt_tx_ipa_uc_detach(struct htt_pdev_t *pdev)
}
/* Free each single buffer */
for (idx = 0; idx < pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt; idx++) {
if (pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx]) {
qdf_mem_free_consistent(
pdev->osdev, pdev->osdev->dev,
ol_cfg_ipa_uc_tx_buf_size(pdev->ctrl_pdev),
pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx],
pdev->ipa_uc_tx_rsc.paddr_strg[idx], 0);
}
}
htt_tx_buf_pool_free(pdev);
/* Free storage */
qdf_mem_free(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg);