浏览代码

qcacmn: Compilation error fix in HW CC code

Fix compilation error in hardware based cookie conversion.
CRs-Fixed: 2978344

Change-Id: I4487dcf116fb71b623ea4aa1f55144a07619dccc
Mohit Khanna 4 年之前
父节点
当前提交
4105f31776
共有 3 个文件被更改,包括 6 次插入6 次删除
  1. 2 2
      dp/wifi3.0/be/dp_be.h
  2. 1 1
      dp/wifi3.0/be/dp_be_rx.c
  3. 3 3
      hal/wifi3.0/be/hal_be_rx_tlv.h

+ 2 - 2
dp/wifi3.0/be/dp_be.h

@@ -125,7 +125,7 @@ struct dp_spt_page_desc_list {
 };
 
 #define DP_CC_SPT_PAGE_UPDATE_VA(_page_base_va, _index, _desc_va) \
-	{ ((uint64_t *)(_page_base_va))[_index] = (uint64_t)(_desc_va); }
+	{ (_page_base_va)[_index] = (uintptr_t)(_desc_va); }
 
 /**
  * struct dp_tx_bank_profile - DP wrapper for TCL banks
@@ -366,6 +366,6 @@ static inline void *dp_cc_desc_find(struct dp_soc *soc,
 	spt_page_va =
 		(uint64_t *)cc_ctx->page_desc_base[ppt_page_id].page_v_addr;
 
-	return (void *)(*(spt_page_va  + spt_va_id));
+	return (void *)(uintptr_t)(*(spt_page_va  + spt_va_id));
 }
 #endif

+ 1 - 1
dp/wifi3.0/be/dp_be_rx.c

@@ -168,7 +168,7 @@ more_data:
 			break;
 		}
 
-		rx_desc = (struct dp_rx_desc *)
+		rx_desc = (struct dp_rx_desc *)(uintptr_t)
 				hal_rx_get_reo_desc_va(ring_desc);
 		dp_rx_desc_sw_cc_check(soc, rx_buf_cookie, &rx_desc);
 

+ 3 - 3
hal/wifi3.0/be/hal_be_rx_tlv.h

@@ -712,7 +712,7 @@ static inline int hal_rx_mpdu_sequence_number_get_be(uint8_t *buf)
  * @ buf: pointer to the start of RX PKT TLV headers
  * @ hal_rx_msdu_metadata: pointer to the msdu info structure
  */
-static void
+static inline void
 hal_rx_msdu_packet_metadata_get_generic_be(uint8_t *buf,
 					   void *pkt_msdu_metadata)
 {
@@ -735,7 +735,7 @@ hal_rx_msdu_packet_metadata_get_generic_be(uint8_t *buf,
  * @buf: pointer to the start of RX PKT TLV header
  * Return: uint32_t(nss)
  */
-static uint32_t hal_rx_tlv_nss_get_be(uint8_t *buf)
+static inline uint32_t hal_rx_tlv_nss_get_be(uint8_t *buf)
 {
 	struct rx_pkt_tlvs *rx_pkt_tlvs = (struct rx_pkt_tlvs *)buf;
 	uint8_t mimo_ss_bitmap;
@@ -776,7 +776,7 @@ static uint32_t hal_rx_tlv_nss_get_be(uint8_t *buf)
  *
  * Return: void
  */
-static void
+static inline void
 hal_rx_mon_hw_desc_get_mpdu_status_be(void *hw_desc_addr,
 				      struct mon_rx_status *rs)
 {