b43: PHY: allow init optimizations by tracking PHY state

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>

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 3d67e6b08e1cc8c4a1cdbf00bf6b1125ea24ae6a..bf279170b4833f1c4282f5cda23baf7703d69b9d 100644 (file)
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -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)
 {
        struct b43_wl *wl = dev->wl;
+       struct b43_phy *phy = &dev->phy;
        int err;
        u32 tmp;
        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;
        }
 
+       phy->do_full_init = true;
+
        /* Try to guess supported bands for the first init needs */
        switch (dev->dev->bus_type) {
 #ifdef CONFIG_B43_BCMA

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

diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index 47b55855c37da0363bb213fc92a4491419f7eebf..4ad6240d9ff40e53557b4d29b27788b3eb9602d5 100644 (file)
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -234,6 +234,9 @@ struct b43_phy {
        /* Is GMODE (2 GHz mode) bit enabled? */
        bool gmode;
 
+       /* After power reset full init has to be performed */
+       bool do_full_init;
+
        /* Analog Type */
        u8 analog;
        /* B43_PHYTYPE_ */