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=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,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 915CCC43381 for ; Sun, 31 Mar 2019 18:17:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 54C4B20872 for ; Sun, 31 Mar 2019 18:17:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uHS2GxBz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731335AbfCaSQ7 (ORCPT ); Sun, 31 Mar 2019 14:16:59 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:56291 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726170AbfCaSQ7 (ORCPT ); Sun, 31 Mar 2019 14:16:59 -0400 Received: by mail-wm1-f68.google.com with SMTP id o25so7828675wmf.5 for ; Sun, 31 Mar 2019 11:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=kWU3jhI/ndsmnEt5VELXq7xrVabBE2qJTkErKAWs5NY=; b=uHS2GxBzN4YAEy1nyaErE+MWnCpcOl/F3Ph2gTh61diGnmNi2P4gbG91LTV7CI+QOe DaN4pjIeS3OKgi0/8J36LcoGbU8cXkJZcg5UUQtsMS4nsFZF5P9s9S1qG4zTT0KC0Yn1 auG4yzntaSI11q8SIQGnba7ayjljfgE4nZaP3wacRqoq/VfnCAZdSEUJlR0f7bVT1UKM EpvK5F0K/yOBxi4oSGfF0lKn9kn+wXRpwnI8PbnC8ZowhQRJktFpqoJHlFc9PQ2iR4Tj qT5cShs/nfpUOYhJ/0L6ZYV66cVRylvpQf9XmdjEQ5rrsrJmdoGG3vntqJXWeeg6nvDv hmAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=kWU3jhI/ndsmnEt5VELXq7xrVabBE2qJTkErKAWs5NY=; b=Qqs0WYbeaWeZ/bO3wlOtUbj7zzBk8k98XWWUsaN0pXHdjNRA3DwQyzZE2U89SzgL5s rxkKJ0Hj/G2KQtXwqkbV2CchYuFVrlXbk86RKGJgt4pVfNPtqlwAlpcaE+EGx1TS2tRA dnHYIrBdcXQYyjQfpbneSNECpQlnCcIml6lZfNxBt94gEQ/mVPCx0wRz8D0zonvu6qxv nHIKiuxtLpxiLaH9XdFxqB/mLgYJAiZZ9fZcBemxhT5qg2Tg3NdqEPMVsSiT952U9Hp4 p6UXYgWU0dBsJCoht5py0tsfPf3PcuLHqfEFb3BFJ/Xwhck1dspRKaLldMXLjs7xaB2U 1ayQ== X-Gm-Message-State: APjAAAWcHTrVhvAjW5iJ70WfhM0CiAeqL8P/Uc06nDoW20OYG4nRRvix E6rIpwVCdmC9tfMvLE5qLAKVb7wH X-Google-Smtp-Source: APXvYqziVakD8fLYptJnPMIiIZuWObPBzIUnowV12s+PvdaSjnRmsnQ7u9p81uYT9jlzhEapCU6i9Q== X-Received: by 2002:a1c:4d02:: with SMTP id o2mr10051081wmh.134.1554056217730; Sun, 31 Mar 2019 11:16:57 -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 t81sm15797872wmb.5.2019.03.31.11.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Mar 2019 11:16:57 -0700 (PDT) Subject: Re: [PATCH net-next] r8169: disable tx interrupt coalescing on RTL8168 To: David Miller Cc: nic_swsd@realtek.com, netdev@vger.kernel.org References: <23289428-64e1-206c-385e-b1ce9c4cc14c@gmail.com> <20190331.111320.1948640028158399763.davem@davemloft.net> From: Heiner Kallweit Message-ID: <04d8d554-6f29-365a-c0d9-325744bf43f5@gmail.com> Date: Sun, 31 Mar 2019 20:16:51 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190331.111320.1948640028158399763.davem@davemloft.net> 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 On 31.03.2019 20:13, David Miller wrote: > From: Heiner Kallweit > Date: Sun, 31 Mar 2019 15:43:59 +0200 > >> @@ -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. */ > > This patch isn't against net-next. > > I'm guessing it's against a tree with the RX coalesce disable changes > applied. > You're right, sorry. It will apply cleanly only once net has been merged into net-next. However, if I rebase this patch to net-next, then merging net to net-next will complain. Can we defer applying this patch until net has been merged?