Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f80f014 authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by John W. Linville
Browse files

brcmsmac: add support for cores with revision 17 



This adds support for bcma wifi core revision 17 which is found on
BCM4716/4717/4718 SoCs. The firmware version 610.812 for brcmsmac found
in linux-firmware does not support these cores, but a firmware
generated with b43-fwcutter from the proprietary broadcom wireless
driver works with these chips. This wifi core contains a revision 5
N-PHY and a revision 7 radio of type 0x2056.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9c170e06

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ MODULE_FIRMWARE("brcm/bcm43xx_hdr-0.fw"); 


/* recognized BCMA Core IDs */

static struct bcma_device_id brcms_coreid_table[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 17, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 23, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_80211, 24, BCMA_ANY_CLASS),

	BCMA_CORETABLE_END

drivers/net/wireless/brcm80211/brcmsmac/main.c

+3 −3
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw) 
	brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs);



	/* do band-specific ucode IHR, SHM, and SCR inits */

	if (D11REV_IS(wlc_hw->corerev, 23)) {

	if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {

		if (BRCMS_ISNPHY(wlc_hw->band))

			brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);

		else
@@ -2264,7 +2264,7 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw) 
	if (wlc_hw->ucode_loaded)

		return;



	if (D11REV_IS(wlc_hw->corerev, 23)) {

	if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {

		if (BRCMS_ISNPHY(wlc_hw->band)) {

			brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo,

					  ucode->bcm43xx_16_mimosz);
@@ -3216,7 +3216,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) 


	sflags = bcma_aread32(core, BCMA_IOST);



	if (D11REV_IS(wlc_hw->corerev, 23)) {

	if (D11REV_IS(wlc_hw->corerev, 17) || D11REV_IS(wlc_hw->corerev, 23)) {

		if (BRCMS_ISNPHY(wlc_hw->band))

			brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);

		else