From patchwork Fri Jun 26 18:11:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Pillai X-Patchwork-Id: 215232 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 893CCC433DF for ; Fri, 26 Jun 2020 18:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B0472088E for ; Fri, 26 Jun 2020 18:12:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="uYochJss" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726073AbgFZSMD (ORCPT ); Fri, 26 Jun 2020 14:12:03 -0400 Received: from mail29.static.mailgun.info ([104.130.122.29]:38730 "EHLO mail29.static.mailgun.info" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725275AbgFZSMB (ORCPT ); Fri, 26 Jun 2020 14:12:01 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1593195120; h=References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=Q3jdndKvBM7Tubrsk8mP7bJlc5lc7sbPttGkG/ZVwYo=; b=uYochJss1WOoPsOFpIe+fCapIcYQlNQiW/q6WCgOFw/c6LwtxuKiAzXY5iJYlgBUebojY3rt NpAOjYuQ2fZcFZgIQLYZSTgl8NTufv4HbtQ82fC1j17F347pblwFoAOeNDtJaeqP4oBbTXN2 ILEwchMjBzC2z/OJ1z7DRwzV4V0= X-Mailgun-Sending-Ip: 104.130.122.29 X-Mailgun-Sid: WyI3YTAwOSIsICJsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n09.prod.us-west-2.postgun.com with SMTP id 5ef63a6b117610c7ff1433bc (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Fri, 26 Jun 2020 18:11:55 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 6E822C433C6; Fri, 26 Jun 2020 18:11:55 +0000 (UTC) Received: from pillair-linux.qualcomm.com (blr-c-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: pillair) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6CF90C433CA; Fri, 26 Jun 2020 18:11:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6CF90C433CA Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=pillair@codeaurora.org From: Rakesh Pillai To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Rakesh Pillai Subject: [PATCH 1/2] ath10k: Pause the tx queues when firmware is down Date: Fri, 26 Jun 2020 23:41:39 +0530 Message-Id: <1593195100-24654-2-git-send-email-pillair@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593195100-24654-1-git-send-email-pillair@codeaurora.org> References: <1593195100-24654-1-git-send-email-pillair@codeaurora.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When the FW goes down, the transmission of packets cannot be done. Currently we are not pausing the tx queues, hence there will be too many attempts to trasmit packets and each of them resulting in failure and thereby logging unwanted failure messages onto the console, as shown below [ 60.842192] ath10k_snoc 18800000.wifi: failed to transmit packet, dropping: -108 [ 60.850181] ath10k_snoc 18800000.wifi: failed to submit frame: -108 [ 60.857058] ath10k_snoc 18800000.wifi: failed to push frame: -108 [ 60.936217] ath10k_snoc 18800000.wifi: failed to transmit packet, dropping: -108 [ 60.944496] ath10k_snoc 18800000.wifi: failed to submit frame: -108 [ 60.951265] ath10k_snoc 18800000.wifi: failed to push frame: -108 [ 61.976589] ath10k_snoc 18800000.wifi: failed to transmit packet, dropping: -108 Stop the tx queues when the wlan firmware is down and also remove the unwanted duplicate/extra logging in the packet transmission path. Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1 Signed-off-by: Rakesh Pillai --- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 18 ++++++++++-------- drivers/net/wireless/ath/ath10k/snoc.c | 3 +++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 62b1502..040053a 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -900,6 +900,7 @@ static inline const char *ath10k_scan_state_str(enum ath10k_scan_state state) enum ath10k_tx_pause_reason { ATH10K_TX_PAUSE_Q_FULL, + ATH10K_TX_PAUSE_FW_DOWN, ATH10K_TX_PAUSE_MAX, }; diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 3e38962..dc7befc 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3348,6 +3348,7 @@ void ath10k_mac_tx_lock(struct ath10k *ar, int reason) ar->tx_paused |= BIT(reason); ieee80211_stop_queues(ar->hw); } +EXPORT_SYMBOL(ath10k_mac_tx_lock); static void ath10k_mac_tx_unlock_iter(void *data, u8 *mac, struct ieee80211_vif *vif) @@ -3378,6 +3379,7 @@ void ath10k_mac_tx_unlock(struct ath10k *ar, int reason) ieee80211_wake_queue(ar->hw, ar->hw->offchannel_tx_hw_queue); } +EXPORT_SYMBOL(ath10k_mac_tx_unlock); void ath10k_mac_vif_tx_lock(struct ath10k_vif *arvif, int reason) { @@ -3748,11 +3750,8 @@ static int ath10k_mac_tx_submit(struct ath10k *ar, break; } - if (ret) { - ath10k_warn(ar, "failed to transmit packet, dropping: %d\n", - ret); + if (ret) ieee80211_free_txskb(ar->hw, skb); - } return ret; } @@ -3806,10 +3805,8 @@ static int ath10k_mac_tx(struct ath10k *ar, } ret = ath10k_mac_tx_submit(ar, txmode, txpath, skb); - if (ret) { - ath10k_warn(ar, "failed to submit frame: %d\n", ret); + if (ret) return ret; - } return 0; } @@ -4441,7 +4438,12 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw, ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb, false); if (ret) { - ath10k_warn(ar, "failed to transmit frame: %d\n", ret); + if (ret == -ESHUTDOWN) + ath10k_dbg(ar, ATH10K_DBG_MAC, "failed to transmit frame: %d\n", + ret); + else + ath10k_warn(ar, "failed to transmit frame: %d\n", ret); + if (is_htt) { spin_lock_bh(&ar->htt.tx_lock); ath10k_htt_tx_dec_pending(htt); diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index 407a074..8440e64 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c @@ -20,6 +20,7 @@ #include "hif.h" #include "htc.h" #include "snoc.h" +#include "mac.h" #define ATH10K_SNOC_RX_POST_RETRY_MS 50 #define CE_POLL_PIPE 4 @@ -1296,6 +1297,7 @@ int ath10k_snoc_fw_indication(struct ath10k *ar, u64 type) switch (type) { case ATH10K_QMI_EVENT_FW_READY_IND: if (test_bit(ATH10K_SNOC_FLAG_REGISTERED, &ar_snoc->flags)) { + ath10k_mac_tx_unlock(ar, ATH10K_TX_PAUSE_FW_DOWN); queue_work(ar->workqueue, &ar->restart_work); break; } @@ -1313,6 +1315,7 @@ int ath10k_snoc_fw_indication(struct ath10k *ar, u64 type) case ATH10K_QMI_EVENT_FW_DOWN_IND: set_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags); set_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags); + ath10k_mac_tx_lock(ar, ATH10K_TX_PAUSE_FW_DOWN); break; default: ath10k_err(ar, "invalid fw indication: %llx\n", type);