From patchwork Mon Aug 25 14:22:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 382745 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 273C31400AA for ; Tue, 26 Aug 2014 00:24:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932546AbaHYOWV (ORCPT ); Mon, 25 Aug 2014 10:22:21 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:42123 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932274AbaHYOWU (ORCPT ); Mon, 25 Aug 2014 10:22:20 -0400 Received: by mail-la0-f47.google.com with SMTP id mc6so13199120lab.34 for ; Mon, 25 Aug 2014 07:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BjsFnXRiNntaZfRZ1H4JDLNOCzggI183Zxwa5VIT6K4=; b=cy1GMSnCOxCpFlpNR+Z3bHcdGzlu8zrSMlr9Q1jVnPa4F2BakKa/KOcdztmRXtKTRS gWcqjIegq3KtROrtGFD1GDTBgOnLnsDnokYY1BY7ZeJIscZ50BrrDOggQmZawRCqJ9GS m1h60I0KT7sk7BRPp3zWOswH3RFmf9WYyNgOtr9FO+8RZAOmcEoD4zrKE8LaQiv5pic7 vgQyK0socrJjZJXsqkyAFCXztHq7QA05waA8ziHw4tFbrfGJ4OfJN+tX7DmB/H0t5AIY bPWkMZPT6t/ovxo6SNO/hXe7fcQC6q9yvmF43zqYNNbMsAIAimOKX/V6+ufDDPjvW7zN HHog== X-Received: by 10.112.173.136 with SMTP id bk8mr3214836lbc.88.1408976538703; Mon, 25 Aug 2014 07:22:18 -0700 (PDT) Received: from Ildjarn.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id et9sm16898lbb.15.2014.08.25.07.22.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Aug 2014 07:22:18 -0700 (PDT) From: Jonas Jensen To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, f.fainelli@gmail.com, eric.dumazet@gmail.com, mirqus@gmail.com, Jonas Jensen Subject: [PATCH v6 1/4] net: moxa: clear DESC1 on ndo_start_xmit() Date: Mon, 25 Aug 2014 16:22:11 +0200 Message-Id: <1408976531-15589-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1408544322-32023-1-git-send-email-jonas.jensen@gmail.com> References: <1408544322-32023-1-git-send-email-jonas.jensen@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org TX buffer length is not cleared on ndo_start_xmit(). Failing to do so can bug/hang the controller and cause TX interrupts to stop altogether. Remove the readl() and compute a new value for DESC1. Addresses https://bugzilla.kernel.org/show_bug.cgi?id=69031 Signed-off-by: Jonas Jensen --- Notes: Changes since v5: 1. remove readl(desc + TX_REG_OFFSET_DESC1) in moxart_mac_start_xmit() 2. compute entirely new values for DESC1 3. set TX_DESC1_END if (tx_head == TX_DESC_NUM_MASK) Applies to next-20140825 drivers/net/ethernet/moxa/moxart_ether.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 5020fd4..eed70d9 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -346,10 +346,9 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) len = ETH_ZLEN; } - txdes1 = readl(desc + TX_REG_OFFSET_DESC1); - txdes1 |= TX_DESC1_LTS | TX_DESC1_FTS; - txdes1 &= ~(TX_DESC1_FIFO_COMPLETE | TX_DESC1_INTR_COMPLETE); - txdes1 |= (len & TX_DESC1_BUF_SIZE_MASK); + txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK); + if (tx_head == TX_DESC_NUM_MASK) + txdes1 |= TX_DESC1_END; writel(txdes1, desc + TX_REG_OFFSET_DESC1); writel(TX_DESC0_DMA_OWN, desc + TX_REG_OFFSET_DESC0);