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-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Buffer count be power of 2 and unmap nbuf

Browse source 
Count of htt tx buffer pool should be power of 2 for fail case. For
Rome platform, it does not unmap nbuf when free htt tx buffer pool.

Change-Id: I85a9a1d02bf403f1be7289b1a0a89f86ef25f763
CRs-Fixed: 2179770
This commit is contained in:
Wu Gao 2018-01-27 11:49:30 +08:00 • committed by snandini
commit e279444ee4
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/dp/htt/htt_tx.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2014-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2011, 2014-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -1086,7 +1086,7 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
if (!buffer_vaddr) {
qdf_print("IPA WDI TX buffer alloc fail %d allocated\n",
tx_buffer_count);
return tx_buffer_count;
goto pwr2;
}
header_ptr = buffer_vaddr;
@ -1131,6 +1131,7 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
ring_vaddr++;
}
pwr2:
/*
* Tx complete ring buffer count should be power of 2.
* So, allocated Tx buffer count should be one less than ring buffer
@ -1212,7 +1213,7 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
if (!buffer_vaddr) {
qdf_print("%s: TX BUF alloc fail, loop index: %d",
__func__, tx_buffer_count);
return tx_buffer_count;
goto pwr2;
}
/* Init buffer */
@ -1234,7 +1235,7 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
"%s: nbuf map failed, loop index: %d",
__func__, tx_buffer_count);
qdf_nbuf_free(buffer_vaddr);
return tx_buffer_count;
goto pwr2;
}
buffer_paddr = qdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
@ -1256,6 +1257,7 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
ring_vaddr++;
}
pwr2:
/*
* Tx complete ring buffer count should be power of 2.
* So, allocated Tx buffer count should be one less than ring buffer
@ -1270,14 +1272,13 @@ static int htt_tx_ipa_uc_wdi_tx_buf_alloc(struct htt_pdev_t *pdev,
/* Free over allocated buffers below power of 2 */
for (idx = tx_buffer_count_pwr2; idx < tx_buffer_count; 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);
buffer_vaddr =
pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx];
if (buffer_vaddr) {
qdf_nbuf_unmap(pdev->osdev, buffer_vaddr,
QDF_DMA_BIDIRECTIONAL);
qdf_nbuf_free(buffer_vaddr);
}
}
}
@ -1299,6 +1300,8 @@ static void htt_tx_buf_pool_free(struct htt_pdev_t *pdev)
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_unmap(pdev->osdev, buffer_vaddr,
QDF_DMA_BIDIRECTIONAL);
qdf_nbuf_free(buffer_vaddr);
}
}