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

qcacmn: Use correct size in consistent free of CE rings

Browse Source 
Size in consistent_memory_free should be same as size used in
consistent_memory_alloc. Fix the value sent in consistent free for CE
rings.

Change-Id: Iba6295cead21d357e266e753ca406732021ddfb4
CRs-Fixed: 2165385
This commit is contained in:
Kiran Venkatappa
2017-12-29 21:08:10 +05:30
committed by snandini
parent cb30062355
commit ae1a370d48
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hif/src/ce/ce_main.c
View File

@@ -1288,6 +1288,7 @@ void ce_fini(struct CE_handle *copyeng)
struct CE_state *CE_state = (struct CE_state *)copyeng; struct CE_state *CE_state = (struct CE_state *)copyeng;
unsigned int CE_id = CE_state->id; unsigned int CE_id = CE_state->id;
struct hif_softc *scn = CE_state->scn; struct hif_softc *scn = CE_state->scn;
uint32_t desc_size;
CE_state->state = CE_UNUSED; CE_state->state = CE_UNUSED;
scn->ce_id_to_state[CE_id] = NULL; scn->ce_id_to_state[CE_id] = NULL;
@@ -1298,13 +1299,14 @@ void ce_fini(struct CE_handle *copyeng)
/* Cleanup the datapath Tx ring */ /* Cleanup the datapath Tx ring */
ce_h2t_tx_ce_cleanup(copyeng); ce_h2t_tx_ce_cleanup(copyeng);
desc_size = ce_get_desc_size(scn, CE_RING_SRC);
if (CE_state->src_ring->shadow_base_unaligned) if (CE_state->src_ring->shadow_base_unaligned)
qdf_mem_free(CE_state->src_ring->shadow_base_unaligned); qdf_mem_free(CE_state->src_ring->shadow_base_unaligned);
if (CE_state->src_ring->base_addr_owner_space_unaligned) if (CE_state->src_ring->base_addr_owner_space_unaligned)
qdf_mem_free_consistent(scn->qdf_dev, qdf_mem_free_consistent(scn->qdf_dev,
scn->qdf_dev->dev, scn->qdf_dev->dev,
(CE_state->src_ring->nentries * (CE_state->src_ring->nentries *
sizeof(struct CE_src_desc) + desc_size +
CE_DESC_RING_ALIGN), CE_DESC_RING_ALIGN),
CE_state->src_ring-> CE_state->src_ring->
base_addr_owner_space_unaligned, base_addr_owner_space_unaligned,
@@ -1316,11 +1318,12 @@ void ce_fini(struct CE_handle *copyeng)
/* Cleanup the datapath Rx ring */ /* Cleanup the datapath Rx ring */
ce_t2h_msg_ce_cleanup(copyeng); ce_t2h_msg_ce_cleanup(copyeng);
desc_size = ce_get_desc_size(scn, CE_RING_DEST);
if (CE_state->dest_ring->base_addr_owner_space_unaligned) if (CE_state->dest_ring->base_addr_owner_space_unaligned)
qdf_mem_free_consistent(scn->qdf_dev, qdf_mem_free_consistent(scn->qdf_dev,
scn->qdf_dev->dev, scn->qdf_dev->dev,
(CE_state->dest_ring->nentries * (CE_state->dest_ring->nentries *
sizeof(struct CE_dest_desc) + desc_size +
CE_DESC_RING_ALIGN), CE_DESC_RING_ALIGN),
CE_state->dest_ring-> CE_state->dest_ring->
base_addr_owner_space_unaligned, base_addr_owner_space_unaligned,
@@ -1342,11 +1345,12 @@ void ce_fini(struct CE_handle *copyeng)
qdf_mem_free( qdf_mem_free(
CE_state->status_ring->shadow_base_unaligned); CE_state->status_ring->shadow_base_unaligned);
desc_size = ce_get_desc_size(scn, CE_RING_STATUS);
if (CE_state->status_ring->base_addr_owner_space_unaligned) if (CE_state->status_ring->base_addr_owner_space_unaligned)
qdf_mem_free_consistent(scn->qdf_dev, qdf_mem_free_consistent(scn->qdf_dev,
scn->qdf_dev->dev, scn->qdf_dev->dev,
(CE_state->status_ring->nentries * (CE_state->status_ring->nentries *
sizeof(struct CE_src_desc) + desc_size +
CE_DESC_RING_ALIGN), CE_DESC_RING_ALIGN),
CE_state->status_ring-> CE_state->status_ring->
base_addr_owner_space_unaligned, base_addr_owner_space_unaligned,