From fbe297b129443c79707704341c2d20e0ea387c10 Mon Sep 17 00:00:00 2001
From: Rakshith Suresh Patkar <rpatkar@codeaurora.org>
Date: Tue, 5 Mar 2019 15:52:37 +0530
Subject: [PATCH] qcacmn: Move htt_rx specific macros from hif to htt

Remove htt_rx specific macros from hif layer.

Change-Id: I87a6ccce9501fa52c798195b01a1ffa873ec2d73
CRs-Fixed: 2412211
---
 hif/inc/regtable_pcie.h      | 81 +-----------------------------------
 hif/src/sdio/regtable_sdio.h | 71 +------------------------------
 hif/src/usb/regtable_usb.h   | 71 +------------------------------
 3 files changed, 3 insertions(+), 220 deletions(-)

diff --git a/hif/inc/regtable_pcie.h b/hif/inc/regtable_pcie.h
index ca455ef15e..3dc81033a9 100644
--- a/hif/inc/regtable_pcie.h
+++ b/hif/inc/regtable_pcie.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -202,85 +202,6 @@
 #define SOC_POWER_REG_OFFSET    (scn->targetdef->d_SOC_POWER_REG_OFFSET)
 /* end */
 
-#if !defined(CONFIG_WIN)
-/* htt_rx.c */
-#define RX_MSDU_END_4_FIRST_MSDU_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_MASK)
-#define RX_MSDU_END_4_FIRST_MSDU_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_LSB)
-#define RX_MPDU_START_0_RETRY_LSB  \
-	(pdev->targetdef->d_RX_MPDU_START_0_RETRY_LSB)
-#define RX_MPDU_START_0_RETRY_MASK  \
-	(pdev->targetdef->d_RX_MPDU_START_0_RETRY_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_LSB)
-#define RX_MPDU_START_2_PN_47_32_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_LSB)
-#define RX_MPDU_START_2_PN_47_32_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_MASK)
-#define RX_MPDU_START_2_TID_LSB  \
-	(pdev->targetdef->d_RX_MPDU_START_2_TID_LSB)
-#define RX_MPDU_START_2_TID_MASK  \
-	(pdev->targetdef->d_RX_MPDU_START_2_TID_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_LSB)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB)
-#define RX_MSDU_END_4_LAST_MSDU_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_MASK)
-#define RX_MSDU_END_4_LAST_MSDU_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_LSB)
-#define RX_ATTENTION_0_MCAST_BCAST_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_MASK)
-#define RX_ATTENTION_0_MCAST_BCAST_LSB \
-	(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_LSB)
-#define RX_ATTENTION_0_FRAGMENT_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_MASK)
-#define RX_ATTENTION_0_FRAGMENT_LSB \
-	(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_LSB)
-#define RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK \
-	(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB \
-	(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB)
-#define RX_MSDU_START_0_MSDU_LENGTH_MASK \
-	(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_MASK)
-#define RX_MSDU_START_0_MSDU_LENGTH_LSB \
-	(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_LSB)
-#define RX_MPDU_START_0_ENCRYPTED_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_MASK)
-#define RX_MPDU_START_0_ENCRYPTED_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_LSB)
-#define RX_ATTENTION_0_MORE_DATA_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MORE_DATA_MASK)
-#define RX_ATTENTION_0_MSDU_DONE_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MSDU_DONE_MASK)
-#define RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK)
-#if !defined(QCA6290_HEADERS_DEF) && !defined(QCA6390_HEADERS_DEF)
-#ifndef RX_MSDU_START_2_DECAP_FORMAT_OFFSET
-#define RX_MSDU_START_2_DECAP_FORMAT_OFFSET \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET)
-#endif
-#ifndef RX_MSDU_START_2_DECAP_FORMAT_LSB
-#define RX_MSDU_START_2_DECAP_FORMAT_LSB \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_LSB)
-#endif
-#ifndef RX_MSDU_START_2_DECAP_FORMAT_MASK
-#define RX_MSDU_START_2_DECAP_FORMAT_MASK \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_MASK)
-#endif
-#endif /*!QCA6290_HEADERS_DEF && !QCA6390_HEADERS_DEF */
-/* end */
-#endif
-
 /* copy_engine.c */
 /* end */
 /* PLL start */
diff --git a/hif/src/sdio/regtable_sdio.h b/hif/src/sdio/regtable_sdio.h
index dfc6a31907..0f5eae5569 100644
--- a/hif/src/sdio/regtable_sdio.h
+++ b/hif/src/sdio/regtable_sdio.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -382,75 +382,6 @@ struct targetdef_s {
 #define SOC_POWER_REG_OFFSET    (scn->targetdef->d_SOC_POWER_REG_OFFSET)
 /* end */
 
-/* htt_rx.c */
-#define RX_MSDU_END_4_FIRST_MSDU_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_MASK)
-#define RX_MSDU_END_4_FIRST_MSDU_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_LSB)
-#define RX_MPDU_START_0_RETRY_LSB  \
-	(pdev->targetdef->d_RX_MPDU_START_0_RETRY_LSB)
-#define RX_MPDU_START_0_RETRY_MASK  \
-	(pdev->targetdef->d_RX_MPDU_START_0_RETRY_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_LSB)
-#define RX_MPDU_START_2_PN_47_32_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_LSB)
-#define RX_MPDU_START_2_PN_47_32_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_MASK)
-#define RX_MPDU_START_2_TID_LSB  \
-	(pdev->targetdef->d_RX_MPDU_START_2_TID_LSB)
-#define RX_MPDU_START_2_TID_MASK  \
-	(pdev->targetdef->d_RX_MPDU_START_2_TID_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_LSB)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB)
-#define RX_MSDU_END_4_LAST_MSDU_MASK \
-	(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_MASK)
-#define RX_MSDU_END_4_LAST_MSDU_LSB \
-	(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_LSB)
-#define RX_ATTENTION_0_MCAST_BCAST_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_MASK)
-#define RX_ATTENTION_0_MCAST_BCAST_LSB \
-	(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_LSB)
-#define RX_ATTENTION_0_FRAGMENT_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_MASK)
-#define RX_ATTENTION_0_FRAGMENT_LSB \
-	(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_LSB)
-#define RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK \
-	(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB \
-	(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB)
-#define RX_MSDU_START_0_MSDU_LENGTH_MASK \
-	(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_MASK)
-#define RX_MSDU_START_0_MSDU_LENGTH_LSB \
-	(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_LSB)
-#define RX_MSDU_START_2_DECAP_FORMAT_OFFSET \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET)
-#define RX_MSDU_START_2_DECAP_FORMAT_MASK \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_MASK)
-#define RX_MSDU_START_2_DECAP_FORMAT_LSB \
-	(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_LSB)
-#define RX_MPDU_START_0_ENCRYPTED_MASK \
-	(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_MASK)
-#define RX_MPDU_START_0_ENCRYPTED_LSB \
-	(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_LSB)
-#define RX_ATTENTION_0_MORE_DATA_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MORE_DATA_MASK)
-#define RX_ATTENTION_0_MSDU_DONE_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_MSDU_DONE_MASK)
-#define RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK \
-	(pdev->targetdef->d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK)
-/* end */
-
 /* copy_engine.c */
 /* end */
 /* PLL start */
diff --git a/hif/src/usb/regtable_usb.h b/hif/src/usb/regtable_usb.h
index d59cd08ca7..eded85b9d1 100644
--- a/hif/src/usb/regtable_usb.h
+++ b/hif/src/usb/regtable_usb.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -496,75 +496,6 @@ struct targetdef_s {
 		(scn->targetdef->d_SOC_POWER_REG_OFFSET)
 /* end */
 
-/* htt_rx.c */
-#define RX_MSDU_END_4_FIRST_MSDU_MASK      \
-		(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_MASK)
-#define RX_MSDU_END_4_FIRST_MSDU_LSB       \
-		(pdev->targetdef->d_RX_MSDU_END_4_FIRST_MSDU_LSB)
-#define RX_MPDU_START_0_RETRY_LSB  \
-		(pdev->targetdef->d_RX_MPDU_START_0_RETRY_LSB)
-#define RX_MPDU_START_0_RETRY_MASK  \
-		(pdev->targetdef->d_RX_MPDU_START_0_RETRY_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_MASK       \
-		(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_MASK)
-#define RX_MPDU_START_0_SEQ_NUM_LSB        \
-		(pdev->targetdef->d_RX_MPDU_START_0_SEQ_NUM_LSB)
-#define RX_MPDU_START_2_PN_47_32_LSB       \
-		(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_LSB)
-#define RX_MPDU_START_2_PN_47_32_MASK      \
-		(pdev->targetdef->d_RX_MPDU_START_2_PN_47_32_MASK)
-#define RX_MPDU_START_2_TID_LSB  \
-		(pdev->targetdef->d_RX_MPDU_START_2_TID_LSB)
-#define RX_MPDU_START_2_TID_MASK  \
-		(pdev->targetdef->d_RX_MPDU_START_2_TID_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_MASK      \
-		(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_MASK)
-#define RX_MSDU_END_1_KEY_ID_OCT_LSB       \
-		(pdev->targetdef->d_RX_MSDU_END_1_KEY_ID_OCT_LSB)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK \
-		(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_MASK)
-#define RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB\
-		(pdev->targetdef->d_RX_MSDU_END_1_EXT_WAPI_PN_63_48_LSB)
-#define RX_MSDU_END_4_LAST_MSDU_MASK       \
-		(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_MASK)
-#define RX_MSDU_END_4_LAST_MSDU_LSB        \
-		(pdev->targetdef->d_RX_MSDU_END_4_LAST_MSDU_LSB)
-#define RX_ATTENTION_0_MCAST_BCAST_MASK    \
-		(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_MASK)
-#define RX_ATTENTION_0_MCAST_BCAST_LSB     \
-		(pdev->targetdef->d_RX_ATTENTION_0_MCAST_BCAST_LSB)
-#define RX_ATTENTION_0_FRAGMENT_MASK       \
-		(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_MASK)
-#define RX_ATTENTION_0_FRAGMENT_LSB        \
-		(pdev->targetdef->d_RX_ATTENTION_0_FRAGMENT_LSB)
-#define RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK\
-		(pdev->targetdef->d_RX_ATTENTION_0_MPDU_LENGTH_ERR_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK \
-		(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_MASK)
-#define RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB\
-		(pdev->targetdef->d_RX_FRAG_INFO_0_RING2_MORE_COUNT_LSB)
-#define RX_MSDU_START_0_MSDU_LENGTH_MASK   \
-		(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_MASK)
-#define RX_MSDU_START_0_MSDU_LENGTH_LSB    \
-		(pdev->targetdef->d_RX_MSDU_START_0_MSDU_LENGTH_LSB)
-#define RX_MSDU_START_2_DECAP_FORMAT_OFFSET\
-		(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_OFFSET)
-#define RX_MSDU_START_2_DECAP_FORMAT_MASK  \
-		(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_MASK)
-#define RX_MSDU_START_2_DECAP_FORMAT_LSB   \
-		(pdev->targetdef->d_RX_MSDU_START_2_DECAP_FORMAT_LSB)
-#define RX_MPDU_START_0_ENCRYPTED_MASK     \
-		(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_MASK)
-#define RX_MPDU_START_0_ENCRYPTED_LSB      \
-		(pdev->targetdef->d_RX_MPDU_START_0_ENCRYPTED_LSB)
-#define RX_ATTENTION_0_MORE_DATA_MASK      \
-		(pdev->targetdef->d_RX_ATTENTION_0_MORE_DATA_MASK)
-#define RX_ATTENTION_0_MSDU_DONE_MASK      \
-		(pdev->targetdef->d_RX_ATTENTION_0_MSDU_DONE_MASK)
-#define RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK \
-		(pdev->targetdef->d_RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK)
-/* end */
-
 /* copy_engine.c */
 #define DST_WR_INDEX_ADDRESS               \
 		(scn->targetdef->d_DST_WR_INDEX_ADDRESS)