From: Dan Lenski <dlenski@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: Dan Lenski <dlenski@gmail.com>, jes.sorensen@redhat.com
Subject: [PATCH 2/2] rtl8xxxu: Make polling timeout for firmware configurable
Date: Tue, 17 May 2016 18:14:46 -0700 [thread overview]
Message-ID: <1463534086-22353-3-git-send-email-dlenski@gmail.com> (raw)
In-Reply-To: <1463534086-22353-1-git-send-email-dlenski@gmail.com>
This patch makes RTL8XXXU_FIRMWARE_POLL_MAX into a configurable module
parameter, firmware_poll_max.
Signed-off-by: Dan Lenski <dlenski@gmail.com>
---
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index 6aed923..a1efb2c 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -44,6 +44,7 @@
static int rtl8xxxu_debug;
static bool rtl8xxxu_ht40_2g;
+static int rtl8xxxu_firmware_poll_max = RTL8XXXU_FIRMWARE_POLL_MAX;
MODULE_AUTHOR("Jes Sorensen <Jes.Sorensen@redhat.com>");
MODULE_DESCRIPTION("RTL8XXXu USB mac80211 Wireless LAN Driver");
@@ -59,6 +60,8 @@ module_param_named(debug, rtl8xxxu_debug, int, 0600);
MODULE_PARM_DESC(debug, "Set debug mask");
module_param_named(ht40_2g, rtl8xxxu_ht40_2g, bool, 0600);
MODULE_PARM_DESC(ht40_2g, "Enable HT40 support on the 2.4GHz band");
+module_param_named(firmware_poll_max, rtl8xxxu_firmware_poll_max, int, 0600);
+MODULE_PARM_DESC(firmware_poll_max, "Maximum polling count for firmware startup (increase if firmware fails to start)");
#define USB_VENDOR_ID_REALTEK 0x0bda
/* Minimum IEEE80211_MAX_FRAME_LEN */
@@ -2050,13 +2053,13 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv)
u32 val32;
/* Poll checksum report */
- for (i = 0; i < RTL8XXXU_FIRMWARE_POLL_MAX; i++) {
+ for (i = 0; i < rtl8xxxu_firmware_poll_max; i++) {
val32 = rtl8xxxu_read32(priv, REG_MCU_FW_DL);
if (val32 & MCU_FW_DL_CSUM_REPORT)
break;
}
- if (i == RTL8XXXU_FIRMWARE_POLL_MAX) {
+ if (i == rtl8xxxu_firmware_poll_max) {
dev_warn(dev, "Firmware checksum poll timed out\n");
ret = -EAGAIN;
goto exit;
@@ -2068,7 +2071,7 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv)
rtl8xxxu_write32(priv, REG_MCU_FW_DL, val32);
/* Wait for firmware to become ready */
- for (i = 0; i < RTL8XXXU_FIRMWARE_POLL_MAX; i++) {
+ for (i = 0; i < rtl8xxxu_firmware_poll_max; i++) {
val32 = rtl8xxxu_read32(priv, REG_MCU_FW_DL);
if (val32 & MCU_WINT_INIT_READY)
break;
@@ -2076,7 +2079,7 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv)
udelay(100);
}
- if (i == RTL8XXXU_FIRMWARE_POLL_MAX) {
+ if (i == rtl8xxxu_firmware_poll_max) {
dev_warn(dev, "Firmware failed to start\n");
ret = -EAGAIN;
goto exit;
--
2.8.2
next prev parent reply other threads:[~2016-05-18 1:15 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 1:14 [PATCH 0/2] rtl8xxxu: increase polling timeout for firmware startup Dan Lenski
2016-05-18 1:14 ` [PATCH 1/2] rtl8xxxu: Increase default " Dan Lenski
2016-05-18 1:20 ` Julian Calaby
2016-05-18 3:35 ` Jes Sorensen
2016-05-18 4:03 ` Daniel Lenski
2016-05-18 14:57 ` Jes Sorensen
2016-05-18 1:14 ` Dan Lenski [this message]
2016-05-18 1:21 ` [PATCH 2/2] rtl8xxxu: Make polling timeout for firmware configurable Julian Calaby
2016-05-18 3:36 ` Jes Sorensen
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=1463534086-22353-3-git-send-email-dlenski@gmail.com \
--to=dlenski@gmail.com \
--cc=jes.sorensen@redhat.com \
--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).