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.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 C7CA6C43381 for ; Sun, 31 Mar 2019 13:44:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BF8020870 for ; Sun, 31 Mar 2019 13:44:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O80RNdh3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731162AbfCaNoK (ORCPT ); Sun, 31 Mar 2019 09:44:10 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:43753 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726863AbfCaNoK (ORCPT ); Sun, 31 Mar 2019 09:44:10 -0400 Received: by mail-wr1-f66.google.com with SMTP id k17so8387143wrx.10 for ; Sun, 31 Mar 2019 06:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=aYbN1fp8OfGVkqrU0ZCZKPJs/by/polxKKdFxfoqMR0=; b=O80RNdh31TiI7W9VYnx2c/nvqGknouxiV00lAx5DVrba8gqSCEqKYvg/9ZPjGQSvBz 28TIs0TSskkq48RE3DuzpLJn1V27/eSevj1nrnxW17Bawae589LD9UTwBcwWLuZ7D3Fm IQMtdmAeVp54iXqNaAVDMnSrUmVjWNO200BhQAazAxtu9+6+PIFHKkJd1kDdYknXOmyq Nul5s6MFwLlDAN+T2jCH9Z8x6KdGTkQomH6wWfIPCAB9I1NYq8oxV/nSRPe0ULa7n2pU kjrBUCWHYLEJ/bFM877Z8qhHezZE0TbaMyLObtxeJzBnKcrNI+WJ2e41tGoU1T8GYwfW JKGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=aYbN1fp8OfGVkqrU0ZCZKPJs/by/polxKKdFxfoqMR0=; b=JoefNQGR2RYF7BAe8dDYMp653fKU2B3E64FJVCmofsczBW+LJhRIwkhE2PBprT9q68 jg05UgQ2TZeZ3H8uAGcjPN1HUN4wf+vOVPRtgvnhjKlFio4X1JUIaTRNFmpFaryNiKL7 Bow90WItiTCYUlbOKF358Zw8+KWivs3f84kj9QZLL+uBPCev8I08WIisDRNUg0lT+VG+ OIS/tk96Pzf4x/Fry3NZREtO1aW11vgnrLEWNWOwjQmmx0sAoQj7o6/gxvHuCjMAYX3O W/ldEbt1VoY5CK4NxTfeT80rna1TohvptLJujKLJGGRM5BVhvXBpdz6f0Q6qZvtiKE/Q hpWw== X-Gm-Message-State: APjAAAVnMFQfoe/CE2LfhAkyN31D17XsNyf2uAxjL380TFSuvOBRhxsH wwzubwkgns+9yWnxs9NNkqa16SJo X-Google-Smtp-Source: APXvYqxwwxdqlIJvfeDs35PXZ3T3jdDkCwtLUGb22BSpWo1UQKN43/lyM4DffhtmY6CMU7dElR80fg== X-Received: by 2002:adf:f451:: with SMTP id f17mr35007766wrp.272.1554039848157; Sun, 31 Mar 2019 06:44:08 -0700 (PDT) Received: from ?IPv6:2003:ea:8be1:dd00:a4e7:3af3:db88:50bb? (p200300EA8BE1DD00A4E73AF3DB8850BB.dip0.t-ipconnect.de. [2003:ea:8be1:dd00:a4e7:3af3:db88:50bb]) by smtp.googlemail.com with ESMTPSA id y133sm2211109wmd.2.2019.03.31.06.44.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 06:44:07 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH net-next] r8169: disable tx interrupt coalescing on RTL8168 To: Realtek linux nic maintainers , David Miller Cc: "netdev@vger.kernel.org" Message-ID: <23289428-64e1-206c-385e-b1ce9c4cc14c@gmail.com> Date: Sun, 31 Mar 2019 15:43:59 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In contrast to switching rx irq coalescing off what fixed an issue, switching tx irq coalescing off is merely a latency optimization, therefore net-next. As part of this change: - Remove INTT_0 .. INTT_3 constants, they aren't used. - Remove comment in rtl_hw_start_8169(), we now have a detailed description by the code in rtl_set_coalesce(). - Due to switching irq coalescing off per default we don't need the initialization in rtl_hw_start_8168(). If ethtool is used to switch on coalescing then rtl_set_coalesce() will configure this register. For the sake of completeness: This patch just changes the default. Users still have the option to configure irq coalescing via ethtool. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8a8a4f70d..8f065bf3e 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -490,10 +490,6 @@ enum rtl_register_content { PCIDAC = (1 << 4), PCIMulRW = (1 << 3), #define INTT_MASK GENMASK(1, 0) - INTT_0 = 0x0000, // 8168 - INTT_1 = 0x0001, // 8168 - INTT_2 = 0x0002, // 8168 - INTT_3 = 0x0003, // 8168 /* rtl8169_PHYstatus */ TBI_Enable = 0x80, @@ -4702,6 +4698,8 @@ static void rtl_hw_start(struct rtl8169_private *tp) rtl_set_rx_tx_desc_registers(tp); rtl_lock_config_regs(tp); + /* disable interrupt coalescing */ + RTL_W16(tp, IntrMitigate, 0x0000); /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ RTL_R8(tp, IntrMask); RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); @@ -4734,12 +4732,6 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp) rtl8169_set_magic_reg(tp, tp->mac_version); - /* - * Undocumented corner. Supposedly: - * (TxTimer << 12) | (TxPackets << 8) | (RxTimer << 4) | RxPackets - */ - RTL_W16(tp, IntrMitigate, 0x0000); - RTL_W32(tp, RxMissed, 0); } @@ -5456,12 +5448,6 @@ static void rtl_hw_start_8168(struct rtl8169_private *tp) { RTL_W8(tp, MaxTxPacketSize, TxPacketMax); - tp->cp_cmd &= ~INTT_MASK; - tp->cp_cmd |= PktCntrDisable | INTT_1; - RTL_W16(tp, CPlusCmd, tp->cp_cmd); - - RTL_W16(tp, IntrMitigate, 0x5100); - /* Work around for RxFIFO overflow. */ if (tp->mac_version == RTL_GIGA_MAC_VER_11) { tp->irq_mask |= RxFIFOOver; @@ -5749,8 +5735,6 @@ static void rtl_hw_start_8101(struct rtl8169_private *tp) rtl_hw_start_8168h_1(tp); break; } - - RTL_W16(tp, IntrMitigate, 0x0000); } static int rtl8169_change_mtu(struct net_device *dev, int new_mtu) -- 2.21.0