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 <b...@kernel.crashing.org>
---
> Signed-off-by: Dave Mitchell <dmitch...@appliedmicro.com>
> Acked-by: Prodyut Hazarika <phazar...@appliedmicro.com>
> Acked-by: Victor Gallardo <vgalla...@appliedmicro.com>
> Acked-by: Loc Ho <l...@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
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
