From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DD742B7B70 for ; Fri, 9 Oct 2009 13:15:11 +1100 (EST) Subject: Re: [PATCH][v2] ibm_newemac: Added 16K Tx FIFO size support for EMAC4 From: Benjamin Herrenschmidt To: Dave Mitchell In-Reply-To: <1255019541-1974-1-git-send-email-dmitchell@appliedmicro.com> References: <1255019541-1974-1-git-send-email-dmitchell@appliedmicro.com> Content-Type: text/plain; charset="UTF-8" Date: Fri, 09 Oct 2009 13:15:02 +1100 Message-Id: <1255054502.2355.27.camel@pasglop> Mime-Version: 1.0 Cc: netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 --- > Signed-off-by: Dave Mitchell > Acked-by: Prodyut Hazarika > Acked-by: Victor Gallardo > Acked-by: Loc Ho > --- > 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