From patchwork Thu Sep 27 04:09:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian-Hong Pan X-Patchwork-Id: 975530 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=endlessm.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=endlessm-com.20150623.gappssmtp.com header.i=@endlessm-com.20150623.gappssmtp.com header.b="gZZGILIp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42LLy81jfCz9sCn for ; Thu, 27 Sep 2018 14:13:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726650AbeI0K1N (ORCPT ); Thu, 27 Sep 2018 06:27:13 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38150 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726566AbeI0K1N (ORCPT ); Thu, 27 Sep 2018 06:27:13 -0400 Received: by mail-pf1-f194.google.com with SMTP id x17-v6so887059pfh.5 for ; Wed, 26 Sep 2018 21:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=fmn5w2Vsi1vG/lbBOq8Q139Hj9dWw6MZ7Oa4lbqZFSQ=; b=gZZGILIpc7vhBN/Yx3KIOptISTxGRgYccUp3Do2PlS12ynHP0/zPjmX4vuWRYpHmy+ 3LIE7E/MNbwA/rqLlMgdca2QGTIiGkWcx/slAcXt+Z7w+dn+LLhwVGSmFGuGF8a52Fav s3SOZk0cO5+gOc82x9cL3jpkrrvgYiBZbl9Vqh9Q0NsQr0Ec7HjbWNlxODjS8MFU2Sqa zkkeGl51ijsj1J1uS5vsJCArMgd/vQAjq/V4UeYDhdW8BohE/G8lCmILVolXqKbPuCdA 6UKDfV1ebkKQlf+rO7lNt3Xg7FY6jzp7Q0KUqIk7BxDffEj2YYRvRnqrMGsNYa2Cm/Pf 6vbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fmn5w2Vsi1vG/lbBOq8Q139Hj9dWw6MZ7Oa4lbqZFSQ=; b=VDg/XebMf0YYDumS/VlD5V6BSAj/aOdyQxL6+/ae8ibZC4ws2nri2vu6jIAfCxrO93 5oN22GSAOvIdbHjc6IQC83OBeIMn5sV385Kk6ZHi2osj8G4yAMVksCe7xrX7G2kX1tSz p9k0DBvyBsGefqWJ75YwAzWC7frjKAYifcXZd4FD9Xv5FCOO+GjJXBdM7lXwiY+oobRb BWH2UmZJq1GznyjJz4NOwkF91sgkheCKvOteRJDYrG8LSEGWLamV134dU/bcvH0gvPLr iiiVfBW6ICqw0Qke3Vt8wxsK90xsyFMms1uDk7woC4uOmO08a8Zi+HlzzyW9b2jR7upi S7vQ== X-Gm-Message-State: ABuFfoj2pDCZu/nUx9DZYowX3sFWMYXJdSY/ivlE7SRemM4BZdEzRaEv +XXoMeZTTQ+hb2Zp32xpMkjDtA== X-Google-Smtp-Source: ACcGV60PZCMOML2orOKiC5KTa/VXr/k9u4Rr+LTagwx/c9oAjgIHcLaJ5B3gfvVQL7IBbqb3I7f+tg== X-Received: by 2002:a17:902:29e3:: with SMTP id h90-v6mr8804617plb.215.1538021461581; Wed, 26 Sep 2018 21:11:01 -0700 (PDT) Received: from endless.endlessm-sf.com (125-227-158-176.HINET-IP.hinet.net. [125.227.158.176]) by smtp.gmail.com with ESMTPSA id t26-v6sm827850pfm.138.2018.09.26.21.10.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Sep 2018 21:10:58 -0700 (PDT) From: Jian-Hong Pan To: "David S . Miller" , Heiner Kallweit Cc: Realtek linux nic maintainers , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kai.heng.feng@canonical.com, linux@endlessm.com, Jian-Hong Pan Subject: [PATCH net] r8169: Enable MSI-X on RTL8106e Date: Thu, 27 Sep 2018 12:09:48 +0800 Message-Id: <20180927040948.11891-1-jian-hong@endlessm.com> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Originally, we have an issue where r8169 MSI-X interrupt is broken after S3 suspend/resume on RTL8106e of ASUS X441UAR. 02:00.0 Ethernet controller [0200]: Realtek Semiconductor Co., Ltd. RTL8101/2/6E PCI Express Fast/Gigabit Ethernet controller [10ec:8136] (rev 07) Subsystem: ASUSTeK Computer Inc. RTL810xE PCI Express Fast Ethernet controller [1043:200f] Flags: bus master, fast devsel, latency 0, IRQ 16 I/O ports at e000 [size=256] Memory at ef100000 (64-bit, non-prefetchable) [size=4K] Memory at e0000000 (64-bit, prefetchable) [size=16K] Capabilities: [40] Power Management version 3 Capabilities: [50] MSI: Enable- Count=1/1 Maskable- 64bit+ Capabilities: [70] Express Endpoint, MSI 01 Capabilities: [b0] MSI-X: Enable+ Count=4 Masked- Capabilities: [d0] Vital Product Data Capabilities: [100] Advanced Error Reporting Capabilities: [140] Virtual Channel Capabilities: [160] Device Serial Number 01-00-00-00-36-4c-e0-00 Capabilities: [170] Latency Tolerance Reporting Kernel driver in use: r8169 Kernel modules: r8169 We found the all of the values in PCI BAR=4 of the ethernet adapter become 0xFF after system resumes. That breaks the MSI-X interrupt. Therefore, we can only fall back to MSI interrupt to fix the issue at that time. However, there is a commit which resolves the drivers getting nothing in PCI BAR=4 after system resumes. It is 04cb3ae895d7 "PCI: Reprogram bridge prefetch registers on resume" by Daniel Drake. After apply the patch, the ethernet adapter works fine before suspend and after resume. So, we can revert the workaround after the commit "PCI: Reprogram bridge prefetch registers on resume" is merged into main tree. This patch reverts commit 7bb05b85bc2d1a1b647b91424b2ed4a18e6ecd81 "r8169: don't use MSI-X on RTL8106e". Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=201181 Fixes: 7bb05b85bc2d ("r8169: don't use MSI-X on RTL8106e") Signed-off-by: Jian-Hong Pan --- drivers/net/ethernet/realtek/r8169.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index bb529ff2ca81..445508c7e067 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7084,20 +7084,17 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) { unsigned int flags; - switch (tp->mac_version) { - case RTL_GIGA_MAC_VER_01 ... RTL_GIGA_MAC_VER_06: + if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { RTL_W8(tp, Cfg9346, Cfg9346_Unlock); RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); RTL_W8(tp, Cfg9346, Cfg9346_Lock); flags = PCI_IRQ_LEGACY; - break; - case RTL_GIGA_MAC_VER_39 ... RTL_GIGA_MAC_VER_40: + } else if (tp->mac_version == RTL_GIGA_MAC_VER_40) { /* This version was reported to have issues with resume * from suspend when using MSI-X */ flags = PCI_IRQ_LEGACY | PCI_IRQ_MSI; - break; - default: + } else { flags = PCI_IRQ_ALL_TYPES; }