Commit 737f657f authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: Implement PHY PLL reset 



We should reset PLL after changing MAC frequency.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 50398ee0

drivers/net/wireless/b43/main.c

+30 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,36 @@ void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags) 
	}

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/BmacCorePllReset */

void b43_wireless_core_phy_pll_reset(struct b43_wldev *dev)

{

	struct bcma_drv_cc *bcma_cc __maybe_unused;

	struct ssb_chipcommon *ssb_cc __maybe_unused;



	switch (dev->dev->bus_type) {

#ifdef CONFIG_B43_BCMA

	case B43_BUS_BCMA:

		bcma_cc = &dev->dev->bdev->bus->drv_cc;



		bcma_cc_write32(bcma_cc, BCMA_CC_CHIPCTL_ADDR, 0);

		bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);

		bcma_cc_set32(bcma_cc, BCMA_CC_CHIPCTL_DATA, 0x4);

		bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);

		break;

#endif

#ifdef CONFIG_B43_SSB

	case B43_BUS_SSB:

		ssb_cc = &dev->dev->sdev->bus->chipco;



		chipco_write32(ssb_cc, SSB_CHIPCO_CHIPCTL_ADDR, 0);

		chipco_mask32(ssb_cc, SSB_CHIPCO_CHIPCTL_DATA, ~0x4);

		chipco_set32(ssb_cc, SSB_CHIPCO_CHIPCTL_DATA, 0x4);

		chipco_mask32(ssb_cc, SSB_CHIPCO_CHIPCTL_DATA, ~0x4);

		break;

#endif

	}

}



#ifdef CONFIG_B43_BCMA

static void b43_bcma_phy_reset(struct b43_wldev *dev)

{

drivers/net/wireless/b43/main.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ void b43_controller_restart(struct b43_wldev *dev, const char *reason); 
#define B43_PS_ASLEEP	(1 << 3)	/* Force device asleep */

void b43_power_saving_ctl_bits(struct b43_wldev *dev, unsigned int ps_flags);



void b43_wireless_core_phy_pll_reset(struct b43_wldev *dev);



void b43_mac_suspend(struct b43_wldev *dev);

void b43_mac_enable(struct b43_wldev *dev);

void b43_mac_phy_clock_set(struct b43_wldev *dev, bool on);

drivers/net/wireless/b43/phy_ht.c

+1 −1
Original line number Diff line number Diff line
@@ -762,7 +762,7 @@ static void b43_phy_ht_spur_avoid(struct b43_wldev *dev, 


	b43_mac_switch_freq(dev, spuravoid);



	/* TODO: reset PLL */

	b43_wireless_core_phy_pll_reset(dev);



	if (spuravoid)

		b43_phy_set(dev, B43_PHY_HT_BBCFG, B43_PHY_HT_BBCFG_RSTRX);

drivers/net/wireless/b43/phy_n.c

+1 −1
Original line number Diff line number Diff line
@@ -6369,7 +6369,7 @@ static void b43_nphy_channel_setup(struct b43_wldev *dev, 
		b43_mac_switch_freq(dev, spuravoid);



		if (dev->phy.rev == 3 || dev->phy.rev == 4)

			; /* TODO: reset PLL */

			b43_wireless_core_phy_pll_reset(dev);



		if (spuravoid)

			b43_phy_set(dev, B43_NPHY_BBCFG, B43_NPHY_BBCFG_RSTRX);

CRA Git | Maintained and supported by SUSTech CRA and CCSE