brcmfmac: add support for CYW43012 SDIO chipset (35cb51b2) · Commits · 戴 / test

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -983,6 +983,7 @@ static const struct sdio_device_id brcmf_sdmmc_ids[] = {
		BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
		BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4356),
		BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_4373),
		BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_CYPRESS_43012),
		{ /* end: all zeroes */ }
		};
		MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);

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

+13 −1

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ struct sbconfig {
		#define SRCI_LSS_MASK 0x00f00000
		#define SRCI_LSS_SHIFT 20
		#define SRCI_SRNB_MASK 0xf0
		#define SRCI_SRNB_MASK_EXT 0x100
		#define SRCI_SRNB_SHIFT 4
		#define SRCI_SRBSZ_MASK 0xf
		#define SRCI_SRBSZ_SHIFT 0
		@@ -591,8 +592,14 @@ static void brcmf_chip_socram_ramsize(struct brcmf_core_priv sr, u32 ramsize,
		ramsize = nb (1 << (banksize + SR_BSZ_BASE));
		if (lss != 0)
		*ramsize += (1 << ((lss - 1) + SR_BSZ_BASE));
		} else {
		/* length of SRAM Banks increased for corerev greater than 23 */
		if (sr->pub.rev >= 23) {
		nb = (coreinfo & (SRCI_SRNB_MASK \| SRCI_SRNB_MASK_EXT))
		>> SRCI_SRNB_SHIFT;
		} else {
		nb = (coreinfo & SRCI_SRNB_MASK) >> SRCI_SRNB_SHIFT;
		}
		for (i = 0; i < nb; i++) {
		retent = brcmf_chip_socram_banksize(sr, i, &banksize);
		*ramsize += banksize;
		@@ -1356,6 +1363,11 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub)
		addr = CORE_CC_REG(base, sr_control1);
		reg = chip->ops->read32(chip->ctx, addr);
		return reg != 0;
		case CY_CC_43012_CHIP_ID:
		addr = CORE_CC_REG(pmu->base, retention_ctl);
		reg = chip->ops->read32(chip->ctx, addr);
		return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK \|
		PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
		default:
		addr = CORE_CC_REG(pmu->base, pmucapabilities_ext);
		reg = chip->ops->read32(chip->ctx, addr);

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

+62 −12

Original line number	Diff line number	Diff line
		@@ -624,6 +624,7 @@ BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
		BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
		BRCMF_FW_DEF(4356, "brcmfmac4356-sdio");
		BRCMF_FW_DEF(4373, "brcmfmac4373-sdio");
		BRCMF_FW_DEF(43012, "brcmfmac43012-sdio");

		static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
		BRCMF_FW_ENTRY(BRCM_CC_43143_CHIP_ID, 0xFFFFFFFF, 43143),
		@@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
		BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFFC0, 43455),
		BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),
		BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356),
		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)
		};

		static void pkt_align(struct sk_buff *p, int len, int align)
		@@ -677,6 +679,14 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on)
		/* 1st KSO write goes to AOS wake up core if device is asleep */
		brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR, wr_val, &err);

		/* In case of 43012 chip, the chip could go down immediately after
		* KSO bit is cleared. So the further reads of KSO register could
		* fail. Thereby just bailing out immediately after clearing KSO
		* bit, to avoid polling of KSO bit.
		*/
		if (!on && bus->ci->chip == CY_CC_43012_CHIP_ID)
		return err;

		if (on) {
		/* device WAKEUP through KSO:
		* write bit 0 & read back until
		@@ -2402,6 +2412,14 @@ static int brcmf_sdio_tx_ctrlframe(struct brcmf_sdio bus, u8 frame, u16 len)
		return ret;
		}

		static bool brcmf_chip_is_ulp(struct brcmf_chip *ci)
		{
		if (ci->chip == CY_CC_43012_CHIP_ID)
		return true;
		else
		return false;
		}

		static void brcmf_sdio_bus_stop(struct device *dev)
		{
		struct brcmf_bus *bus_if = dev_get_drvdata(dev);
		@@ -2409,7 +2427,7 @@ static void brcmf_sdio_bus_stop(struct device *dev)
		struct brcmf_sdio *bus = sdiodev->bus;
		struct brcmf_core *core = bus->sdio_core;
		u32 local_hostintmask;
		u8 saveclk;
		u8 saveclk, bpreq;
		int err;

		brcmf_dbg(TRACE, "Enter\n");
		@@ -2436,9 +2454,14 @@ static void brcmf_sdio_bus_stop(struct device *dev)
		/* Force backplane clocks to assure F2 interrupt propagates */
		saveclk = brcmf_sdiod_readb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
		&err);
		if (!err)
		brcmf_sdiod_writeb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
		(saveclk \| SBSDIO_FORCE_HT), &err);
		if (!err) {
		bpreq = saveclk;
		bpreq \|= brcmf_chip_is_ulp(bus->ci) ?
		SBSDIO_HT_AVAIL_REQ : SBSDIO_FORCE_HT;
		brcmf_sdiod_writeb(sdiodev,
		SBSDIO_FUNC1_CHIPCLKCSR,
		bpreq, &err);
		}
		if (err)
		brcmf_err("Failed to force clock for F2: err %d\n",
		err);
		@@ -3328,20 +3351,45 @@ err:
		return bcmerror;
		}

		static bool brcmf_sdio_aos_no_decode(struct brcmf_sdio *bus)
		{
		if (bus->ci->chip == CY_CC_43012_CHIP_ID)
		return true;
		else
		return false;
		}

		static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)
		{
		int err = 0;
		u8 val;
		u8 wakeupctrl;
		u8 cardcap;
		u8 chipclkcsr;

		brcmf_dbg(TRACE, "Enter\n");

		if (brcmf_chip_is_ulp(bus->ci)) {
		wakeupctrl = SBSDIO_FUNC1_WCTRL_ALPWAIT_SHIFT;
		chipclkcsr = SBSDIO_HT_AVAIL_REQ;
		} else {
		wakeupctrl = SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT;
		chipclkcsr = SBSDIO_FORCE_HT;
		}

		if (brcmf_sdio_aos_no_decode(bus)) {
		cardcap = SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC;
		} else {
		cardcap = (SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT \|
		SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT);
		}

		val = brcmf_sdiod_readb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL, &err);
		if (err) {
		brcmf_err("error reading SBSDIO_FUNC1_WAKEUPCTRL\n");
		return;
		}

		val \|= 1 << SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT;
		val \|= 1 << wakeupctrl;
		brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL, val, &err);
		if (err) {
		brcmf_err("error writing SBSDIO_FUNC1_WAKEUPCTRL\n");
		@@ -3350,8 +3398,7 @@ static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)

		/* Add CMD14 Support */
		brcmf_sdiod_func0_wb(bus->sdiodev, SDIO_CCCR_BRCM_CARDCAP,
		(SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT \|
		SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT),
		cardcap,
		&err);
		if (err) {
		brcmf_err("error writing SDIO_CCCR_BRCM_CARDCAP\n");
		@@ -3359,7 +3406,7 @@ static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)
		}

		brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
		SBSDIO_FORCE_HT, &err);
		chipclkcsr, &err);
		if (err) {
		brcmf_err("error writing SBSDIO_FUNC1_CHIPCLKCSR\n");
		return;
		@@ -4051,7 +4098,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
		const struct firmware *code;
		void *nvram;
		u32 nvram_len;
		u8 saveclk;
		u8 saveclk, bpreq;
		u8 devctl;

		brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);
		@@ -4085,8 +4132,11 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
		/* Force clocks on backplane to be sure F2 interrupt propagates */
		saveclk = brcmf_sdiod_readb(sdiod, SBSDIO_FUNC1_CHIPCLKCSR, &err);
		if (!err) {
		bpreq = saveclk;
		bpreq \|= brcmf_chip_is_ulp(bus->ci) ?
		SBSDIO_HT_AVAIL_REQ : SBSDIO_FORCE_HT;
		brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_CHIPCLKCSR,
		(saveclk \| SBSDIO_FORCE_HT), &err);
		bpreq, &err);
		}
		if (err) {
		brcmf_err("Failed to force clock for F2: err %d\n", err);

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@
		#define BRCM_CC_43664_CHIP_ID 43664
		#define BRCM_CC_4371_CHIP_ID 0x4371
		#define CY_CC_4373_CHIP_ID 0x4373
		#define CY_CC_43012_CHIP_ID 43012

		/* USB Device IDs */
		#define BRCM_USB_43143_DEVICE_ID 0xbd1e

include/linux/mmc/sdio_ids.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@
		#define SDIO_DEVICE_ID_BROADCOM_4354 0x4354
		#define SDIO_DEVICE_ID_BROADCOM_4356 0x4356
		#define SDIO_DEVICE_ID_CYPRESS_4373 0x4373
		#define SDIO_DEVICE_ID_CYPRESS_43012 43012

		#define SDIO_VENDOR_ID_INTEL 0x0089
		#define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX 0x1402

Admin message