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=-7.1 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 0E785C282C2 for ; Sun, 10 Feb 2019 13:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C5DAF207E0 for ; Sun, 10 Feb 2019 13:52:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iOscvtAm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726177AbfBJNu0 (ORCPT ); Sun, 10 Feb 2019 08:50:26 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40375 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726101AbfBJNu0 (ORCPT ); Sun, 10 Feb 2019 08:50:26 -0500 Received: by mail-wm1-f67.google.com with SMTP id q21so11847532wmc.5 for ; Sun, 10 Feb 2019 05:50:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=AoIDwYZ567STYjGwNF8QrIvd0pWxhccrILWbvxZIg0U=; b=iOscvtAmg2cy4lesTJk+Ibv6TiWxjct4Imp43mANqSvE6jWKSBAxG748sciYDqId2D iiaGsnLVgWYdxjrRGSU8QR77r1SEXfy/DlTc0/0JX4/JhoJwvFEP0owyXx0V5Ub29WY3 o+w6U4TL4m+lWCWceFDn6t3o559SForoehTgUZPzSNyEhNMbyOEqVFA8P3nC/yUyMZlt iwE/QnAeeefrMQIv/9AHJsro5y8Afpd7bip3BqhOdaIPQOqY/r1DnE9G7Y68/GpdTurn ONb5WVTuLtqw45qxo8nu7KrrkJplygDvjrcYhDCG+zgRalx3Kk06OvSdHe4Io9SFZFFz FVBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=AoIDwYZ567STYjGwNF8QrIvd0pWxhccrILWbvxZIg0U=; b=c6JW5kooLUr7scRT/DcP8YzC8MQfIF6KIjsCz2KAjw1EV6/hk7dshZBEaEHkwy43D0 opbtrR8RFwbW0Unedy6P7MHdufyaxmDq6RZOhkqNLhPvEhHdWOeehJ/+zM18KOyz9XNY xh2rE2YGY6s+RSUxGuY/fkkWXDSU0SH1dSur0pCJ0hvWBghWPVKqlqI3SalEX6RPAo2x Dq5Cd1HgbwOwSO9IpPV6mKdldQhEXRv750MmvwYROaKL+v1ezrdgwMoTRMnQiqnSHFul LUtCvQDGsGzpBzFRdyAhmKSeipbDIJVfG33KvvujycdN7TRgUVjD/lY3U/tVxdhL8OH1 3SVQ== X-Gm-Message-State: AHQUAuaL13bdf1ExfQDgZPt2VFITIJhXvcM9FP7lYEuc7s87xol42gNW jU89iv39tphsUu5Fk4DzfxyNLX0y X-Google-Smtp-Source: AHgI3IY8QA2vRnutxmcx3YYcUKs53lSGED3VRGzZcEx0OcAp9izok2GijB7a9SvEWO5qjpR57sRBOg== X-Received: by 2002:adf:d845:: with SMTP id k5mr8075591wrl.145.1549806623429; Sun, 10 Feb 2019 05:50:23 -0800 (PST) Received: from ?IPv6:2003:ea:8bf1:e200:1513:f24d:17d6:1a6d? (p200300EA8BF1E2001513F24D17D61A6D.dip0.t-ipconnect.de. [2003:ea:8bf1:e200:1513:f24d:17d6:1a6d]) by smtp.googlemail.com with ESMTPSA id n184sm7263309wmf.5.2019.02.10.05.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Feb 2019 05:50:22 -0800 (PST) Subject: [PATCH net 1/2] Revert "r8169: remove unneeded mmiowb barriers" From: Heiner Kallweit To: Realtek linux nic maintainers , David Miller Cc: Sander Eikelenboom , "netdev@vger.kernel.org" References: Message-ID: <25b9c2e6-1eab-b074-6754-c620bfbd32dd@gmail.com> Date: Sun, 10 Feb 2019 14:49:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: 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 This reverts commit bd7153bd83b806bfcc2e79b7a6f43aa653d06ef3. There doesn't seem to be anything wrong with this patch, it's just reverted to get a stable baseline again. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index abb94c543aa2..bba806ce57d3 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1286,11 +1286,13 @@ static u16 rtl_get_events(struct rtl8169_private *tp) static void rtl_ack_events(struct rtl8169_private *tp, u16 bits) { RTL_W16(tp, IntrStatus, bits); + mmiowb(); } static void rtl_irq_disable(struct rtl8169_private *tp) { RTL_W16(tp, IntrMask, 0); + mmiowb(); } #define RTL_EVENT_NAPI_RX (RxOK | RxErr) @@ -6130,8 +6132,10 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, if (unlikely(stop_queue)) netif_stop_queue(dev); - if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) + if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) { RTL_W8(tp, TxPoll, NPQ); + mmiowb(); + } if (unlikely(stop_queue)) { /* Sync with rtl_tx: @@ -6483,7 +6487,9 @@ static int rtl8169_poll(struct napi_struct *napi, int budget) if (work_done < budget) { napi_complete_done(napi, work_done); + rtl_irq_enable(tp); + mmiowb(); } return work_done; -- 2.20.1