From patchwork Thu Jun 12 00:16:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nimrod Andy X-Patchwork-Id: 358949 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 97305140081 for ; Thu, 12 Jun 2014 11:42:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755218AbaFLBmS (ORCPT ); Wed, 11 Jun 2014 21:42:18 -0400 Received: from mail-by2lp0235.outbound.protection.outlook.com ([207.46.163.235]:56576 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755212AbaFLBmQ (ORCPT ); Wed, 11 Jun 2014 21:42:16 -0400 Received: from BLUPR03CA031.namprd03.prod.outlook.com (10.141.30.24) by BLUPR03MB374.namprd03.prod.outlook.com (10.141.75.146) with Microsoft SMTP Server (TLS) id 15.0.954.9; Thu, 12 Jun 2014 01:42:15 +0000 Received: from BL2FFO11FD054.protection.gbl (2a01:111:f400:7c09::126) by BLUPR03CA031.outlook.office365.com (2a01:111:e400:879::24) with Microsoft SMTP Server (TLS) id 15.0.959.15 via Frontend Transport; Thu, 12 Jun 2014 01:42:14 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD054.mail.protection.outlook.com (10.173.161.182) with Microsoft SMTP Server (TLS) id 15.0.959.15 via Frontend Transport; Thu, 12 Jun 2014 01:42:14 +0000 Received: from shlinux1.ap.freescale.net (shlinux1.ap.freescale.net [10.192.225.216]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id s5C1ftFg018586; Wed, 11 Jun 2014 18:42:11 -0700 From: Fugang Duan To: CC: , , , , , Subject: [PATCH v5 4/6] net: fec: Increase buffer descriptor entry number Date: Thu, 12 Jun 2014 08:16:21 +0800 Message-ID: <1402532183-14910-5-git-send-email-b38611@freescale.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1402532183-14910-1-git-send-email-b38611@freescale.com> References: <1402532183-14910-1-git-send-email-b38611@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(189002)(199002)(77096999)(81542001)(74502001)(50466002)(26826002)(88136002)(74662001)(76176999)(33646001)(89996001)(83072002)(85852003)(104166001)(50986999)(48376002)(79102001)(21056001)(92726001)(47776003)(80022001)(20776003)(76482001)(19580405001)(77982001)(87286001)(97736001)(64706001)(81342001)(46102001)(87936001)(19580395003)(36756003)(77156001)(31966008)(68736004)(62966002)(6806004)(4396001)(83322001)(92566001)(104016001)(50226001)(44976005)(99396002)(84676001)(93916002)(102836001)(42262001); DIR:OUT; SFP:; SCL:1; SRVR:BLUPR03MB374; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BL:0; ACTION:Default; RISK:Low; SCL:0; SPMLVL:NotSpam; PCL:0; RULEID: X-Forefront-PRVS: 02408926C4 Received-SPF: Fail (: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=fugang.duan@freescale.com; X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to support SG, software TSO, let's increase BD entry number. CC: Ezequiel Garcia CC: Eric Dumazet CC: David Laight Signed-off-by: Fugang Duan --- drivers/net/ethernet/freescale/fec.h | 4 ++-- drivers/net/ethernet/freescale/fec_main.c | 29 +++++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index db967a0..5ffd323 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -246,8 +246,8 @@ struct bufdesc_ex { #define RX_RING_SIZE (FEC_ENET_RX_FRPPG * FEC_ENET_RX_PAGES) #define FEC_ENET_TX_FRSIZE 2048 #define FEC_ENET_TX_FRPPG (PAGE_SIZE / FEC_ENET_TX_FRSIZE) -#define TX_RING_SIZE 16 /* Must be power of two */ -#define TX_RING_MOD_MASK 15 /* for this to work */ +#define TX_RING_SIZE 512 /* Must be power of two */ +#define TX_RING_MOD_MASK 511 /* for this to work */ #define BD_ENET_RX_INT 0x00800000 #define BD_ENET_RX_PTP ((ushort)0x0400) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index f943cd1..b27a729 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -173,10 +173,6 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #endif #endif /* CONFIG_M5272 */ -#if (((RX_RING_SIZE + TX_RING_SIZE) * 32) > PAGE_SIZE) -#error "FEC: descriptor ring size constants too large" -#endif - /* Interrupt events/masks. */ #define FEC_ENET_HBERR ((uint)0x80000000) /* Heartbeat error */ #define FEC_ENET_BABR ((uint)0x40000000) /* Babbling receiver */ @@ -2048,9 +2044,21 @@ static int fec_enet_init(struct net_device *ndev) const struct platform_device_id *id_entry = platform_get_device_id(fep->pdev); struct bufdesc *cbd_base; + int bd_size; + + /* init the tx & rx ring size */ + fep->tx_ring_size = TX_RING_SIZE; + fep->rx_ring_size = RX_RING_SIZE; + + if (fep->bufdesc_ex) + fep->bufdesc_size = sizeof(struct bufdesc_ex); + else + fep->bufdesc_size = sizeof(struct bufdesc); + bd_size = (fep->tx_ring_size + fep->rx_ring_size) * + fep->bufdesc_size; /* Allocate memory for buffer descriptors. */ - cbd_base = dma_alloc_coherent(NULL, PAGE_SIZE, &fep->bd_dma, + cbd_base = dma_alloc_coherent(NULL, bd_size, &fep->bd_dma, GFP_KERNEL); if (!cbd_base) return -ENOMEM; @@ -2064,20 +2072,13 @@ static int fec_enet_init(struct net_device *ndev) /* make sure MAC we just acquired is programmed into the hw */ fec_set_mac_address(ndev, NULL); - /* init the tx & rx ring size */ - fep->tx_ring_size = TX_RING_SIZE; - fep->rx_ring_size = RX_RING_SIZE; - /* Set receive and transmit descriptor base. */ fep->rx_bd_base = cbd_base; - if (fep->bufdesc_ex) { + if (fep->bufdesc_ex) fep->tx_bd_base = (struct bufdesc *) (((struct bufdesc_ex *)cbd_base) + fep->rx_ring_size); - fep->bufdesc_size = sizeof(struct bufdesc_ex); - } else { + else fep->tx_bd_base = cbd_base + fep->rx_ring_size; - fep->bufdesc_size = sizeof(struct bufdesc); - } /* The FEC Ethernet specific entries in the device structure */ ndev->watchdog_timeo = TX_TIMEOUT;