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

Commit 84ad327d authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: add hostready indication 



A hostready signal is introduced to inform firmware through mailbox
doorbell1 when common ring initialized or D3 exited.

Reviewed-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ff68c9f9

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

+12 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { 
#define BRCMF_PCIE_PCIE2REG_MAILBOXMASK		0x4C

#define BRCMF_PCIE_PCIE2REG_CONFIGADDR		0x120

#define BRCMF_PCIE_PCIE2REG_CONFIGDATA		0x124

#define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX		0x140

#define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0	0x140

#define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1	0x144



#define BRCMF_PCIE2_INTA			0x01

#define BRCMF_PCIE2_INTB			0x02
@@ -140,6 +141,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { 
#define BRCMF_PCIE_SHARED_VERSION_MASK		0x00FF

#define BRCMF_PCIE_SHARED_DMA_INDEX		0x10000

#define BRCMF_PCIE_SHARED_DMA_2B_IDX		0x100000

#define BRCMF_PCIE_SHARED_HOSTRDY_DB1		0x10000000



#define BRCMF_PCIE_FLAGS_HTOD_SPLIT		0x4000

#define BRCMF_PCIE_FLAGS_DTOH_SPLIT		0x8000
@@ -782,6 +784,12 @@ static void brcmf_pcie_intr_enable(struct brcmf_pciedev_info *devinfo) 
			       BRCMF_PCIE_MB_INT_FN0_1);

}



static void brcmf_pcie_hostready(struct brcmf_pciedev_info *devinfo)

{

	if (devinfo->shared.flags & BRCMF_PCIE_SHARED_HOSTRDY_DB1)

		brcmf_pcie_write_reg32(devinfo,

				       BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_1, 1);

}



static irqreturn_t brcmf_pcie_quick_check_isr(int irq, void *arg)

{
@@ -924,7 +932,7 @@ static int brcmf_pcie_ring_mb_ring_bell(void *ctx) 


	brcmf_dbg(PCIE, "RING !\n");

	/* Any arbitrary value will do, lets use 1 */

	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX, 1);

	brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX_0, 1);



	return 0;

}
@@ -1728,6 +1736,7 @@ static void brcmf_pcie_setup(struct device *dev, int ret, 
	init_waitqueue_head(&devinfo->mbdata_resp_wait);



	brcmf_pcie_intr_enable(devinfo);

	brcmf_pcie_hostready(devinfo);

	if (brcmf_attach(&devinfo->pdev->dev, devinfo->settings) == 0)

		return;
@@ -1950,6 +1959,7 @@ static int brcmf_pcie_pm_leave_D3(struct device *dev) 
		brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2);

		brcmf_bus_change_state(bus, BRCMF_BUS_UP);

		brcmf_pcie_intr_enable(devinfo);

		brcmf_pcie_hostready(devinfo);

		return 0;

	}