From patchwork Mon Nov 5 16:22:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 197218 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 E98692C0094 for ; Tue, 6 Nov 2012 03:23:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752845Ab2KEQWq (ORCPT ); Mon, 5 Nov 2012 11:22:46 -0500 Received: from mail-oa0-f46.google.com ([209.85.219.46]:49379 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505Ab2KEQWl (ORCPT ); Mon, 5 Nov 2012 11:22:41 -0500 Received: by mail-oa0-f46.google.com with SMTP id h16so5924901oag.19 for ; Mon, 05 Nov 2012 08:22:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=meqtKTiW/SMxD/t9ma8EYHCuA6cyzGBKz+i9BU1SocE=; b=PinGlMYujKq21k/IjpBlXD35SMR2fyBJ+l14fr3Oy961l+cv3Fvho4/rvI5xpks2EF X7Kyp/VP98aVXFac+dFZBH/i4FodKKPId1fF61cSQEHt8G34ervasSX1w/0HcDx1DKEY W3He1iRDeEiogVAtovTWEKgiT8MeiSAzmg+P8O+ztZEg4pQaUkk+8Lk8eghrkN81pxpI 4notIjKdGzWJ7pX1gy/fVmePK6hz1HfvUV/r4ed44TEyIGv4xwOK5xDAhTcWrz+bpq/f bxKn053Zx1dUmnVVqfZu8RBveF5KDaF6SdV6YZEUvpa8EVr0J3UjIkB0lzpku+JjNZpz +y9w== Received: by 10.60.19.168 with SMTP id g8mr8037404oee.101.1352132561219; Mon, 05 Nov 2012 08:22:41 -0800 (PST) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id fw9sm18064643obc.19.2012.11.05.08.22.39 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 08:22:40 -0800 (PST) From: Rob Herring To: netdev@vger.kernel.org, davem@davemloft.net Cc: eric.dumazet@gmail.com, Rob Herring Subject: [PATCH v3 2/6] net: calxedaxgmac: remove explicit rx dma buffer polling Date: Mon, 5 Nov 2012 10:22:20 -0600 Message-Id: <1352132544-15809-3-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1352132544-15809-1-git-send-email-robherring2@gmail.com> References: <1352132544-15809-1-git-send-email-robherring2@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Rob Herring New received frames will trigger the rx DMA to poll the DMA descriptors, so there is no need to tell the h/w to poll. We also want to enable dropping frames from the fifo when there is no buffer. Signed-off-by: Rob Herring --- drivers/net/ethernet/calxeda/xgmac.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 7f5fd17..728fcef 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -966,7 +966,7 @@ static int xgmac_hw_init(struct net_device *dev) ctrl |= XGMAC_CONTROL_IPC; writel(ctrl, ioaddr + XGMAC_CONTROL); - writel(DMA_CONTROL_DFF | DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); + writel(DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); /* Set the HW DMA mode and the COE */ writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA | @@ -1180,8 +1180,6 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit) xgmac_rx_refill(priv); - writel(1, priv->base + XGMAC_DMA_RX_POLL); - return count; }