Fixes for 5.4

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

diff --git a/queue-5.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch b/queue-5.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch
new file mode 100644 (file)
index 0000000..815f213
--- /dev/null
+++ b/queue-5.4/revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch
@@ -0,0 +1,57 @@
+From 4a3747fd30d18caf5da6b9dfe52bd0151135ba65 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 34a06e89e176..3c3bc9f58498 100644
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
+@@ -1666,11 +1666,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-5.4/series b/queue-5.4/series
index f61133b5d32515565b7da6e12aaf7f184b9f629a..5154d9e66230af4c925b01be8181a8ccb1771ba6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -8,3 +8,5 @@ mmc-meson-gx-use-memcpy_to-fromio-for-dram-access-quirk.patch
 kbuild-add-config_ld_is_lld.patch
 arm64-link-with-z-norelro-for-lld-or-aarch64-elf.patch
 mips-generic-update-node-names-to-avoid-unit-addresses.patch
+spi-spi-nxp-fspi-move-the-register-operation-after-t.patch
+revert-pci-pm-do-not-read-power-state-in-pci_enable_.patch

diff --git a/queue-5.4/spi-spi-nxp-fspi-move-the-register-operation-after-t.patch b/queue-5.4/spi-spi-nxp-fspi-move-the-register-operation-after-t.patch
new file mode 100644 (file)
index 0000000..6de6fb6
--- /dev/null
+++ b/queue-5.4/spi-spi-nxp-fspi-move-the-register-operation-after-t.patch
@@ -0,0 +1,53 @@
+From 3ac8e00abffc6916b1ce7346d83b455c75355289 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 10 Jun 2021 17:24:33 +0800
+Subject: spi: spi-nxp-fspi: move the register operation after the clock enable
+
+From: Haibo Chen <haibo.chen@nxp.com>
+
+[ Upstream commit f422316c8e9d3c4aff3c56549dfb44a677d02f14 ]
+
+Move the register operation after the clock enable, otherwise system
+will stuck when this driver probe.
+
+Fixes: 71d80563b076 ("spi: spi-nxp-fspi: fix fspi panic by unexpected interrupts")
+Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
+Link: https://lore.kernel.org/r/1623317073-25158-1-git-send-email-haibo.chen@nxp.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/spi/spi-nxp-fspi.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c
+index efd9e908e224..36a44a837031 100644
+--- a/drivers/spi/spi-nxp-fspi.c
++++ b/drivers/spi/spi-nxp-fspi.c
+@@ -975,12 +975,6 @@ static int nxp_fspi_probe(struct platform_device *pdev)
+               goto err_put_ctrl;
+       }
+ 
+-      /* Clear potential interrupts */
+-      reg = fspi_readl(f, f->iobase + FSPI_INTR);
+-      if (reg)
+-              fspi_writel(f, reg, f->iobase + FSPI_INTR);
+-
+-
+       /* find the resources - controller memory mapped space */
+       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap");
+       f->ahb_addr = devm_ioremap_resource(dev, res);
+@@ -1012,6 +1006,11 @@ static int nxp_fspi_probe(struct platform_device *pdev)
+               goto err_put_ctrl;
+       }
+ 
++      /* Clear potential interrupts */
++      reg = fspi_readl(f, f->iobase + FSPI_INTR);
++      if (reg)
++              fspi_writel(f, reg, f->iobase + FSPI_INTR);
++
+       /* find the irq */
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0)
+-- 
+2.30.2
+