--- drivers/net/r8169.c

+++ drivers/net/r8169.c

@@ -23,6 +23,7 @@

#include <linux/tcp.h>

#include <linux/init.h>

#include <linux/dma-mapping.h>

+#include <linux/pci-aspm.h>

#include <asm/system.h>

#include <asm/io.h>

@@ -3030,6 +3031,11 @@ rtl8169_init_one(struct pci_dev *pdev, c

mii->reg_num_mask = 0x1f;

mii->supports_gmii = !!(cfg->features & RTL_FEATURE_GMII);

+ /* disable ASPM completely as that cause random device stop working

+ * problems as well as full system hangs for some PCIe devices users */

+ pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |

+ PCIE_LINK_STATE_CLKPM);

+

/* enable device (incl. PCI PM wakeup and hotplug setup) */

rc = pci_enable_device(pdev);

if (rc < 0) {

@@ -3735,7 +3741,8 @@ static void rtl_hw_start_8168(struct net

RTL_W16(IntrMitigate, 0x5151);

/* Work around for RxFIFO overflow. */

- if (tp->mac_version == RTL_GIGA_MAC_VER_11) {

+ if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||

+ tp->mac_version == RTL_GIGA_MAC_VER_22) {

tp->intr_event |= RxFIFOOver | PCSTimeout;

tp->intr_event &= ~RxOverflow;

}

@@ -4627,7 +4634,8 @@ static irqreturn_t rtl8169_interrupt(int

/* Work around for rx fifo overflow */

if (unlikely(status & RxFIFOOver) &&

- (tp->mac_version == RTL_GIGA_MAC_VER_11)) {

+ (tp->mac_version == RTL_GIGA_MAC_VER_11 ||

+ tp->mac_version == RTL_GIGA_MAC_VER_22)) {

netif_stop_queue(dev);

rtl8169_tx_timeout(dev);

break;