From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Dave Mitchell <dmitchell@appliedmicro.com>
Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH][v2] ibm_newemac: Added 16K Tx FIFO size support for EMAC4
Date: Fri, 09 Oct 2009 13:15:02 +1100 [thread overview]
Message-ID: <1255054502.2355.27.camel@pasglop> (raw)
In-Reply-To: <1255019541-1974-1-git-send-email-dmitchell@appliedmicro.com>
On Thu, 2009-10-08 at 11:32 -0500, Dave Mitchell wrote:
> Some of the EMAC V4 implementations support 16K Tx FIFOs. This
> patch adds support for this functionality and fixes typos in the
> Tx FIFO size error messages.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
> Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com>
> Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com>
> Acked-by: Victor Gallardo <vgallardo@appliedmicro.com>
> Acked-by: Loc Ho <lho@appliedmicro.com>
> ---
> v1->v2: local date/time was out-of-sync and thus mail was as well
>
> drivers/net/ibm_newemac/core.c | 7 +++++--
> drivers/net/ibm_newemac/emac.h | 1 +
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
> index 89c82c5..c6591cb 100644
> --- a/drivers/net/ibm_newemac/core.c
> +++ b/drivers/net/ibm_newemac/core.c
> @@ -443,7 +443,7 @@ static u32 __emac_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_s
> ret |= EMAC_MR1_TFS_2K;
> break;
> default:
> - printk(KERN_WARNING "%s: Unknown Rx FIFO size %d\n",
> + printk(KERN_WARNING "%s: Unknown Tx FIFO size %d\n",
> dev->ndev->name, tx_size);
> }
>
> @@ -470,6 +470,9 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_
> DBG2(dev, "__emac4_calc_base_mr1" NL);
>
> switch(tx_size) {
> + case 16384:
> + ret |= EMAC4_MR1_TFS_16K;
> + break;
> case 4096:
> ret |= EMAC4_MR1_TFS_4K;
> break;
> @@ -477,7 +480,7 @@ static u32 __emac4_calc_base_mr1(struct emac_instance *dev, int tx_size, int rx_
> ret |= EMAC4_MR1_TFS_2K;
> break;
> default:
> - printk(KERN_WARNING "%s: Unknown Rx FIFO size %d\n",
> + printk(KERN_WARNING "%s: Unknown Tx FIFO size %d\n",
> dev->ndev->name, tx_size);
> }
>
> diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h
> index 0afc2cf..d34adf9 100644
> --- a/drivers/net/ibm_newemac/emac.h
> +++ b/drivers/net/ibm_newemac/emac.h
> @@ -153,6 +153,7 @@ struct emac_regs {
> #define EMAC4_MR1_RFS_16K 0x00280000
> #define EMAC4_MR1_TFS_2K 0x00020000
> #define EMAC4_MR1_TFS_4K 0x00030000
> +#define EMAC4_MR1_TFS_16K 0x00050000
> #define EMAC4_MR1_TR 0x00008000
> #define EMAC4_MR1_MWSW_001 0x00001000
> #define EMAC4_MR1_JPSM 0x00000800
next prev parent reply other threads:[~2009-10-09 2:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-08 16:32 [PATCH][v2] ibm_newemac: Added 16K Tx FIFO size support for EMAC4 Dave Mitchell
2009-10-09 2:15 ` Benjamin Herrenschmidt [this message]
2009-10-09 5:55 ` David Miller
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=1255054502.2355.27.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=dmitchell@appliedmicro.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=netdev@vger.kernel.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 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.