From: greearb@candelatech.com
To: linux-wireless@vger.kernel.org
Cc: ath10k@lists.infradead.org, Ben Greear <greearb@candelatech.com>
Subject: [PATCH v2 07/10] ath10k: add fw-powerup-fail to ethtool stats.
Date: Tue, 23 Sep 2014 14:17:22 -0700 [thread overview]
Message-ID: <1411507045-18973-7-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1411507045-18973-1-git-send-email-greearb@candelatech.com>
From: Ben Greear <greearb@candelatech.com>
This gives user-space a normal-ish way to detect that
firmware has failed to start and that a reboot is
probably required.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
v2: New patch for this series, goes well with the other
ethtool patch.
drivers/net/wireless/ath/ath10k/core.h | 2 +-
drivers/net/wireless/ath/ath10k/debug.c | 2 ++
drivers/net/wireless/ath/ath10k/pci.c | 12 +++++++++---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 7b220b1..601d573 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -399,7 +399,7 @@ struct ath10k {
struct ieee80211_hw *hw;
struct device *dev;
u8 mac_addr[ETH_ALEN];
-
+ bool fw_powerup_failed; /* If true, might take reboot to recover. */
u32 chip_id;
u32 target_version;
u8 fw_version_major;
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index af1ca3e..77b60f4 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -1091,6 +1091,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {
"d_fw_crash_count",
"d_fw_warm_reset_count",
"d_fw_cold_reset_count",
+ "d_fw_powerup_failed", /* boolean */
};
#define ATH10K_SSTATS_LEN ARRAY_SIZE(ath10k_gstrings_stats)
@@ -1175,6 +1176,7 @@ void ath10k_get_et_stats(struct ieee80211_hw *hw,
data[i++] = ar->fw_crash_counter;
data[i++] = ar->fw_warm_reset_counter;
data[i++] = ar->fw_cold_reset_counter;
+ data[i++] = ar->fw_powerup_failed;
spin_unlock_bh(&ar->data_lock);
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 38f7386..ebe2ee1 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1851,7 +1851,7 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
ret);
if (ath10k_pci_reset_mode == ATH10K_PCI_RESET_WARM_ONLY)
- return ret;
+ goto out;
ath10k_warn(ar, "trying cold reset\n");
@@ -1859,11 +1859,17 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
if (ret) {
ath10k_err(ar, "failed to power up target using cold reset too (%d)\n",
ret);
- return ret;
+ goto out;
}
}
- return 0;
+out:
+ /* If we have failed to power-up, it may take a reboot to
+ * get the NIC back online.
+ * Set flag accordinly so that user-space can know.
+ */
+ ar->fw_powerup_failed = !!ret;
+ return ret;
}
static void ath10k_pci_hif_power_down(struct ath10k *ar)
--
1.7.11.7
next prev parent reply other threads:[~2014-09-23 21:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 21:17 [PATCH v2 01/10] ath10k: use 64-bit vdev map greearb
2014-09-23 21:17 ` [PATCH v2 02/10] ath10k: add helper method to grab debug stats greearb
2014-09-23 21:17 ` [PATCH v2 03/10] ath10k: support ethtool stats greearb
2014-09-24 7:44 ` Michal Kazior
2014-09-24 14:37 ` Ben Greear
2014-09-29 8:21 ` Kalle Valo
2014-09-29 16:07 ` Ben Greear
2014-09-23 21:17 ` [PATCH v2 04/10] ath10k: make firmware text debug messages more verbose greearb
2014-11-22 15:28 ` Kalle Valo
2014-11-22 16:07 ` Ben Greear
2014-11-24 15:18 ` Kalle Valo
2014-11-24 14:19 ` Kalle Valo
2014-09-23 21:17 ` [PATCH v2 05/10] ath10k: apply chainmask settings to vdev on creation greearb
2014-11-26 6:25 ` Kalle Valo
2014-09-23 21:17 ` [PATCH v2 06/10] ath10k: use configured nss instead of max nss greearb
2014-11-04 19:55 ` Ben Greear
2014-11-13 13:22 ` Kalle Valo
2014-11-26 6:26 ` Kalle Valo
2014-09-23 21:17 ` greearb [this message]
2014-09-29 8:24 ` [PATCH v2 07/10] ath10k: add fw-powerup-fail to ethtool stats Kalle Valo
2014-09-29 16:05 ` Ben Greear
2014-09-30 12:27 ` Michal Kazior
2014-09-30 15:53 ` Ben Greear
2014-09-23 21:17 ` [PATCH v2 08/10] ath10k: support CT firmware flag greearb
2014-09-23 21:17 ` [PATCH v2 09/10] ath10k: always request htc tx replenishment greearb
2014-09-23 21:17 ` [PATCH v2 10/10] ath10k: request firmware flush in ath10k_flush greearb
2014-10-01 8:22 ` [PATCH v2 01/10] ath10k: use 64-bit vdev map Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411507045-18973-7-git-send-email-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).