| Message ID | 20180927040948.11891-1-jian-hong@endlessm.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] r8169: Enable MSI-X on RTL8106e | expand |
From: Jian-Hong Pan <jian-hong@endlessm.com> Date: Thu, 27 Sep 2018 12:09:48 +0800 > 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. I don't see this upstream yet.
David Miller <davem@davemloft.net> 於 2018年10月2日 週二 下午1:51寫道： > > From: Jian-Hong Pan <jian-hong@endlessm.com> > Date: Thu, 27 Sep 2018 12:09:48 +0800 > > > 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. > > I don't see this upstream yet. It is in linux-next repository: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=04cb3ae895d7efdc60f0fe17182b200a3da20f09 Regrads, Jian-Hong Pan
2018-10-02 13:57 GMT+08:00 Jian-Hong Pan <jian-hong@endlessm.com>: > David Miller <davem@davemloft.net> 於 2018年10月2日 週二 下午1:51寫道： >> >> From: Jian-Hong Pan <jian-hong@endlessm.com> >> Date: Thu, 27 Sep 2018 12:09:48 +0800 >> >> > 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. >> >> I don't see this upstream yet. > > It is in linux-next repository: > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=04cb3ae895d7efdc60f0fe17182b200a3da20f09 The commit is also back ported into Linux kernel 4.19-rc7 now. https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git/commit/?id=083874549fdfefa629dfa752785e20427dde1511 Regrads, Jian-Hong Pan
From: Jian-Hong Pan <jian-hong@endlessm.com> Date: Mon, 15 Oct 2018 16:51:12 +0800 > 2018-10-02 13:57 GMT+08:00 Jian-Hong Pan <jian-hong@endlessm.com>: >> David Miller <davem@davemloft.net> 於 2018年10月2日 週二 下午1:51寫道： >>> >>> From: Jian-Hong Pan <jian-hong@endlessm.com> >>> Date: Thu, 27 Sep 2018 12:09:48 +0800 >>> >>> > 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. >>> >>> I don't see this upstream yet. >> >> It is in linux-next repository: >> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=04cb3ae895d7efdc60f0fe17182b200a3da20f09 > > The commit is also back ported into Linux kernel 4.19-rc7 now. > https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git/commit/?id=083874549fdfefa629dfa752785e20427dde1511 Patch applied, thanks.
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; }
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 <jian-hong@endlessm.com> --- drivers/net/ethernet/realtek/r8169.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)