2012-07-25 22:57:08

by Jeff Mahoney

[permalink] [raw]
Subject: [PATCH] brcmsmac: document firmware dependencies

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The brcmsmac driver requests firmware but doesn't document the
dependency. This means that software that analyzes the modules to
determine if firmware is needed won't detect it.

Specifically, (at least) openSUSE won't install the kernel-firmware
package if no hardware requires it.

This patch adds the MODULE_FIRMWARE directives.

Signed-off-by: Jeff Mahoney <[email protected]>
- ---
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

- --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -86,7 +86,9 @@ MODULE_AUTHOR("Broadcom Corporation");
MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
MODULE_LICENSE("Dual BSD/GPL");
- -
+/* This needs to be adjusted when brcms_firmwares changes */
+MODULE_FIRMWARE("brcm/bcm43xx-0.fw");
+MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw");

/* recognized BCMA Core IDs */
static struct bcma_device_id brcms_coreid_table[] = {

- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJQEHm8AAoJEB57S2MheeWySqEQALkb2wGqTYsbjeKSz4gbXshf
aUohL3UWrE81FH/2QzcXzLlLYPWmRdzsdMve6uafNfWWVHEXJDW5PzNbegCOwaPt
8CdDFCUztKElfOzuqs6gUA3RgKdCl0ORSEFvFg6qg77jpw348e749dHUalmrsxga
eR1R7NbFb7i2dcl0cK8d6SefdWtzcPonYYtb/pjSbJXlGMPxPpjFpXA2e/eGx+sf
X5RP2AVGXDPQ7KgtVcZMMbOfmWRYLNmLfFZjXkpZGGPPiGgIc523HP3+PAAEi054
LG3YcRIURAmqklrrHs2QQh9kQB3IxwXonkOiPsUuj9kJzv1mgMyxvXSOwywgI2O3
AWRxCeQMsujrSLXUJJVHKjOk7sOmYHy/y7KytA1gvxQ18XnEHs0BrnOEUtgdbNdO
rsc9gtZwtc1OOSmuH1kX12IyLe8YFatQ/d3nrFjWlMYeY0eqP349/vhgMdzQyTN5
yz8wrbANBxDMiqsh+wUCtMEU5YPAailNcYPl2mUT2ptGmup6LGZSS0lpk1/GfPkr
qpHW+4coFeJyIGT4IEnux3+32KaIrU/m93Vd7H7D0Lv4AsDV3Dn6YTD6EbdUgWmW
bwvuAUWhVhgRoeVB6nO+fkHRrQyWUDRqknGXL+qtPn/TKDyJw7x3md1yR+/WbIeX
jFFv5i1+CDoR+JlMmkOK
=7FV2
-----END PGP SIGNATURE-----


2012-08-06 19:18:01

by Jeff Mahoney

[permalink] [raw]
Subject: Re: [PATCH] brcmsmac: document firmware dependencies

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/6/12 3:01 PM, John W. Linville wrote:
> Could you repost this in a fashion that is consumable by 'git am'?

Apologies. I forgot to turn off signing. I've resent.

- -Jeff

> On Wed, Jul 25, 2012 at 06:57:00PM -0400, Jeff Mahoney wrote: The
> brcmsmac driver requests firmware but doesn't document the
> dependency. This means that software that analyzes the modules to
> determine if firmware is needed won't detect it.
>
> Specifically, (at least) openSUSE won't install the
> kernel-firmware package if no hardware requires it.
>
> This patch adds the MODULE_FIRMWARE directives.
>
> Signed-off-by: Jeff Mahoney <[email protected]> ---
> drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +++- 1
> file changed, 3 insertions(+), 1 deletion(-)
>
> --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++
> b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -86,7
> +86,9 @@ MODULE_AUTHOR("Broadcom Corporation");
> MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
> MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
> MODULE_LICENSE("Dual BSD/GPL"); - +/* This needs to be adjusted
> when brcms_firmwares changes */
> +MODULE_FIRMWARE("brcm/bcm43xx-0.fw");
> +MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw");
>
> /* recognized BCMA Core IDs */ static struct bcma_device_id
> brcms_coreid_table[] = {
>
>> -- To unsubscribe from this list: send the line "unsubscribe
>> linux-wireless" in the body of a message to
>> [email protected] More majordomo info at
>> http://vger.kernel.org/majordomo-info.html
>>
>

- --
Jeff Mahoney
SUSE Labs
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJQIBhiAAoJEB57S2MheeWy8GQP/RS/v1buCVfYTkkzp5DGb6Fe
w4gtRvGmSbPj8iOIbCqC1VhzoGXntJbL9KVlE0RDqc9A3nriEC+DPx11t4VFx8KP
8JI9ai25tIy40FOMb3HlaZ4AeVCu3eooEU7lxIfdy+hognXj9LIw2GohDVwmlTG3
0XLsOJoYax0RRQe7lhRIPASDjbl5lne+djrCJODZN1kSNJguKKyo7p5+1VqfVszi
pEcs6NZWw7YbyoJ9g+px4turX4A9dEqWqw1qCL48gWL/iCLPETN72xj6O+oumZ5G
NJeuLn0Mz+uNOd7wh8gAAJVrAAcnIPVVWrWbJtcAJKaPW5lQnf8sSB1XDvVZAmlM
syNfJm9c0JSVquD/SS73awCOMQwMP5Zx7jK09pmgAQwrPATpoMwbUDlGG97UI24O
36PqA1u5iNaPfK1EJ9Q0e/12hD+OyLgo9gC6zSVKz0soxfuQIONou1Ju/6yyjX/3
SqTckKELkM1TY9HDqLIvYrCNPbWI73QVEKdKcdBojBbrtCBGV6PvS+6ZnPBJNbPg
4V1VjHO/gG8o99kYM0mCtBNq8fiL1UNmmBZFPM/uAEumZA9z4+EzFA1bUJg3YYzD
TO2Q9FL7hYTp2BUrJJBk5V7tzG8EMah6M+oWpam+5zNtQbq3QopNZAlvJlCvg9sv
XDGL9pMHB+2qbZTYvVmq
=wqxy
-----END PGP SIGNATURE-----

2012-08-06 19:15:12

by John W. Linville

[permalink] [raw]
Subject: Re: [PATCH] brcmsmac: document firmware dependencies

Could you repost this in a fashion that is consumable by 'git am'?

On Wed, Jul 25, 2012 at 06:57:00PM -0400, Jeff Mahoney wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> The brcmsmac driver requests firmware but doesn't document the
> dependency. This means that software that analyzes the modules to
> determine if firmware is needed won't detect it.
>
> Specifically, (at least) openSUSE won't install the kernel-firmware
> package if no hardware requires it.
>
> This patch adds the MODULE_FIRMWARE directives.
>
> Signed-off-by: Jeff Mahoney <[email protected]>
> - ---
> drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> - --- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> +++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
> @@ -86,7 +86,9 @@ MODULE_AUTHOR("Broadcom Corporation");
> MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
> MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
> MODULE_LICENSE("Dual BSD/GPL");
> - -
> +/* This needs to be adjusted when brcms_firmwares changes */
> +MODULE_FIRMWARE("brcm/bcm43xx-0.fw");
> +MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw");
>
> /* recognized BCMA Core IDs */
> static struct bcma_device_id brcms_coreid_table[] = {
>
> - --
> Jeff Mahoney
> SUSE Labs
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
> Comment: GPGTools - http://gpgtools.org
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iQIcBAEBAgAGBQJQEHm8AAoJEB57S2MheeWySqEQALkb2wGqTYsbjeKSz4gbXshf
> aUohL3UWrE81FH/2QzcXzLlLYPWmRdzsdMve6uafNfWWVHEXJDW5PzNbegCOwaPt
> 8CdDFCUztKElfOzuqs6gUA3RgKdCl0ORSEFvFg6qg77jpw348e749dHUalmrsxga
> eR1R7NbFb7i2dcl0cK8d6SefdWtzcPonYYtb/pjSbJXlGMPxPpjFpXA2e/eGx+sf
> X5RP2AVGXDPQ7KgtVcZMMbOfmWRYLNmLfFZjXkpZGGPPiGgIc523HP3+PAAEi054
> LG3YcRIURAmqklrrHs2QQh9kQB3IxwXonkOiPsUuj9kJzv1mgMyxvXSOwywgI2O3
> AWRxCeQMsujrSLXUJJVHKjOk7sOmYHy/y7KytA1gvxQ18XnEHs0BrnOEUtgdbNdO
> rsc9gtZwtc1OOSmuH1kX12IyLe8YFatQ/d3nrFjWlMYeY0eqP349/vhgMdzQyTN5
> yz8wrbANBxDMiqsh+wUCtMEU5YPAailNcYPl2mUT2ptGmup6LGZSS0lpk1/GfPkr
> qpHW+4coFeJyIGT4IEnux3+32KaIrU/m93Vd7H7D0Lv4AsDV3Dn6YTD6EbdUgWmW
> bwvuAUWhVhgRoeVB6nO+fkHRrQyWUDRqknGXL+qtPn/TKDyJw7x3md1yR+/WbIeX
> jFFv5i1+CDoR+JlMmkOK
> =7FV2
> -----END PGP SIGNATURE-----
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>

--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2012-08-06 19:19:42

by Arend van Spriel

[permalink] [raw]
Subject: Re: [PATCH] brcmsmac: document firmware dependencies

On 08/06/2012 09:17 PM, Jeff Mahoney wrote:
> The brcmsmac driver requests firmware but doesn't document the
> dependency. This means that software that analyzes the modules to
> determine if firmware is needed won't detect it.
>
> Specifically, (at least) openSUSE won't install the kernel-firmware
> package if no hardware requires it.
>
> This patch adds the MODULE_FIRMWARE directives.
>

Acked-by: Arend van Spriel <[email protected]>

> Signed-off-by: Jeff Mahoney <[email protected]>

Gr. AvS