brcmfmac: Add clm_blob firmware files to modinfo
PATCH 1/1 brcmfmac: Add clm_blob firmware files to modinfo
From: Matthias Brugger <[email protected]>
Cypress Wi-Fi chipsets include information regarding regulatory constraints. These are provided to the driver through "Country Local Matrix" (CLM) blobs. Files present in Linux firmware repository are on a generic world-wide safe version with conservative power settings which is designed to comply with regulatory but may not provide best performance on all boards. Never the less, a better functionality can be expected with the file present, so add it to the modinfo of the driver.
---
.../wireless/broadcom/brcm80211/brcmfmac/firmware.h | 7 +++++++ .../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 ++++++------ 3 files changed, 15 insertions(+), 8 deletions(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +7 -0
@@ -32,6 +32,13 @@ static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \BRCMF_FW_DEFAULT_PATH fw_base; \ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin") +/* Firmware and Country Local Matrix files */ +#define BRCMF_FW_CLM_DEF (fw_name, fw_base) \ +static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \ + BRCMF_FW_DEFAULT_PATH fw_base; \ +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin"); \ +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".clm_blob") +#define BRCMF_FW_ENTRY (chipid, mask, name) \ { chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2 -2
@@ -48,8 +48,8 @@ enum brcmf_pcie_state {BRCMF_FW_DEF (43602 ,"brcmfmac43602-pcie" );BRCMF_FW_DEF (4350 ,"brcmfmac4350-pcie" ); BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie"); -BRCMF_FW_DEF (4356 ,"brcmfmac4356-pcie" ); -BRCMF_FW_DEF (43570 ,"brcmfmac43570-pcie" ); +BRCMF_FW_CLM_DEF (4356 ,"brcmfmac4356-pcie" ); +BRCMF_FW_CLM_DEF (43570 ,"brcmfmac43570-pcie" );BRCMF_FW_DEF (4358 ,"brcmfmac4358-pcie" );BRCMF_FW_DEF (4359 ,"brcmfmac4359-pcie" );BRCMF_FW_DEF (4364 ,"brcmfmac4364-pcie" );
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +6 -6
@@ -616,14 +616,14 @@ BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");BRCMF_FW_DEF (4339 ,"brcmfmac4339-sdio" ); BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");/* Note the names are not postfixed with a1 for backward compatibility */ -BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio"); -BRCMF_FW_DEF (43455 ,"brcmfmac43455-sdio" ); +BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio"); +BRCMF_FW_CLM_DEF (43455 ,"brcmfmac43455-sdio" );BRCMF_FW_DEF (43456 ,"brcmfmac43456-sdio" ); -BRCMF_FW_DEF (4354 ,"brcmfmac4354-sdio" ); -BRCMF_FW_DEF (4356 ,"brcmfmac4356-sdio" ); +BRCMF_FW_CLM_DEF (4354 ,"brcmfmac4354-sdio" ); +BRCMF_FW_CLM_DEF (4356 ,"brcmfmac4356-sdio" );BRCMF_FW_DEF (4359 ,"brcmfmac4359-sdio" ); -BRCMF_FW_DEF (4373 ,"brcmfmac4373-sdio" ); -BRCMF_FW_DEF (43012 ,"brcmfmac43012-sdio" ); +BRCMF_FW_CLM_DEF (4373 ,"brcmfmac4373-sdio" ); +BRCMF_FW_CLM_DEF (43012 ,"brcmfmac43012-sdio" );/* firmware config files */ MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt" );
Signature · 1 line
2.31.1
Hi,
Quoted 11 lines · On 6/7/21 12:34 PM, [email protected] wrote:
From: Matthias Brugger <[email protected]>
Cypress Wi-Fi chipsets include information regarding regulatory constraints. These are provided to the driver through "Country Local Matrix" (CLM) blobs. Files present in Linux firmware repository are on a generic world-wide safe version with conservative power settings which is designed to comply with regulatory but may not provide best performance on all boards. Never the less, a better functionality can be expected with the file present, so add it to the modinfo of the driver.
Quoted 1 line
Signed-off-by Matthias Brugger <[email protected]>
Thanks, patch looks good to me:
Regards,
Hans
Quoted 67 lines
---
.../wireless/broadcom/brcm80211/brcmfmac/firmware.h | 7 +++++++ .../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 ++-- .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 ++++++------ 3 files changed, 15 insertions(+), 8 deletions(-)drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +7
-0@@ -32,6 +32,13 @@ static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \BRCMF_FW_DEFAULT_PATH fw_base; \ MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin") +/* Firmware and Country Local Matrix files */ +#define BRCMF_FW_CLM_DEF (fw_name, fw_base) \ +static const char BRCM_ ## fw_name ## _FIRMWARE_BASENAME[] = \ + BRCMF_FW_DEFAULT_PATH fw_base; \ +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".bin"); \ +MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH fw_base ".clm_blob") +#define BRCMF_FW_ENTRY (chipid, mask, name) \ { chipid, mask, BRCM_ ## name ## _FIRMWARE_BASENAME }drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +2
-2@@ -48,8 +48,8 @@ enum brcmf_pcie_state {BRCMF_FW_DEF (43602 ,"brcmfmac43602-pcie" );BRCMF_FW_DEF (4350 ,"brcmfmac4350-pcie" ); BRCMF_FW_DEF(4350C, "brcmfmac4350c2-pcie"); -BRCMF_FW_DEF (4356 ,"brcmfmac4356-pcie" ); -BRCMF_FW_DEF (43570 ,"brcmfmac43570-pcie" ); +BRCMF_FW_CLM_DEF (4356 ,"brcmfmac4356-pcie" ); +BRCMF_FW_CLM_DEF (43570 ,"brcmfmac43570-pcie" );BRCMF_FW_DEF (4358 ,"brcmfmac4358-pcie" );BRCMF_FW_DEF (4359 ,"brcmfmac4359-pcie" );BRCMF_FW_DEF (4364 ,"brcmfmac4364-pcie" );drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +6
-6@@ -616,14 +616,14 @@ BRCMF_FW_DEF(43362, "brcmfmac43362-sdio");BRCMF_FW_DEF (4339 ,"brcmfmac4339-sdio" ); BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");/* Note the names are not postfixed with a1 for backward compatibility */ -BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio"); -BRCMF_FW_DEF (43455 ,"brcmfmac43455-sdio" ); +BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio"); +BRCMF_FW_CLM_DEF (43455 ,"brcmfmac43455-sdio" );BRCMF_FW_DEF (43456 ,"brcmfmac43456-sdio" ); -BRCMF_FW_DEF (4354 ,"brcmfmac4354-sdio" ); -BRCMF_FW_DEF (4356 ,"brcmfmac4356-sdio" ); +BRCMF_FW_CLM_DEF (4354 ,"brcmfmac4354-sdio" ); +BRCMF_FW_CLM_DEF (4356 ,"brcmfmac4356-sdio" );BRCMF_FW_DEF (4359 ,"brcmfmac4359-sdio" ); -BRCMF_FW_DEF (4373 ,"brcmfmac4373-sdio" ); -BRCMF_FW_DEF (43012 ,"brcmfmac43012-sdio" ); +BRCMF_FW_CLM_DEF (4373 ,"brcmfmac4373-sdio" ); +BRCMF_FW_CLM_DEF (43012 ,"brcmfmac43012-sdio" );/* firmware config files */ MODULE_FIRMWARE (BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt" );
Quoted 11 lines · [email protected] wrote:
From: Matthias Brugger <[email protected]>
Cypress Wi-Fi chipsets include information regarding regulatory constraints. These are provided to the driver through "Country Local Matrix" (CLM) blobs. Files present in Linux firmware repository are on a generic world-wide safe version with conservative power settings which is designed to comply with regulatory but may not provide best performance on all boards. Never the less, a better functionality can be expected with the file present, so add it to the modinfo of the driver.
Quoted 2 lines
Signed-off-by Matthias Brugger <[email protected]>Reviewed-by Hans de Goede <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
885f256f61f9 brcmfmac: Add clm_blob firmware files to modinfo
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches