diff for duplicates of <942e559e-32ee-9e05-1489-823662d0dfe9@yandex-team.ru>
diff --git a/a/1.txt b/N1/1.txt
index 8c9a4dc..5da608a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,80 +9,80 @@ On 17.01.2019 10:57, Neftin, Sasha wrote:
>> As result e1000_watchdog_task sees used tx buffer while carrier is off
>> and start this reset cycle again.
>>
->> [ 17.794359] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
->> [ 17.794714] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready
->> [ 22.936455] e1000e 0000:02:00.0 eth1: changing MTU from 1500 to 9000
->> [ 23.033336] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 26.102364] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
->> [ 27.174495] 8021q: 802.1Q VLAN Support v1.8
->> [ 27.174513] 8021q: adding VLAN 0 to HW filter on device eth1
->> [ 30.671724] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation
->> [ 30.898564] netpoll: netconsole: local port 6666
->> [ 30.898566] netpoll: netconsole: local IPv6 address 2a02:6b8:0:80b:beae:c5ff:fe28:23f8
->> [ 30.898567] netpoll: netconsole: interface 'eth1'
->> [ 30.898568] netpoll: netconsole: remote port 6666
->> [ 30.898568] netpoll: netconsole: remote IPv6 address 2a02:6b8:b000:605c:e61d:2dff:fe03:3790
->> [ 30.898569] netpoll: netconsole: remote ethernet address b0:a8:6e:f4:ff:c0
->> [ 30.917747] console [netcon0] enabled
->> [ 30.917749] netconsole: network logging started
->> [ 31.453353] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.185730] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.321840] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.465822] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.597423] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.745417] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 34.877356] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 35.005441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 35.157376] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 35.289362] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 35.417441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
->> [ 37.790342] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+>> [?? 17.794359] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+>> [?? 17.794714] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready
+>> [?? 22.936455] e1000e 0000:02:00.0 eth1: changing MTU from 1500 to 9000
+>> [?? 23.033336] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 26.102364] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
+>> [?? 27.174495] 8021q: 802.1Q VLAN Support v1.8
+>> [?? 27.174513] 8021q: adding VLAN 0 to HW filter on device eth1
+>> [?? 30.671724] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation
+>> [?? 30.898564] netpoll: netconsole: local port 6666
+>> [?? 30.898566] netpoll: netconsole: local IPv6 address 2a02:6b8:0:80b:beae:c5ff:fe28:23f8
+>> [?? 30.898567] netpoll: netconsole: interface 'eth1'
+>> [?? 30.898568] netpoll: netconsole: remote port 6666
+>> [?? 30.898568] netpoll: netconsole: remote IPv6 address 2a02:6b8:b000:605c:e61d:2dff:fe03:3790
+>> [?? 30.898569] netpoll: netconsole: remote ethernet address b0:a8:6e:f4:ff:c0
+>> [?? 30.917747] console [netcon0] enabled
+>> [?? 30.917749] netconsole: network logging started
+>> [?? 31.453353] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.185730] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.321840] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.465822] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.597423] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.745417] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 34.877356] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 35.005441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 35.157376] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 35.289362] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 35.417441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames
+>> [?? 37.790342] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None
>>
>> This patch flushes tx buffers only once when carrier is off
>> rather than at each watchdog iteration.
>>
>> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
>> ---
->> drivers/net/ethernet/intel/e1000e/netdev.c | 15 ++++++---------
->> 1 file changed, 6 insertions(+), 9 deletions(-)
+>> ? drivers/net/ethernet/intel/e1000e/netdev.c |?? 15 ++++++---------
+>> ? 1 file changed, 6 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
>> index 189f231075c2..d10083beec83 100644
>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
>> @@ -5309,8 +5309,13 @@ static void e1000_watchdog_task(struct work_struct *work)
->> /* 8000ES2LAN requires a Rx packet buffer work-around
->> * on link down event; reset the controller to flush
->> * the Rx packet buffer.
->> + *
->> + * If the link is lost the controller stops DMA, but
->> + * if there is queued Tx work it cannot be done. So
->> + * reset the controller to flush the Tx packet buffers.
->> */
->> - if (adapter->flags & FLAG_RX_NEEDS_RESTART)
->> + if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||
->> + e1000_desc_unused(tx_ring) + 1 < tx_ring->count)
->> adapter->flags |= FLAG_RESTART_NOW;
->> else
->> pm_schedule_suspend(netdev->dev.parent,
+>> ????????????? /* 8000ES2LAN requires a Rx packet buffer work-around
+>> ?????????????? * on link down event; reset the controller to flush
+>> ?????????????? * the Rx packet buffer.
+>> +???????????? *
+>> +???????????? * If the link is lost the controller stops DMA, but
+>> +???????????? * if there is queued Tx work it cannot be done.? So
+>> +???????????? * reset the controller to flush the Tx packet buffers.
+>> ?????????????? */
+>> -??????????? if (adapter->flags & FLAG_RX_NEEDS_RESTART)
+>> +??????????? if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||
+>> +??????????????? e1000_desc_unused(tx_ring) + 1 < tx_ring->count)
+>> ????????????????? adapter->flags |= FLAG_RESTART_NOW;
+>> ????????????? else
+>> ????????????????? pm_schedule_suspend(netdev->dev.parent,
>> @@ -5333,14 +5338,6 @@ static void e1000_watchdog_task(struct work_struct *work)
->> adapter->gotc_old = adapter->stats.gotc;
->> spin_unlock(&adapter->stats64_lock);
->> - /* If the link is lost the controller stops DMA, but
->> - * if there is queued Tx work it cannot be done. So
->> - * reset the controller to flush the Tx packet buffers.
->> - */
->> - if (!netif_carrier_ok(netdev) &&
->> - (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))
->> - adapter->flags |= FLAG_RESTART_NOW;
+>> ????? adapter->gotc_old = adapter->stats.gotc;
+>> ????? spin_unlock(&adapter->stats64_lock);
+>> -??? /* If the link is lost the controller stops DMA, but
+>> -???? * if there is queued Tx work it cannot be done.? So
+>> -???? * reset the controller to flush the Tx packet buffers.
+>> -???? */
+>> -??? if (!netif_carrier_ok(netdev) &&
+>> -??????? (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))
+>> -??????? adapter->flags |= FLAG_RESTART_NOW;
>> -
->> /* If reset is necessary, do it outside of interrupt context. */
->> if (adapter->flags & FLAG_RESTART_NOW) {
->> schedule_work(&adapter->reset_task);
+>> ????? /* If reset is necessary, do it outside of interrupt context. */
+>> ????? if (adapter->flags & FLAG_RESTART_NOW) {
+>> ????????? schedule_work(&adapter->reset_task);
>>
>> _______________________________________________
>> Intel-wired-lan mailing list
->> Intel-wired-lan@osuosl.org
+>> Intel-wired-lan at osuosl.org
>> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>>
> What is the HW setup you encountered this issue? Could you try to disable the jumbo frame and recheck? We cannot allow the low CPU states
@@ -220,7 +220,7 @@ ff:06.3 Host bridge: Intel Corporation Xeon 5600 Series Integrated Memory Contro
full dmesg
-[ 0.000000] Linux version 4.19.15-test (khlebnikov@kernel1.search.yandex.net) (gcc version 5.4.0 20160609 (Ubuntu
+[ 0.000000] Linux version 4.19.15-test (khlebnikov at kernel1.search.yandex.net) (gcc version 5.4.0 20160609 (Ubuntu
5.4.0-6ubuntu1~16.04.11)) #2 SMP Mon Jan 14 12:50:23 UTC 2019
[ 0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-4.19.15-test root=/dev/mapper/hdd-root ro pti=off spectre_v2=off consoleblank=0
biosdevname=0 net.ifnames=0
@@ -868,12 +868,12 @@ reserved, 0K cma-reserved)
[ 2.666866] scsi host3: ahci
[ 2.667668] scsi host4: ahci
[ 2.668623] scsi host5: ahci
-[ 2.669051] ata1: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa100 irq 24
-[ 2.669056] ata2: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa180 irq 24
-[ 2.669061] ata3: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa200 irq 24
-[ 2.669065] ata4: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa280 irq 24
-[ 2.669069] ata5: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa300 irq 24
-[ 2.669073] ata6: SATA max UDMA/133 abar m2048@0xfbcfa000 port 0xfbcfa380 irq 24
+[ 2.669051] ata1: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa100 irq 24
+[ 2.669056] ata2: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa180 irq 24
+[ 2.669061] ata3: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa200 irq 24
+[ 2.669065] ata4: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa280 irq 24
+[ 2.669069] ata5: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa300 irq 24
+[ 2.669073] ata6: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa380 irq 24
[ 2.669276] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
[ 2.669289] ehci-pci: EHCI PCI platform driver
[ 2.670123] ehci-pci 0000:00:1a.7: EHCI Host Controller
@@ -983,7 +983,7 @@ reserved, 0K cma-reserved)
[ 2.726706] rtc_cmos 00:01: alarms up to one month, y3k, 114 bytes nvram, hpet irqs
[ 2.727227] softdog: initialized. soft_noboot=0 soft_margin=60 sec soft_panic=0 (nowayout=0)
[ 2.727457] device-mapper: uevent: version 1.0.3
-[ 2.727837] device-mapper: ioctl: 4.39.0-ioctl (2018-04-03) initialised: dm-devel@redhat.com
+[ 2.727837] device-mapper: ioctl: 4.39.0-ioctl (2018-04-03) initialised: dm-devel at redhat.com
[ 2.727927] hidraw: raw HID events driver (C) Jiri Kosina
[ 2.728007] usbcore: registered new interface driver usbhid
[ 2.728010] usbhid: USB HID core driver
diff --git a/a/content_digest b/N1/content_digest
index 666bb9a..00e93b4 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,21 +8,13 @@
"From\0Konstantin Khlebnikov <khlebnikov\@yandex-team.ru>\0"
]
[
- "Subject\0Re: [Intel-wired-lan] [PATCH] e1000e: fix cyclic resets at link up with active tx\0"
+ "Subject\0[Intel-wired-lan] [PATCH] e1000e: fix cyclic resets at link up with active tx\0"
]
[
"Date\0Thu, 17 Jan 2019 15:10:49 +0300\0"
]
[
- "To\0Neftin",
- " Sasha <sasha.neftin\@intel.com>",
- " netdev\@vger.kernel.org",
- " intel-wired-lan\@lists.osuosl.org",
- " Jeff Kirsher <jeffrey.t.kirsher\@intel.com>\0"
-]
-[
- "Cc\0linux-kernel\@vger.kernel.org",
- " David S. Miller <davem\@davemloft.net>\0"
+ "To\0intel-wired-lan\@osuosl.org\0"
]
[
"\0000:1\0"
@@ -42,80 +34,80 @@
">> As result e1000_watchdog_task sees used tx buffer while carrier is off\n",
">> and start this reset cycle again.\n",
">>\n",
- ">> [\302\240\302\240 17.794359] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
- ">> [\302\240\302\240 17.794714] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready\n",
- ">> [\302\240\302\240 22.936455] e1000e 0000:02:00.0 eth1: changing MTU from 1500 to 9000\n",
- ">> [\302\240\302\240 23.033336] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 26.102364] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
- ">> [\302\240\302\240 27.174495] 8021q: 802.1Q VLAN Support v1.8\n",
- ">> [\302\240\302\240 27.174513] 8021q: adding VLAN 0 to HW filter on device eth1\n",
- ">> [\302\240\302\240 30.671724] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation\n",
- ">> [\302\240\302\240 30.898564] netpoll: netconsole: local port 6666\n",
- ">> [\302\240\302\240 30.898566] netpoll: netconsole: local IPv6 address 2a02:6b8:0:80b:beae:c5ff:fe28:23f8\n",
- ">> [\302\240\302\240 30.898567] netpoll: netconsole: interface 'eth1'\n",
- ">> [\302\240\302\240 30.898568] netpoll: netconsole: remote port 6666\n",
- ">> [\302\240\302\240 30.898568] netpoll: netconsole: remote IPv6 address 2a02:6b8:b000:605c:e61d:2dff:fe03:3790\n",
- ">> [\302\240\302\240 30.898569] netpoll: netconsole: remote ethernet address b0:a8:6e:f4:ff:c0\n",
- ">> [\302\240\302\240 30.917747] console [netcon0] enabled\n",
- ">> [\302\240\302\240 30.917749] netconsole: network logging started\n",
- ">> [\302\240\302\240 31.453353] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.185730] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.321840] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.465822] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.597423] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.745417] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 34.877356] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 35.005441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 35.157376] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 35.289362] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 35.417441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
- ">> [\302\240\302\240 37.790342] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
+ ">> [?? 17.794359] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
+ ">> [?? 17.794714] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready\n",
+ ">> [?? 22.936455] e1000e 0000:02:00.0 eth1: changing MTU from 1500 to 9000\n",
+ ">> [?? 23.033336] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 26.102364] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
+ ">> [?? 27.174495] 8021q: 802.1Q VLAN Support v1.8\n",
+ ">> [?? 27.174513] 8021q: adding VLAN 0 to HW filter on device eth1\n",
+ ">> [?? 30.671724] cgroup: cgroup: disabling cgroup2 socket matching due to net_prio or net_cls activation\n",
+ ">> [?? 30.898564] netpoll: netconsole: local port 6666\n",
+ ">> [?? 30.898566] netpoll: netconsole: local IPv6 address 2a02:6b8:0:80b:beae:c5ff:fe28:23f8\n",
+ ">> [?? 30.898567] netpoll: netconsole: interface 'eth1'\n",
+ ">> [?? 30.898568] netpoll: netconsole: remote port 6666\n",
+ ">> [?? 30.898568] netpoll: netconsole: remote IPv6 address 2a02:6b8:b000:605c:e61d:2dff:fe03:3790\n",
+ ">> [?? 30.898569] netpoll: netconsole: remote ethernet address b0:a8:6e:f4:ff:c0\n",
+ ">> [?? 30.917747] console [netcon0] enabled\n",
+ ">> [?? 30.917749] netconsole: network logging started\n",
+ ">> [?? 31.453353] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.185730] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.321840] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.465822] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.597423] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.745417] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 34.877356] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 35.005441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 35.157376] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 35.289362] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 35.417441] e1000e 0000:02:00.0: Some CPU C-states have been disabled in order to enable jumbo frames\n",
+ ">> [?? 37.790342] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None\n",
">>\n",
">> This patch flushes tx buffers only once when carrier is off\n",
">> rather than at each watchdog iteration.\n",
">>\n",
">> Signed-off-by: Konstantin Khlebnikov <khlebnikov\@yandex-team.ru>\n",
">> ---\n",
- ">> \302\240 drivers/net/ethernet/intel/e1000e/netdev.c |\302\240\302\240 15 ++++++---------\n",
- ">> \302\240 1 file changed, 6 insertions(+), 9 deletions(-)\n",
+ ">> ? drivers/net/ethernet/intel/e1000e/netdev.c |?? 15 ++++++---------\n",
+ ">> ? 1 file changed, 6 insertions(+), 9 deletions(-)\n",
">>\n",
">> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c\n",
">> index 189f231075c2..d10083beec83 100644\n",
">> --- a/drivers/net/ethernet/intel/e1000e/netdev.c\n",
">> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c\n",
">> \@\@ -5309,8 +5309,13 \@\@ static void e1000_watchdog_task(struct work_struct *work)\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 /* 8000ES2LAN requires a Rx packet buffer work-around\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 * on link down event; reset the controller to flush\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 * the Rx packet buffer.\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 *\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 * If the link is lost the controller stops DMA, but\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 * if there is queued Tx work it cannot be done.\302\240 So\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 * reset the controller to flush the Tx packet buffers.\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 */\n",
- ">> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if (adapter->flags & FLAG_RX_NEEDS_RESTART)\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||\n",
- ">> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 e1000_desc_unused(tx_ring) + 1 < tx_ring->count)\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 adapter->flags |= FLAG_RESTART_NOW;\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 else\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 pm_schedule_suspend(netdev->dev.parent,\n",
+ ">> ????????????? /* 8000ES2LAN requires a Rx packet buffer work-around\n",
+ ">> ?????????????? * on link down event; reset the controller to flush\n",
+ ">> ?????????????? * the Rx packet buffer.\n",
+ ">> +???????????? *\n",
+ ">> +???????????? * If the link is lost the controller stops DMA, but\n",
+ ">> +???????????? * if there is queued Tx work it cannot be done.? So\n",
+ ">> +???????????? * reset the controller to flush the Tx packet buffers.\n",
+ ">> ?????????????? */\n",
+ ">> -??????????? if (adapter->flags & FLAG_RX_NEEDS_RESTART)\n",
+ ">> +??????????? if ((adapter->flags & FLAG_RX_NEEDS_RESTART) ||\n",
+ ">> +??????????????? e1000_desc_unused(tx_ring) + 1 < tx_ring->count)\n",
+ ">> ????????????????? adapter->flags |= FLAG_RESTART_NOW;\n",
+ ">> ????????????? else\n",
+ ">> ????????????????? pm_schedule_suspend(netdev->dev.parent,\n",
">> \@\@ -5333,14 +5338,6 \@\@ static void e1000_watchdog_task(struct work_struct *work)\n",
- ">> \302\240\302\240\302\240\302\240\302\240 adapter->gotc_old = adapter->stats.gotc;\n",
- ">> \302\240\302\240\302\240\302\240\302\240 spin_unlock(&adapter->stats64_lock);\n",
- ">> -\302\240\302\240\302\240 /* If the link is lost the controller stops DMA, but\n",
- ">> -\302\240\302\240\302\240\302\240 * if there is queued Tx work it cannot be done.\302\240 So\n",
- ">> -\302\240\302\240\302\240\302\240 * reset the controller to flush the Tx packet buffers.\n",
- ">> -\302\240\302\240\302\240\302\240 */\n",
- ">> -\302\240\302\240\302\240 if (!netif_carrier_ok(netdev) &&\n",
- ">> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))\n",
- ">> -\302\240\302\240\302\240\302\240\302\240\302\240\302\240 adapter->flags |= FLAG_RESTART_NOW;\n",
+ ">> ????? adapter->gotc_old = adapter->stats.gotc;\n",
+ ">> ????? spin_unlock(&adapter->stats64_lock);\n",
+ ">> -??? /* If the link is lost the controller stops DMA, but\n",
+ ">> -???? * if there is queued Tx work it cannot be done.? So\n",
+ ">> -???? * reset the controller to flush the Tx packet buffers.\n",
+ ">> -???? */\n",
+ ">> -??? if (!netif_carrier_ok(netdev) &&\n",
+ ">> -??????? (e1000_desc_unused(tx_ring) + 1 < tx_ring->count))\n",
+ ">> -??????? adapter->flags |= FLAG_RESTART_NOW;\n",
">> -\n",
- ">> \302\240\302\240\302\240\302\240\302\240 /* If reset is necessary, do it outside of interrupt context. */\n",
- ">> \302\240\302\240\302\240\302\240\302\240 if (adapter->flags & FLAG_RESTART_NOW) {\n",
- ">> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 schedule_work(&adapter->reset_task);\n",
+ ">> ????? /* If reset is necessary, do it outside of interrupt context. */\n",
+ ">> ????? if (adapter->flags & FLAG_RESTART_NOW) {\n",
+ ">> ????????? schedule_work(&adapter->reset_task);\n",
">>\n",
">> _______________________________________________\n",
">> Intel-wired-lan mailing list\n",
- ">> Intel-wired-lan\@osuosl.org\n",
+ ">> Intel-wired-lan at osuosl.org\n",
">> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan\n",
">>\n",
"> What is the HW setup you encountered this issue? Could you try to disable the jumbo frame and recheck? We cannot allow the low CPU states \n",
@@ -253,7 +245,7 @@
"\n",
"full dmesg\n",
"\n",
- "[ 0.000000] Linux version 4.19.15-test (khlebnikov\@kernel1.search.yandex.net) (gcc version 5.4.0 20160609 (Ubuntu \n",
+ "[ 0.000000] Linux version 4.19.15-test (khlebnikov at kernel1.search.yandex.net) (gcc version 5.4.0 20160609 (Ubuntu \n",
"5.4.0-6ubuntu1~16.04.11)) #2 SMP Mon Jan 14 12:50:23 UTC 2019\n",
"[ 0.000000] Command line: BOOT_IMAGE=/boot/vmlinuz-4.19.15-test root=/dev/mapper/hdd-root ro pti=off spectre_v2=off consoleblank=0 \n",
"biosdevname=0 net.ifnames=0\n",
@@ -901,12 +893,12 @@
"[ 2.666866] scsi host3: ahci\n",
"[ 2.667668] scsi host4: ahci\n",
"[ 2.668623] scsi host5: ahci\n",
- "[ 2.669051] ata1: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa100 irq 24\n",
- "[ 2.669056] ata2: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa180 irq 24\n",
- "[ 2.669061] ata3: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa200 irq 24\n",
- "[ 2.669065] ata4: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa280 irq 24\n",
- "[ 2.669069] ata5: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa300 irq 24\n",
- "[ 2.669073] ata6: SATA max UDMA/133 abar m2048\@0xfbcfa000 port 0xfbcfa380 irq 24\n",
+ "[ 2.669051] ata1: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa100 irq 24\n",
+ "[ 2.669056] ata2: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa180 irq 24\n",
+ "[ 2.669061] ata3: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa200 irq 24\n",
+ "[ 2.669065] ata4: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa280 irq 24\n",
+ "[ 2.669069] ata5: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa300 irq 24\n",
+ "[ 2.669073] ata6: SATA max UDMA/133 abar m2048 at 0xfbcfa000 port 0xfbcfa380 irq 24\n",
"[ 2.669276] ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver\n",
"[ 2.669289] ehci-pci: EHCI PCI platform driver\n",
"[ 2.670123] ehci-pci 0000:00:1a.7: EHCI Host Controller\n",
@@ -1016,7 +1008,7 @@
"[ 2.726706] rtc_cmos 00:01: alarms up to one month, y3k, 114 bytes nvram, hpet irqs\n",
"[ 2.727227] softdog: initialized. soft_noboot=0 soft_margin=60 sec soft_panic=0 (nowayout=0)\n",
"[ 2.727457] device-mapper: uevent: version 1.0.3\n",
- "[ 2.727837] device-mapper: ioctl: 4.39.0-ioctl (2018-04-03) initialised: dm-devel\@redhat.com\n",
+ "[ 2.727837] device-mapper: ioctl: 4.39.0-ioctl (2018-04-03) initialised: dm-devel at redhat.com\n",
"[ 2.727927] hidraw: raw HID events driver (C) Jiri Kosina\n",
"[ 2.728007] usbcore: registered new interface driver usbhid\n",
"[ 2.728010] usbhid: USB HID core driver\n",
@@ -1236,4 +1228,4 @@
"[ 37.790342] e1000e: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: None"
]
-e16dc17a3b891ab2afb3d1f5ef06cef8d0a0714b687a39e6ba0c302040ca8ec4
+d92edceb90df0187d111ba61597b29d8db2d7f6cff95c5e1cd2f5e5cc5843eee
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.