d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC ath changes up to and including the v0.9.16.16 hal import

Browse Source 
Approved by:	re (scottl, mux)
This commit is contained in:
sam 2006-02-24 19:51:11 +00:00
parent ec3349e71e
commit 1e9460c68f
7 changed files with 871 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/ath/ath_rate/amrr/amrr.c
View File

@ -210,9 +210,6 @@ ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate)
(ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0); (ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0);
ni->ni_txrate = rate; ni->ni_txrate = rate;
/* XXX management/control frames always go at the lowest speed */
an->an_tx_mgtrate = rt->info[0].rateCode;
an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble;
/* /*
* Before associating a node has no rate set setup * Before associating a node has no rate set setup
* so we can't calculate any transmit codes to use. * so we can't calculate any transmit codes to use.
@ -253,7 +250,7 @@ ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate)
/* NB: only do this if we didn't already do it above */ /* NB: only do this if we didn't already do it above */
amn->amn_tx_rate3 = rt->info[0].rateCode; amn->amn_tx_rate3 = rt->info[0].rateCode;
amn->amn_tx_rate3sp = amn->amn_tx_rate3sp =
an->an_tx_mgtrate | rt->info[0].shortPreamble; amn->amn_tx_rate3 | rt->info[0].shortPreamble;
} else { } else {
amn->amn_tx_rate3 = amn->amn_tx_rate3sp = 0; amn->amn_tx_rate3 = amn->amn_tx_rate3sp = 0;
} }

5
sys/dev/ath/ath_rate/onoe/onoe.c
View File

@ -194,9 +194,6 @@ ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate)
(ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0); (ni->ni_rates.rs_rates[rate] & IEEE80211_RATE_VAL) / 2 : 0);
ni->ni_txrate = rate; ni->ni_txrate = rate;
/* XXX management/control frames always go at the lowest speed */
an->an_tx_mgtrate = rt->info[0].rateCode;
an->an_tx_mgtratesp = an->an_tx_mgtrate | rt->info[0].shortPreamble;
/* /*
* Before associating a node has no rate set setup * Before associating a node has no rate set setup
* so we can't calculate any transmit codes to use. * so we can't calculate any transmit codes to use.
@ -243,7 +240,7 @@ ath_rate_update(struct ath_softc *sc, struct ieee80211_node *ni, int rate)
/* NB: only do this if we didn't already do it above */ /* NB: only do this if we didn't already do it above */
on->on_tx_rate3 = rt->info[0].rateCode; on->on_tx_rate3 = rt->info[0].rateCode;
on->on_tx_rate3sp = on->on_tx_rate3sp =
an->an_tx_mgtrate | rt->info[0].shortPreamble; on->on_tx_rate3 | rt->info[0].shortPreamble;
} else { } else {
on->on_tx_rate3 = on->on_tx_rate3sp = 0; on->on_tx_rate3 = on->on_tx_rate3sp = 0;
} }

296
sys/dev/ath/ath_rate/sample/sample.c
View File

@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$");
#define SAMPLE_DEBUG #define SAMPLE_DEBUG
#ifdef SAMPLE_DEBUG #ifdef SAMPLE_DEBUG
enum { enum {
ATH_DEBUG_RATE = 0x00000010, /* rate control */ ATH_DEBUG_RATE = 0x00000010 /* rate control */
}; };
#define DPRINTF(sc, _fmt, ...) do { \ #define DPRINTF(sc, _fmt, ...) do { \
if (sc->sc_debug & ATH_DEBUG_RATE) \ if (sc->sc_debug & ATH_DEBUG_RATE) \
@ -108,13 +108,17 @@ enum {
* The difference between the algorithm in the thesis and the one in this * The difference between the algorithm in the thesis and the one in this
* file is that the one in this file uses a ewma instead of a window. * file is that the one in this file uses a ewma instead of a window.
* *
* Also, this implementation tracks the average transmission time for
* a few different packet sizes independently for each link.
*/ */
#define STALE_FAILURE_TIMEOUT_MS 10000 #define STALE_FAILURE_TIMEOUT_MS 10000
#define MIN_SWITCH_MS 1000
static void ath_rate_ctl_reset(struct ath_softc *, struct ieee80211_node *); static void ath_rate_ctl_reset(struct ath_softc *, struct ieee80211_node *);
static __inline int size_to_bin(int size) static __inline int
size_to_bin(int size)
{ {
int x = 0; int x = 0;
for (x = 0; x < NUM_PACKET_SIZE_BINS; x++) { for (x = 0; x < NUM_PACKET_SIZE_BINS; x++) {
@ -124,11 +128,13 @@ static __inline int size_to_bin(int size)
} }
return NUM_PACKET_SIZE_BINS-1; return NUM_PACKET_SIZE_BINS-1;
} }
static __inline int bin_to_size(int index) { static __inline int
bin_to_size(int index) {
return packet_size_bins[index]; return packet_size_bins[index];
} }
static __inline int rate_to_ndx(struct sample_node *sn, int rate) { static __inline int
rate_to_ndx(struct sample_node *sn, int rate) {
int x = 0; int x = 0;
for (x = 0; x < sn->num_rates; x++) { for (x = 0; x < sn->num_rates; x++) {
if (sn->rates[x].rate == rate) { if (sn->rates[x].rate == rate) {
@ -138,28 +144,11 @@ static __inline int rate_to_ndx(struct sample_node *sn, int rate) {
return -1; return -1;
} }
/*
* Setup rate codes for management/control frames. We force
* all such frames to the lowest rate.
*/
static void
ath_rate_setmgtrates(struct ath_softc *sc, struct ath_node *an)
{
const HAL_RATE_TABLE *rt = sc->sc_currates;
/* setup rates for management frames */
/* XXX management/control frames always go at lowest speed */
an->an_tx_mgtrate = rt->info[0].rateCode;
an->an_tx_mgtratesp = an->an_tx_mgtrate
| rt->info[0].shortPreamble;
}
void void
ath_rate_node_init(struct ath_softc *sc, struct ath_node *an) ath_rate_node_init(struct ath_softc *sc, struct ath_node *an)
{ {
DPRINTF(sc, "%s:\n", __func__); DPRINTF(sc, "%s:\n", __func__);
/* NB: assumed to be zero'd by caller */ /* NB: assumed to be zero'd by caller */
ath_rate_setmgtrates(sc, an);
} }
void void
@ -185,6 +174,15 @@ static __inline int best_rate_ndx(struct sample_node *sn, int size_bin,
!sn->stats[size_bin][x].packets_acked)) { !sn->stats[size_bin][x].packets_acked)) {
continue; continue;
} }
/* 9 megabits never works better than 12 */
if (sn->rates[x].rate == 18)
continue;
/* don't use a bit-rate that has been failing */
if (sn->stats[size_bin][x].successive_failures > 3)
continue;
if (!best_rate_tt || best_rate_tt > tt) { if (!best_rate_tt || best_rate_tt > tt) {
best_rate_tt = tt; best_rate_tt = tt;
best_rate_ndx = x; best_rate_ndx = x;
@ -194,11 +192,10 @@ static __inline int best_rate_ndx(struct sample_node *sn, int size_bin,
} }
/* /*
* pick a ndx s.t. the perfect_tx_time * pick a good "random" bit-rate to sample other than the current one
* is less than the best bit-rate's average_tx_time
* and the ndx has not had four successive failures.
*/ */
static __inline int pick_sample_ndx(struct sample_node *sn, int size_bin) static __inline int
pick_sample_ndx(struct sample_node *sn, int size_bin)
{ {
int x = 0; int x = 0;
int current_ndx = 0; int current_ndx = 0;
@ -213,25 +210,39 @@ static __inline int pick_sample_ndx(struct sample_node *sn, int size_bin)
current_tt = sn->stats[size_bin][current_ndx].average_tx_time; current_tt = sn->stats[size_bin][current_ndx].average_tx_time;
for (x = 0; x < sn->num_rates; x++) { for (x = 0; x < sn->num_rates; x++) {
int ndx = (sn->last_sample_ndx[size_bin] + 1 + x) % sn->num_rates; int ndx = (sn->last_sample_ndx[size_bin]+1+x) % sn->num_rates;
/*
* clear any stale stuff out. /* don't sample the current bit-rate */
*/ if (ndx == current_ndx)
if (ticks - sn->stats[size_bin][ndx].last_tx > ((hz * STALE_FAILURE_TIMEOUT_MS)/1000)) { continue;
sn->stats[size_bin][ndx].average_tx_time = sn->stats[size_bin][ndx].perfect_tx_time;
sn->stats[size_bin][ndx].successive_failures = 0; /* this bit-rate is always worse than the current one */
sn->stats[size_bin][ndx].tries = 0; if (sn->stats[size_bin][ndx].perfect_tx_time > current_tt)
sn->stats[size_bin][ndx].total_packets = 0; continue;
sn->stats[size_bin][ndx].packets_acked = 0;
} /* rarely sample bit-rates that fail a lot */
if (ticks - sn->stats[size_bin][ndx].last_tx < ((hz * STALE_FAILURE_TIMEOUT_MS)/1000) &&
sn->stats[size_bin][ndx].successive_failures > 3)
continue;
/* don't sample more than 2 indexes higher
* for rates higher than 11 megabits
*/
if (sn->rates[ndx].rate > 22 && ndx > current_ndx + 2)
continue;
/* 9 megabits never works better than 12 */
if (sn->rates[ndx].rate == 18)
continue;
/* if we're using 11 megabits, only sample up to 12 megabits
*/
if (sn->rates[current_ndx].rate == 22 && ndx > current_ndx + 1)
continue;
if (ndx != current_ndx &&
sn->stats[size_bin][ndx].perfect_tx_time < current_tt &&
sn->stats[size_bin][ndx].successive_failures < 4) {
sn->last_sample_ndx[size_bin] = ndx; sn->last_sample_ndx[size_bin] = ndx;
return ndx; return ndx;
} }
}
return current_ndx; return current_ndx;
} }
@ -243,11 +254,10 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_node *sn = ATH_NODE_SAMPLE(an);
struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc); struct sample_softc *ssc = ATH_SOFTC_SAMPLE(sc);
struct ieee80211com *ic = &sc->sc_ic; struct ieee80211com *ic = &sc->sc_ic;
int ndx, size_bin, mrr, best_ndx; int ndx, size_bin, mrr, best_ndx, change_rates;
unsigned average_tx_time; unsigned average_tx_time;
mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT) && mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
!(frameLen > ic->ic_rtsthreshold);
size_bin = size_to_bin(frameLen); size_bin = size_to_bin(frameLen);
best_ndx = best_rate_ndx(sn, size_bin, !mrr); best_ndx = best_rate_ndx(sn, size_bin, !mrr);
@ -256,57 +266,14 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
} else { } else {
average_tx_time = 0; average_tx_time = 0;
} }
if (sn->static_rate_ndx != -1) { if (sn->static_rate_ndx != -1) {
ndx = sn->static_rate_ndx; ndx = sn->static_rate_ndx;
*try0 = ATH_TXMAXTRY; *try0 = ATH_TXMAXTRY;
} else { } else {
ndx = 0;
*try0 = mrr ? 2 : ATH_TXMAXTRY; *try0 = mrr ? 2 : ATH_TXMAXTRY;
DPRINTF(sc, "%s: %s size %d mrr %d packets_sent %d best_ndx %d " if (sn->sample_tt[size_bin] < average_tx_time * (sn->packets_since_sample[size_bin]*ssc->ath_sample_rate/100)) {
"sample tt %d packets since %d\n"
, __func__, ether_sprintf(an->an_node.ni_macaddr)
, packet_size_bins[size_bin]
, mrr
, sn->packets_sent[size_bin]
, best_ndx
, sn->sample_tt[size_bin]
, sn->packets_since_sample[size_bin]
);
if (!sn->packets_sent[size_bin]) {
/* no packets sent */
if (best_ndx == -1) {
ndx = sn->num_rates - 1;
if (sc->sc_curmode != IEEE80211_MODE_11B) {
for (; ndx >= 0 && sn->rates[ndx].rate > 72; ndx--)
;
}
} else {
ndx = best_ndx;
}
} else if (best_ndx == -1) {
/* no packet has succeeded yet */
if (mrr) {
/*
* no packet has succeeded, try the
* highest bitrate that hasn't failed
*/
for (ndx = sn->num_rates-1; ndx >= 0; ndx--) {
if (sn->stats[size_bin][ndx].successive_failures == 0) {
break;
}
}
} else {
ndx = sn->num_rates - 1;
if (sc->sc_curmode != IEEE80211_MODE_11B) {
for (; ndx >= 0 && sn->rates[ndx].rate > 72; ndx--)
;
}
}
} else if (sn->sample_tt[size_bin] < (sn->packets_since_sample[size_bin]*ssc->ath_sample_rate/100) * average_tx_time &&
sn->packets_since_sample[size_bin] > 15) {
/* /*
* we want to limit the time measuring the performance * we want to limit the time measuring the performance
* of other bit-rates to ath_sample_rate% of the * of other bit-rates to ath_sample_rate% of the
@ -314,13 +281,6 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
*/ */
ndx = pick_sample_ndx(sn, size_bin); ndx = pick_sample_ndx(sn, size_bin);
if (ndx != sn->current_rate[size_bin]) { if (ndx != sn->current_rate[size_bin]) {
DPRINTF(sc, "%s: %s size %d last sample tt %d sampling %d packets since %d\n",
__func__,
ether_sprintf(an->an_node.ni_macaddr),
packet_size_bins[size_bin],
sn->sample_tt[size_bin],
sn->rates[ndx].rate,
sn->packets_since_sample[size_bin]);
sn->current_sample_ndx[size_bin] = ndx; sn->current_sample_ndx[size_bin] = ndx;
} else { } else {
sn->current_sample_ndx[size_bin] = -1; sn->current_sample_ndx[size_bin] = -1;
@ -328,19 +288,37 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
sn->packets_since_sample[size_bin] = 0; sn->packets_since_sample[size_bin] = 0;
} else { } else {
sn->packets_since_sample[size_bin]++; change_rates = 0;
if (!sn->packets_sent[size_bin] || best_ndx == -1) {
/* no packet has been sent successfully yet */
for (ndx = sn->num_rates-1; ndx > 0; ndx--) {
/* /*
* don't switch bit-rates every packet. only * pick the highest rate <= 36 Mbps
* switch during the first few packets we send * that hasn't failed.
* or after 100 packets, or if the current
* bit-rate begins to perform twice as bad as
* another one.
*/ */
if (sn->packets_sent[size_bin] < 20 || if (sn->rates[ndx].rate <= 72 &&
ticks - ((hz*2000)/1000) > sn->jiffies_since_switch[size_bin] || sn->stats[size_bin][ndx].successive_failures == 0) {
average_tx_time * 2 < sn->stats[size_bin][sn->current_rate[size_bin]].average_tx_time ) { break;
if (sn->packets_sent[size_bin] > 20) { }
DPRINTF(sc, "%s: %s size %d switch rate %d (%d/%d) -> %d (%d/%d) after %d packets mmr %d\n", }
change_rates = 1;
best_ndx = ndx;
} else if (sn->packets_sent[size_bin] < 20) {
/* let the bit-rate switch quickly during the first few packets */
change_rates = 1;
} else if (ticks - ((hz*MIN_SWITCH_MS)/1000) > sn->ticks_since_switch[size_bin]) {
/* 2 seconds have gone by */
change_rates = 1;
} else if (average_tx_time * 2 < sn->stats[size_bin][sn->current_rate[size_bin]].average_tx_time) {
/* the current bit-rate is twice as slow as the best one */
change_rates = 1;
}
sn->packets_since_sample[size_bin]++;
if (change_rates) {
if (best_ndx != sn->current_rate[size_bin]) {
DPRINTF(sc, "%s: %s size %d switch rate %d (%d/%d) -> %d (%d/%d) after %d packets mrr %d\n",
__func__, __func__,
ether_sprintf(an->an_node.ni_macaddr), ether_sprintf(an->an_node.ni_macaddr),
packet_size_bins[size_bin], packet_size_bins[size_bin],
@ -355,17 +333,22 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
} }
sn->packets_since_switch[size_bin] = 0; sn->packets_since_switch[size_bin] = 0;
sn->current_rate[size_bin] = best_ndx; sn->current_rate[size_bin] = best_ndx;
sn->jiffies_since_switch[size_bin] = ticks; sn->ticks_since_switch[size_bin] = ticks;
} }
ndx = sn->current_rate[size_bin]; ndx = sn->current_rate[size_bin];
sn->packets_since_switch[size_bin]++; sn->packets_since_switch[size_bin]++;
if (size_bin == 0) {
/*
* set the visible txrate for this node
* to the rate of small packets
*/
an->an_node.ni_txrate = ndx;
}
}
} }
} KASSERT(ndx >= 0 && ndx < sn->num_rates, ("ndx is %d", ndx));
if (ndx < 0) {
ndx = 0;
}
*rix = sn->rates[ndx].rix; *rix = sn->rates[ndx].rix;
if (shortPreamble) { if (shortPreamble) {
*txrate = sn->rates[ndx].shortPreambleRateCode; *txrate = sn->rates[ndx].shortPreambleRateCode;
@ -373,7 +356,6 @@ ath_rate_findrate(struct ath_softc *sc, struct ath_node *an,
*txrate = sn->rates[ndx].rateCode; *txrate = sn->rates[ndx].rateCode;
} }
sn->packets_sent[size_bin]++; sn->packets_sent[size_bin]++;
an->an_node.ni_txrate = ndx;
} }
void void
@ -382,28 +364,17 @@ ath_rate_setupxtxdesc(struct ath_softc *sc, struct ath_node *an,
{ {
struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_node *sn = ATH_NODE_SAMPLE(an);
int rateCode = -1; int rateCode = -1;
int frame_size, size_bin, best_ndx, ndx; int frame_size = 0;
int size_bin = 0;
int ndx = 0;
frame_size = ds->ds_ctl0 & 0x0fff; /* low-order 12 bits of ds_ctl0 */ size_bin = size_to_bin(frame_size); // TODO: it's correct that frame_size alway 0 ?
KASSERT(frame_size != 0, ("no frame size")); ndx = sn->current_rate[size_bin]; /* retry at the current bit-rate */
size_bin = size_to_bin(frame_size);
best_ndx = best_rate_ndx(sn, size_bin, 0);
if (best_ndx == -1 || !sn->stats[size_bin][best_ndx].packets_acked) { if (!sn->stats[size_bin][ndx].packets_acked) {
/* ndx = 0; /* use the lowest bit-rate */
* no packet has succeeded, so also try at the
* lowest bitate.
*/
ndx = 0;
} else {
/*
* we're trying a different bit-rate, and it could be lossy,
* so if it fails try at the best bit-rate.
*/
ndx = best_ndx;
} }
KASSERT(0 <= ndx && ndx < IEEE80211_RATE_MAXSIZE,
("invalid ndx %d", ndx));
if (shortPreamble) { if (shortPreamble) {
rateCode = sn->rates[ndx].shortPreambleRateCode; rateCode = sn->rates[ndx].shortPreambleRateCode;
} else { } else {
@ -461,17 +432,6 @@ update_stats(struct ath_softc *sc, struct ath_node *an,
short_tries-1, short_tries-1,
MIN(tries3 + tries_so_far, tries) - tries_so_far - 1); MIN(tries3 + tries_so_far, tries) - tries_so_far - 1);
} }
#ifdef SAMPLE_DEBUG
if (short_tries + tries > 3 || status) {
DPRINTF(sc, "%s: %s size %d rate %d ndx %d tries (%d/%d) tries0 %d tt %d avg_tt %d perfect_tt %d status %d\n",
__func__, ether_sprintf(an->an_node.ni_macaddr),
size,
rate, ndx0, short_tries, tries, tries0, tt,
sn->stats[size_bin][ndx0].average_tx_time,
sn->stats[size_bin][ndx0].perfect_tx_time,
status);
}
#endif /* SAMPLE_DEBUG */
if (sn->stats[size_bin][ndx0].total_packets < (100 / (100 - ssc->ath_smoothing_rate))) { if (sn->stats[size_bin][ndx0].total_packets < (100 / (100 - ssc->ath_smoothing_rate))) {
/* just average the first few packets */ /* just average the first few packets */
int avg_tx = sn->stats[size_bin][ndx0].average_tx_time; int avg_tx = sn->stats[size_bin][ndx0].average_tx_time;
@ -485,16 +445,17 @@ update_stats(struct ath_softc *sc, struct ath_node *an,
} }
if (status) { if (status) {
/*
* this packet failed - count this as a failure
* for larger packets also, since we assume
* if a small packet fails at a lower bit-rate
* then a larger one will also.
*/
int y; int y;
for (y = size_bin; y < NUM_PACKET_SIZE_BINS; y++) { sn->stats[size_bin][ndx0].successive_failures++;
for (y = size_bin+1; y < NUM_PACKET_SIZE_BINS; y++) {
/* also say larger packets failed since we
* assume if a small packet fails at a lower
* bit-rate then a larger one will also.
*/
sn->stats[y][ndx0].successive_failures++; sn->stats[y][ndx0].successive_failures++;
sn->stats[y][ndx0].last_tx = ticks; sn->stats[y][ndx0].last_tx = ticks;
sn->stats[y][ndx0].tries += tries;
sn->stats[y][ndx0].total_packets++;
} }
} else { } else {
sn->stats[size_bin][ndx0].packets_acked++; sn->stats[size_bin][ndx0].packets_acked++;
@ -521,10 +482,12 @@ void
ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an, ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an,
const struct ath_desc *ds, const struct ath_desc *ds0) const struct ath_desc *ds, const struct ath_desc *ds0)
{ {
struct ieee80211com *ic = &sc->sc_ic;
struct sample_node *sn = ATH_NODE_SAMPLE(an); struct sample_node *sn = ATH_NODE_SAMPLE(an);
const struct ar5212_desc *ads = (const struct ar5212_desc *)&ds->ds_ctl0; const struct ar5212_desc *ads = (const struct ar5212_desc *)&ds->ds_ctl0;
int final_rate, short_tries, long_tries, frame_size; int final_rate, short_tries, long_tries, frame_size;
int ndx = -1; int ndx = -1;
int mrr;
final_rate = sc->sc_hwmap[ds->ds_txstat.ts_rate &~ HAL_TXSTAT_ALTRATE].ieeerate; final_rate = sc->sc_hwmap[ds->ds_txstat.ts_rate &~ HAL_TXSTAT_ALTRATE].ieeerate;
short_tries = ds->ds_txstat.ts_shortretry + 1; short_tries = ds->ds_txstat.ts_shortretry + 1;
@ -543,6 +506,8 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an,
return; return;
} }
mrr = sc->sc_mrretry && !(ic->ic_flags & IEEE80211_F_USEPROT);
if (sc->sc_mrretry && ds->ds_txstat.ts_status) { if (sc->sc_mrretry && ds->ds_txstat.ts_status) {
/* this packet failed */ /* this packet failed */
DPRINTF(sc, "%s: %s size %d rate/try %d/%d %d/%d %d/%d %d/%d status %s retries (%d/%d)\n", DPRINTF(sc, "%s: %s size %d rate/try %d/%d %d/%d %d/%d %d/%d status %s retries (%d/%d)\n",
@ -562,7 +527,7 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an,
long_tries); long_tries);
} }
if (!(ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE)) { if (!mrr || !(ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE)) {
/* only one rate was used */ /* only one rate was used */
ndx = rate_to_ndx(sn, final_rate); ndx = rate_to_ndx(sn, final_rate);
DPRINTF(sc, "%s: %s size %d status %d rate/try %d/%d/%d\n", DPRINTF(sc, "%s: %s size %d status %d rate/try %d/%d/%d\n",
@ -625,7 +590,7 @@ ath_rate_tx_complete(struct ath_softc *sc, struct ath_node *an,
ndx2, tries2, ndx2, tries2,
ndx3, tries3, ndx3, tries3,
short_tries, ds->ds_txstat.ts_longretry + 1, short_tries, ds->ds_txstat.ts_longretry + 1,
ds->ds_txstat.ts_status); long_tries > tries0);
} }
if (tries1 && finalTSIdx > 0) { if (tries1 && finalTSIdx > 0) {
@ -689,8 +654,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
* A fixed rate is to be used; ic_fixed_rate is an * A fixed rate is to be used; ic_fixed_rate is an
* index into the supported rate set. Convert this * index into the supported rate set. Convert this
* to the index into the negotiated rate set for * to the index into the negotiated rate set for
* the node. We know the rate is there because the * the node.
* rate set is checked when the station associates.
*/ */
const struct ieee80211_rateset *rs = const struct ieee80211_rateset *rs =
&ic->ic_sup_rates[ic->ic_curmode]; &ic->ic_sup_rates[ic->ic_curmode];
@ -710,6 +674,11 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
for (x = 0; x < ni->ni_rates.rs_nrates; x++) { for (x = 0; x < ni->ni_rates.rs_nrates; x++) {
sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL; sn->rates[x].rate = ni->ni_rates.rs_rates[x] & IEEE80211_RATE_VAL;
sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate]; sn->rates[x].rix = sc->sc_rixmap[sn->rates[x].rate];
if (sn->rates[x].rix == 0xff) {
DPRINTF(sc, "%s: ignore bogus rix at %d\n",
__func__, x);
continue;
}
sn->rates[x].rateCode = rt->info[sn->rates[x].rix].rateCode; sn->rates[x].rateCode = rt->info[sn->rates[x].rix].rateCode;
sn->rates[x].shortPreambleRateCode = sn->rates[x].shortPreambleRateCode =
rt->info[sn->rates[x].rix].rateCode | rt->info[sn->rates[x].rix].rateCode |
@ -727,6 +696,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) { for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) {
int size = bin_to_size(y); int size = bin_to_size(y);
int ndx = 0;
sn->packets_sent[y] = 0; sn->packets_sent[y] = 0;
sn->current_sample_ndx[y] = -1; sn->current_sample_ndx[y] = -1;
sn->last_sample_ndx[y] = 0; sn->last_sample_ndx[y] = 0;
@ -744,7 +714,27 @@ ath_rate_ctl_reset(struct ath_softc *sc, struct ieee80211_node *ni)
0, 0); 0, 0);
sn->stats[y][x].average_tx_time = sn->stats[y][x].perfect_tx_time; sn->stats[y][x].average_tx_time = sn->stats[y][x].perfect_tx_time;
} }
/* set the initial rate */
for (ndx = sn->num_rates-1; ndx > 0; ndx--) {
if (sn->rates[ndx].rate <= 72) {
break;
} }
}
sn->current_rate[y] = ndx;
}
DPRINTF(sc, "%s: %s %d rates %d%sMbps (%dus)- %d%sMbps (%dus)\n",
__func__, ether_sprintf(ni->ni_macaddr),
sn->num_rates,
sn->rates[0].rate/2, sn->rates[0].rate % 0x1 ? ".5" : "",
sn->stats[1][0].perfect_tx_time,
sn->rates[sn->num_rates-1].rate/2,
sn->rates[sn->num_rates-1].rate % 0x1 ? ".5" : "",
sn->stats[1][sn->num_rates-1].perfect_tx_time
);
ni->ni_txrate = sn->current_rate[0];
#undef RATE #undef RATE
} }

56
sys/dev/ath/ath_rate/sample/sample.h
View File

@ -90,7 +90,7 @@ struct sample_node {
int current_rate[NUM_PACKET_SIZE_BINS]; int current_rate[NUM_PACKET_SIZE_BINS];
int packets_since_switch[NUM_PACKET_SIZE_BINS]; int packets_since_switch[NUM_PACKET_SIZE_BINS];
unsigned jiffies_since_switch[NUM_PACKET_SIZE_BINS]; unsigned ticks_since_switch[NUM_PACKET_SIZE_BINS];
int packets_since_sample[NUM_PACKET_SIZE_BINS]; int packets_since_sample[NUM_PACKET_SIZE_BINS];
unsigned sample_tt[NUM_PACKET_SIZE_BINS]; unsigned sample_tt[NUM_PACKET_SIZE_BINS];
@ -186,8 +186,8 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
int length, int length,
int rix, int short_retries, int long_retries) { int rix, int short_retries, int long_retries) {
const HAL_RATE_TABLE *rt = sc->sc_currates; const HAL_RATE_TABLE *rt = sc->sc_currates;
int rts, cts;
/* pg 205 ieee.802.11.pdf */
unsigned t_slot = 20; unsigned t_slot = 20;
unsigned t_difs = 50; unsigned t_difs = 50;
unsigned t_sifs = 10; unsigned t_sifs = 10;
@ -196,16 +196,43 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
int x = 0; int x = 0;
int cw = WIFI_CW_MIN; int cw = WIFI_CW_MIN;
int cix = rt->info[rix].controlRate; int cix = rt->info[rix].controlRate;
int rts = 0;
int cts = 0;
KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode)); KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
if (rt->info[rix].phy == IEEE80211_T_OFDM) { if (!rt->info[rix].rateKbps) {
t_slot = 9; printf("rix %d (%d) bad ratekbps %d mode %u",
t_sifs = 9; rix, rt->info[rix].dot11Rate,
t_difs = 28; rt->info[rix].rateKbps,
sc->sc_curmode);
return 0;
} }
/*
* XXX getting mac/phy level timings should be fixed for turbo
* rates, and there is probably a way to get this from the
* hal...
*/
switch (rt->info[rix].phy) {
case IEEE80211_T_OFDM:
t_slot = 9;
t_sifs = 16;
t_difs = 28;
/* fall through */
case IEEE80211_T_TURBO:
t_slot = 9;
t_sifs = 8;
t_difs = 28;
break;
case IEEE80211_T_DS:
/* fall through to default */
default:
/* pg 205 ieee.802.11.pdf */
t_slot = 20;
t_difs = 50;
t_sifs = 10;
}
rts = cts = 0;
if ((ic->ic_flags & IEEE80211_F_USEPROT) && if ((ic->ic_flags & IEEE80211_F_USEPROT) &&
rt->info[rix].phy == IEEE80211_T_OFDM) { rt->info[rix].phy == IEEE80211_T_OFDM) {
@ -218,13 +245,22 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
} }
if (length > ic->ic_rtsthreshold) { if (0 /*length > ic->ic_rtsthreshold */) {
rts = 1; rts = 1;
} }
if (rts || cts) { if (rts || cts) {
int ctsrate = rt->info[cix].rateCode; int ctsrate = rt->info[cix].rateCode;
int ctsduration = 0; int ctsduration = 0;
if (!rt->info[cix].rateKbps) {
printf("cix %d (%d) bad ratekbps %d mode %u",
cix, rt->info[cix].dot11Rate,
rt->info[cix].rateKbps,
sc->sc_curmode);
return 0;
}
ctsrate |= rt->info[cix].shortPreamble; ctsrate |= rt->info[cix].shortPreamble;
if (rts) /* SIFS + CTS */ if (rts) /* SIFS + CTS */
ctsduration += rt->info[cix].spAckDuration; ctsduration += rt->info[cix].spAckDuration;
@ -238,7 +274,7 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
tt += (short_retries + 1) * ctsduration; tt += (short_retries + 1) * ctsduration;
} }
tt += t_difs; tt += t_difs;
tt += (long_retries+1)*(t_sifs + rt->info[cix].spAckDuration); tt += (long_retries+1)*(t_sifs + rt->info[rix].spAckDuration);
tt += (long_retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length, tt += (long_retries+1)*ath_hal_computetxtime(sc->sc_ah, rt, length,
rix, AH_TRUE); rix, AH_TRUE);
for (x = 0; x <= short_retries + long_retries; x++) { for (x = 0; x <= short_retries + long_retries; x++) {

745
sys/dev/ath/if_ath.c
View File

File diff suppressed because it is too large Load Diff

2
sys/dev/ath/if_athioctl.h
View File

@ -46,6 +46,7 @@ struct ath_stats {
u_int32_t ast_watchdog; /* device reset by watchdog */ u_int32_t ast_watchdog; /* device reset by watchdog */
u_int32_t ast_hardware; /* fatal hardware error interrupts */ u_int32_t ast_hardware; /* fatal hardware error interrupts */
u_int32_t ast_bmiss; /* beacon miss interrupts */ u_int32_t ast_bmiss; /* beacon miss interrupts */
u_int32_t ast_bmiss_phantom;/* beacon miss interrupts */
u_int32_t ast_bstuck; /* beacon stuck interrupts */ u_int32_t ast_bstuck; /* beacon stuck interrupts */
u_int32_t ast_rxorn; /* rx overrun interrupts */ u_int32_t ast_rxorn; /* rx overrun interrupts */
u_int32_t ast_rxeol; /* rx eol interrupts */ u_int32_t ast_rxeol; /* rx eol interrupts */
@ -105,6 +106,7 @@ struct ath_stats {
u_int32_t ast_ant_txswitch;/* tx antenna switches */ u_int32_t ast_ant_txswitch;/* tx antenna switches */
u_int32_t ast_ant_rx[8]; /* rx frames with antenna */ u_int32_t ast_ant_rx[8]; /* rx frames with antenna */
u_int32_t ast_ant_tx[8]; /* tx frames with antenna */ u_int32_t ast_ant_tx[8]; /* tx frames with antenna */
u_int32_t ast_pad[32];
}; };
#define SIOCGATHSTATS _IOWR('i', 137, struct ifreq) #define SIOCGATHSTATS _IOWR('i', 137, struct ifreq)

107
sys/dev/ath/if_athvar.h
View File

@ -51,10 +51,15 @@
#define ATH_TIMEOUT 1000 #define ATH_TIMEOUT 1000
#ifndef ATH_RXBUF
#define ATH_RXBUF 40 /* number of RX buffers */ #define ATH_RXBUF 40 /* number of RX buffers */
#endif
#ifndef ATH_TXBUF
#define ATH_TXBUF 100 /* number of TX buffers */ #define ATH_TXBUF 100 /* number of TX buffers */
#endif
#define ATH_TXDESC 10 /* number of descriptors per buffer */ #define ATH_TXDESC 10 /* number of descriptors per buffer */
#define ATH_TXMAXTRY 11 /* max number of transmit attempts */ #define ATH_TXMAXTRY 11 /* max number of transmit attempts */
#define ATH_TXMGTTRY 4 /* xmit attempts for mgt/ctl frames */
#define ATH_TXINTR_PERIOD 5 /* max number of batched tx descriptors */ #define ATH_TXINTR_PERIOD 5 /* max number of batched tx descriptors */
#define ATH_BEACON_AIFS_DEFAULT 0 /* default aifs for ap beacon q */ #define ATH_BEACON_AIFS_DEFAULT 0 /* default aifs for ap beacon q */
@ -75,10 +80,7 @@
/* driver-specific node state */ /* driver-specific node state */
struct ath_node { struct ath_node {
struct ieee80211_node an_node; /* base class */ struct ieee80211_node an_node; /* base class */
u_int8_t an_tx_mgtrate; /* h/w rate for management/ctl frames */
u_int8_t an_tx_mgtratesp;/* short preamble h/w rate for " " */
u_int32_t an_avgrssi; /* average rssi over all rx frames */ u_int32_t an_avgrssi; /* average rssi over all rx frames */
HAL_NODE_STATS an_halstats; /* rssi statistics used by hal */
/* variable-length rate control state follows */ /* variable-length rate control state follows */
}; };
#define ATH_NODE(ni) ((struct ath_node *)(ni)) #define ATH_NODE(ni) ((struct ath_node *)(ni))
@ -140,11 +142,14 @@ struct ath_txq {
u_int32_t *axq_link; /* link ptr in last TX desc */ u_int32_t *axq_link; /* link ptr in last TX desc */
STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */ STAILQ_HEAD(, ath_buf) axq_q; /* transmit queue */
struct mtx axq_lock; /* lock on q and link */ struct mtx axq_lock; /* lock on q and link */
char axq_name[12]; /* e.g. "ath0_txq4" */
}; };
#define ATH_TXQ_LOCK_INIT(_sc, _tq) \ #define ATH_TXQ_LOCK_INIT(_sc, _tq) do { \
mtx_init(&(_tq)->axq_lock, \ snprintf((_tq)->axq_name, sizeof((_tq)->axq_name), "%s_txq%u", \
device_get_nameunit((_sc)->sc_dev), "xmit q", MTX_DEF) device_get_nameunit((_sc)->sc_dev), (_tq)->axq_qnum); \
mtx_init(&(_tq)->axq_lock, (_tq)->axq_name, "ath_txq", MTX_DEF); \
} while (0);
#define ATH_TXQ_LOCK_DESTROY(_tq) mtx_destroy(&(_tq)->axq_lock) #define ATH_TXQ_LOCK_DESTROY(_tq) mtx_destroy(&(_tq)->axq_lock)
#define ATH_TXQ_LOCK(_tq) mtx_lock(&(_tq)->axq_lock) #define ATH_TXQ_LOCK(_tq) mtx_lock(&(_tq)->axq_lock)
#define ATH_TXQ_UNLOCK(_tq) mtx_unlock(&(_tq)->axq_lock) #define ATH_TXQ_UNLOCK(_tq) mtx_unlock(&(_tq)->axq_lock)
@ -159,11 +164,13 @@ struct ath_txq {
(_tq)->axq_depth--; \ (_tq)->axq_depth--; \
} while (0) } while (0)
struct taskqueue;
struct ath_tx99;
struct ath_softc { struct ath_softc {
struct ifnet *sc_ifp; /* interface common */ struct ifnet *sc_ifp; /* interface common */
struct ath_stats sc_stats; /* interface statistics */ struct ath_stats sc_stats; /* interface statistics */
struct ieee80211com sc_ic; /* IEEE 802.11 common */ struct ieee80211com sc_ic; /* IEEE 802.11 common */
int sc_regdomain;
int sc_countrycode; int sc_countrycode;
int sc_debug; int sc_debug;
void (*sc_recv_mgmt)(struct ieee80211com *, void (*sc_recv_mgmt)(struct ieee80211com *,
@ -178,8 +185,11 @@ struct ath_softc {
bus_space_handle_t sc_sh; /* bus space handle */ bus_space_handle_t sc_sh; /* bus space handle */
bus_dma_tag_t sc_dmat; /* bus DMA tag */ bus_dma_tag_t sc_dmat; /* bus DMA tag */
struct mtx sc_mtx; /* master lock (recursive) */ struct mtx sc_mtx; /* master lock (recursive) */
struct taskqueue *sc_tq; /* private task queue */
struct proc *sc_tqproc;
struct ath_hal *sc_ah; /* Atheros HAL */ struct ath_hal *sc_ah; /* Atheros HAL */
struct ath_ratectrl *sc_rc; /* tx rate control support */ struct ath_ratectrl *sc_rc; /* tx rate control support */
struct ath_tx99 *sc_tx99; /* tx99 adjunct state */
void (*sc_setdefantenna)(struct ath_softc *, u_int); void (*sc_setdefantenna)(struct ath_softc *, u_int);
unsigned int sc_invalid : 1, /* disable hardware accesses */ unsigned int sc_invalid : 1, /* disable hardware accesses */
sc_mrretry : 1, /* multi-rate retry support */ sc_mrretry : 1, /* multi-rate retry support */
@ -191,11 +201,13 @@ struct ath_softc {
sc_ledstate: 1, /* LED on/off state */ sc_ledstate: 1, /* LED on/off state */
sc_blinking: 1, /* LED blink operation active */ sc_blinking: 1, /* LED blink operation active */
sc_mcastkey: 1, /* mcast key cache search */ sc_mcastkey: 1, /* mcast key cache search */
sc_syncbeacon:1,/* sync/resync beacon timers */
sc_hasclrkey:1; /* CLR key supported */ sc_hasclrkey:1; /* CLR key supported */
/* rate tables */ /* rate tables */
const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX]; const HAL_RATE_TABLE *sc_rates[IEEE80211_MODE_MAX];
const HAL_RATE_TABLE *sc_currates; /* current rate table */ const HAL_RATE_TABLE *sc_currates; /* current rate table */
enum ieee80211_phymode sc_curmode; /* current phy mode */ enum ieee80211_phymode sc_curmode; /* current phy mode */
HAL_OPMODE sc_opmode; /* current operating mode */
u_int16_t sc_curtxpow; /* current tx power limit */ u_int16_t sc_curtxpow; /* current tx power limit */
HAL_CHANNEL sc_curchan; /* current h/w channel */ HAL_CHANNEL sc_curchan; /* current h/w channel */
u_int8_t sc_rixmap[256]; /* IEEE to h/w rate table ix */ u_int8_t sc_rixmap[256]; /* IEEE to h/w rate table ix */
@ -206,7 +218,10 @@ struct ath_softc {
u_int16_t ledon; /* softled on time */ u_int16_t ledon; /* softled on time */
u_int16_t ledoff; /* softled off time */ u_int16_t ledoff; /* softled off time */
} sc_hwmap[32]; /* h/w rate ix mappings */ } sc_hwmap[32]; /* h/w rate ix mappings */
u_int8_t sc_minrateix; /* min h/w rate index */
u_int8_t sc_mcastrix; /* mcast h/w rate index */
u_int8_t sc_protrix; /* protection rate index */ u_int8_t sc_protrix; /* protection rate index */
u_int sc_mcastrate; /* ieee rate for mcastrateix */
u_int sc_txantenna; /* tx antenna (fixed or auto) */ u_int sc_txantenna; /* tx antenna (fixed or auto) */
HAL_INT sc_imask; /* interrupt mask copy */ HAL_INT sc_imask; /* interrupt mask copy */
u_int sc_keymax; /* size of key cache */ u_int sc_keymax; /* size of key cache */
@ -221,6 +236,9 @@ struct ath_softc {
u_int16_t sc_ledoff; /* off time for current blink */ u_int16_t sc_ledoff; /* off time for current blink */
struct callout sc_ledtimer; /* led off timer */ struct callout sc_ledtimer; /* led off timer */
u_int sc_rfsilentpin; /* GPIO pin for rfkill int */
u_int sc_rfsilentpol; /* pin setting for rfkill on */
struct bpf_if *sc_drvbpf; struct bpf_if *sc_drvbpf;
union { union {
struct ath_tx_radiotap_header th; struct ath_tx_radiotap_header th;
@ -241,12 +259,15 @@ struct ath_softc {
u_int32_t *sc_rxlink; /* link ptr in last RX desc */ u_int32_t *sc_rxlink; /* link ptr in last RX desc */
struct task sc_rxtask; /* rx int processing */ struct task sc_rxtask; /* rx int processing */
struct task sc_rxorntask; /* rxorn int processing */ struct task sc_rxorntask; /* rxorn int processing */
struct task sc_radartask; /* radar processing */
u_int8_t sc_defant; /* current default antenna */ u_int8_t sc_defant; /* current default antenna */
u_int8_t sc_rxotherant; /* rx's on non-default antenna*/ u_int8_t sc_rxotherant; /* rx's on non-default antenna*/
u_int64_t sc_lastrx; /* tsf at last rx'd frame */
struct ath_descdma sc_txdma; /* TX descriptors */ struct ath_descdma sc_txdma; /* TX descriptors */
ath_bufhead sc_txbuf; /* transmit buffer */ ath_bufhead sc_txbuf; /* transmit buffer */
struct mtx sc_txbuflock; /* txbuf lock */ struct mtx sc_txbuflock; /* txbuf lock */
char sc_txname[12]; /* e.g. "ath0_buf" */
int sc_tx_timer; /* transmit timeout */ int sc_tx_timer; /* transmit timeout */
u_int sc_txqsetup; /* h/w queues setup */ u_int sc_txqsetup; /* h/w queues setup */
u_int sc_txintrperiod;/* tx interrupt batching */ u_int sc_txintrperiod;/* tx interrupt batching */
@ -270,7 +291,11 @@ struct ath_softc {
} sc_updateslot; /* slot time update fsm */ } sc_updateslot; /* slot time update fsm */
struct callout sc_cal_ch; /* callout handle for cals */ struct callout sc_cal_ch; /* callout handle for cals */
int sc_calinterval; /* current polling interval */
int sc_caltries; /* cals at current interval */
HAL_NODE_STATS sc_halstats; /* station-mode rssi stats */
struct callout sc_scan_ch; /* callout handle for scan */ struct callout sc_scan_ch; /* callout handle for scan */
struct callout sc_dfs_ch; /* callout handle for dfs */
}; };
#define sc_tx_th u_tx_rt.th #define sc_tx_th u_tx_rt.th
#define sc_rx_th u_rx_rt.th #define sc_rx_th u_rx_rt.th
@ -285,9 +310,11 @@ struct ath_softc {
#define ATH_TXQ_SETUP(sc, i) ((sc)->sc_txqsetup & (1<<i)) #define ATH_TXQ_SETUP(sc, i) ((sc)->sc_txqsetup & (1<<i))
#define ATH_TXBUF_LOCK_INIT(_sc) \ #define ATH_TXBUF_LOCK_INIT(_sc) do { \
mtx_init(&(_sc)->sc_txbuflock, \ snprintf((_sc)->sc_txname, sizeof((_sc)->sc_txname), "%s_buf", \
device_get_nameunit((_sc)->sc_dev), "xmit buf q", MTX_DEF) device_get_nameunit((_sc)->sc_dev)); \
mtx_init(&(_sc)->sc_txbuflock, (_sc)->sc_txname, "ath_buf", MTX_DEF); \
} while (0)
#define ATH_TXBUF_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_txbuflock) #define ATH_TXBUF_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_txbuflock)
#define ATH_TXBUF_LOCK(_sc) mtx_lock(&(_sc)->sc_txbuflock) #define ATH_TXBUF_LOCK(_sc) mtx_lock(&(_sc)->sc_txbuflock)
#define ATH_TXBUF_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_txbuflock) #define ATH_TXBUF_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_txbuflock)
@ -324,8 +351,8 @@ void ath_intr(void *);
((*(_ah)->ah_getPendingInterrupts)((_ah), (_pmask))) ((*(_ah)->ah_getPendingInterrupts)((_ah), (_pmask)))
#define ath_hal_updatetxtriglevel(_ah, _inc) \ #define ath_hal_updatetxtriglevel(_ah, _inc) \
((*(_ah)->ah_updateTxTrigLevel)((_ah), (_inc))) ((*(_ah)->ah_updateTxTrigLevel)((_ah), (_inc)))
#define ath_hal_setpower(_ah, _mode, _sleepduration) \ #define ath_hal_setpower(_ah, _mode) \
((*(_ah)->ah_setPowerMode)((_ah), (_mode), AH_TRUE, (_sleepduration))) ((*(_ah)->ah_setPowerMode)((_ah), (_mode), AH_TRUE))
#define ath_hal_keycachesize(_ah) \ #define ath_hal_keycachesize(_ah) \
((*(_ah)->ah_getKeyCacheSize)((_ah))) ((*(_ah)->ah_getKeyCacheSize)((_ah)))
#define ath_hal_keyreset(_ah, _ix) \ #define ath_hal_keyreset(_ah, _ix) \
@ -366,8 +393,8 @@ void ath_intr(void *);
((*(_ah)->ah_startTxDma)((_ah), (_q))) ((*(_ah)->ah_startTxDma)((_ah), (_q)))
#define ath_hal_setchannel(_ah, _chan) \ #define ath_hal_setchannel(_ah, _chan) \
((*(_ah)->ah_setChannel)((_ah), (_chan))) ((*(_ah)->ah_setChannel)((_ah), (_chan)))
#define ath_hal_calibrate(_ah, _chan) \ #define ath_hal_calibrate(_ah, _chan, _iqcal) \
((*(_ah)->ah_perCalibration)((_ah), (_chan))) ((*(_ah)->ah_perCalibration)((_ah), (_chan), (_iqcal)))
#define ath_hal_setledstate(_ah, _state) \ #define ath_hal_setledstate(_ah, _state) \
((*(_ah)->ah_setLedState)((_ah), (_state))) ((*(_ah)->ah_setLedState)((_ah), (_state)))
#define ath_hal_beaconinit(_ah, _nextb, _bperiod) \ #define ath_hal_beaconinit(_ah, _nextb, _bperiod) \
@ -409,8 +436,8 @@ void ath_intr(void *);
((*(_ah)->ah_getDefAntenna)((_ah))) ((*(_ah)->ah_getDefAntenna)((_ah)))
#define ath_hal_setdefantenna(_ah, _ant) \ #define ath_hal_setdefantenna(_ah, _ant) \
((*(_ah)->ah_setDefAntenna)((_ah), (_ant))) ((*(_ah)->ah_setDefAntenna)((_ah), (_ant)))
#define ath_hal_rxmonitor(_ah, _arg) \ #define ath_hal_rxmonitor(_ah, _arg, _chan) \
((*(_ah)->ah_rxMonitor)((_ah), (_arg))) ((*(_ah)->ah_rxMonitor)((_ah), (_arg), (_chan)))
#define ath_hal_mibevent(_ah, _stats) \ #define ath_hal_mibevent(_ah, _stats) \
((*(_ah)->ah_procMibEvent)((_ah), (_stats))) ((*(_ah)->ah_procMibEvent)((_ah), (_stats)))
#define ath_hal_setslottime(_ah, _us) \ #define ath_hal_setslottime(_ah, _us) \
@ -432,7 +459,9 @@ void ath_intr(void *);
#define ath_hal_ciphersupported(_ah, _cipher) \ #define ath_hal_ciphersupported(_ah, _cipher) \
(ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK) (ath_hal_getcapability(_ah, HAL_CAP_CIPHER, _cipher, NULL) == HAL_OK)
#define ath_hal_getregdomain(_ah, _prd) \ #define ath_hal_getregdomain(_ah, _prd) \
ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) (ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd)) == HAL_OK)
#define ath_hal_setregdomain(_ah, _rd) \
((*(_ah)->ah_setRegulatoryDomain)((_ah), (_rd), NULL))
#define ath_hal_getcountrycode(_ah, _pcc) \ #define ath_hal_getcountrycode(_ah, _pcc) \
(*(_pcc) = (_ah)->ah_countryCode) (*(_pcc) = (_ah)->ah_countryCode)
#define ath_hal_tkipsplit(_ah) \ #define ath_hal_tkipsplit(_ah) \
@ -481,6 +510,24 @@ void ath_intr(void *);
#else #else
#define ath_hal_getmcastkeysearch(_ah) 0 #define ath_hal_getmcastkeysearch(_ah) 0
#endif #endif
#define ath_hal_hasrfsilent(_ah) \
(ath_hal_getcapability(_ah, HAL_CAP_RFSILENT, 0, NULL) == HAL_OK)
#define ath_hal_getrfkill(_ah) \
(ath_hal_getcapability(_ah, HAL_CAP_RFSILENT, 1, NULL) == HAL_OK)
#define ath_hal_setrfkill(_ah, _onoff) \
ath_hal_setcapability(_ah, HAL_CAP_RFSILENT, 1, _onoff, NULL)
#define ath_hal_getrfsilent(_ah, _prfsilent) \
(ath_hal_getcapability(_ah, HAL_CAP_RFSILENT, 2, _prfsilent) == HAL_OK)
#define ath_hal_setrfsilent(_ah, _rfsilent) \
ath_hal_setcapability(_ah, HAL_CAP_RFSILENT, 2, _rfsilent, NULL)
#define ath_hal_gettpack(_ah, _ptpack) \
(ath_hal_getcapability(_ah, HAL_CAP_TPC_ACK, 0, _ptpack) == HAL_OK)
#define ath_hal_settpack(_ah, _tpack) \
ath_hal_setcapability(_ah, HAL_CAP_TPC_ACK, 0, _tpack, NULL)
#define ath_hal_gettpcts(_ah, _ptpcts) \
(ath_hal_getcapability(_ah, HAL_CAP_TPC_CTS, 0, _ptpcts) == HAL_OK)
#define ath_hal_settpcts(_ah, _tpcts) \
ath_hal_setcapability(_ah, HAL_CAP_TPC_CTS, 0, _tpcts, NULL)
#if HAL_ABI_VERSION < 0x05120700 #if HAL_ABI_VERSION < 0x05120700
#define ath_hal_process_noisefloor(_ah) #define ath_hal_process_noisefloor(_ah)
#define ath_hal_getchannoise(_ah, _c) (-96) #define ath_hal_getchannoise(_ah, _c) (-96)
@ -490,17 +537,24 @@ void ath_intr(void *);
#define ath_hal_getchannoise(_ah, _c) \ #define ath_hal_getchannoise(_ah, _c) \
((*(_ah)->ah_getChanNoise)((_ah), (_c))) ((*(_ah)->ah_getChanNoise)((_ah), (_c)))
#endif #endif
#if HAL_ABI_VERSION < 0x05122200
#define HAL_TXQ_TXOKINT_ENABLE TXQ_FLAG_TXOKINT_ENABLE
#define HAL_TXQ_TXERRINT_ENABLE TXQ_FLAG_TXERRINT_ENABLE
#define HAL_TXQ_TXDESCINT_ENABLE TXQ_FLAG_TXDESCINT_ENABLE
#define HAL_TXQ_TXEOLINT_ENABLE TXQ_FLAG_TXEOLINT_ENABLE
#define HAL_TXQ_TXURNINT_ENABLE TXQ_FLAG_TXURNINT_ENABLE
#endif
#define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ #define ath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \
((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq)))
#define ath_hal_rxprocdesc(_ah, _ds, _dspa, _dsnext) \ #define ath_hal_rxprocdesc(_ah, _ds, _dspa, _dsnext) \
((*(_ah)->ah_procRxDesc)((_ah), (_ds), (_dspa), (_dsnext))) ((*(_ah)->ah_procRxDesc)((_ah), (_ds), (_dspa), (_dsnext), 0))
#define ath_hal_setuptxdesc(_ah, _ds, _plen, _hlen, _atype, _txpow, \ #define ath_hal_setuptxdesc(_ah, _ds, _plen, _hlen, _atype, _txpow, \
_txr0, _txtr0, _keyix, _ant, _flags, \ _txr0, _txtr0, _keyix, _ant, _flags, \
_rtsrate, _rtsdura) \ _rtsrate, _rtsdura) \
((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \ ((*(_ah)->ah_setupTxDesc)((_ah), (_ds), (_plen), (_hlen), (_atype), \
(_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \ (_txpow), (_txr0), (_txtr0), (_keyix), (_ant), \
(_flags), (_rtsrate), (_rtsdura))) (_flags), (_rtsrate), (_rtsdura), 0, 0, 0))
#define ath_hal_setupxtxdesc(_ah, _ds, \ #define ath_hal_setupxtxdesc(_ah, _ds, \
_txr1, _txtr1, _txr2, _txtr2, _txr3, _txtr3) \ _txr1, _txtr1, _txr2, _txtr2, _txr3, _txtr3) \
((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), \ ((*(_ah)->ah_setupXTxDesc)((_ah), (_ds), \
@ -509,10 +563,25 @@ void ath_intr(void *);
((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last), (_ds0))) ((*(_ah)->ah_fillTxDesc)((_ah), (_ds), (_l), (_first), (_last), (_ds0)))
#define ath_hal_txprocdesc(_ah, _ds) \ #define ath_hal_txprocdesc(_ah, _ds) \
((*(_ah)->ah_procTxDesc)((_ah), (_ds))) ((*(_ah)->ah_procTxDesc)((_ah), (_ds)))
#define ath_hal_gettxintrtxqs(_ah, _txqs) \
((*(_ah)->ah_getTxIntrQueue)((_ah), (_txqs)))
#define ath_hal_gpioCfgOutput(_ah, _gpio) \ #define ath_hal_gpioCfgOutput(_ah, _gpio) \
((*(_ah)->ah_gpioCfgOutput)((_ah), (_gpio))) ((*(_ah)->ah_gpioCfgOutput)((_ah), (_gpio)))
#define ath_hal_gpioset(_ah, _gpio, _b) \ #define ath_hal_gpioset(_ah, _gpio, _b) \
((*(_ah)->ah_gpioSet)((_ah), (_gpio), (_b))) ((*(_ah)->ah_gpioSet)((_ah), (_gpio), (_b)))
#define ath_hal_gpioget(_ah, _gpio) \
((*(_ah)->ah_gpioGet)((_ah), (_gpio)))
#define ath_hal_gpiosetintr(_ah, _gpio, _b) \
((*(_ah)->ah_gpioSetIntr)((_ah), (_gpio), (_b)))
#define ath_hal_radar_event(_ah) \
((*(_ah)->ah_radarHaveEvent)((_ah)))
#define ath_hal_procdfs(_ah, _chan) \
((*(_ah)->ah_processDfs)((_ah), (_chan)))
#define ath_hal_checknol(_ah, _chan, _nchans) \
((*(_ah)->ah_dfsNolCheck)((_ah), (_chan), (_nchans)))
#define ath_hal_radar_wait(_ah, _chan) \
((*(_ah)->ah_radarWait)((_ah), (_chan)))
#endif /* _DEV_ATH_ATHVAR_H */ #endif /* _DEV_ATH_ATHVAR_H */