This if file 6 of 10 of the port of the bcm43xx driver from softmac
to mac80211.
Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
---
Index: linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
===================================================================
--- linux-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
+++ linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_phy.c
@@ -7,6 +7,7 @@
Michael Buesch <mbuesch@xxxxxxxxxx>
Danny van Dyk <kugelfang@xxxxxxxxxx>
Andreas Jaggi <andreas.jaggi@xxxxxxxxxxxx>
+ Copyright (c) 2007 Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Some parts of the code in this file are derived from the ipw2200
driver Copyright(c) 2003 - 2004 Intel Corporation.
@@ -37,7 +38,6 @@
#include "bcm43xx_main.h"
#include "bcm43xx_radio.h"
#include "bcm43xx_ilt.h"
-#include "bcm43xx_power.h"
static const s8 bcm43xx_tssi2dbm_b_table[] = {
@@ -78,911 +78,737 @@ static const s8 bcm43xx_tssi2dbm_g_table
-20, -20, -20, -20,
};
-static void bcm43xx_phy_initg(struct bcm43xx_private *bcm);
+static void bcm43xx_phy_initg(struct bcm43xx_wldev *dev);
static inline
void bcm43xx_voluntary_preempt(void)
{
- assert(!in_atomic() && !in_irq() &&
- !in_interrupt() && !irqs_disabled());
+ BCM43xx_BUG_ON(!(!in_atomic() && !in_irq() &&
+ !in_interrupt() && !irqs_disabled()));
#ifndef CONFIG_PREEMPT
cond_resched();
#endif /* CONFIG_PREEMPT */
}
-void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm)
+void bcm43xx_raw_phy_lock(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- assert(irqs_disabled());
- if (bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD) == 0x00000000) {
- phy->is_locked = 0;
+ BCM43xx_WARN_ON(!irqs_disabled());
+ if (bcm43xx_read32(dev, BCM43xx_MMIO_STATUS_BITFIELD) == 0) {
+ phy->locked = 0;
return;
}
- if (bcm->current_core->rev < 3) {
- bcm43xx_mac_suspend(bcm);
+ if (dev->dev->id.revision < 3) {
+ bcm43xx_mac_suspend(dev);
spin_lock(&phy->lock);
} else {
- if (bcm->ieee->iw_mode != IW_MODE_MASTER)
- bcm43xx_power_saving_ctl_bits(bcm, -1, 1);
+ if (!bcm43xx_is_mode(dev->wl, IEEE80211_IF_TYPE_AP))
+ bcm43xx_power_saving_ctl_bits(dev, -1, 1);
}
- phy->is_locked = 1;
+ phy->locked = 1;
}
-void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm)
+void bcm43xx_raw_phy_unlock(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- assert(irqs_disabled());
- if (bcm->current_core->rev < 3) {
- if (phy->is_locked) {
+ BCM43xx_WARN_ON(!irqs_disabled());
+ if (dev->dev->id.revision < 3) {
+ if (phy->locked) {
spin_unlock(&phy->lock);
- bcm43xx_mac_enable(bcm);
+ bcm43xx_mac_enable(dev);
}
} else {
- if (bcm->ieee->iw_mode != IW_MODE_MASTER)
- bcm43xx_power_saving_ctl_bits(bcm, -1, -1);
+ if (!bcm43xx_is_mode(dev->wl, IEEE80211_IF_TYPE_AP))
+ bcm43xx_power_saving_ctl_bits(dev, -1, -1);
}
- phy->is_locked = 0;
+ phy->locked = 0;
}
-u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset)
+u16 bcm43xx_phy_read(struct bcm43xx_wldev *dev, u16 offset)
{
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
- return bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_DATA);
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_CONTROL, offset);
+ return bcm43xx_read16(dev, BCM43xx_MMIO_PHY_DATA);
}
-void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val)
+void bcm43xx_phy_write(struct bcm43xx_wldev *dev, u16 offset, u16 val)
{
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_CONTROL, offset);
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_CONTROL, offset);
mmiowb();
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_DATA, val);
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_DATA, val);
}
-void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm)
+void bcm43xx_phy_calibrate(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* Dummy read. */
+ bcm43xx_read32(dev, BCM43xx_MMIO_STATUS_BITFIELD); /* Dummy read. */
if (phy->calibrated)
return;
if (phy->type == BCM43xx_PHYTYPE_G && phy->rev == 1) {
- bcm43xx_wireless_core_reset(bcm, 0);
- bcm43xx_phy_initg(bcm);
- bcm43xx_wireless_core_reset(bcm, 1);
+ bcm43xx_wireless_core_reset(dev, 0);
+ bcm43xx_phy_initg(dev);
+ bcm43xx_wireless_core_reset(dev, BCM43xx_TMSLOW_GMODE);
}
phy->calibrated = 1;
}
-/* Connect the PHY
- * http://bcm-specs.sipsolutions.net/SetPHY
- */
-int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect)
-{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- u32 flags;
-
- if (bcm->current_core->rev < 5)
- goto out;
-
- flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
- if (connect) {
- if (!(flags & BCM43xx_SBTMSTATEHIGH_G_PHY_AVAIL))
- return -ENODEV;
- flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
- flags |= BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
- bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
- } else {
- if (!(flags & BCM43xx_SBTMSTATEHIGH_A_PHY_AVAIL))
- return -ENODEV;
- flags = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATELOW);
- flags &= ~BCM43xx_SBTMSTATELOW_G_MODE_ENABLE;
- bcm43xx_write32(bcm, BCM43xx_CIR_SBTMSTATELOW, flags);
- }
-out:
- phy->connected = connect;
- if (connect)
- dprintk(KERN_INFO PFX "PHY connected\n");
- else
- dprintk(KERN_INFO PFX "PHY disconnected\n");
-
- return 0;
-}
-
/* intialize B PHY power control
* as described in http://bcm-specs.sipsolutions.net/InitPowerControl
*/
-static void bcm43xx_phy_init_pctl(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_init_pctl(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 saved_batt = 0, saved_ratt = 0, saved_txctl1 = 0;
int must_reset_txpower = 0;
- assert(phy->type != BCM43xx_PHYTYPE_A);
- if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
- (bcm->board_type == 0x0416))
+ BCM43xx_BUG_ON(!(phy->type == BCM43xx_PHYTYPE_B ||
+ phy->type == BCM43xx_PHYTYPE_G));
+ if (is_bcm_board_vendor(dev) &&
+ (dev->dev->bus->boardinfo.type == 0x0416))
return;
- bcm43xx_phy_write(bcm, 0x0028, 0x8018);
- bcm43xx_write16(bcm, 0x03E6, bcm43xx_read16(bcm, 0x03E6) & 0xFFDF);
+ bcm43xx_phy_write(dev, 0x0028, 0x8018);
+ bcm43xx_write16(dev, 0x03E6, bcm43xx_read16(dev, 0x03E6) & 0xFFDF);
if (phy->type == BCM43xx_PHYTYPE_G) {
- if (!phy->connected)
+ if (!phy->gmode)
return;
- bcm43xx_phy_write(bcm, 0x047A, 0xC111);
+ bcm43xx_phy_write(dev, 0x047A, 0xC111);
}
if (phy->savedpctlreg != 0xFFFF)
return;
+#ifdef CONFIG_BCM43XX_DEBUG
+ if (phy->manual_txpower_control)
+ return;
+#endif
if (phy->type == BCM43xx_PHYTYPE_B &&
phy->rev >= 2 &&
- radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0076,
- bcm43xx_radio_read16(bcm, 0x0076) | 0x0084);
+ phy->radio_ver == 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0076,
+ bcm43xx_radio_read16(dev, 0x0076)
+ | 0x0084);
} else {
- saved_batt = radio->baseband_atten;
- saved_ratt = radio->radio_atten;
- saved_txctl1 = radio->txctl1;
- if ((radio->revision >= 6) && (radio->revision <= 8)
+ saved_batt = phy->bbatt;
+ saved_ratt = phy->rfatt;
+ saved_txctl1 = phy->txctl1;
+ if ((phy->radio_rev >= 6) && (phy->radio_rev <= 8)
&& /*FIXME: incomplete specs for 5 < revision < 9 */ 0)
- bcm43xx_radio_set_txpower_bg(bcm, 0xB, 0x1F, 0);
+ bcm43xx_radio_set_txpower_bg(dev, 0xB, 0x1F, 0);
else
- bcm43xx_radio_set_txpower_bg(bcm, 0xB, 9, 0);
+ bcm43xx_radio_set_txpower_bg(dev, 0xB, 9, 0);
must_reset_txpower = 1;
}
- bcm43xx_dummy_transmission(bcm);
+ bcm43xx_dummy_transmission(dev);
- phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_PCTL);
+ phy->savedpctlreg = bcm43xx_phy_read(dev, BCM43xx_PHY_G_PCTL);
if (must_reset_txpower)
- bcm43xx_radio_set_txpower_bg(bcm, saved_batt, saved_ratt, saved_txctl1);
+ bcm43xx_radio_set_txpower_bg(dev, saved_batt, saved_ratt,
+ saved_txctl1);
else
- bcm43xx_radio_write16(bcm, 0x0076, bcm43xx_radio_read16(bcm, 0x0076) & 0xFF7B);
- bcm43xx_radio_clear_tssi(bcm);
+ bcm43xx_radio_write16(dev, 0x0076, bcm43xx_radio_read16(dev,
+ 0x0076) & 0xFF7B);
+ bcm43xx_radio_clear_tssi(dev);
}
-static void bcm43xx_phy_agcsetup(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_agcsetup(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 offset = 0x0000;
if (phy->rev == 1)
offset = 0x4C00;
- bcm43xx_ilt_write(bcm, offset, 0x00FE);
- bcm43xx_ilt_write(bcm, offset + 1, 0x000D);
- bcm43xx_ilt_write(bcm, offset + 2, 0x0013);
- bcm43xx_ilt_write(bcm, offset + 3, 0x0019);
+ bcm43xx_ilt_write(dev, offset, 0x00FE);
+ bcm43xx_ilt_write(dev, offset + 1, 0x000D);
+ bcm43xx_ilt_write(dev, offset + 2, 0x0013);
+ bcm43xx_ilt_write(dev, offset + 3, 0x0019);
if (phy->rev == 1) {
- bcm43xx_ilt_write(bcm, 0x1800, 0x2710);
- bcm43xx_ilt_write(bcm, 0x1801, 0x9B83);
- bcm43xx_ilt_write(bcm, 0x1802, 0x9B83);
- bcm43xx_ilt_write(bcm, 0x1803, 0x0F8D);
- bcm43xx_phy_write(bcm, 0x0455, 0x0004);
- }
-
- bcm43xx_phy_write(bcm, 0x04A5, (bcm43xx_phy_read(bcm, 0x04A5) & 0x00FF) | 0x5700);
- bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xFF80) | 0x000F);
- bcm43xx_phy_write(bcm, 0x041A, (bcm43xx_phy_read(bcm, 0x041A) & 0xC07F) | 0x2B80);
- bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xF0FF) | 0x0300);
-
- bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0008);
-
- bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xFFF0) | 0x0008);
- bcm43xx_phy_write(bcm, 0x04A1, (bcm43xx_phy_read(bcm, 0x04A1) & 0xF0FF) | 0x0600);
- bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xF0FF) | 0x0700);
- bcm43xx_phy_write(bcm, 0x04A0, (bcm43xx_phy_read(bcm, 0x04A0) & 0xF0FF) | 0x0100);
+ bcm43xx_ilt_write(dev, 0x1800, 0x2710);
+ bcm43xx_ilt_write(dev, 0x1801, 0x9B83);
+ bcm43xx_ilt_write(dev, 0x1802, 0x9B83);
+ bcm43xx_ilt_write(dev, 0x1803, 0x0F8D);
+ bcm43xx_phy_write(dev, 0x0455, 0x0004);
+ }
+
+ bcm43xx_phy_write(dev, 0x04A5, (bcm43xx_phy_read(dev, 0x04A5) & 0x00FF)
+ | 0x5700);
+ bcm43xx_phy_write(dev, 0x041A, (bcm43xx_phy_read(dev, 0x041A) & 0xFF80)
+ | 0x000F);
+ bcm43xx_phy_write(dev, 0x041A, (bcm43xx_phy_read(dev, 0x041A) & 0xC07F)
+ | 0x2B80);
+ bcm43xx_phy_write(dev, 0x048C, (bcm43xx_phy_read(dev, 0x048C) & 0xF0FF)
+ | 0x0300);
+
+ bcm43xx_radio_write16(dev, 0x007A, bcm43xx_radio_read16(dev, 0x007A)
+ | 0x0008);
+
+ bcm43xx_phy_write(dev, 0x04A0, (bcm43xx_phy_read(dev, 0x04A0) & 0xFFF0)
+ | 0x0008);
+ bcm43xx_phy_write(dev, 0x04A1, (bcm43xx_phy_read(dev, 0x04A1) & 0xF0FF)
+ | 0x0600);
+ bcm43xx_phy_write(dev, 0x04A2, (bcm43xx_phy_read(dev, 0x04A2) & 0xF0FF)
+ | 0x0700);
+ bcm43xx_phy_write(dev, 0x04A0, (bcm43xx_phy_read(dev, 0x04A0) & 0xF0FF)
+ | 0x0100);
if (phy->rev == 1)
- bcm43xx_phy_write(bcm, 0x04A2, (bcm43xx_phy_read(bcm, 0x04A2) & 0xFFF0) | 0x0007);
+ bcm43xx_phy_write(dev, 0x04A2, (bcm43xx_phy_read(dev, 0x04A2)
+ & 0xFFF0) | 0x0007);
- bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xFF00) | 0x001C);
- bcm43xx_phy_write(bcm, 0x0488, (bcm43xx_phy_read(bcm, 0x0488) & 0xC0FF) | 0x0200);
- bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0xFF00) | 0x001C);
- bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xFF00) | 0x0020);
- bcm43xx_phy_write(bcm, 0x0489, (bcm43xx_phy_read(bcm, 0x0489) & 0xC0FF) | 0x0200);
- bcm43xx_phy_write(bcm, 0x0482, (bcm43xx_phy_read(bcm, 0x0482) & 0xFF00) | 0x002E);
- bcm43xx_phy_write(bcm, 0x0496, (bcm43xx_phy_read(bcm, 0x0496) & 0x00FF) | 0x1A00);
- bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0xFF00) | 0x0028);
- bcm43xx_phy_write(bcm, 0x0481, (bcm43xx_phy_read(bcm, 0x0481) & 0x00FF) | 0x2C00);
+ bcm43xx_phy_write(dev, 0x0488, (bcm43xx_phy_read(dev, 0x0488) & 0xFF00)
+ | 0x001C);
+ bcm43xx_phy_write(dev, 0x0488, (bcm43xx_phy_read(dev, 0x0488) & 0xC0FF)
+ | 0x0200);
+ bcm43xx_phy_write(dev, 0x0496, (bcm43xx_phy_read(dev, 0x0496) & 0xFF00)
+ | 0x001C);
+ bcm43xx_phy_write(dev, 0x0489, (bcm43xx_phy_read(dev, 0x0489) & 0xFF00)
+ | 0x0020);
+ bcm43xx_phy_write(dev, 0x0489, (bcm43xx_phy_read(dev, 0x0489) & 0xC0FF)
+ | 0x0200);
+ bcm43xx_phy_write(dev, 0x0482, (bcm43xx_phy_read(dev, 0x0482) & 0xFF00)
+ | 0x002E);
+ bcm43xx_phy_write(dev, 0x0496, (bcm43xx_phy_read(dev, 0x0496) & 0x00FF)
+ | 0x1A00);
+ bcm43xx_phy_write(dev, 0x0481, (bcm43xx_phy_read(dev, 0x0481) & 0xFF00)
+ | 0x0028);
+ bcm43xx_phy_write(dev, 0x0481, (bcm43xx_phy_read(dev, 0x0481) & 0x00FF)
+ | 0x2C00);
if (phy->rev == 1) {
- bcm43xx_phy_write(bcm, 0x0430, 0x092B);
- bcm43xx_phy_write(bcm, 0x041B, (bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1) | 0x0002);
+ bcm43xx_phy_write(dev, 0x0430, 0x092B);
+ bcm43xx_phy_write(dev, 0x041B, (bcm43xx_phy_read(dev, 0x041B)
+ & 0xFFE1) | 0x0002);
} else {
- bcm43xx_phy_write(bcm, 0x041B, bcm43xx_phy_read(bcm, 0x041B) & 0xFFE1);
- bcm43xx_phy_write(bcm, 0x041F, 0x287A);
- bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) & 0xFFF0) | 0x0004);
+ bcm43xx_phy_write(dev, 0x041B, bcm43xx_phy_read(dev, 0x041B)
+ & 0xFFE1);
+ bcm43xx_phy_write(dev, 0x041F, 0x287A);
+ bcm43xx_phy_write(dev, 0x0420, (bcm43xx_phy_read(dev, 0x0420)
+ & 0xFFF0) | 0x0004);
}
if (phy->rev > 2) {
- bcm43xx_phy_write(bcm, 0x0422, 0x287A);
- bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420)
+ bcm43xx_phy_write(dev, 0x0422, 0x287A);
+ bcm43xx_phy_write(dev, 0x0420, (bcm43xx_phy_read(dev, 0x0420)
& 0x0FFF) | 0x3000);
}
-
- bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080)
+
+ bcm43xx_phy_write(dev, 0x04A8, (bcm43xx_phy_read(dev, 0x04A8) & 0x8080)
| 0x7874);
- bcm43xx_phy_write(bcm, 0x048E, 0x1C00);
+ bcm43xx_phy_write(dev, 0x048E, 0x1C00);
if (phy->rev == 1) {
- bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB)
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB)
& 0xF0FF) | 0x0600);
- bcm43xx_phy_write(bcm, 0x048B, 0x005E);
- bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C)
- & 0xFF00) | 0x001E);
- bcm43xx_phy_write(bcm, 0x048D, 0x0002);
+ bcm43xx_phy_write(dev, 0x048B, 0x005E);
+ bcm43xx_phy_write(dev, 0x048C,
+ (bcm43xx_phy_read(dev, 0x048C) & 0xFF00)
+ | 0x001E);
+ bcm43xx_phy_write(dev, 0x048D, 0x0002);
}
- bcm43xx_ilt_write(bcm, offset + 0x0800, 0);
- bcm43xx_ilt_write(bcm, offset + 0x0801, 7);
- bcm43xx_ilt_write(bcm, offset + 0x0802, 16);
- bcm43xx_ilt_write(bcm, offset + 0x0803, 28);
+ bcm43xx_ilt_write(dev, offset + 0x0800, 0);
+ bcm43xx_ilt_write(dev, offset + 0x0801, 7);
+ bcm43xx_ilt_write(dev, offset + 0x0802, 16);
+ bcm43xx_ilt_write(dev, offset + 0x0803, 28);
if (phy->rev >= 6) {
- bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426)
- & 0xFFFC));
- bcm43xx_phy_write(bcm, 0x0426, (bcm43xx_phy_read(bcm, 0x0426)
- & 0xEFFF));
+ bcm43xx_phy_write(dev, 0x0426,
+ (bcm43xx_phy_read(dev, 0x0426) & 0xFFFC));
+ bcm43xx_phy_write(dev, 0x0426,
+ (bcm43xx_phy_read(dev, 0x0426) & 0xEFFF));
}
}
-static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_setupg(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 i;
- assert(phy->type == BCM43xx_PHYTYPE_G);
+ BCM43xx_BUG_ON(phy->type != BCM43xx_PHYTYPE_G);
if (phy->rev == 1) {
- bcm43xx_phy_write(bcm, 0x0406, 0x4F19);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
- & 0xFC3F) | 0x0340);
- bcm43xx_phy_write(bcm, 0x042C, 0x005A);
- bcm43xx_phy_write(bcm, 0x0427, 0x001A);
+ bcm43xx_phy_write(dev, 0x0406, 0x4F19);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ (bcm43xx_phy_read(dev,
+ BCM43xx_PHY_G_CRS) & 0xFC3F) | 0x0340);
+ bcm43xx_phy_write(dev, 0x042C, 0x005A);
+ bcm43xx_phy_write(dev, 0x0427, 0x001A);
for (i = 0; i < BCM43xx_ILT_FINEFREQG_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqg[i]);
+ bcm43xx_ilt_write(dev, 0x5800 + i,
+ bcm43xx_ilt_finefreqg[i]);
for (i = 0; i < BCM43xx_ILT_NOISEG1_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg1[i]);
+ bcm43xx_ilt_write(dev, 0x1800 + i,
+ bcm43xx_ilt_noiseg1[i]);
for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
- bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
+ bcm43xx_ilt_write32(dev, 0x2000 + i,
+ bcm43xx_ilt_rotor[i]);
} else {
- /* nrssi values are signed 6-bit values. Not sure why we write 0x7654 here... */
- bcm43xx_nrssi_hw_write(bcm, 0xBA98, (s16)0x7654);
+ /* nrssi values are signed 6-bit values. Why 0x7654 here? */
+ bcm43xx_nrssi_hw_write(dev, 0xBA98, (s16)0x7654);
if (phy->rev == 2) {
- bcm43xx_phy_write(bcm, 0x04C0, 0x1861);
- bcm43xx_phy_write(bcm, 0x04C1, 0x0271);
+ bcm43xx_phy_write(dev, 0x04C0, 0x1861);
+ bcm43xx_phy_write(dev, 0x04C1, 0x0271);
} else if (phy->rev > 2) {
- bcm43xx_phy_write(bcm, 0x04C0, 0x0098);
- bcm43xx_phy_write(bcm, 0x04C1, 0x0070);
- bcm43xx_phy_write(bcm, 0x04C9, 0x0080);
+ bcm43xx_phy_write(dev, 0x04C0, 0x0098);
+ bcm43xx_phy_write(dev, 0x04C1, 0x0070);
+ bcm43xx_phy_write(dev, 0x04C9, 0x0080);
}
- bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x800);
+ bcm43xx_phy_write(dev, 0x042B, bcm43xx_phy_read(dev,
+ 0x042B) | 0x800);
for (i = 0; i < 64; i++)
- bcm43xx_ilt_write(bcm, 0x4000 + i, i);
+ bcm43xx_ilt_write(dev, 0x4000 + i, i);
for (i = 0; i < BCM43xx_ILT_NOISEG2_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noiseg2[i]);
+ bcm43xx_ilt_write(dev, 0x1800 + i,
+ bcm43xx_ilt_noiseg2[i]);
}
-
+
if (phy->rev <= 2)
for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg1[i]);
- else if ((phy->rev >= 7) && (bcm43xx_phy_read(bcm, 0x0449) & 0x0200))
+ bcm43xx_ilt_write(dev, 0x1400 + i,
+ bcm43xx_ilt_noisescaleg1[i]);
+ else if ((phy->rev >= 7) && (bcm43xx_phy_read(dev, 0x0449) & 0x0200))
for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg3[i]);
+ bcm43xx_ilt_write(dev, 0x1400 + i,
+ bcm43xx_ilt_noisescaleg3[i]);
else
for (i = 0; i < BCM43xx_ILT_NOISESCALEG_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1400 + i, bcm43xx_ilt_noisescaleg2[i]);
-
+ bcm43xx_ilt_write(dev, 0x1400 + i,
+ bcm43xx_ilt_noisescaleg2[i]);
+
if (phy->rev == 2)
for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
+ bcm43xx_ilt_write(dev, 0x5000 + i,
+ bcm43xx_ilt_sigmasqr1[i]);
else if ((phy->rev > 2) && (phy->rev <= 8))
for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr2[i]);
-
+ bcm43xx_ilt_write(dev, 0x5000 + i,
+ bcm43xx_ilt_sigmasqr2[i]);
+
if (phy->rev == 1) {
for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
- bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
- for (i = 0; i < 4; i++) {
- bcm43xx_ilt_write(bcm, 0x5404 + i, 0x0020);
- bcm43xx_ilt_write(bcm, 0x5408 + i, 0x0020);
- bcm43xx_ilt_write(bcm, 0x540C + i, 0x0020);
- bcm43xx_ilt_write(bcm, 0x5410 + i, 0x0020);
- }
- bcm43xx_phy_agcsetup(bcm);
-
- if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
- (bcm->board_type == 0x0416) &&
- (bcm->board_revision == 0x0017))
+ bcm43xx_ilt_write32(dev, 0x2400 + i,
+ bcm43xx_ilt_retard[i]);
+ for (i = 4; i < 20; i++)
+ bcm43xx_ilt_write(dev, 0x5400 + i, 0x0020);
+ bcm43xx_phy_agcsetup(dev);
+
+ if (is_bcm_board_vendor(dev) &&
+ (dev->dev->bus->boardinfo.type == 0x0416) &&
+ (dev->dev->bus->boardinfo.rev == 0x0017))
return;
- bcm43xx_ilt_write(bcm, 0x5001, 0x0002);
- bcm43xx_ilt_write(bcm, 0x5002, 0x0001);
+ bcm43xx_ilt_write(dev, 0x5001, 0x0002);
+ bcm43xx_ilt_write(dev, 0x5002, 0x0001);
} else {
- for (i = 0; i <= 0x2F; i++)
- bcm43xx_ilt_write(bcm, 0x1000 + i, 0x0820);
- bcm43xx_phy_agcsetup(bcm);
- bcm43xx_phy_read(bcm, 0x0400); /* dummy read */
- bcm43xx_phy_write(bcm, 0x0403, 0x1000);
- bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
- bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
-
- if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM) &&
- (bcm->board_type == 0x0416) &&
- (bcm->board_revision == 0x0017))
+ for (i = 0; i <= 0x20; i++)
+ bcm43xx_ilt_write(dev, 0x1000 + i, 0x0820);
+ bcm43xx_phy_agcsetup(dev);
+ bcm43xx_phy_read(dev, 0x0400); /* dummy read */
+ bcm43xx_phy_write(dev, 0x0403, 0x1000);
+ bcm43xx_ilt_write(dev, 0x3C02, 0x000F);
+ bcm43xx_ilt_write(dev, 0x3C03, 0x0014);
+
+ if (is_bcm_board_vendor(dev) &&
+ (dev->dev->bus->boardinfo.type == 0x0416) &&
+ (dev->dev->bus->boardinfo.rev == 0x0017))
return;
- bcm43xx_ilt_write(bcm, 0x0401, 0x0002);
- bcm43xx_ilt_write(bcm, 0x0402, 0x0001);
+ bcm43xx_ilt_write(dev, 0x0401, 0x0002);
+ bcm43xx_ilt_write(dev, 0x0402, 0x0001);
}
}
-/* Initialize the noisescaletable for APHY */
-static void bcm43xx_phy_init_noisescaletbl(struct bcm43xx_private *bcm)
+/* Initialize the APHY portion of a GPHY. */
+static void bcm43xx_phy_inita(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- int i;
-
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, 0x1400);
- for (i = 0; i < 12; i++) {
- if (phy->rev == 2)
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
- else
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
- }
- if (phy->rev == 2)
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6700);
- else
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2300);
- for (i = 0; i < 11; i++) {
- if (phy->rev == 2)
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x6767);
- else
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x2323);
- }
- if (phy->rev == 2)
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0067);
- else
- bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, 0x0023);
-}
-static void bcm43xx_phy_setupa(struct bcm43xx_private *bcm)
-{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- u16 i;
+ might_sleep();
- assert(phy->type == BCM43xx_PHYTYPE_A);
- switch (phy->rev) {
- case 2:
- bcm43xx_phy_write(bcm, 0x008E, 0x3800);
- bcm43xx_phy_write(bcm, 0x0035, 0x03FF);
- bcm43xx_phy_write(bcm, 0x0036, 0x0400);
-
- bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
-
- bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
- bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
- bcm43xx_ilt_write(bcm, 0x3C0C, 0x07BF);
- bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
-
- bcm43xx_phy_write(bcm, 0x0024, 0x4680);
- bcm43xx_phy_write(bcm, 0x0020, 0x0003);
- bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
- bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
-
- bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
- bcm43xx_phy_write(bcm, 0x002B, bcm43xx_phy_read(bcm, 0x002B) & 0xFBFF);
- bcm43xx_phy_write(bcm, 0x008E, 0x58C1);
-
- bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
- bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
- bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
- bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
- bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
-
- bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
- bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
- bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
-
- bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
- bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
- bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
-
- for (i = 0; i < 16; i++)
- bcm43xx_ilt_write(bcm, 0x4000 + i, (0x8 + i) & 0x000F);
-
- bcm43xx_ilt_write(bcm, 0x3003, 0x1044);
- bcm43xx_ilt_write(bcm, 0x3004, 0x7201);
- bcm43xx_ilt_write(bcm, 0x3006, 0x0040);
- bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
-
- for (i = 0; i < BCM43xx_ILT_FINEFREQA_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x5800 + i, bcm43xx_ilt_finefreqa[i]);
- for (i = 0; i < BCM43xx_ILT_NOISEA2_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea2[i]);
- for (i = 0; i < BCM43xx_ILT_ROTOR_SIZE; i++)
- bcm43xx_ilt_write32(bcm, 0x2000 + i, bcm43xx_ilt_rotor[i]);
- bcm43xx_phy_init_noisescaletbl(bcm);
- for (i = 0; i < BCM43xx_ILT_RETARD_SIZE; i++)
- bcm43xx_ilt_write32(bcm, 0x2400 + i, bcm43xx_ilt_retard[i]);
- break;
- case 3:
- for (i = 0; i < 64; i++)
- bcm43xx_ilt_write(bcm, 0x4000 + i, i);
-
- bcm43xx_ilt_write(bcm, 0x3807, 0x0051);
-
- bcm43xx_phy_write(bcm, 0x001C, 0x0FF9);
- bcm43xx_phy_write(bcm, 0x0020, bcm43xx_phy_read(bcm, 0x0020) & 0xFF0F);
- bcm43xx_radio_write16(bcm, 0x0002, 0x07BF);
-
- bcm43xx_phy_write(bcm, 0x0024, 0x4680);
- bcm43xx_phy_write(bcm, 0x0020, 0x0003);
- bcm43xx_phy_write(bcm, 0x001D, 0x0F40);
- bcm43xx_phy_write(bcm, 0x001F, 0x1C00);
- bcm43xx_phy_write(bcm, 0x002A, (bcm43xx_phy_read(bcm, 0x002A) & 0x00FF) | 0x0400);
-
- bcm43xx_ilt_write(bcm, 0x3001, (bcm43xx_ilt_read(bcm, 0x3001) & 0x0010) | 0x0008);
- for (i = 0; i < BCM43xx_ILT_NOISEA3_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x1800 + i, bcm43xx_ilt_noisea3[i]);
- bcm43xx_phy_init_noisescaletbl(bcm);
- for (i = 0; i < BCM43xx_ILT_SIGMASQR_SIZE; i++)
- bcm43xx_ilt_write(bcm, 0x5000 + i, bcm43xx_ilt_sigmasqr1[i]);
-
- bcm43xx_phy_write(bcm, 0x0003, 0x1808);
-
- bcm43xx_ilt_write(bcm, 0x0803, 0x000F);
- bcm43xx_ilt_write(bcm, 0x0804, 0x001F);
- bcm43xx_ilt_write(bcm, 0x0805, 0x002A);
- bcm43xx_ilt_write(bcm, 0x0805, 0x0030);
- bcm43xx_ilt_write(bcm, 0x0807, 0x003A);
-
- bcm43xx_ilt_write(bcm, 0x0000, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0001, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0002, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0003, 0x0013);
- bcm43xx_ilt_write(bcm, 0x0004, 0x0015);
- bcm43xx_ilt_write(bcm, 0x0005, 0x0015);
- bcm43xx_ilt_write(bcm, 0x0006, 0x0019);
-
- bcm43xx_ilt_write(bcm, 0x0404, 0x0003);
- bcm43xx_ilt_write(bcm, 0x0405, 0x0003);
- bcm43xx_ilt_write(bcm, 0x0406, 0x0007);
-
- bcm43xx_ilt_write(bcm, 0x3C02, 0x000F);
- bcm43xx_ilt_write(bcm, 0x3C03, 0x0014);
- break;
- default:
- assert(0);
- }
-}
-
-/* Initialize APHY. This is also called for the GPHY in some cases. */
-static void bcm43xx_phy_inita(struct bcm43xx_private *bcm)
-{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
- u16 tval;
-
- if (phy->type == BCM43xx_PHYTYPE_A) {
- bcm43xx_phy_setupa(bcm);
- } else {
- bcm43xx_phy_setupg(bcm);
- if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
- bcm43xx_phy_write(bcm, 0x046E, 0x03CF);
- return;
- }
-
- bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
- (bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) & 0xF83C) | 0x0340);
- bcm43xx_phy_write(bcm, 0x0034, 0x0001);
-
- TODO();//TODO: RSSI AGC
- bcm43xx_phy_write(bcm, BCM43xx_PHY_A_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_A_CRS) | (1 << 14));
- bcm43xx_radio_init2060(bcm);
-
- if ((bcm->board_vendor == PCI_VENDOR_ID_BROADCOM)
- && ((bcm->board_type == 0x0416) || (bcm->board_type == 0x040A))) {
- if (radio->lofcal == 0xFFFF) {
- TODO();//TODO: LOF Cal
- bcm43xx_radio_set_tx_iq(bcm);
- } else
- bcm43xx_radio_write16(bcm, 0x001E, radio->lofcal);
- }
-
- bcm43xx_phy_write(bcm, 0x007A, 0xF111);
-
- if (phy->savedpctlreg == 0xFFFF) {
- bcm43xx_radio_write16(bcm, 0x0019, 0x0000);
- bcm43xx_radio_write16(bcm, 0x0017, 0x0020);
-
- tval = bcm43xx_ilt_read(bcm, 0x3001);
- if (phy->rev == 1) {
- bcm43xx_ilt_write(bcm, 0x3001,
- (bcm43xx_ilt_read(bcm, 0x3001) & 0xFF87)
- | 0x0058);
- } else {
- bcm43xx_ilt_write(bcm, 0x3001,
- (bcm43xx_ilt_read(bcm, 0x3001) & 0xFFC3)
- | 0x002C);
- }
- bcm43xx_dummy_transmission(bcm);
- phy->savedpctlreg = bcm43xx_phy_read(bcm, BCM43xx_PHY_A_PCTL);
- bcm43xx_ilt_write(bcm, 0x3001, tval);
-
- bcm43xx_radio_set_txpower_a(bcm, 0x0018);
- }
- bcm43xx_radio_clear_tssi(bcm);
+ bcm43xx_phy_setupg(dev);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_PACTRL)
+ bcm43xx_phy_write(dev, 0x046E, 0x03CF);
}
-static void bcm43xx_phy_initb2(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_initb2(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 offset, val;
- bcm43xx_write16(bcm, 0x03EC, 0x3F22);
- bcm43xx_phy_write(bcm, 0x0020, 0x301C);
- bcm43xx_phy_write(bcm, 0x0026, 0x0000);
- bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
- bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
+ bcm43xx_write16(dev, 0x03EC, 0x3F22);
+ bcm43xx_phy_write(dev, 0x0020, 0x301C);
+ bcm43xx_phy_write(dev, 0x0026, 0x0000);
+ bcm43xx_phy_write(dev, 0x0030, 0x00C6);
+ bcm43xx_phy_write(dev, 0x0088, 0x3E00);
val = 0x3C3D;
for (offset = 0x0089; offset < 0x00A7; offset++) {
- bcm43xx_phy_write(bcm, offset, val);
+ bcm43xx_phy_write(dev, offset, val);
val -= 0x0202;
}
- bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
- if (radio->channel == 0xFF)
- bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+ bcm43xx_phy_write(dev, 0x03E4, 0x3000);
+ if (phy->channel == 0xFF)
+ bcm43xx_radio_selectchannel(dev,
+ BCM43xx_RADIO_DEFAULT_CHANNEL_BG,
+ 0);
else
- bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
- if (radio->version != 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
- bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
- }
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
- if (radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
- bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
- bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
- bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
- bcm43xx_phy_write(bcm, 0x0038, 0x0677);
- bcm43xx_radio_init2050(bcm);
- }
- bcm43xx_phy_write(bcm, 0x0014, 0x0080);
- bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
- bcm43xx_phy_write(bcm, 0x0032, 0x00CC);
- bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
- bcm43xx_phy_lo_b_measure(bcm);
- bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
- if (radio->version != 0x2050)
- bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1000);
- bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
- if (radio->version != 0x2050)
- bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
- bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
- bcm43xx_phy_init_pctl(bcm);
+ bcm43xx_radio_selectchannel(dev, phy->channel, 0);
+ if (phy->radio_ver != 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0075, 0x0080);
+ bcm43xx_radio_write16(dev, 0x0079, 0x0081);
+ }
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0023);
+ if (phy->radio_ver == 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0070);
+ bcm43xx_radio_write16(dev, 0x005B, 0x007B);
+ bcm43xx_radio_write16(dev, 0x005C, 0x00B0);
+ bcm43xx_radio_write16(dev, 0x007A, 0x000F);
+ bcm43xx_phy_write(dev, 0x0038, 0x0677);
+ bcm43xx_radio_init2050(dev);
+ }
+ bcm43xx_phy_write(dev, 0x0014, 0x0080);
+ bcm43xx_phy_write(dev, 0x0032, 0x00CA);
+ bcm43xx_phy_write(dev, 0x0032, 0x00CC);
+ bcm43xx_phy_write(dev, 0x0035, 0x07C2);
+ bcm43xx_phy_lo_b_measure(dev);
+ bcm43xx_phy_write(dev, 0x0026, 0xCC00);
+ if (phy->radio_ver != 0x2050)
+ bcm43xx_phy_write(dev, 0x0026, 0xCE00);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, 0x1000);
+ bcm43xx_phy_write(dev, 0x002A, 0x88A3);
+ if (phy->radio_ver != 0x2050)
+ bcm43xx_phy_write(dev, 0x002A, 0x88C2);
+ bcm43xx_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);
+ bcm43xx_phy_init_pctl(dev);
}
-static void bcm43xx_phy_initb4(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_initb4(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 offset, val;
- bcm43xx_write16(bcm, 0x03EC, 0x3F22);
- bcm43xx_phy_write(bcm, 0x0020, 0x301C);
- bcm43xx_phy_write(bcm, 0x0026, 0x0000);
- bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
- bcm43xx_phy_write(bcm, 0x0088, 0x3E00);
+ bcm43xx_write16(dev, 0x03EC, 0x3F22);
+ bcm43xx_phy_write(dev, 0x0020, 0x301C);
+ bcm43xx_phy_write(dev, 0x0026, 0x0000);
+ bcm43xx_phy_write(dev, 0x0030, 0x00C6);
+ bcm43xx_phy_write(dev, 0x0088, 0x3E00);
val = 0x3C3D;
for (offset = 0x0089; offset < 0x00A7; offset++) {
- bcm43xx_phy_write(bcm, offset, val);
+ bcm43xx_phy_write(dev, offset, val);
val -= 0x0202;
}
- bcm43xx_phy_write(bcm, 0x03E4, 0x3000);
- if (radio->channel == 0xFF)
- bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 0);
+ bcm43xx_phy_write(dev, 0x03E4, 0x3000);
+ if (phy->channel == 0xFF)
+ bcm43xx_radio_selectchannel(dev,
+ BCM43xx_RADIO_DEFAULT_CHANNEL_BG,
+ 0);
else
- bcm43xx_radio_selectchannel(bcm, radio->channel, 0);
- if (radio->version != 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
- bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
- }
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
- if (radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
- bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
- bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
- bcm43xx_radio_write16(bcm, 0x007A, 0x000F);
- bcm43xx_phy_write(bcm, 0x0038, 0x0677);
- bcm43xx_radio_init2050(bcm);
- }
- bcm43xx_phy_write(bcm, 0x0014, 0x0080);
- bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
- if (radio->version == 0x2050)
- bcm43xx_phy_write(bcm, 0x0032, 0x00E0);
- bcm43xx_phy_write(bcm, 0x0035, 0x07C2);
-
- bcm43xx_phy_lo_b_measure(bcm);
-
- bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
- if (radio->version == 0x2050)
- bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x1100);
- bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
- if (radio->version == 0x2050)
- bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
- bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
- if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
- bcm43xx_calc_nrssi_slope(bcm);
- bcm43xx_calc_nrssi_threshold(bcm);
+ bcm43xx_radio_selectchannel(dev, phy->channel, 0);
+ if (phy->radio_ver != 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0075, 0x0080);
+ bcm43xx_radio_write16(dev, 0x0079, 0x0081);
+ }
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0023);
+ if (phy->radio_ver == 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0070);
+ bcm43xx_radio_write16(dev, 0x005B, 0x007B);
+ bcm43xx_radio_write16(dev, 0x005C, 0x00B0);
+ bcm43xx_radio_write16(dev, 0x007A, 0x000F);
+ bcm43xx_phy_write(dev, 0x0038, 0x0677);
+ bcm43xx_radio_init2050(dev);
+ }
+ bcm43xx_phy_write(dev, 0x0014, 0x0080);
+ bcm43xx_phy_write(dev, 0x0032, 0x00CA);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_phy_write(dev, 0x0032, 0x00E0);
+ bcm43xx_phy_write(dev, 0x0035, 0x07C2);
+
+ bcm43xx_phy_lo_b_measure(dev);
+
+ bcm43xx_phy_write(dev, 0x0026, 0xCC00);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_phy_write(dev, 0x0026, 0xCE00);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, 0x1100);
+ bcm43xx_phy_write(dev, 0x002A, 0x88A3);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_phy_write(dev, 0x002A, 0x88C2);
+ bcm43xx_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_RSSI) {
+ bcm43xx_calc_nrssi_slope(dev);
+ bcm43xx_calc_nrssi_threshold(dev);
}
- bcm43xx_phy_init_pctl(bcm);
+ bcm43xx_phy_init_pctl(dev);
}
-static void bcm43xx_phy_initb5(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_initb5(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 offset;
u16 value;
u8 old_channel;
if (phy->analog == 1)
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A)
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
| 0x0050);
- if ((bcm->board_vendor != PCI_VENDOR_ID_BROADCOM) &&
- (bcm->board_type != 0x0416)) {
+ if (!is_bcm_board_vendor(dev) &&
+ (dev->dev->bus->boardinfo.type != 0x0416)) {
value = 0x2120;
for (offset = 0x00A8 ; offset < 0x00C7; offset++) {
- bcm43xx_phy_write(bcm, offset, value);
+ bcm43xx_phy_write(dev, offset, value);
value += 0x0202;
}
}
- bcm43xx_phy_write(bcm, 0x0035,
- (bcm43xx_phy_read(bcm, 0x0035) & 0xF0FF)
+ bcm43xx_phy_write(dev, 0x0035,
+ (bcm43xx_phy_read(dev, 0x0035) & 0xF0FF)
| 0x0700);
- if (radio->version == 0x2050)
- bcm43xx_phy_write(bcm, 0x0038, 0x0667);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_phy_write(dev, 0x0038, 0x0667);
- if (phy->connected) {
- if (radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A)
+ if (phy->gmode) {
+ if (phy->radio_ver == 0x2050) {
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
| 0x0020);
- bcm43xx_radio_write16(bcm, 0x0051,
- bcm43xx_radio_read16(bcm, 0x0051)
+ bcm43xx_radio_write16(dev, 0x0051,
+ bcm43xx_radio_read16(dev, 0x0051)
| 0x0004);
}
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO, 0x0000);
-
- bcm43xx_phy_write(bcm, 0x0802, bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
- bcm43xx_phy_write(bcm, 0x042B, bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
-
- bcm43xx_phy_write(bcm, 0x001C, 0x186A);
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_RADIO, 0x0000);
- bcm43xx_phy_write(bcm, 0x0013, (bcm43xx_phy_read(bcm, 0x0013) & 0x00FF) | 0x1900);
- bcm43xx_phy_write(bcm, 0x0035, (bcm43xx_phy_read(bcm, 0x0035) & 0xFFC0) | 0x0064);
- bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D) & 0xFF80) | 0x000A);
- }
-
- if (bcm->bad_frames_preempt) {
- bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11));
- }
+ bcm43xx_phy_write(dev, 0x0802, bcm43xx_phy_read(dev, 0x0802) |
+ 0x0100);
+ bcm43xx_phy_write(dev, 0x042B, bcm43xx_phy_read(dev, 0x042B) |
+ 0x2000);
+
+ bcm43xx_phy_write(dev, 0x001C, 0x186A);
+
+ bcm43xx_phy_write(dev, 0x0013, (bcm43xx_phy_read(dev, 0x0013) &
+ 0x00FF) | 0x1900);
+ bcm43xx_phy_write(dev, 0x0035, (bcm43xx_phy_read(dev, 0x0035) &
+ 0xFFC0) | 0x0064);
+ bcm43xx_phy_write(dev, 0x005D, (bcm43xx_phy_read(dev, 0x005D) &
+ 0xFF80) | 0x000A);
+ }
+
+ if (dev->bad_frames_preempt)
+ bcm43xx_phy_write(dev, BCM43xx_PHY_RADIO_BITFIELD,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_RADIO_BITFIELD) | (1 << 11));
if (phy->analog == 1) {
- bcm43xx_phy_write(bcm, 0x0026, 0xCE00);
- bcm43xx_phy_write(bcm, 0x0021, 0x3763);
- bcm43xx_phy_write(bcm, 0x0022, 0x1BC3);
- bcm43xx_phy_write(bcm, 0x0023, 0x06F9);
- bcm43xx_phy_write(bcm, 0x0024, 0x037E);
- } else
- bcm43xx_phy_write(bcm, 0x0026, 0xCC00);
- bcm43xx_phy_write(bcm, 0x0030, 0x00C6);
- bcm43xx_write16(bcm, 0x03EC, 0x3F22);
+ bcm43xx_phy_write(dev, 0x0026, 0xCE00);
+ bcm43xx_phy_write(dev, 0x0021, 0x3763);
+ bcm43xx_phy_write(dev, 0x0022, 0x1BC3);
+ bcm43xx_phy_write(dev, 0x0023, 0x06F9);
+ bcm43xx_phy_write(dev, 0x0024, 0x037E);
+ } else {
+ bcm43xx_phy_write(dev, 0x0026, 0xCC00);
+ }
+ bcm43xx_phy_write(dev, 0x0030, 0x00C6);
+ bcm43xx_write16(dev, 0x03EC, 0x3F22);
if (phy->analog == 1)
- bcm43xx_phy_write(bcm, 0x0020, 0x3E1C);
+ bcm43xx_phy_write(dev, 0x0020, 0x3E1C);
else
- bcm43xx_phy_write(bcm, 0x0020, 0x301C);
+ bcm43xx_phy_write(dev, 0x0020, 0x301C);
if (phy->analog == 0)
- bcm43xx_write16(bcm, 0x03E4, 0x3000);
+ bcm43xx_write16(dev, 0x03E4, 0x3000);
- old_channel = radio->channel;
+ old_channel = (phy->channel == 0xFF) ? 1 : phy->channel;
/* Force to channel 7, even if not supported. */
- bcm43xx_radio_selectchannel(bcm, 7, 0);
+ bcm43xx_radio_selectchannel(dev, 7, 0);
- if (radio->version != 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0075, 0x0080);
- bcm43xx_radio_write16(bcm, 0x0079, 0x0081);
+ if (phy->radio_ver != 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0075, 0x0080);
+ bcm43xx_radio_write16(dev, 0x0079, 0x0081);
}
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0023);
- if (radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
+ if (phy->radio_ver == 0x2050) {
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0070);
}
- bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
- bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
+ bcm43xx_radio_write16(dev, 0x005B, 0x007B);
+ bcm43xx_radio_write16(dev, 0x005C, 0x00B0);
- bcm43xx_radio_write16(bcm, 0x007A, bcm43xx_radio_read16(bcm, 0x007A) | 0x0007);
+ bcm43xx_radio_write16(dev, 0x007A, bcm43xx_radio_read16(dev, 0x007A) |
+ 0x0007);
- bcm43xx_radio_selectchannel(bcm, old_channel, 0);
+ bcm43xx_radio_selectchannel(dev, old_channel, 0);
- bcm43xx_phy_write(bcm, 0x0014, 0x0080);
- bcm43xx_phy_write(bcm, 0x0032, 0x00CA);
- bcm43xx_phy_write(bcm, 0x002A, 0x88A3);
+ bcm43xx_phy_write(dev, 0x0014, 0x0080);
+ bcm43xx_phy_write(dev, 0x0032, 0x00CA);
+ bcm43xx_phy_write(dev, 0x002A, 0x88A3);
- bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
+ bcm43xx_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);
- if (radio->version == 0x2050)
- bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_radio_write16(dev, 0x005D, 0x000D);
- bcm43xx_write16(bcm, 0x03E4, (bcm43xx_read16(bcm, 0x03E4) & 0xFFC0) | 0x0004);
+ bcm43xx_write16(dev, 0x03E4, (bcm43xx_read16(dev, 0x03E4) & 0xFFC0) |
+ 0x0004);
}
-static void bcm43xx_phy_initb6(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_initb6(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 offset, val;
u8 old_channel;
- bcm43xx_phy_write(bcm, 0x003E, 0x817A);
- bcm43xx_radio_write16(bcm, 0x007A,
- (bcm43xx_radio_read16(bcm, 0x007A) | 0x0058));
- if (radio->revision == 4 ||
- radio->revision == 5) {
- bcm43xx_radio_write16(bcm, 0x0051, 0x0037);
- bcm43xx_radio_write16(bcm, 0x0052, 0x0070);
- bcm43xx_radio_write16(bcm, 0x0053, 0x00B3);
- bcm43xx_radio_write16(bcm, 0x0054, 0x009B);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
- bcm43xx_radio_write16(bcm, 0x005B, 0x0088);
- bcm43xx_radio_write16(bcm, 0x005D, 0x0088);
- bcm43xx_radio_write16(bcm, 0x005E, 0x0088);
- bcm43xx_radio_write16(bcm, 0x007D, 0x0088);
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+ bcm43xx_phy_write(dev, 0x003E, 0x817A);
+ bcm43xx_radio_write16(dev, 0x007A,
+ (bcm43xx_radio_read16(dev, 0x007A) | 0x0058));
+ if (phy->radio_rev == 4 ||
+ phy->radio_rev == 5) {
+ bcm43xx_radio_write16(dev, 0x0051, 0x0037);
+ bcm43xx_radio_write16(dev, 0x0052, 0x0070);
+ bcm43xx_radio_write16(dev, 0x0053, 0x00B3);
+ bcm43xx_radio_write16(dev, 0x0054, 0x009B);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0088);
+ bcm43xx_radio_write16(dev, 0x005B, 0x0088);
+ bcm43xx_radio_write16(dev, 0x005D, 0x0088);
+ bcm43xx_radio_write16(dev, 0x005E, 0x0088);
+ bcm43xx_radio_write16(dev, 0x007D, 0x0088);
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET,
- (bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+ (bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET)
| 0x00000200));
}
- if (radio->revision == 8) {
- bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
- bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
- bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
- bcm43xx_radio_write16(bcm, 0x0054, 0x0098);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
- bcm43xx_radio_write16(bcm, 0x005B, 0x006B);
- bcm43xx_radio_write16(bcm, 0x005C, 0x000F);
- if (bcm->sprom.boardflags & 0x8000) {
- bcm43xx_radio_write16(bcm, 0x005D, 0x00FA);
- bcm43xx_radio_write16(bcm, 0x005E, 0x00D8);
+ if (phy->radio_rev == 8) {
+ bcm43xx_radio_write16(dev, 0x0051, 0x0000);
+ bcm43xx_radio_write16(dev, 0x0052, 0x0040);
+ bcm43xx_radio_write16(dev, 0x0053, 0x00B7);
+ bcm43xx_radio_write16(dev, 0x0054, 0x0098);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0088);
+ bcm43xx_radio_write16(dev, 0x005B, 0x006B);
+ bcm43xx_radio_write16(dev, 0x005C, 0x000F);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & 0x8000) {
+ bcm43xx_radio_write16(dev, 0x005D, 0x00FA);
+ bcm43xx_radio_write16(dev, 0x005E, 0x00D8);
} else {
- bcm43xx_radio_write16(bcm, 0x005D, 0x00F5);
- bcm43xx_radio_write16(bcm, 0x005E, 0x00B8);
+ bcm43xx_radio_write16(dev, 0x005D, 0x00F5);
+ bcm43xx_radio_write16(dev, 0x005E, 0x00B8);
}
- bcm43xx_radio_write16(bcm, 0x0073, 0x0003);
- bcm43xx_radio_write16(bcm, 0x007D, 0x00A8);
- bcm43xx_radio_write16(bcm, 0x007C, 0x0001);
- bcm43xx_radio_write16(bcm, 0x007E, 0x0008);
+ bcm43xx_radio_write16(dev, 0x0073, 0x0003);
+ bcm43xx_radio_write16(dev, 0x007D, 0x00A8);
+ bcm43xx_radio_write16(dev, 0x007C, 0x0001);
+ bcm43xx_radio_write16(dev, 0x007E, 0x0008);
}
val = 0x1E1F;
for (offset = 0x0088; offset < 0x0098; offset++) {
- bcm43xx_phy_write(bcm, offset, val);
+ bcm43xx_phy_write(dev, offset, val);
val -= 0x0202;
}
val = 0x3E3F;
for (offset = 0x0098; offset < 0x00A8; offset++) {
- bcm43xx_phy_write(bcm, offset, val);
+ bcm43xx_phy_write(dev, offset, val);
val -= 0x0202;
}
val = 0x2120;
for (offset = 0x00A8; offset < 0x00C8; offset++) {
- bcm43xx_phy_write(bcm, offset, (val & 0x3F3F));
+ bcm43xx_phy_write(dev, offset, (val & 0x3F3F));
val += 0x0202;
}
if (phy->type == BCM43xx_PHYTYPE_G) {
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0020);
- bcm43xx_radio_write16(bcm, 0x0051,
- bcm43xx_radio_read16(bcm, 0x0051) | 0x0004);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
- bcm43xx_phy_write(bcm, 0x5B, 0x0000);
- bcm43xx_phy_write(bcm, 0x5C, 0x0000);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A) |
+ 0x0020);
+ bcm43xx_radio_write16(dev, 0x0051,
+ bcm43xx_radio_read16(dev, 0x0051) |
+ 0x0004);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) | 0x0100);
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B) | 0x2000);
+ bcm43xx_phy_write(dev, 0x5B, 0x0000);
+ bcm43xx_phy_write(dev, 0x5C, 0x0000);
}
- old_channel = radio->channel;
+ old_channel = phy->channel;
if (old_channel >= 8)
- bcm43xx_radio_selectchannel(bcm, 1, 0);
+ bcm43xx_radio_selectchannel(dev, 1, 0);
else
- bcm43xx_radio_selectchannel(bcm, 13, 0);
+ bcm43xx_radio_selectchannel(dev, 13, 0);
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
- bcm43xx_radio_write16(bcm, 0x0050, 0x0023);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0023);
udelay(40);
- if (radio->revision < 6 || radio-> revision == 8) {
- bcm43xx_radio_write16(bcm, 0x007C, (bcm43xx_radio_read16(bcm, 0x007C)
+ if (phy->radio_rev < 6 || phy->radio_rev == 8) {
+ bcm43xx_radio_write16(dev, 0x007C,
+ (bcm43xx_radio_read16(dev, 0x007C)
| 0x0002));
- bcm43xx_radio_write16(bcm, 0x0050, 0x0020);
+ bcm43xx_radio_write16(dev, 0x0050, 0x0020);
}
- if (radio->revision <= 2) {
- bcm43xx_radio_write16(bcm, 0x007C, 0x0020);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
- bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
- bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
- }
- bcm43xx_radio_write16(bcm, 0x007A,
- (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007);
-
- bcm43xx_radio_selectchannel(bcm, old_channel, 0);
-
- bcm43xx_phy_write(bcm, 0x0014, 0x0200);
- if (radio->revision >= 6)
- bcm43xx_phy_write(bcm, 0x002A, 0x88C2);
+ if (phy->radio_rev <= 2) {
+ bcm43xx_radio_write16(dev, 0x007C, 0x0020);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0070);
+ bcm43xx_radio_write16(dev, 0x005B, 0x007B);
+ bcm43xx_radio_write16(dev, 0x005C, 0x00B0);
+ }
+ bcm43xx_radio_write16(dev, 0x007A,
+ (bcm43xx_radio_read16(dev,
+ 0x007A) & 0x00F8) | 0x0007);
+
+ bcm43xx_radio_selectchannel(dev, old_channel, 0);
+
+ bcm43xx_phy_write(dev, 0x0014, 0x0200);
+ if (phy->radio_rev >= 6)
+ bcm43xx_phy_write(dev, 0x002A, 0x88C2);
else
- bcm43xx_phy_write(bcm, 0x002A, 0x8AC0);
- bcm43xx_phy_write(bcm, 0x0038, 0x0668);
- bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
- if (radio->revision <= 5)
- bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D)
+ bcm43xx_phy_write(dev, 0x002A, 0x8AC0);
+ bcm43xx_phy_write(dev, 0x0038, 0x0668);
+ bcm43xx_radio_set_txpower_bg(dev, 0xFFFF, 0xFFFF, 0xFFFF);
+ if (phy->radio_rev <= 5)
+ bcm43xx_phy_write(dev, 0x005D, (bcm43xx_phy_read(dev, 0x005D)
& 0xFF80) | 0x0003);
- if (radio->revision <= 2)
- bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
-
+ if (phy->radio_rev <= 2)
+ bcm43xx_radio_write16(dev, 0x005D, 0x000D);
+
if (phy->analog == 4){
- bcm43xx_write16(bcm, 0x03E4, 0x0009);
- bcm43xx_phy_write(bcm, 0x61, bcm43xx_phy_read(bcm, 0x61) & 0xFFF);
+ bcm43xx_write16(dev, 0x03E4, 0x0009);
+ bcm43xx_phy_write(dev, 0x61, bcm43xx_phy_read(dev, 0x61)
+ & 0xFFF);
} else {
- bcm43xx_phy_write(bcm, 0x0002, (bcm43xx_phy_read(bcm, 0x0002) & 0xFFC0) | 0x0004);
+ bcm43xx_phy_write(dev, 0x0002, (bcm43xx_phy_read(dev, 0x0002)
+ & 0xFFC0) | 0x0004);
}
if (phy->type == BCM43xx_PHYTYPE_G)
- bcm43xx_write16(bcm, 0x03E6, 0x0);
+ bcm43xx_write16(dev, 0x03E6, 0x0);
if (phy->type == BCM43xx_PHYTYPE_B) {
- bcm43xx_write16(bcm, 0x03E6, 0x8140);
- bcm43xx_phy_write(bcm, 0x0016, 0x0410);
- bcm43xx_phy_write(bcm, 0x0017, 0x0820);
- bcm43xx_phy_write(bcm, 0x0062, 0x0007);
- bcm43xx_radio_init2050(bcm);
- bcm43xx_phy_lo_g_measure(bcm);
- if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
- bcm43xx_calc_nrssi_slope(bcm);
- bcm43xx_calc_nrssi_threshold(bcm);
+ bcm43xx_write16(dev, 0x03E6, 0x8140);
+ bcm43xx_phy_write(dev, 0x0016, 0x0410);
+ bcm43xx_phy_write(dev, 0x0017, 0x0820);
+ bcm43xx_phy_write(dev, 0x0062, 0x0007);
+ bcm43xx_radio_init2050(dev);
+ bcm43xx_phy_lo_g_measure(dev);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_RSSI) {
+ bcm43xx_calc_nrssi_slope(dev);
+ bcm43xx_calc_nrssi_threshold(dev);
}
- bcm43xx_phy_init_pctl(bcm);
+ bcm43xx_phy_init_pctl(dev);
}
}
-static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm)
+static void bcm43xx_calc_loopback_gain(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 backup_phy[15] = {0};
u16 backup_radio[3];
u16 backup_bband;
@@ -990,139 +816,140 @@ static void bcm43xx_calc_loopback_gain(s
u16 loop1_cnt, loop1_done, loop1_omitted;
u16 loop2_done;
- backup_phy[0] = bcm43xx_phy_read(bcm, 0x0429);
- backup_phy[1] = bcm43xx_phy_read(bcm, 0x0001);
- backup_phy[2] = bcm43xx_phy_read(bcm, 0x0811);
- backup_phy[3] = bcm43xx_phy_read(bcm, 0x0812);
+ backup_phy[0] = bcm43xx_phy_read(dev, 0x0429);
+ backup_phy[1] = bcm43xx_phy_read(dev, 0x0001);
+ backup_phy[2] = bcm43xx_phy_read(dev, 0x0811);
+ backup_phy[3] = bcm43xx_phy_read(dev, 0x0812);
if (phy->rev != 1) {
- backup_phy[4] = bcm43xx_phy_read(bcm, 0x0814);
- backup_phy[5] = bcm43xx_phy_read(bcm, 0x0815);
+ backup_phy[4] = bcm43xx_phy_read(dev, 0x0814);
+ backup_phy[5] = bcm43xx_phy_read(dev, 0x0815);
}
- backup_phy[6] = bcm43xx_phy_read(bcm, 0x005A);
- backup_phy[7] = bcm43xx_phy_read(bcm, 0x0059);
- backup_phy[8] = bcm43xx_phy_read(bcm, 0x0058);
- backup_phy[9] = bcm43xx_phy_read(bcm, 0x000A);
- backup_phy[10] = bcm43xx_phy_read(bcm, 0x0003);
- backup_phy[11] = bcm43xx_phy_read(bcm, 0x080F);
- backup_phy[12] = bcm43xx_phy_read(bcm, 0x0810);
- backup_phy[13] = bcm43xx_phy_read(bcm, 0x002B);
- backup_phy[14] = bcm43xx_phy_read(bcm, 0x0015);
- bcm43xx_phy_read(bcm, 0x002D); /* dummy read */
- backup_bband = radio->baseband_atten;
- backup_radio[0] = bcm43xx_radio_read16(bcm, 0x0052);
- backup_radio[1] = bcm43xx_radio_read16(bcm, 0x0043);
- backup_radio[2] = bcm43xx_radio_read16(bcm, 0x007A);
-
- bcm43xx_phy_write(bcm, 0x0429,
- bcm43xx_phy_read(bcm, 0x0429) & 0x3FFF);
- bcm43xx_phy_write(bcm, 0x0001,
- bcm43xx_phy_read(bcm, 0x0001) & 0x8000);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x0002);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) & 0xFFFD);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x0001);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) & 0xFFFE);
+ backup_phy[6] = bcm43xx_phy_read(dev, 0x005A);
+ backup_phy[7] = bcm43xx_phy_read(dev, 0x0059);
+ backup_phy[8] = bcm43xx_phy_read(dev, 0x0058);
+ backup_phy[9] = bcm43xx_phy_read(dev, 0x000A);
+ backup_phy[10] = bcm43xx_phy_read(dev, 0x0003);
+ backup_phy[11] = bcm43xx_phy_read(dev, 0x080F);
+ backup_phy[12] = bcm43xx_phy_read(dev, 0x0810);
+ backup_phy[13] = bcm43xx_phy_read(dev, 0x002B);
+ backup_phy[14] = bcm43xx_phy_read(dev, 0x0015);
+ bcm43xx_phy_read(dev, 0x002D); /* dummy read */
+ backup_bband = phy->bbatt;
+ backup_radio[0] = bcm43xx_radio_read16(dev, 0x0052);
+ backup_radio[1] = bcm43xx_radio_read16(dev, 0x0043);
+ backup_radio[2] = bcm43xx_radio_read16(dev, 0x007A);
+
+ bcm43xx_phy_write(dev, 0x0429,
+ bcm43xx_phy_read(dev, 0x0429) & 0x3FFF);
+ bcm43xx_phy_write(dev, 0x0001,
+ bcm43xx_phy_read(dev, 0x0001) & 0x8000);
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x0002);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) & 0xFFFD);
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x0001);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) & 0xFFFE);
if (phy->rev != 1) {
- bcm43xx_phy_write(bcm, 0x0814,
- bcm43xx_phy_read(bcm, 0x0814) | 0x0001);
- bcm43xx_phy_write(bcm, 0x0815,
- bcm43xx_phy_read(bcm, 0x0815) & 0xFFFE);
- bcm43xx_phy_write(bcm, 0x0814,
- bcm43xx_phy_read(bcm, 0x0814) | 0x0002);
- bcm43xx_phy_write(bcm, 0x0815,
- bcm43xx_phy_read(bcm, 0x0815) & 0xFFFD);
- }
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
+ bcm43xx_phy_write(dev, 0x0814,
+ bcm43xx_phy_read(dev, 0x0814) | 0x0001);
+ bcm43xx_phy_write(dev, 0x0815,
+ bcm43xx_phy_read(dev, 0x0815) & 0xFFFE);
+ bcm43xx_phy_write(dev, 0x0814,
+ bcm43xx_phy_read(dev, 0x0814) | 0x0002);
+ bcm43xx_phy_write(dev, 0x0815,
+ bcm43xx_phy_read(dev, 0x0815) & 0xFFFD);
+ }
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x000C);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) | 0x000C);
- bcm43xx_phy_write(bcm, 0x0811,
- (bcm43xx_phy_read(bcm, 0x0811)
+ bcm43xx_phy_write(dev, 0x0811,
+ (bcm43xx_phy_read(dev, 0x0811)
& 0xFFCF) | 0x0030);
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812)
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812)
& 0xFFCF) | 0x0010);
- bcm43xx_phy_write(bcm, 0x005A, 0x0780);
- bcm43xx_phy_write(bcm, 0x0059, 0xC810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+ bcm43xx_phy_write(dev, 0x005A, 0x0780);
+ bcm43xx_phy_write(dev, 0x0059, 0xC810);
+ bcm43xx_phy_write(dev, 0x0058, 0x000D);
if (phy->analog == 0) {
- bcm43xx_phy_write(bcm, 0x0003, 0x0122);
+ bcm43xx_phy_write(dev, 0x0003, 0x0122);
} else {
- bcm43xx_phy_write(bcm, 0x000A,
- bcm43xx_phy_read(bcm, 0x000A)
+ bcm43xx_phy_write(dev, 0x000A,
+ bcm43xx_phy_read(dev, 0x000A)
| 0x2000);
}
if (phy->rev != 1) {
- bcm43xx_phy_write(bcm, 0x0814,
- bcm43xx_phy_read(bcm, 0x0814) | 0x0004);
- bcm43xx_phy_write(bcm, 0x0815,
- bcm43xx_phy_read(bcm, 0x0815) & 0xFFFB);
+ bcm43xx_phy_write(dev, 0x0814,
+ bcm43xx_phy_read(dev, 0x0814) | 0x0004);
+ bcm43xx_phy_write(dev, 0x0815,
+ bcm43xx_phy_read(dev, 0x0815) & 0xFFFB);
}
- bcm43xx_phy_write(bcm, 0x0003,
- (bcm43xx_phy_read(bcm, 0x0003)
+ bcm43xx_phy_write(dev, 0x0003,
+ (bcm43xx_phy_read(dev, 0x0003)
& 0xFF9F) | 0x0040);
- if (radio->version == 0x2050 && radio->revision == 2) {
- bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
- bcm43xx_radio_write16(bcm, 0x0043,
- (bcm43xx_radio_read16(bcm, 0x0043)
+ if (phy->radio_ver == 0x2050 && phy->radio_rev == 2) {
+ bcm43xx_radio_write16(dev, 0x0052, 0x0000);
+ bcm43xx_radio_write16(dev, 0x0043,
+ (bcm43xx_radio_read16(dev, 0x0043)
& 0xFFF0) | 0x0009);
loop1_cnt = 9;
- } else if (radio->revision == 8) {
- bcm43xx_radio_write16(bcm, 0x0043, 0x000F);
+ } else if (phy->radio_rev == 8) {
+ bcm43xx_radio_write16(dev, 0x0043, 0x000F);
loop1_cnt = 15;
- } else
+ } else {
loop1_cnt = 0;
+ }
- bcm43xx_phy_set_baseband_attenuation(bcm, 11);
+ bcm43xx_phy_set_baseband_attenuation(dev, 11);
if (phy->rev >= 3)
- bcm43xx_phy_write(bcm, 0x080F, 0xC020);
+ bcm43xx_phy_write(dev, 0x080F, 0xC020);
else
- bcm43xx_phy_write(bcm, 0x080F, 0x8020);
- bcm43xx_phy_write(bcm, 0x0810, 0x0000);
+ bcm43xx_phy_write(dev, 0x080F, 0x8020);
+ bcm43xx_phy_write(dev, 0x0810, 0x0000);
- bcm43xx_phy_write(bcm, 0x002B,
- (bcm43xx_phy_read(bcm, 0x002B)
+ bcm43xx_phy_write(dev, 0x002B,
+ (bcm43xx_phy_read(dev, 0x002B)
& 0xFFC0) | 0x0001);
- bcm43xx_phy_write(bcm, 0x002B,
- (bcm43xx_phy_read(bcm, 0x002B)
+ bcm43xx_phy_write(dev, 0x002B,
+ (bcm43xx_phy_read(dev, 0x002B)
& 0xC0FF) | 0x0800);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x0100);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) & 0xCFFF);
- if (bcm->sprom.boardflags & BCM43xx_BFL_EXTLNA) {
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x0100);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) & 0xCFFF);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_EXTLNA) {
if (phy->rev >= 7) {
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811)
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811)
| 0x0800);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812)
| 0x8000);
}
}
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A)
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
& 0x00F7);
for (i = 0; i < loop1_cnt; i++) {
- bcm43xx_radio_write16(bcm, 0x0043, loop1_cnt);
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812)
+ bcm43xx_radio_write16(dev, 0x0043, loop1_cnt);
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812)
& 0xF0FF) | (i << 8));
- bcm43xx_phy_write(bcm, 0x0015,
- (bcm43xx_phy_read(bcm, 0x0015)
+ bcm43xx_phy_write(dev, 0x0015,
+ (bcm43xx_phy_read(dev, 0x0015)
& 0x0FFF) | 0xA000);
- bcm43xx_phy_write(bcm, 0x0015,
- (bcm43xx_phy_read(bcm, 0x0015)
+ bcm43xx_phy_write(dev, 0x0015,
+ (bcm43xx_phy_read(dev, 0x0015)
& 0x0FFF) | 0xF000);
udelay(20);
- if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
+ if (bcm43xx_phy_read(dev, 0x002D) >= 0x0DFC)
break;
}
loop1_done = i;
@@ -1130,166 +957,167 @@ static void bcm43xx_calc_loopback_gain(s
loop2_done = 0;
if (loop1_done >= 8) {
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812)
| 0x0030);
for (i = loop1_done - 8; i < 16; i++) {
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812)
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812)
& 0xF0FF) | (i << 8));
- bcm43xx_phy_write(bcm, 0x0015,
- (bcm43xx_phy_read(bcm, 0x0015)
+ bcm43xx_phy_write(dev, 0x0015,
+ (bcm43xx_phy_read(dev, 0x0015)
& 0x0FFF) | 0xA000);
- bcm43xx_phy_write(bcm, 0x0015,
- (bcm43xx_phy_read(bcm, 0x0015)
+ bcm43xx_phy_write(dev, 0x0015,
+ (bcm43xx_phy_read(dev, 0x0015)
& 0x0FFF) | 0xF000);
udelay(20);
- if (bcm43xx_phy_read(bcm, 0x002D) >= 0x0DFC)
+ if (bcm43xx_phy_read(dev, 0x002D) >= 0x0DFC)
break;
}
}
if (phy->rev != 1) {
- bcm43xx_phy_write(bcm, 0x0814, backup_phy[4]);
- bcm43xx_phy_write(bcm, 0x0815, backup_phy[5]);
+ bcm43xx_phy_write(dev, 0x0814, backup_phy[4]);
+ bcm43xx_phy_write(dev, 0x0815, backup_phy[5]);
}
- bcm43xx_phy_write(bcm, 0x005A, backup_phy[6]);
- bcm43xx_phy_write(bcm, 0x0059, backup_phy[7]);
- bcm43xx_phy_write(bcm, 0x0058, backup_phy[8]);
- bcm43xx_phy_write(bcm, 0x000A, backup_phy[9]);
- bcm43xx_phy_write(bcm, 0x0003, backup_phy[10]);
- bcm43xx_phy_write(bcm, 0x080F, backup_phy[11]);
- bcm43xx_phy_write(bcm, 0x0810, backup_phy[12]);
- bcm43xx_phy_write(bcm, 0x002B, backup_phy[13]);
- bcm43xx_phy_write(bcm, 0x0015, backup_phy[14]);
-
- bcm43xx_phy_set_baseband_attenuation(bcm, backup_bband);
-
- bcm43xx_radio_write16(bcm, 0x0052, backup_radio[0]);
- bcm43xx_radio_write16(bcm, 0x0043, backup_radio[1]);
- bcm43xx_radio_write16(bcm, 0x007A, backup_radio[2]);
+ bcm43xx_phy_write(dev, 0x005A, backup_phy[6]);
+ bcm43xx_phy_write(dev, 0x0059, backup_phy[7]);
+ bcm43xx_phy_write(dev, 0x0058, backup_phy[8]);
+ bcm43xx_phy_write(dev, 0x000A, backup_phy[9]);
+ bcm43xx_phy_write(dev, 0x0003, backup_phy[10]);
+ bcm43xx_phy_write(dev, 0x080F, backup_phy[11]);
+ bcm43xx_phy_write(dev, 0x0810, backup_phy[12]);
+ bcm43xx_phy_write(dev, 0x002B, backup_phy[13]);
+ bcm43xx_phy_write(dev, 0x0015, backup_phy[14]);
+
+ bcm43xx_phy_set_baseband_attenuation(dev, backup_bband);
+
+ bcm43xx_radio_write16(dev, 0x0052, backup_radio[0]);
+ bcm43xx_radio_write16(dev, 0x0043, backup_radio[1]);
+ bcm43xx_radio_write16(dev, 0x007A, backup_radio[2]);
- bcm43xx_phy_write(bcm, 0x0811, backup_phy[2] | 0x0003);
+ bcm43xx_phy_write(dev, 0x0811, backup_phy[2] | 0x0003);
udelay(10);
- bcm43xx_phy_write(bcm, 0x0811, backup_phy[2]);
- bcm43xx_phy_write(bcm, 0x0812, backup_phy[3]);
- bcm43xx_phy_write(bcm, 0x0429, backup_phy[0]);
- bcm43xx_phy_write(bcm, 0x0001, backup_phy[1]);
+ bcm43xx_phy_write(dev, 0x0811, backup_phy[2]);
+ bcm43xx_phy_write(dev, 0x0812, backup_phy[3]);
+ bcm43xx_phy_write(dev, 0x0429, backup_phy[0]);
+ bcm43xx_phy_write(dev, 0x0001, backup_phy[1]);
phy->loopback_gain[0] = ((loop1_done * 6) - (loop1_omitted * 4)) - 11;
phy->loopback_gain[1] = (24 - (3 * loop2_done)) * 2;
}
-static void bcm43xx_phy_initg(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_initg(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 tmp;
if (phy->rev == 1)
- bcm43xx_phy_initb5(bcm);
+ bcm43xx_phy_initb5(dev);
else
- bcm43xx_phy_initb6(bcm);
- if (phy->rev >= 2 || phy->connected)
- bcm43xx_phy_inita(bcm);
+ bcm43xx_phy_initb6(dev);
+ if (phy->rev >= 2 || phy->gmode)
+ bcm43xx_phy_inita(dev);
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x0814, 0x0000);
- bcm43xx_phy_write(bcm, 0x0815, 0x0000);
+ bcm43xx_phy_write(dev, 0x0814, 0x0000);
+ bcm43xx_phy_write(dev, 0x0815, 0x0000);
}
if (phy->rev == 2) {
- bcm43xx_phy_write(bcm, 0x0811, 0x0000);
- bcm43xx_phy_write(bcm, 0x0015, 0x00C0);
+ bcm43xx_phy_write(dev, 0x0811, 0x0000);
+ bcm43xx_phy_write(dev, 0x0015, 0x00C0);
}
if (phy->rev > 5) {
- bcm43xx_phy_write(bcm, 0x0811, 0x0400);
- bcm43xx_phy_write(bcm, 0x0015, 0x00C0);
+ bcm43xx_phy_write(dev, 0x0811, 0x0400);
+ bcm43xx_phy_write(dev, 0x0015, 0x00C0);
}
- if (phy->rev >= 2 && phy->connected) {
- tmp = bcm43xx_phy_read(bcm, 0x0400) & 0xFF;
+ if (phy->rev >= 2 && phy->gmode) {
+ tmp = bcm43xx_phy_read(dev, 0x0400) & 0xFF;
if (tmp ==3 || tmp == 5) {
- bcm43xx_phy_write(bcm, 0x04C2, 0x1816);
- bcm43xx_phy_write(bcm, 0x04C3, 0x8006);
+ bcm43xx_phy_write(dev, 0x04C2, 0x1816);
+ bcm43xx_phy_write(dev, 0x04C3, 0x8006);
if (tmp == 5) {
- bcm43xx_phy_write(bcm, 0x04CC,
- (bcm43xx_phy_read(bcm, 0x04CC)
+ bcm43xx_phy_write(dev, 0x04CC,
+ (bcm43xx_phy_read(dev, 0x04CC)
& 0x00FF) | 0x1F00);
}
}
- bcm43xx_phy_write(bcm, 0x047E, 0x0078);
+ bcm43xx_phy_write(dev, 0x047E, 0x0078);
}
- if (radio->revision == 8) {
- bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080);
- bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004);
- }
- if (phy->rev >= 2 && phy->connected)
- bcm43xx_calc_loopback_gain(bcm);
- if (radio->revision != 8) {
- if (radio->initval == 0xFFFF)
- radio->initval = bcm43xx_radio_init2050(bcm);
+ if (phy->radio_rev == 8) {
+ bcm43xx_phy_write(dev, 0x0801, bcm43xx_phy_read(dev, 0x0801)
+ | 0x0080);
+ bcm43xx_phy_write(dev, 0x043E, bcm43xx_phy_read(dev, 0x043E)
+ | 0x0004);
+ }
+ if (phy->rev >= 2 && phy->gmode)
+ bcm43xx_calc_loopback_gain(dev);
+ if (phy->radio_rev != 8) {
+ if (phy->initval == 0xFFFF)
+ phy->initval = bcm43xx_radio_init2050(dev);
else
- bcm43xx_radio_write16(bcm, 0x0078, radio->initval);
+ bcm43xx_radio_write16(dev, 0x0078, phy->initval);
}
- if (radio->txctl2 == 0xFFFF) {
- bcm43xx_phy_lo_g_measure(bcm);
+ if (phy->txctl2 == 0xFFFF) {
+ bcm43xx_phy_lo_g_measure(dev);
} else {
- if (radio->version == 0x2050 && radio->revision == 8) {
- bcm43xx_radio_write16(bcm, 0x0052,
- (radio->txctl1 << 4) | radio->txctl2);
- } else {
- bcm43xx_radio_write16(bcm, 0x0052,
- (bcm43xx_radio_read16(bcm, 0x0052)
- & 0xFFF0) | radio->txctl1);
- }
+ if (phy->radio_ver == 0x2050 && phy->radio_rev == 8)
+ bcm43xx_radio_write16(dev, 0x0052,
+ (phy->txctl1 << 4) | phy->txctl2);
+ else
+ bcm43xx_radio_write16(dev, 0x0052,
+ (bcm43xx_radio_read16(dev, 0x0052)
+ & 0xFFF0) | phy->txctl1);
if (phy->rev >= 6) {
- bcm43xx_phy_write(bcm, 0x0036,
- (bcm43xx_phy_read(bcm, 0x0036)
- & 0x0FFF) | (radio->txctl2 << 12));
+ bcm43xx_phy_write(dev, 0x0036,
+ (bcm43xx_phy_read(dev, 0x0036)
+ & 0x0FFF) | (phy->txctl2 << 12));
}
- if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL)
- bcm43xx_phy_write(bcm, 0x002E, 0x8075);
+ if (dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_PACTRL)
+ bcm43xx_phy_write(dev, 0x002E, 0x8075);
else
- bcm43xx_phy_write(bcm, 0x002E, 0x807F);
+ bcm43xx_phy_write(dev, 0x002E, 0x807F);
if (phy->rev < 2)
- bcm43xx_phy_write(bcm, 0x002F, 0x0101);
+ bcm43xx_phy_write(dev, 0x002F, 0x0101);
else
- bcm43xx_phy_write(bcm, 0x002F, 0x0202);
+ bcm43xx_phy_write(dev, 0x002F, 0x0202);
}
- if (phy->connected || phy->rev >= 2) {
- bcm43xx_phy_lo_adjust(bcm, 0);
- bcm43xx_phy_write(bcm, 0x080F, 0x8078);
+ if (phy->gmode || phy->rev >= 2) {
+ bcm43xx_phy_lo_adjust(dev, 0);
+ bcm43xx_phy_write(dev, 0x080F, 0x8078);
}
- if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
+ if (!(dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_RSSI)) {
/* The specs state to update the NRSSI LT with
* the value 0x7FFFFFFF here. I think that is some weird
* compiler optimization in the original driver.
* Essentially, what we do here is resetting all NRSSI LT
* entries to -32 (see the limit_value() in nrssi_hw_update())
*/
- bcm43xx_nrssi_hw_update(bcm, 0xFFFF);
- bcm43xx_calc_nrssi_threshold(bcm);
- } else if (phy->connected || phy->rev >= 2) {
- if (radio->nrssi[0] == -1000) {
- assert(radio->nrssi[1] == -1000);
- bcm43xx_calc_nrssi_slope(bcm);
+ bcm43xx_nrssi_hw_update(dev, 0xFFFF);
+ bcm43xx_calc_nrssi_threshold(dev);
+ } else if (phy->gmode || phy->rev >= 2) {
+ if (phy->nrssi[0] == -1000) {
+ BCM43xx_WARN_ON(phy->nrssi[1] != -1000);
+ bcm43xx_calc_nrssi_slope(dev);
} else {
- assert(radio->nrssi[1] != -1000);
- bcm43xx_calc_nrssi_threshold(bcm);
+ BCM43xx_WARN_ON(phy->nrssi[1] == -1000);
+ bcm43xx_calc_nrssi_threshold(dev);
}
}
- if (radio->revision == 8)
- bcm43xx_phy_write(bcm, 0x0805, 0x3230);
- bcm43xx_phy_init_pctl(bcm);
- if (bcm->chip_id == 0x4306 && bcm->chip_package == 2) {
- bcm43xx_phy_write(bcm, 0x0429,
- bcm43xx_phy_read(bcm, 0x0429) & 0xBFFF);
- bcm43xx_phy_write(bcm, 0x04C3,
- bcm43xx_phy_read(bcm, 0x04C3) & 0x7FFF);
+ if (phy->radio_rev == 8)
+ bcm43xx_phy_write(dev, 0x0805, 0x3230);
+ bcm43xx_phy_init_pctl(dev);
+ if (dev->dev->bus->chip_id == 0x4306
+ && dev->dev->bus->chip_package == 2) {
+ bcm43xx_phy_write(dev, 0x0429,
+ bcm43xx_phy_read(dev, 0x0429) & 0xBFFF);
+ bcm43xx_phy_write(dev, 0x04C3,
+ bcm43xx_phy_read(dev, 0x04C3) & 0x7FFF);
}
}
-static u16 bcm43xx_phy_lo_b_r15_loop(struct bcm43xx_private *bcm)
+static u16 bcm43xx_phy_lo_b_r15_loop(struct bcm43xx_wldev *dev)
{
int i;
u16 ret = 0;
@@ -1297,13 +1125,13 @@ static u16 bcm43xx_phy_lo_b_r15_loop(str
local_irq_save(flags);
for (i = 0; i < 10; i++){
- bcm43xx_phy_write(bcm, 0x0015, 0xAFA0);
+ bcm43xx_phy_write(dev, 0x0015, 0xAFA0);
udelay(1);
- bcm43xx_phy_write(bcm, 0x0015, 0xEFA0);
+ bcm43xx_phy_write(dev, 0x0015, 0xEFA0);
udelay(10);
- bcm43xx_phy_write(bcm, 0x0015, 0xFFA0);
+ bcm43xx_phy_write(dev, 0x0015, 0xFFA0);
udelay(40);
- ret += bcm43xx_phy_read(bcm, 0x002C);
+ ret += bcm43xx_phy_read(dev, 0x002C);
}
local_irq_restore(flags);
bcm43xx_voluntary_preempt();
@@ -1311,59 +1139,58 @@ static u16 bcm43xx_phy_lo_b_r15_loop(str
return ret;
}
-void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm)
+void bcm43xx_phy_lo_b_measure(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 regstack[12] = { 0 };
u16 mls;
u16 fval;
int i, j;
- regstack[0] = bcm43xx_phy_read(bcm, 0x0015);
- regstack[1] = bcm43xx_radio_read16(bcm, 0x0052) & 0xFFF0;
+ regstack[0] = bcm43xx_phy_read(dev, 0x0015);
+ regstack[1] = bcm43xx_radio_read16(dev, 0x0052) & 0xFFF0;
- if (radio->version == 0x2053) {
- regstack[2] = bcm43xx_phy_read(bcm, 0x000A);
- regstack[3] = bcm43xx_phy_read(bcm, 0x002A);
- regstack[4] = bcm43xx_phy_read(bcm, 0x0035);
- regstack[5] = bcm43xx_phy_read(bcm, 0x0003);
- regstack[6] = bcm43xx_phy_read(bcm, 0x0001);
- regstack[7] = bcm43xx_phy_read(bcm, 0x0030);
-
- regstack[8] = bcm43xx_radio_read16(bcm, 0x0043);
- regstack[9] = bcm43xx_radio_read16(bcm, 0x007A);
- regstack[10] = bcm43xx_read16(bcm, 0x03EC);
- regstack[11] = bcm43xx_radio_read16(bcm, 0x0052) & 0x00F0;
-
- bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
- bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
- bcm43xx_phy_write(bcm, 0x0035, regstack[4] & 0xFF7F);
- bcm43xx_radio_write16(bcm, 0x007A, regstack[9] & 0xFFF0);
- }
- bcm43xx_phy_write(bcm, 0x0015, 0xB000);
- bcm43xx_phy_write(bcm, 0x002B, 0x0004);
-
- if (radio->version == 0x2053) {
- bcm43xx_phy_write(bcm, 0x002B, 0x0203);
- bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
+ if (phy->radio_ver == 0x2053) {
+ regstack[2] = bcm43xx_phy_read(dev, 0x000A);
+ regstack[3] = bcm43xx_phy_read(dev, 0x002A);
+ regstack[4] = bcm43xx_phy_read(dev, 0x0035);
+ regstack[5] = bcm43xx_phy_read(dev, 0x0003);
+ regstack[6] = bcm43xx_phy_read(dev, 0x0001);
+ regstack[7] = bcm43xx_phy_read(dev, 0x0030);
+
+ regstack[8] = bcm43xx_radio_read16(dev, 0x0043);
+ regstack[9] = bcm43xx_radio_read16(dev, 0x007A);
+ regstack[10] = bcm43xx_read16(dev, 0x03EC);
+ regstack[11] = bcm43xx_radio_read16(dev, 0x0052) & 0x00F0;
+
+ bcm43xx_phy_write(dev, 0x0030, 0x00FF);
+ bcm43xx_write16(dev, 0x03EC, 0x3F3F);
+ bcm43xx_phy_write(dev, 0x0035, regstack[4] & 0xFF7F);
+ bcm43xx_radio_write16(dev, 0x007A, regstack[9] & 0xFFF0);
+ }
+ bcm43xx_phy_write(dev, 0x0015, 0xB000);
+ bcm43xx_phy_write(dev, 0x002B, 0x0004);
+
+ if (phy->radio_ver == 0x2053) {
+ bcm43xx_phy_write(dev, 0x002B, 0x0203);
+ bcm43xx_phy_write(dev, 0x002A, 0x08A3);
}
phy->minlowsig[0] = 0xFFFF;
for (i = 0; i < 4; i++) {
- bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
- bcm43xx_phy_lo_b_r15_loop(bcm);
+ bcm43xx_radio_write16(dev, 0x0052, regstack[1] | i);
+ bcm43xx_phy_lo_b_r15_loop(dev);
}
for (i = 0; i < 10; i++) {
- bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | i);
- mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
+ bcm43xx_radio_write16(dev, 0x0052, regstack[1] | i);
+ mls = bcm43xx_phy_lo_b_r15_loop(dev) / 10;
if (mls < phy->minlowsig[0]) {
phy->minlowsig[0] = mls;
phy->minlowsigpos[0] = i;
}
}
- bcm43xx_radio_write16(bcm, 0x0052, regstack[1] | phy->minlowsigpos[0]);
+ bcm43xx_radio_write16(dev, 0x0052, regstack[1] | phy->minlowsigpos[0]);
phy->minlowsig[1] = 0xFFFF;
@@ -1373,8 +1200,8 @@ void bcm43xx_phy_lo_b_measure(struct bcm
fval = (0x0100 * i) + j + 0x0100;
else
fval = (0x0100 * i) + j;
- bcm43xx_phy_write(bcm, 0x002F, fval);
- mls = bcm43xx_phy_lo_b_r15_loop(bcm) / 10;
+ bcm43xx_phy_write(dev, 0x002F, fval);
+ mls = bcm43xx_phy_lo_b_r15_loop(dev) / 10;
if (mls < phy->minlowsig[1]) {
phy->minlowsig[1] = mls;
phy->minlowsigpos[1] = fval;
@@ -1383,75 +1210,76 @@ void bcm43xx_phy_lo_b_measure(struct bcm
}
phy->minlowsigpos[1] += 0x0101;
- bcm43xx_phy_write(bcm, 0x002F, phy->minlowsigpos[1]);
- if (radio->version == 0x2053) {
- bcm43xx_phy_write(bcm, 0x000A, regstack[2]);
- bcm43xx_phy_write(bcm, 0x002A, regstack[3]);
- bcm43xx_phy_write(bcm, 0x0035, regstack[4]);
- bcm43xx_phy_write(bcm, 0x0003, regstack[5]);
- bcm43xx_phy_write(bcm, 0x0001, regstack[6]);
- bcm43xx_phy_write(bcm, 0x0030, regstack[7]);
-
- bcm43xx_radio_write16(bcm, 0x0043, regstack[8]);
- bcm43xx_radio_write16(bcm, 0x007A, regstack[9]);
-
- bcm43xx_radio_write16(bcm, 0x0052,
- (bcm43xx_radio_read16(bcm, 0x0052) & 0x000F)
- | regstack[11]);
+ bcm43xx_phy_write(dev, 0x002F, phy->minlowsigpos[1]);
+ if (phy->radio_ver == 0x2053) {
+ bcm43xx_phy_write(dev, 0x000A, regstack[2]);
+ bcm43xx_phy_write(dev, 0x002A, regstack[3]);
+ bcm43xx_phy_write(dev, 0x0035, regstack[4]);
+ bcm43xx_phy_write(dev, 0x0003, regstack[5]);
+ bcm43xx_phy_write(dev, 0x0001, regstack[6]);
+ bcm43xx_phy_write(dev, 0x0030, regstack[7]);
+
+ bcm43xx_radio_write16(dev, 0x0043, regstack[8]);
+ bcm43xx_radio_write16(dev, 0x007A, regstack[9]);
+
+ bcm43xx_radio_write16(dev, 0x0052,
+ (bcm43xx_radio_read16(dev, 0x0052)
+ & 0x000F) | regstack[11]);
- bcm43xx_write16(bcm, 0x03EC, regstack[10]);
+ bcm43xx_write16(dev, 0x03EC, regstack[10]);
}
- bcm43xx_phy_write(bcm, 0x0015, regstack[0]);
+ bcm43xx_phy_write(dev, 0x0015, regstack[0]);
}
static inline
-u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_private *bcm, u16 control)
+u16 bcm43xx_phy_lo_g_deviation_subval(struct bcm43xx_wldev *dev, u16 control)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 ret;
unsigned long flags;
local_irq_save(flags);
- if (phy->connected) {
- bcm43xx_phy_write(bcm, 0x15, 0xE300);
+ if (phy->gmode) {
+ bcm43xx_phy_write(dev, 0x15, 0xE300);
control <<= 8;
- bcm43xx_phy_write(bcm, 0x0812, control | 0x00B0);
+ bcm43xx_phy_write(dev, 0x0812, control | 0x00B0);
udelay(5);
- bcm43xx_phy_write(bcm, 0x0812, control | 0x00B2);
+ bcm43xx_phy_write(dev, 0x0812, control | 0x00B2);
udelay(2);
- bcm43xx_phy_write(bcm, 0x0812, control | 0x00B3);
+ bcm43xx_phy_write(dev, 0x0812, control | 0x00B3);
udelay(4);
- bcm43xx_phy_write(bcm, 0x0015, 0xF300);
+ bcm43xx_phy_write(dev, 0x0015, 0xF300);
udelay(8);
} else {
- bcm43xx_phy_write(bcm, 0x0015, control | 0xEFA0);
+ bcm43xx_phy_write(dev, 0x0015, control | 0xEFA0);
udelay(2);
- bcm43xx_phy_write(bcm, 0x0015, control | 0xEFE0);
+ bcm43xx_phy_write(dev, 0x0015, control | 0xEFE0);
udelay(4);
- bcm43xx_phy_write(bcm, 0x0015, control | 0xFFE0);
+ bcm43xx_phy_write(dev, 0x0015, control | 0xFFE0);
udelay(8);
}
- ret = bcm43xx_phy_read(bcm, 0x002D);
+ ret = bcm43xx_phy_read(dev, 0x002D);
local_irq_restore(flags);
bcm43xx_voluntary_preempt();
return ret;
}
-static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_private *bcm, u16 control)
+static u32 bcm43xx_phy_lo_g_singledeviation(struct bcm43xx_wldev *dev,
+ u16 control)
{
int i;
u32 ret = 0;
for (i = 0; i < 8; i++)
- ret += bcm43xx_phy_lo_g_deviation_subval(bcm, control);
+ ret += bcm43xx_phy_lo_g_deviation_subval(dev, control);
return ret;
}
/* Write the LocalOscillator CONTROL */
static inline
-void bcm43xx_lo_write(struct bcm43xx_private *bcm,
+void bcm43xx_lo_write(struct bcm43xx_wldev *dev,
struct bcm43xx_lopair *pair)
{
u16 value;
@@ -1463,30 +1291,31 @@ void bcm43xx_lo_write(struct bcm43xx_pri
/* Sanity check. */
if (pair->low < -8 || pair->low > 8 ||
pair->high < -8 || pair->high > 8) {
- printk(KERN_WARNING PFX
+ struct bcm43xx_phy *phy = &dev->phy;
+ bcmdbg(dev->wl,
"WARNING: Writing invalid LOpair "
"(low: %d, high: %d, index: %lu)\n",
pair->low, pair->high,
- (unsigned long)(pair - bcm43xx_current_phy(bcm)->_lo_pairs));
+ (unsigned long)(pair - phy->_lo_pairs));
dump_stack();
}
#endif
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, value);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_LO_CONTROL, value);
}
static inline
-struct bcm43xx_lopair * bcm43xx_find_lopair(struct bcm43xx_private *bcm,
+struct bcm43xx_lopair *bcm43xx_find_lopair(struct bcm43xx_wldev *dev,
u16 baseband_attenuation,
u16 radio_attenuation,
u16 tx)
{
static const u8 dict[10] = { 11, 10, 11, 12, 13, 12, 13, 12, 13, 12 };
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
if (baseband_attenuation > 6)
baseband_attenuation = 6;
- assert(radio_attenuation < 10);
+ BCM43xx_WARN_ON(radio_attenuation >= 10);
if (tx == 3) {
return bcm43xx_get_lopair(phy,
@@ -1497,52 +1326,53 @@ struct bcm43xx_lopair * bcm43xx_find_lop
}
static inline
-struct bcm43xx_lopair * bcm43xx_current_lopair(struct bcm43xx_private *bcm)
+struct bcm43xx_lopair *bcm43xx_current_lopair(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- return bcm43xx_find_lopair(bcm,
- radio->baseband_atten,
- radio->radio_atten,
- radio->txctl1);
+ return bcm43xx_find_lopair(dev,
+ phy->bbatt,
+ phy->rfatt,
+ phy->txctl1);
}
/* Adjust B/G LO */
-void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed)
+void bcm43xx_phy_lo_adjust(struct bcm43xx_wldev *dev, int fixed)
{
struct bcm43xx_lopair *pair;
if (fixed) {
/* Use fixed values. Only for initialization. */
- pair = bcm43xx_find_lopair(bcm, 2, 3, 0);
- } else
- pair = bcm43xx_current_lopair(bcm);
- bcm43xx_lo_write(bcm, pair);
+ pair = bcm43xx_find_lopair(dev, 2, 3, 0);
+ } else {
+ pair = bcm43xx_current_lopair(dev);
+ }
+ bcm43xx_lo_write(dev, pair);
}
-static void bcm43xx_phy_lo_g_measure_txctl2(struct bcm43xx_private *bcm)
+static void bcm43xx_phy_lo_g_measure_txctl2(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 txctl2 = 0, i;
u32 smallest, tmp;
- bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
+ bcm43xx_radio_write16(dev, 0x0052, 0x0000);
udelay(10);
- smallest = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
+ smallest = bcm43xx_phy_lo_g_singledeviation(dev, 0);
for (i = 0; i < 16; i++) {
- bcm43xx_radio_write16(bcm, 0x0052, i);
+ bcm43xx_radio_write16(dev, 0x0052, i);
udelay(10);
- tmp = bcm43xx_phy_lo_g_singledeviation(bcm, 0);
+ tmp = bcm43xx_phy_lo_g_singledeviation(dev, 0);
if (tmp < smallest) {
smallest = tmp;
txctl2 = i;
}
}
- radio->txctl2 = txctl2;
+ phy->txctl2 = txctl2;
}
static
-void bcm43xx_phy_lo_g_state(struct bcm43xx_private *bcm,
+void bcm43xx_phy_lo_g_state(struct bcm43xx_wldev *dev,
const struct bcm43xx_lopair *in_pair,
struct bcm43xx_lopair *out_pair,
u16 r27)
@@ -1572,11 +1402,11 @@ void bcm43xx_phy_lo_g_state(struct bcm43
/* Note that in_pair and out_pair can point to the same pair. Be careful. */
- bcm43xx_lo_write(bcm, &lowest_transition);
- lowest_deviation = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
+ bcm43xx_lo_write(dev, &lowest_transition);
+ lowest_deviation = bcm43xx_phy_lo_g_singledeviation(dev, r27);
do {
found_lower = 0;
- assert(state >= 0 && state <= 8);
+ BCM43xx_WARN_ON(!(state >= 0 && state <= 8));
if (state == 0) {
begin = 1;
end = 8;
@@ -1596,12 +1426,14 @@ void bcm43xx_phy_lo_g_state(struct bcm43
tmp_pair.high = lowest_transition.high;
tmp_pair.low = lowest_transition.low;
while (1) {
- assert(j >= 1 && j <= 8);
+ BCM43xx_WARN_ON(!(j >= 1 && j <= 8));
transition.high = tmp_pair.high + transitions[j - 1].high;
transition.low = tmp_pair.low + transitions[j - 1].low;
- if ((abs(transition.low) < 9) && (abs(transition.high) < 9)) {
- bcm43xx_lo_write(bcm, &transition);
- tmp = bcm43xx_phy_lo_g_singledeviation(bcm, r27);
+ if ((abs(transition.low) < 9)
+ && (abs(transition.high) < 9)) {
+ bcm43xx_lo_write(dev, &transition);
+ tmp = bcm43xx_phy_lo_g_singledeviation(dev,
+ r27);
if (tmp < lowest_deviation) {
lowest_deviation = tmp;
state = j;
@@ -1625,36 +1457,36 @@ void bcm43xx_phy_lo_g_state(struct bcm43
}
/* Set the baseband attenuation value on chip. */
-void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
+void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_wldev *dev,
u16 baseband_attenuation)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 value;
if (phy->analog == 0) {
- value = (bcm43xx_read16(bcm, 0x03E6) & 0xFFF0);
+ value = (bcm43xx_read16(dev, 0x03E6) & 0xFFF0);
value |= (baseband_attenuation & 0x000F);
- bcm43xx_write16(bcm, 0x03E6, value);
+ bcm43xx_write16(dev, 0x03E6, value);
return;
}
- if (phy->analog == 1) {
- value = bcm43xx_phy_read(bcm, 0x0060) & ~0x003C;
+ if (phy->analog > 1) {
+ value = bcm43xx_phy_read(dev, 0x0060) & ~0x003C;
value |= (baseband_attenuation << 2) & 0x003C;
} else {
- value = bcm43xx_phy_read(bcm, 0x0060) & ~0x0078;
+ value = bcm43xx_phy_read(dev, 0x0060) & ~0x0078;
value |= (baseband_attenuation << 3) & 0x0078;
}
- bcm43xx_phy_write(bcm, 0x0060, value);
+ bcm43xx_phy_write(dev, 0x0060, value);
}
/* http://bcm-specs.sipsolutions.net/LocalOscillator/Measure */
-void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm)
+void bcm43xx_phy_lo_g_measure(struct bcm43xx_wldev *dev)
{
static const u8 pairorder[10] = { 3, 1, 5, 7, 9, 2, 0, 4, 6, 8 };
- const int is_initializing = (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZING);
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ const int is_initializing = (bcm43xx_status(dev)
+ < BCM43xx_STAT_STARTED);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 h, i, oldi = 0, j;
struct bcm43xx_lopair control;
struct bcm43xx_lopair *tmp_control;
@@ -1662,59 +1494,59 @@ void bcm43xx_phy_lo_g_measure(struct bcm
u16 regstack[16] = { 0 };
u8 oldchannel;
- //XXX: What are these?
+ /* XXX: What are these? */
u8 r27 = 0, r31;
- oldchannel = radio->channel;
+ oldchannel = phy->channel;
/* Setup */
- if (phy->connected) {
- regstack[0] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
- regstack[1] = bcm43xx_phy_read(bcm, 0x0802);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
- bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
- }
- regstack[3] = bcm43xx_read16(bcm, 0x03E2);
- bcm43xx_write16(bcm, 0x03E2, regstack[3] | 0x8000);
- regstack[4] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
- regstack[5] = bcm43xx_phy_read(bcm, 0x15);
- regstack[6] = bcm43xx_phy_read(bcm, 0x2A);
- regstack[7] = bcm43xx_phy_read(bcm, 0x35);
- regstack[8] = bcm43xx_phy_read(bcm, 0x60);
- regstack[9] = bcm43xx_radio_read16(bcm, 0x43);
- regstack[10] = bcm43xx_radio_read16(bcm, 0x7A);
- regstack[11] = bcm43xx_radio_read16(bcm, 0x52);
- if (phy->connected) {
- regstack[12] = bcm43xx_phy_read(bcm, 0x0811);
- regstack[13] = bcm43xx_phy_read(bcm, 0x0812);
- regstack[14] = bcm43xx_phy_read(bcm, 0x0814);
- regstack[15] = bcm43xx_phy_read(bcm, 0x0815);
- }
- bcm43xx_radio_selectchannel(bcm, 6, 0);
- if (phy->connected) {
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
- bcm43xx_phy_write(bcm, 0x0802, regstack[1] & 0xFFFC);
- bcm43xx_dummy_transmission(bcm);
- }
- bcm43xx_radio_write16(bcm, 0x0043, 0x0006);
-
- bcm43xx_phy_set_baseband_attenuation(bcm, 2);
-
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, 0x0000);
- bcm43xx_phy_write(bcm, 0x002E, 0x007F);
- bcm43xx_phy_write(bcm, 0x080F, 0x0078);
- bcm43xx_phy_write(bcm, 0x0035, regstack[7] & ~(1 << 7));
- bcm43xx_radio_write16(bcm, 0x007A, regstack[10] & 0xFFF0);
- bcm43xx_phy_write(bcm, 0x002B, 0x0203);
- bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
- if (phy->connected) {
- bcm43xx_phy_write(bcm, 0x0814, regstack[14] | 0x0003);
- bcm43xx_phy_write(bcm, 0x0815, regstack[15] & 0xFFFC);
- bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
- bcm43xx_phy_write(bcm, 0x0812, 0x00B2);
+ if (phy->gmode) {
+ regstack[0] = bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS);
+ regstack[1] = bcm43xx_phy_read(dev, 0x0802);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
+ bcm43xx_phy_write(dev, 0x0802, regstack[1] & 0xFFFC);
+ }
+ regstack[3] = bcm43xx_read16(dev, 0x03E2);
+ bcm43xx_write16(dev, 0x03E2, regstack[3] | 0x8000);
+ regstack[4] = bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT);
+ regstack[5] = bcm43xx_phy_read(dev, 0x15);
+ regstack[6] = bcm43xx_phy_read(dev, 0x2A);
+ regstack[7] = bcm43xx_phy_read(dev, 0x35);
+ regstack[8] = bcm43xx_phy_read(dev, 0x60);
+ regstack[9] = bcm43xx_radio_read16(dev, 0x43);
+ regstack[10] = bcm43xx_radio_read16(dev, 0x7A);
+ regstack[11] = bcm43xx_radio_read16(dev, 0x52);
+ if (phy->gmode) {
+ regstack[12] = bcm43xx_phy_read(dev, 0x0811);
+ regstack[13] = bcm43xx_phy_read(dev, 0x0812);
+ regstack[14] = bcm43xx_phy_read(dev, 0x0814);
+ regstack[15] = bcm43xx_phy_read(dev, 0x0815);
+ }
+ bcm43xx_radio_selectchannel(dev, 6, 0);
+ if (phy->gmode) {
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS, regstack[0] & 0x7FFF);
+ bcm43xx_phy_write(dev, 0x0802, regstack[1] & 0xFFFC);
+ bcm43xx_dummy_transmission(dev);
+ }
+ bcm43xx_radio_write16(dev, 0x0043, 0x0006);
+
+ bcm43xx_phy_set_baseband_attenuation(dev, 2);
+
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, 0x0000);
+ bcm43xx_phy_write(dev, 0x002E, 0x007F);
+ bcm43xx_phy_write(dev, 0x080F, 0x0078);
+ bcm43xx_phy_write(dev, 0x0035, regstack[7] & ~(1 << 7));
+ bcm43xx_radio_write16(dev, 0x007A, regstack[10] & 0xFFF0);
+ bcm43xx_phy_write(dev, 0x002B, 0x0203);
+ bcm43xx_phy_write(dev, 0x002A, 0x08A3);
+ if (phy->gmode) {
+ bcm43xx_phy_write(dev, 0x0814, regstack[14] | 0x0003);
+ bcm43xx_phy_write(dev, 0x0815, regstack[15] & 0xFFFC);
+ bcm43xx_phy_write(dev, 0x0811, 0x01B3);
+ bcm43xx_phy_write(dev, 0x0812, 0x00B2);
}
if (is_initializing)
- bcm43xx_phy_lo_g_measure_txctl2(bcm);
- bcm43xx_phy_write(bcm, 0x080F, 0x8078);
+ bcm43xx_phy_lo_g_measure_txctl2(dev);
+ bcm43xx_phy_write(dev, 0x080F, 0x8078);
/* Measure */
control.low = 0;
@@ -1756,20 +1588,20 @@ void bcm43xx_phy_lo_g_measure(struct bcm
r27 = 3;
r31 = 0;
}
- bcm43xx_radio_write16(bcm, 0x43, i);
- bcm43xx_radio_write16(bcm, 0x52, radio->txctl2);
+ bcm43xx_radio_write16(dev, 0x43, i);
+ bcm43xx_radio_write16(dev, 0x52, phy->txctl2);
udelay(10);
bcm43xx_voluntary_preempt();
- bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
+ bcm43xx_phy_set_baseband_attenuation(dev, j * 2);
tmp = (regstack[10] & 0xFFF0);
if (r31)
tmp |= 0x0008;
- bcm43xx_radio_write16(bcm, 0x007A, tmp);
+ bcm43xx_radio_write16(dev, 0x007A, tmp);
tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
- bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
+ bcm43xx_phy_lo_g_state(dev, &control, tmp_control, r27);
}
oldi = i;
}
@@ -1778,9 +1610,12 @@ void bcm43xx_phy_lo_g_measure(struct bcm
/* Loop over each possible BasebandAttenuation/2 */
for (j = 0; j < 4; j++) {
if (is_initializing) {
- tmp_control = bcm43xx_get_lopair(phy, i - 9, j * 2);
+ tmp_control = bcm43xx_get_lopair(phy, i - 9,
+ j * 2);
memcpy(&control, tmp_control, sizeof(control));
- tmp = (i - 9) * 2 + j - 5;//FIXME: This is wrong, as the following if statement can never trigger.
+ /* FIXME: The next line is wrong, as the
+ * following if statement can never trigger. */
+ tmp = (i - 9) * 2 + j - 5;
r27 = 0;
r31 = 0;
if (tmp > 14) {
@@ -1798,62 +1633,65 @@ void bcm43xx_phy_lo_g_measure(struct bcm
r27 = 3;
r31 = 0;
}
- bcm43xx_radio_write16(bcm, 0x43, i - 9);
- bcm43xx_radio_write16(bcm, 0x52,
- radio->txctl2
- | (3/*txctl1*/ << 4));//FIXME: shouldn't txctl1 be zero here and 3 in the loop above?
+ bcm43xx_radio_write16(dev, 0x43, i - 9);
+ /* FIXME: shouldn't txctl1 be zero in the next line
+ * and 3 in the loop above? */
+ bcm43xx_radio_write16(dev, 0x52,
+ phy->txctl2
+ | (3/*txctl1*/ << 4));
udelay(10);
bcm43xx_voluntary_preempt();
- bcm43xx_phy_set_baseband_attenuation(bcm, j * 2);
+ bcm43xx_phy_set_baseband_attenuation(dev, j * 2);
tmp = (regstack[10] & 0xFFF0);
if (r31)
tmp |= 0x0008;
- bcm43xx_radio_write16(bcm, 0x7A, tmp);
+ bcm43xx_radio_write16(dev, 0x7A, tmp);
tmp_control = bcm43xx_get_lopair(phy, i, j * 2);
- bcm43xx_phy_lo_g_state(bcm, &control, tmp_control, r27);
+ bcm43xx_phy_lo_g_state(dev, &control, tmp_control, r27);
}
}
/* Restoration */
- if (phy->connected) {
- bcm43xx_phy_write(bcm, 0x0015, 0xE300);
- bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA0);
+ if (phy->gmode) {
+ bcm43xx_phy_write(dev, 0x0015, 0xE300);
+ bcm43xx_phy_write(dev, 0x0812, (r27 << 8) | 0xA0);
udelay(5);
- bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA2);
+ bcm43xx_phy_write(dev, 0x0812, (r27 << 8) | 0xA2);
udelay(2);
- bcm43xx_phy_write(bcm, 0x0812, (r27 << 8) | 0xA3);
+ bcm43xx_phy_write(dev, 0x0812, (r27 << 8) | 0xA3);
bcm43xx_voluntary_preempt();
- } else
- bcm43xx_phy_write(bcm, 0x0015, r27 | 0xEFA0);
- bcm43xx_phy_lo_adjust(bcm, is_initializing);
- bcm43xx_phy_write(bcm, 0x002E, 0x807F);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x002F, 0x0202);
+ } else {
+ bcm43xx_phy_write(dev, 0x0015, r27 | 0xEFA0);
+ }
+ bcm43xx_phy_lo_adjust(dev, is_initializing);
+ bcm43xx_phy_write(dev, 0x002E, 0x807F);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x002F, 0x0202);
else
- bcm43xx_phy_write(bcm, 0x002F, 0x0101);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, regstack[4]);
- bcm43xx_phy_write(bcm, 0x0015, regstack[5]);
- bcm43xx_phy_write(bcm, 0x002A, regstack[6]);
- bcm43xx_phy_write(bcm, 0x0035, regstack[7]);
- bcm43xx_phy_write(bcm, 0x0060, regstack[8]);
- bcm43xx_radio_write16(bcm, 0x0043, regstack[9]);
- bcm43xx_radio_write16(bcm, 0x007A, regstack[10]);
+ bcm43xx_phy_write(dev, 0x002F, 0x0101);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, regstack[4]);
+ bcm43xx_phy_write(dev, 0x0015, regstack[5]);
+ bcm43xx_phy_write(dev, 0x002A, regstack[6]);
+ bcm43xx_phy_write(dev, 0x0035, regstack[7]);
+ bcm43xx_phy_write(dev, 0x0060, regstack[8]);
+ bcm43xx_radio_write16(dev, 0x0043, regstack[9]);
+ bcm43xx_radio_write16(dev, 0x007A, regstack[10]);
regstack[11] &= 0x00F0;
- regstack[11] |= (bcm43xx_radio_read16(bcm, 0x52) & 0x000F);
- bcm43xx_radio_write16(bcm, 0x52, regstack[11]);
- bcm43xx_write16(bcm, 0x03E2, regstack[3]);
- if (phy->connected) {
- bcm43xx_phy_write(bcm, 0x0811, regstack[12]);
- bcm43xx_phy_write(bcm, 0x0812, regstack[13]);
- bcm43xx_phy_write(bcm, 0x0814, regstack[14]);
- bcm43xx_phy_write(bcm, 0x0815, regstack[15]);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, regstack[0]);
- bcm43xx_phy_write(bcm, 0x0802, regstack[1]);
+ regstack[11] |= (bcm43xx_radio_read16(dev, 0x52) & 0x000F);
+ bcm43xx_radio_write16(dev, 0x52, regstack[11]);
+ bcm43xx_write16(dev, 0x03E2, regstack[3]);
+ if (phy->gmode) {
+ bcm43xx_phy_write(dev, 0x0811, regstack[12]);
+ bcm43xx_phy_write(dev, 0x0812, regstack[13]);
+ bcm43xx_phy_write(dev, 0x0814, regstack[14]);
+ bcm43xx_phy_write(dev, 0x0815, regstack[15]);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS, regstack[0]);
+ bcm43xx_phy_write(dev, 0x0802, regstack[1]);
}
- bcm43xx_radio_selectchannel(bcm, oldchannel, 1);
+ bcm43xx_radio_selectchannel(dev, oldchannel, 1);
#ifdef CONFIG_BCM43XX_DEBUG
{
@@ -1862,7 +1700,7 @@ void bcm43xx_phy_lo_g_measure(struct bcm
tmp_control = phy->_lo_pairs + i;
if (tmp_control->low < -8 || tmp_control->low > 8 ||
tmp_control->high < -8 || tmp_control->high > 8) {
- printk(KERN_WARNING PFX
+ bcmwarn(dev->wl,
"WARNING: Invalid LOpair (low: %d, high: %d, index: %d)\n",
tmp_control->low, tmp_control->high, i);
}
@@ -1872,17 +1710,17 @@ void bcm43xx_phy_lo_g_measure(struct bcm
}
static
-void bcm43xx_phy_lo_mark_current_used(struct bcm43xx_private *bcm)
+void bcm43xx_phy_lo_mark_current_used(struct bcm43xx_wldev *dev)
{
struct bcm43xx_lopair *pair;
- pair = bcm43xx_current_lopair(bcm);
+ pair = bcm43xx_current_lopair(dev);
pair->used = 1;
}
-void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm)
+void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
struct bcm43xx_lopair *pair;
int i;
@@ -1895,9 +1733,9 @@ void bcm43xx_phy_lo_mark_all_unused(stru
/* http://bcm-specs.sipsolutions.net/EstimatePowerOut
* This function converts a TSSI value to dBm in Q5.2
*/
-static s8 bcm43xx_phy_estimate_power_out(struct bcm43xx_private *bcm, s8 tssi)
+static s8 bcm43xx_phy_estimate_power_out(struct bcm43xx_wldev *dev, s8 tssi)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
s8 dbm = 0;
s32 tmp;
@@ -1906,174 +1744,189 @@ static s8 bcm43xx_phy_estimate_power_out
tmp -= phy->savedpctlreg;
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- tmp += 0x80;
- tmp = limit_value(tmp, 0x00, 0xFF);
- dbm = phy->tssi2dbm[tmp];
- TODO(); //TODO: There's a FIXME on the specs
- break;
case BCM43xx_PHYTYPE_B:
case BCM43xx_PHYTYPE_G:
tmp = limit_value(tmp, 0x00, 0x3F);
dbm = phy->tssi2dbm[tmp];
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
return dbm;
}
/* http://bcm-specs.sipsolutions.net/RecalculateTransmissionPower */
-void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm)
+void bcm43xx_phy_xmitpower(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
-
+ struct bcm43xx_phy *phy = &dev->phy;
+ u16 tmp;
+ u16 txpower;
+ s8 v0;
+ s8 v1;
+ s8 v2;
+ s8 v3;
+ s8 average;
+ int max_pwr;
+ s16 desired_pwr;
+ s16 estimated_pwr;
+ s16 pwr_adjust;
+ s16 radio_att_delta;
+ s16 baseband_att_delta;
+ s16 radio_attenuation;
+ s16 baseband_attenuation;
+ unsigned long phylock_flags;
+
if (phy->savedpctlreg == 0xFFFF)
return;
- if ((bcm->board_type == 0x0416) &&
- (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM))
+ if ((dev->dev->bus->boardinfo.type == 0x0416) &&
+ is_bcm_board_vendor(dev))
return;
-
- switch (phy->type) {
- case BCM43xx_PHYTYPE_A: {
-
- TODO(); //TODO: Nothing for A PHYs yet :-/
-
- break;
- }
- case BCM43xx_PHYTYPE_B:
- case BCM43xx_PHYTYPE_G: {
- u16 tmp;
- u16 txpower;
- s8 v0, v1, v2, v3;
- s8 average;
- u8 max_pwr;
- s16 desired_pwr, estimated_pwr, pwr_adjust;
- s16 radio_att_delta, baseband_att_delta;
- s16 radio_attenuation, baseband_attenuation;
- unsigned long phylock_flags;
+#ifdef CONFIG_BCM43XX_DEBUG
+ if (phy->manual_txpower_control)
+ return;
+#endif
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0058);
+ BCM43xx_BUG_ON(!(phy->type == BCM43xx_PHYTYPE_B ||
+ phy->type == BCM43xx_PHYTYPE_G));
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x0058);
+ v0 = (s8)(tmp & 0x00FF);
+ v1 = (s8)((tmp & 0xFF00) >> 8);
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x005A);
+ v2 = (s8)(tmp & 0x00FF);
+ v3 = (s8)((tmp & 0xFF00) >> 8);
+ tmp = 0;
+
+ if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F) {
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED,
+ 0x0070);
v0 = (s8)(tmp & 0x00FF);
v1 = (s8)((tmp & 0xFF00) >> 8);
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005A);
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED,
+ 0x0072);
v2 = (s8)(tmp & 0x00FF);
v3 = (s8)((tmp & 0xFF00) >> 8);
- tmp = 0;
-
- if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F) {
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0070);
- v0 = (s8)(tmp & 0x00FF);
- v1 = (s8)((tmp & 0xFF00) >> 8);
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0072);
- v2 = (s8)(tmp & 0x00FF);
- v3 = (s8)((tmp & 0xFF00) >> 8);
- if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F)
- return;
- v0 = (v0 + 0x20) & 0x3F;
- v1 = (v1 + 0x20) & 0x3F;
- v2 = (v2 + 0x20) & 0x3F;
- v3 = (v3 + 0x20) & 0x3F;
- tmp = 1;
- }
- bcm43xx_radio_clear_tssi(bcm);
-
- average = (v0 + v1 + v2 + v3 + 2) / 4;
-
- if (tmp && (bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x005E) & 0x8))
- average -= 13;
-
- estimated_pwr = bcm43xx_phy_estimate_power_out(bcm, average);
-
- max_pwr = bcm->sprom.maxpower_bgphy;
-
- if ((bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) &&
- (phy->type == BCM43xx_PHYTYPE_G))
- max_pwr -= 0x3;
-
- /*TODO:
- max_pwr = min(REG - bcm->sprom.antennagain_bgphy - 0x6, max_pwr)
- where REG is the max power as per the regulatory domain
- */
-
- desired_pwr = limit_value(radio->txpower_desired, 0, max_pwr);
- /* Check if we need to adjust the current power. */
- pwr_adjust = desired_pwr - estimated_pwr;
- radio_att_delta = -(pwr_adjust + 7) >> 3;
- baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
- if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
- bcm43xx_phy_lo_mark_current_used(bcm);
+ if (v0 == 0x7F || v1 == 0x7F || v2 == 0x7F || v3 == 0x7F)
return;
- }
+ v0 = (v0 + 0x20) & 0x3F;
+ v1 = (v1 + 0x20) & 0x3F;
+ v2 = (v2 + 0x20) & 0x3F;
+ v3 = (v3 + 0x20) & 0x3F;
+ tmp = 1;
+ }
+ bcm43xx_radio_clear_tssi(dev);
+
+ average = (v0 + v1 + v2 + v3 + 2) / 4;
+
+ if (tmp && (bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x005E)
+ & 0x8))
+ average -= 13;
+
+ estimated_pwr = bcm43xx_phy_estimate_power_out(dev, average);
+
+ max_pwr = dev->dev->bus->sprom.r1.maxpwr_bg;
+
+ if ((dev->dev->bus->sprom.r1.boardflags_lo
+ & BCM43xx_BFL_PACTRL) &&
+ (phy->type == BCM43xx_PHYTYPE_G))
+ max_pwr -= 0x3;
+ if (unlikely(max_pwr <= 0)) {
+ bcmwarn(dev->wl, "Invalid max-TX-power value in SPROM."
+ "\n");
+ max_pwr = 60; /* fake it */
+ dev->dev->bus->sprom.r1.maxpwr_bg = max_pwr;
+ }
+
+ /*TODO:
+ max_pwr = min(REG - dev->dev->bus->sprom.antennagain_bgphy
+ - 0x6, max_pwr)
+ where REG is the max power as per the regulatory domain
+ */
+
+ desired_pwr = limit_value(phy->power_level, 0, max_pwr);
+ if (bcm43xx_debug(dev, BCM43xx_DBG_XMITPOWER)) {
+ bcmdbg(dev->wl, "Current TX power output: " Q52_FMT
+ " dBm, Desired TX power output: " Q52_FMT
+ " dBm\n", Q52_ARG(estimated_pwr),
+ Q52_ARG(desired_pwr));
+ }
+ /* Check if we need to adjust the current power. */
+ pwr_adjust = desired_pwr - estimated_pwr;
+ radio_att_delta = -(pwr_adjust + 7) >> 3;
+ baseband_att_delta = -(pwr_adjust >> 1) - (4 * radio_att_delta);
+ if ((radio_att_delta == 0) && (baseband_att_delta == 0)) {
+ bcm43xx_phy_lo_mark_current_used(dev);
+ return;
+ }
- /* Calculate the new attenuation values. */
- baseband_attenuation = radio->baseband_atten;
- baseband_attenuation += baseband_att_delta;
- radio_attenuation = radio->radio_atten;
- radio_attenuation += radio_att_delta;
-
- /* Get baseband and radio attenuation values into their permitted ranges.
- * baseband 0-11, radio 0-9.
- * Radio attenuation affects power level 4 times as much as baseband.
- */
- if (radio_attenuation < 0) {
- baseband_attenuation -= (4 * -radio_attenuation);
- radio_attenuation = 0;
- } else if (radio_attenuation > 9) {
- baseband_attenuation += (4 * (radio_attenuation - 9));
- radio_attenuation = 9;
- } else {
- while (baseband_attenuation < 0 && radio_attenuation > 0) {
- baseband_attenuation += 4;
- radio_attenuation--;
- }
- while (baseband_attenuation > 11 && radio_attenuation < 9) {
- baseband_attenuation -= 4;
- radio_attenuation++;
+ /* Calculate the new attenuation values. */
+ baseband_attenuation = phy->bbatt;
+ baseband_attenuation += baseband_att_delta;
+ radio_attenuation = phy->rfatt;
+ radio_attenuation += radio_att_delta;
+
+ /* Get baseband and radio attenuation values into permitted ranges.
+ * baseband 0-11, radio 0-9.
+ * Radio attenuation affects power level 4 times as much as baseband.
+ */
+ if (radio_attenuation < 0) {
+ baseband_attenuation -= (4 * -radio_attenuation);
+ radio_attenuation = 0;
+ } else if (radio_attenuation > 9) {
+ baseband_attenuation += (4 * (radio_attenuation - 9));
+ radio_attenuation = 9;
+ } else {
+ while (baseband_attenuation < 0 && radio_attenuation > 0) {
+ baseband_attenuation += 4;
+ radio_attenuation--;
+ }
+ while (baseband_attenuation > 11 && radio_attenuation < 9) {
+ baseband_attenuation -= 4;
+ radio_attenuation++;
+ }
+ }
+ baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
+
+ txpower = phy->txctl1;
+ if ((phy->radio_ver == 0x2050) && (phy->radio_rev == 2)) {
+ if (radio_attenuation <= 1) {
+ if (txpower == 0) {
+ txpower = 3;
+ radio_attenuation += 2;
+ baseband_attenuation += 2;
+ } else if (dev->dev->bus->sprom.r1.boardflags_lo
+ & BCM43xx_BFL_PACTRL) {
+ baseband_attenuation += 4 *
+ (radio_attenuation - 2);
+ radio_attenuation = 2;
}
- }
- baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
-
- txpower = radio->txctl1;
- if ((radio->version == 0x2050) && (radio->revision == 2)) {
- if (radio_attenuation <= 1) {
- if (txpower == 0) {
- txpower = 3;
- radio_attenuation += 2;
- baseband_attenuation += 2;
- } else if (bcm->sprom.boardflags & BCM43xx_BFL_PACTRL) {
- baseband_attenuation += 4 * (radio_attenuation - 2);
- radio_attenuation = 2;
- }
- } else if (radio_attenuation > 4 && txpower != 0) {
- txpower = 0;
- if (baseband_attenuation < 3) {
- radio_attenuation -= 3;
- baseband_attenuation += 2;
- } else {
- radio_attenuation -= 2;
- baseband_attenuation -= 2;
- }
+ } else if (radio_attenuation > 4 && txpower != 0) {
+ txpower = 0;
+ if (baseband_attenuation < 3) {
+ radio_attenuation -= 3;
+ baseband_attenuation += 2;
+ } else {
+ radio_attenuation -= 2;
+ baseband_attenuation -= 2;
}
}
- radio->txctl1 = txpower;
- baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
- radio_attenuation = limit_value(radio_attenuation, 0, 9);
-
- bcm43xx_phy_lock(bcm, phylock_flags);
- bcm43xx_radio_lock(bcm);
- bcm43xx_radio_set_txpower_bg(bcm, baseband_attenuation,
- radio_attenuation, txpower);
- bcm43xx_phy_lo_mark_current_used(bcm);
- bcm43xx_radio_unlock(bcm);
- bcm43xx_phy_unlock(bcm, phylock_flags);
- break;
- }
- default:
- assert(0);
}
+ phy->txctl1 = txpower;
+ baseband_attenuation = limit_value(baseband_attenuation, 0, 11);
+ radio_attenuation = limit_value(radio_attenuation, 0, 9);
+
+ if (bcm43xx_debug(dev, BCM43xx_DBG_XMITPOWER)) {
+ bcmdbg(dev->wl, "Old and new values for bbatt: %d %d, "
+ "Old and new values for rfatt: %d %d\n", phy->bbatt,
+ baseband_attenuation, phy->rfatt, radio_attenuation);
+ }
+ bcm43xx_phy_lock(dev, phylock_flags);
+ bcm43xx_radio_lock(dev);
+ bcm43xx_radio_set_txpower_bg(dev, baseband_attenuation,
+ radio_attenuation, txpower);
+ bcm43xx_phy_lo_mark_current_used(dev);
+ bcm43xx_radio_unlock(dev);
+ bcm43xx_phy_unlock(dev, phylock_flags);
}
static inline
@@ -2090,7 +1943,7 @@ s8 bcm43xx_tssi2dbm_entry(s8 entry [], u
{
s32 m1, m2, f = 256, q, delta;
s8 i = 0;
-
+
m1 = bcm43xx_tssi2dbm_ad(16 * pab0 + index * pab1, 32);
m2 = max(bcm43xx_tssi2dbm_ad(32768 + index * pab2, 256), 1);
do {
@@ -2107,25 +1960,20 @@ s8 bcm43xx_tssi2dbm_entry(s8 entry [], u
}
/* http://bcm-specs.sipsolutions.net/TSSI_to_DBM_Table */
-int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm)
+int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
s16 pab0, pab1, pab2;
u8 idx;
s8 *dyn_tssi2dbm;
-
- if (phy->type == BCM43xx_PHYTYPE_A) {
- pab0 = (s16)(bcm->sprom.pa1b0);
- pab1 = (s16)(bcm->sprom.pa1b1);
- pab2 = (s16)(bcm->sprom.pa1b2);
- } else {
- pab0 = (s16)(bcm->sprom.pa0b0);
- pab1 = (s16)(bcm->sprom.pa0b1);
- pab2 = (s16)(bcm->sprom.pa0b2);
- }
- if ((bcm->chip_id == 0x4301) && (radio->version != 0x2050)) {
+ BCM43xx_WARN_ON(!(phy->type == BCM43xx_PHYTYPE_B ||
+ phy->type == BCM43xx_PHYTYPE_G));
+ pab0 = (s16)(dev->dev->bus->sprom.r1.pa0b0);
+ pab1 = (s16)(dev->dev->bus->sprom.r1.pa0b1);
+ pab2 = (s16)(dev->dev->bus->sprom.r1.pa0b2);
+
+ if ((dev->dev->bus->chip_id == 0x4301) && (phy->radio_ver != 0x2050)) {
phy->idle_tssi = 0x34;
phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
return 0;
@@ -2134,30 +1982,22 @@ int bcm43xx_phy_init_tssi2dbm_table(stru
if (pab0 != 0 && pab1 != 0 && pab2 != 0 &&
pab0 != -1 && pab1 != -1 && pab2 != -1) {
/* The pabX values are set in SPROM. Use them. */
- if (phy->type == BCM43xx_PHYTYPE_A) {
- if ((s8)bcm->sprom.idle_tssi_tgt_aphy != 0 &&
- (s8)bcm->sprom.idle_tssi_tgt_aphy != -1)
- phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_aphy);
- else
- phy->idle_tssi = 62;
- } else {
- if ((s8)bcm->sprom.idle_tssi_tgt_bgphy != 0 &&
- (s8)bcm->sprom.idle_tssi_tgt_bgphy != -1)
- phy->idle_tssi = (s8)(bcm->sprom.idle_tssi_tgt_bgphy);
- else
- phy->idle_tssi = 62;
- }
+ if ((s8)dev->dev->bus->sprom.r1.itssi_bg != 0 &&
+ (s8)dev->dev->bus->sprom.r1.itssi_bg != -1)
+ phy->idle_tssi = (s8)(dev->dev->bus->sprom.r1.itssi_bg);
+ else
+ phy->idle_tssi = 62;
dyn_tssi2dbm = kmalloc(64, GFP_KERNEL);
if (dyn_tssi2dbm == NULL) {
- printk(KERN_ERR PFX "Could not allocate memory"
- "for tssi2dbm table\n");
+ bcmerr(dev->wl, "Could not allocate memory"
+ "for tssi2dbm table\n");
return -ENOMEM;
}
for (idx = 0; idx < 64; idx++)
if (bcm43xx_tssi2dbm_entry(dyn_tssi2dbm, idx, pab0, pab1, pab2)) {
phy->tssi2dbm = NULL;
- printk(KERN_ERR PFX "Could not generate "
- "tssi2dBm table\n");
+ bcmerr(dev->wl, "Could not generate "
+ "tssi2dBm table\n");
kfree(dyn_tssi2dbm);
return -ENODEV;
}
@@ -2166,12 +2006,6 @@ int bcm43xx_phy_init_tssi2dbm_table(stru
} else {
/* pabX values not set in SPROM. */
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- /* APHY needs a generated table. */
- phy->tssi2dbm = NULL;
- printk(KERN_ERR PFX "Could not generate tssi2dBm "
- "table (wrong SPROM info)!\n");
- return -ENODEV;
case BCM43xx_PHYTYPE_B:
phy->idle_tssi = 0x34;
phy->tssi2dbm = bcm43xx_tssi2dbm_b_table;
@@ -2186,52 +2020,46 @@ int bcm43xx_phy_init_tssi2dbm_table(stru
return 0;
}
-int bcm43xx_phy_init(struct bcm43xx_private *bcm)
+int bcm43xx_phy_init(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
int err = -ENODEV;
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- if (phy->rev == 2 || phy->rev == 3) {
- bcm43xx_phy_inita(bcm);
- err = 0;
- }
- break;
case BCM43xx_PHYTYPE_B:
switch (phy->rev) {
case 2:
- bcm43xx_phy_initb2(bcm);
+ bcm43xx_phy_initb2(dev);
err = 0;
break;
case 4:
- bcm43xx_phy_initb4(bcm);
+ bcm43xx_phy_initb4(dev);
err = 0;
break;
case 5:
- bcm43xx_phy_initb5(bcm);
+ bcm43xx_phy_initb5(dev);
err = 0;
break;
case 6:
- bcm43xx_phy_initb6(bcm);
+ bcm43xx_phy_initb6(dev);
err = 0;
break;
}
break;
case BCM43xx_PHYTYPE_G:
- bcm43xx_phy_initg(bcm);
+ bcm43xx_phy_initg(dev);
err = 0;
break;
}
if (err)
- printk(KERN_WARNING PFX "Unknown PHYTYPE found!\n");
+ bcmerr(dev->wl, "Unknown PHYTYPE found\n");
return err;
}
-void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm)
+void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 antennadiv;
u16 offset;
u16 value;
@@ -2241,28 +2069,24 @@ void bcm43xx_phy_set_antenna_diversity(s
if (antennadiv == 0xFFFF)
antennadiv = 3;
- assert(antennadiv <= 3);
+ BCM43xx_WARN_ON(antennadiv > 3);
- ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+ ucodeflags = bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET);
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET,
ucodeflags & ~BCM43xx_UCODEFLAG_AUTODIV);
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
case BCM43xx_PHYTYPE_G:
- if (phy->type == BCM43xx_PHYTYPE_A)
- offset = 0x0000;
- else
- offset = 0x0400;
+ offset = 0x0400;
if (antennadiv == 2)
value = (3/*automatic*/ << 7);
else
value = (antennadiv << 7);
- bcm43xx_phy_write(bcm, offset + 1,
- (bcm43xx_phy_read(bcm, offset + 1)
+ bcm43xx_phy_write(dev, offset + 1,
+ (bcm43xx_phy_read(dev, offset + 1)
& 0x7E7F) | value);
if (antennadiv >= 2) {
@@ -2270,77 +2094,124 @@ void bcm43xx_phy_set_antenna_diversity(s
value = (antennadiv << 7);
else
value = (0/*force0*/ << 7);
- bcm43xx_phy_write(bcm, offset + 0x2B,
- (bcm43xx_phy_read(bcm, offset + 0x2B)
+ bcm43xx_phy_write(dev, offset + 0x2B,
+ (bcm43xx_phy_read(dev, offset + 0x2B)
& 0xFEFF) | value);
}
if (phy->type == BCM43xx_PHYTYPE_G) {
if (antennadiv >= 2)
- bcm43xx_phy_write(bcm, 0x048C,
- bcm43xx_phy_read(bcm, 0x048C)
+ bcm43xx_phy_write(dev, 0x048C,
+ bcm43xx_phy_read(dev, 0x048C)
| 0x2000);
else
- bcm43xx_phy_write(bcm, 0x048C,
- bcm43xx_phy_read(bcm, 0x048C)
+ bcm43xx_phy_write(dev, 0x048C,
+ bcm43xx_phy_read(dev, 0x048C)
& ~0x2000);
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x0461,
- bcm43xx_phy_read(bcm, 0x0461)
+ bcm43xx_phy_write(dev, 0x0461,
+ bcm43xx_phy_read(dev, 0x0461)
| 0x0010);
- bcm43xx_phy_write(bcm, 0x04AD,
- (bcm43xx_phy_read(bcm, 0x04AD)
+ bcm43xx_phy_write(dev, 0x04AD,
+ (bcm43xx_phy_read(dev, 0x04AD)
& 0x00FF) | 0x0015);
if (phy->rev == 2)
- bcm43xx_phy_write(bcm, 0x0427, 0x0008);
+ bcm43xx_phy_write(dev, 0x0427, 0x0008);
else
- bcm43xx_phy_write(bcm, 0x0427,
- (bcm43xx_phy_read(bcm, 0x0427)
+ bcm43xx_phy_write(dev, 0x0427,
+ (bcm43xx_phy_read(dev, 0x0427)
& 0x00FF) | 0x0008);
}
else if (phy->rev >= 6)
- bcm43xx_phy_write(bcm, 0x049B, 0x00DC);
+ bcm43xx_phy_write(dev, 0x049B, 0x00DC);
} else {
- if (phy->rev < 3)
- bcm43xx_phy_write(bcm, 0x002B,
- (bcm43xx_phy_read(bcm, 0x002B)
+ if (phy->rev < 3) {
+ bcm43xx_phy_write(dev, 0x002B,
+ (bcm43xx_phy_read(dev, 0x002B)
& 0x00FF) | 0x0024);
- else {
- bcm43xx_phy_write(bcm, 0x0061,
- bcm43xx_phy_read(bcm, 0x0061)
+ } else {
+ bcm43xx_phy_write(dev, 0x0061,
+ bcm43xx_phy_read(dev, 0x0061)
| 0x0010);
if (phy->rev == 3) {
- bcm43xx_phy_write(bcm, 0x0093, 0x001D);
- bcm43xx_phy_write(bcm, 0x0027, 0x0008);
+ bcm43xx_phy_write(dev, 0x0093, 0x001D);
+ bcm43xx_phy_write(dev, 0x0027, 0x0008);
} else {
- bcm43xx_phy_write(bcm, 0x0093, 0x003A);
- bcm43xx_phy_write(bcm, 0x0027,
- (bcm43xx_phy_read(bcm, 0x0027)
+ bcm43xx_phy_write(dev, 0x0093, 0x003A);
+ bcm43xx_phy_write(dev, 0x0027,
+ (bcm43xx_phy_read(dev, 0x0027)
& 0x00FF) | 0x0008);
}
}
}
break;
case BCM43xx_PHYTYPE_B:
- if (bcm->current_core->rev == 2)
+ if (dev->dev->id.revision == 2)
value = (3/*automatic*/ << 7);
else
value = (antennadiv << 7);
- bcm43xx_phy_write(bcm, 0x03E2,
- (bcm43xx_phy_read(bcm, 0x03E2)
+ bcm43xx_phy_write(dev, 0x03E2,
+ (bcm43xx_phy_read(dev, 0x03E2)
& 0xFE7F) | value);
break;
default:
- assert(0);
+ BCM43xx_WARN_ON(1);
}
if (antennadiv >= 2) {
- ucodeflags = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+ ucodeflags = bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET);
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET,
ucodeflags | BCM43xx_UCODEFLAG_AUTODIV);
}
phy->antenna_diversity = antennadiv;
}
+
+/* Set the PowerSavingControlBits.
+ * Bitvalues:
+ * 0 => unset the bit
+ * 1 => set the bit
+ * -1 => calculate the bit
+ */
+void bcm43xx_power_saving_ctl_bits(struct bcm43xx_wldev *dev,
+ int bit25, int bit26)
+{
+ int i;
+ u32 status;
+
+/* FIXME: Force 25 to off and 26 to on for now: */
+bit25 = 0;
+bit26 = 1;
+
+ if (bit25 == -1) {
+ /* TODO: If powersave is not off and FIXME is not set and we
+ * are not in adhoc and thus is not an AP and we arei
+ * associated, set bit 25 */
+ }
+ if (bit26 == -1) {
+ /* TODO: If the device is awake or this is an AP, or we are
+ * scanning, or FIXME, or we are associated, or FIXME,
+ * or the latest PS-Poll packet sent was successful,
+ * set bit26 */
+ }
+ status = bcm43xx_read32(dev, BCM43xx_MMIO_STATUS_BITFIELD);
+ if (bit25)
+ status |= BCM43xx_SBF_PS1;
+ else
+ status &= ~BCM43xx_SBF_PS1;
+ if (bit26)
+ status |= BCM43xx_SBF_PS2;
+ else
+ status &= ~BCM43xx_SBF_PS2;
+ bcm43xx_write32(dev, BCM43xx_MMIO_STATUS_BITFIELD, status);
+ if (bit26 && dev->dev->id.revision >= 5) {
+ for (i = 0; i < 100; i++) {
+ if (bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED, 0x0040)
+ != 4)
+ break;
+ udelay(10);
+ }
+ }
+}
Index: linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
===================================================================
--- linux-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
+++ linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_phy.h
@@ -7,6 +7,7 @@
Michael Buesch <mbuesch@xxxxxxxxxx>
Danny van Dyk <kugelfang@xxxxxxxxxx>
Andreas Jaggi <andreas.jaggi@xxxxxxxxxxxx>
+ Copyright (c) 2007 Larry Finger <Larry.Finger@xxxxxxxxxxxx>
Some parts of the code in this file are derived from the ipw2200
driver Copyright(c) 2003 - 2004 Intel Corporation.
@@ -33,15 +34,148 @@
#include <linux/types.h>
-struct bcm43xx_private;
+enum {
+ BCM43xx_ANTENNA0, /* Antenna 0 */
+ BCM43xx_ANTENNA1, /* Antenna 0 */
+ BCM43xx_ANTENNA_AUTO1, /* Automatic, starting with antenna 1 */
+ BCM43xx_ANTENNA_AUTO0, /* Automatic, starting with antenna 0 */
+
+ BCM43xx_ANTENNA_AUTO = BCM43xx_ANTENNA_AUTO0,
+ BCM43xx_ANTENNA_DEFAULT = BCM43xx_ANTENNA_AUTO,
+};
+
+enum {
+ BCM43xx_INTERFMODE_NONE,
+ BCM43xx_INTERFMODE_NONWLAN,
+ BCM43xx_INTERFMODE_MANUALWLAN,
+ BCM43xx_INTERFMODE_AUTOWLAN,
+};
+
+/*** PHY Registers ***/
+
+/* Routing */
+#define BCM43xx_PHYROUTE_OFDM_GPHY 0x400
+#define BCM43xx_PHYROUTE_EXT_GPHY 0x800
+
+/* Base registers. */
+#define BCM43xx_PHY_BASE(reg) (reg)
+/* OFDM (A) registers of a G-PHY */
+#define BCM43xx_PHY_OFDM(reg) ((reg) | BCM43xx_PHYROUTE_OFDM_GPHY)
+/* Extended G-PHY registers */
+#define BCM43xx_PHY_EXTG(reg) ((reg) | BCM43xx_PHYROUTE_EXT_GPHY)
+
+
+/* Extended G-PHY Registers */
+#define BCM43xx_PHY_CLASSCTL BCM43xx_PHY_EXTG(0x02) /* Classify control */
+#define BCM43xx_PHY_GTABCTL BCM43xx_PHY_EXTG(0x03) /* G-PHY table control (see below) */
+#define BCM43xx_PHY_GTABOFF 0x03FF /* G-PHY table offset (see below) */
+#define BCM43xx_PHY_GTABNR 0xFC00 /* G-PHY table number (see below) */
+#define BCM43xx_PHY_GTABNR_SHIFT 10
+#define BCM43xx_PHY_GTABDATA BCM43xx_PHY_EXTG(0x04) /* G-PHY table data */
+#define BCM43xx_PHY_LO_MASK BCM43xx_PHY_EXTG(0x0F) /* Local Oscillator control mask */
+#define BCM43xx_PHY_LO_CTL BCM43xx_PHY_EXTG(0x10) /* Local Oscillator control */
+#define BCM43xx_PHY_RFOVER BCM43xx_PHY_EXTG(0x11) /* RF override */
+#define BCM43xx_PHY_RFOVERVAL BCM43xx_PHY_EXTG(0x12) /* RF override value */
+/*** OFDM table numbers ***/
+#define BCM43xx_OFDMTAB(number, offset) (((number) << BCM43xx_PHY_OTABLENR_SHIFT) | (offset))
+#define BCM43xx_OFDMTAB_AGC1 BCM43xx_OFDMTAB(0x00, 0)
+#define BCM43xx_OFDMTAB_GAIN0 BCM43xx_OFDMTAB(0x00, 0)
+#define BCM43xx_OFDMTAB_GAINX BCM43xx_OFDMTAB(0x01, 0)
+#define BCM43xx_OFDMTAB_GAIN1 BCM43xx_OFDMTAB(0x01, 4)
+#define BCM43xx_OFDMTAB_AGC3 BCM43xx_OFDMTAB(0x02, 0)
+#define BCM43xx_OFDMTAB_GAIN2 BCM43xx_OFDMTAB(0x02, 3)
+#define BCM43xx_OFDMTAB_LNAHPFGAIN1 BCM43xx_OFDMTAB(0x03, 0)
+#define BCM43xx_OFDMTAB_WRSSI BCM43xx_OFDMTAB(0x04, 0)
+#define BCM43xx_OFDMTAB_LNAHPFGAIN2 BCM43xx_OFDMTAB(0x04, 0)
+#define BCM43xx_OFDMTAB_NOISESCALE BCM43xx_OFDMTAB(0x05, 0)
+#define BCM43xx_OFDMTAB_AGC2 BCM43xx_OFDMTAB(0x06, 0)
+#define BCM43xx_OFDMTAB_ROTOR BCM43xx_OFDMTAB(0x08, 0)
+#define BCM43xx_OFDMTAB_ADVRETARD BCM43xx_OFDMTAB(0x09, 0)
+#define BCM43xx_OFDMTAB_DAC BCM43xx_OFDMTAB(0x0C, 0)
+#define BCM43xx_OFDMTAB_DC BCM43xx_OFDMTAB(0x0E, 7)
+#define BCM43xx_OFDMTAB_PWRDYN2 BCM43xx_OFDMTAB(0x0E, 12)
+#define BCM43xx_OFDMTAB_LNAGAIN BCM43xx_OFDMTAB(0x0E, 13)
+
+#define BCM43xx_OFDMTAB_LPFGAIN BCM43xx_OFDMTAB(0x0F, 12)
+#define BCM43xx_OFDMTAB_RSSI BCM43xx_OFDMTAB(0x10, 0)
+
+#define BCM43xx_OFDMTAB_AGC1_R1 BCM43xx_OFDMTAB(0x13, 0)
+#define BCM43xx_OFDMTAB_GAINX_R1 BCM43xx_OFDMTAB(0x14, 0)
+#define BCM43xx_OFDMTAB_MINSIGSQ BCM43xx_OFDMTAB(0x14, 1)
+#define BCM43xx_OFDMTAB_AGC3_R1 BCM43xx_OFDMTAB(0x15, 0)
+#define BCM43xx_OFDMTAB_WRSSI_R1 BCM43xx_OFDMTAB(0x15, 4)
+#define BCM43xx_OFDMTAB_TSSI BCM43xx_OFDMTAB(0x15, 0)
+#define BCM43xx_OFDMTAB_DACRFPABB BCM43xx_OFDMTAB(0x16, 0)
+#define BCM43xx_OFDMTAB_DACOFF BCM43xx_OFDMTAB(0x17, 0)
+#define BCM43xx_OFDMTAB_DCBIAS BCM43xx_OFDMTAB(0x18, 0)
+
+void bcm43xx_put_attenuation_into_ranges(int *_bbatt, int *_rfatt);
+
+/* OFDM (A) PHY Registers */
+#define BCM43xx_PHY_VERSION_OFDM BCM43xx_PHY_OFDM(0x00) /* Versioning register for A-PHY */
+#define BCM43xx_PHY_BBANDCFG BCM43xx_PHY_OFDM(0x01) /* Baseband config */
+#define BCM43xx_PHY_BBANDCFG_RXANT 0x180 /* RX Antenna selection */
+#define BCM43xx_PHY_BBANDCFG_RXANT_SHIFT 7
+#define BCM43xx_PHY_PWRDOWN BCM43xx_PHY_OFDM(0x03) /* Powerdown */
+#define BCM43xx_PHY_CRSTHRES1 BCM43xx_PHY_OFDM(0x06) /* CRS Threshold 1 */
+#define BCM43xx_PHY_LNAHPFCTL BCM43xx_PHY_OFDM(0x1C) /* LNA/HPF control */
+#define BCM43xx_PHY_ADIVRELATED BCM43xx_PHY_OFDM(0x27) /* FIXME rename */
+#define BCM43xx_PHY_CRS0 BCM43xx_PHY_OFDM(0x29)
+#define BCM43xx_PHY_ANTDWELL BCM43xx_PHY_OFDM(0x2B) /* Antenna dwell */
+#define BCM43xx_PHY_ANTDWELL_AUTODIV1 0x0100 /* Automatic RX diversity start antenna */
+#define BCM43xx_PHY_ENCORE BCM43xx_PHY_OFDM(0x49) /* "Encore" (RangeMax / BroadRange) */
+#define BCM43xx_PHY_ENCORE_EN 0x0200 /* Encore enable */
+#define BCM43xx_PHY_LMS BCM43xx_PHY_OFDM(0x55)
+#define BCM43xx_PHY_OFDM61 BCM43xx_PHY_OFDM(0x61) /* FIXME rename */
+#define BCM43xx_PHY_OFDM61_10 0x0010 /* FIXME rename */
+#define BCM43xx_PHY_IQBAL BCM43xx_PHY_OFDM(0x69) /* I/Q balance */
+#define BCM43xx_PHY_OTABLECTL BCM43xx_PHY_OFDM(0x72) /* OFDM table control (see below) */
+#define BCM43xx_PHY_OTABLEOFF 0x03FF /* OFDM table offset (see below) */
+#define BCM43xx_PHY_OTABLENR 0xFC00 /* OFDM table number (see below) */
+#define BCM43xx_PHY_OTABLENR_SHIFT 10
+#define BCM43xx_PHY_OTABLEI BCM43xx_PHY_OFDM(0x73) /* OFDM table data I */
+#define BCM43xx_PHY_OTABLEQ BCM43xx_PHY_OFDM(0x74) /* OFDM table data Q */
+#define BCM43xx_PHY_HPWR_TSSICTL BCM43xx_PHY_OFDM(0x78) /* Hardware power TSSI control */
+#define BCM43xx_PHY_NRSSITHRES BCM43xx_PHY_OFDM(0x8A) /* NRSSI threshold */
+#define BCM43xx_PHY_ANTWRSETT BCM43xx_PHY_OFDM(0x8C) /* Antenna WR settle */
+#define BCM43xx_PHY_ANTWRSETT_ARXDIV 0x2000 /* Automatic RX diversity enabled */
+#define BCM43xx_PHY_CLIPPWRDOWNT BCM43xx_PHY_OFDM(0x93) /* Clip powerdown threshold */
+#define BCM43xx_PHY_OFDM9B BCM43xx_PHY_OFDM(0x9B) /* FIXME rename */
+#define BCM43xx_PHY_N1P1GAIN BCM43xx_PHY_OFDM(0xA0)
+#define BCM43xx_PHY_P1P2GAIN BCM43xx_PHY_OFDM(0xA1)
+#define BCM43xx_PHY_N1N2GAIN BCM43xx_PHY_OFDM(0xA2)
+#define BCM43xx_PHY_CLIPTHRES BCM43xx_PHY_OFDM(0xA3)
+#define BCM43xx_PHY_CLIPN1P2THRES BCM43xx_PHY_OFDM(0xA4)
+#define BCM43xx_PHY_DIVSRCHIDX BCM43xx_PHY_OFDM(0xA8) /* Divider search gain/index */
+#define BCM43xx_PHY_CLIPP2THRES BCM43xx_PHY_OFDM(0xA9)
+#define BCM43xx_PHY_CLIPP3THRES BCM43xx_PHY_OFDM(0xAA)
+#define BCM43xx_PHY_DIVP1P2GAIN BCM43xx_PHY_OFDM(0xAB)
+#define BCM43xx_PHY_DIVSRCHGAINBACK BCM43xx_PHY_OFDM(0xAD) /* Divider search gain back */
+#define BCM43xx_PHY_DIVSRCHGAINCHNG BCM43xx_PHY_OFDM(0xAE) /* Divider search gain change */
+#define BCM43xx_PHY_CRSTHRES1_R1 BCM43xx_PHY_OFDM(0xC0) /* CRS Threshold 1 (rev 1 only) */
+#define BCM43xx_PHY_CRSTHRES2_R1 BCM43xx_PHY_OFDM(0xC1) /* CRS Threshold 2 (rev 1 only) */
+#define BCM43xx_PHY_TSSIP_LTBASE BCM43xx_PHY_OFDM(0x380) /* TSSI power lookup table base */
+#define BCM43xx_PHY_DC_LTBASE BCM43xx_PHY_OFDM(0x3A0) /* DC lookup table base */
+#define BCM43xx_PHY_GAIN_LTBASE BCM43xx_PHY_OFDM(0x3C0) /* Gain lookup table base */
+
+void bcm43xx_put_attenuation_into_ranges(int *_bbatt, int *_rfatt);
+
+/* Masks for the different PHY versioning registers. */
+#define BCM43xx_PHYVER_ANALOG 0xF000
+#define BCM43xx_PHYVER_ANALOG_SHIFT 12
+#define BCM43xx_PHYVER_TYPE 0x0F00
+#define BCM43xx_PHYVER_TYPE_SHIFT 8
+#define BCM43xx_PHYVER_VERSION 0x00FF
-void bcm43xx_raw_phy_lock(struct bcm43xx_private *bcm);
+struct bcm43xx_wldev;
+
+void bcm43xx_raw_phy_lock(struct bcm43xx_wldev *dev);
#define bcm43xx_phy_lock(bcm, flags) \
do { \
local_irq_save(flags); \
bcm43xx_raw_phy_lock(bcm); \
} while (0)
-void bcm43xx_raw_phy_unlock(struct bcm43xx_private *bcm);
+void bcm43xx_raw_phy_unlock(struct bcm43xx_wldev *dev);
#define bcm43xx_phy_unlock(bcm, flags) \
do { \
bcm43xx_raw_phy_unlock(bcm); \
@@ -50,29 +184,34 @@ void bcm43xx_raw_phy_unlock(struct bcm43
/* Card uses the loopback gain stuff */
#define has_loopback_gain(phy) \
- (((phy)->rev > 1) || ((phy)->connected))
+ (((phy)->rev > 1) || ((phy)->gmode))
+
+u16 bcm43xx_phy_read(struct bcm43xx_wldev *dev, u16 offset);
+void bcm43xx_phy_write(struct bcm43xx_wldev *dev, u16 offset, u16 val);
-u16 bcm43xx_phy_read(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_phy_write(struct bcm43xx_private *bcm, u16 offset, u16 val);
+int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_wldev *dev);
+int bcm43xx_phy_init(struct bcm43xx_wldev *dev);
-int bcm43xx_phy_init_tssi2dbm_table(struct bcm43xx_private *bcm);
-int bcm43xx_phy_init(struct bcm43xx_private *bcm);
+void bcm43xx_set_rx_antenna(struct bcm43xx_wldev *dev, int antenna);
-void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_private *bcm);
-void bcm43xx_phy_calibrate(struct bcm43xx_private *bcm);
-int bcm43xx_phy_connect(struct bcm43xx_private *bcm, int connect);
+void bcm43xx_phy_set_antenna_diversity(struct bcm43xx_wldev *dev);
+void bcm43xx_phy_calibrate(struct bcm43xx_wldev *dev);
+int bcm43xx_phy_connect(struct bcm43xx_wldev *dev, int connect);
-void bcm43xx_phy_lo_b_measure(struct bcm43xx_private *bcm);
-void bcm43xx_phy_lo_g_measure(struct bcm43xx_private *bcm);
-void bcm43xx_phy_xmitpower(struct bcm43xx_private *bcm);
+void bcm43xx_phy_lo_b_measure(struct bcm43xx_wldev *dev);
+void bcm43xx_phy_lo_g_measure(struct bcm43xx_wldev *dev);
+void bcm43xx_phy_xmitpower(struct bcm43xx_wldev *dev);
/* Adjust the LocalOscillator to the saved values.
* "fixed" is only set to 1 once in initialization. Set to 0 otherwise.
*/
-void bcm43xx_phy_lo_adjust(struct bcm43xx_private *bcm, int fixed);
-void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_private *bcm);
+void bcm43xx_phy_lo_adjust(struct bcm43xx_wldev *dev, int fixed);
+void bcm43xx_phy_lo_mark_all_unused(struct bcm43xx_wldev *dev);
-void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_private *bcm,
+void bcm43xx_phy_set_baseband_attenuation(struct bcm43xx_wldev *dev,
u16 baseband_attenuation);
+void bcm43xx_power_saving_ctl_bits(struct bcm43xx_wldev *dev,
+ int bit25, int bit26);
+
#endif /* BCM43xx_PHY_H_ */
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
