b43: Update dummy transmission to match V4 specs

PATCH In review Gábor Stefanik 3 participants 4 messages Aug 13, 2009 Networking drivers (wireless)

lore

Share & tools

lore

Gábor Stefanik

author

2009-08-13 14:51 UTC #0 lore raw

PATCH v2 1/1 b43: Update dummy transmission to match V4 specs

The V4 dummy transmission has two extra bools in its prototype, so update all callers with the 2 bools.

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

---
v2: Convert all callers to v4, and drop the v3->v4 wrapper.

drivers/net/wireless/b43/lo.c    |    2 +-
drivers/net/wireless/b43/main.c  |   42 ++++++++++++++++++++++---------------
drivers/net/wireless/b43/main.h  |    2 +-
drivers/net/wireless/b43/phy_g.c |    6 ++--
drivers/net/wireless/b43/wa.c    |    2 +-
5 files changed, 31 insertions(+), 23 deletions(-)

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

index 22d0fbd..976104f 100644
@@ -477,7 +477,7 @@ static void lo_measure_setup(struct b43_wldev *dev,

	} else
		b43_phy_write(dev, B43_PHY_CCK(0x2B), 0x0802);
	if (phy->rev >= 2)
-		b43_dummy_transmission(dev);
+		b43_dummy_transmission(dev, false, true);
	b43_gphy_channel_switch(dev, 6, 0);
	b43_radio_read16(dev, 0x51);	/* dummy read */
	if (phy->type == B43_PHYTYPE_G)

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

index cb4a871..fbcbe4f 100644
@@ -684,9 +684,9 @@ static void b43_synchronize_irq(struct b43_wldev *dev)

}

/* DummyTransmission function, as documented on
- * http://bcm-specs.sipsolutions.net/DummyTransmission
+ * http://bcm-v4.sipsolutions.net/802.11/DummyTransmission
*/
-void b43_dummy_transmission(struct b43_wldev *dev)
+void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on)

{
	struct b43_wl *wl = dev->wl;
	struct b43_phy *phy = &dev->phy;
@@ -700,19 +700,12 @@ void b43_dummy_transmission(struct b43_wldev *dev)
		0x00000000,
	};

- switch (phy->type) {
- case B43_PHYTYPE_A:

+	if (ofdm) {
		max_loop = 0x1E;
		buffer[0] = 0x000201CC;
-		break;
-	case B43_PHYTYPE_B:
-	case B43_PHYTYPE_G:
+	} else {
		max_loop = 0xFA;
		buffer[0] = 0x000B846E;
-		break;
-	default:
-		B43_WARN_ON(1);
-		return;
	}

	spin_lock_irq(&wl->irq_lock);
@@ -721,20 +714,35 @@ void b43_dummy_transmission(struct b43_wldev *dev)
	for (i = 0; i < 5; i++)
		b43_ram_write(dev, i * 4, buffer[i]);

- /* Commit writes */
- b43_read32(dev, B43_MMIO_MACCTL);
-

	b43_write16(dev, 0x0568, 0x0000);

- b43_write16(dev, 0x07C0, 0x0000);
- value = ((phy->type == B43_PHYTYPE_A) ? 1 : 0);
+ if (dev->dev->id.revision < 11)
+ b43_write16(dev, 0x07C0, 0x0000);
+ else
+ b43_write16(dev, 0x07C0, 0x0100);

+	value = (ofdm ? 0x41 : 0x40);
	b43_write16(dev, 0x050C, value);
+	if ((phy->type == B43_PHYTYPE_N) || (phy->type == B43_PHYTYPE_LP))
+		b43_write16(dev, 0x0514, 0x1A02);
	b43_write16(dev, 0x0508, 0x0000);
	b43_write16(dev, 0x050A, 0x0000);
	b43_write16(dev, 0x054C, 0x0000);
	b43_write16(dev, 0x056A, 0x0014);
	b43_write16(dev, 0x0568, 0x0826);
	b43_write16(dev, 0x0500, 0x0000);

- b43_write16(dev, 0x0502, 0x0030);
+ if (!pa_on && (phy->type == B43_PHYTYPE_N)) {
+ //SPEC TODO
+ }
+
+ switch (phy->type) {
+ case B43_PHYTYPE_N:
+ b43_write16(dev, 0x0502, 0x00D0);
+ break;
+ case B43_PHYTYPE_LP:
+ b43_write16(dev, 0x0502, 0x0050);
+ break;
+ default:
+ b43_write16(dev, 0x0502, 0x0030);
+ }

	if (phy->radio_ver == 0x2050 && phy->radio_rev <= 0x5)
		b43_radio_write16(dev, 0x0051, 0x0017);

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

index 40abcf5..2d23f65 100644
@@ -124,7 +124,7 @@ void __b43_shm_write16(struct b43_wldev *dev, u16 routing, u16 offset, u16 value

u64 b43_hf_read(struct b43_wldev *dev);
void b43_hf_write(struct b43_wldev *dev, u64 value);

-void b43_dummy_transmission(struct b43_wldev *dev);
+void b43_dummy_transmission(struct b43_wldev *dev, bool ofdm, bool pa_on);

void b43_wireless_core_reset(struct b43_wldev *dev, u32 flags);

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

index e7b98f0..e75a39d 100644
@@ -333,7 +333,7 @@ static void b43_set_all_gains(struct b43_wldev *dev,

		b43_phy_maskset(dev, 0x04A1, 0xBFBF, tmp);
		b43_phy_maskset(dev, 0x04A2, 0xBFBF, tmp);
	}

- b43_dummy_transmission(dev);
+ b43_dummy_transmission(dev, false, true);
}

static void b43_set_original_gains(struct b43_wldev *dev)
@@ -365,7 +365,7 @@ static void b43_set_original_gains(struct b43_wldev *dev)

	b43_phy_maskset(dev, 0x04A0, 0xBFBF, 0x4040);
	b43_phy_maskset(dev, 0x04A1, 0xBFBF, 0x4040);
	b43_phy_maskset(dev, 0x04A2, 0xBFBF, 0x4000);

- b43_dummy_transmission(dev);
+ b43_dummy_transmission(dev, false, true);
}

/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
@@ -1964,7 +1964,7 @@ static void b43_phy_init_pctl(struct b43_wldev *dev)

			}
			b43_set_txpower_g(dev, &bbatt, &rfatt, 0);
		}
-		b43_dummy_transmission(dev);
+		b43_dummy_transmission(dev, false, true);
		gphy->cur_idle_tssi = b43_phy_read(dev, B43_PHY_ITSSI);
		if (B43_DEBUG) {
			/* Current-Idle-TSSI sanity check. */

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

index e1e20f6..73e97fa 100644
@@ -37,7 +37,7 @@ static void b43_wa_papd(struct b43_wldev *dev)

	backup = b43_ofdmtab_read16(dev, B43_OFDMTAB_PWRDYN2, 0);
	b43_ofdmtab_write16(dev, B43_OFDMTAB_PWRDYN2, 0, 7);
	b43_ofdmtab_write16(dev, B43_OFDMTAB_UNKNOWN_APHY, 0, 0);
-	b43_dummy_transmission(dev);
+	b43_dummy_transmission(dev, true, true);
	b43_ofdmtab_write16(dev, B43_OFDMTAB_PWRDYN2, 0, backup);
}

Signature · 1 line

1.6.2.4

Michael Buesch

2009-08-13 17:23 UTC #1 lore raw

Quoted 7 lines · On Thursday 13 August 2009 16:51:51 Gábor Stefanik wrote:

The V4 dummy transmission has two extra bools in its prototype, so update all callers with the 2 bools.
Signed-off-by Gábor Stefanik <[email protected]>
---
v2: Convert all callers to v4, and drop the v3->v4 wrapper.

Review

Quoted 10 lines

(quoted diff) +5 -3

-	/* Commit writes */
-	b43_read32(dev, B43_MMIO_MACCTL);
 
-	value = ((phy->type == B43_PHYTYPE_A) ? 1 : 0);
+	if (dev->dev->id.revision < 11)
+		b43_write16(dev, 0x07C0, 0x0000);
+	else
+		b43_write16(dev, 0x07C0, 0x0100);
+	value = (ofdm ? 0x41 : 0x40);
 	b43_write16(dev, 0x050C, value);

This patch changes G-PHY codepaths. Did you test it on (at least one) G-PHY device?

Signature · 1 line

Greetings, Michael.

Gábor Stefanik

author

2009-08-13 18:02 UTC #2 lore raw

2009/8/13 Michael Buesch <[email protected]>:

Quoted 19 lines · On Thursday 13 August 2009 16:51:51 Gábor Stefanik wrote:

Quoted 10 lines
The V4 dummy transmission has two extra bools in its prototype, so update all callers with the 2 bools.
Signed-off-by Gábor Stefanik <[email protected]>
---
v2: Convert all callers to v4, and drop the v3->v4 wrapper.
- /* Commit writes */
- b43_read32(dev, B43_MMIO_MACCTL);
Quoted 7 lines
- value = ((phy->type == B43_PHYTYPE_A) ? 1 : 0);
+ if (dev->dev->id.revision < 11)
+ b43_write16(dev, 0x07C0, 0x0000);
+ else
+ b43_write16(dev, 0x07C0, 0x0100);
+ value = (ofdm ? 0x41 : 0x40); b43_write16(dev, 0x050C, value);

Quoted 1 line

This patch changes G-PHY codepaths. Did you test it on (at least one) G-PHY device?

Not yet - if you could test it, I would be grateful.

Signature · 1 line

Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)

Larry Finger

2009-08-13 19:47 UTC #3 lore raw

In reply to Michael Buesch

Quoted 11 lines · Michael Buesch

Quoted 9 lines · On Thursday 13 August 2009 16:51:51 Gábor Stefanik wrote:
The V4 dummy transmission has two extra bools in its prototype, so update all callers with the 2 bools.
Signed-off-by Gábor Stefanik <[email protected]>
---
v2: Convert all callers to v4, and drop the v3->v4 wrapper.
(quoted diff) +0 -2
-	/* Commit writes */
-	b43_read32(dev, B43_MMIO_MACCTL);

Quoted 10 lines

Review
Quoted 7 lines
(quoted diff) +5 -1
-	value = ((phy->type == B43_PHYTYPE_A) ? 1 : 0);
+	if (dev->dev->id.revision < 11)
+		b43_write16(dev, 0x07C0, 0x0000);
+	else
+		b43_write16(dev, 0x07C0, 0x0100);
+	value = (ofdm ? 0x41 : 0x40);
 	b43_write16(dev, 0x050C, value);
This patch changes G-PHY codepaths. Did you test it on (at least one) G-PHY device?

My device with the 0x4312 ID still works with this patch applied.

Larry