From: Sasha Levin Date: Fri, 25 Jun 2021 11:56:17 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v5.12.14~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16de1de027d787f3c4a3f6194a200cec759321bd;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch b/queue-4.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch new file mode 100644 index 00000000000..863bade19bb --- /dev/null +++ b/queue-4.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch @@ -0,0 +1,57 @@ +From 3632d8f9dfd261552e00bed061dc4be313e03e1c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +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 + +[ 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 +Reported-by: Salvatore Bonaccorso +Fixes: 4514d991d992 ("PCI: PM: Do not read power state in pci_enable_device_flags()") +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + 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 22e8172f373d..b7f65fc54dc2 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -1328,11 +1328,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.4/series b/queue-4.4/series index 040d0bccdac..8525ad5d85a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -42,3 +42,4 @@ x86-fpu-reset-state-for-all-signal-restore-failures.patch inet-use-bigger-hash-table-for-ip-id-generation.patch arm-9081-1-fix-gcc-10-thumb2-kernel-regression.patch makefile-move-wno-unused-but-set-variable-out-of-gcc-only-block.patch +revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch