All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sedat Dilek <sedat.dilek@googlemail.com>
To: Felix Fietkau <nbd@openwrt.org>
Cc: linux-wireless@vger.kernel.org, linville@tuxdriver.com,
	ath5k-devel@lists.ath5k.org
Subject: Re: [PATCH v2 1/7] ath5k: optimize tx descriptor setup
Date: Wed, 13 Apr 2011 06:23:40 +0200	[thread overview]
Message-ID: <BANLkTingC8r-obXeYxjbHVr2G80MCbhyMQ@mail.gmail.com> (raw)
In-Reply-To: <1302646041-3917-1-git-send-email-nbd@openwrt.org>

On Wed, Apr 13, 2011 at 12:07 AM, Felix Fietkau <nbd@openwrt.org> wrote:
> Use local variables to reduce the number of load/store operations on uncached
> memory.
>
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> ---
>  drivers/net/wireless/ath/ath5k/desc.c |   45 +++++++++++++++++++--------------
>  1 files changed, 26 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
> index 16b44ff..6996d55 100644
> --- a/drivers/net/wireless/ath/ath5k/desc.c
> +++ b/drivers/net/wireless/ath/ath5k/desc.c
> @@ -185,6 +185,12 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>        struct ath5k_hw_4w_tx_ctl *tx_ctl;
>        unsigned int frame_len;
>
> +       /*
> +        * Use local variables for these to reduce load/store access on
> +        * uncached memory
> +        */
> +       u32 txctl0 = 0, txctl1 = 0, txctl2 = 0, txctl3 = 0;
> +
>        tx_ctl = &desc->ud.ds_tx5212.tx_ctl;
>
>        /*
> @@ -208,8 +214,9 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>        if (tx_power > AR5K_TUNE_MAX_TXPOWER)
>                tx_power = AR5K_TUNE_MAX_TXPOWER;
>
> -       /* Clear descriptor */
> -       memset(&desc->ud.ds_tx5212, 0, sizeof(struct ath5k_hw_5212_tx_desc));
> +       /* Clear descriptor status area */
> +       memset(&desc->ud.ds_tx5212.tx_stat, 0,
> +              sizeof(desc->ud.ds_tx5212.tx_stat));
>
>        /* Setup control descriptor */
>
> @@ -221,7 +228,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>        if (frame_len & ~AR5K_4W_TX_DESC_CTL0_FRAME_LEN)
>                return -EINVAL;
>
> -       tx_ctl->tx_control_0 = frame_len & AR5K_4W_TX_DESC_CTL0_FRAME_LEN;
> +       txctl0 = frame_len & AR5K_4W_TX_DESC_CTL0_FRAME_LEN;
>
>        /* Verify and set buffer length */
>
> @@ -232,21 +239,17 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>        if (pkt_len & ~AR5K_4W_TX_DESC_CTL1_BUF_LEN)
>                return -EINVAL;
>
> -       tx_ctl->tx_control_1 = pkt_len & AR5K_4W_TX_DESC_CTL1_BUF_LEN;
> +       txctl1 = pkt_len & AR5K_4W_TX_DESC_CTL1_BUF_LEN;
>
> -       tx_ctl->tx_control_0 |=
> -               AR5K_REG_SM(tx_power, AR5K_4W_TX_DESC_CTL0_XMIT_POWER) |
> -               AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);
> -       tx_ctl->tx_control_1 |= AR5K_REG_SM(type,
> -                                       AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);
> -       tx_ctl->tx_control_2 = AR5K_REG_SM(tx_tries0,
> -                                       AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);
> -       tx_ctl->tx_control_3 = tx_rate0 & AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
> +       txctl0 |= AR5K_REG_SM(tx_power, AR5K_4W_TX_DESC_CTL0_XMIT_POWER) |
> +                 AR5K_REG_SM(antenna_mode, AR5K_4W_TX_DESC_CTL0_ANT_MODE_XMIT);
> +       txctl1 |= AR5K_REG_SM(type, AR5K_4W_TX_DESC_CTL1_FRAME_TYPE);
> +       txctl2 = AR5K_REG_SM(tx_tries0, AR5K_4W_TX_DESC_CTL2_XMIT_TRIES0);
> +       txctl3 = tx_rate0 & AR5K_4W_TX_DESC_CTL3_XMIT_RATE0;
>
>  #define _TX_FLAGS(_c, _flag)                                   \
>        if (flags & AR5K_TXDESC_##_flag) {                      \
> -               tx_ctl->tx_control_##_c |=                      \
> -                       AR5K_4W_TX_DESC_CTL##_c##_##_flag;      \
> +               txctl##_c |= AR5K_4W_TX_DESC_CTL##_c##_##_flag; \
>        }
>
>        _TX_FLAGS(0, CLRDMASK);
> @@ -262,8 +265,8 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>         * WEP crap
>         */
>        if (key_index != AR5K_TXKEYIX_INVALID) {
> -               tx_ctl->tx_control_0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
> -               tx_ctl->tx_control_1 |= AR5K_REG_SM(key_index,
> +               txctl0 |= AR5K_4W_TX_DESC_CTL0_ENCRYPT_KEY_VALID;
> +               txctl1 |= AR5K_REG_SM(key_index,
>                                AR5K_4W_TX_DESC_CTL1_ENCRYPT_KEY_IDX);
>        }
>
> @@ -274,12 +277,16 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
>                if ((flags & AR5K_TXDESC_RTSENA) &&
>                                (flags & AR5K_TXDESC_CTSENA))
>                        return -EINVAL;
> -               tx_ctl->tx_control_2 |= rtscts_duration &
> -                               AR5K_4W_TX_DESC_CTL2_RTS_DURATION;
> -               tx_ctl->tx_control_3 |= AR5K_REG_SM(rtscts_rate,
> +               txctl2 |= rtscts_duration & AR5K_4W_TX_DESC_CTL2_RTS_DURATION;
> +               txctl3 |= AR5K_REG_SM(rtscts_rate,
>                                AR5K_4W_TX_DESC_CTL3_RTS_CTS_RATE);
>        }
>
> +       tx_ctl->tx_control_0 = txctl0;
> +       tx_ctl->tx_control_1 = txctl1;
> +       tx_ctl->tx_control_2 = txctl2;
> +       tx_ctl->tx_control_3 = txctl3;
> +
>        return 0;
>  }
>
> --
> 1.7.3.2
>

Looks like this v2 did not found its way to wireless-next [1].

- Sedat -

[1] http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next-2.6.git;a=commit;h=c5e0a88aa2e0f42cdb4c79c977c52f6bc38ec160

  reply	other threads:[~2011-04-13  4:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-10 16:32 [PATCH 1/7] ath5k: optimize tx descriptor setup Felix Fietkau
2011-04-10 16:32 ` [PATCH 2/7] ath5k: remove ts_rate from ath5k_tx_status Felix Fietkau
2011-04-10 16:32   ` [PATCH 3/7] ath5k: optimize tx status processing Felix Fietkau
2011-04-10 16:32     ` [PATCH 4/7] ath5k: optimize rx " Felix Fietkau
2011-04-10 16:32       ` [PATCH 5/7] ath5k: remove ts_retry from ath5k_tx_status Felix Fietkau
2011-04-10 16:32         ` [PATCH 6/7] ath5k: clean up debugfs code Felix Fietkau
2011-04-10 16:32           ` [PATCH 7/7] ath5k: reduce interrupt load caused by rx/tx interrupts Felix Fietkau
2011-04-12  7:04         ` [ath5k-devel] [PATCH 5/7] ath5k: remove ts_retry from ath5k_tx_status 海藻敬之
2011-04-12 21:43           ` Felix Fietkau
2011-04-11  6:29 ` [PATCH 1/7] ath5k: optimize tx descriptor setup Kalle Valo
2011-04-12 21:55   ` Felix Fietkau
2011-04-12 22:07 ` [PATCH v2 " Felix Fietkau
2011-04-13  4:23   ` Sedat Dilek [this message]
2011-04-13 12:51     ` John W. Linville
2011-04-13 18:34       ` Kalle Valo
2011-04-14  7:27         ` Sedat Dilek

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=BANLkTingC8r-obXeYxjbHVr2G80MCbhyMQ@mail.gmail.com \
    --to=sedat.dilek@googlemail.com \
    --cc=ath5k-devel@lists.ath5k.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=nbd@openwrt.org \
    --cc=sedat.dilek@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.