b43: HT-PHY: implement killing radio

Closed drivers kill radio right after reading radio version and MACCTL,
so it was easy to find related PHY ops:
 phy_read(0x0810) -> 0x0000
phy_write(0x0810) <- 0x0000
To find out the mask of above OP, MMIO hack was used to fake read val:
 phy_read(0x0810) -> 0xffff
phy_write(0x0810) <- 0x0000

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/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
index 5777cdbc047b8e49c452eb11113d3bea109a6cef..e84d4c1353543eaddee601ea2aa931130f3fbbc0 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.c
+++ b/drivers/net/wireless/b43/phy_ht.c
@@ -59,6 +59,19 @@ static void b43_phy_ht_op_free(struct b43_wldev *dev)
        phy->ht = NULL;
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/Radio/Switch%20Radio */
+static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
+                                       bool blocked)
+{
+       if (b43_read32(dev, B43_MMIO_MACCTL) & B43_MACCTL_ENABLED)
+               b43err(dev->wl, "MAC not suspended\n");
+
+       if (blocked) {
+               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0);
+       } else {
+       }
+}
+
 static void b43_phy_ht_op_switch_analog(struct b43_wldev *dev, bool on)
 {
        if (on) {
@@ -141,9 +154,7 @@ const struct b43_phy_operations b43_phyops_ht = {
        .phy_maskset            = b43_phy_ht_op_maskset,
        .radio_read             = b43_phy_ht_op_radio_read,
        .radio_write            = b43_phy_ht_op_radio_write,
-       /*
        .software_rfkill        = b43_phy_ht_op_software_rfkill,
-       */
        .switch_analog          = b43_phy_ht_op_switch_analog,
        /*
        .switch_channel         = b43_phy_ht_op_switch_channel,

diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h
index 84ac47cbfaad6d8c5ff0fa76137737d5f7f5c683..e16d4bbeb4b6d8b93135ddc3e0851c45628b2306 100644 (file)
--- a/drivers/net/wireless/b43/phy_ht.h
+++ b/drivers/net/wireless/b43/phy_ht.h
@@ -8,6 +8,8 @@
 #define B43_PHY_HT_TABLE_DATALO                        0x073 /* Table data low */
 #define B43_PHY_HT_TABLE_DATAHI                        0x074 /* Table data high */
 
+#define B43_PHY_HT_RF_CTL1                     B43_PHY_EXTG(0x010)
+
 #define B43_PHY_HT_AFE_CTL1                    B43_PHY_EXTG(0x110)
 #define B43_PHY_HT_AFE_CTL2                    B43_PHY_EXTG(0x111)
 #define B43_PHY_HT_AFE_CTL3                    B43_PHY_EXTG(0x114)