ar9170: added phy register initialisation from eeprom values
Quoted 6 lines
"Joerg Albert" <[email protected]> wrote:
This patch adds the initialisation of some PHY registers
from the modal_header[] values in the EEPROM (seeotus/hal/hpmain.c, line 333 ff.)Signed-off-by Joerg Albert <[email protected]>
meh, no hardware... and only a shitty kiosk with web-interface here. testing has to wait until the weekend.
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 400
Quoted 10 lines
drivers/net/wireless/ath/ar9170/phy.c +2
-0@@ -396,6 +396,131 @@ static struct ar9170_phy_init ar5416_phy_init[] = { { 0x1c9384, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, } }; +/* look up a certain register in ar5416_phy_init[] and return the init. value +for the band and bandwidth given. Return 0 if register address not found. */
See Documentation/CodingStyle - Chapter 8
The preferred style for long (multi-line) comments is:
/*
* look up a certain register in ar5416_phy_init[] and return the init. value
* for the band and bandwidth given. Return 0 if register address not found. */
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 401
Quoted 1 line
drivers/net/wireless/ath/ar9170/phy.c +1
-0+u32 ar9170_get_default_phy_reg_val (int reg,bool is_2ghz,bool is_40mhz)
please consider this instead:
static u32 ar9170_get_default_phy_reg_val(u32 reg, [...]) (static function, and reg is a u32)
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 405
Quoted 4 lines
drivers/net/wireless/ath/ar9170/phy.c +4
-0+{ +struct ar9170_phy_init *p; +struct ar9170_phy_init *endp = + ar5416_phy_init+ARRAY_SIZE (ar5416_phy_init);
(see Codingstyle: 3.1: Spaces
=> Use one space around (on each side of) most binary [...] operators)
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 407
Quoted 2 lines
drivers/net/wireless/ath/ar9170/phy.c +2
-0+ +for (p = ar5416_phy_init; p < endp; p++)
a extra { } wouldn't hurt. The following statements also has multiple lines.
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 415
Quoted 8 lines
drivers/net/wireless/ath/ar9170/phy.c +8
-0+if (p->reg == reg) { +if (is_2ghz) +return is_40mhz ? p->_2ghz_40 : p->_2ghz_20; +else +return is_40mhz ? p->_5ghz_40 : p->_5ghz_20; + } +return 0 ; +}
hmm, it's a bit odd to use pointers over a fixed array, what about (unfortunately space and line damaged... and untested):
{
unsigned int i;
for (i = 0; i < ARRAY_SIZE(ar5416_phy_init); i++) {
if (ar5416_phy_init[i].reg != reg)
continue;
if (is_2ghz) {
if (is_40mhz)
return ar5416_phy_init[i]._2ghz_40;
else
return ar5416_phy_init[i]._2ghz_20;
} else {
if (is_40mhz)
return ar5416_phy_init[i]._5ghz_40;
else
return ar5416_phy_init[i]._5ghz_20;
}
}
return 0;
}this follows the looks of the rest of the code. (e.g ar9170_init_phy) (of course, either version should be fine.
so stay with yours if you have doubts.)
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 417
Quoted 2 lines
drivers/net/wireless/ath/ar9170/phy.c +2
-0+/* initialize some phy regs from eeprom values in modal_header[] +acc. to band and bandwith */
(multi-line comment, but I guess you know what do here now...)
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 424
Quoted 7 lines
drivers/net/wireless/ath/ar9170/phy.c +7
-0+static int ar9170_init_phy_from_eeprom (struct ar9170 *ar, +bool is_2ghz,bool is_40mhz) +{ +const u8 xpd2pd[16 ] = { +0x2 ,0x2 ,0x2 ,0x1 ,0x2 ,0x2 ,0x6 ,0x2 , +0x2 ,0x3 ,0x7 ,0x2 ,0xB ,0x2 ,0x2 ,0x2 + };
static const u8 xpd2pd ?
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 428
Quoted 4 lines
drivers/net/wireless/ath/ar9170/phy.c +4
-0+u32 defval, newval;/* two separate for debugging the changes */ +/* pointer to the modal_header acc. to band */ +struct ar9170_eeprom_modal *m = ar->eeprom.modal_header + + (is_2ghz ?1 :0 );
what about:
struct ar9170_eeprom_modal *m = &ar->eeprom.modal_header[is_2ghz]; ?
Quoted 12 lines
drivers/net/wireless/ath/ar9170/phy.c +12
-0+ar9170_regwrite_begin (ar); + +/* ant common control (index 0) */ + defval =ar9170_get_default_phy_reg_val (0x1c5964 , is_2ghz, is_40mhz); + newval =le32_to_cpu (m->antCtrlCommon); +ar9170_regwrite (0x1c5964 , newval); + +/* ant control chain 0 (index 1) */ + defval =ar9170_get_default_phy_reg_val (0x1c5960 , is_2ghz, is_40mhz); + newval =le32_to_cpu (m->antCtrlChain[0 ]); +ar9170_regwrite (0x1c5960 , newval); +
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 450
Quoted 10 lines
drivers/net/wireless/ath/ar9170/phy.c +10
-0+/* ant control chain 2 (index 2) */ + defval =ar9170_get_default_phy_reg_val (0x1c7960 , is_2ghz, is_40mhz); + newval =le32_to_cpu (m->antCtrlChain[1 ]); +ar9170_regwrite (0x1c7960 , newval); + +/* SwSettle (index 3) */ +if (!is_40mhz) { + defval =ar9170_get_default_phy_reg_val (0x1c5844 , + is_2ghz, is_40mhz); + newval = (defval & ~0x3f80 ) | ((m->switchSettling &0x7f )<<7 );
(well )<<7 is a bit tight, but it looks like you ran out of space in this line?)
Quoted 54 lines
drivers/net/wireless/ath/ar9170/phy.c +54
-0+ar9170_regwrite (0x1c5844 , newval); + } + +/* adcDesired, pdaDesired (index 4) */ + defval =ar9170_get_default_phy_reg_val (0x1c5850 , is_2ghz, is_40mhz); + newval = (defval & ~0xffff ) | ((u8 )m->pgaDesiredSize <<8 ) | + ((u8 )m->adcDesiredSize); +ar9170_regwrite (0x1c5850 , newval); + +/* TxEndToXpaOff, TxFrameToXpaOn (index 5) */ + defval =ar9170_get_default_phy_reg_val (0x1c5834 , is_2ghz, is_40mhz); + newval = (m->txEndToXpaOff <<24 ) | (m->txEndToXpaOff <<16 ) | + (m->txFrameToXpaOn <<8 ) | m->txFrameToXpaOn; +ar9170_regwrite (0x1c5834 , newval); + +/* TxEndToRxOn (index 6) */ + defval =ar9170_get_default_phy_reg_val (0x1c5828 , is_2ghz, is_40mhz); + newval = (defval & ~0xff0000 ) | (m->txEndToRxOn <<16 ); +ar9170_regwrite (0x1c5828 , newval); + +/* thresh62 (index 7) */ + defval =ar9170_get_default_phy_reg_val (0x1c8864 , is_2ghz, is_40mhz); + newval = (defval & ~0x7f000 ) | (m->thresh62 <<12 ); +ar9170_regwrite (0x1c8864 , newval); + +/* tx/rx attenuation chain 0 (index 8) */ + defval =ar9170_get_default_phy_reg_val (0x1c5848 , is_2ghz, is_40mhz); + newval = (defval & ~0x3f000 ) | ((m->txRxAttenCh[0 ] &0x3f ) <<12 ); +ar9170_regwrite (0x1c5848 , newval); + +/* tx/rx attenuation chain 2 (index 9) */ + defval =ar9170_get_default_phy_reg_val (0x1c7848 , is_2ghz, is_40mhz); + newval = (defval & ~0x3f000 ) | ((m->txRxAttenCh[1 ] &0x3f ) <<12 ); +ar9170_regwrite (0x1c7848 , newval); + +/* tx/rx margin chain 0 (index 10) */ + defval =ar9170_get_default_phy_reg_val (0x1c620c , is_2ghz, is_40mhz); + newval = (defval & ~0xfc0000 ) | ((m->rxTxMarginCh[0 ] &0x3f ) <<18 ); +/* bsw margin chain 0 for 5GHz only */ +if (!is_2ghz) + newval = (newval & ~0x3c00 ) | ((m->bswMargin[0 ] &0xf ) <<10 ); +ar9170_regwrite (0x1c620c , newval); + +/* tx/rx margin chain 2 (index 11) */ + defval =ar9170_get_default_phy_reg_val (0x1c820c , is_2ghz, is_40mhz); + newval = (defval & ~0xfc0000 ) | ((m->rxTxMarginCh[1 ] &0x3f ) <<18 ); +ar9170_regwrite (0x1c820c , newval); + +/* iqCall, iqCallq chain 0 (index 12) */ + defval =ar9170_get_default_phy_reg_val (0x1c5920 , is_2ghz, is_40mhz); + newval = (defval & ~0x7ff ) | (((u8 )m->iqCalICh[0 ] &0x3f ) <<5 ) | + ((u8 )m->iqCalQCh[0 ] &0x1f ); +ar9170_regwrite (0x1c5920 , newval); +
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 514
Quoted 10 lines
drivers/net/wireless/ath/ar9170/phy.c +10
-0+/* iqCall, iqCallq chain 2 (index 13) */ + defval =ar9170_get_default_phy_reg_val (0x1c7920 , is_2ghz, is_40mhz); + newval = (defval & ~0x7ff ) | (((u8 )m->iqCalICh[1 ] &0x3f ) <<5 ) | + ((u8 )m->iqCalQCh[1 ] &0x1f ); +ar9170_regwrite (0x1c7920 , newval); + +/* xpd gain mask (index 14) */ + defval =ar9170_get_default_phy_reg_val (0x1c6258 , is_2ghz, is_40mhz); + newval = (defval & ~0xf0000 ) | (xpd2pd[m->xpdGain &0xf ] <<16 ); +ar9170_regwrite (0x1c6258 , newval);
(cannot test this now. it looks good, though.)
It's amazing how much **** you can _cut_ from the vendor driver.
BTW: does this patch help the 1-stage fw stability, or is it still broken?
Regards,
Chr
________________________________________________________________
Neu: WEB.DE Doppel-FLAT mit Internet-Flatrate + Telefon-Flatrate für nur 19,99 Euro/mtl.!* http://produkte.web.de/go/02/
Quoted 9 lines · On 08/31/2009 11:53 AM, [email protected] wrote:
...
SeeDocumentation/CodingStyle- Chapter 8The preferred style for long (multi-line) comments is:
/*
* look up a certain register in ar5416_phy_init[] and return the init. value
* for the band and bandwidth given. Return 0 if register address not found. */
...
Thanks for the comments. I agree with all of them and will re-spin a patch.
Quoted 1 line
It's amazing how much **** you can _cut_ from the vendor driver.
Yes, at first sight it looks really complex but it isn't.
Quoted 1 line
BTW: does this patch help the 1-stage fw stability, or is it still broken?
Turned out I had a corrupt firmware file. After downloading from Luis' URL it works fine
with my WNDA3100. Guess I had an earlier version from before 2009/05/28 or firefox corrupted it during download.
What's your setup to get 80+ MBit/s throughput with the two-stage firmware? I've used an 802.11g AP so far, but have access to an 802.11n dual-band AP now. Guess I should use 5GHz as 2.4 is rather crowded here.
How can I put ar9170 into 802.11n/40MHz mode?
Regards,
Jörg.
(changed cc', web.de finally pissed me off with a 500 mail quota)
2009/8/31 Joerg Albert <[email protected]>:
Quoted 12 lines · On 08/31/2009 11:53 AM, [email protected] wrote:
Quoted 9 lines
...
SeeDocumentation/CodingStyle- Chapter 8The preferred style for long (multi-line) comments is:
/*
* look up a certain register in ar5416_phy_init[] and return the init. value
* for the band and bandwidth given. Return 0 if register address not found. */
...Thanks for the comments. I agree with all of them and will re-spin a patch.
Great!
Quoted 3 lines
Quoted 1 line
It's amazing how much **** you can _cut_ from the vendor driver.
Yes, at first sight it looks really complex but it isn't.
well, there's still a thing... we can only copy what's there in driver, But since the two-stage fw is capable of reinitializing
the rf/phy we could do all sorts of stuff without breaking it.
Quoted 7 lines
Quoted 1 line
BTW: does this patch help the 1-stage fw stability, or is it still broken?
Turned out I had a corrupt firmware file. After downloading from Luis' URL it works fine with my WNDA3100. Guess I had an earlier version from before 2009/05/28 or firefox corrupted it during download.
What's your setup to get 80+ MBit/s throughput with the two-stage firmware?
simply another 11n card a few meters away (but in the same room of course, since the 5GHz band doesn't like to go through concrete)
I tested a few configurations and only with a rt2860pci was able to get a satisfying result over a small distance (7 m, but still in the same room ;) ) Other cards: like the ar5416 also worked, but not that well (tx rates halved) and iwl4965, iwl5300 didn't work at all in n. (but they're flying with 11a)
Quoted 3 lines
I've used an 802.11g AP so far, but have access to an 802.11n dual-band AP now. Guess I should use 5GHz as 2.4 is rather crowded here.
How can I put ar9170 into 802.11n/40MHz mode?
well you need a patch which lets you use the MCS rates and
kicks off BlockAck sessions. I posted a version some time
ago, (AFAIK initial RFC?). However due to fact that the code belongs into the rc-algorithm and the lack of "out-house testing" feedback, I had to drop it. I can send you an _updated_ (well, it should apply without fuzz... but you still have to select the MCS by hand) version if you want, however not until Friday. Of course, If you have free time on your hand, you could do the fix-ups by yourself and start the madNess right on! ;-)
(Note: Felix is looking into minstrel/HT. I expect once the code is available, that we only have to patch ar9170 just a _little_ bit to get it _sort of_ working.
(it might never probably work with the current available firmwares, since the BA tx_status is totally bogus)
Regards,
Chr
PATCH v2 1/1 ar9170: added phy register initialisation from eeprom values
This patch adds the initialisation of some PHY registers from the modal_header[] values in the EEPROM (see otus/hal/hpmain.c, line 333 ff.)
---
Compared to v1 I've included Christian's suggestions and removed three unnecessary defval assignments for "ant * control".
This patch seems to depend on Christian's
"[RFT] ar9170: use eeprom's frequency calibration values" (2009-08-21), I get a poor throughput here without it (1-stage fw, 802.11g AP).
drivers/net/wireless/ath/ar9170/phy.c | 136 ++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ar9170/phy.c +135 -1
@@ -396,6 +396,138 @@ static struct ar9170_phy_init ar5416_phy_init[] = { { 0x1c9384, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, } }; +/* +* look up a certain register in ar5416_phy_init[] and return the init. value +* for the band and bandwidth given. Return 0 if register address not found. +*/ +static u32 ar9170_get_default_phy_reg_val (u32 reg,bool is_2ghz,bool is_40mhz) +{ +unsigned int i; +for (i =0 ; i <ARRAY_SIZE (ar5416_phy_init); i++) { +if (ar5416_phy_init[i].reg != reg) +continue ; + +if (is_2ghz) { +if (is_40mhz) +return ar5416_phy_init[i]._2ghz_40; +else +return ar5416_phy_init[i]._2ghz_20; + }else { +if (is_40mhz) +return ar5416_phy_init[i]._5ghz_40; +else +return ar5416_phy_init[i]._5ghz_20; + } + } +return 0 ; +} + +/* +* initialize some phy regs from eeprom values in modal_header[] +* acc. to band and bandwith +*/ +static int ar9170_init_phy_from_eeprom (struct ar9170 *ar, +bool is_2ghz,bool is_40mhz) +{ +static const u8 xpd2pd[16 ] = { +0x2 ,0x2 ,0x2 ,0x1 ,0x2 ,0x2 ,0x6 ,0x2 , +0x2 ,0x3 ,0x7 ,0x2 ,0xB ,0x2 ,0x2 ,0x2 + }; +u32 defval, newval; +/* pointer to the modal_header acc. to band */ +struct ar9170_eeprom_modal *m = &ar->eeprom.modal_header[is_2ghz]; + +ar9170_regwrite_begin (ar); + +/* ant common control (index 0) */ + newval =le32_to_cpu (m->antCtrlCommon); +ar9170_regwrite (0x1c5964 , newval); + +/* ant control chain 0 (index 1) */ + newval =le32_to_cpu (m->antCtrlChain[0 ]); +ar9170_regwrite (0x1c5960 , newval); + +/* ant control chain 2 (index 2) */ + newval =le32_to_cpu (m->antCtrlChain[1 ]); +ar9170_regwrite (0x1c7960 , newval); + +/* SwSettle (index 3) */ +if (!is_40mhz) { + defval =ar9170_get_default_phy_reg_val (0x1c5844 , + is_2ghz, is_40mhz); + newval = (defval & ~0x3f80 ) | + ((m->switchSettling &0x7f ) <<7 ); +ar9170_regwrite (0x1c5844 , newval); + } + +/* adcDesired, pdaDesired (index 4) */ + defval =ar9170_get_default_phy_reg_val (0x1c5850 , is_2ghz, is_40mhz); + newval = (defval & ~0xffff ) | ((u8 )m->pgaDesiredSize <<8 ) | + ((u8 )m->adcDesiredSize); +ar9170_regwrite (0x1c5850 , newval); + +/* TxEndToXpaOff, TxFrameToXpaOn (index 5) */ + defval =ar9170_get_default_phy_reg_val (0x1c5834 , is_2ghz, is_40mhz); + newval = (m->txEndToXpaOff <<24 ) | (m->txEndToXpaOff <<16 ) | + (m->txFrameToXpaOn <<8 ) | m->txFrameToXpaOn; +ar9170_regwrite (0x1c5834 , newval); + +/* TxEndToRxOn (index 6) */ + defval =ar9170_get_default_phy_reg_val (0x1c5828 , is_2ghz, is_40mhz); + newval = (defval & ~0xff0000 ) | (m->txEndToRxOn <<16 ); +ar9170_regwrite (0x1c5828 , newval); + +/* thresh62 (index 7) */ + defval =ar9170_get_default_phy_reg_val (0x1c8864 , is_2ghz, is_40mhz); + newval = (defval & ~0x7f000 ) | (m->thresh62 <<12 ); +ar9170_regwrite (0x1c8864 , newval); + +/* tx/rx attenuation chain 0 (index 8) */ + defval =ar9170_get_default_phy_reg_val (0x1c5848 , is_2ghz, is_40mhz); + newval = (defval & ~0x3f000 ) | ((m->txRxAttenCh[0 ] &0x3f ) <<12 ); +ar9170_regwrite (0x1c5848 , newval); + +/* tx/rx attenuation chain 2 (index 9) */ + defval =ar9170_get_default_phy_reg_val (0x1c7848 , is_2ghz, is_40mhz); + newval = (defval & ~0x3f000 ) | ((m->txRxAttenCh[1 ] &0x3f ) <<12 ); +ar9170_regwrite (0x1c7848 , newval); + +/* tx/rx margin chain 0 (index 10) */ + defval =ar9170_get_default_phy_reg_val (0x1c620c , is_2ghz, is_40mhz); + newval = (defval & ~0xfc0000 ) | ((m->rxTxMarginCh[0 ] &0x3f ) <<18 ); +/* bsw margin chain 0 for 5GHz only */ +if (!is_2ghz) + newval = (newval & ~0x3c00 ) | ((m->bswMargin[0 ] &0xf ) <<10 ); +ar9170_regwrite (0x1c620c , newval); + +/* tx/rx margin chain 2 (index 11) */ + defval =ar9170_get_default_phy_reg_val (0x1c820c , is_2ghz, is_40mhz); + newval = (defval & ~0xfc0000 ) | ((m->rxTxMarginCh[1 ] &0x3f ) <<18 ); +ar9170_regwrite (0x1c820c , newval); + +/* iqCall, iqCallq chain 0 (index 12) */ + defval =ar9170_get_default_phy_reg_val (0x1c5920 , is_2ghz, is_40mhz); + newval = (defval & ~0x7ff ) | (((u8 )m->iqCalICh[0 ] &0x3f ) <<5 ) | + ((u8 )m->iqCalQCh[0 ] &0x1f ); +ar9170_regwrite (0x1c5920 , newval); + +/* iqCall, iqCallq chain 2 (index 13) */ + defval =ar9170_get_default_phy_reg_val (0x1c7920 , is_2ghz, is_40mhz); + newval = (defval & ~0x7ff ) | (((u8 )m->iqCalICh[1 ] &0x3f ) <<5 ) | + ((u8 )m->iqCalQCh[1 ] &0x1f ); +ar9170_regwrite (0x1c7920 , newval); + +/* xpd gain mask (index 14) */ + defval =ar9170_get_default_phy_reg_val (0x1c6258 , is_2ghz, is_40mhz); + newval = (defval & ~0xf0000 ) | (xpd2pd[m->xpdGain &0xf ] <<16 ); +ar9170_regwrite (0x1c6258 , newval); + + +ar9170_regwrite_finish (); + +return ar9170_regwrite_result (); +} +int ar9170_init_phy (struct ar9170 *ar,enum ieee80211_band band) {int i, err;
@@ -426,7 +558,9 @@ int ar9170_init_phy(struct ar9170 *ar, enum ieee80211_band band)if (err)return err; -/* XXX: use EEPROM data here! */ + err =ar9170_init_phy_from_eeprom (ar, is_2ghz, is_40mhz); +if (err) +return err; err =ar9170_init_power_cal (ar);if (err)
Signature · 1 line
1.6.0.4
Quoted 6 lines · On Thursday 03 September 2009 01:02:59 Joerg Albert wrote:
This patch adds the initialisation of some PHY registers from the modal_header[] values in the EEPROM (see
otus/hal/hpmain.c, line 333 ff.)Signed-off-by Joerg Albert <[email protected]>
Quoted 9 lines
---
Compared to v1 I've included Christian's suggestions and removed three unnecessary defval assignments for "ant * control".
This patch seems to depend on Christian's
"[RFT] ar9170: use eeprom's frequency calibration values" (2009-08-21), I get a poor throughput here without it (1-stage fw, 802.11g AP).
Good work!
with both patches applied, my WNDA is finally able to pick up some speed. But, it's still a mbit slower than the two-stage fw.
Quoted 16 lines
drivers/net/wireless/ath/ar9170/phy.c | 136 ++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 1 deletions(-)drivers/net/wireless/ath/ar9170/phy.c +5
-0@@ -396,6 +396,138 @@ static struct ar9170_phy_init ar5416_phy_init[] = { { 0x1c9384, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, 0xf3307ff0, } }; +/* +* look up a certain register in ar5416_phy_init[] and return the init. value +* for the band and bandwidth given. Return 0 if register address not found. +*/ +static u32 ar9170_get_default_phy_reg_val (u32 reg,bool is_2ghz,bool is_40mhz)
[...]
drivers/net/wireless/ath/ar9170/phy.c static struct ar9170_phy_init ar5416_phy_init[] = { · line 525
Quoted 6 lines
drivers/net/wireless/ath/ar9170/phy.c +6
-0+/* xpd gain mask (index 14) */ + defval =ar9170_get_default_phy_reg_val (0x1c6258 , is_2ghz, is_40mhz); + newval = (defval & ~0xf0000 ) | (xpd2pd[m->xpdGain &0xf ] <<16 ); +ar9170_regwrite (0x1c6258 , newval); + +
John, can you please nuke those two empty lines?
drivers/net/wireless/ath/ar9170/phy.c int ar9170_init_phy(struct ar9170 *ar, enum ieee80211_band band) · line 429
Quoted 13 lines
drivers/net/wireless/ath/ar9170/phy.c +5
-1+ar9170_regwrite_finish (); + +return ar9170_regwrite_result (); +} +int ar9170_init_phy (struct ar9170 *ar,enum ieee80211_band band) {int i, err;@@ -426,7 +558,9 @@ int ar9170_init_phy(struct ar9170 *ar, enum ieee80211_band band)if (err)return err; -/* XXX: use EEPROM data here! */
uh, I think we're still missing the heavy clip/conformance? (otus/hal/hpmain.c, line 3723 ff.).
It should be modified to say something like:
/* TODO: (heavy clip) regulatory domain power level fine-tuning. */
drivers/net/wireless/ath/ar9170/phy.c int ar9170_init_phy(struct ar9170 *ar, enum ieee80211_band band) · line 566
Quoted 6 lines
drivers/net/wireless/ath/ar9170/phy.c +3
-0+ err =ar9170_init_phy_from_eeprom (ar, is_2ghz, is_40mhz); +if (err) +return err; err =ar9170_init_power_cal (ar);if (err)
Regards,
Chr
A message that is not in the archive (sent off-list or not yet received): [email protected]
(CC linux-wireless)
Quoted 11 lines · On Thursday 03 September 2009 00:44:02 Joerg Albert wrote:
Quoted 8 lines · Christian Lamparter
well you need a patch which lets you use the MCS rates and
kicks off BlockAck sessions. I posted a version some time
ago, (AFAIK initial RFC?). However due to fact that the code belongs into the rc-algorithm and the lack of "out-house testing" feedback, I had to drop it. I can send you an _updated_ (well, it should apply without fuzz... but you still have to select the MCS by hand) version if you want, however not until Friday. Of course, If you have free time on your hand, you could do the fix-ups by yourself and start the madNess right on! ;-)
Quoted 4 lines
As I'm not that familiar with 802.11n (and always short of free time) I'd like to use your patch.
Guess the old version is
"[WIP][RFT][RFC] ar9170: aggregation xmit (aka the _other_ part)" from 2009/06/06?
exactly... it's old & buggy
this version even has a bogus rc.
(Of course, you can select your own MCS rate by changing)
+ rate->idx = sta_info->current_rate;
to a static value between 0 and 15.
(which is _translated_ into: MCS 0 - 15)
Regards,
Chr
drivers/net/wireless/ath/ar9170/ar9170.h +11 -0
@@ -131,6 +131,7 @@ struct ar9170_rxstream_mpdu_merge {enum ar9170_tid_state {AR9170_TID_STATE_INVALID ,AR9170_TID_STATE_SHUTDOWN , +AR9170_TID_STATE_STARTING ,AR9170_TID_STATE_PROGRESS ,AR9170_TID_STATE_COMPLETE , };
@@ -233,6 +234,10 @@ struct ar9170 {struct list_head tx_ampdu_list;unsigned int tx_ampdu_pending; +spinlock_t addba_list_lock; +struct list_head addba_list; +struct work_struct start_tx_ba_work; +/* rxstream mpdu merge */ struct ar9170_rxstream_mpdu_merge rx_mpdu;struct sk_buff *rx_failover;
@@ -246,6 +251,12 @@ struct ar9170 {struct ar9170_sta_info {struct ar9170_sta_tid agg[AR9170_NUM_TID ];unsigned int ampdu_max_len; + +#ifndef AR9170_MAC80211_RC_MCS +unsigned int max_mcs; +int score; +unsigned int current_rate; +#endif /* AR9170_MAC80211_RC_MCS */ };#define AR9170_TX_FLAG_WAIT_FOR_ACK BIT(0)
drivers/net/wireless/ath/ar9170/main.c +186 -2
274 lines not on this page · raw message