b43: HT-PHY: add place for writing HT PHY support
authorRafał Miłecki <zajec5@gmail.com>
Mon, 13 Jun 2011 14:20:06 +0000 (16:20 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 17 Jun 2011 18:22:20 +0000 (14:22 -0400)
This is totally broken plus we do not have specs for HT PHY yet. Just
introduce place for writing driver if we discover anything.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/b43/Kconfig
drivers/net/wireless/b43/Makefile
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/phy_common.c
drivers/net/wireless/b43/phy_common.h
drivers/net/wireless/b43/phy_ht.c [new file with mode: 0644]
drivers/net/wireless/b43/phy_ht.h [new file with mode: 0644]

index fe26bf448fdbf5b54f0acfdff41aa8a4f860d235..e02db1be172338f50e42918538606ef9b142092a 100644 (file)
@@ -112,6 +112,14 @@ config B43_PHY_LP
          and embedded devices. It supports 802.11a/g
          (802.11a support is optional, and currently disabled).
 
+config B43_PHY_HT
+       bool "Support for HT-PHY devices (BROKEN)"
+       depends on B43 && BROKEN
+       ---help---
+         Support for the HT-PHY.
+
+         Say N, this is BROKEN and crashes driver.
+
 # This config option automatically enables b43 LEDS support,
 # if it's possible.
 config B43_LEDS
index 95f7c001fda1c130bd2338f4c3d63bed34aecbb0..58d614a889b9b7b192aa62977fac4489d8314c01 100644 (file)
@@ -10,6 +10,7 @@ b43-y                         += phy_a.o
 b43-$(CONFIG_B43_PHY_N)                += phy_n.o
 b43-$(CONFIG_B43_PHY_LP)       += phy_lp.o
 b43-$(CONFIG_B43_PHY_LP)       += tables_lpphy.o
+b43-$(CONFIG_B43_PHY_HT)       += phy_ht.o
 b43-y                          += sysfs.o
 b43-y                          += xmit.o
 b43-y                          += lo.o
index 7aed9a0eabc4ca40d854e50726962cb0f644512b..acee7b6af29a66538148a2a69a5323b1499fc7b9 100644 (file)
@@ -4096,6 +4096,12 @@ static int b43_phy_versioning(struct b43_wldev *dev)
                if (phy_rev > 2)
                        unsupported = 1;
                break;
+#endif
+#ifdef CONFIG_B43_PHY_HT
+       case B43_PHYTYPE_HT:
+               if (phy_rev > 1)
+                       unsupported = 1;
+               break;
 #endif
        default:
                unsupported = 1;
@@ -4153,6 +4159,10 @@ static int b43_phy_versioning(struct b43_wldev *dev)
                if (radio_ver != 0x2062 && radio_ver != 0x2063)
                        unsupported = 1;
                break;
+       case B43_PHYTYPE_HT:
+               if (radio_ver != 0x2059)
+                       unsupported = 1;
+               break;
        default:
                B43_WARN_ON(1);
        }
index 425af28ea4e5dd445cbbcae917d1a6aab7ac814c..9705950f059a3d5a08e8d78f87e489af4ce5d0b7 100644 (file)
@@ -31,6 +31,7 @@
 #include "phy_a.h"
 #include "phy_n.h"
 #include "phy_lp.h"
+#include "phy_ht.h"
 #include "b43.h"
 #include "main.h"
 
@@ -57,6 +58,11 @@ int b43_phy_allocate(struct b43_wldev *dev)
        case B43_PHYTYPE_LP:
 #ifdef CONFIG_B43_PHY_LP
                phy->ops = &b43_phyops_lp;
+#endif
+               break;
+       case B43_PHYTYPE_HT:
+#ifdef CONFIG_B43_PHY_HT
+               phy->ops = &b43_phyops_ht;
 #endif
                break;
        }
index 2401bee8b0819476717ad567ea627f8cdc082af3..47dcb800a3c313a08e5b633a974afb2dcc4b5670 100644 (file)
@@ -194,6 +194,7 @@ struct b43_phy_a;
 struct b43_phy_g;
 struct b43_phy_n;
 struct b43_phy_lp;
+struct b43_phy_ht;
 
 struct b43_phy {
        /* Hardware operation callbacks. */
@@ -216,6 +217,8 @@ struct b43_phy {
                struct b43_phy_n *n;
                /* LP-PHY specific information */
                struct b43_phy_lp *lp;
+               /* HT-PHY specific information */
+               struct b43_phy_ht *ht;
        };
 
        /* Band support flags. */
diff --git a/drivers/net/wireless/b43/phy_ht.c b/drivers/net/wireless/b43/phy_ht.c
new file mode 100644 (file)
index 0000000..320be0e
--- /dev/null
@@ -0,0 +1,119 @@
+/*
+
+  Broadcom B43 wireless driver
+  IEEE 802.11n HT-PHY support
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; see the file COPYING.  If not, write to
+  the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+*/
+
+#include <linux/slab.h>
+
+#include "b43.h"
+#include "phy_ht.h"
+#include "main.h"
+
+/**************************************************
+ * Basic PHY ops.
+ **************************************************/
+
+static int b43_phy_ht_op_allocate(struct b43_wldev *dev)
+{
+       struct b43_phy_ht *phy_ht;
+
+       phy_ht = kzalloc(sizeof(*phy_ht), GFP_KERNEL);
+       if (!phy_ht)
+               return -ENOMEM;
+       dev->phy.ht = phy_ht;
+
+       return 0;
+}
+
+static void b43_phy_ht_op_prepare_structs(struct b43_wldev *dev)
+{
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_ht *phy_ht = phy->ht;
+
+       memset(phy_ht, 0, sizeof(*phy_ht));
+}
+
+static void b43_phy_ht_op_free(struct b43_wldev *dev)
+{
+       struct b43_phy *phy = &dev->phy;
+       struct b43_phy_ht *phy_ht = phy->ht;
+
+       kfree(phy_ht);
+       phy->ht = NULL;
+}
+
+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 36;
+}
+
+/**************************************************
+ * R/W ops.
+ **************************************************/
+
+static u16 b43_phy_ht_op_read(struct b43_wldev *dev, u16 reg)
+{
+       b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
+       return b43_read16(dev, B43_MMIO_PHY_DATA);
+}
+
+static void b43_phy_ht_op_write(struct b43_wldev *dev, u16 reg, u16 value)
+{
+       b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
+       b43_write16(dev, B43_MMIO_PHY_DATA, value);
+}
+
+static void b43_phy_ht_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
+                                u16 set)
+{
+       b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
+       b43_write16(dev, B43_MMIO_PHY_DATA,
+                   (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
+}
+
+/**************************************************
+ * PHY ops struct.
+ **************************************************/
+
+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,
+       /*
+       .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,
+       */
+       .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,
+       */
+};
diff --git a/drivers/net/wireless/b43/phy_ht.h b/drivers/net/wireless/b43/phy_ht.h
new file mode 100644 (file)
index 0000000..aabad6f
--- /dev/null
@@ -0,0 +1,19 @@
+#ifndef B43_PHY_HT_H_
+#define B43_PHY_HT_H_
+
+#include "phy_common.h"
+
+
+#define B43_PHY_HT_TABLE_ADDR                  0x072 /* Table address */
+#define B43_PHY_HT_TABLE_DATALO                        0x073 /* Table data low */
+#define B43_PHY_HT_TABLE_DATAHI                        0x074 /* Table data high */
+
+
+struct b43_phy_ht {
+};
+
+
+struct b43_phy_operations;
+extern const struct b43_phy_operations b43_phyops_ht;
+
+#endif /* B43_PHY_HT_H_ */