lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mwl8k: increase firmware loading timeouts

Browse Source 
The time between loading the helper image and starting to upload the
main firmware image should be at least 5 ms or so.  We were doing an
msleep(1) before, and 1 ms appears to not be enough in almost all
cases, but building with HZ=100 has always masked this so far.  Bumping
the msleep argument to 5 fixes firmware loading e.g. when HZ=1000.

Some firmware images need more than 200ms to initialize.  Bump the
ready code timeout to 500ms to accommodate for this.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Lennert Buytenhek
2009-11-30 18:13:20 +01:00
committed by John W. Linville
parent 7e1112d34a
commit 89b872e2e4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/mwl8k.c
View File

@@ -571,7 +571,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
"helper image\n", pci_name(priv->pdev)); "helper image\n", pci_name(priv->pdev));
return rc; return rc;
} }
msleep(1); msleep(5);
rc = mwl8k_feed_fw_image(priv, fw->data, fw->size); rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);
} else { } else {
@@ -588,9 +588,8 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
iowrite32(MWL8K_MODE_AP, priv->regs + MWL8K_HIU_GEN_PTR); iowrite32(MWL8K_MODE_AP, priv->regs + MWL8K_HIU_GEN_PTR);
else else
iowrite32(MWL8K_MODE_STA, priv->regs + MWL8K_HIU_GEN_PTR); iowrite32(MWL8K_MODE_STA, priv->regs + MWL8K_HIU_GEN_PTR);
msleep(1);
loops = 200000; loops = 500000;
do { do {
u32 ready_code; u32 ready_code;