From: Ivo van Doorn <ivdoorn@gmail.com>
To: netdev@vger.kernel.org
Cc: rt2x00-devel@lfcorreia.dyndns.org
Subject: [PATCH 9/32] rt2x00: Fix antenna configuration
Date: Fri, 28 Apr 2006 00:03:00 +0200 [thread overview]
Message-ID: <200604280003.00692.IvDoorn@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 6449 bytes --]
From: Ivo van Doorn <IvDoorn@gmail.com>
The handling of the antenna configuration was not
completely correct. For all modules the double clearing
of some bits can be reduced, and for rt2500pci and rt2500usb
some registers were not corretly changed.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-04-27 21:41:20.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2400pci.c 2006-04-27 21:41:52.000000000 +0200
@@ -485,6 +485,9 @@ rt2400pci_config_antenna(struct rt2x00_p
rt2x00_bbp_read(rt2x00pci, 4, ®_rx);
rt2x00_bbp_read(rt2x00pci, 1, ®_tx);
+ /*
+ * Clear current config antenna bits.
+ */
reg_rx &= ~0x06;
reg_tx &= ~0x03;
@@ -495,18 +498,18 @@ rt2400pci_config_antenna(struct rt2x00_p
*/
if (antenna == 0) {
/* Diversity. */
- reg_rx = (reg_rx & 0xf9) | 0x02;
- reg_tx = (reg_tx & 0xfc) | 0x01;
+ reg_rx |= 0x02;
+ reg_tx |= 0x01;
} else if (antenna == 1) {
/* RX: Antenna B */
- reg_rx = (reg_rx & 0xf9) | 0x04;
+ reg_rx |= 0x04;
/* TX: Antenna A */
- reg_tx = (reg_tx & 0xfc) | 0x00;
+ reg_tx |= 0x00;
} else if (antenna == 2) {
/* RX: Antenna A */
- reg_rx = (reg_rx & 0xf9) | 0x00;
+ reg_rx |= 0x00;
/* TX: Antenna B */
- reg_tx = (reg_tx & 0xfc) | 0x02;
+ reg_tx |= 0x02;
}
rt2x00_bbp_write(rt2x00pci, 4, reg_rx);
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-04-27 21:41:20.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500pci.c 2006-04-27 21:41:52.000000000 +0200
@@ -506,12 +506,17 @@ rt2500pci_config_channel(struct rt2x00_p
static void
rt2500pci_config_antenna(struct rt2x00_pci *rt2x00pci, int antenna)
{
+ u32 reg;
u8 reg_rx;
u8 reg_tx;
+ rt2x00_register_read(rt2x00pci, BBPCSR1, ®);
rt2x00_bbp_read(rt2x00pci, 14, ®_rx);
rt2x00_bbp_read(rt2x00pci, 2, ®_tx);
+ /*
+ * Clear current config antenna bits.
+ */
reg_rx &= ~0x06;
reg_tx &= ~0x03;
@@ -522,20 +527,46 @@ rt2500pci_config_antenna(struct rt2x00_p
*/
if (antenna == 0) {
/* Diversity. */
- reg_rx = (reg_rx & 0xf9) | 0x02;
- reg_tx = (reg_tx & 0xfc) | 0x01;
+ reg_rx |= 0x02;
+ reg_tx |= 0x01;
+ rt2x00_set_field32(®, BBPCSR1_CCK, 2);
+ rt2x00_set_field32(®, BBPCSR1_OFDM, 2);
} else if (antenna == 1) {
/* RX: Antenna B */
- reg_rx = (reg_rx & 0xf9) | 0x04;
+ reg_rx |= 0x04;
/* TX: Antenna A */
- reg_tx = (reg_tx & 0xfc) | 0x00;
+ reg_tx |= 0x00;
+ rt2x00_set_field32(®, BBPCSR1_CCK, 0);
+ rt2x00_set_field32(®, BBPCSR1_OFDM, 0);
} else if (antenna == 2) {
/* RX: Antenna A */
- reg_rx = (reg_rx & 0xf9) | 0x00;
+ reg_rx |= 0x00;
/* TX: Antenna B */
- reg_tx = (reg_tx & 0xfc) | 0x02;
+ reg_tx |= 0x02;
+ rt2x00_set_field32(®, BBPCSR1_CCK, 2);
+ rt2x00_set_field32(®, BBPCSR1_OFDM, 2);
+ }
+
+ /*
+ * RT2525E and RT5222 need to flip TX I/Q
+ */
+ if (rt2x00_rf(&rt2x00pci->chip, RF2525E)
+ || rt2x00_rf(&rt2x00pci->chip, RF5222)) {
+ reg_tx |= 0x04;
+ rt2x00_set_field32(®, BBPCSR1_CCK_FLIP, 1);
+ rt2x00_set_field32(®, BBPCSR1_OFDM_FLIP, 1);
+
+ /*
+ * RT2525E does not need RX I/Q Flip.
+ */
+ if (rt2x00_rf(&rt2x00pci->chip, RF2525E))
+ reg_rx &= ~0x04;
+ } else {
+ rt2x00_set_field32(®, BBPCSR1_CCK_FLIP, 0);
+ rt2x00_set_field32(®, BBPCSR1_OFDM_FLIP, 0);
}
+ rt2x00_register_write(rt2x00pci, BBPCSR1, reg);
rt2x00_bbp_write(rt2x00pci, 14, reg_rx);
rt2x00_bbp_write(rt2x00pci, 2, reg_tx);
diff -uprN wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500usb.c wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500usb.c
--- wireless-dev-rt2x00/drivers/net/wireless/d80211/rt2x00/rt2500usb.c 2006-04-27 21:41:20.000000000 +0200
+++ wireless-dev-rt2x00-patch/drivers/net/wireless/d80211/rt2x00/rt2500usb.c 2006-04-27 21:41:52.000000000 +0200
@@ -372,8 +372,9 @@ rt2500usb_config_antenna(struct rt2x00_u
rt2x00_register_read(rt2x00usb, PHY_CSR5, &csr5_reg);
rt2x00_register_read(rt2x00usb, PHY_CSR6, &csr6_reg);
- csr5_reg &= ~0x0003;
- csr6_reg &= ~0x0003;
+ /*
+ * Clear current config antenna bits.
+ */
reg_tx &= ~0x03;
reg_rx &= ~0x03;
@@ -386,40 +387,41 @@ rt2500usb_config_antenna(struct rt2x00_u
/* Diversity. */
reg_rx |= 0x01;
reg_tx |= 0x01;
- csr5_reg |= 0x0001;
- csr6_reg |= 0x0001;
+ rt2x00_set_field16_nb(&csr5_reg, PHY_CSR5_CCK, 1);
+ rt2x00_set_field16_nb(&csr6_reg, PHY_CSR6_OFDM, 1);
} else if (antenna == 1) {
/* RX: Antenna B */
reg_rx |= 0x02;
/* TX: Antenna A */
reg_tx |= 0x00;
- csr5_reg |= 0x0000;
- csr6_reg |= 0x0000;
+ rt2x00_set_field16_nb(&csr5_reg, PHY_CSR5_CCK, 0);
+ rt2x00_set_field16_nb(&csr6_reg, PHY_CSR6_OFDM, 0);
} else if (antenna == 2) {
/* RX: Antenna A */
reg_tx |= 0x02;
- csr5_reg |= 0x0002;
- csr6_reg |= 0x0002;
/* TX: Antenna B */
reg_rx |= 0x00;
+ rt2x00_set_field16_nb(&csr5_reg, PHY_CSR5_CCK, 2);
+ rt2x00_set_field16_nb(&csr6_reg, PHY_CSR6_OFDM, 2);
}
/*
- * RT2525E needs to flip TX I/Q but not RX I/Q.
+ * RT2525E and RT5222 need to flip TX I/Q
*/
- if (rt2x00_rf(&rt2x00usb->chip, RF2525E)) {
+ if (rt2x00_rf(&rt2x00usb->chip, RF2525E)
+ || rt2x00_rf(&rt2x00usb->chip, RF5222)) {
reg_tx |= 0x04;
- reg_rx &= ~0x04;
- csr5_reg |= 0x0004;
- csr6_reg |= 0x0004;
- }
- /*
- * RT5222 needs to flip TX I/Q.
- */
- if (rt2x00_rf(&rt2x00usb->chip, RF5222)) {
- reg_tx |= 0x04;
- csr5_reg |= 0x0004;
- csr6_reg |= 0x0004;
+ rt2x00_set_field16_nb(&csr5_reg, PHY_CSR5_CCK_FLIP, 1);
+ rt2x00_set_field16_nb(&csr6_reg, PHY_CSR6_OFDM_FLIP, 1);
+
+ /*
+ * RT2525E does not need RX I/Q Flip.
+ */
+ if (rt2x00_rf(&rt2x00usb->chip, RF2525E))
+ reg_rx &= ~0x04;
+ } else {
+ rt2x00_set_field16_nb(&csr5_reg, PHY_CSR5_CCK_FLIP, 0);
+ rt2x00_set_field16_nb(&csr6_reg, PHY_CSR6_OFDM_FLIP, 0);
}
rt2x00_bbp_write(rt2x00usb, 2, reg_tx);
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2006-04-27 22:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200604280003.00692.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=rt2x00-devel@lfcorreia.dyndns.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).