From ee35f9250e3617d03bec638cf63b640153371ad6 Mon Sep 17 00:00:00 2001 From: "Poddar, Siddarth" Date: Thu, 4 Jan 2018 16:41:26 +0530 Subject: [PATCH] qcacld-3.0: Enable 64-bit htt rx addr tracking based on HTT_PADDR64 Enable 64-bit htt rx addr tracking based on HTT_PADDR64 when ENABLE_DEBUG_ADDRESS_MARKING is disabled. CRs-Fixed: 2166963 Change-Id: I47cfcb3f082bc969cd27630cfd96eb53b31cc40d --- core/dp/htt/htt_rx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c index 818e88c4f484..145a810164d7 100644 --- a/core/dp/htt/htt_rx.c +++ b/core/dp/htt/htt_rx.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -388,7 +388,7 @@ htt_rx_paddr_mark_high_bits(qdf_dma_addr_t paddr) return paddr; } -#ifdef HTT_PADDR64 +#if HTT_PADDR64 static inline qdf_dma_addr_t htt_paddr_trim_to_37(qdf_dma_addr_t paddr) { qdf_dma_addr_t ret = paddr; @@ -449,6 +449,7 @@ htt_rx_in_ord_paddr_get(uint32_t *u32p) return paddr; } #else +#if HTT_PADDR64 static qdf_dma_addr_t htt_rx_in_ord_paddr_get(uint32_t *u32p) { @@ -464,6 +465,14 @@ htt_rx_in_ord_paddr_get(uint32_t *u32p) } return paddr; } +#else +static inline qdf_dma_addr_t +htt_rx_in_ord_paddr_get(uint32_t *u32p) +{ + return HTT_RX_IN_ORD_PADDR_IND_PADDR_GET(*u32p); +} + +#endif #endif /* ENABLE_DEBUG_ADDRESS_MARKING */ #endif /* CONFIG_HL_SUPPORT*/