* [PATCH v3] brcmfmac: expose firmware config files through modinfo
@ 2020-11-24 12:00 matthias.bgg
2020-11-24 12:01 ` Hans de Goede
2020-12-02 19:37 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: matthias.bgg @ 2020-11-24 12:00 UTC (permalink / raw)
To: Jakub Kicinski, Kalle Valo, David S . Miller, hdegoede
Cc: Pali Rohár, Guenter Roeck, Chi-Hsien Lin, Franky Lin,
Chung-Hsien Hsu, Jean-Philippe Brucker, Double Lo, Frank Kao,
linux-wireless, brcm80211-dev-list.pdl, Arend van Spriel,
Gustavo A . R . Silva, netdev, Rafał Miłecki,
Hante Meuleman, Wright Feng, Matthias Brugger, digetx,
Saravanan Shanmugham, linux-kernel, Ulf Hansson, Amar Shankar,
brcm80211-dev-list
From: Matthias Brugger <mbrugger@suse.com>
Apart from a firmware binary the chip needs a config file used by the
FW. Add the config files to modinfo so that they can be read by
userspace.
Signed-off-by: Matthias Brugger <mbrugger@suse.com>
---
Changes in v3:
Use only two more generic wildcards.
Changes in v2:
In comparison to first version [0] we use wildcards to enumerate the
firmware configuration files. Wildcard support was added to dracut
recently [1].
[0] https://lore.kernel.org/linux-wireless/20200701153123.25602-1-matthias.bgg@kernel.org/
[1] https://github.com/dracutdevs/dracut/pull/860
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 99987a789e7e..6fe91c537adf 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -625,6 +625,10 @@ BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");
BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
+/* firmware config files */
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");
+MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");
+
static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v3] brcmfmac: expose firmware config files through modinfo
2020-11-24 12:00 [PATCH v3] brcmfmac: expose firmware config files through modinfo matthias.bgg
@ 2020-11-24 12:01 ` Hans de Goede
2020-12-02 19:37 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2020-11-24 12:01 UTC (permalink / raw)
To: matthias.bgg, Jakub Kicinski, Kalle Valo, David S . Miller
Cc: Pali Rohár, Guenter Roeck, Chi-Hsien Lin, Franky Lin,
Chung-Hsien Hsu, Jean-Philippe Brucker, Double Lo, Frank Kao,
linux-wireless, brcm80211-dev-list.pdl, Arend van Spriel,
Gustavo A . R . Silva, netdev, Rafał Miłecki,
Hante Meuleman, Wright Feng, Matthias Brugger, digetx,
Saravanan Shanmugham, linux-kernel, Ulf Hansson, Amar Shankar,
brcm80211-dev-list
Hi,
On 11/24/20 1:00 PM, matthias.bgg@kernel.org wrote:
> From: Matthias Brugger <mbrugger@suse.com>
>
> Apart from a firmware binary the chip needs a config file used by the
> FW. Add the config files to modinfo so that they can be read by
> userspace.
>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
>
> ---
>
> Changes in v3:
> Use only two more generic wildcards.
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
>
> Changes in v2:
> In comparison to first version [0] we use wildcards to enumerate the
> firmware configuration files. Wildcard support was added to dracut
> recently [1].
> [0] https://lore.kernel.org/linux-wireless/20200701153123.25602-1-matthias.bgg@kernel.org/
> [1] https://github.com/dracutdevs/dracut/pull/860
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 99987a789e7e..6fe91c537adf 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -625,6 +625,10 @@ BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");
> BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
> BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");
>
> +/* firmware config files */
> +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-sdio.*.txt");
> +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcm/brcmfmac*-pcie.*.txt");
> +
> static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
> BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
> BRCMF_FW_ENTRY(BRCM_CC_43241_CHIP_ID, 0x0000001F, 43241B0),
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v3] brcmfmac: expose firmware config files through modinfo
2020-11-24 12:00 [PATCH v3] brcmfmac: expose firmware config files through modinfo matthias.bgg
2020-11-24 12:01 ` Hans de Goede
@ 2020-12-02 19:37 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2020-12-02 19:37 UTC (permalink / raw)
To: matthias.bgg
Cc: Jakub Kicinski, David S . Miller, hdegoede, Pali Rohár,
Guenter Roeck, Chi-Hsien Lin, Franky Lin, Chung-Hsien Hsu,
Jean-Philippe Brucker, Double Lo, Frank Kao, linux-wireless,
brcm80211-dev-list.pdl, Arend van Spriel, Gustavo A . R . Silva,
netdev, Rafał Miłecki, Hante Meuleman, Wright Feng,
Matthias Brugger, digetx, Saravanan Shanmugham, linux-kernel,
Ulf Hansson, Amar Shankar, brcm80211-dev-list
matthias.bgg@kernel.org wrote:
> From: Matthias Brugger <mbrugger@suse.com>
>
> Apart from a firmware binary the chip needs a config file used by the
> FW. Add the config files to modinfo so that they can be read by
> userspace.
>
> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Patch applied to wireless-drivers-next.git, thanks.
75729e110e68 brcmfmac: expose firmware config files through modinfo
--
https://patchwork.kernel.org/project/linux-wireless/patch/20201124120018.31358-1-matthias.bgg@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-02 19:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-24 12:00 [PATCH v3] brcmfmac: expose firmware config files through modinfo matthias.bgg
2020-11-24 12:01 ` Hans de Goede
2020-12-02 19:37 ` Kalle Valo
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).