openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

b43: N-PHY: grab more info about new channel 

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki 2010-10-11 03:11:01 +02:00 committed by John W. Linville
parent a8909cfb18
commit a656b6a966
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/net/wireless/b43/phy_n.c
View File

@ -3323,9 +3323,9 @@ int b43_phy_initn(struct b43_wldev *dev)
} }
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */ /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/ChanspecSetup */
static void b43_nphy_chanspec_setup(struct b43_wldev *dev, static void b43_nphy_channel_setup(struct b43_wldev *dev,
const struct b43_phy_n_sfo_cfg *e, const struct b43_phy_n_sfo_cfg *e,
struct b43_chanspec chanspec) struct ieee80211_channel *new_channel)
{ {
struct b43_phy *phy = &dev->phy; struct b43_phy *phy = &dev->phy;
struct b43_phy_n *nphy = dev->phy.n; struct b43_phy_n *nphy = dev->phy.n;
@ -3334,13 +3334,13 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,
u32 tmp32; u32 tmp32;
tmp = b43_phy_read(dev, B43_NPHY_BANDCTL) & B43_NPHY_BANDCTL_5GHZ; tmp = b43_phy_read(dev, B43_NPHY_BANDCTL) & B43_NPHY_BANDCTL_5GHZ;
if (chanspec.b_freq == 1 && tmp == 0) { if (new_channel->band == IEEE80211_BAND_5GHZ && tmp == 0) {
tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR); tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR);
b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4); b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4);
b43_phy_set(dev, B43_PHY_B_BBCFG, 0xC000); b43_phy_set(dev, B43_PHY_B_BBCFG, 0xC000);
b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32); b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32);
b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ); b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ);
} else if (chanspec.b_freq == 1) { } else if (new_channel->band == IEEE80211_BAND_5GHZ) {
b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ); b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);
tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR); tmp32 = b43_read32(dev, B43_MMIO_PSM_PHY_HDR);
b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4); b43_write32(dev, B43_MMIO_PSM_PHY_HDR, tmp32 | 4);
@ -3350,13 +3350,12 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,
b43_chantab_phy_upload(dev, e); b43_chantab_phy_upload(dev, e);
if (new_channel->hw_value == 14) {
if (nphy->radio_chanspec.channel == 14) {
b43_nphy_classifier(dev, 2, 0); b43_nphy_classifier(dev, 2, 0);
b43_phy_set(dev, B43_PHY_B_TEST, 0x0800); b43_phy_set(dev, B43_PHY_B_TEST, 0x0800);
} else { } else {
b43_nphy_classifier(dev, 2, 2); b43_nphy_classifier(dev, 2, 2);
if (chanspec.b_freq == 2) if (new_channel->band == IEEE80211_BAND_2GHZ)
b43_phy_mask(dev, B43_PHY_B_TEST, ~0x840); b43_phy_mask(dev, B43_PHY_B_TEST, ~0x840);
} }
@ -3379,16 +3378,17 @@ static void b43_nphy_chanspec_setup(struct b43_wldev *dev,
} }
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetChanspec */ /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/SetChanspec */
static int b43_nphy_set_chanspec(struct b43_wldev *dev, static int b43_nphy_set_channel(struct b43_wldev *dev,
struct b43_chanspec chanspec) struct ieee80211_channel *channel,
enum nl80211_channel_type channel_type)
{ {
struct b43_phy *phy = &dev->phy;
struct b43_phy_n *nphy = dev->phy.n; struct b43_phy_n *nphy = dev->phy.n;
const struct b43_nphy_channeltab_entry_rev2 *tabent_r2; const struct b43_nphy_channeltab_entry_rev2 *tabent_r2;
const struct b43_nphy_channeltab_entry_rev3 *tabent_r3; const struct b43_nphy_channeltab_entry_rev3 *tabent_r3;
u8 tmp; u8 tmp;
u8 channel = chanspec.channel;
if (dev->phy.rev >= 3) { if (dev->phy.rev >= 3) {
/* TODO */ /* TODO */
@ -3396,36 +3396,36 @@ static int b43_nphy_set_chanspec(struct b43_wldev *dev,
if (!tabent_r3) if (!tabent_r3)
return -ESRCH; return -ESRCH;
} else { } else {
tabent_r2 = b43_nphy_get_chantabent_rev2(dev, channel); tabent_r2 = b43_nphy_get_chantabent_rev2(dev,
channel->hw_value);
if (!tabent_r2) if (!tabent_r2)
return -ESRCH; return -ESRCH;
} }
nphy->radio_chanspec = chanspec; nphy->radio_chanspec.channel = channel->hw_value;
/*
if (chanspec.b_width != nphy->b_width) if (chanspec.b_width != nphy->b_width)
; /* TODO: BMAC BW Set (chanspec.b_width) */ ; TODO: BMAC BW Set (chanspec.b_width)
*/
/* TODO: use defines */ if (channel_type == NL80211_CHAN_HT40PLUS)
if (chanspec.b_width == 3) { b43_phy_set(dev, B43_NPHY_RXCTL,
if (chanspec.sideband == 2) B43_NPHY_RXCTL_BSELU20);
b43_phy_set(dev, B43_NPHY_RXCTL, else if (channel_type == NL80211_CHAN_HT40MINUS)
B43_NPHY_RXCTL_BSELU20); b43_phy_mask(dev, B43_NPHY_RXCTL,
else ~B43_NPHY_RXCTL_BSELU20);
b43_phy_mask(dev, B43_NPHY_RXCTL,
~B43_NPHY_RXCTL_BSELU20);
}
if (dev->phy.rev >= 3) { if (dev->phy.rev >= 3) {
tmp = (chanspec.b_freq == 1) ? 4 : 0; tmp = (channel->band == IEEE80211_BAND_5GHZ) ? 4 : 0;
b43_radio_maskset(dev, 0x08, 0xFFFB, tmp); b43_radio_maskset(dev, 0x08, 0xFFFB, tmp);
/* TODO: PHY Radio2056 Setup (dev, tabent_r3); */ /* TODO: PHY Radio2056 Setup (dev, tabent_r3); */
b43_nphy_chanspec_setup(dev, &(tabent_r3->phy_regs), chanspec); b43_nphy_channel_setup(dev, &(tabent_r3->phy_regs), channel);
} else { } else {
tmp = (chanspec.b_freq == 1) ? 0x0020 : 0x0050; tmp = (channel->band == IEEE80211_BAND_5GHZ) ? 0x0020 : 0x0050;
b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, tmp); b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, tmp);
b43_radio_2055_setup(dev, tabent_r2); b43_radio_2055_setup(dev, tabent_r2);
b43_nphy_chanspec_setup(dev, &(tabent_r2->phy_regs), chanspec); b43_nphy_channel_setup(dev, &(tabent_r2->phy_regs), channel);
} }
return 0; return 0;
@ -3567,8 +3567,8 @@ static void b43_nphy_op_switch_analog(struct b43_wldev *dev, bool on)
static int b43_nphy_op_switch_channel(struct b43_wldev *dev, static int b43_nphy_op_switch_channel(struct b43_wldev *dev,
unsigned int new_channel) unsigned int new_channel)
{ {
struct b43_phy_n *nphy = dev->phy.n; struct ieee80211_channel *channel = dev->wl->hw->conf.channel;
struct b43_chanspec chanspec; enum nl80211_channel_type channel_type = dev->wl->hw->conf.channel_type;
if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) { if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ) {
if ((new_channel < 1) || (new_channel > 14)) if ((new_channel < 1) || (new_channel > 14))
@ -3578,10 +3578,7 @@ static int b43_nphy_op_switch_channel(struct b43_wldev *dev,
return -EINVAL; return -EINVAL;
} }
chanspec = nphy->radio_chanspec; return b43_nphy_set_channel(dev, channel, channel_type);
chanspec.channel = new_channel;
return b43_nphy_set_chanspec(dev, chanspec);
} }
static unsigned int b43_nphy_op_get_default_chan(struct b43_wldev *dev) static unsigned int b43_nphy_op_get_default_chan(struct b43_wldev *dev)