iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b43: PHY: allow init optimizations by tracking PHY state

Browse Source 
PHY has to be often re-initialized (e.g. during band switching after PHY
reset), however some operations have to be performed only once (only
power reset affects them).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2014-05-27 22:07:31 +02:00 committed by John W. Linville
parent cf42c4e5d3
commit 09951ad493
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/b43/main.c
View File

@ -5164,6 +5164,7 @@ static void b43_supported_bands(struct b43_wldev *dev, bool *have_2ghz_phy,
static int b43_wireless_core_attach(struct b43_wldev *dev) static int b43_wireless_core_attach(struct b43_wldev *dev)
{ {
struct b43_wl *wl = dev->wl; struct b43_wl *wl = dev->wl;
struct b43_phy *phy = &dev->phy;
int err; int err;
u32 tmp; u32 tmp;
bool have_2ghz_phy = false, have_5ghz_phy = false; bool have_2ghz_phy = false, have_5ghz_phy = false;
@ -5181,6 +5182,8 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
goto out; goto out;
} }
phy->do_full_init = true;
/* Try to guess supported bands for the first init needs */ /* Try to guess supported bands for the first init needs */
switch (dev->dev->bus_type) { switch (dev->dev->bus_type) {
#ifdef CONFIG_B43_BCMA #ifdef CONFIG_B43_BCMA

5
drivers/net/wireless/b43/phy_common.c
View File

@ -98,11 +98,14 @@ int b43_phy_init(struct b43_wldev *dev)
phy->ops->switch_analog(dev, true); phy->ops->switch_analog(dev, true);
b43_software_rfkill(dev, false); b43_software_rfkill(dev, false);
err = ops->init(dev); err = ops->init(dev);
if (err) { if (err) {
b43err(dev->wl, "PHY init failed\n"); b43err(dev->wl, "PHY init failed\n");
goto err_block_rf; goto err_block_rf;
} }
phy->do_full_init = false;
/* Make sure to switch hardware and firmware (SHM) to /* Make sure to switch hardware and firmware (SHM) to
* the default channel. */ * the default channel. */
err = b43_switch_channel(dev, ops->get_default_chan(dev)); err = b43_switch_channel(dev, ops->get_default_chan(dev));
@ -114,6 +117,7 @@ int b43_phy_init(struct b43_wldev *dev)
return 0; return 0;
err_phy_exit: err_phy_exit:
phy->do_full_init = true;
if (ops->exit) if (ops->exit)
ops->exit(dev); ops->exit(dev);
err_block_rf: err_block_rf:
@ -127,6 +131,7 @@ void b43_phy_exit(struct b43_wldev *dev)
const struct b43_phy_operations *ops = dev->phy.ops; const struct b43_phy_operations *ops = dev->phy.ops;
b43_software_rfkill(dev, true); b43_software_rfkill(dev, true);
dev->phy.do_full_init = true;
if (ops->exit) if (ops->exit)
ops->exit(dev); ops->exit(dev);
} }

3
drivers/net/wireless/b43/phy_common.h
View File

@ -234,6 +234,9 @@ struct b43_phy {
/* Is GMODE (2 GHz mode) bit enabled? */ /* Is GMODE (2 GHz mode) bit enabled? */
bool gmode; bool gmode;
/* After power reset full init has to be performed */
bool do_full_init;
/* Analog Type */ /* Analog Type */
u8 analog; u8 analog;
/* B43_PHYTYPE_ */ /* B43_PHYTYPE_ */