Fixes for 4.14

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

diff --git a/queue-4.14/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch b/queue-4.14/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch
new file mode 100644 (file)
index 0000000..c636c81
--- /dev/null
+++ b/queue-4.14/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch
@@ -0,0 +1,57 @@
+From 5233ce4f073198c7cfce4483f72254448bde2239 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 22 Jun 2021 17:35:18 +0200
+Subject: Revert "PCI: PM: Do not read power state in
+ pci_enable_device_flags()"
+
+From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+
+[ Upstream commit 4d6035f9bf4ea12776322746a216e856dfe46698 ]
+
+Revert commit 4514d991d992 ("PCI: PM: Do not read power state in
+pci_enable_device_flags()") that is reported to cause PCI device
+initialization issues on some systems.
+
+BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=213481
+Link: https://lore.kernel.org/linux-acpi/YNDoGICcg0V8HhpQ@eldamar.lan
+Reported-by: Michael <phyre@rogers.com>
+Reported-by: Salvatore Bonaccorso <carnil@debian.org>
+Fixes: 4514d991d992 ("PCI: PM: Do not read power state in pci_enable_device_flags()")
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/pci/pci.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
+index 1993e5e28ea7..c847b5554db6 100644
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
+@@ -1378,11 +1378,21 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
+       int err;
+       int i, bars = 0;
+ 
+-      if (atomic_inc_return(&dev->enable_cnt) > 1) {
+-              pci_update_current_state(dev, dev->current_state);
+-              return 0;               /* already enabled */
++      /*
++       * Power state could be unknown at this point, either due to a fresh
++       * boot or a device removal call.  So get the current power state
++       * so that things like MSI message writing will behave as expected
++       * (e.g. if the device really is in D0 at enable time).
++       */
++      if (dev->pm_cap) {
++              u16 pmcsr;
++              pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
++              dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
+       }
+ 
++      if (atomic_inc_return(&dev->enable_cnt) > 1)
++              return 0;               /* already enabled */
++
+       bridge = pci_upstream_bridge(dev);
+       if (bridge)
+               pci_enable_bridge(bridge);
+-- 
+2.30.2
+

diff --git a/queue-4.14/series b/queue-4.14/series
index d4184f254352a773a951a71ac0950d9e5e7556f4..b5864110ad48808b88f2b45976e909eebb550da4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -68,3 +68,4 @@ arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch
 makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch
 mips-generic-update-node-names-to-avoid-unit-addresses.patch
 arm64-perf-disable-pmu-while-processing-counter-overflows.patch
+revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch