From patchwork Mon May 16 15:41:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 622620 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 3r7l7K4BTkz9sDG for ; Tue, 17 May 2016 01:41:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b=jxlpTrAf; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152AbcEPPlc (ORCPT ); Mon, 16 May 2016 11:41:32 -0400 Received: from mail-qg0-f47.google.com ([209.85.192.47]:35246 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754032AbcEPPla (ORCPT ); Mon, 16 May 2016 11:41:30 -0400 Received: by mail-qg0-f47.google.com with SMTP id f74so90762542qge.2 for ; Mon, 16 May 2016 08:41:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TGBecWBrQ6PGyAk9/1tV73B9tabB4G0WATeu6VvYuw0=; b=jxlpTrAfoI08k+OW5SB5yKAtwNK+7u71cyu9Hx3Sotj3jzhi4u4Cdt5DLi9Rlw12xT 6tvb5LomIIVXdpU9LexnFFcrY1bp9rCEbx4oy6tJzRvKAJJfvk9I+A+BeFqeKsXk2zsW 1hSFzGeNRVAyDLA6tYonKSoOZtleiVZA+2CnnFUQg7G67MBvpqc319aqNHNSeIInPL04 mkXpFC526wsjBhX/3vcI8zZpmUt+hh9LSy7H5AJf3BGiXvormqmW4R7fdcxEww/f+d4l Zo5lim1i8gDpsVxaMhckZZlizGQpYLW43Km16GE/cV1kUzUT1BKCFWPLA2zDZvRkMYPz pstg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TGBecWBrQ6PGyAk9/1tV73B9tabB4G0WATeu6VvYuw0=; b=Lswm7PsrZakdZCu2U+U9HB+8qK2pIv3Xc3wsUKkEVcDvv8ZEqJ0O6VjuiDpo58HUjv xkv+eSObd2oTyRuB5+WtOUCmwfUU8Gl1E8UbS+nh6vwPiS1denYs9Ef80royYXo2e9T+ QKqOjGEVRDO0+6PUZXMhwD1Nr3mGfWTH7vUvtF4NjjNGCN7cMgoA0SGx5vA9ouGlz8YL GoCVO2dtWOa1BtNlDreTGDDcNLm/zwU3CSy3MYr+hy+k3hSIM3TnrVUgsH443PReXumv uli823UZGaGHG5vWMR4uvBMEYn5nwX8uUqJLrp9QomSi0ZaTfYeVDCWAGj9gb62ZZd9i 8gcA== X-Gm-Message-State: AOPr4FUSqFVZS2cgb29r6Fh+Yn9Mnb0mqqbPz9CLXJeaXQDgUyOtyMpLB42k5FVMkvEVow== X-Received: by 10.140.169.193 with SMTP id p184mr31404552qhp.13.1463413280845; Mon, 16 May 2016 08:41:20 -0700 (PDT) Received: from localhost.localdomain ([190.2.108.156]) by smtp.gmail.com with ESMTPSA id f204sm14995821qhe.1.2016.05.16.08.41.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 16 May 2016 08:41:19 -0700 (PDT) From: Ezequiel Garcia To: netdev@vger.kernel.org, peppe.cavallaro@st.com, alexandre.torgue@st.com Cc: Joachim Eastwood , David Miller , Ezequiel Garcia Subject: [PATCH] stmmac: hardware TX COE doesn't work when force_thresh_dma_mode is set Date: Mon, 16 May 2016 12:41:07 -0300 Message-Id: <1463413267-19543-1-git-send-email-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.7.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit f748be531d70 ("stmmac: support new GMAC4") reverted a previous fix by mistake. This commit re-applies said fix: commit dec2165ff38a99f937fe61875d102c6c8596c815 Author: Sonic Zhang Date: Thu Jan 22 14:55:57 2015 +0800 stmmac: hardware TX COE doesn't work when force_thresh_dma_mode is set Clear the TX COE bit when force_thresh_dma_mode is set even hardware dma capability says support. Tested on BF609. Signed-off-by: Sonic Zhang Acked-by: Giuseppe Cavallaro Signed-off-by: David S. Miller Tested on LPC4350 Hitex board. Fixes: f748be531d70 ("stmmac: support new GMAC4") Signed-off-by: Ezequiel Garcia Tested-by: Joachim Eastwood --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index fd5ab7bfdb76..eac45d0c75e2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3131,7 +3131,12 @@ static int stmmac_hw_init(struct stmmac_priv *priv) priv->plat->enh_desc = priv->dma_cap.enh_desc; priv->plat->pmt = priv->dma_cap.pmt_remote_wake_up; - priv->plat->tx_coe = priv->dma_cap.tx_coe; + /* TXCOE doesn't work in thresh DMA mode */ + if (priv->plat->force_thresh_dma_mode) + priv->plat->tx_coe = 0; + else + priv->plat->tx_coe = priv->dma_cap.tx_coe; + /* In case of GMAC4 rx_coe is from HW cap register. */ priv->plat->rx_coe = priv->dma_cap.rx_coe;