qcacmn: use proper HAL abtraction APIs to get WBM internal error
the current HAL API is to read the WBM internal error
bit from the wbm release ring descriptor is always taking
HKv1 HW structure. But the wbm_internal_error bit
placement has changed from HKv2, for this reason we have
to use target specific HAL API.
Change-Id: I44789180754ca21ae59650b6d8620321a1f12569
diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c
index 1bae203..e52b821 100644
--- a/dp/wifi3.0/dp_tx.c
+++ b/dp/wifi3.0/dp_tx.c
@@ -3544,9 +3544,9 @@
* completion ring. These errors are not related to
* Tx completions, and should just be ignored
*/
-
- wbm_internal_error =
- hal_get_wbm_internal_error(tx_comp_hal_desc);
+ wbm_internal_error = hal_get_wbm_internal_error(
+ soc->hal_soc,
+ tx_comp_hal_desc);
if (wbm_internal_error) {
dp_err_rl("Tx comp wbm_internal_error!!");
diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h
index 05e110d..5dbd835 100644
--- a/hal/wifi3.0/hal_generic_api.h
+++ b/hal/wifi3.0/hal_generic_api.h
@@ -1862,6 +1862,24 @@
}
/**
+ * hal_get_wbm_internal_error_generic() - is WBM internal error
+ * @hal_desc: completion ring descriptor pointer
+ *
+ * This function will return 0 or 1 - is it WBM internal error or not
+ *
+ * Return: uint8_t
+ */
+static inline uint8_t hal_get_wbm_internal_error_generic(void *hal_desc)
+{
+ uint32_t comp_desc =
+ *(uint32_t *)(((uint8_t *)hal_desc) +
+ WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_OFFSET);
+
+ return (comp_desc & WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_MASK) >>
+ WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_LSB;
+}
+
+/**
* hal_rx_dump_mpdu_start_tlv_generic: dump RX mpdu_start TLV in structured
* human readable format.
* @mpdu_start: pointer the rx_attention TLV in pkt.
diff --git a/hal/wifi3.0/hal_internal.h b/hal/wifi3.0/hal_internal.h
index 6d863f1..98276ef 100644
--- a/hal/wifi3.0/hal_internal.h
+++ b/hal/wifi3.0/hal_internal.h
@@ -372,6 +372,7 @@
void (*hal_tx_comp_get_status)(void *desc, void *ts,
struct hal_soc *hal);
uint8_t (*hal_tx_comp_get_release_reason)(void *hal_desc);
+ uint8_t (*hal_get_wbm_internal_error)(void *hal_desc);
void (*hal_tx_desc_set_mesh_en)(void *desc, uint8_t en);
/* rx */
diff --git a/hal/wifi3.0/hal_tx.h b/hal/wifi3.0/hal_tx.h
index ea343ff..43c6bab 100644
--- a/hal/wifi3.0/hal_tx.h
+++ b/hal/wifi3.0/hal_tx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020 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
@@ -804,7 +804,6 @@
return hal_soc->ops->hal_tx_comp_get_release_reason(hal_desc);
}
-
/**
* hal_tx_comp_desc_sync() - collect hardware descriptor contents
* @hal_desc: hardware descriptor pointer
@@ -1124,13 +1123,12 @@
*
* Return: buffer type
*/
-static inline uint8_t hal_get_wbm_internal_error(void *hal_desc)
+static inline
+uint8_t hal_get_wbm_internal_error(hal_soc_handle_t hal_soc_hdl, void *hal_desc)
{
- uint32_t comp_desc =
- *(uint32_t *)(((uint8_t *)hal_desc) +
- WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_OFFSET);
+ struct hal_soc *hal_soc = (struct hal_soc *)hal_soc_hdl;
- return (comp_desc & WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_MASK) >>
- WBM_RELEASE_RING_2_WBM_INTERNAL_ERROR_LSB;
+ return hal_soc->ops->hal_get_wbm_internal_error(hal_desc);
}
+
#endif /* HAL_TX_H */
diff --git a/hal/wifi3.0/qca6290/hal_6290.c b/hal/wifi3.0/qca6290/hal_6290.c
index 132dd76..a88e548 100644
--- a/hal/wifi3.0/qca6290/hal_6290.c
+++ b/hal/wifi3.0/qca6290/hal_6290.c
@@ -1010,6 +1010,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_6290,
/* rx */
hal_rx_msdu_start_nss_get_6290,
diff --git a/hal/wifi3.0/qca6390/hal_6390.c b/hal/wifi3.0/qca6390/hal_6390.c
index 89dd612..46e1c63 100644
--- a/hal/wifi3.0/qca6390/hal_6390.c
+++ b/hal/wifi3.0/qca6390/hal_6390.c
@@ -1006,6 +1006,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_6390,
/* rx */
hal_rx_msdu_start_nss_get_6390,
diff --git a/hal/wifi3.0/qca6490/hal_6490.c b/hal/wifi3.0/qca6490/hal_6490.c
index 6b889e1..98e123d 100644
--- a/hal/wifi3.0/qca6490/hal_6490.c
+++ b/hal/wifi3.0/qca6490/hal_6490.c
@@ -1324,6 +1324,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_6490,
/* rx */
diff --git a/hal/wifi3.0/qca8074v1/hal_8074v1.c b/hal/wifi3.0/qca8074v1/hal_8074v1.c
index 303da11..c8ba5d1 100644
--- a/hal/wifi3.0/qca8074v1/hal_8074v1.c
+++ b/hal/wifi3.0/qca8074v1/hal_8074v1.c
@@ -1006,6 +1006,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_8074v1,
/* rx */
hal_rx_msdu_start_nss_get_8074,
diff --git a/hal/wifi3.0/qca8074v2/hal_8074v2.c b/hal/wifi3.0/qca8074v2/hal_8074v2.c
index 6a3462a..e54b5bd 100644
--- a/hal/wifi3.0/qca8074v2/hal_8074v2.c
+++ b/hal/wifi3.0/qca8074v2/hal_8074v2.c
@@ -1004,6 +1004,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_8074v2,
/* rx */
diff --git a/hal/wifi3.0/qcn9000/hal_9000.c b/hal/wifi3.0/qcn9000/hal_9000.c
index c07ad16..154b3c0 100644
--- a/hal/wifi3.0/qcn9000/hal_9000.c
+++ b/hal/wifi3.0/qcn9000/hal_9000.c
@@ -1364,6 +1364,7 @@
hal_tx_desc_set_cache_set_num_generic,
hal_tx_comp_get_status_generic,
hal_tx_comp_get_release_reason_generic,
+ hal_get_wbm_internal_error_generic,
hal_tx_desc_set_mesh_en_9000,
/* rx */