From patchwork Tue Jun 9 09:41:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?QmlhbyBIdWFuZyAo6buE5b2qKQ==?= X-Patchwork-Id: 1305753 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mediatek.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mediatek.com header.i=@mediatek.com header.a=rsa-sha256 header.s=dk header.b=IqBq9AbS; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49h4vh2JnJz9sT6 for ; Tue, 9 Jun 2020 19:44:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726765AbgFIJoL (ORCPT ); Tue, 9 Jun 2020 05:44:11 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:22411 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726964AbgFIJoL (ORCPT ); Tue, 9 Jun 2020 05:44:11 -0400 X-UUID: 53bf48e4edd44161aa93f1570fba1f19-20200609 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=u4KMXSeT0DGxNEg0hfooe1wRE4xbxuD+hCYPLeD3kfA=; b=IqBq9AbS7ouHrlfc+Iq1EuKgG11XQ+AT/isYM3eBQpM8TmqA3hca5IXsQskzkAV9nZK7VqZMvW+YfrqWi4TwqHlULGHxv0e53/y4BhwJQoo4NrodJb0o1FOj2/06XrZV0YHW0FQpWd4ws6hQyIfB0pcNxi1KQvFm3zN2BXa4h7w=; X-UUID: 53bf48e4edd44161aa93f1570fba1f19-20200609 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1117393545; Tue, 09 Jun 2020 17:44:06 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Jun 2020 17:44:03 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 9 Jun 2020 17:44:03 +0800 From: Biao Huang To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" CC: , , Matthias Brugger , , , Subject: [PATCH] net: stmmac: Fix RX Coalesce IOC always true issue Date: Tue, 9 Jun 2020 17:41:33 +0800 Message-ID: <20200609094133.11053-1-biao.huang@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently rx_count_frames in stmmac_rx_refill always 0, which leads to use_rx_wd false, and IOC bit of rx_desc3 true forever. Fix it. Fixes: 6fa9d691b91ac ("net: stmmac: Prevent divide-by-zero") Signed-off-by: Biao Huang --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index e6898fd5223f..87b529743fd0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3607,8 +3607,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue) stmmac_refill_desc3(priv, rx_q, p); rx_q->rx_count_frames++; - rx_q->rx_count_frames += priv->rx_coal_frames; - if (rx_q->rx_count_frames > priv->rx_coal_frames) + if (rx_q->rx_count_frames >= priv->rx_coal_frames) rx_q->rx_count_frames = 0; use_rx_wd = !priv->rx_coal_frames;