Skip to content

L
linux-davinci
Commit acaa410d authored by Mattias Nissler's avatar Mattias Nissler Committed by David S. Miller
Browse files
Options

rt2x00: Rework rt61 antenna selection. 

This patch changes rt61 antenna selection again. It helps at least with the
rt61 pci card in my box, I hope I haven't broken behaviour on other RF chips.
RF 2529 antenna setup is incomplete, we need to at code for diversity when we
figure out how it is done properly.
Signed-off-by: default avatarMattias Nissler <mattias.nissler@gmx.de>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e14f6d3
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 107 deletions
drivers/net/wireless/rt2x00/rt61pci.c
View file @ acaa410d
...@@ -422,40 +422,24 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev, ...@@ -422,40 +422,24 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
rt61pci_bbp_read(rt2x00dev, 77, &r77); rt61pci_bbp_read(rt2x00dev, 77, &r77);
rt2x00_set_field8(&r3, BBP_R3_SMART_MODE, rt2x00_set_field8(&r3, BBP_R3_SMART_MODE,
!rt2x00_rf(&rt2x00dev->chip, RF5225)); rt2x00_rf(&rt2x00dev->chip, RF5325));
/*
* Configure the TX antenna.
*/
switch (ant->tx) {
case ANTENNA_A:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 0);
break;
case ANTENNA_SW_DIVERSITY:
case ANTENNA_HW_DIVERSITY:
/*
* NOTE: We should never come here because rt2x00lib is
* supposed to catch this and send us the correct antenna
* explicitely. However we are nog going to bug about this.
* Instead, just default to antenna B.
*/
case ANTENNA_B:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 3);
break;
}
/* /*
* Configure the RX antenna. * Configure the RX antenna.
*/ */
switch (ant->rx) { switch (ant->rx) {
case ANTENNA_HW_DIVERSITY: case ANTENNA_HW_DIVERSITY:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
(rt2x00dev->curr_hwmode != HWMODE_A)); (rt2x00dev->curr_hwmode != HWMODE_A));
break; break;
case ANTENNA_A: case ANTENNA_A:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
if (rt2x00dev->curr_hwmode == HWMODE_A)
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
break; break;
case ANTENNA_SW_DIVERSITY: case ANTENNA_SW_DIVERSITY:
/* /*
...@@ -465,8 +449,12 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev, ...@@ -465,8 +449,12 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
* Instead, just default to antenna B. * Instead, just default to antenna B.
*/ */
case ANTENNA_B: case ANTENNA_B:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0); rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
if (rt2x00dev->curr_hwmode == HWMODE_A)
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
else
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
break; break;
} }
...@@ -487,39 +475,20 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev, ...@@ -487,39 +475,20 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
rt61pci_bbp_read(rt2x00dev, 77, &r77); rt61pci_bbp_read(rt2x00dev, 77, &r77);
rt2x00_set_field8(&r3, BBP_R3_SMART_MODE, rt2x00_set_field8(&r3, BBP_R3_SMART_MODE,
!rt2x00_rf(&rt2x00dev->chip, RF2527)); rt2x00_rf(&rt2x00dev->chip, RF2529));
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
!test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags)); !test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags));
/*
* Configure the TX antenna.
*/
switch (ant->tx) {
case ANTENNA_A:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 0);
break;
case ANTENNA_SW_DIVERSITY:
case ANTENNA_HW_DIVERSITY:
/*
* NOTE: We should never come here because rt2x00lib is
* supposed to catch this and send us the correct antenna
* explicitely. However we are nog going to bug about this.
* Instead, just default to antenna B.
*/
case ANTENNA_B:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 3);
break;
}
/* /*
* Configure the RX antenna. * Configure the RX antenna.
*/ */
switch (ant->rx) { switch (ant->rx) {
case ANTENNA_HW_DIVERSITY: case ANTENNA_HW_DIVERSITY:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 2);
break; break;
case ANTENNA_A: case ANTENNA_A:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
break; break;
case ANTENNA_SW_DIVERSITY: case ANTENNA_SW_DIVERSITY:
/* /*
...@@ -529,7 +498,8 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev, ...@@ -529,7 +498,8 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
* Instead, just default to antenna B. * Instead, just default to antenna B.
*/ */
case ANTENNA_B: case ANTENNA_B:
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
break; break;
} }
...@@ -545,16 +515,13 @@ static void rt61pci_config_antenna_2529_rx(struct rt2x00_dev *rt2x00dev, ...@@ -545,16 +515,13 @@ static void rt61pci_config_antenna_2529_rx(struct rt2x00_dev *rt2x00dev,
rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg); rt2x00pci_register_read(rt2x00dev, MAC_CSR13, &reg);
if (p1 != 0xff) { rt2x00_set_field32(&reg, MAC_CSR13_BIT4, p1);
rt2x00_set_field32(&reg, MAC_CSR13_BIT4, !!p1);
rt2x00_set_field32(&reg, MAC_CSR13_BIT12, 0); rt2x00_set_field32(&reg, MAC_CSR13_BIT12, 0);
rt2x00pci_register_write(rt2x00dev, MAC_CSR13, reg);
}
if (p2 != 0xff) {
rt2x00_set_field32(&reg, MAC_CSR13_BIT3, !p2); rt2x00_set_field32(&reg, MAC_CSR13_BIT3, !p2);
rt2x00_set_field32(&reg, MAC_CSR13_BIT11, 0); rt2x00_set_field32(&reg, MAC_CSR13_BIT11, 0);
rt2x00pci_register_write(rt2x00dev, MAC_CSR13, reg); rt2x00pci_register_write(rt2x00dev, MAC_CSR13, reg);
}
} }
static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev, static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
...@@ -570,37 +537,18 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev, ...@@ -570,37 +537,18 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
rt61pci_bbp_read(rt2x00dev, 4, &r4); rt61pci_bbp_read(rt2x00dev, 4, &r4);
rt61pci_bbp_read(rt2x00dev, 77, &r77); rt61pci_bbp_read(rt2x00dev, 77, &r77);
rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &eeprom); /* FIXME: Antenna selection for the rf 2529 is very confusing in the
rx_ant = !!(rt2x00_get_field16(eeprom, EEPROM_NIC_TX_RX_FIXED) & 2); * legacy driver. The code below should be ok for non-diversity setups.
rt2x00_set_field8(&r3, BBP_R3_SMART_MODE, 0);
/*
* Configure the TX antenna.
*/
switch (ant->tx) {
case ANTENNA_A:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 0);
break;
case ANTENNA_SW_DIVERSITY:
case ANTENNA_HW_DIVERSITY:
/*
* NOTE: We should never come here because rt2x00lib is
* supposed to catch this and send us the correct antenna
* explicitely. However we are nog going to bug about this.
* Instead, just default to antenna B.
*/ */
case ANTENNA_B:
rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 3);
break;
}
/* /*
* Configure the RX antenna. * Configure the RX antenna.
*/ */
switch (ant->rx) { switch (ant->rx) {
case ANTENNA_A: case ANTENNA_A:
rt61pci_config_antenna_2529_rx(rt2x00dev, 0, rx_ant); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 0);
rt61pci_config_antenna_2529_rx(rt2x00dev, 0, 0);
break; break;
case ANTENNA_SW_DIVERSITY: case ANTENNA_SW_DIVERSITY:
case ANTENNA_HW_DIVERSITY: case ANTENNA_HW_DIVERSITY:
...@@ -611,27 +559,12 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev, ...@@ -611,27 +559,12 @@ static void rt61pci_config_antenna_2529(struct rt2x00_dev *rt2x00dev,
* Instead, just default to antenna B. * Instead, just default to antenna B.
*/ */
case ANTENNA_B: case ANTENNA_B:
rt61pci_config_antenna_2529_rx(rt2x00dev, 1, rx_ant); rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA_CONTROL, 1);
rt2x00_set_field8(&r77, BBP_R77_RX_ANTENNA, 3);
rt61pci_config_antenna_2529_rx(rt2x00dev, 1, 1);
break; break;
} }
/*
* FIXME: We are using the default antenna setup to
* determine the remaining settings. This because we
* need to know what the EEPROM indicated.
* It is however unclear if this is required, and overall
* using the default antenna settings here is incorrect
* since mac80211 might have told us to use fixed settings.
*/
if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
else
rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
(rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY) &&
(rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY));
rt61pci_bbp_write(rt2x00dev, 77, r77); rt61pci_bbp_write(rt2x00dev, 77, r77);
rt61pci_bbp_write(rt2x00dev, 3, r3); rt61pci_bbp_write(rt2x00dev, 3, r3);
rt61pci_bbp_write(rt2x00dev, 4, r4); rt61pci_bbp_write(rt2x00dev, 4, r4);
...@@ -676,8 +609,6 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev, ...@@ -676,8 +609,6 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev,
unsigned int i; unsigned int i;
u32 reg; u32 reg;
rt2x00pci_register_read(rt2x00dev, PHY_CSR0, &reg);
if (rt2x00dev->curr_hwmode == HWMODE_A) { if (rt2x00dev->curr_hwmode == HWMODE_A) {
sel = antenna_sel_a; sel = antenna_sel_a;
lna = test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags); lna = test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags);
...@@ -686,15 +617,17 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev, ...@@ -686,15 +617,17 @@ static void rt61pci_config_antenna(struct rt2x00_dev *rt2x00dev,
lna = test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags); lna = test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags);
} }
for (i = 0; i < ARRAY_SIZE(antenna_sel_a); i++)
rt61pci_bbp_write(rt2x00dev, sel[i].word, sel[i].value[lna]);
rt2x00pci_register_read(rt2x00dev, PHY_CSR0, &reg);
rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_BG, rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_BG,
(rt2x00dev->curr_hwmode == HWMODE_B || (rt2x00dev->curr_hwmode == HWMODE_B ||
rt2x00dev->curr_hwmode == HWMODE_G)); rt2x00dev->curr_hwmode == HWMODE_G));
rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_A, rt2x00_set_field32(&reg, PHY_CSR0_PA_PE_A,
(rt2x00dev->curr_hwmode == HWMODE_A)); (rt2x00dev->curr_hwmode == HWMODE_A));
for (i = 0; i < ARRAY_SIZE(antenna_sel_a); i++)
rt61pci_bbp_write(rt2x00dev, sel[i].word, sel[i].value[lna]);
rt2x00pci_register_write(rt2x00dev, PHY_CSR0, reg); rt2x00pci_register_write(rt2x00dev, PHY_CSR0, reg);
if (rt2x00_rf(&rt2x00dev->chip, RF5225) || if (rt2x00_rf(&rt2x00dev->chip, RF5225) ||
......
drivers/net/wireless/rt2x00/rt61pci.h
View file @ acaa410d
...@@ -1077,13 +1077,19 @@ struct hw_pairwise_ta_entry { ...@@ -1077,13 +1077,19 @@ struct hw_pairwise_ta_entry {
* R4: RX antenna control * R4: RX antenna control
* FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529) * FRAME_END: 1 - DPDT, 0 - SPDT (Only valid for 802.11G, RF2527 & RF2529)
*/ */
#define BBP_R4_RX_ANTENNA FIELD8(0x03)
/*
* ANTENNA_CONTROL semantics (guessed):
* 0x1: Software controlled antenna switching (fixed or SW diversity)
* 0x2: Hardware diversity.
*/
#define BBP_R4_RX_ANTENNA_CONTROL FIELD8(0x03)
#define BBP_R4_RX_FRAME_END FIELD8(0x20) #define BBP_R4_RX_FRAME_END FIELD8(0x20)
/* /*
* R77 * R77
*/ */
#define BBP_R77_TX_ANTENNA FIELD8(0x03) #define BBP_R77_RX_ANTENNA FIELD8(0x03)
/* /*
* RF registers * RF registers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment