diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-04-10 12:32:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-12 16:59:17 -0400 |
commit | b161b89fb97b30233526d31c5f94397ed94ffea6 (patch) | |
tree | 7b357a6b513253f707aee7ec0513b967dc6fedad /drivers/net | |
parent | fe12081cb664cd5d412dc56de0585a80484b1331 (diff) |
ath5k: optimize tx status processing
Use ACCESS_ONCE to reduce the number of variable reloads on uncached memory
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/desc.c | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c index 990a3b42144..3758b967029 100644 --- a/drivers/net/wireless/ath/ath5k/desc.c +++ b/drivers/net/wireless/ath/ath5k/desc.c | |||
@@ -401,32 +401,38 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, | |||
401 | { | 401 | { |
402 | struct ath5k_hw_4w_tx_ctl *tx_ctl; | 402 | struct ath5k_hw_4w_tx_ctl *tx_ctl; |
403 | struct ath5k_hw_tx_status *tx_status; | 403 | struct ath5k_hw_tx_status *tx_status; |
404 | u32 txstat0, txstat1, txctl2; | ||
404 | 405 | ||
405 | tx_ctl = &desc->ud.ds_tx5212.tx_ctl; | 406 | tx_ctl = &desc->ud.ds_tx5212.tx_ctl; |
406 | tx_status = &desc->ud.ds_tx5212.tx_stat; | 407 | tx_status = &desc->ud.ds_tx5212.tx_stat; |
407 | 408 | ||
409 | txstat1 = ACCESS_ONCE(tx_status->tx_status_1); | ||
410 | |||
408 | /* No frame has been send or error */ | 411 | /* No frame has been send or error */ |
409 | if (unlikely(!(tx_status->tx_status_1 & AR5K_DESC_TX_STATUS1_DONE))) | 412 | if (unlikely(!(txstat1 & AR5K_DESC_TX_STATUS1_DONE))) |
410 | return -EINPROGRESS; | 413 | return -EINPROGRESS; |
411 | 414 | ||
415 | txstat0 = ACCESS_ONCE(tx_status->tx_status_0); | ||
416 | txctl2 = ACCESS_ONCE(tx_ctl->tx_control_2); | ||
417 | |||
412 | /* | 418 | /* |
413 | * Get descriptor status | 419 | * Get descriptor status |
414 | */ | 420 | */ |
415 | ts->ts_tstamp = AR5K_REG_MS(tx_status->tx_status_0, | 421 | ts->ts_tstamp = AR5K_REG_MS(txstat0, |
416 | AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP); | 422 | AR5K_DESC_TX_STATUS0_SEND_TIMESTAMP); |
417 | ts->ts_shortretry = AR5K_REG_MS(tx_status->tx_status_0, | 423 | ts->ts_shortretry = AR5K_REG_MS(txstat0, |
418 | AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT); | 424 | AR5K_DESC_TX_STATUS0_SHORT_RETRY_COUNT); |
419 | ts->ts_longretry = AR5K_REG_MS(tx_status->tx_status_0, | 425 | ts->ts_longretry = AR5K_REG_MS(txstat0, |
420 | AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT); | 426 | AR5K_DESC_TX_STATUS0_LONG_RETRY_COUNT); |
421 | ts->ts_seqnum = AR5K_REG_MS(tx_status->tx_status_1, | 427 | ts->ts_seqnum = AR5K_REG_MS(txstat1, |
422 | AR5K_DESC_TX_STATUS1_SEQ_NUM); | 428 | AR5K_DESC_TX_STATUS1_SEQ_NUM); |
423 | ts->ts_rssi = AR5K_REG_MS(tx_status->tx_status_1, | 429 | ts->ts_rssi = AR5K_REG_MS(txstat1, |
424 | AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH); | 430 | AR5K_DESC_TX_STATUS1_ACK_SIG_STRENGTH); |
425 | ts->ts_antenna = (tx_status->tx_status_1 & | 431 | ts->ts_antenna = (txstat1 & |
426 | AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212) ? 2 : 1; | 432 | AR5K_DESC_TX_STATUS1_XMIT_ANTENNA_5212) ? 2 : 1; |
427 | ts->ts_status = 0; | 433 | ts->ts_status = 0; |
428 | 434 | ||
429 | ts->ts_final_idx = AR5K_REG_MS(tx_status->tx_status_1, | 435 | ts->ts_final_idx = AR5K_REG_MS(txstat1, |
430 | AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212); | 436 | AR5K_DESC_TX_STATUS1_FINAL_TS_IX_5212); |
431 | 437 | ||
432 | /* The longretry counter has the number of un-acked retries | 438 | /* The longretry counter has the number of un-acked retries |
@@ -437,17 +443,17 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, | |||
437 | ts->ts_retry[ts->ts_final_idx] = ts->ts_longretry; | 443 | ts->ts_retry[ts->ts_final_idx] = ts->ts_longretry; |
438 | switch (ts->ts_final_idx) { | 444 | switch (ts->ts_final_idx) { |
439 | case 3: | 445 | case 3: |
440 | ts->ts_retry[2] = AR5K_REG_MS(tx_ctl->tx_control_2, | 446 | ts->ts_retry[2] = AR5K_REG_MS(txctl2, |
441 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2); | 447 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES2); |
442 | ts->ts_longretry += ts->ts_retry[2]; | 448 | ts->ts_longretry += ts->ts_retry[2]; |
443 | /* fall through */ | 449 | /* fall through */ |
444 | case 2: | 450 | case 2: |
445 | ts->ts_retry[1] = AR5K_REG_MS(tx_ctl->tx_control_2, | 451 | ts->ts_retry[1] = AR5K_REG_MS(txctl2, |
446 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); | 452 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); |
447 | ts->ts_longretry += ts->ts_retry[1]; | 453 | ts->ts_longretry += ts->ts_retry[1]; |
448 | /* fall through */ | 454 | /* fall through */ |
449 | case 1: | 455 | case 1: |
450 | ts->ts_retry[0] = AR5K_REG_MS(tx_ctl->tx_control_2, | 456 | ts->ts_retry[0] = AR5K_REG_MS(txctl2, |
451 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); | 457 | AR5K_4W_TX_DESC_CTL2_XMIT_TRIES1); |
452 | ts->ts_longretry += ts->ts_retry[0]; | 458 | ts->ts_longretry += ts->ts_retry[0]; |
453 | /* fall through */ | 459 | /* fall through */ |
@@ -456,15 +462,14 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah, | |||
456 | } | 462 | } |
457 | 463 | ||
458 | /* TX error */ | 464 | /* TX error */ |
459 | if (!(tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK)) { | 465 | if (!(txstat0 & AR5K_DESC_TX_STATUS0_FRAME_XMIT_OK)) { |
460 | if (tx_status->tx_status_0 & | 466 | if (txstat0 & AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES) |
461 | AR5K_DESC_TX_STATUS0_EXCESSIVE_RETRIES) | ||
462 | ts->ts_status |= AR5K_TXERR_XRETRY; | 467 | ts->ts_status |= AR5K_TXERR_XRETRY; |
463 | 468 | ||
464 | if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN) | 469 | if (txstat0 & AR5K_DESC_TX_STATUS0_FIFO_UNDERRUN) |
465 | ts->ts_status |= AR5K_TXERR_FIFO; | 470 | ts->ts_status |= AR5K_TXERR_FIFO; |
466 | 471 | ||
467 | if (tx_status->tx_status_0 & AR5K_DESC_TX_STATUS0_FILTERED) | 472 | if (txstat0 & AR5K_DESC_TX_STATUS0_FILTERED) |
468 | ts->ts_status |= AR5K_TXERR_FILT; | 473 | ts->ts_status |= AR5K_TXERR_FILT; |
469 | } | 474 | } |
470 | 475 | ||