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

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

brcmsmac: use bcma PCIe up and down functions 



replace the calls to bcma_core_pci_extend_L1timer() by calls to the
newly introduced bcma_core_pci_ip() and bcma_core_pci_down()

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cfe51ec1

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

+0 −21
Original line number Diff line number Diff line
@@ -679,27 +679,6 @@ bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode) 
	return mode == BCMA_CLKMODE_FAST;

}



void ai_pci_up(struct si_pub *sih)

{

	struct si_info *sii;



	sii = container_of(sih, struct si_info, pub);



	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)

		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);

}



/* Unconfigure and/or apply various WARs when going down */

void ai_pci_down(struct si_pub *sih)

{

	struct si_info *sii;



	sii = container_of(sih, struct si_info, pub);



	if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)

		bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);

}



/* Enable BT-COEX & Ex-PA for 4313 */

void ai_epa_4313war(struct si_pub *sih)

{

drivers/net/wireless/brcm80211/brcmsmac/aiutils.h

+0 −3
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ extern u16 ai_clkctl_fast_pwrup_delay(struct si_pub *sih); 
extern bool ai_clkctl_cc(struct si_pub *sih, enum bcma_clkmode mode);

extern bool ai_deviceremoved(struct si_pub *sih);



extern void ai_pci_down(struct si_pub *sih);

extern void ai_pci_up(struct si_pub *sih);



/* Enable Ex-PA for 4313 */

extern void ai_epa_4313war(struct si_pub *sih);

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

+4 −4
Original line number Diff line number Diff line
@@ -4669,7 +4669,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core, 
	brcms_c_coredisable(wlc_hw);



	/* Match driver "down" state */

	ai_pci_down(wlc_hw->sih);

	bcma_core_pci_down(wlc_hw->d11core->bus);



	/* turn off pll and xtal to match driver "down" state */

	brcms_b_xtal(wlc_hw, OFF);
@@ -5012,12 +5012,12 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw) 
	 */

	if (brcms_b_radio_read_hwdisabled(wlc_hw)) {

		/* put SB PCI in down state again */

		ai_pci_down(wlc_hw->sih);

		bcma_core_pci_down(wlc_hw->d11core->bus);

		brcms_b_xtal(wlc_hw, OFF);

		return -ENOMEDIUM;

	}



	ai_pci_up(wlc_hw->sih);

	bcma_core_pci_up(wlc_hw->d11core->bus);



	/* reset the d11 core */

	brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
@@ -5214,7 +5214,7 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw) 


		/* turn off primary xtal and pll */

		if (!wlc_hw->noreset) {

			ai_pci_down(wlc_hw->sih);

			bcma_core_pci_down(wlc_hw->d11core->bus);

			brcms_b_xtal(wlc_hw, OFF);

		}

	}