mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Andreas Müller
275240af94
When using udev >=177 libertas driver does not load properly the firmware [1]. The patches 0001-0016 were taken from [2] and can be viewed at [3]. Patch 0017 I created to fix compiler complaining for missing symbol is_interrupt when DEBUG set. The patch series was tested with meta-gumstix on overo with udev-175 and udev-182. [1] http://www.spinics.net/lists/linux-wireless/msg85541.html [2] git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git [3] http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next.git;a=history;f=drivers/net/wireless/libertas;hb=HEAD Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
155 lines
4.0 KiB
Diff
155 lines
4.0 KiB
Diff
From 488c3ee77ea0e63c9ae4736b1610aaf39c6527ee Mon Sep 17 00:00:00 2001
|
|
From: Daniel Drake <dsd@laptop.org>
|
|
Date: Wed, 18 Apr 2012 20:09:44 +0100
|
|
Subject: [PATCH 15/17] libertas CS: convert to asynchronous firmware loading
|
|
|
|
Signed-off-by: Daniel Drake <dsd@laptop.org>
|
|
Tested-by: Dan Williams <dcbw@redhat.com>
|
|
Acked-by: Dan Williams <dcbw@redhat.com>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
---
|
|
drivers/net/wireless/libertas/if_cs.c | 88 ++++++++++++++++++--------------
|
|
1 files changed, 49 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
|
|
index cee5052..16beaf3 100644
|
|
--- a/drivers/net/wireless/libertas/if_cs.c
|
|
+++ b/drivers/net/wireless/libertas/if_cs.c
|
|
@@ -738,6 +738,50 @@ done:
|
|
return ret;
|
|
}
|
|
|
|
+static void if_cs_prog_firmware(struct lbs_private *priv, int ret,
|
|
+ const struct firmware *helper,
|
|
+ const struct firmware *mainfw)
|
|
+{
|
|
+ struct if_cs_card *card = priv->card;
|
|
+
|
|
+ if (ret) {
|
|
+ pr_err("failed to find firmware (%d)\n", ret);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ /* Load the firmware */
|
|
+ ret = if_cs_prog_helper(card, helper);
|
|
+ if (ret == 0 && (card->model != MODEL_8305))
|
|
+ ret = if_cs_prog_real(card, mainfw);
|
|
+ if (ret)
|
|
+ goto out;
|
|
+
|
|
+ /* Now actually get the IRQ */
|
|
+ ret = request_irq(card->p_dev->irq, if_cs_interrupt,
|
|
+ IRQF_SHARED, DRV_NAME, card);
|
|
+ if (ret) {
|
|
+ pr_err("error in request_irq\n");
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * Clear any interrupt cause that happened while sending
|
|
+ * firmware/initializing card
|
|
+ */
|
|
+ if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);
|
|
+ if_cs_enable_ints(card);
|
|
+
|
|
+ /* And finally bring the card up */
|
|
+ priv->fw_ready = 1;
|
|
+ if (lbs_start_card(priv) != 0) {
|
|
+ pr_err("could not activate card\n");
|
|
+ free_irq(card->p_dev->irq, card);
|
|
+ }
|
|
+
|
|
+out:
|
|
+ release_firmware(helper);
|
|
+ release_firmware(mainfw);
|
|
+}
|
|
|
|
|
|
/********************************************************************/
|
|
@@ -809,8 +853,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
|
|
unsigned int prod_id;
|
|
struct lbs_private *priv;
|
|
struct if_cs_card *card;
|
|
- const struct firmware *helper = NULL;
|
|
- const struct firmware *mainfw = NULL;
|
|
|
|
lbs_deb_enter(LBS_DEB_CS);
|
|
|
|
@@ -890,20 +932,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
|
|
goto out2;
|
|
}
|
|
|
|
- ret = lbs_get_firmware(&p_dev->dev, card->model, &fw_table[0],
|
|
- &helper, &mainfw);
|
|
- if (ret) {
|
|
- pr_err("failed to find firmware (%d)\n", ret);
|
|
- goto out2;
|
|
- }
|
|
-
|
|
- /* Load the firmware early, before calling into libertas.ko */
|
|
- ret = if_cs_prog_helper(card, helper);
|
|
- if (ret == 0 && (card->model != MODEL_8305))
|
|
- ret = if_cs_prog_real(card, mainfw);
|
|
- if (ret)
|
|
- goto out2;
|
|
-
|
|
/* Make this card known to the libertas driver */
|
|
priv = lbs_add_card(card, &p_dev->dev);
|
|
if (!priv) {
|
|
@@ -911,37 +939,22 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
|
|
goto out2;
|
|
}
|
|
|
|
- /* Finish setting up fields in lbs_private */
|
|
+ /* Set up fields in lbs_private */
|
|
card->priv = priv;
|
|
priv->card = card;
|
|
priv->hw_host_to_card = if_cs_host_to_card;
|
|
priv->enter_deep_sleep = NULL;
|
|
priv->exit_deep_sleep = NULL;
|
|
priv->reset_deep_sleep_wakeup = NULL;
|
|
- priv->fw_ready = 1;
|
|
|
|
- /* Now actually get the IRQ */
|
|
- ret = request_irq(p_dev->irq, if_cs_interrupt,
|
|
- IRQF_SHARED, DRV_NAME, card);
|
|
+ /* Get firmware */
|
|
+ ret = lbs_get_firmware_async(priv, &p_dev->dev, card->model, fw_table,
|
|
+ if_cs_prog_firmware);
|
|
if (ret) {
|
|
- pr_err("error in request_irq\n");
|
|
- goto out3;
|
|
- }
|
|
-
|
|
- /*
|
|
- * Clear any interrupt cause that happened while sending
|
|
- * firmware/initializing card
|
|
- */
|
|
- if_cs_write16(card, IF_CS_CARD_INT_CAUSE, IF_CS_BIT_MASK);
|
|
- if_cs_enable_ints(card);
|
|
-
|
|
- /* And finally bring the card up */
|
|
- if (lbs_start_card(priv) != 0) {
|
|
- pr_err("could not activate card\n");
|
|
+ pr_err("failed to find firmware (%d)\n", ret);
|
|
goto out3;
|
|
}
|
|
|
|
- ret = 0;
|
|
goto out;
|
|
|
|
out3:
|
|
@@ -951,9 +964,6 @@ out2:
|
|
out1:
|
|
pcmcia_disable_device(p_dev);
|
|
out:
|
|
- release_firmware(helper);
|
|
- release_firmware(mainfw);
|
|
-
|
|
lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret);
|
|
return ret;
|
|
}
|
|
--
|
|
1.7.4.4
|
|
|