From 84e3394a3ce52149794d531334e62c915780b31c Mon Sep 17 00:00:00 2001 From: "Pamidipati, Vijay" Date: Thu, 1 Jun 2017 07:34:51 +0530 Subject: [PATCH] qcacmn: Add a check for target_type for accessing CE legacy registers In ce_services, check if target type is srng based and access legacy registers only if it is not, for APIs which are common between legacy and srng-based targets Change-Id: I515026cd9b6d14accd4c219c6d03134a36cc3db6 --- hif/src/ce/ce_service.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/hif/src/ce/ce_service.c b/hif/src/ce/ce_service.c index 86cdcc8909..e511af4968 100644 --- a/hif/src/ce/ce_service.c +++ b/hif/src/ce/ce_service.c @@ -2106,12 +2106,15 @@ more_watermarks: more_comp_cnt++ < CE_TXRX_COMP_CHECK_THRESHOLD) { goto more_completions; } else { - HIF_ERROR( - "%s:Potential infinite loop detected during Rx processing nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", - __func__, CE_state->dest_ring->nentries_mask, - CE_state->dest_ring->sw_index, - CE_DEST_RING_READ_IDX_GET(scn, + if (!ce_srng_based(scn)) { + HIF_ERROR( + "%s:Potential infinite loop detected during Rx processing nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", + __func__, + CE_state->dest_ring->nentries_mask, + CE_state->dest_ring->sw_index, + CE_DEST_RING_READ_IDX_GET(scn, CE_state->ctrl_addr)); + } } } @@ -2122,12 +2125,15 @@ more_watermarks: more_snd_comp_cnt++ < CE_TXRX_COMP_CHECK_THRESHOLD) { goto more_completions; } else { - HIF_ERROR( - "%s:Potential infinite loop detected during send completion nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", - __func__, CE_state->src_ring->nentries_mask, - CE_state->src_ring->sw_index, - CE_SRC_RING_READ_IDX_GET(scn, + if (!ce_srng_based(scn)) { + HIF_ERROR( + "%s:Potential infinite loop detected during send completion nentries_mask:0x%x sw read_idx:0x%x hw read_idx:0x%x", + __func__, + CE_state->src_ring->nentries_mask, + CE_state->src_ring->sw_index, + CE_SRC_RING_READ_IDX_GET(scn, CE_state->ctrl_addr)); + } } }