From patchwork Thu Oct 8 16:32:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Mitchell X-Patchwork-Id: 35476 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id A4E8DB7DD0 for ; Fri, 9 Oct 2009 03:32:43 +1100 (EST) Received: from mail-fx0-f214.google.com (mail-fx0-f214.google.com [209.85.220.214]) by ozlabs.org (Postfix) with ESMTP id 8319CB7043 for ; Fri, 9 Oct 2009 03:32:36 +1100 (EST) Received: by fxm10 with SMTP id 10so5732748fxm.8 for ; Thu, 08 Oct 2009 09:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer; bh=SmL1CH2yQu9jZG0hc9/VjSd2gHBbtPX1bV5vD+2P9rM=; b=L15C9zk+cfRWYRORXHl3F3tELpBFQ18vihuh11KpqFF6tQTRuucv8XbhrARWz+Mrcd jlzRqw4Obne2Qv2SMQFnVO7ypQj/fTcOI/HmBjcskwksmFkOgIydNJuXlz4k1Vi06Nf6 EpAdCKzAD6TFZVGPylbWtLAle6X9JjnLLl/j0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; b=K/8dJTnjPluATlmNP36wLi6vQBBJPZjlL6IlnGkHHyG/9v1UpSVSwV3+FyuHNGw68x zHd5a/4qND6/6UrBn5sHMwFez2VHEP2wjz99un/cQUOwXJuE+oHhw2sPWAVEAejXGMxk dulI0i2ON7Q4SPrBcmjfM/jD+8rnm+I7u40pA= Received: by 10.103.50.29 with SMTP id c29mr611390muk.61.1255019553340; Thu, 08 Oct 2009 09:32:33 -0700 (PDT) Received: from localhost (99-51-189-48.lightspeed.austtx.sbcglobal.net [99.51.189.48]) by mx.google.com with ESMTPS id w5sm121383mue.37.2009.10.08.09.32.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 08 Oct 2009 09:32:33 -0700 (PDT) From: Dave Mitchell To: netdev@vger.kernel.org Subject: [PATCH][v2] ibm_newemac: Added 16K Tx FIFO size support for EMAC4 Date: Thu, 8 Oct 2009 11:32:21 -0500 Message-Id: <1255019541-1974-1-git-send-email-dmitchell@appliedmicro.com> X-Mailer: git-send-email 1.6.3.2 Cc: linuxppc-dev@lists.ozlabs.org, Dave Mitchell X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org 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. Signed-off-by: Dave Mitchell Acked-by: Prodyut Hazarika Acked-by: Victor Gallardo Acked-by: Loc Ho Acked-by: Benjamin Herrenschmidt --- 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