From patchwork Thu Jun 5 06:59:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nimrod Andy X-Patchwork-Id: 356220 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 54A7214009C for ; Thu, 5 Jun 2014 18:23:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751919AbaFEIXn (ORCPT ); Thu, 5 Jun 2014 04:23:43 -0400 Received: from mail-bl2lp0207.outbound.protection.outlook.com ([207.46.163.207]:9704 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751776AbaFEIXU (ORCPT ); Thu, 5 Jun 2014 04:23:20 -0400 Received: from BY2PR03MB490.namprd03.prod.outlook.com (10.141.142.20) by BY2PR03MB492.namprd03.prod.outlook.com (10.141.142.23) with Microsoft SMTP Server (TLS) id 15.0.949.11; Thu, 5 Jun 2014 08:23:16 +0000 Received: from BY2PR03CA031.namprd03.prod.outlook.com (10.242.234.152) by BY2PR03MB490.namprd03.prod.outlook.com (10.141.142.20) with Microsoft SMTP Server (TLS) id 15.0.949.11; Thu, 5 Jun 2014 08:23:14 +0000 Received: from BL2FFO11FD044.protection.gbl (2a01:111:f400:7c09::170) by BY2PR03CA031.outlook.office365.com (2a01:111:e400:2c2c::24) with Microsoft SMTP Server (TLS) id 15.0.954.9 via Frontend Transport; Thu, 5 Jun 2014 08:23:14 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD044.mail.protection.outlook.com (10.173.161.140) with Microsoft SMTP Server (TLS) id 15.0.949.9 via Frontend Transport; Thu, 5 Jun 2014 08:23:13 +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 s558MpRp002305; Thu, 5 Jun 2014 01:23:10 -0700 From: Fugang Duan To: CC: , , , , , , , , , Subject: [PATCH v3 4/6] net: fec: Increase buffer descriptor entry number Date: Thu, 5 Jun 2014 14:59:30 +0800 Message-ID: <1401951572-6538-5-git-send-email-b38611@freescale.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1401951572-6538-1-git-send-email-b38611@freescale.com> References: <1401951572-6538-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)(62966002)(19580405001)(104166001)(64706001)(81542001)(92726001)(33646001)(84676001)(48376002)(31966008)(93916002)(68736004)(102836001)(50986999)(87936001)(83072002)(26826002)(77096999)(89996001)(99396002)(74502001)(77982001)(77156001)(87286001)(6806004)(76176999)(76482001)(36756003)(88136002)(92566001)(97736001)(81342001)(79102001)(85852003)(46102001)(20776003)(74662001)(4396001)(83322001)(21056001)(50226001)(47776003)(50466002)(19580395003)(44976005)(80022001)(104016001)(42262001); DIR:OUT; SFP:; SCL:1; SRVR:BY2PR03MB490; 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: 0233768B38 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-Microsoft-Antispam: BL:0; ACTION:Default; RISK:Low; SCL:0; SPMLVL:NotSpam; PCL:0; RULEID: 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 | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h index 3b8d6d1..241621d 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 cf3c368..9de1660 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 */ @@ -2061,9 +2057,20 @@ 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) + bd_size = sizeof(struct bufdesc_ex); + else + bd_size = sizeof(struct bufdesc); + bd_size *= (fep->tx_ring_size + fep->rx_ring_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; @@ -2077,10 +2084,6 @@ 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)