Skip to contentSkip to conversation

libertas: declare MODULE_FIRMWARE

PATCH Applied Ben Hutchings 3 participants 3 messages Nov 7, 2009 – Nov 10, 2009 Networking drivers (wireless)

lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 50/75 libertas: declare MODULE_FIRMWARE

Signed-off-by Ben Hutchings <[email protected]>
---
 drivers/net/wireless/libertas/if_cs.c   |    1 +
 drivers/net/wireless/libertas/if_sdio.c |    6 ++++++
 drivers/net/wireless/libertas/if_spi.c  |    4 ++++
 drivers/net/wireless/libertas/if_usb.c  |    2 ++
 4 files changed, 13 insertions(+), 0 deletions(-)
drivers/net/wireless/libertas/if_cs.c +1 -0
index 9127d2a..9834e3f 100644
@@ -48,6 +48,7 @@
 MODULE_AUTHOR("Holger Schurig <[email protected]>");
 MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("libertas_cs_helper.fw");
drivers/net/wireless/libertas/if_sdio.c +6 -0
index 9716728..09fcfad 100644
@@ -99,6 +99,12 @@ static struct if_sdio_model if_sdio_models[] = {
 		.firmware = "sd8688.bin",
 	},
 };
+MODULE_FIRMWARE("sd8385_helper.bin");
+MODULE_FIRMWARE("sd8385.bin");
+MODULE_FIRMWARE("sd8686_helper.bin");
+MODULE_FIRMWARE("sd8686.bin");
+MODULE_FIRMWARE("sd8688_helper.bin");
+MODULE_FIRMWARE("sd8688.bin");
 
 struct if_sdio_packet {
 	struct if_sdio_packet	*next;
drivers/net/wireless/libertas/if_spi.c +4 -0
index d6a48dd..bf4bfba 100644
@@ -902,6 +902,10 @@ static int if_spi_calculate_fw_names(u16 card_id,
 		 chip_id_to_device_name[i].name);
 	return 0;
 }
+MODULE_FIRMWARE("libertas/gspi8385_hlp.bin");
+MODULE_FIRMWARE("libertas/gspi8385.bin");
+MODULE_FIRMWARE("libertas/gspi8686_hlp.bin");
+MODULE_FIRMWARE("libertas/gspi8686.bin");
 
 static int __devinit if_spi_probe(struct spi_device *spi)
 {
drivers/net/wireless/libertas/if_usb.c +2 -0
index f12d667..65e1745 100644
@@ -28,6 +28,8 @@
 static char *lbs_fw_name = "usb8388.bin";
 module_param_named(fw_name, lbs_fw_name, charp, 0644);
 
+MODULE_FIRMWARE("usb8388.bin");
+
 static struct usb_device_id if_usb_table[] = {
 	/* Enter the device signature inside */
 	{ USB_DEVICE(0x1286, 0x2001) },
Signature · 1 line
1.6.5.2
#1 lore raw

At Sat, 07 Nov 2009 22:00:03 +0000,

drivers/net/wireless/libertas/if_cs.c line 51

Quoted 9 lines · Ben Hutchings
drivers/net/wireless/libertas/if_cs.c +1 -0
index 9127d2a..9834e3f 100644
@@ -48,6 +48,7 @@
 MODULE_AUTHOR("Holger Schurig <[email protected]>");
 MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("libertas_cs_helper.fw");

Do you intentionally only define specify the helper firmware? The device won't be working without loading "libertas_cs.fw" as well.

Do you have any pointer for me to what MDOULE_FIRMWARE does? What user-space tool does it it for what purpose?

--
http://www.holgerschurig.de

#2 lore raw
Quoted 15 lines · Holger Schurig

At Sat, 07 Nov 2009 22:00:03 +0000,

drivers/net/wireless/libertas/if_cs.c line 51

Quoted 9 lines · Ben Hutchings
drivers/net/wireless/libertas/if_cs.c +1 -0
index 9127d2a..9834e3f 100644
@@ -48,6 +48,7 @@
 MODULE_AUTHOR("Holger Schurig <[email protected]>");
 MODULE_DESCRIPTION("Driver for Marvell 83xx compact flash WLAN cards");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE("libertas_cs_helper.fw");

Do you intentionally only define specify the helper firmware? The device won't be working without loading "libertas_cs.fw" as well.

Quoted 2 lines

Do you have any pointer for me to what MDOULE_FIRMWARE does? What user-space tool does it it for what purpose?

It's nice information to know from 'modinfo' or other uses so that we might be able to find the firmware automatically. Right now actually PackageKit will figure out missing firmware from udev when udev can't find the right firmware, but having it in 'modinfo' is useful too.

Honestly I think we should actually reorganize the firmware and put it in /lib/firmware/libertas or something.

Dan