This if file 8 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_radio.c
===================================================================
--- linux-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_radio.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.
@@ -52,7 +53,7 @@ static u16 flip_4bit(u16 value)
{
u16 flipped = 0x0000;
- assert((value & ~0x000F) == 0x0000);
+ BCM43xx_BUG_ON(!((value & ~0x000F) == 0x0000));
flipped |= (value & 0x0001) << 3;
flipped |= (value & 0x0002) << 1;
@@ -76,82 +77,77 @@ u16 channel2freq_bg(u8 channel)
72, 84,
};
- assert(channel >= 1 && channel <= 14);
+ if (unlikely(channel < 1 || channel > 14)) {
+ printk(KERN_INFO "bcm43xx: Channel %d is out of range\n",
+ channel);
+ dump_stack();
+ return 2412;
+ }
return frequencies_bg[channel - 1];
}
-/* Get the freq, as it has to be written to the device. */
-static inline
-u16 channel2freq_a(u8 channel)
-{
- assert(channel <= 200);
-
- return (5000 + 5 * channel);
-}
-
-void bcm43xx_radio_lock(struct bcm43xx_private *bcm)
+void bcm43xx_radio_lock(struct bcm43xx_wldev *dev)
{
u32 status;
- status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+ status = bcm43xx_read32(dev, BCM43xx_MMIO_STATUS_BITFIELD);
status |= BCM43xx_SBF_RADIOREG_LOCK;
- bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+ bcm43xx_write32(dev, BCM43xx_MMIO_STATUS_BITFIELD, status);
mmiowb();
udelay(10);
}
-void bcm43xx_radio_unlock(struct bcm43xx_private *bcm)
+void bcm43xx_radio_unlock(struct bcm43xx_wldev *dev)
{
u32 status;
- bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_VER); /* dummy read */
- status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD);
+ bcm43xx_read16(dev, BCM43xx_MMIO_PHY_VER); /* dummy read */
+ status = bcm43xx_read32(dev, BCM43xx_MMIO_STATUS_BITFIELD);
status &= ~BCM43xx_SBF_RADIOREG_LOCK;
- bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, status);
+ bcm43xx_write32(dev, BCM43xx_MMIO_STATUS_BITFIELD, status);
mmiowb();
}
-u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset)
+u16 bcm43xx_radio_read16(struct bcm43xx_wldev *dev, u16 offset)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- offset |= 0x0040;
- break;
case BCM43xx_PHYTYPE_B:
- if (radio->version == 0x2053) {
+ if (phy->radio_ver == 0x2053) {
if (offset < 0x70)
offset += 0x80;
else if (offset < 0x80)
offset += 0x70;
- } else if (radio->version == 0x2050) {
+ } else if (phy->radio_ver == 0x2050) {
offset |= 0x80;
- } else
- assert(0);
+ } else {
+ BCM43xx_WARN_ON(1);
+ }
break;
case BCM43xx_PHYTYPE_G:
offset |= 0x80;
break;
+ default:
+ BCM43xx_BUG_ON(1);
}
- bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
- return bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW);
+ bcm43xx_write16(dev, BCM43xx_MMIO_RADIO_CONTROL, offset);
+ return bcm43xx_read16(dev, BCM43xx_MMIO_RADIO_DATA_LOW);
}
-void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val)
+void bcm43xx_radio_write16(struct bcm43xx_wldev *dev, u16 offset, u16 val)
{
- bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_CONTROL, offset);
+ bcm43xx_write16(dev, BCM43xx_MMIO_RADIO_CONTROL, offset);
mmiowb();
- bcm43xx_write16(bcm, BCM43xx_MMIO_RADIO_DATA_LOW, val);
+ bcm43xx_write16(dev, BCM43xx_MMIO_RADIO_DATA_LOW, val);
}
-static void bcm43xx_set_all_gains(struct bcm43xx_private *bcm,
+static void bcm43xx_set_all_gains(struct bcm43xx_wldev *dev,
s16 first, s16 second, s16 third)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 i;
u16 start = 0x08, end = 0x18;
u16 offset = 0x0400;
@@ -164,26 +160,29 @@ static void bcm43xx_set_all_gains(struct
}
for (i = 0; i < 4; i++)
- bcm43xx_ilt_write(bcm, offset + i, first);
+ bcm43xx_ilt_write(dev, offset + i, first);
for (i = start; i < end; i++)
- bcm43xx_ilt_write(bcm, offset + i, second);
+ bcm43xx_ilt_write(dev, offset + i, second);
if (third != -1) {
tmp = ((u16)third << 14) | ((u16)third << 6);
- bcm43xx_phy_write(bcm, 0x04A0,
- (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | tmp);
- bcm43xx_phy_write(bcm, 0x04A1,
- (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | tmp);
- bcm43xx_phy_write(bcm, 0x04A2,
- (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | tmp);
+ bcm43xx_phy_write(dev, 0x04A0,
+ (bcm43xx_phy_read(dev, 0x04A0) & 0xBFBF)
+ | tmp);
+ bcm43xx_phy_write(dev, 0x04A1,
+ (bcm43xx_phy_read(dev, 0x04A1) & 0xBFBF)
+ | tmp);
+ bcm43xx_phy_write(dev, 0x04A2,
+ (bcm43xx_phy_read(dev, 0x04A2) & 0xBFBF)
+ | tmp);
}
- bcm43xx_dummy_transmission(bcm);
+ bcm43xx_dummy_transmission(dev);
}
-static void bcm43xx_set_original_gains(struct bcm43xx_private *bcm)
+static void bcm43xx_set_original_gains(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 i, tmp;
u16 offset = 0x0400;
u16 start = 0x0008, end = 0x0018;
@@ -199,62 +198,63 @@ static void bcm43xx_set_original_gains(s
tmp |= (i & 0x0001) << 1;
tmp |= (i & 0x0002) >> 1;
- bcm43xx_ilt_write(bcm, offset + i, tmp);
+ bcm43xx_ilt_write(dev, offset + i, tmp);
}
for (i = start; i < end; i++)
- bcm43xx_ilt_write(bcm, offset + i, i - start);
+ bcm43xx_ilt_write(dev, offset + i, i - start);
- bcm43xx_phy_write(bcm, 0x04A0,
- (bcm43xx_phy_read(bcm, 0x04A0) & 0xBFBF) | 0x4040);
- bcm43xx_phy_write(bcm, 0x04A1,
- (bcm43xx_phy_read(bcm, 0x04A1) & 0xBFBF) | 0x4040);
- bcm43xx_phy_write(bcm, 0x04A2,
- (bcm43xx_phy_read(bcm, 0x04A2) & 0xBFBF) | 0x4000);
- bcm43xx_dummy_transmission(bcm);
+ bcm43xx_phy_write(dev, 0x04A0,
+ (bcm43xx_phy_read(dev, 0x04A0) & 0xBFBF) | 0x4040);
+ bcm43xx_phy_write(dev, 0x04A1,
+ (bcm43xx_phy_read(dev, 0x04A1) & 0xBFBF) | 0x4040);
+ bcm43xx_phy_write(dev, 0x04A2,
+ (bcm43xx_phy_read(dev, 0x04A2) & 0xBFBF) | 0x4000);
+ bcm43xx_dummy_transmission(dev);
}
/* Synthetic PU workaround */
-static void bcm43xx_synth_pu_workaround(struct bcm43xx_private *bcm, u8 channel)
+static void bcm43xx_synth_pu_workaround(struct bcm43xx_wldev *dev, u8 channel)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
-
- if (radio->version != 0x2050 || radio->revision >= 6) {
+ struct bcm43xx_phy *phy = &dev->phy;
+
+ might_sleep();
+
+ if (phy->radio_ver != 0x2050 || phy->radio_rev >= 6)
/* We do not need the workaround. */
return;
- }
if (channel <= 10) {
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL,
channel2freq_bg(channel + 4));
} else {
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL,
channel2freq_bg(1));
}
- udelay(100);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
+ msleep(1);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL,
channel2freq_bg(channel));
}
-u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel)
+u8 bcm43xx_radio_aci_detect(struct bcm43xx_wldev *dev, u8 channel)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u8 ret = 0;
u16 saved, rssi, temp;
int i, j = 0;
- saved = bcm43xx_phy_read(bcm, 0x0403);
- bcm43xx_radio_selectchannel(bcm, channel, 0);
- bcm43xx_phy_write(bcm, 0x0403, (saved & 0xFFF8) | 5);
- if (radio->aci_hw_rssi)
- rssi = bcm43xx_phy_read(bcm, 0x048A) & 0x3F;
+ saved = bcm43xx_phy_read(dev, 0x0403);
+ bcm43xx_radio_selectchannel(dev, channel, 0);
+ bcm43xx_phy_write(dev, 0x0403, (saved & 0xFFF8) | 5);
+ if (phy->aci_hw_rssi)
+ rssi = bcm43xx_phy_read(dev, 0x048A) & 0x3F;
else
rssi = saved & 0x3F;
/* clamp temp to signed 5bit */
if (rssi > 32)
rssi -= 64;
for (i = 0;i < 100; i++) {
- temp = (bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x3F;
+ temp = (bcm43xx_phy_read(dev, 0x047F) >> 8) & 0x3F;
if (temp > 32)
temp -= 64;
if (temp < rssi)
@@ -262,46 +262,45 @@ u8 bcm43xx_radio_aci_detect(struct bcm43
if (j >= 20)
ret = 1;
}
- bcm43xx_phy_write(bcm, 0x0403, saved);
+ bcm43xx_phy_write(dev, 0x0403, saved);
return ret;
}
-u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm)
+u8 bcm43xx_radio_aci_scan(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;
u8 ret[13];
- unsigned int channel = radio->channel;
+ unsigned int channel = phy->channel;
unsigned int i, j, start, end;
unsigned long phylock_flags;
if (!((phy->type == BCM43xx_PHYTYPE_G) && (phy->rev > 0)))
return 0;
- bcm43xx_phy_lock(bcm, phylock_flags);
- bcm43xx_radio_lock(bcm);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
- bcm43xx_set_all_gains(bcm, 3, 8, 1);
+ bcm43xx_phy_lock(dev, phylock_flags);
+ bcm43xx_radio_lock(dev);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) & 0xFFFC);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS) & 0x7FFF);
+ bcm43xx_set_all_gains(dev, 3, 8, 1);
start = (channel - 5 > 0) ? channel - 5 : 1;
end = (channel + 5 < 14) ? channel + 5 : 13;
for (i = start; i <= end; i++) {
if (abs(channel - i) > 2)
- ret[i-1] = bcm43xx_radio_aci_detect(bcm, i);
+ ret[i-1] = bcm43xx_radio_aci_detect(dev, i);
}
- bcm43xx_radio_selectchannel(bcm, channel, 0);
- bcm43xx_phy_write(bcm, 0x0802,
- (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC) | 0x0003);
- bcm43xx_phy_write(bcm, 0x0403,
- bcm43xx_phy_read(bcm, 0x0403) & 0xFFF8);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
- bcm43xx_set_original_gains(bcm);
+ bcm43xx_radio_selectchannel(dev, channel, 0);
+ bcm43xx_phy_write(dev, 0x0802,
+ (bcm43xx_phy_read(dev, 0x0802) & 0xFFFC) | 0x0003);
+ bcm43xx_phy_write(dev, 0x0403,
+ bcm43xx_phy_read(dev, 0x0403) & 0xFFF8);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS) | 0x8000);
+ bcm43xx_set_original_gains(dev);
for (i = 0; i < 13; i++) {
if (!ret[i])
continue;
@@ -309,130 +308,131 @@ u8 bcm43xx_radio_aci_scan(struct bcm43xx
for (j = i; j < end; j++)
ret[j] = 1;
}
- bcm43xx_radio_unlock(bcm);
- bcm43xx_phy_unlock(bcm, phylock_flags);
+ bcm43xx_radio_unlock(dev);
+ bcm43xx_phy_unlock(dev, phylock_flags);
return ret[channel - 1];
}
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val)
+void bcm43xx_nrssi_hw_write(struct bcm43xx_wldev *dev, u16 offset, s16 val)
{
- bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_NRSSILT_CTRL, offset);
mmiowb();
- bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_DATA, (u16)val);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_NRSSILT_DATA, (u16)val);
}
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset)
+s16 bcm43xx_nrssi_hw_read(struct bcm43xx_wldev *dev, u16 offset)
{
u16 val;
- bcm43xx_phy_write(bcm, BCM43xx_PHY_NRSSILT_CTRL, offset);
- val = bcm43xx_phy_read(bcm, BCM43xx_PHY_NRSSILT_DATA);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_NRSSILT_CTRL, offset);
+ val = bcm43xx_phy_read(dev, BCM43xx_PHY_NRSSILT_DATA);
return (s16)val;
}
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val)
+void bcm43xx_nrssi_hw_update(struct bcm43xx_wldev *dev, u16 val)
{
u16 i;
s16 tmp;
for (i = 0; i < 64; i++) {
- tmp = bcm43xx_nrssi_hw_read(bcm, i);
+ tmp = bcm43xx_nrssi_hw_read(dev, i);
tmp -= val;
tmp = limit_value(tmp, -32, 31);
- bcm43xx_nrssi_hw_write(bcm, i, tmp);
+ bcm43xx_nrssi_hw_write(dev, i, tmp);
}
}
/* http://bcm-specs.sipsolutions.net/NRSSILookupTable */
-void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm)
+void bcm43xx_nrssi_mem_update(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
s16 i, delta;
s32 tmp;
- delta = 0x1F - radio->nrssi[0];
+ delta = 0x1F - phy->nrssi[0];
for (i = 0; i < 64; i++) {
- tmp = (i - delta) * radio->nrssislope;
+ tmp = (i - delta) * phy->nrssislope;
tmp /= 0x10000;
tmp += 0x3A;
tmp = limit_value(tmp, 0, 0x3F);
- radio->nrssi_lt[i] = tmp;
+ phy->nrssi_lt[i] = tmp;
}
}
-static void bcm43xx_calc_nrssi_offset(struct bcm43xx_private *bcm)
+static void bcm43xx_calc_nrssi_offset(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 backup[20] = { 0 };
s16 v47F;
u16 i;
u16 saved = 0xFFFF;
- backup[0] = bcm43xx_phy_read(bcm, 0x0001);
- backup[1] = bcm43xx_phy_read(bcm, 0x0811);
- backup[2] = bcm43xx_phy_read(bcm, 0x0812);
- backup[3] = bcm43xx_phy_read(bcm, 0x0814);
- backup[4] = bcm43xx_phy_read(bcm, 0x0815);
- backup[5] = bcm43xx_phy_read(bcm, 0x005A);
- backup[6] = bcm43xx_phy_read(bcm, 0x0059);
- backup[7] = bcm43xx_phy_read(bcm, 0x0058);
- backup[8] = bcm43xx_phy_read(bcm, 0x000A);
- backup[9] = bcm43xx_phy_read(bcm, 0x0003);
- backup[10] = bcm43xx_radio_read16(bcm, 0x007A);
- backup[11] = bcm43xx_radio_read16(bcm, 0x0043);
-
- bcm43xx_phy_write(bcm, 0x0429,
- bcm43xx_phy_read(bcm, 0x0429) & 0x7FFF);
- bcm43xx_phy_write(bcm, 0x0001,
- (bcm43xx_phy_read(bcm, 0x0001) & 0x3FFF) | 0x4000);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812) & 0xFFF3) | 0x0004);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) & ~(0x1 | 0x2));
+ backup[0] = bcm43xx_phy_read(dev, 0x0001);
+ backup[1] = bcm43xx_phy_read(dev, 0x0811);
+ backup[2] = bcm43xx_phy_read(dev, 0x0812);
+ backup[3] = bcm43xx_phy_read(dev, 0x0814);
+ backup[4] = bcm43xx_phy_read(dev, 0x0815);
+ backup[5] = bcm43xx_phy_read(dev, 0x005A);
+ backup[6] = bcm43xx_phy_read(dev, 0x0059);
+ backup[7] = bcm43xx_phy_read(dev, 0x0058);
+ backup[8] = bcm43xx_phy_read(dev, 0x000A);
+ backup[9] = bcm43xx_phy_read(dev, 0x0003);
+ backup[10] = bcm43xx_radio_read16(dev, 0x007A);
+ backup[11] = bcm43xx_radio_read16(dev, 0x0043);
+
+ bcm43xx_phy_write(dev, 0x0429,
+ bcm43xx_phy_read(dev, 0x0429) & 0x7FFF);
+ bcm43xx_phy_write(dev, 0x0001,
+ (bcm43xx_phy_read(dev, 0x0001) & 0x3FFF) | 0x4000);
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x000C);
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812) & 0xFFF3) | 0x0004);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) & ~(0x1 | 0x2));
if (phy->rev >= 6) {
- backup[12] = bcm43xx_phy_read(bcm, 0x002E);
- backup[13] = bcm43xx_phy_read(bcm, 0x002F);
- backup[14] = bcm43xx_phy_read(bcm, 0x080F);
- backup[15] = bcm43xx_phy_read(bcm, 0x0810);
- backup[16] = bcm43xx_phy_read(bcm, 0x0801);
- backup[17] = bcm43xx_phy_read(bcm, 0x0060);
- backup[18] = bcm43xx_phy_read(bcm, 0x0014);
- backup[19] = bcm43xx_phy_read(bcm, 0x0478);
-
- bcm43xx_phy_write(bcm, 0x002E, 0);
- bcm43xx_phy_write(bcm, 0x002F, 0);
- bcm43xx_phy_write(bcm, 0x080F, 0);
- bcm43xx_phy_write(bcm, 0x0810, 0);
- bcm43xx_phy_write(bcm, 0x0478,
- bcm43xx_phy_read(bcm, 0x0478) | 0x0100);
- bcm43xx_phy_write(bcm, 0x0801,
- bcm43xx_phy_read(bcm, 0x0801) | 0x0040);
- bcm43xx_phy_write(bcm, 0x0060,
- bcm43xx_phy_read(bcm, 0x0060) | 0x0040);
- bcm43xx_phy_write(bcm, 0x0014,
- bcm43xx_phy_read(bcm, 0x0014) | 0x0200);
- }
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
+ backup[12] = bcm43xx_phy_read(dev, 0x002E);
+ backup[13] = bcm43xx_phy_read(dev, 0x002F);
+ backup[14] = bcm43xx_phy_read(dev, 0x080F);
+ backup[15] = bcm43xx_phy_read(dev, 0x0810);
+ backup[16] = bcm43xx_phy_read(dev, 0x0801);
+ backup[17] = bcm43xx_phy_read(dev, 0x0060);
+ backup[18] = bcm43xx_phy_read(dev, 0x0014);
+ backup[19] = bcm43xx_phy_read(dev, 0x0478);
+
+ bcm43xx_phy_write(dev, 0x002E, 0);
+ bcm43xx_phy_write(dev, 0x002F, 0);
+ bcm43xx_phy_write(dev, 0x080F, 0);
+ bcm43xx_phy_write(dev, 0x0810, 0);
+ bcm43xx_phy_write(dev, 0x0478,
+ bcm43xx_phy_read(dev, 0x0478) | 0x0100);
+ bcm43xx_phy_write(dev, 0x0801,
+ bcm43xx_phy_read(dev, 0x0801) | 0x0040);
+ bcm43xx_phy_write(dev, 0x0060,
+ bcm43xx_phy_read(dev, 0x0060) | 0x0040);
+ bcm43xx_phy_write(dev, 0x0014,
+ bcm43xx_phy_read(dev, 0x0014) | 0x0200);
+ }
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A) | 0x0070);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A) | 0x0080);
udelay(30);
- v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ v47F = (s16)((bcm43xx_phy_read(dev, 0x047F) >> 8) & 0x003F);
if (v47F >= 0x20)
v47F -= 0x40;
if (v47F == 31) {
for (i = 7; i >= 4; i--) {
- bcm43xx_radio_write16(bcm, 0x007B, i);
+ bcm43xx_radio_write16(dev, 0x007B, i);
udelay(20);
- v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ v47F = (s16)((bcm43xx_phy_read(dev, 0x047F) >> 8)
+ & 0x003F);
if (v47F >= 0x20)
v47F -= 0x40;
if (v47F < 31 && saved == 0xFFFF)
@@ -441,52 +441,56 @@ static void bcm43xx_calc_nrssi_offset(st
if (saved == 0xFFFF)
saved = 4;
} else {
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
- 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, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x000C);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) | 0x000C);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) | 0x0030);
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) | 0x0030);
- bcm43xx_phy_write(bcm, 0x005A, 0x0480);
- bcm43xx_phy_write(bcm, 0x0059, 0x0810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ & 0x007F);
+ 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, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x000C);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) | 0x000C);
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811) | 0x0030);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812) | 0x0030);
+ bcm43xx_phy_write(dev, 0x005A, 0x0480);
+ bcm43xx_phy_write(dev, 0x0059, 0x0810);
+ 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);
}
- 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(bcm, 0x0003,
- (bcm43xx_phy_read(bcm, 0x0003) & 0xFF9F)
+ 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(dev, 0x0003,
+ (bcm43xx_phy_read(dev, 0x0003) & 0xFF9F)
| 0x0040);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
- bcm43xx_set_all_gains(bcm, 3, 0, 1);
- bcm43xx_radio_write16(bcm, 0x0043,
- (bcm43xx_radio_read16(bcm, 0x0043)
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ | 0x000F);
+ bcm43xx_set_all_gains(dev, 3, 0, 1);
+ bcm43xx_radio_write16(dev, 0x0043,
+ (bcm43xx_radio_read16(dev, 0x0043)
& 0x00F0) | 0x000F);
udelay(30);
- v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ v47F = (s16)((bcm43xx_phy_read(dev, 0x047F) >> 8) & 0x003F);
if (v47F >= 0x20)
v47F -= 0x40;
if (v47F == -32) {
for (i = 0; i < 4; i++) {
- bcm43xx_radio_write16(bcm, 0x007B, i);
+ bcm43xx_radio_write16(dev, 0x007B, i);
udelay(20);
- v47F = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ v47F = (s16)((bcm43xx_phy_read(dev,
+ 0x047F) >> 8)
+ & 0x003F);
if (v47F >= 0x20)
v47F -= 0x40;
if (v47F > -31 && saved == 0xFFFF)
@@ -494,294 +498,312 @@ static void bcm43xx_calc_nrssi_offset(st
}
if (saved == 0xFFFF)
saved = 3;
- } else
+ } else {
saved = 0;
+ }
}
- bcm43xx_radio_write16(bcm, 0x007B, saved);
+ bcm43xx_radio_write16(dev, 0x007B, saved);
if (phy->rev >= 6) {
- bcm43xx_phy_write(bcm, 0x002E, backup[12]);
- bcm43xx_phy_write(bcm, 0x002F, backup[13]);
- bcm43xx_phy_write(bcm, 0x080F, backup[14]);
- bcm43xx_phy_write(bcm, 0x0810, backup[15]);
- }
- bcm43xx_phy_write(bcm, 0x0814, backup[3]);
- bcm43xx_phy_write(bcm, 0x0815, backup[4]);
- bcm43xx_phy_write(bcm, 0x005A, backup[5]);
- bcm43xx_phy_write(bcm, 0x0059, backup[6]);
- bcm43xx_phy_write(bcm, 0x0058, backup[7]);
- bcm43xx_phy_write(bcm, 0x000A, backup[8]);
- bcm43xx_phy_write(bcm, 0x0003, backup[9]);
- bcm43xx_radio_write16(bcm, 0x0043, backup[11]);
- bcm43xx_radio_write16(bcm, 0x007A, backup[10]);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) | 0x1 | 0x2);
- bcm43xx_phy_write(bcm, 0x0429,
- bcm43xx_phy_read(bcm, 0x0429) | 0x8000);
- bcm43xx_set_original_gains(bcm);
+ bcm43xx_phy_write(dev, 0x002E, backup[12]);
+ bcm43xx_phy_write(dev, 0x002F, backup[13]);
+ bcm43xx_phy_write(dev, 0x080F, backup[14]);
+ bcm43xx_phy_write(dev, 0x0810, backup[15]);
+ }
+ bcm43xx_phy_write(dev, 0x0814, backup[3]);
+ bcm43xx_phy_write(dev, 0x0815, backup[4]);
+ bcm43xx_phy_write(dev, 0x005A, backup[5]);
+ bcm43xx_phy_write(dev, 0x0059, backup[6]);
+ bcm43xx_phy_write(dev, 0x0058, backup[7]);
+ bcm43xx_phy_write(dev, 0x000A, backup[8]);
+ bcm43xx_phy_write(dev, 0x0003, backup[9]);
+ bcm43xx_radio_write16(dev, 0x0043, backup[11]);
+ bcm43xx_radio_write16(dev, 0x007A, backup[10]);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) | 0x1 | 0x2);
+ bcm43xx_phy_write(dev, 0x0429,
+ bcm43xx_phy_read(dev, 0x0429) | 0x8000);
+ bcm43xx_set_original_gains(dev);
if (phy->rev >= 6) {
- bcm43xx_phy_write(bcm, 0x0801, backup[16]);
- bcm43xx_phy_write(bcm, 0x0060, backup[17]);
- bcm43xx_phy_write(bcm, 0x0014, backup[18]);
- bcm43xx_phy_write(bcm, 0x0478, backup[19]);
+ bcm43xx_phy_write(dev, 0x0801, backup[16]);
+ bcm43xx_phy_write(dev, 0x0060, backup[17]);
+ bcm43xx_phy_write(dev, 0x0014, backup[18]);
+ bcm43xx_phy_write(dev, 0x0478, backup[19]);
}
- bcm43xx_phy_write(bcm, 0x0001, backup[0]);
- bcm43xx_phy_write(bcm, 0x0812, backup[2]);
- bcm43xx_phy_write(bcm, 0x0811, backup[1]);
+ bcm43xx_phy_write(dev, 0x0001, backup[0]);
+ bcm43xx_phy_write(dev, 0x0812, backup[2]);
+ bcm43xx_phy_write(dev, 0x0811, backup[1]);
}
-void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm)
+void bcm43xx_calc_nrssi_slope(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[18] = { 0 };
u16 tmp;
s16 nrssi0, nrssi1;
switch (phy->type) {
case BCM43xx_PHYTYPE_B:
- backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
- backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
- backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
- backup[3] = bcm43xx_phy_read(bcm, 0x0030);
- backup[4] = bcm43xx_phy_read(bcm, 0x0026);
- backup[5] = bcm43xx_phy_read(bcm, 0x0015);
- backup[6] = bcm43xx_phy_read(bcm, 0x002A);
- backup[7] = bcm43xx_phy_read(bcm, 0x0020);
- backup[8] = bcm43xx_phy_read(bcm, 0x005A);
- backup[9] = bcm43xx_phy_read(bcm, 0x0059);
- backup[10] = bcm43xx_phy_read(bcm, 0x0058);
- backup[11] = bcm43xx_read16(bcm, 0x03E2);
- backup[12] = bcm43xx_read16(bcm, 0x03E6);
- backup[13] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+ backup[0] = bcm43xx_radio_read16(dev, 0x007A);
+ backup[1] = bcm43xx_radio_read16(dev, 0x0052);
+ backup[2] = bcm43xx_radio_read16(dev, 0x0043);
+ backup[3] = bcm43xx_phy_read(dev, 0x0030);
+ backup[4] = bcm43xx_phy_read(dev, 0x0026);
+ backup[5] = bcm43xx_phy_read(dev, 0x0015);
+ backup[6] = bcm43xx_phy_read(dev, 0x002A);
+ backup[7] = bcm43xx_phy_read(dev, 0x0020);
+ backup[8] = bcm43xx_phy_read(dev, 0x005A);
+ backup[9] = bcm43xx_phy_read(dev, 0x0059);
+ backup[10] = bcm43xx_phy_read(dev, 0x0058);
+ backup[11] = bcm43xx_read16(dev, 0x03E2);
+ backup[12] = bcm43xx_read16(dev, 0x03E6);
+ backup[13] = bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT);
- tmp = bcm43xx_radio_read16(bcm, 0x007A);
+ tmp = bcm43xx_radio_read16(dev, 0x007A);
tmp &= (phy->rev >= 5) ? 0x007F : 0x000F;
- bcm43xx_radio_write16(bcm, 0x007A, tmp);
- bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
- bcm43xx_write16(bcm, 0x03EC, 0x7F7F);
- bcm43xx_phy_write(bcm, 0x0026, 0x0000);
- bcm43xx_phy_write(bcm, 0x0015,
- bcm43xx_phy_read(bcm, 0x0015) | 0x0020);
- bcm43xx_phy_write(bcm, 0x002A, 0x08A3);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
-
- nrssi0 = (s16)bcm43xx_phy_read(bcm, 0x0027);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
+ bcm43xx_radio_write16(dev, 0x007A, tmp);
+ bcm43xx_phy_write(dev, 0x0030, 0x00FF);
+ bcm43xx_write16(dev, 0x03EC, 0x7F7F);
+ bcm43xx_phy_write(dev, 0x0026, 0x0000);
+ bcm43xx_phy_write(dev, 0x0015,
+ bcm43xx_phy_read(dev, 0x0015) | 0x0020);
+ bcm43xx_phy_write(dev, 0x002A, 0x08A3);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ | 0x0080);
+
+ nrssi0 = (s16)bcm43xx_phy_read(dev, 0x0027);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ & 0x007F);
if (phy->analog >= 2) {
- bcm43xx_write16(bcm, 0x03E6, 0x0040);
+ bcm43xx_write16(dev, 0x03E6, 0x0040);
} else if (phy->analog == 0) {
- bcm43xx_write16(bcm, 0x03E6, 0x0122);
+ bcm43xx_write16(dev, 0x03E6, 0x0122);
} else {
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
- bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT) & 0x2000);
- }
- bcm43xx_phy_write(bcm, 0x0020, 0x3F3F);
- bcm43xx_phy_write(bcm, 0x0015, 0xF330);
- bcm43xx_radio_write16(bcm, 0x005A, 0x0060);
- bcm43xx_radio_write16(bcm, 0x0043,
- bcm43xx_radio_read16(bcm, 0x0043) & 0x00F0);
- bcm43xx_phy_write(bcm, 0x005A, 0x0480);
- bcm43xx_phy_write(bcm, 0x0059, 0x0810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT,
+ bcm43xx_read16(dev,
+ BCM43xx_MMIO_CHANNEL_EXT) & 0x2000);
+ }
+ bcm43xx_phy_write(dev, 0x0020, 0x3F3F);
+ bcm43xx_phy_write(dev, 0x0015, 0xF330);
+ bcm43xx_radio_write16(dev, 0x005A, 0x0060);
+ bcm43xx_radio_write16(dev, 0x0043,
+ bcm43xx_radio_read16(dev, 0x0043)
+ & 0x00F0);
+ bcm43xx_phy_write(dev, 0x005A, 0x0480);
+ bcm43xx_phy_write(dev, 0x0059, 0x0810);
+ bcm43xx_phy_write(dev, 0x0058, 0x000D);
udelay(20);
- nrssi1 = (s16)bcm43xx_phy_read(bcm, 0x0027);
- bcm43xx_phy_write(bcm, 0x0030, backup[3]);
- bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
- bcm43xx_write16(bcm, 0x03E2, backup[11]);
- bcm43xx_phy_write(bcm, 0x0026, backup[4]);
- bcm43xx_phy_write(bcm, 0x0015, backup[5]);
- bcm43xx_phy_write(bcm, 0x002A, backup[6]);
- bcm43xx_synth_pu_workaround(bcm, radio->channel);
+ nrssi1 = (s16)bcm43xx_phy_read(dev, 0x0027);
+ bcm43xx_phy_write(dev, 0x0030, backup[3]);
+ bcm43xx_radio_write16(dev, 0x007A, backup[0]);
+ bcm43xx_write16(dev, 0x03E2, backup[11]);
+ bcm43xx_phy_write(dev, 0x0026, backup[4]);
+ bcm43xx_phy_write(dev, 0x0015, backup[5]);
+ bcm43xx_phy_write(dev, 0x002A, backup[6]);
+ bcm43xx_synth_pu_workaround(dev, phy->channel);
if (phy->analog != 0)
- bcm43xx_write16(bcm, 0x03F4, backup[13]);
+ bcm43xx_write16(dev, 0x03F4, backup[13]);
- bcm43xx_phy_write(bcm, 0x0020, backup[7]);
- bcm43xx_phy_write(bcm, 0x005A, backup[8]);
- bcm43xx_phy_write(bcm, 0x0059, backup[9]);
- bcm43xx_phy_write(bcm, 0x0058, backup[10]);
- bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
- bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
+ bcm43xx_phy_write(dev, 0x0020, backup[7]);
+ bcm43xx_phy_write(dev, 0x005A, backup[8]);
+ bcm43xx_phy_write(dev, 0x0059, backup[9]);
+ bcm43xx_phy_write(dev, 0x0058, backup[10]);
+ bcm43xx_radio_write16(dev, 0x0052, backup[1]);
+ bcm43xx_radio_write16(dev, 0x0043, backup[2]);
if (nrssi0 == nrssi1)
- radio->nrssislope = 0x00010000;
- else
- radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
+ phy->nrssislope = 0x00010000;
+ else
+ phy->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
if (nrssi0 <= -4) {
- radio->nrssi[0] = nrssi0;
- radio->nrssi[1] = nrssi1;
+ phy->nrssi[0] = nrssi0;
+ phy->nrssi[1] = nrssi1;
}
break;
case BCM43xx_PHYTYPE_G:
- if (radio->revision >= 9)
+ if (phy->radio_rev >= 9)
return;
- if (radio->revision == 8)
- bcm43xx_calc_nrssi_offset(bcm);
+ if (phy->radio_rev == 8)
+ bcm43xx_calc_nrssi_offset(dev);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0x7FFF);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC);
- backup[7] = bcm43xx_read16(bcm, 0x03E2);
- bcm43xx_write16(bcm, 0x03E2,
- bcm43xx_read16(bcm, 0x03E2) | 0x8000);
- backup[0] = bcm43xx_radio_read16(bcm, 0x007A);
- backup[1] = bcm43xx_radio_read16(bcm, 0x0052);
- backup[2] = bcm43xx_radio_read16(bcm, 0x0043);
- backup[3] = bcm43xx_phy_read(bcm, 0x0015);
- backup[4] = bcm43xx_phy_read(bcm, 0x005A);
- backup[5] = bcm43xx_phy_read(bcm, 0x0059);
- backup[6] = bcm43xx_phy_read(bcm, 0x0058);
- backup[8] = bcm43xx_read16(bcm, 0x03E6);
- backup[9] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS)
+ & 0x7FFF);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) & 0xFFFC);
+ backup[7] = bcm43xx_read16(dev, 0x03E2);
+ bcm43xx_write16(dev, 0x03E2,
+ bcm43xx_read16(dev, 0x03E2) | 0x8000);
+ backup[0] = bcm43xx_radio_read16(dev, 0x007A);
+ backup[1] = bcm43xx_radio_read16(dev, 0x0052);
+ backup[2] = bcm43xx_radio_read16(dev, 0x0043);
+ backup[3] = bcm43xx_phy_read(dev, 0x0015);
+ backup[4] = bcm43xx_phy_read(dev, 0x005A);
+ backup[5] = bcm43xx_phy_read(dev, 0x0059);
+ backup[6] = bcm43xx_phy_read(dev, 0x0058);
+ backup[8] = bcm43xx_read16(dev, 0x03E6);
+ backup[9] = bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT);
if (phy->rev >= 3) {
- backup[10] = bcm43xx_phy_read(bcm, 0x002E);
- backup[11] = bcm43xx_phy_read(bcm, 0x002F);
- backup[12] = bcm43xx_phy_read(bcm, 0x080F);
- backup[13] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_LO_CONTROL);
- backup[14] = bcm43xx_phy_read(bcm, 0x0801);
- backup[15] = bcm43xx_phy_read(bcm, 0x0060);
- backup[16] = bcm43xx_phy_read(bcm, 0x0014);
- backup[17] = bcm43xx_phy_read(bcm, 0x0478);
- bcm43xx_phy_write(bcm, 0x002E, 0);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, 0);
+ backup[10] = bcm43xx_phy_read(dev, 0x002E);
+ backup[11] = bcm43xx_phy_read(dev, 0x002F);
+ backup[12] = bcm43xx_phy_read(dev, 0x080F);
+ backup[13] = bcm43xx_phy_read(dev,
+ BCM43xx_PHY_G_LO_CONTROL);
+ backup[14] = bcm43xx_phy_read(dev, 0x0801);
+ backup[15] = bcm43xx_phy_read(dev, 0x0060);
+ backup[16] = bcm43xx_phy_read(dev, 0x0014);
+ backup[17] = bcm43xx_phy_read(dev, 0x0478);
+ bcm43xx_phy_write(dev, 0x002E, 0);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_LO_CONTROL, 0);
switch (phy->rev) {
case 4: case 6: case 7:
- bcm43xx_phy_write(bcm, 0x0478,
- bcm43xx_phy_read(bcm, 0x0478)
+ bcm43xx_phy_write(dev, 0x0478,
+ bcm43xx_phy_read(dev, 0x0478)
| 0x0100);
- bcm43xx_phy_write(bcm, 0x0801,
- bcm43xx_phy_read(bcm, 0x0801)
+ bcm43xx_phy_write(dev, 0x0801,
+ bcm43xx_phy_read(dev, 0x0801)
| 0x0040);
break;
case 3: case 5:
- bcm43xx_phy_write(bcm, 0x0801,
- bcm43xx_phy_read(bcm, 0x0801)
+ bcm43xx_phy_write(dev, 0x0801,
+ bcm43xx_phy_read(dev, 0x0801)
& 0xFFBF);
break;
}
- bcm43xx_phy_write(bcm, 0x0060,
- bcm43xx_phy_read(bcm, 0x0060)
+ bcm43xx_phy_write(dev, 0x0060,
+ bcm43xx_phy_read(dev, 0x0060)
| 0x0040);
- bcm43xx_phy_write(bcm, 0x0014,
- bcm43xx_phy_read(bcm, 0x0014)
+ bcm43xx_phy_write(dev, 0x0014,
+ bcm43xx_phy_read(dev, 0x0014)
| 0x0200);
}
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0070);
- bcm43xx_set_all_gains(bcm, 0, 8, 0);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) & 0x00F7);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ | 0x0070);
+ bcm43xx_set_all_gains(dev, 0, 8, 0);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ & 0x00F7);
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x0811,
- (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0030);
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0010);
- }
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x0080);
+ bcm43xx_phy_write(dev, 0x0811,
+ (bcm43xx_phy_read(dev, 0x0811)
+ & 0xFFCF) | 0x0030);
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812)
+ & 0xFFCF) | 0x0010);
+ }
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ | 0x0080);
udelay(20);
- nrssi0 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ nrssi0 = (s16)((bcm43xx_phy_read(dev, 0x047F) >> 8) & 0x003F);
if (nrssi0 >= 0x0020)
nrssi0 -= 0x0040;
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) & 0x007F);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ & 0x007F);
if (phy->analog >= 2) {
- bcm43xx_phy_write(bcm, 0x0003,
- (bcm43xx_phy_read(bcm, 0x0003)
+ bcm43xx_phy_write(dev, 0x0003,
+ (bcm43xx_phy_read(dev, 0x0003)
& 0xFF9F) | 0x0040);
}
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
- bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT,
+ bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT)
| 0x2000);
- bcm43xx_radio_write16(bcm, 0x007A,
- bcm43xx_radio_read16(bcm, 0x007A) | 0x000F);
- bcm43xx_phy_write(bcm, 0x0015, 0xF330);
+ bcm43xx_radio_write16(dev, 0x007A,
+ bcm43xx_radio_read16(dev, 0x007A)
+ | 0x000F);
+ bcm43xx_phy_write(dev, 0x0015, 0xF330);
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x0812,
- (bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF) | 0x0020);
- bcm43xx_phy_write(bcm, 0x0811,
- (bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF) | 0x0020);
+ bcm43xx_phy_write(dev, 0x0812,
+ (bcm43xx_phy_read(dev, 0x0812)
+ & 0xFFCF) | 0x0020);
+ bcm43xx_phy_write(dev, 0x0811,
+ (bcm43xx_phy_read(dev, 0x0811)
+ & 0xFFCF) | 0x0020);
}
- bcm43xx_set_all_gains(bcm, 3, 0, 1);
- if (radio->revision == 8) {
- bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
+ bcm43xx_set_all_gains(dev, 3, 0, 1);
+ if (phy->radio_rev == 8) {
+ bcm43xx_radio_write16(dev, 0x0043, 0x001F);
} else {
- tmp = bcm43xx_radio_read16(bcm, 0x0052) & 0xFF0F;
- bcm43xx_radio_write16(bcm, 0x0052, tmp | 0x0060);
- tmp = bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0;
- bcm43xx_radio_write16(bcm, 0x0043, tmp | 0x0009);
- }
- bcm43xx_phy_write(bcm, 0x005A, 0x0480);
- bcm43xx_phy_write(bcm, 0x0059, 0x0810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
+ tmp = bcm43xx_radio_read16(dev, 0x0052) & 0xFF0F;
+ bcm43xx_radio_write16(dev, 0x0052, tmp | 0x0060);
+ tmp = bcm43xx_radio_read16(dev, 0x0043) & 0xFFF0;
+ bcm43xx_radio_write16(dev, 0x0043, tmp | 0x0009);
+ }
+ bcm43xx_phy_write(dev, 0x005A, 0x0480);
+ bcm43xx_phy_write(dev, 0x0059, 0x0810);
+ bcm43xx_phy_write(dev, 0x0058, 0x000D);
udelay(20);
- nrssi1 = (s16)((bcm43xx_phy_read(bcm, 0x047F) >> 8) & 0x003F);
+ nrssi1 = (s16)((bcm43xx_phy_read(dev, 0x047F) >> 8) & 0x003F);
if (nrssi1 >= 0x0020)
nrssi1 -= 0x0040;
if (nrssi0 == nrssi1)
- radio->nrssislope = 0x00010000;
+ phy->nrssislope = 0x00010000;
else
- radio->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
+ phy->nrssislope = 0x00400000 / (nrssi0 - nrssi1);
if (nrssi0 >= -4) {
- radio->nrssi[0] = nrssi1;
- radio->nrssi[1] = nrssi0;
+ phy->nrssi[0] = nrssi1;
+ phy->nrssi[1] = nrssi0;
}
if (phy->rev >= 3) {
- bcm43xx_phy_write(bcm, 0x002E, backup[10]);
- bcm43xx_phy_write(bcm, 0x002F, backup[11]);
- bcm43xx_phy_write(bcm, 0x080F, backup[12]);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_LO_CONTROL, backup[13]);
+ bcm43xx_phy_write(dev, 0x002E, backup[10]);
+ bcm43xx_phy_write(dev, 0x002F, backup[11]);
+ bcm43xx_phy_write(dev, 0x080F, backup[12]);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_LO_CONTROL,
+ backup[13]);
}
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_phy_read(bcm, 0x0812) & 0xFFCF);
- bcm43xx_phy_write(bcm, 0x0811,
- bcm43xx_phy_read(bcm, 0x0811) & 0xFFCF);
- }
-
- bcm43xx_radio_write16(bcm, 0x007A, backup[0]);
- bcm43xx_radio_write16(bcm, 0x0052, backup[1]);
- bcm43xx_radio_write16(bcm, 0x0043, backup[2]);
- bcm43xx_write16(bcm, 0x03E2, backup[7]);
- bcm43xx_write16(bcm, 0x03E6, backup[8]);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[9]);
- bcm43xx_phy_write(bcm, 0x0015, backup[3]);
- bcm43xx_phy_write(bcm, 0x005A, backup[4]);
- bcm43xx_phy_write(bcm, 0x0059, backup[5]);
- bcm43xx_phy_write(bcm, 0x0058, backup[6]);
- bcm43xx_synth_pu_workaround(bcm, radio->channel);
- bcm43xx_phy_write(bcm, 0x0802,
- bcm43xx_phy_read(bcm, 0x0802) | (0x0001 | 0x0002));
- bcm43xx_set_original_gains(bcm);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x8000);
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_phy_read(dev, 0x0812)
+ & 0xFFCF);
+ bcm43xx_phy_write(dev, 0x0811,
+ bcm43xx_phy_read(dev, 0x0811)
+ & 0xFFCF);
+ }
+
+ bcm43xx_radio_write16(dev, 0x007A, backup[0]);
+ bcm43xx_radio_write16(dev, 0x0052, backup[1]);
+ bcm43xx_radio_write16(dev, 0x0043, backup[2]);
+ bcm43xx_write16(dev, 0x03E2, backup[7]);
+ bcm43xx_write16(dev, 0x03E6, backup[8]);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, backup[9]);
+ bcm43xx_phy_write(dev, 0x0015, backup[3]);
+ bcm43xx_phy_write(dev, 0x005A, backup[4]);
+ bcm43xx_phy_write(dev, 0x0059, backup[5]);
+ bcm43xx_phy_write(dev, 0x0058, backup[6]);
+ bcm43xx_synth_pu_workaround(dev, phy->channel);
+ bcm43xx_phy_write(dev, 0x0802,
+ bcm43xx_phy_read(dev, 0x0802) | 0x0003);
+ bcm43xx_set_original_gains(dev);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS)
+ | 0x8000);
if (phy->rev >= 3) {
- bcm43xx_phy_write(bcm, 0x0801, backup[14]);
- bcm43xx_phy_write(bcm, 0x0060, backup[15]);
- bcm43xx_phy_write(bcm, 0x0014, backup[16]);
- bcm43xx_phy_write(bcm, 0x0478, backup[17]);
+ bcm43xx_phy_write(dev, 0x0801, backup[14]);
+ bcm43xx_phy_write(dev, 0x0060, backup[15]);
+ bcm43xx_phy_write(dev, 0x0014, backup[16]);
+ bcm43xx_phy_write(dev, 0x0478, backup[17]);
}
- bcm43xx_nrssi_mem_update(bcm);
- bcm43xx_calc_nrssi_threshold(bcm);
+ bcm43xx_nrssi_mem_update(dev);
+ bcm43xx_calc_nrssi_threshold(dev);
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
-void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm)
+void bcm43xx_calc_nrssi_threshold(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;
s32 threshold;
s32 a, b;
s16 tmp16;
@@ -789,54 +811,59 @@ void bcm43xx_calc_nrssi_threshold(struct
switch (phy->type) {
case BCM43xx_PHYTYPE_B: {
- if (radio->version != 0x2050)
+ if (phy->radio_ver != 0x2050)
return;
- if (!(bcm->sprom.boardflags & BCM43xx_BFL_RSSI))
+ if (!(dev->dev->bus->sprom.r1.boardflags_lo & BCM43xx_BFL_RSSI))
return;
- if (radio->revision >= 6) {
- threshold = (radio->nrssi[1] - radio->nrssi[0]) * 32;
- threshold += 20 * (radio->nrssi[0] + 1);
+ if (phy->radio_rev >= 6) {
+ threshold = (phy->nrssi[1] - phy->nrssi[0]) * 32;
+ threshold += 20 * (phy->nrssi[0] + 1);
threshold /= 40;
- } else
- threshold = radio->nrssi[1] - 5;
+ } else {
+ threshold = phy->nrssi[1] - 5;
+ }
threshold = limit_value(threshold, 0, 0x3E);
- bcm43xx_phy_read(bcm, 0x0020); /* dummy read */
- bcm43xx_phy_write(bcm, 0x0020, (((u16)threshold) << 8) | 0x001C);
-
- if (radio->revision >= 6) {
- bcm43xx_phy_write(bcm, 0x0087, 0x0E0D);
- bcm43xx_phy_write(bcm, 0x0086, 0x0C0B);
- bcm43xx_phy_write(bcm, 0x0085, 0x0A09);
- bcm43xx_phy_write(bcm, 0x0084, 0x0808);
- bcm43xx_phy_write(bcm, 0x0083, 0x0808);
- bcm43xx_phy_write(bcm, 0x0082, 0x0604);
- bcm43xx_phy_write(bcm, 0x0081, 0x0302);
- bcm43xx_phy_write(bcm, 0x0080, 0x0100);
+ bcm43xx_phy_read(dev, 0x0020); /* dummy read */
+ bcm43xx_phy_write(dev, 0x0020, (((u16)threshold) << 8)
+ | 0x001C);
+
+ if (phy->radio_rev >= 6) {
+ bcm43xx_phy_write(dev, 0x0087, 0x0E0D);
+ bcm43xx_phy_write(dev, 0x0086, 0x0C0B);
+ bcm43xx_phy_write(dev, 0x0085, 0x0A09);
+ bcm43xx_phy_write(dev, 0x0084, 0x0808);
+ bcm43xx_phy_write(dev, 0x0083, 0x0808);
+ bcm43xx_phy_write(dev, 0x0082, 0x0604);
+ bcm43xx_phy_write(dev, 0x0081, 0x0302);
+ bcm43xx_phy_write(dev, 0x0080, 0x0100);
}
break;
}
case BCM43xx_PHYTYPE_G:
- if (!phy->connected ||
- !(bcm->sprom.boardflags & BCM43xx_BFL_RSSI)) {
- tmp16 = bcm43xx_nrssi_hw_read(bcm, 0x20);
+ if (!phy->gmode ||
+ !(dev->dev->bus->sprom.r1.boardflags_lo &
+ BCM43xx_BFL_RSSI)) {
+ tmp16 = bcm43xx_nrssi_hw_read(dev, 0x20);
if (tmp16 >= 0x20)
tmp16 -= 0x40;
if (tmp16 < 3) {
- bcm43xx_phy_write(bcm, 0x048A,
- (bcm43xx_phy_read(bcm, 0x048A)
+ bcm43xx_phy_write(dev, 0x048A,
+ (bcm43xx_phy_read(dev, 0x048A)
& 0xF000) | 0x09EB);
} else {
- bcm43xx_phy_write(bcm, 0x048A,
- (bcm43xx_phy_read(bcm, 0x048A)
+ bcm43xx_phy_write(dev, 0x048A,
+ (bcm43xx_phy_read(dev, 0x048A)
& 0xF000) | 0x0AED);
}
} else {
- if (radio->interfmode == BCM43xx_RADIO_INTERFMODE_NONWLAN) {
+ if (phy->interfmode ==
+ BCM43xx_RADIO_INTERFMODE_NONWLAN) {
a = 0xE;
b = 0xA;
- } else if (!radio->aci_wlan_automatic && radio->aci_enable) {
+ } else if (!phy->aci_wlan_automatic &&
+ phy->aci_enable) {
a = 0x13;
b = 0x12;
} else {
@@ -844,8 +871,8 @@ void bcm43xx_calc_nrssi_threshold(struct
b = 0x11;
}
- a = a * (radio->nrssi[1] - radio->nrssi[0]);
- a += (radio->nrssi[0] << 6);
+ a = a * (phy->nrssi[1] - phy->nrssi[0]);
+ a += (phy->nrssi[0] << 6);
if (a < 32)
a += 31;
else
@@ -853,8 +880,8 @@ void bcm43xx_calc_nrssi_threshold(struct
a = a >> 6;
a = limit_value(a, -31, 31);
- b = b * (radio->nrssi[1] - radio->nrssi[0]);
- b += (radio->nrssi[0] << 6);
+ b = b * (phy->nrssi[1] - phy->nrssi[0]);
+ b += (phy->nrssi[0] << 6);
if (b < 32)
b += 31;
else
@@ -862,14 +889,14 @@ void bcm43xx_calc_nrssi_threshold(struct
b = b >> 6;
b = limit_value(b, -31, 31);
- tmp_u16 = bcm43xx_phy_read(bcm, 0x048A) & 0xF000;
+ tmp_u16 = bcm43xx_phy_read(dev, 0x048A) & 0xF000;
tmp_u16 |= ((u32)b & 0x0000003F);
tmp_u16 |= (((u32)a & 0x0000003F) << 6);
- bcm43xx_phy_write(bcm, 0x048A, tmp_u16);
+ bcm43xx_phy_write(dev, 0x048A, tmp_u16);
}
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
@@ -882,13 +909,13 @@ static void _stack_save(u32 *_stackptr,
{
u32 *stackptr = &(_stackptr[*stackidx]);
- assert((offset & 0xE000) == 0x0000);
- assert((id & 0xF8) == 0x00);
+ BCM43xx_WARN_ON(!((offset & 0xE000) == 0x0000));
+ BCM43xx_WARN_ON(!((id & 0xF8) == 0x00));
*stackptr = offset;
*stackptr |= ((u32)id) << 13;
*stackptr |= ((u32)value) << 16;
(*stackidx)++;
- assert(*stackidx < BCM43xx_INTERFSTACK_SIZE);
+ BCM43xx_WARN_ON(!(*stackidx < BCM43xx_INTERFSTACK_SIZE));
}
static u16 _stack_restore(u32 *stackptr,
@@ -896,8 +923,8 @@ static u16 _stack_restore(u32 *stackptr,
{
size_t i;
- assert((offset & 0xE000) == 0x0000);
- assert((id & 0xF8) == 0x00);
+ BCM43xx_WARN_ON(!((offset & 0xE000) == 0x0000));
+ BCM43xx_WARN_ON(!((id & 0xF8) == 0x00));
for (i = 0; i < BCM43xx_INTERFSTACK_SIZE; i++, stackptr++) {
if ((*stackptr & 0x00001FFF) != offset)
continue;
@@ -905,7 +932,7 @@ static u16 _stack_restore(u32 *stackptr,
continue;
return ((*stackptr & 0xFFFF0000) >> 16);
}
- assert(0);
+ BCM43xx_BUG_ON(1);
return 0;
}
@@ -913,59 +940,60 @@ static u16 _stack_restore(u32 *stackptr,
#define phy_stacksave(offset) \
do { \
_stack_save(stack, &stackidx, 0x1, (offset), \
- bcm43xx_phy_read(bcm, (offset))); \
+ bcm43xx_phy_read(dev, (offset))); \
} while (0)
#define phy_stackrestore(offset) \
do { \
- bcm43xx_phy_write(bcm, (offset), \
+ bcm43xx_phy_write(dev, (offset), \
_stack_restore(stack, 0x1, \
(offset))); \
} while (0)
#define radio_stacksave(offset) \
do { \
_stack_save(stack, &stackidx, 0x2, (offset), \
- bcm43xx_radio_read16(bcm, (offset))); \
+ bcm43xx_radio_read16(dev, (offset))); \
} while (0)
#define radio_stackrestore(offset) \
do { \
- bcm43xx_radio_write16(bcm, (offset), \
+ bcm43xx_radio_write16(dev, (offset), \
_stack_restore(stack, 0x2, \
(offset))); \
} while (0)
#define ilt_stacksave(offset) \
do { \
_stack_save(stack, &stackidx, 0x3, (offset), \
- bcm43xx_ilt_read(bcm, (offset))); \
+ bcm43xx_ilt_read(dev, (offset))); \
} while (0)
#define ilt_stackrestore(offset) \
do { \
- bcm43xx_ilt_write(bcm, (offset), \
+ bcm43xx_ilt_write(dev, (offset), \
_stack_restore(stack, 0x3, \
(offset))); \
} while (0)
static void
-bcm43xx_radio_interference_mitigation_enable(struct bcm43xx_private *bcm,
+bcm43xx_radio_interference_mitigation_enable(struct bcm43xx_wldev *dev,
int mode)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 tmp, flipped;
u32 tmp32;
size_t stackidx = 0;
- u32 *stack = radio->interfstack;
+ u32 *stack = phy->interfstack;
switch (mode) {
case BCM43xx_RADIO_INTERFMODE_NONWLAN:
if (phy->rev != 1) {
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & ~0x4000);
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B)
+ | 0x0800);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_G_CRS) & ~0x4000);
break;
}
radio_stacksave(0x0078);
- tmp = (bcm43xx_radio_read16(bcm, 0x0078) & 0x001E);
+ tmp = (bcm43xx_radio_read16(dev, 0x0078) & 0x001E);
flipped = flip_4bit(tmp);
if (flipped < 10 && flipped >= 8)
flipped = 7;
@@ -973,52 +1001,58 @@ bcm43xx_radio_interference_mitigation_en
flipped -= 3;
flipped = flip_4bit(flipped);
flipped = (flipped << 1) | 0x0020;
- bcm43xx_radio_write16(bcm, 0x0078, flipped);
+ bcm43xx_radio_write16(dev, 0x0078, flipped);
- bcm43xx_calc_nrssi_threshold(bcm);
+ bcm43xx_calc_nrssi_threshold(dev);
phy_stacksave(0x0406);
- bcm43xx_phy_write(bcm, 0x0406, 0x7E28);
+ bcm43xx_phy_write(dev, 0x0406, 0x7E28);
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B) | 0x0800);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD) | 0x1000);
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B) | 0x0800);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_RADIO_BITFIELD,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_RADIO_BITFIELD) | 0x1000);
phy_stacksave(0x04A0);
- bcm43xx_phy_write(bcm, 0x04A0,
- (bcm43xx_phy_read(bcm, 0x04A0) & 0xC0C0) | 0x0008);
+ bcm43xx_phy_write(dev, 0x04A0,
+ (bcm43xx_phy_read(dev, 0x04A0) & 0xC0C0)
+ | 0x0008);
phy_stacksave(0x04A1);
- bcm43xx_phy_write(bcm, 0x04A1,
- (bcm43xx_phy_read(bcm, 0x04A1) & 0xC0C0) | 0x0605);
+ bcm43xx_phy_write(dev, 0x04A1,
+ (bcm43xx_phy_read(dev, 0x04A1) & 0xC0C0)
+ | 0x0605);
phy_stacksave(0x04A2);
- bcm43xx_phy_write(bcm, 0x04A2,
- (bcm43xx_phy_read(bcm, 0x04A2) & 0xC0C0) | 0x0204);
+ bcm43xx_phy_write(dev, 0x04A2,
+ (bcm43xx_phy_read(dev, 0x04A2) & 0xC0C0)
+ | 0x0204);
phy_stacksave(0x04A8);
- bcm43xx_phy_write(bcm, 0x04A8,
- (bcm43xx_phy_read(bcm, 0x04A8) & 0xC0C0) | 0x0803);
+ bcm43xx_phy_write(dev, 0x04A8,
+ (bcm43xx_phy_read(dev, 0x04A8) & 0xC0C0)
+ | 0x0803);
phy_stacksave(0x04AB);
- bcm43xx_phy_write(bcm, 0x04AB,
- (bcm43xx_phy_read(bcm, 0x04AB) & 0xC0C0) | 0x0605);
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB) & 0xC0C0)
+ | 0x0605);
phy_stacksave(0x04A7);
- bcm43xx_phy_write(bcm, 0x04A7, 0x0002);
+ bcm43xx_phy_write(dev, 0x04A7, 0x0002);
phy_stacksave(0x04A3);
- bcm43xx_phy_write(bcm, 0x04A3, 0x287A);
+ bcm43xx_phy_write(dev, 0x04A3, 0x287A);
phy_stacksave(0x04A9);
- bcm43xx_phy_write(bcm, 0x04A9, 0x2027);
+ bcm43xx_phy_write(dev, 0x04A9, 0x2027);
phy_stacksave(0x0493);
- bcm43xx_phy_write(bcm, 0x0493, 0x32F5);
+ bcm43xx_phy_write(dev, 0x0493, 0x32F5);
phy_stacksave(0x04AA);
- bcm43xx_phy_write(bcm, 0x04AA, 0x2027);
+ bcm43xx_phy_write(dev, 0x04AA, 0x2027);
phy_stacksave(0x04AC);
- bcm43xx_phy_write(bcm, 0x04AC, 0x32F5);
+ bcm43xx_phy_write(dev, 0x04AC, 0x32F5);
break;
case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
- if (bcm43xx_phy_read(bcm, 0x0033) & 0x0800)
+ if (bcm43xx_phy_read(dev, 0x0033) & 0x0800)
break;
- radio->aci_enable = 1;
+ phy->aci_enable = 1;
phy_stacksave(BCM43xx_PHY_RADIO_BITFIELD);
phy_stacksave(BCM43xx_PHY_G_CRS);
@@ -1055,163 +1089,165 @@ bcm43xx_radio_interference_mitigation_en
phy_stacksave(0x042B);
phy_stacksave(0x048C);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
- & ~0x1000);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
+ bcm43xx_phy_write(dev, BCM43xx_PHY_RADIO_BITFIELD,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_RADIO_BITFIELD) & ~0x1000);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ (bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS)
& 0xFFFC) | 0x0002);
- bcm43xx_phy_write(bcm, 0x0033, 0x0800);
- bcm43xx_phy_write(bcm, 0x04A3, 0x2027);
- bcm43xx_phy_write(bcm, 0x04A9, 0x1CA8);
- bcm43xx_phy_write(bcm, 0x0493, 0x287A);
- bcm43xx_phy_write(bcm, 0x04AA, 0x1CA8);
- bcm43xx_phy_write(bcm, 0x04AC, 0x287A);
+ bcm43xx_phy_write(dev, 0x0033, 0x0800);
+ bcm43xx_phy_write(dev, 0x04A3, 0x2027);
+ bcm43xx_phy_write(dev, 0x04A9, 0x1CA8);
+ bcm43xx_phy_write(dev, 0x0493, 0x287A);
+ bcm43xx_phy_write(dev, 0x04AA, 0x1CA8);
+ bcm43xx_phy_write(dev, 0x04AC, 0x287A);
- bcm43xx_phy_write(bcm, 0x04A0,
- (bcm43xx_phy_read(bcm, 0x04A0)
+ bcm43xx_phy_write(dev, 0x04A0,
+ (bcm43xx_phy_read(dev, 0x04A0)
& 0xFFC0) | 0x001A);
- bcm43xx_phy_write(bcm, 0x04A7, 0x000D);
+ bcm43xx_phy_write(dev, 0x04A7, 0x000D);
if (phy->rev < 2) {
- bcm43xx_phy_write(bcm, 0x0406, 0xFF0D);
+ bcm43xx_phy_write(dev, 0x0406, 0xFF0D);
} else if (phy->rev == 2) {
- bcm43xx_phy_write(bcm, 0x04C0, 0xFFFF);
- bcm43xx_phy_write(bcm, 0x04C1, 0x00A9);
+ bcm43xx_phy_write(dev, 0x04C0, 0xFFFF);
+ bcm43xx_phy_write(dev, 0x04C1, 0x00A9);
} else {
- bcm43xx_phy_write(bcm, 0x04C0, 0x00C1);
- bcm43xx_phy_write(bcm, 0x04C1, 0x0059);
+ bcm43xx_phy_write(dev, 0x04C0, 0x00C1);
+ bcm43xx_phy_write(dev, 0x04C1, 0x0059);
}
- bcm43xx_phy_write(bcm, 0x04A1,
- (bcm43xx_phy_read(bcm, 0x04A1)
- & 0xC0FF) | 0x1800);
- bcm43xx_phy_write(bcm, 0x04A1,
- (bcm43xx_phy_read(bcm, 0x04A1)
- & 0xFFC0) | 0x0015);
- bcm43xx_phy_write(bcm, 0x04A8,
- (bcm43xx_phy_read(bcm, 0x04A8)
- & 0xCFFF) | 0x1000);
- bcm43xx_phy_write(bcm, 0x04A8,
- (bcm43xx_phy_read(bcm, 0x04A8)
- & 0xF0FF) | 0x0A00);
- bcm43xx_phy_write(bcm, 0x04AB,
- (bcm43xx_phy_read(bcm, 0x04AB)
- & 0xCFFF) | 0x1000);
- bcm43xx_phy_write(bcm, 0x04AB,
- (bcm43xx_phy_read(bcm, 0x04AB)
- & 0xF0FF) | 0x0800);
- bcm43xx_phy_write(bcm, 0x04AB,
- (bcm43xx_phy_read(bcm, 0x04AB)
- & 0xFFCF) | 0x0010);
- bcm43xx_phy_write(bcm, 0x04AB,
- (bcm43xx_phy_read(bcm, 0x04AB)
- & 0xFFF0) | 0x0005);
- bcm43xx_phy_write(bcm, 0x04A8,
- (bcm43xx_phy_read(bcm, 0x04A8)
- & 0xFFCF) | 0x0010);
- bcm43xx_phy_write(bcm, 0x04A8,
- (bcm43xx_phy_read(bcm, 0x04A8)
- & 0xFFF0) | 0x0006);
- bcm43xx_phy_write(bcm, 0x04A2,
- (bcm43xx_phy_read(bcm, 0x04A2)
- & 0xF0FF) | 0x0800);
- bcm43xx_phy_write(bcm, 0x04A0,
- (bcm43xx_phy_read(bcm, 0x04A0)
- & 0xF0FF) | 0x0500);
- bcm43xx_phy_write(bcm, 0x04A2,
- (bcm43xx_phy_read(bcm, 0x04A2)
- & 0xFFF0) | 0x000B);
+ bcm43xx_phy_write(dev, 0x04A1,
+ (bcm43xx_phy_read(dev, 0x04A1)
+ & 0xC0FF) | 0x1800);
+ bcm43xx_phy_write(dev, 0x04A1,
+ (bcm43xx_phy_read(dev, 0x04A1)
+ & 0xFFC0) | 0x0015);
+ bcm43xx_phy_write(dev, 0x04A8,
+ (bcm43xx_phy_read(dev, 0x04A8)
+ & 0xCFFF) | 0x1000);
+ bcm43xx_phy_write(dev, 0x04A8,
+ (bcm43xx_phy_read(dev, 0x04A8)
+ & 0xF0FF) | 0x0A00);
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB)
+ & 0xCFFF) | 0x1000);
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB)
+ & 0xF0FF) | 0x0800);
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB)
+ & 0xFFCF) | 0x0010);
+ bcm43xx_phy_write(dev, 0x04AB,
+ (bcm43xx_phy_read(dev, 0x04AB)
+ & 0xFFF0) | 0x0005);
+ bcm43xx_phy_write(dev, 0x04A8,
+ (bcm43xx_phy_read(dev, 0x04A8)
+ & 0xFFCF) | 0x0010);
+ bcm43xx_phy_write(dev, 0x04A8,
+ (bcm43xx_phy_read(dev, 0x04A8)
+ & 0xFFF0) | 0x0006);
+ bcm43xx_phy_write(dev, 0x04A2,
+ (bcm43xx_phy_read(dev, 0x04A2)
+ & 0xF0FF) | 0x0800);
+ bcm43xx_phy_write(dev, 0x04A0,
+ (bcm43xx_phy_read(dev, 0x04A0)
+ & 0xF0FF) | 0x0500);
+ bcm43xx_phy_write(dev, 0x04A2,
+ (bcm43xx_phy_read(dev, 0x04A2)
+ & 0xFFF0) | 0x000B);
if (phy->rev >= 3) {
- bcm43xx_phy_write(bcm, 0x048A,
- bcm43xx_phy_read(bcm, 0x048A)
+ bcm43xx_phy_write(dev, 0x048A,
+ bcm43xx_phy_read(dev, 0x048A)
& ~0x8000);
- bcm43xx_phy_write(bcm, 0x0415,
- (bcm43xx_phy_read(bcm, 0x0415)
+ bcm43xx_phy_write(dev, 0x0415,
+ (bcm43xx_phy_read(dev, 0x0415)
& 0x8000) | 0x36D8);
- bcm43xx_phy_write(bcm, 0x0416,
- (bcm43xx_phy_read(bcm, 0x0416)
+ bcm43xx_phy_write(dev, 0x0416,
+ (bcm43xx_phy_read(dev, 0x0416)
& 0x8000) | 0x36D8);
- bcm43xx_phy_write(bcm, 0x0417,
- (bcm43xx_phy_read(bcm, 0x0417)
+ bcm43xx_phy_write(dev, 0x0417,
+ (bcm43xx_phy_read(dev, 0x0417)
& 0xFE00) | 0x016D);
} else {
- bcm43xx_phy_write(bcm, 0x048A,
- bcm43xx_phy_read(bcm, 0x048A)
+ bcm43xx_phy_write(dev, 0x048A,
+ bcm43xx_phy_read(dev, 0x048A)
| 0x1000);
- bcm43xx_phy_write(bcm, 0x048A,
- (bcm43xx_phy_read(bcm, 0x048A)
+ bcm43xx_phy_write(dev, 0x048A,
+ (bcm43xx_phy_read(dev, 0x048A)
& 0x9FFF) | 0x2000);
- tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+ tmp32 = bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET);
if (!(tmp32 & 0x800)) {
tmp32 |= 0x800;
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET,
tmp32);
}
}
if (phy->rev >= 2) {
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B)
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B)
| 0x0800);
}
- bcm43xx_phy_write(bcm, 0x048C,
- (bcm43xx_phy_read(bcm, 0x048C)
+ bcm43xx_phy_write(dev, 0x048C,
+ (bcm43xx_phy_read(dev, 0x048C)
& 0xF0FF) | 0x0200);
if (phy->rev == 2) {
- bcm43xx_phy_write(bcm, 0x04AE,
- (bcm43xx_phy_read(bcm, 0x04AE)
+ bcm43xx_phy_write(dev, 0x04AE,
+ (bcm43xx_phy_read(dev, 0x04AE)
& 0xFF00) | 0x007F);
- bcm43xx_phy_write(bcm, 0x04AD,
- (bcm43xx_phy_read(bcm, 0x04AD)
+ bcm43xx_phy_write(dev, 0x04AD,
+ (bcm43xx_phy_read(dev, 0x04AD)
& 0x00FF) | 0x1300);
} else if (phy->rev >= 6) {
- bcm43xx_ilt_write(bcm, 0x1A00 + 0x3, 0x007F);
- bcm43xx_ilt_write(bcm, 0x1A00 + 0x2, 0x007F);
- bcm43xx_phy_write(bcm, 0x04AD,
- bcm43xx_phy_read(bcm, 0x04AD)
+ bcm43xx_ilt_write(dev, 0x1A00 + 0x3, 0x007F);
+ bcm43xx_ilt_write(dev, 0x1A00 + 0x2, 0x007F);
+ bcm43xx_phy_write(dev, 0x04AD,
+ bcm43xx_phy_read(dev, 0x04AD)
& 0x00FF);
}
- bcm43xx_calc_nrssi_slope(bcm);
+ bcm43xx_calc_nrssi_slope(dev);
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
static void
-bcm43xx_radio_interference_mitigation_disable(struct bcm43xx_private *bcm,
+bcm43xx_radio_interference_mitigation_disable(struct bcm43xx_wldev *dev,
int mode)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u32 tmp32;
- u32 *stack = radio->interfstack;
+ u32 *stack = phy->interfstack;
switch (mode) {
case BCM43xx_RADIO_INTERFMODE_NONWLAN:
if (phy->rev != 1) {
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B)
+ & ~0x0800);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_G_CRS) | 0x4000);
break;
}
phy_stackrestore(0x0078);
- bcm43xx_calc_nrssi_threshold(bcm);
+ bcm43xx_calc_nrssi_threshold(dev);
phy_stackrestore(0x0406);
- bcm43xx_phy_write(bcm, 0x042B,
- bcm43xx_phy_read(bcm, 0x042B) & ~0x0800);
- if (!bcm->bad_frames_preempt) {
- bcm43xx_phy_write(bcm, BCM43xx_PHY_RADIO_BITFIELD,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_RADIO_BITFIELD)
+ bcm43xx_phy_write(dev, 0x042B,
+ bcm43xx_phy_read(dev, 0x042B) & ~0x0800);
+ if (!dev->bad_frames_preempt)
+ bcm43xx_phy_write(dev, BCM43xx_PHY_RADIO_BITFIELD,
+ bcm43xx_phy_read(dev,
+ BCM43xx_PHY_RADIO_BITFIELD)
& ~(1 << 11));
- }
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) | 0x4000);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS)
+ | 0x4000);
phy_stackrestore(0x04A0);
phy_stackrestore(0x04A1);
phy_stackrestore(0x04A2);
@@ -1225,10 +1261,10 @@ bcm43xx_radio_interference_mitigation_di
phy_stackrestore(0x04AC);
break;
case BCM43xx_RADIO_INTERFMODE_MANUALWLAN:
- if (!(bcm43xx_phy_read(bcm, 0x0033) & 0x0800))
+ if (!(bcm43xx_phy_read(dev, 0x0033) & 0x0800))
break;
- radio->aci_enable = 0;
+ phy->aci_enable = 0;
phy_stackrestore(BCM43xx_PHY_RADIO_BITFIELD);
phy_stackrestore(BCM43xx_PHY_G_CRS);
@@ -1243,8 +1279,9 @@ bcm43xx_radio_interference_mitigation_di
if (phy->rev >= 2) {
phy_stackrestore(0x04C0);
phy_stackrestore(0x04C1);
- } else
+ } else {
phy_stackrestore(0x0406);
+ }
phy_stackrestore(0x04A1);
phy_stackrestore(0x04AB);
phy_stackrestore(0x04A8);
@@ -1263,18 +1300,18 @@ bcm43xx_radio_interference_mitigation_di
phy_stackrestore(0x04A8);
phy_stackrestore(0x042B);
phy_stackrestore(0x048C);
- tmp32 = bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
+ tmp32 = bcm43xx_shm_read32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET);
if (tmp32 & 0x800) {
tmp32 &= ~0x800;
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
BCM43xx_UCODEFLAGS_OFFSET,
tmp32);
}
- bcm43xx_calc_nrssi_slope(bcm);
+ bcm43xx_calc_nrssi_slope(dev);
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
@@ -1285,23 +1322,22 @@ bcm43xx_radio_interference_mitigation_di
#undef ilt_stacksave
#undef ilt_stackrestore
-int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm,
+int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_wldev *dev,
int mode)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
int currentmode;
if ((phy->type != BCM43xx_PHYTYPE_G) ||
(phy->rev == 0) ||
- (!phy->connected))
+ (!phy->gmode))
return -ENODEV;
- radio->aci_wlan_automatic = 0;
+ phy->aci_wlan_automatic = 0;
switch (mode) {
case BCM43xx_RADIO_INTERFMODE_AUTOWLAN:
- radio->aci_wlan_automatic = 1;
- if (radio->aci_enable)
+ phy->aci_wlan_automatic = 1;
+ if (phy->aci_enable)
mode = BCM43xx_RADIO_INTERFMODE_MANUALWLAN;
else
mode = BCM43xx_RADIO_INTERFMODE_NONE;
@@ -1314,27 +1350,28 @@ int bcm43xx_radio_set_interference_mitig
return -EINVAL;
}
- currentmode = radio->interfmode;
+ currentmode = phy->interfmode;
if (currentmode == mode)
return 0;
if (currentmode != BCM43xx_RADIO_INTERFMODE_NONE)
- bcm43xx_radio_interference_mitigation_disable(bcm, currentmode);
+ bcm43xx_radio_interference_mitigation_disable(dev, currentmode);
if (mode == BCM43xx_RADIO_INTERFMODE_NONE) {
- radio->aci_enable = 0;
- radio->aci_hw_rssi = 0;
- } else
- bcm43xx_radio_interference_mitigation_enable(bcm, mode);
- radio->interfmode = mode;
+ phy->aci_enable = 0;
+ phy->aci_hw_rssi = 0;
+ } else {
+ bcm43xx_radio_interference_mitigation_enable(dev, mode);
+ }
+ phy->interfmode = mode;
return 0;
}
-u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_wldev *dev)
{
u16 reg, index, ret;
- reg = bcm43xx_radio_read16(bcm, 0x0060);
+ reg = bcm43xx_radio_read16(dev, 0x0060);
index = (reg & 0x001E) >> 1;
ret = rcc_table[index] << 1;
ret |= (reg & 0x0001);
@@ -1344,19 +1381,18 @@ u16 bcm43xx_radio_calibrationvalue(struc
}
#define LPD(L, P, D) (((L) << 2) | ((P) << 1) | ((D) << 0))
-static u16 bcm43xx_get_812_value(struct bcm43xx_private *bcm, u8 lpd)
+static u16 bcm43xx_get_812_value(struct bcm43xx_wldev *dev, u8 lpd)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 loop_or = 0;
u16 adj_loopback_gain = phy->loopback_gain[0];
u8 loop;
u16 extern_lna_control;
- if (!phy->connected)
+ if (!phy->gmode)
return 0;
if (!has_loopback_gain(phy)) {
- if (phy->rev < 7 || !(bcm->sprom.boardflags
+ if (phy->rev < 7 || !(dev->dev->bus->sprom.r1.boardflags_lo
& BCM43xx_BFL_EXTLNA)) {
switch (lpd) {
case LPD(0, 1, 1):
@@ -1368,7 +1404,7 @@ static u16 bcm43xx_get_812_value(struct
case LPD(1, 0, 0):
return 0x30B3;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
} else {
switch (lpd) {
@@ -1381,11 +1417,11 @@ static u16 bcm43xx_get_812_value(struct
case LPD(1, 0, 0):
return 0x20B3;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
} else {
- if (radio->revision == 8)
+ if (phy->radio_rev == 8)
adj_loopback_gain += 0x003E;
else
adj_loopback_gain += 0x0026;
@@ -1409,7 +1445,7 @@ static u16 bcm43xx_get_812_value(struct
}
loop_or = (loop << 8) | extern_lna_control;
- if (phy->rev >= 7 && bcm->sprom.boardflags
+ if (phy->rev >= 7 && dev->dev->bus->sprom.r1.boardflags_lo
& BCM43xx_BFL_EXTLNA) {
if (extern_lna_control)
loop_or |= 0x8000;
@@ -1423,7 +1459,7 @@ static u16 bcm43xx_get_812_value(struct
case LPD(1, 0, 0):
return (0x2093 | loop_or);
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
} else {
switch (lpd) {
@@ -1435,183 +1471,195 @@ static u16 bcm43xx_get_812_value(struct
case LPD(1, 0, 0):
return (0x0093 | loop_or);
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
}
}
return 0;
}
-u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm)
+u16 bcm43xx_radio_init2050(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[21] = { 0 };
u16 ret;
u16 i, j;
u32 tmp1 = 0, tmp2 = 0;
- backup[0] = bcm43xx_radio_read16(bcm, 0x0043);
- backup[14] = bcm43xx_radio_read16(bcm, 0x0051);
- backup[15] = bcm43xx_radio_read16(bcm, 0x0052);
- backup[1] = bcm43xx_phy_read(bcm, 0x0015);
- backup[16] = bcm43xx_phy_read(bcm, 0x005A);
- backup[17] = bcm43xx_phy_read(bcm, 0x0059);
- backup[18] = bcm43xx_phy_read(bcm, 0x0058);
+ backup[0] = bcm43xx_radio_read16(dev, 0x0043);
+ backup[14] = bcm43xx_radio_read16(dev, 0x0051);
+ backup[15] = bcm43xx_radio_read16(dev, 0x0052);
+ backup[1] = bcm43xx_phy_read(dev, 0x0015);
+ backup[16] = bcm43xx_phy_read(dev, 0x005A);
+ backup[17] = bcm43xx_phy_read(dev, 0x0059);
+ backup[18] = bcm43xx_phy_read(dev, 0x0058);
if (phy->type == BCM43xx_PHYTYPE_B) {
- backup[2] = bcm43xx_phy_read(bcm, 0x0030);
- backup[3] = bcm43xx_read16(bcm, 0x03EC);
- bcm43xx_phy_write(bcm, 0x0030, 0x00FF);
- bcm43xx_write16(bcm, 0x03EC, 0x3F3F);
+ backup[2] = bcm43xx_phy_read(dev, 0x0030);
+ backup[3] = bcm43xx_read16(dev, 0x03EC);
+ bcm43xx_phy_write(dev, 0x0030, 0x00FF);
+ bcm43xx_write16(dev, 0x03EC, 0x3F3F);
} else {
- if (phy->connected) {
- backup[4] = bcm43xx_phy_read(bcm, 0x0811);
- backup[5] = bcm43xx_phy_read(bcm, 0x0812);
- backup[6] = bcm43xx_phy_read(bcm, 0x0814);
- backup[7] = bcm43xx_phy_read(bcm, 0x0815);
- backup[8] = bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS);
- backup[9] = bcm43xx_phy_read(bcm, 0x0802);
- bcm43xx_phy_write(bcm, 0x0814,
- (bcm43xx_phy_read(bcm, 0x0814)
+ if (phy->gmode) {
+ backup[4] = bcm43xx_phy_read(dev, 0x0811);
+ backup[5] = bcm43xx_phy_read(dev, 0x0812);
+ backup[6] = bcm43xx_phy_read(dev, 0x0814);
+ backup[7] = bcm43xx_phy_read(dev, 0x0815);
+ backup[8] = bcm43xx_phy_read(dev, BCM43xx_PHY_G_CRS);
+ backup[9] = bcm43xx_phy_read(dev, 0x0802);
+ bcm43xx_phy_write(dev, 0x0814,
+ (bcm43xx_phy_read(dev, 0x0814)
| 0x0003));
- bcm43xx_phy_write(bcm, 0x0815,
- (bcm43xx_phy_read(bcm, 0x0815)
+ bcm43xx_phy_write(dev, 0x0815,
+ (bcm43xx_phy_read(dev, 0x0815)
& 0xFFFC));
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS,
- (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS)
- & 0x7FFF));
- bcm43xx_phy_write(bcm, 0x0802,
- (bcm43xx_phy_read(bcm, 0x0802) & 0xFFFC));
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS,
+ (bcm43xx_phy_read(dev,
+ BCM43xx_PHY_G_CRS) & 0x7FFF));
+ bcm43xx_phy_write(dev, 0x0802,
+ (bcm43xx_phy_read(dev, 0x0802)
+ & 0xFFFC));
if (phy->rev > 1) { /* loopback gain enabled */
- backup[19] = bcm43xx_phy_read(bcm, 0x080F);
- backup[20] = bcm43xx_phy_read(bcm, 0x0810);
+ backup[19] = bcm43xx_phy_read(dev, 0x080F);
+ backup[20] = bcm43xx_phy_read(dev, 0x0810);
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, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
- if (phy->rev < 7 || !(bcm->sprom.boardflags
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(0, 1, 1)));
+ if (phy->rev < 7 ||
+ !(dev->dev->bus->sprom.r1.boardflags_lo
& BCM43xx_BFL_EXTLNA))
- bcm43xx_phy_write(bcm, 0x0811, 0x01B3);
+ bcm43xx_phy_write(dev, 0x0811, 0x01B3);
else
- bcm43xx_phy_write(bcm, 0x0811, 0x09B3);
+ bcm43xx_phy_write(dev, 0x0811, 0x09B3);
}
}
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
- (bcm43xx_read16(bcm, BCM43xx_MMIO_PHY_RADIO) | 0x8000));
- backup[10] = bcm43xx_phy_read(bcm, 0x0035);
- bcm43xx_phy_write(bcm, 0x0035,
- (bcm43xx_phy_read(bcm, 0x0035) & 0xFF7F));
- backup[11] = bcm43xx_read16(bcm, 0x03E6);
- backup[12] = bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT);
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_RADIO,
+ (bcm43xx_read16(dev, BCM43xx_MMIO_PHY_RADIO)
+ | 0x8000));
+ backup[10] = bcm43xx_phy_read(dev, 0x0035);
+ bcm43xx_phy_write(dev, 0x0035,
+ (bcm43xx_phy_read(dev, 0x0035) & 0xFF7F));
+ backup[11] = bcm43xx_read16(dev, 0x03E6);
+ backup[12] = bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT);
- // Initialization
+ /* Initialization */
if (phy->analog == 0) {
- bcm43xx_write16(bcm, 0x03E6, 0x0122);
+ bcm43xx_write16(dev, 0x03E6, 0x0122);
} else {
if (phy->analog >= 2)
- bcm43xx_phy_write(bcm, 0x0003,
- (bcm43xx_phy_read(bcm, 0x0003)
+ bcm43xx_phy_write(dev, 0x0003,
+ (bcm43xx_phy_read(dev, 0x0003)
& 0xFFBF) | 0x0040);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
- (bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT,
+ (bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT)
| 0x2000));
}
- ret = bcm43xx_radio_calibrationvalue(bcm);
+ ret = bcm43xx_radio_calibrationvalue(dev);
if (phy->type == BCM43xx_PHYTYPE_B)
- bcm43xx_radio_write16(bcm, 0x0078, 0x0026);
+ bcm43xx_radio_write16(dev, 0x0078, 0x0026);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(0, 1, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xBFAF);
- bcm43xx_phy_write(bcm, 0x002B, 0x1403);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(0, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xBFA0);
- bcm43xx_radio_write16(bcm, 0x0051,
- (bcm43xx_radio_read16(bcm, 0x0051) | 0x0004));
- if (radio->revision == 8)
- bcm43xx_radio_write16(bcm, 0x0043, 0x001F);
- else {
- bcm43xx_radio_write16(bcm, 0x0052, 0x0000);
- bcm43xx_radio_write16(bcm, 0x0043,
- (bcm43xx_radio_read16(bcm, 0x0043) & 0xFFF0)
- | 0x0009);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(0, 1, 1)));
+ bcm43xx_phy_write(dev, 0x0015, 0xBFAF);
+ bcm43xx_phy_write(dev, 0x002B, 0x1403);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(0, 0, 1)));
+ bcm43xx_phy_write(dev, 0x0015, 0xBFA0);
+ bcm43xx_radio_write16(dev, 0x0051,
+ (bcm43xx_radio_read16(dev, 0x0051)
+ | 0x0004));
+ if (phy->radio_rev == 8) {
+ bcm43xx_radio_write16(dev, 0x0043, 0x001F);
+ } else {
+ bcm43xx_radio_write16(dev, 0x0052, 0x0000);
+ bcm43xx_radio_write16(dev, 0x0043,
+ (bcm43xx_radio_read16(dev, 0x0043)
+ & 0xFFF0)
+ | 0x0009);
}
- bcm43xx_phy_write(bcm, 0x0058, 0x0000);
+ bcm43xx_phy_write(dev, 0x0058, 0x0000);
for (i = 0; i < 16; i++) {
- bcm43xx_phy_write(bcm, 0x005A, 0x0480);
- bcm43xx_phy_write(bcm, 0x0059, 0xC810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
+ bcm43xx_phy_write(dev, 0x005A, 0x0480);
+ bcm43xx_phy_write(dev, 0x0059, 0xC810);
+ bcm43xx_phy_write(dev, 0x0058, 0x000D);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(1, 0, 1)));
+ bcm43xx_phy_write(dev, 0x0015, 0xAFB0);
udelay(10);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(1, 0, 1)));
+ bcm43xx_phy_write(dev, 0x0015, 0xEFB0);
udelay(10);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(1, 0, 0)));
- bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(1, 0, 0)));
+ bcm43xx_phy_write(dev, 0x0015, 0xFFF0);
udelay(20);
- tmp1 += bcm43xx_phy_read(bcm, 0x002D);
- bcm43xx_phy_write(bcm, 0x0058, 0x0000);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm, LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
+ tmp1 += bcm43xx_phy_read(dev, 0x002D);
+ bcm43xx_phy_write(dev, 0x0058, 0x0000);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
+ LPD(1, 0, 1)));
+ bcm43xx_phy_write(dev, 0x0015, 0xAFB0);
}
tmp1++;
tmp1 >>= 9;
udelay(10);
- bcm43xx_phy_write(bcm, 0x0058, 0x0000);
+ bcm43xx_phy_write(dev, 0x0058, 0x0000);
for (i = 0; i < 16; i++) {
- bcm43xx_radio_write16(bcm, 0x0078, (flip_4bit(i) << 1) | 0x0020);
- backup[13] = bcm43xx_radio_read16(bcm, 0x0078);
+ bcm43xx_radio_write16(dev, 0x0078, (flip_4bit(i) << 1)
+ | 0x0020);
+ backup[13] = bcm43xx_radio_read16(dev, 0x0078);
udelay(10);
for (j = 0; j < 16; j++) {
- bcm43xx_phy_write(bcm, 0x005A, 0x0D80);
- bcm43xx_phy_write(bcm, 0x0059, 0xC810);
- bcm43xx_phy_write(bcm, 0x0058, 0x000D);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm,
+ bcm43xx_phy_write(dev, 0x005A, 0x0D80);
+ bcm43xx_phy_write(dev, 0x0059, 0xC810);
+ bcm43xx_phy_write(dev, 0x0058, 0x000D);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
+ bcm43xx_phy_write(dev, 0x0015, 0xAFB0);
udelay(10);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm,
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xEFB0);
+ bcm43xx_phy_write(dev, 0x0015, 0xEFB0);
udelay(10);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm,
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
LPD(1, 0, 0)));
- bcm43xx_phy_write(bcm, 0x0015, 0xFFF0);
+ bcm43xx_phy_write(dev, 0x0015, 0xFFF0);
udelay(10);
- tmp2 += bcm43xx_phy_read(bcm, 0x002D);
- bcm43xx_phy_write(bcm, 0x0058, 0x0000);
- if (phy->connected)
- bcm43xx_phy_write(bcm, 0x0812,
- bcm43xx_get_812_value(bcm,
+ tmp2 += bcm43xx_phy_read(dev, 0x002D);
+ bcm43xx_phy_write(dev, 0x0058, 0x0000);
+ if (phy->gmode)
+ bcm43xx_phy_write(dev, 0x0812,
+ bcm43xx_get_812_value(dev,
LPD(1, 0, 1)));
- bcm43xx_phy_write(bcm, 0x0015, 0xAFB0);
+ bcm43xx_phy_write(dev, 0x0015, 0xAFB0);
}
tmp2++;
tmp2 >>= 8;
@@ -1620,35 +1668,35 @@ u16 bcm43xx_radio_init2050(struct bcm43x
}
/* Restore the registers */
- bcm43xx_phy_write(bcm, 0x0015, backup[1]);
- bcm43xx_radio_write16(bcm, 0x0051, backup[14]);
- bcm43xx_radio_write16(bcm, 0x0052, backup[15]);
- bcm43xx_radio_write16(bcm, 0x0043, backup[0]);
- bcm43xx_phy_write(bcm, 0x005A, backup[16]);
- bcm43xx_phy_write(bcm, 0x0059, backup[17]);
- bcm43xx_phy_write(bcm, 0x0058, backup[18]);
- bcm43xx_write16(bcm, 0x03E6, backup[11]);
+ bcm43xx_phy_write(dev, 0x0015, backup[1]);
+ bcm43xx_radio_write16(dev, 0x0051, backup[14]);
+ bcm43xx_radio_write16(dev, 0x0052, backup[15]);
+ bcm43xx_radio_write16(dev, 0x0043, backup[0]);
+ bcm43xx_phy_write(dev, 0x005A, backup[16]);
+ bcm43xx_phy_write(dev, 0x0059, backup[17]);
+ bcm43xx_phy_write(dev, 0x0058, backup[18]);
+ bcm43xx_write16(dev, 0x03E6, backup[11]);
if (phy->analog != 0)
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT, backup[12]);
- bcm43xx_phy_write(bcm, 0x0035, backup[10]);
- bcm43xx_radio_selectchannel(bcm, radio->channel, 1);
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT, backup[12]);
+ bcm43xx_phy_write(dev, 0x0035, backup[10]);
+ bcm43xx_radio_selectchannel(dev, phy->channel, 1);
if (phy->type == BCM43xx_PHYTYPE_B) {
- bcm43xx_phy_write(bcm, 0x0030, backup[2]);
- bcm43xx_write16(bcm, 0x03EC, backup[3]);
+ bcm43xx_phy_write(dev, 0x0030, backup[2]);
+ bcm43xx_write16(dev, 0x03EC, backup[3]);
} else {
- if (phy->connected) {
- bcm43xx_write16(bcm, BCM43xx_MMIO_PHY_RADIO,
- (bcm43xx_read16(bcm,
+ if (phy->gmode) {
+ bcm43xx_write16(dev, BCM43xx_MMIO_PHY_RADIO,
+ (bcm43xx_read16(dev,
BCM43xx_MMIO_PHY_RADIO) & 0x7FFF));
- bcm43xx_phy_write(bcm, 0x0811, backup[4]);
- bcm43xx_phy_write(bcm, 0x0812, backup[5]);
- bcm43xx_phy_write(bcm, 0x0814, backup[6]);
- bcm43xx_phy_write(bcm, 0x0815, backup[7]);
- bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, backup[8]);
- bcm43xx_phy_write(bcm, 0x0802, backup[9]);
+ bcm43xx_phy_write(dev, 0x0811, backup[4]);
+ bcm43xx_phy_write(dev, 0x0812, backup[5]);
+ bcm43xx_phy_write(dev, 0x0814, backup[6]);
+ bcm43xx_phy_write(dev, 0x0815, backup[7]);
+ bcm43xx_phy_write(dev, BCM43xx_PHY_G_CRS, backup[8]);
+ bcm43xx_phy_write(dev, 0x0802, backup[9]);
if (phy->rev > 1) {
- bcm43xx_phy_write(bcm, 0x080F, backup[19]);
- bcm43xx_phy_write(bcm, 0x0810, backup[20]);
+ bcm43xx_phy_write(dev, 0x080F, backup[19]);
+ bcm43xx_phy_write(dev, 0x0810, backup[20]);
}
}
}
@@ -1658,43 +1706,60 @@ u16 bcm43xx_radio_init2050(struct bcm43x
return ret;
}
-void bcm43xx_radio_init2060(struct bcm43xx_private *bcm)
+void bcm43xx_radio_init2060(struct bcm43xx_wldev *dev)
{
int err;
- bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
- bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
- bcm43xx_radio_write16(bcm, 0x0009, 0x0040);
- bcm43xx_radio_write16(bcm, 0x0005, 0x00AA);
- bcm43xx_radio_write16(bcm, 0x0032, 0x008F);
- bcm43xx_radio_write16(bcm, 0x0006, 0x008F);
- bcm43xx_radio_write16(bcm, 0x0034, 0x008F);
- bcm43xx_radio_write16(bcm, 0x002C, 0x0007);
- bcm43xx_radio_write16(bcm, 0x0082, 0x0080);
- bcm43xx_radio_write16(bcm, 0x0080, 0x0000);
- bcm43xx_radio_write16(bcm, 0x003F, 0x00DA);
- bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
- bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0010);
- bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
- bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020);
- udelay(400);
-
- bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0020) | 0x0010);
- udelay(400);
-
- bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008) | 0x0008);
- bcm43xx_radio_write16(bcm, 0x0085, bcm43xx_radio_read16(bcm, 0x0085) & ~0x0010);
- bcm43xx_radio_write16(bcm, 0x0005, bcm43xx_radio_read16(bcm, 0x0005) & ~0x0008);
- bcm43xx_radio_write16(bcm, 0x0081, bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040);
- bcm43xx_radio_write16(bcm, 0x0081, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0040) | 0x0040);
- bcm43xx_radio_write16(bcm, 0x0005, (bcm43xx_radio_read16(bcm, 0x0081) & ~0x0008) | 0x0008);
- bcm43xx_phy_write(bcm, 0x0063, 0xDDC6);
- bcm43xx_phy_write(bcm, 0x0069, 0x07BE);
- bcm43xx_phy_write(bcm, 0x006A, 0x0000);
-
- err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_A, 0);
- assert(err == 0);
- udelay(1000);
+ bcm43xx_radio_write16(dev, 0x0004, 0x00C0);
+ bcm43xx_radio_write16(dev, 0x0005, 0x0008);
+ bcm43xx_radio_write16(dev, 0x0009, 0x0040);
+ bcm43xx_radio_write16(dev, 0x0005, 0x00AA);
+ bcm43xx_radio_write16(dev, 0x0032, 0x008F);
+ bcm43xx_radio_write16(dev, 0x0006, 0x008F);
+ bcm43xx_radio_write16(dev, 0x0034, 0x008F);
+ bcm43xx_radio_write16(dev, 0x002C, 0x0007);
+ bcm43xx_radio_write16(dev, 0x0082, 0x0080);
+ bcm43xx_radio_write16(dev, 0x0080, 0x0000);
+ bcm43xx_radio_write16(dev, 0x003F, 0x00DA);
+ bcm43xx_radio_write16(dev, 0x0005,
+ bcm43xx_radio_read16(dev, 0x0005) & ~0x0008);
+ bcm43xx_radio_write16(dev, 0x0081,
+ bcm43xx_radio_read16(dev, 0x0081) & ~0x0010);
+ bcm43xx_radio_write16(dev, 0x0081,
+ bcm43xx_radio_read16(dev, 0x0081) & ~0x0020);
+ bcm43xx_radio_write16(dev, 0x0081,
+ bcm43xx_radio_read16(dev, 0x0081) & ~0x0020);
+ msleep(1); /* udelay(400); */
+
+ bcm43xx_radio_write16(dev, 0x0081,
+ (bcm43xx_radio_read16(dev, 0x0081) & ~0x0020)
+ | 0x0010);
+ msleep(1); /* udelay(400); */
+
+ bcm43xx_radio_write16(dev, 0x0005,
+ (bcm43xx_radio_read16(dev, 0x0005) & ~0x0008)
+ | 0x0008);
+ bcm43xx_radio_write16(dev, 0x0085,
+ bcm43xx_radio_read16(dev, 0x0085) & ~0x0010);
+ bcm43xx_radio_write16(dev, 0x0005,
+ bcm43xx_radio_read16(dev, 0x0005) & ~0x0008);
+ bcm43xx_radio_write16(dev, 0x0081,
+ bcm43xx_radio_read16(dev, 0x0081) & ~0x0040);
+ bcm43xx_radio_write16(dev, 0x0081,
+ (bcm43xx_radio_read16(dev, 0x0081) & ~0x0040)
+ | 0x0040);
+ bcm43xx_radio_write16(dev, 0x0005,
+ (bcm43xx_radio_read16(dev, 0x0081) & ~0x0008) |
+ 0x0008);
+ bcm43xx_phy_write(dev, 0x0063, 0xDDC6);
+ bcm43xx_phy_write(dev, 0x0069, 0x07BE);
+ bcm43xx_phy_write(dev, 0x006A, 0x0000);
+
+ err = bcm43xx_radio_selectchannel(dev, BCM43xx_RADIO_DEFAULT_CHANNEL_A,
+ 0);
+ BCM43xx_WARN_ON(err != 0);
+
+ msleep(1);
}
static inline
@@ -1714,137 +1779,81 @@ u16 freq_r3A_value(u16 frequency)
return value;
}
-void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm)
+void bcm43xx_radio_set_tx_iq(struct bcm43xx_wldev *dev)
{
static const u8 data_high[5] = { 0x00, 0x40, 0x80, 0x90, 0xD0 };
static const u8 data_low[5] = { 0x00, 0x01, 0x05, 0x06, 0x0A };
- u16 tmp = bcm43xx_radio_read16(bcm, 0x001E);
- int i, j;
-
+ u16 tmp = bcm43xx_radio_read16(dev, 0x001E);
+ int i;
+ int j;
+
for (i = 0; i < 5; i++) {
for (j = 0; j < 5; j++) {
if (tmp == (data_high[i] | data_low[j])) {
- bcm43xx_phy_write(bcm, 0x0069, (i - j) << 8 | 0x00C0);
+ bcm43xx_phy_write(dev, 0x0069, (i - j) << 8 |
+ 0x00C0);
return;
}
}
}
}
-int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm,
+int bcm43xx_radio_selectchannel(struct bcm43xx_wldev *dev,
u8 channel,
int synthetic_pu_workaround)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
- u16 r8, tmp;
- u16 freq;
+ struct bcm43xx_phy *phy = &dev->phy;
- if (!ieee80211_is_valid_channel(bcm->ieee, channel))
- return -EINVAL;
- if ((radio->manufact == 0x17F) &&
- (radio->version == 0x2060) &&
- (radio->revision == 1)) {
- freq = channel2freq_a(channel);
-
- r8 = bcm43xx_radio_read16(bcm, 0x0008);
- bcm43xx_write16(bcm, 0x03F0, freq);
- bcm43xx_radio_write16(bcm, 0x0008, r8);
-
- TODO();//TODO: write max channel TX power? to Radio 0x2D
- tmp = bcm43xx_radio_read16(bcm, 0x002E);
- tmp &= 0x0080;
- TODO();//TODO: OR tmp with the Power out estimation for this channel?
- bcm43xx_radio_write16(bcm, 0x002E, tmp);
-
- if (freq >= 4920 && freq <= 5500) {
- /*
- * r8 = (((freq * 15 * 0xE1FC780F) >> 32) / 29) & 0x0F;
- * = (freq * 0.025862069
- */
- r8 = 3 * freq / 116; /* is equal to r8 = freq * 0.025862 */
- }
- bcm43xx_radio_write16(bcm, 0x0007, (r8 << 4) | r8);
- bcm43xx_radio_write16(bcm, 0x0020, (r8 << 4) | r8);
- bcm43xx_radio_write16(bcm, 0x0021, (r8 << 4) | r8);
- bcm43xx_radio_write16(bcm, 0x0022,
- (bcm43xx_radio_read16(bcm, 0x0022)
- & 0x000F) | (r8 << 4));
- bcm43xx_radio_write16(bcm, 0x002A, (r8 << 4));
- bcm43xx_radio_write16(bcm, 0x002B, (r8 << 4));
- bcm43xx_radio_write16(bcm, 0x0008,
- (bcm43xx_radio_read16(bcm, 0x0008)
- & 0x00F0) | (r8 << 4));
- bcm43xx_radio_write16(bcm, 0x0029,
- (bcm43xx_radio_read16(bcm, 0x0029)
- & 0xFF0F) | 0x00B0);
- bcm43xx_radio_write16(bcm, 0x0035, 0x00AA);
- bcm43xx_radio_write16(bcm, 0x0036, 0x0085);
- bcm43xx_radio_write16(bcm, 0x003A,
- (bcm43xx_radio_read16(bcm, 0x003A)
- & 0xFF20) | freq_r3A_value(freq));
- bcm43xx_radio_write16(bcm, 0x003D,
- bcm43xx_radio_read16(bcm, 0x003D) & 0x00FF);
- bcm43xx_radio_write16(bcm, 0x0081,
- (bcm43xx_radio_read16(bcm, 0x0081)
- & 0xFF7F) | 0x0080);
- bcm43xx_radio_write16(bcm, 0x0035,
- bcm43xx_radio_read16(bcm, 0x0035) & 0xFFEF);
- bcm43xx_radio_write16(bcm, 0x0035,
- (bcm43xx_radio_read16(bcm, 0x0035)
- & 0xFFEF) | 0x0010);
- bcm43xx_radio_set_tx_iq(bcm);
- TODO(); //TODO: TSSI2dbm workaround
- bcm43xx_phy_xmitpower(bcm);//FIXME correct?
- } else {
- if (synthetic_pu_workaround)
- bcm43xx_synth_pu_workaround(bcm, channel);
+/* TODO: Check if channel is valid - return -EINVAL if not */
+ if (synthetic_pu_workaround)
+ bcm43xx_synth_pu_workaround(dev, channel);
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL,
- channel2freq_bg(channel));
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL,
+ channel2freq_bg(channel));
- if (channel == 14) {
- if (bcm->sprom.locale == BCM43xx_LOCALE_JAPAN) {
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
- BCM43xx_UCODEFLAGS_OFFSET,
- bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
- BCM43xx_UCODEFLAGS_OFFSET)
- & ~(1 << 7));
- } else {
- bcm43xx_shm_write32(bcm, BCM43xx_SHM_SHARED,
- BCM43xx_UCODEFLAGS_OFFSET,
- bcm43xx_shm_read32(bcm, BCM43xx_SHM_SHARED,
- BCM43xx_UCODEFLAGS_OFFSET)
- | (1 << 7));
- }
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
- bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
- | (1 << 11));
- } else {
- bcm43xx_write16(bcm, BCM43xx_MMIO_CHANNEL_EXT,
- bcm43xx_read16(bcm, BCM43xx_MMIO_CHANNEL_EXT)
- & 0xF7BF);
- }
+ if (channel == 14) {
+ if (dev->dev->bus->sprom.r1.country_code == 5) /* JAPAN) */
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
+ BCM43xx_UCODEFLAGS_OFFSET,
+ bcm43xx_shm_read32(dev,
+ BCM43xx_SHM_SHARED,
+ BCM43xx_UCODEFLAGS_OFFSET)
+ & ~(1 << 7));
+ else
+ bcm43xx_shm_write32(dev, BCM43xx_SHM_SHARED,
+ BCM43xx_UCODEFLAGS_OFFSET,
+ bcm43xx_shm_read32(dev,
+ BCM43xx_SHM_SHARED,
+ BCM43xx_UCODEFLAGS_OFFSET)
+ | (1 << 7));
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT,
+ bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT)
+ | (1 << 11));
+ } else {
+ bcm43xx_write16(dev, BCM43xx_MMIO_CHANNEL_EXT,
+ bcm43xx_read16(dev, BCM43xx_MMIO_CHANNEL_EXT)
+ & 0xF7BF);
}
- radio->channel = channel;
- //XXX: Using the longer of 2 timeouts (8000 vs 2000 usecs). Specs states
- // that 2000 usecs might suffice.
- udelay(8000);
+ phy->channel = channel;
+ /*XXX: Using the longer of 2 timeouts (8000 vs 2000 usecs). Specs states
+ * that 2000 usecs might suffice. */
+ msleep(8);
return 0;
}
-void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val)
+void bcm43xx_radio_set_txantenna(struct bcm43xx_wldev *dev, u32 val)
{
u16 tmp;
val <<= 8;
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0022) & 0xFCFF;
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0022, tmp | val);
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x03A8) & 0xFCFF;
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x03A8, tmp | val);
- tmp = bcm43xx_shm_read16(bcm, BCM43xx_SHM_SHARED, 0x0054) & 0xFCFF;
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0054, tmp | val);
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x0022) & 0xFCFF;
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0022, tmp | val);
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x03A8) & 0xFCFF;
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x03A8, tmp | val);
+ tmp = bcm43xx_shm_read16(dev, BCM43xx_SHM_SHARED, 0x0054) & 0xFCFF;
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0054, tmp | val);
}
/* http://bcm-specs.sipsolutions.net/TX_Gain_Base_Band */
@@ -1852,7 +1861,7 @@ static u16 bcm43xx_get_txgain_base_band(
{
u16 ret;
- assert(txpower <= 63);
+ BCM43xx_WARN_ON(txpower > 63);
if (txpower >= 54)
ret = 2;
@@ -1871,7 +1880,7 @@ static u16 bcm43xx_get_txgain_freq_power
{
u16 ret;
- assert(txpower <= 63);
+ BCM43xx_WARN_ON(txpower > 63);
if (txpower >= 32)
ret = 0;
@@ -1892,7 +1901,7 @@ static u16 bcm43xx_get_txgain_dac(u16 tx
{
u16 ret;
- assert(txpower <= 63);
+ BCM43xx_WARN_ON(txpower > 63);
if (txpower >= 54)
ret = txpower - 53;
@@ -1914,9 +1923,9 @@ static u16 bcm43xx_get_txgain_dac(u16 tx
return ret;
}
-void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower)
+void bcm43xx_radio_set_txpower_a(struct bcm43xx_wldev *dev, u16 txpower)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
u16 pamp, base, dac, ilt;
txpower = limit_value(txpower, 0, 63);
@@ -1924,110 +1933,103 @@ void bcm43xx_radio_set_txpower_a(struct
pamp = bcm43xx_get_txgain_freq_power_amp(txpower);
pamp <<= 5;
pamp &= 0x00E0;
- bcm43xx_phy_write(bcm, 0x0019, pamp);
+ bcm43xx_phy_write(dev, 0x0019, pamp);
base = bcm43xx_get_txgain_base_band(txpower);
base &= 0x000F;
- bcm43xx_phy_write(bcm, 0x0017, base | 0x0020);
+ bcm43xx_phy_write(dev, 0x0017, base | 0x0020);
- ilt = bcm43xx_ilt_read(bcm, 0x3001);
+ ilt = bcm43xx_ilt_read(dev, 0x3001);
ilt &= 0x0007;
dac = bcm43xx_get_txgain_dac(txpower);
dac <<= 3;
dac |= ilt;
- bcm43xx_ilt_write(bcm, 0x3001, dac);
+ bcm43xx_ilt_write(dev, 0x3001, dac);
- radio->txpwr_offset = txpower;
+ phy->txpwr_offset = txpower;
- TODO();
- //TODO: FuncPlaceholder (Adjust BB loft cancel)
+ /* TODO: FuncPlaceholder (Adjust BB loft cancel) */
}
-void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
+void bcm43xx_radio_set_txpower_bg(struct bcm43xx_wldev *dev,
u16 baseband_attenuation, u16 radio_attenuation,
u16 txpower)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
if (baseband_attenuation == 0xFFFF)
- baseband_attenuation = radio->baseband_atten;
+ baseband_attenuation = phy->bbatt;
if (radio_attenuation == 0xFFFF)
- radio_attenuation = radio->radio_atten;
+ radio_attenuation = phy->rfatt;
if (txpower == 0xFFFF)
- txpower = radio->txctl1;
- radio->baseband_atten = baseband_attenuation;
- radio->radio_atten = radio_attenuation;
- radio->txctl1 = txpower;
-
- assert(/*baseband_attenuation >= 0 &&*/ baseband_attenuation <= 11);
- if (radio->revision < 6)
- assert(/*radio_attenuation >= 0 &&*/ radio_attenuation <= 9);
+ txpower = phy->txctl1;
+ phy->bbatt = baseband_attenuation;
+ phy->rfatt = radio_attenuation;
+ phy->txctl1 = txpower;
+
+ BCM43xx_WARN_ON(baseband_attenuation > 11);
+ if (phy->radio_rev < 6)
+ BCM43xx_WARN_ON(radio_attenuation > 9);
else
- assert(/* radio_attenuation >= 0 &&*/ radio_attenuation <= 31);
- assert(/*txpower >= 0 &&*/ txpower <= 7);
+ BCM43xx_WARN_ON(radio_attenuation > 31);
+ BCM43xx_WARN_ON(txpower > 7);
- bcm43xx_phy_set_baseband_attenuation(bcm, baseband_attenuation);
- bcm43xx_radio_write16(bcm, 0x0043, radio_attenuation);
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0064, radio_attenuation);
- if (radio->version == 0x2050) {
- bcm43xx_radio_write16(bcm, 0x0052,
- (bcm43xx_radio_read16(bcm, 0x0052) & ~0x0070)
- | ((txpower << 4) & 0x0070));
- }
- //FIXME: The spec is very weird and unclear here.
+ bcm43xx_phy_set_baseband_attenuation(dev, baseband_attenuation);
+ bcm43xx_radio_write16(dev, 0x0043, radio_attenuation);
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0064, radio_attenuation);
+ if (phy->radio_ver == 0x2050)
+ bcm43xx_radio_write16(dev, 0x0052,
+ (bcm43xx_radio_read16(dev, 0x0052)
+ & ~0x0070) | ((txpower << 4) & 0x0070));
+ /* FIXME: The spec is very weird and unclear here. */
if (phy->type == BCM43xx_PHYTYPE_G)
- bcm43xx_phy_lo_adjust(bcm, 0);
+ bcm43xx_phy_lo_adjust(dev, 0);
}
-u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm)
+u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- if (radio->version == 0x2050 && radio->revision < 6)
+ if (phy->radio_ver == 0x2050 && phy->radio_rev < 6)
return 0;
return 2;
}
-u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm)
+u16 bcm43xx_default_radio_attenuation(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 att = 0xFFFF;
- if (phy->type == BCM43xx_PHYTYPE_A)
- return 0x60;
-
- switch (radio->version) {
+ switch (phy->radio_ver) {
case 0x2053:
- switch (radio->revision) {
+ switch (phy->radio_rev) {
case 1:
att = 6;
break;
}
break;
case 0x2050:
- switch (radio->revision) {
+ switch (phy->radio_rev) {
case 0:
att = 5;
break;
case 1:
if (phy->type == BCM43xx_PHYTYPE_G) {
- if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x421 &&
- bcm->board_revision >= 30)
+ if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type == 0x421 &&
+ dev->dev->bus->boardinfo.rev >= 30)
att = 3;
- else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x416)
+ else if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type == 0x416)
att = 3;
else
att = 1;
} else {
- if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x421 &&
- bcm->board_revision >= 30)
+ if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type == 0x421 &&
+ dev->dev->bus->boardinfo.rev >= 30)
att = 7;
else
att = 6;
@@ -2035,19 +2037,21 @@ u16 bcm43xx_default_radio_attenuation(st
break;
case 2:
if (phy->type == BCM43xx_PHYTYPE_G) {
- if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x421 &&
- bcm->board_revision >= 30)
+ if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type == 0x421 &&
+ dev->dev->bus->boardinfo.rev >= 30)
att = 3;
- else if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x416)
+ else if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type ==
+ 0x416)
att = 5;
- else if (bcm->chip_id == 0x4320)
+ else if (dev->dev->bus->chip_id == 0x4320)
att = 4;
else
att = 3;
- } else
+ } else {
att = 6;
+ }
break;
case 3:
att = 5;
@@ -2068,11 +2072,11 @@ u16 bcm43xx_default_radio_attenuation(st
att = 5;
}
}
- if (bcm->board_vendor == PCI_VENDOR_ID_BROADCOM &&
- bcm->board_type == 0x421) {
- if (bcm->board_revision < 0x43)
+ if (is_bcm_board_vendor(dev) &&
+ dev->dev->bus->boardinfo.type == 0x421) {
+ if (dev->dev->bus->boardinfo.rev < 0x43)
att = 2;
- else if (bcm->board_revision < 0x51)
+ else if (dev->dev->bus->boardinfo.rev < 0x51)
att = 3;
}
if (att == 0xFFFF)
@@ -2081,90 +2085,77 @@ u16 bcm43xx_default_radio_attenuation(st
return att;
}
-u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm)
+u16 bcm43xx_default_txctl1(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
- if (radio->version != 0x2050)
+ if (phy->radio_ver != 0x2050)
return 0;
- if (radio->revision == 1)
+ if (phy->radio_rev == 1)
return 3;
- if (radio->revision < 6)
+ if (phy->radio_rev < 6)
return 2;
- if (radio->revision == 8)
+ if (phy->radio_rev == 8)
return 1;
return 0;
}
-void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm)
+void bcm43xx_radio_turn_on(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;
int err;
- if (radio->enabled)
+ might_sleep();
+
+ if (phy->radio_on)
return;
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- bcm43xx_radio_write16(bcm, 0x0004, 0x00C0);
- bcm43xx_radio_write16(bcm, 0x0005, 0x0008);
- bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) & 0xFFF7);
- bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) & 0xFFF7);
- bcm43xx_radio_init2060(bcm);
- break;
case BCM43xx_PHYTYPE_B:
case BCM43xx_PHYTYPE_G:
- bcm43xx_phy_write(bcm, 0x0015, 0x8000);
- bcm43xx_phy_write(bcm, 0x0015, 0xCC00);
- bcm43xx_phy_write(bcm, 0x0015, (phy->connected ? 0x00C0 : 0x0000));
- err = bcm43xx_radio_selectchannel(bcm, BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 1);
- assert(err == 0);
+ bcm43xx_phy_write(dev, 0x0015, 0x8000);
+ bcm43xx_phy_write(dev, 0x0015, 0xCC00);
+ bcm43xx_phy_write(dev, 0x0015, (phy->gmode ? 0x00C0 : 0x0000));
+ err = bcm43xx_radio_selectchannel(dev,
+ BCM43xx_RADIO_DEFAULT_CHANNEL_BG, 1);
+ BCM43xx_WARN_ON(err != 0);
break;
default:
- assert(0);
+ BCM43xx_BUG_ON(1);
}
- radio->enabled = 1;
- dprintk(KERN_INFO PFX "Radio turned on\n");
- bcm43xx_leds_update(bcm, 0);
+ phy->radio_on = 1;
+ bcmdbg(dev->wl, "Radio turned on\n");
+ bcm43xx_leds_update(dev, 0);
}
-
-void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
+
+void bcm43xx_radio_turn_off(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;
- if (phy->type == BCM43xx_PHYTYPE_A) {
- bcm43xx_radio_write16(bcm, 0x0004, 0x00FF);
- bcm43xx_radio_write16(bcm, 0x0005, 0x00FB);
- bcm43xx_phy_write(bcm, 0x0010, bcm43xx_phy_read(bcm, 0x0010) | 0x0008);
- bcm43xx_phy_write(bcm, 0x0011, bcm43xx_phy_read(bcm, 0x0011) | 0x0008);
+ if (phy->type == BCM43xx_PHYTYPE_G && dev->dev->id.revision >= 5) {
+ bcm43xx_phy_write(dev, 0x0811, bcm43xx_phy_read(dev, 0x0811) |
+ 0x008C);
+ bcm43xx_phy_write(dev, 0x0812, bcm43xx_phy_read(dev, 0x0812) &
+ 0xFF73);
+ } else {
+ bcm43xx_phy_write(dev, 0x0015, 0xAA00);
}
- if (phy->type == BCM43xx_PHYTYPE_G && bcm->current_core->rev >= 5) {
- bcm43xx_phy_write(bcm, 0x0811, bcm43xx_phy_read(bcm, 0x0811) | 0x008C);
- bcm43xx_phy_write(bcm, 0x0812, bcm43xx_phy_read(bcm, 0x0812) & 0xFF73);
- } else
- bcm43xx_phy_write(bcm, 0x0015, 0xAA00);
- radio->enabled = 0;
- dprintk(KERN_INFO PFX "Radio turned off\n");
- bcm43xx_leds_update(bcm, 0);
+ phy->radio_on = 0;
+ bcmdbg(dev->wl, "Radio turned off\n");
+ bcm43xx_leds_update(dev, 0);
}
-void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm)
+void bcm43xx_radio_clear_tssi(struct bcm43xx_wldev *dev)
{
- struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
+ struct bcm43xx_phy *phy = &dev->phy;
switch (phy->type) {
- case BCM43xx_PHYTYPE_A:
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0068, 0x7F7F);
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x006a, 0x7F7F);
- break;
case BCM43xx_PHYTYPE_B:
case BCM43xx_PHYTYPE_G:
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0058, 0x7F7F);
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x005a, 0x7F7F);
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0070, 0x7F7F);
- bcm43xx_shm_write16(bcm, BCM43xx_SHM_SHARED, 0x0072, 0x7F7F);
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0058, 0x7F7F);
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x005a, 0x7F7F);
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0070, 0x7F7F);
+ bcm43xx_shm_write16(dev, BCM43xx_SHM_SHARED, 0x0072, 0x7F7F);
break;
}
}
Index: linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
===================================================================
--- linux-2.6.orig/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
+++ linux-2.6/drivers/net/wireless/bcm43xx/bcm43xx_radio.h
@@ -53,63 +53,48 @@
#define BCM43xx_RADIO_INTERFMODE_AUTOWLAN 3
-void bcm43xx_radio_lock(struct bcm43xx_private *bcm);
-void bcm43xx_radio_unlock(struct bcm43xx_private *bcm);
+void bcm43xx_radio_lock(struct bcm43xx_wldev *dev);
+void bcm43xx_radio_unlock(struct bcm43xx_wldev *dev);
-u16 bcm43xx_radio_read16(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_radio_write16(struct bcm43xx_private *bcm, u16 offset, u16 val);
+u16 bcm43xx_radio_read16(struct bcm43xx_wldev *dev, u16 offset);
+void bcm43xx_radio_write16(struct bcm43xx_wldev *dev, u16 offset, u16 val);
-u16 bcm43xx_radio_init2050(struct bcm43xx_private *bcm);
-void bcm43xx_radio_init2060(struct bcm43xx_private *bcm);
+u16 bcm43xx_radio_init2050(struct bcm43xx_wldev *dev);
+void bcm43xx_radio_init2060(struct bcm43xx_wldev *dev);
-void bcm43xx_radio_turn_on(struct bcm43xx_private *bcm);
-void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm);
-
-static inline
-int bcm43xx_is_hw_radio_enabled(struct bcm43xx_private *bcm)
-{
- /* function to return state of hardware enable of radio
- * returns 0 if radio disabled, 1 if radio enabled
- */
- if (bcm->current_core->rev >= 3)
- return ((bcm43xx_read32(bcm, BCM43xx_MMIO_RADIO_HWENABLED_HI)
- & BCM43xx_MMIO_RADIO_HWENABLED_HI_MASK)
- == 0) ? 1 : 0;
- else
- return ((bcm43xx_read16(bcm, BCM43xx_MMIO_RADIO_HWENABLED_LO)
- & BCM43xx_MMIO_RADIO_HWENABLED_LO_MASK)
- == 0) ? 0 : 1;
-}
+void bcm43xx_radio_turn_on(struct bcm43xx_wldev *dev);
+void bcm43xx_radio_turn_off(struct bcm43xx_wldev *dev);
-int bcm43xx_radio_selectchannel(struct bcm43xx_private *bcm, u8 channel,
+int bcm43xx_radio_selectchannel(struct bcm43xx_wldev *dev, u8 channel,
int synthetic_pu_workaround);
-void bcm43xx_radio_set_txpower_a(struct bcm43xx_private *bcm, u16 txpower);
-void bcm43xx_radio_set_txpower_bg(struct bcm43xx_private *bcm,
+void bcm43xx_radio_set_txpower_a(struct bcm43xx_wldev *dev, u16 txpower);
+void bcm43xx_radio_set_txpower_bg(struct bcm43xx_wldev *dev,
u16 baseband_attenuation, u16 attenuation,
u16 txpower);
-u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_private *bcm);
-u16 bcm43xx_default_radio_attenuation(struct bcm43xx_private *bcm);
-u16 bcm43xx_default_txctl1(struct bcm43xx_private *bcm);
+u16 bcm43xx_default_baseband_attenuation(struct bcm43xx_wldev *dev);
+u16 bcm43xx_default_radio_attenuation(struct bcm43xx_wldev *dev);
+u16 bcm43xx_default_txctl1(struct bcm43xx_wldev *dev);
-void bcm43xx_radio_set_txantenna(struct bcm43xx_private *bcm, u32 val);
+void bcm43xx_radio_set_txantenna(struct bcm43xx_wldev *dev, u32 val);
-void bcm43xx_radio_clear_tssi(struct bcm43xx_private *bcm);
+void bcm43xx_radio_clear_tssi(struct bcm43xx_wldev *dev);
-u8 bcm43xx_radio_aci_detect(struct bcm43xx_private *bcm, u8 channel);
-u8 bcm43xx_radio_aci_scan(struct bcm43xx_private *bcm);
+u8 bcm43xx_radio_aci_detect(struct bcm43xx_wldev *dev, u8 channel);
+u8 bcm43xx_radio_aci_scan(struct bcm43xx_wldev *dev);
-int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm, int mode);
+int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_wldev *dev,
+ int mode);
-void bcm43xx_calc_nrssi_slope(struct bcm43xx_private *bcm);
-void bcm43xx_calc_nrssi_threshold(struct bcm43xx_private *bcm);
-s16 bcm43xx_nrssi_hw_read(struct bcm43xx_private *bcm, u16 offset);
-void bcm43xx_nrssi_hw_write(struct bcm43xx_private *bcm, u16 offset, s16 val);
-void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val);
-void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm);
+void bcm43xx_calc_nrssi_slope(struct bcm43xx_wldev *dev);
+void bcm43xx_calc_nrssi_threshold(struct bcm43xx_wldev *dev);
+s16 bcm43xx_nrssi_hw_read(struct bcm43xx_wldev *dev, u16 offset);
+void bcm43xx_nrssi_hw_write(struct bcm43xx_wldev *dev, u16 offset, s16 val);
+void bcm43xx_nrssi_hw_update(struct bcm43xx_wldev *dev, u16 val);
+void bcm43xx_nrssi_mem_update(struct bcm43xx_wldev *dev);
-void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm);
-u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm);
+void bcm43xx_radio_set_tx_iq(struct bcm43xx_wldev *dev);
+u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_wldev *dev);
#endif /* BCM43xx_RADIO_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
