b43: Implement antenna diversity support for LP-PHY

RFC/RFT Gábor Stefanik 2 participants 2 messages Aug 27, 2009 Networking drivers (wireless)

Share & tools

Gábor Stefanik

author

2009-08-27 18:19 UTC #0 lore raw

Signed-off-by Gábor Stefanik <[email protected]>

---
This intentionally deviates slightly from the spec (writing the antenna ID in one pass instead of two) - please test if this works. (I don't have the tools to test if it actually selects the right antenna.)

The A/G-PHY changes are fallout fixes from the enum change, which in turn allows the LP-PHY code to be much simpler. The antenna_to_phyctl change is a fix for a potential existing bug that this patch may otherwise trigger.

drivers/net/wireless/b43/main.c       |    3 ++-
drivers/net/wireless/b43/phy_a.c      |    2 +-
drivers/net/wireless/b43/phy_common.h |   10 +++++-----
drivers/net/wireless/b43/phy_g.c      |    2 +-
drivers/net/wireless/b43/phy_lp.c     |   11 ++++++++++-
5 files changed, 19 insertions(+), 9 deletions(-)

drivers/net/wireless/b43/main.c +0 -0

index 289e06c..3b038c9 100644
@@ -1456,7 +1456,8 @@ static u16 b43_antenna_to_phyctl(int antenna)

		return B43_TXH_PHY_ANT2;
	case B43_ANTENNA3:
		return B43_TXH_PHY_ANT3;
-	case B43_ANTENNA_AUTO:
+	case B43_ANTENNA_AUTO0:
+	case B43_ANTENNA_AUTO1:
		return B43_TXH_PHY_ANT01AUTO;
	}
	B43_WARN_ON(1);

drivers/net/wireless/b43/phy_a.c +0 -0

index 816e028..809ec97 100644
@@ -531,7 +531,7 @@ static void b43_aphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)

	tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);
	tmp &= ~B43_PHY_BBANDCFG_RXANT;
-	tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)
+	tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna)
	    << B43_PHY_BBANDCFG_RXANT_SHIFT;
	b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);

drivers/net/wireless/b43/phy_common.h +0 -0

index b47a0f5..a6a90df 100644
@@ -49,11 +49,11 @@ enum b43_interference_mitigation {

/* Antenna identifiers */
enum {
- B43_ANTENNA0, /* Antenna 0 */
- B43_ANTENNA1, /* Antenna 0 */
- B43_ANTENNA_AUTO1, /* Automatic, starting with antenna 1 */
- B43_ANTENNA_AUTO0, /* Automatic, starting with antenna 0 */
- B43_ANTENNA2,
+ B43_ANTENNA0 = 0, /* Antenna 0 */
+ B43_ANTENNA1 = 1, /* Antenna 1 */
+ B43_ANTENNA_AUTO0 = 2, /* Automatic, starting with antenna 0 */
+ B43_ANTENNA_AUTO1 = 3, /* Automatic, starting with antenna 1 */
+ B43_ANTENNA2 = 4,

	B43_ANTENNA3 = 8,

	B43_ANTENNA_AUTO = B43_ANTENNA_AUTO0,

drivers/net/wireless/b43/phy_g.c +0 -0

index c6c9d2f..c6d639d 100644
@@ -2651,7 +2651,7 @@ static void b43_gphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)

	tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);
	tmp &= ~B43_PHY_BBANDCFG_RXANT;
-	tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)
+	tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna)
			<< B43_PHY_BBANDCFG_RXANT_SHIFT;
	b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);

drivers/net/wireless/b43/phy_lp.c +0 -0

index 837d952..457357a 100644
@@ -2204,7 +2204,16 @@ static int b43_lpphy_op_init(struct b43_wldev *dev)

static void b43_lpphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna) {
- //TODO
+ int autodiv = ;
+
+ if (dev->phy.rev >= 2)
+ return; // rev2+ doesn't support antenna diversity
+
+ if (B43_WARN_ON(antenna > B43_ANTENNA_AUTO1))
+ return;
+
+ /* NOTE: The spec breaks this up into 2 writes - please test */
+ b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFFFC, antenna);
}

static void b43_lpphy_op_adjust_txpower(struct b43_wldev *dev)

Signature · 1 line

1.6.2.4

Larry Finger

2009-08-27 18:39 UTC #1 lore raw

Quoted 99 lines · Gábor Stefanik

Signed-off-by Gábor Stefanik <[email protected]>

drivers/net/wireless/b43/main.c       |    3 ++-
drivers/net/wireless/b43/phy_a.c      |    2 +-
drivers/net/wireless/b43/phy_common.h |   10 +++++-----
drivers/net/wireless/b43/phy_g.c      |    2 +-
drivers/net/wireless/b43/phy_lp.c     |   11 ++++++++++-
5 files changed, 19 insertions(+), 9 deletions(-)

drivers/net/wireless/b43/main.c +2 -1

index 289e06c..3b038c9 100644
@@ -1456,7 +1456,8 @@ static u16 b43_antenna_to_phyctl(int antenna)
        return B43_TXH_PHY_ANT2;
    case B43_ANTENNA3:
        return B43_TXH_PHY_ANT3;
-    case B43_ANTENNA_AUTO:
+    case B43_ANTENNA_AUTO0:
+    case B43_ANTENNA_AUTO1:
        return B43_TXH_PHY_ANT01AUTO;
    }
    B43_WARN_ON(1);

drivers/net/wireless/b43/phy_a.c +1 -1

index 816e028..809ec97 100644
@@ -531,7 +531,7 @@ static void b43_aphy_op_set_rx_antenna(struct
 b43_wldev *dev, int antenna)
 
    tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);
    tmp &= ~B43_PHY_BBANDCFG_RXANT;
-    tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)
+    tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna)
        << B43_PHY_BBANDCFG_RXANT_SHIFT;
    b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);

drivers/net/wireless/b43/phy_common.h +5 -5

index b47a0f5..a6a90df 100644
@@ -49,11 +49,11 @@ enum b43_interference_mitigation {
 
 /* Antenna identifiers */
 enum {
-    B43_ANTENNA0,        /* Antenna 0 */
-    B43_ANTENNA1,        /* Antenna 0 */
-    B43_ANTENNA_AUTO1,    /* Automatic, starting with antenna 1 */
-    B43_ANTENNA_AUTO0,    /* Automatic, starting with antenna 0 */
-    B43_ANTENNA2,
+    B43_ANTENNA0 = 0,    /* Antenna 0 */
+    B43_ANTENNA1 = 1,    /* Antenna 1 */
+    B43_ANTENNA_AUTO0 = 2,    /* Automatic, starting with antenna 0 */
+    B43_ANTENNA_AUTO1 = 3,    /* Automatic, starting with antenna 1 */
+    B43_ANTENNA2 = 4,
    B43_ANTENNA3 = 8,
 
    B43_ANTENNA_AUTO = B43_ANTENNA_AUTO0,

drivers/net/wireless/b43/phy_g.c +1 -1

index c6c9d2f..c6d639d 100644
@@ -2651,7 +2651,7 @@ static void b43_gphy_op_set_rx_antenna(struct
 b43_wldev *dev, int antenna)
 
    tmp = b43_phy_read(dev, B43_PHY_BBANDCFG);
    tmp &= ~B43_PHY_BBANDCFG_RXANT;
-    tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna)
+    tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna)
            << B43_PHY_BBANDCFG_RXANT_SHIFT;
    b43_phy_write(dev, B43_PHY_BBANDCFG, tmp);

drivers/net/wireless/b43/phy_lp.c +3 -1

index 837d952..457357a 100644
@@ -2204,7 +2204,16 @@ static int b43_lpphy_op_init(struct b43_wldev *dev)
 
 static void b43_lpphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna)
 {
-    //TODO
+    int autodiv = ;
+
+    if (dev->phy.rev >= 2)

drivers/net/wireless/b43/phy_lp.c static int b43_lpphy_op_init(struct b43_wldev *dev) · line 2219

Quoted 10 lines

drivers/net/wireless/b43/phy_lp.c +7 -0

+        return; // rev2+ doesn't support antenna diversity
+
+    if (B43_WARN_ON(antenna > B43_ANTENNA_AUTO1))
+        return;
+
+    /* NOTE: The spec breaks this up into 2 writes - please test */
+    b43_phy_maskset(dev, B43_LPPHY_CRSGAIN_CTL, 0xFFFC, antenna);
 }
 
 static void b43_lpphy_op_adjust_txpower(struct b43_wldev *dev)

Sorry, but the spec for this routine was updated 1.5 hours ago.

As to the two-stage write, the spec does match the original code. Who knows what happens in the device. As it adds little to the routine, I would suggest implementing it the way the original code does.

Larry