From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7EB9C43381 for ; Mon, 18 Mar 2019 09:31:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A0742083D for ; Mon, 18 Mar 2019 09:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901505; bh=mBdfUgfkAj2ue9t7XB1tpf/Pj/rHjk5X+07uVAGI82Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sgc0BbdXTGklLI18m3Bz7hKNCUoDt5U9rhvlyvpZb1wDyBsMb6Hve7e5QacH6c3ht UMQDG8Z3ikkGhPuULEz+TInjHG4X01mtykk5B2Xj4hc3fd347z63+31ACK55OnAhW+ uM+7dVmp4QtoW74RhnuwwSN7RGtq19jdzLch/xPw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728620AbfCRJbo (ORCPT ); Mon, 18 Mar 2019 05:31:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:39494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728611AbfCRJbm (ORCPT ); Mon, 18 Mar 2019 05:31:42 -0400 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1D2DF2075C; Mon, 18 Mar 2019 09:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552901501; bh=mBdfUgfkAj2ue9t7XB1tpf/Pj/rHjk5X+07uVAGI82Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lpQQWTmI/z807zPNj+hkcuc6akR99Eny0BCfEKChAzF4+JtEeg2BzQgH8RxvI3Khu dAEEJfJ3BfWo406aBCP3+wBpdCLVfhKpqaUBFHMTt691EhB71Vgl2JWaQ+xOfWXo7+ nqzGKyUFPekwV0vO/FH3y0rMpy33m1okK1nn4Klo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masaru Nagai , Kazuya Mizuguchi , Simon Horman , "David S. Miller" Subject: [PATCH 4.19 13/52] ravb: Decrease TxFIFO depth of Q3 and Q2 to one Date: Mon, 18 Mar 2019 10:25:10 +0100 Message-Id: <20190318084015.134213551@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190318084013.532280682@linuxfoundation.org> References: <20190318084013.532280682@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masaru Nagai [ Upstream commit ae9819e339b451da7a86ab6fe38ecfcb6814e78a ] Hardware has the CBS (Credit Based Shaper) which affects only Q3 and Q2. When updating the CBS settings, even if the driver does so after waiting for Tx DMA finished, there is a possibility that frame data still remains in TxFIFO. To avoid this, decrease TxFIFO depth of Q3 and Q2 to one. This patch has been exercised this using netperf TCP_MAERTS, TCP_STREAM and UDP_STREAM tests run on an Ebisu board. No performance change was detected, outside of noise in the tests, both in terms of throughput and CPU utilisation. Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper") Signed-off-by: Masaru Nagai Signed-off-by: Kazuya Mizuguchi [simon: updated changelog] Signed-off-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/renesas/ravb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -459,7 +459,7 @@ static int ravb_dmac_init(struct net_dev RCR_EFFS | RCR_ENCF | RCR_ETS0 | RCR_ESF | 0x18000000, RCR); /* Set FIFO size */ - ravb_write(ndev, TGC_TQP_AVBMODE1 | 0x00222200, TGC); + ravb_write(ndev, TGC_TQP_AVBMODE1 | 0x00112200, TGC); /* Timestamp enable */ ravb_write(ndev, TCCR_TFEN, TCCR);