From 4ecc05c34f16ab9eb2ac0922505072aec08837db Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Thu, 25 Jan 2024 00:37:51 -0600 Subject: [PATCH 233/296] brcmfmac: fix wrong FW extension problem for secure chips 43022 and H2 use different extension Signed-off-by: Ian Lin --- .../broadcom/brcm80211/brcmfmac/sdio.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 10a754a0ab34..c896ffc93c97 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -5504,14 +5504,23 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus) struct brcmf_fw_request *fwreq; struct brcmf_fw_name fwnames[3]; - if (bus->ci->blhs && bus->ci->chip == CY_CC_43022_CHIP_ID) { + if (bus->ci->blhs) { /* 43022 : secure-mode supports .trxs image only */ - fwnames[0].extension = ".trxs"; - fwnames[0].path = bus->sdiodev->fw_name; + if (bus->ci->chip == CY_CC_43022_CHIP_ID) + fwnames[0].extension = ".trxs"; + else if ((bus->ci->chip == CY_CC_55500_CHIP_ID) || + (bus->ci->chip == CY_CC_55572_CHIP_ID)) + fwnames[0].extension = ".trxse"; + else + brcmf_err("unexpected chip 0x%x with blhs\n", bus->ci->chip); } else { - fwnames[0].extension = ".bin"; - fwnames[0].path = bus->sdiodev->fw_name; + if ((bus->ci->chip == CY_CC_55500_CHIP_ID) || + (bus->ci->chip == CY_CC_55572_CHIP_ID)) + fwnames[0].extension = ".trx"; + else + fwnames[0].extension = ".bin"; } + fwnames[0].path = bus->sdiodev->fw_name; fwnames[1].extension = ".txt"; fwnames[1].path = bus->sdiodev->nvram_name; -- 2.25.1