Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git] / drivers / net / wireless / b43 / phy_ht.c
index 42bea30..7c40919 100644 (file)
 #include "radio_2059.h"
 #include "main.h"
 
+/**************************************************
+ * Radio 2059.
+ **************************************************/
+
 static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
                        const struct b43_phy_ht_channeltab_e_radio2059 *e)
 {
@@ -57,7 +61,7 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
        b43_radio_write(dev, 0x98, e->radio_syn98);
 
        for (i = 0; i < 2; i++) {
-               routing = i ? 0x800 : 0x400;
+               routing = i ? R2059_RXRX1 : R2059_TXRX0;
                b43_radio_write(dev, routing | 0x4a, e->radio_rxtx4a);
                b43_radio_write(dev, routing | 0x58, e->radio_rxtx58);
                b43_radio_write(dev, routing | 0x5a, e->radio_rxtx5a);
@@ -79,6 +83,78 @@ static void b43_radio_2059_channel_setup(struct b43_wldev *dev,
        udelay(300);
 }
 
+static void b43_radio_2059_init(struct b43_wldev *dev)
+{
+       const u16 routing[] = { R2059_SYN, R2059_TXRX0, R2059_RXRX1 };
+       const u16 radio_values[3][2] = {
+               { 0x61, 0xE9 }, { 0x69, 0xD5 }, { 0x73, 0x99 },
+       };
+       u16 i, j;
+
+       b43_radio_write(dev, R2059_ALL | 0x51, 0x0070);
+       b43_radio_write(dev, R2059_ALL | 0x5a, 0x0003);
+
+       for (i = 0; i < ARRAY_SIZE(routing); i++)
+               b43_radio_set(dev, routing[i] | 0x146, 0x3);
+
+       b43_radio_set(dev, 0x2e, 0x0078);
+       b43_radio_set(dev, 0xc0, 0x0080);
+       msleep(2);
+       b43_radio_mask(dev, 0x2e, ~0x0078);
+       b43_radio_mask(dev, 0xc0, ~0x0080);
+
+       if (1) { /* FIXME */
+               b43_radio_set(dev, R2059_RXRX1 | 0x4, 0x1);
+               udelay(10);
+               b43_radio_set(dev, R2059_RXRX1 | 0x0BF, 0x1);
+               b43_radio_maskset(dev, R2059_RXRX1 | 0x19B, 0x3, 0x2);
+
+               b43_radio_set(dev, R2059_RXRX1 | 0x4, 0x2);
+               udelay(100);
+               b43_radio_mask(dev, R2059_RXRX1 | 0x4, ~0x2);
+
+               for (i = 0; i < 10000; i++) {
+                       if (b43_radio_read(dev, R2059_RXRX1 | 0x145) & 1) {
+                               i = 0;
+                               break;
+                       }
+                       udelay(100);
+               }
+               if (i)
+                       b43err(dev->wl, "radio 0x945 timeout\n");
+
+               b43_radio_mask(dev, R2059_RXRX1 | 0x4, ~0x1);
+               b43_radio_set(dev, 0xa, 0x60);
+
+               for (i = 0; i < 3; i++) {
+                       b43_radio_write(dev, 0x17F, radio_values[i][0]);
+                       b43_radio_write(dev, 0x13D, 0x6E);
+                       b43_radio_write(dev, 0x13E, radio_values[i][1]);
+                       b43_radio_write(dev, 0x13C, 0x55);
+
+                       for (j = 0; j < 10000; j++) {
+                               if (b43_radio_read(dev, 0x140) & 2) {
+                                       j = 0;
+                                       break;
+                               }
+                               udelay(500);
+                       }
+                       if (j)
+                               b43err(dev->wl, "radio 0x140 timeout\n");
+
+                       b43_radio_write(dev, 0x13C, 0x15);
+               }
+
+               b43_radio_mask(dev, 0x17F, ~0x1);
+       }
+
+       b43_radio_mask(dev, 0x11, ~0x0008);
+}
+
+/**************************************************
+ * Channel switching ops.
+ **************************************************/
+
 static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
                                const struct b43_phy_ht_channeltab_e_phy *e,
                                struct ieee80211_channel *new_channel)
@@ -104,9 +180,14 @@ static void b43_phy_ht_channel_setup(struct b43_wldev *dev,
 
        /* TODO: separated function? */
        for (i = 0; i < 3; i++) {
+               u16 mask;
                u32 tmp = b43_httab_read(dev, B43_HTTAB32(26, 0xE8));
 
-               /* TODO: some op on PHY reg 0x908 */
+               if (0) /* FIXME */
+                       mask = 0x2 << (i * 4);
+               else
+                       mask = 0;
+               b43_phy_mask(dev, B43_PHY_EXTG(0x108), mask);
 
                b43_httab_write(dev, B43_HTTAB16(7, 0x110 + i), tmp >> 16);
                b43_httab_write(dev, B43_HTTAB8(13, 0x63 + (i * 4)),
@@ -172,6 +253,13 @@ static void b43_phy_ht_op_prepare_structs(struct b43_wldev *dev)
        memset(phy_ht, 0, sizeof(*phy_ht));
 }
 
+static int b43_phy_ht_op_init(struct b43_wldev *dev)
+{
+       b43_phy_ht_tables_init(dev);
+
+       return 0;
+}
+
 static void b43_phy_ht_op_free(struct b43_wldev *dev)
 {
        struct b43_phy *phy = &dev->phy;
@@ -188,13 +276,25 @@ static void b43_phy_ht_op_software_rfkill(struct b43_wldev *dev,
        if (b43_read32(dev, B43_MMIO_MACCTL) & B43_MACCTL_ENABLED)
                b43err(dev->wl, "MAC not suspended\n");
 
+       /* In the following PHY ops we copy wl's dummy behaviour.
+        * TODO: Find out if reads (currently hidden in masks/masksets) are
+        * needed and replace following ops with just writes or w&r.
+        * Note: B43_PHY_HT_RF_CTL1 register is tricky, wrong operation can
+        * cause delayed (!) machine lock up. */
        if (blocked) {
-               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0);
+               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, 0);
        } else {
-               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0);
-               b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, ~0, 0x1);
-               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, ~0);
-               b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, ~0, 0x2);
+               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, 0);
+               b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, 0, 0x1);
+               b43_phy_mask(dev, B43_PHY_HT_RF_CTL1, 0);
+               b43_phy_maskset(dev, B43_PHY_HT_RF_CTL1, 0, 0x2);
+
+               if (dev->phy.radio_ver == 0x2059)
+                       b43_radio_2059_init(dev);
+               else
+                       B43_WARN_ON(1);
+
+               b43_switch_channel(dev, dev->phy.channel);
        }
 }
 
@@ -236,7 +336,7 @@ static int b43_phy_ht_op_switch_channel(struct b43_wldev *dev,
 static unsigned int b43_phy_ht_op_get_default_chan(struct b43_wldev *dev)
 {
        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
-               return 1;
+               return 11;
        return 36;
 }
 
@@ -280,6 +380,16 @@ static void b43_phy_ht_op_radio_write(struct b43_wldev *dev, u16 reg,
        b43_write16(dev, B43_MMIO_RADIO24_DATA, value);
 }
 
+static enum b43_txpwr_result
+b43_phy_ht_op_recalc_txpower(struct b43_wldev *dev, bool ignore_tssi)
+{
+       return B43_TXPWR_RES_DONE;
+}
+
+static void b43_phy_ht_op_adjust_txpower(struct b43_wldev *dev)
+{
+}
+
 /**************************************************
  * PHY ops struct.
  **************************************************/
@@ -288,9 +398,7 @@ const struct b43_phy_operations b43_phyops_ht = {
        .allocate               = b43_phy_ht_op_allocate,
        .free                   = b43_phy_ht_op_free,
        .prepare_structs        = b43_phy_ht_op_prepare_structs,
-       /*
        .init                   = b43_phy_ht_op_init,
-       */
        .phy_read               = b43_phy_ht_op_read,
        .phy_write              = b43_phy_ht_op_write,
        .phy_maskset            = b43_phy_ht_op_maskset,
@@ -300,8 +408,6 @@ const struct b43_phy_operations b43_phyops_ht = {
        .switch_analog          = b43_phy_ht_op_switch_analog,
        .switch_channel         = b43_phy_ht_op_switch_channel,
        .get_default_chan       = b43_phy_ht_op_get_default_chan,
-       /*
        .recalc_txpower         = b43_phy_ht_op_recalc_txpower,
        .adjust_txpower         = b43_phy_ht_op_adjust_txpower,
-       */
 };