brcmfmac: set F2 watermark to 256 for 4373 (e1a08730) · Commits · 戴 / test

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

+24 −2

Original line number	Diff line number	Diff line
		@@ -49,6 +49,10 @@
		#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
		#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)

		/* watermark expressed in number of words */
		#define DEFAULT_F2_WATERMARK 0x8
		#define CY_4373_F2_WATERMARK 0x40

		#ifdef DEBUG

		#define BRCMF_TRAP_INFO_SIZE 80
		@@ -138,6 +142,8 @@ struct rte_console {
		/* 1: isolate internal sdio signals, put external pads in tri-state; requires
		* sdio bus power cycle to clear (rev 9) */
		#define SBSDIO_DEVCTL_PADS_ISO 0x08
		/* 1: enable F2 Watermark */
		#define SBSDIO_DEVCTL_F2WM_ENAB 0x10
		/* Force SD->SB reset mapping (rev 11) */
		#define SBSDIO_DEVCTL_SB_RST_CTL 0x30
		/* Determined by CoreControl bit */
		@@ -4046,6 +4052,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
		void *nvram;
		u32 nvram_len;
		u8 saveclk;
		u8 devctl;

		brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);

		@@ -4101,8 +4108,23 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
		brcmf_sdiod_writel(sdiod, core->base + SD_REG(hostintmask),
		bus->hostintmask, NULL);


		brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, 8, &err);
		switch (sdiod->func1->device) {
		case SDIO_DEVICE_ID_CYPRESS_4373:
		brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
		CY_4373_F2_WATERMARK);
		brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
		CY_4373_F2_WATERMARK, &err);
		devctl = brcmf_sdiod_readb(sdiod, SBSDIO_DEVICE_CTL,
		&err);
		devctl \|= SBSDIO_DEVCTL_F2WM_ENAB;
		brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
		&err);
		break;
		default:
		brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
		DEFAULT_F2_WATERMARK, &err);
		break;
		}
		} else {
		/* Disable F2 again */
		sdio_disable_func(sdiod->func2);

Admin message