wifi: ath10k: Set tx credit to one for WCN3990 snoc based devices

Currently host can send two WMI commands at once. There is possibility to
cause SMMU issues or corruption, if host wants to initiate 2 DMA
transfers, it is possible when copy complete interrupt for first DMA
reaches host, CE has already updated SRRI (Source ring read index) for
both DMA transfers and is in the middle of 2nd DMA. Host uses SRRI
(Source ring read index) to interpret how many DMA’s have been completed
and tries to unmap/free both the DMA entries. Hence now it is limiting to
one.Because CE is  still in the middle of 2nd DMA which can cause these
issues when handling two DMA transfers.

This change will not impact other targets, as it is only for WCN3990.

Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.2.0-01387-QCAHLSWMTPLZ-1

Signed-off-by: Youghandhar Chintala <quic_youghand@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220801134941.15216-1-quic_youghand@quicinc.com

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 276954b70d6305e554699ebfa197e3c77c16c6d1..d1ac64026cb3102813389454395d7af18dc2a5e4 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -98,6 +98,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = true,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA988X_HW_2_0_VERSION,
@@ -136,6 +137,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = true,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9887_HW_1_0_VERSION,
@@ -175,6 +177,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA6174_HW_3_2_VERSION,
@@ -209,6 +212,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .supports_peer_stats_info = true,
                .dynamic_sar_support = true,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA6174_HW_2_1_VERSION,
@@ -247,6 +251,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA6174_HW_2_1_VERSION,
@@ -285,6 +290,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA6174_HW_3_0_VERSION,
@@ -323,6 +329,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA6174_HW_3_2_VERSION,
@@ -365,6 +372,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .supports_peer_stats_info = true,
                .dynamic_sar_support = true,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -409,6 +417,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9984_HW_1_0_DEV_VERSION,
@@ -460,6 +469,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9888_HW_2_0_DEV_VERSION,
@@ -508,6 +518,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9377_HW_1_0_DEV_VERSION,
@@ -546,6 +557,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -586,6 +598,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA9377_HW_1_1_DEV_VERSION,
@@ -617,6 +630,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .credit_size_workaround = true,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = QCA4019_HW_1_0_DEV_VERSION,
@@ -662,6 +676,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = false,
                .hw_restart_disconnect = false,
+               .use_fw_tx_credits = true,
        },
        {
                .id = WCN3990_HW_1_0_DEV_VERSION,
@@ -693,6 +708,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
                .tx_stats_over_pktlog = false,
                .dynamic_sar_support = true,
                .hw_restart_disconnect = true,
+               .use_fw_tx_credits = false,
        },
 };
 

diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index fab398046a3f231c38b20e60d771f3548ddaba57..6d1784f74bea497e7ac1c34a70504e6d4b023960 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -947,13 +947,18 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc)
                return -ECOMM;
        }
 
-       htc->total_transmit_credits = __le16_to_cpu(msg->ready.credit_count);
+       if (ar->hw_params.use_fw_tx_credits)
+               htc->total_transmit_credits = __le16_to_cpu(msg->ready.credit_count);
+       else
+               htc->total_transmit_credits = 1;
+
        htc->target_credit_size = __le16_to_cpu(msg->ready.credit_size);
 
        ath10k_dbg(ar, ATH10K_DBG_HTC,
-                  "Target ready! transmit resources: %d size:%d\n",
+                  "Target ready! transmit resources: %d size:%d actual credits:%d\n",
                   htc->total_transmit_credits,
-                  htc->target_credit_size);
+                  htc->target_credit_size,
+                  msg->ready.credit_count);
 
        if ((htc->total_transmit_credits == 0) ||
            (htc->target_credit_size == 0)) {

diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 93acf0dd580a6f0f5e076fb6d6106887c39791ef..1b99f3a39a1134bcca75fe729c0fe5f1acdbf3ac 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -635,6 +635,8 @@ struct ath10k_hw_params {
        bool dynamic_sar_support;
 
        bool hw_restart_disconnect;
+
+       bool use_fw_tx_credits;
 };
 
 struct htt_resp;