From 88f3beae583682a992de2429992256666d70a40a Mon Sep 17 00:00:00 2001

From: Miroslav Lichvar <mlichvar@redhat.com>

Date: Tue, 23 Oct 2018 14:37:39 +0200

Subject: e1000e: allow non-monotonic SYSTIM readings

[ Upstream commit e1f65b0d70e9e5c80e15105cd96fa00174d7c436 ]

It seems with some NICs supported by the e1000e driver a SYSTIM reading

may occasionally be few microseconds before the previous reading and if

enabled also pass e1000e_sanitize_systim() without reaching the maximum

number of rereads, even if the function is modified to check three

consecutive readings (i.e. it doesn't look like a double read error).

This causes an underflow in the timecounter and the PHC time jumps hours

ahead.

This was observed on 82574, I217 and I219. The fastest way to reproduce

it is to run a program that continuously calls the PTP_SYS_OFFSET ioctl

on the PHC.

Modify e1000e_phc_gettime() to use timecounter_cyc2time() instead of

timecounter_read() in order to allow non-monotonic SYSTIM readings and

prevent the PHC from jumping.

Cc: Richard Cochran <richardcochran@gmail.com>

Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>

Acked-by: Jacob Keller <jacob.e.keller@intel.com>

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---

 drivers/net/ethernet/intel/e1000e/ptp.c | 13 ++++++++++---

 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c

index 37c76945ad9b..e1f821edbc21 100644

--- a/drivers/net/ethernet/intel/e1000e/ptp.c

+++ b/drivers/net/ethernet/intel/e1000e/ptp.c

@@ -173,10 +173,14 @@ static int e1000e_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)

 	struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter,

 						     ptp_clock_info);

 	unsigned long flags;

-	u64 ns;

+	u64 cycles, ns;

 	spin_lock_irqsave(&adapter->systim_lock, flags);

-	ns = timecounter_read(&adapter->tc);

+

+	/* Use timecounter_cyc2time() to allow non-monotonic SYSTIM readings */

+	cycles = adapter->cc.read(&adapter->cc);

+	ns = timecounter_cyc2time(&adapter->tc, cycles);

+

 	spin_unlock_irqrestore(&adapter->systim_lock, flags);

 	*ts = ns_to_timespec64(ns);

@@ -232,9 +236,12 @@ static void e1000e_systim_overflow_work(struct work_struct *work)

 						     systim_overflow_work.work);

 	struct e1000_hw *hw = &adapter->hw;

 	struct timespec64 ts;

+	u64 ns;

-	adapter->ptp_clock_info.gettime64(&adapter->ptp_clock_info, &ts);

+	/* Update the timecounter */

+	ns = timecounter_read(&adapter->tc);

+	ts = ns_to_timespec64(ns);

 	e_dbg("SYSTIM overflow check at %lld.%09lu\n",

 	      (long long) ts.tv_sec, ts.tv_nsec);

-- 

cgit 1.2-0.3.lf.el7

From 49dd86f0f5ece4e7addc0f8db5e75a2fb404ede6 Mon Sep 17 00:00:00 2001

From: Florian Fainelli <f.fainelli@gmail.com>

Date: Thu, 21 Feb 2019 20:09:28 -0800

Subject: e1000e: Fix -Wformat-truncation warnings

[ Upstream commit 135e7245479addc6b1f5d031e3d7e2ddb3d2b109 ]

Provide precision hints to snprintf() since we know the destination

buffer size of the RX/TX ring names are IFNAMSIZ + 5 - 1. This fixes the

following warnings:

drivers/net/ethernet/intel/e1000e/netdev.c: In function

'e1000_request_msix':

drivers/net/ethernet/intel/e1000e/netdev.c:2109:13: warning: 'snprintf'

output may be truncated before the last format character

[-Wformat-truncation=]

     "%s-rx-0", netdev->name);

             ^

drivers/net/ethernet/intel/e1000e/netdev.c:2107:3: note: 'snprintf'

output between 6 and 21 bytes into a destination of size 20

   snprintf(adapter->rx_ring->name,

   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

     sizeof(adapter->rx_ring->name) - 1,

     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

     "%s-rx-0", netdev->name);

     ~~~~~~~~~~~~~~~~~~~~~~~~

drivers/net/ethernet/intel/e1000e/netdev.c:2125:13: warning: 'snprintf'

output may be truncated before the last format character

[-Wformat-truncation=]

     "%s-tx-0", netdev->name);

             ^

drivers/net/ethernet/intel/e1000e/netdev.c:2123:3: note: 'snprintf'

output between 6 and 21 bytes into a destination of size 20

   snprintf(adapter->tx_ring->name,

   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

     sizeof(adapter->tx_ring->name) - 1,

     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

     "%s-tx-0", netdev->name);

     ~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---

 drivers/net/ethernet/intel/e1000e/netdev.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c

index 3ba0c90e7055..e3945469b5c8 100644

--- a/drivers/net/ethernet/intel/e1000e/netdev.c

+++ b/drivers/net/ethernet/intel/e1000e/netdev.c

@@ -2106,7 +2106,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)

 	if (strlen(netdev->name) < (IFNAMSIZ - 5))

 		snprintf(adapter->rx_ring->name,

 			 sizeof(adapter->rx_ring->name) - 1,

-			 "%s-rx-0", netdev->name);

+			 "%.14s-rx-0", netdev->name);

 	else

 		memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);

 	err = request_irq(adapter->msix_entries[vector].vector,

@@ -2122,7 +2122,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)

 	if (strlen(netdev->name) < (IFNAMSIZ - 5))

 		snprintf(adapter->tx_ring->name,

 			 sizeof(adapter->tx_ring->name) - 1,

-			 "%s-tx-0", netdev->name);

+			 "%.14s-tx-0", netdev->name);

 	else

 		memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);

 	err = request_irq(adapter->msix_entries[vector].vector,

-- 

cgit 1.2-0.3.lf.el7

From b9f257e27890c462cc07c3e6d4fa7509730ea396 Mon Sep 17 00:00:00 2001

From: Kai-Heng Feng <kai.heng.feng@canonical.com>

Date: Tue, 11 Dec 2018 15:59:37 +0800

Subject: e1000e: Exclude device from suspend direct complete optimization

[ Upstream commit 59f58708c5047289589cbf6ee95146b76cf57d1e ]

e1000e sets different WoL settings in system suspend callback and

runtime suspend callback.

The suspend direct complete optimization leaves e1000e in runtime

suspended state with wrong WoL setting during system suspend.

To fix this, we need to disable suspend direct complete optimization to

let e1000e always use suspend callback to set correct WoL during system

suspend.

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---

 drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c

index 23edc1364487..8b11682ebba2 100644

--- a/drivers/net/ethernet/intel/e1000e/netdev.c

+++ b/drivers/net/ethernet/intel/e1000e/netdev.c

@@ -7327,6 +7327,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	e1000_print_device_info(adapter);

+	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);

+

 	if (pci_dev_run_wake(pdev))

 		pm_runtime_put_noidle(&pdev->dev);

-- 

cgit 1.2-0.3.lf.el7

From 5ec9ba494db252d8a5baaed4fdaf5b4bbbc201dd Mon Sep 17 00:00:00 2001

From: Kai-Heng Feng <kai.heng.feng@canonical.com>

Date: Sun, 3 Feb 2019 01:40:16 +0800

Subject: e1000e: Disable runtime PM on CNP+

[ Upstream commit 459d69c407f9ba122f12216555c3012284dc9fd7 ]

There are some new e1000e devices can only be woken up from D3 one time,

by plugging Ethernet cable. Subsequent cable plugging does set PME bit

correctly, but it still doesn't get woken up.

Since e1000e connects to the root complex directly, we rely on ACPI to

wake it up. In this case, the GPE from _PRW only works once and stops

working after that. Though it appears to be a platform bug, e1000e

maintainers confirmed that I219 does not support D3.

So disable runtime PM on CNP+ chips. We may need to disable earlier

generations if this bug also hit older platforms.

Bugzilla: https://bugzilla.kernel.org/attachment.cgi?id=280819

Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Sasha Levin <sashal@kernel.org>

---

 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c

index 8b11682ebba2..8cd339c92c1a 100644

--- a/drivers/net/ethernet/intel/e1000e/netdev.c

+++ b/drivers/net/ethernet/intel/e1000e/netdev.c

@@ -7329,7 +7329,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

 	dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);

-	if (pci_dev_run_wake(pdev))

+	if (pci_dev_run_wake(pdev) && hw->mac.type < e1000_pch_cnp)

 		pm_runtime_put_noidle(&pdev->dev);

 	return 0;

-- 

cgit 1.2-0.3.lf.el7

From 8cff6598b3c03936022dc3998274dba43567cc05 Mon Sep 17 00:00:00 2001

From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

Date: Wed, 17 Apr 2019 11:13:20 +0300

Subject: e1000e: start network tx queue only when link is up

commit d17ba0f616a08f597d9348c372d89b8c0405ccf3 upstream.

Driver does not want to keep packets in Tx queue when link is lost.

But present code only reset NIC to flush them, but does not prevent

queuing new packets. Moreover reset sequence itself could generate

new packets via netconsole and NIC falls into endless reset loop.

This patch wakes Tx queue only when NIC is ready to send packets.

This is proper fix for problem addressed by commit 0f9e980bf5ee

("e1000e: fix cyclic resets at link up with active tx").

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>

Tested-by: Joseph Yasi <joe.yasi@gmail.com>

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

Tested-by: Oleksandr Natalenko <oleksandr@redhat.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---

 drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c

index 31ef42a031f2..a7b5a47ab83d 100644

--- a/drivers/net/ethernet/intel/e1000e/netdev.c

+++ b/drivers/net/ethernet/intel/e1000e/netdev.c

@@ -4208,7 +4208,7 @@ void e1000e_up(struct e1000_adapter *adapter)

 		e1000_configure_msix(adapter);

 	e1000_irq_enable(adapter);

-	netif_start_queue(adapter->netdev);

+	/* Tx queue started by watchdog timer when link is up */

 	e1000e_trigger_lsc(adapter);

 }

@@ -4584,6 +4584,7 @@ int e1000e_open(struct net_device *netdev)

 	pm_runtime_get_sync(&pdev->dev);

 	netif_carrier_off(netdev);

+	netif_stop_queue(netdev);

 	/* allocate transmit descriptors */

 	err = e1000e_setup_tx_resources(adapter->tx_ring);

@@ -4644,7 +4645,6 @@ int e1000e_open(struct net_device *netdev)

 	e1000_irq_enable(adapter);

 	adapter->tx_hang_recheck = false;

-	netif_start_queue(netdev);

 	hw->mac.get_link_status = true;

 	pm_runtime_put(&pdev->dev);

@@ -5266,6 +5266,7 @@ static void e1000_watchdog_task(struct work_struct *work)

 			if (phy->ops.cfg_on_link_up)

 				phy->ops.cfg_on_link_up(hw);

+			netif_wake_queue(netdev);

 			netif_carrier_on(netdev);

 			if (!test_bit(__E1000_DOWN, &adapter->state))

@@ -5279,6 +5280,7 @@ static void e1000_watchdog_task(struct work_struct *work)

 			/* Link status message must follow this format */

 			pr_info("%s NIC Link is Down\n", adapter->netdev->name);

 			netif_carrier_off(netdev);

+			netif_stop_queue(netdev);

 			if (!test_bit(__E1000_DOWN, &adapter->state))

 				mod_timer(&adapter->phy_info_timer,

 					  round_jiffies(jiffies + 2 * HZ));

-- 

cgit 1.2-0.3.lf.el7