From: matthias.bgg@kernel.org
To: Jakub Kicinski <kuba@kernel.org>,
Kalle Valo <kvalo@codeaurora.org>,
"David S . Miller" <davem@davemloft.net>,
hdegoede@redhat.com
Cc: "Pali Rohár" <pali@kernel.org>,
"Guenter Roeck" <linux@roeck-us.net>,
"Chi-Hsien Lin" <chi-hsien.lin@cypress.com>,
"Franky Lin" <franky.lin@broadcom.com>,
"Chung-Hsien Hsu" <stanley.hsu@cypress.com>,
"Jean-Philippe Brucker" <jean-philippe@linaro.org>,
"Double Lo" <double.lo@cypress.com>,
"Frank Kao" <frank.kao@cypress.com>,
linux-wireless@vger.kernel.org,
brcm80211-dev-list.pdl@broadcom.com,
"Arend van Spriel" <arend.vanspriel@broadcom.com>,
"Gustavo A . R . Silva" <gustavo@embeddedor.com>,
netdev@vger.kernel.org, "Rafał Miłecki" <rafal@milecki.pl>,
"Hante Meuleman" <hante.meuleman@broadcom.com>,
"Wright Feng" <wright.feng@cypress.com>,
"Matthias Brugger" <mbrugger@suse.com>,
digetx@gmail.com,
"Saravanan Shanmugham" <saravanan.shanmugham@cypress.com>,
linux-kernel@vger.kernel.org,
"Ulf Hansson" <ulf.hansson@linaro.org>,
"Amar Shankar" <amsr@cypress.com>,
brcm80211-dev-list@cypress.com
Subject: [PATCH v3] brcmfmac: expose firmware config files through modinfo
Date: Tue, 24 Nov 2020 13:00:18 +0100 [thread overview]
Message-ID: <20201124120018.31358-1-matthias.bgg@kernel.org> (raw)
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
next reply other threads:[~2020-11-24 12:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 12:00 matthias.bgg [this message]
2020-11-24 12:01 ` [PATCH v3] brcmfmac: expose firmware config files through modinfo Hans de Goede
2020-12-02 19:37 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201124120018.31358-1-matthias.bgg@kernel.org \
--to=matthias.bgg@kernel.org \
--cc=amsr@cypress.com \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211-dev-list@cypress.com \
--cc=chi-hsien.lin@cypress.com \
--cc=davem@davemloft.net \
--cc=digetx@gmail.com \
--cc=double.lo@cypress.com \
--cc=frank.kao@cypress.com \
--cc=franky.lin@broadcom.com \
--cc=gustavo@embeddedor.com \
--cc=hante.meuleman@broadcom.com \
--cc=hdegoede@redhat.com \
--cc=jean-philippe@linaro.org \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mbrugger@suse.com \
--cc=netdev@vger.kernel.org \
--cc=pali@kernel.org \
--cc=rafal@milecki.pl \
--cc=saravanan.shanmugham@cypress.com \
--cc=stanley.hsu@cypress.com \
--cc=ulf.hansson@linaro.org \
--cc=wright.feng@cypress.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).