Commit d2587c57 authored by Angus Ainslie's avatar Angus Ainslie Committed by Kalle Valo
Browse files

brcmfmac: add 43752 SDIO ids and initialization 



Add HW and SDIO ids for use with the SparkLan AP6275S
Add the firmware mapping structures for the BRCM43752 chipset.
The 43752 needs some things setup similar to the 43012 chipset.
The WATERMARK shows better performance when initialized to the 4373 value.

Signed-off-by: default avatarAngus Ainslie <angus@akkea.ca>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210812165218.2508258-2-angus@akkea.ca
parent 41b637ba

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -991,6 +991,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = { 
	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4359),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43012),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),

	BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_CYPRESS_89359),

	{ /* end: all zeroes */ }

	{ /* end: all zeroes */ }

};

};

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -729,6 +729,8 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) 
	case BRCM_CC_4364_CHIP_ID:

	case BRCM_CC_4364_CHIP_ID:

	case CY_CC_4373_CHIP_ID:

	case CY_CC_4373_CHIP_ID:

		return 0x160000;

		return 0x160000;

	case CY_CC_43752_CHIP_ID:

		return 0x170000;

	default:

	default:

		brcmf_err("unknown chip: %s\n", ci->pub.name);

		brcmf_err("unknown chip: %s\n", ci->pub.name);

		break;

		break;
@@ -1421,6 +1423,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) 
		reg = chip->ops->read32(chip->ctx, addr);

		reg = chip->ops->read32(chip->ctx, addr);

		return (reg & CC_SR_CTL0_ENABLE_MASK) != 0;

		return (reg & CC_SR_CTL0_ENABLE_MASK) != 0;

	case BRCM_CC_4359_CHIP_ID:

	case BRCM_CC_4359_CHIP_ID:

	case CY_CC_43752_CHIP_ID:

	case CY_CC_43012_CHIP_ID:

	case CY_CC_43012_CHIP_ID:

		addr = CORE_CC_REG(pmu->base, retention_ctl);

		addr = CORE_CC_REG(pmu->base, retention_ctl);

		reg = chip->ops->read32(chip->ctx, addr);

		reg = chip->ops->read32(chip->ctx, addr);

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -625,6 +625,7 @@ BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-sdio"); 
BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");

BRCMF_FW_DEF(4359, "brcmfmac4359-sdio");

BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio");

BRCMF_FW_CLM_DEF(4373, "brcmfmac4373-sdio");

BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio");

BRCMF_FW_CLM_DEF(43012, "brcmfmac43012-sdio");

BRCMF_FW_CLM_DEF(43752, "brcmfmac43752-sdio");





/* firmware config files */

/* firmware config files */

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");

MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-sdio.*.txt");
@@ -655,7 +656,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { 
	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),

	BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),

	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),

	BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),

	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),

	BRCMF_FW_ENTRY(CY_CC_4373_CHIP_ID, 0xFFFFFFFF, 4373),

	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012)

	BRCMF_FW_ENTRY(CY_CC_43012_CHIP_ID, 0xFFFFFFFF, 43012),

	BRCMF_FW_ENTRY(CY_CC_43752_CHIP_ID, 0xFFFFFFFF, 43752)

};

};





#define TXCTL_CREDITS	2

#define TXCTL_CREDITS	2
@@ -3421,7 +3423,8 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus, 




static bool brcmf_sdio_aos_no_decode(struct brcmf_sdio *bus)

static bool brcmf_sdio_aos_no_decode(struct brcmf_sdio *bus)

{

{

	if (bus->ci->chip == CY_CC_43012_CHIP_ID)

	if (bus->ci->chip == CY_CC_43012_CHIP_ID ||

	    bus->ci->chip == CY_CC_43752_CHIP_ID)

		return true;

		return true;

	else

	else

		return false;

		return false;
@@ -4266,6 +4269,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, 




		switch (sdiod->func1->device) {

		switch (sdiod->func1->device) {

		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:

		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_4373:

		case SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752:

			brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",

			brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",

				  CY_4373_F2_WATERMARK);

				  CY_4373_F2_WATERMARK);

			brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,

			brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define BRCM_CC_4371_CHIP_ID		0x4371

#define BRCM_CC_4371_CHIP_ID		0x4371

#define CY_CC_4373_CHIP_ID		0x4373

#define CY_CC_4373_CHIP_ID		0x4373

#define CY_CC_43012_CHIP_ID		43012

#define CY_CC_43012_CHIP_ID		43012

#define CY_CC_43752_CHIP_ID		43752





/* USB Device IDs */

/* USB Device IDs */

#define BRCM_USB_43143_DEVICE_ID	0xbd1e

#define BRCM_USB_43143_DEVICE_ID	0xbd1e

include/linux/mmc/sdio_ids.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ 
#define SDIO_DEVICE_ID_BROADCOM_43364		0xa9a4

#define SDIO_DEVICE_ID_BROADCOM_43364		0xa9a4

#define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6

#define SDIO_DEVICE_ID_BROADCOM_43430		0xa9a6

#define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf

#define SDIO_DEVICE_ID_BROADCOM_43455		0xa9bf

#define SDIO_DEVICE_ID_BROADCOM_CYPRESS_43752	0xaae8





#define SDIO_VENDOR_ID_MARVELL			0x02df

#define SDIO_VENDOR_ID_MARVELL			0x02df

#define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103

#define SDIO_DEVICE_ID_MARVELL_LIBERTAS		0x9103