Commit ed26edf7 authored by Zhao, Jiaqing's avatar Zhao, Jiaqing Committed by Kalle Valo
Browse files

brcmfmac: Add BCM43454/6 support 



BCM43454/6 is a variant of BCM4345 which is exactly identical to
BCM4345/6, except the chip id is 0xa9be. This patch adds support
for BCM43454/6 by handing it in the same way as BCM4345.

Note: when loading some specific version of BCM4345 firmware, the
chip id may become 0x4345. This is an expected behavior, and it will
restore to 0xa9be after power cycle.

Signed-off-by: default avatarJiaqing Zhao <jiaqing.zhao@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/CO1PR11MB47859B51BCA88613D1582EB88E2E9@CO1PR11MB4785.namprd11.prod.outlook.com
parent b96a7925

drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c

+2 −0
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) 
{

	switch (ci->pub.chip) {

	case BRCM_CC_4345_CHIP_ID:

	case BRCM_CC_43454_CHIP_ID:

		return 0x198000;

	case BRCM_CC_4335_CHIP_ID:

	case BRCM_CC_4339_CHIP_ID:
@@ -1401,6 +1402,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) 
	case BRCM_CC_4354_CHIP_ID:

	case BRCM_CC_4356_CHIP_ID:

	case BRCM_CC_4345_CHIP_ID:

	case BRCM_CC_43454_CHIP_ID:

		/* explicitly check SR engine enable bit */

		pmu_cc3_mask = BIT(2);

		fallthrough;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) 
	brcmf_feat_firmware_capabilities(ifp);

	memset(&gscan_cfg, 0, sizeof(gscan_cfg));

	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID &&

	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID)

	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID &&

	    drvr->bus_if->chip != BRCM_CC_43454_CHIP_ID)

		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,

					  "pfn_gscan_cfg",

					  &gscan_cfg, sizeof(gscan_cfg));

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 
	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0),

	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),

	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),

	BRCMF_FW_ENTRY(BRCM_CC_43454_CHIP_ID, 0x00000040, 43455),

	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),

	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),

	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),

drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define BRCM_CC_4339_CHIP_ID		0x4339

#define BRCM_CC_43430_CHIP_ID		43430

#define BRCM_CC_4345_CHIP_ID		0x4345

#define BRCM_CC_43454_CHIP_ID		43454

#define BRCM_CC_43465_CHIP_ID		43465

#define BRCM_CC_4350_CHIP_ID		0x4350

#define BRCM_CC_43525_CHIP_ID		43525