lkml.org 
[lkml]   [2022]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: [PATCH v2 02/35] brcmfmac: pcie: Declare missing firmware files in pcie.c
    From
    On 1/4/2022 8:26 AM, Hector Martin wrote:
    > Move one of the declarations from sdio.c to pcie.c, since it makes no
    > sense in the former (SDIO support is optional), and add missing ones.

    Actually, any bus is optional so each bus should indeed declare the
    applicable firmware names/patterns.

    > Fixes: 75729e110e68 ("brcmfmac: expose firmware config files through modinfo")
    > Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
    Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
    > Signed-off-by: Hector Martin <marcan@marcan.st>
    > ---
    > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +++++++
    > drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 -
    > 2 files changed, 7 insertions(+), 1 deletion(-)
    >
    > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
    > index 8b149996fc00..aed49416c434 100644
    > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
    > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
    > @@ -59,6 +59,13 @@ BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
    > BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
    > BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
    >
    > +/* firmware config files */
    > +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt");

    what is this one for? Those would be covered by the specific
    BRCMF_FW_DEF() macro instances, no?

    > +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");
    > +
    > +/* per-board firmware binaries */
    > +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.bin");
    > +
    > static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
    > BRCMF_FW_ENTRY(BRCM_CC_43602_CHIP_ID, 0xFFFFFFFF, 43602),
    > BRCMF_FW_ENTRY(BRCM_CC_43465_CHIP_ID, 0xFFFFFFF0, 4366C),
    > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    > index 8effeb7a7269..5d156e591b35 100644
    > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    > @@ -629,7 +629,6 @@ BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio");
    >
    > /* firmware config files */
    > MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");
    > -MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.*.txt");
    >
    > /* per-board firmware binaries */
    > MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.bin");
    [unhandled content-type:application/pkcs7-signature]
    \
     
     \ /
      Last update: 2022-01-06 10:57    [W:4.292 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site