5.15-stable patches

added patches:
	pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch
	pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch

diff --git a/queue-5.15/pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch b/queue-5.15/pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch
new file mode 100644 (file)
index 0000000..2625a88
--- /dev/null
+++ b/queue-5.15/pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch
@@ -0,0 +1,38 @@
+From f21082fb20dbfb3e42b769b59ef21c2a7f2c7c1f Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <maz@kernel.org>
+Date: Thu, 4 Nov 2021 18:01:30 +0000
+Subject: PCI: Add MSI masking quirk for Nvidia ION AHCI
+
+From: Marc Zyngier <maz@kernel.org>
+
+commit f21082fb20dbfb3e42b769b59ef21c2a7f2c7c1f upstream.
+
+The ION AHCI device pretends that MSI masking isn't a thing, while it
+actually implements it and needs MSIs to be unmasked to work. Add a quirk
+to that effect.
+
+Reported-by: Rui Salvaterra <rsalvaterra@gmail.com>
+Signed-off-by: Marc Zyngier <maz@kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Rui Salvaterra <rsalvaterra@gmail.com>
+Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Bjorn Helgaas <helgaas@kernel.org>
+Link: https://lore.kernel.org/r/CALjTZvbzYfBuLB+H=fj2J+9=DxjQ2Uqcy0if_PvmJ-nU-qEgkg@mail.gmail.com
+Link: https://lore.kernel.org/r/20211104180130.3825416-3-maz@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pci/quirks.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/pci/quirks.c
++++ b/drivers/pci/quirks.c
+@@ -5796,3 +5796,9 @@ static void apex_pci_fixup_class(struct
+ }
+ DECLARE_PCI_FIXUP_CLASS_HEADER(0x1ac1, 0x089a,
+                              PCI_CLASS_NOT_DEFINED, 8, apex_pci_fixup_class);
++
++static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)
++{
++      pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
++}
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);

diff --git a/queue-5.15/pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch b/queue-5.15/pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch
new file mode 100644 (file)
index 0000000..49ed175
--- /dev/null
+++ b/queue-5.15/pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch
@@ -0,0 +1,51 @@
+From 2226667a145db2e1f314d7f57fd644fe69863ab9 Mon Sep 17 00:00:00 2001
+From: Marc Zyngier <maz@kernel.org>
+Date: Thu, 4 Nov 2021 18:01:29 +0000
+Subject: PCI/MSI: Deal with devices lying about their MSI mask capability
+
+From: Marc Zyngier <maz@kernel.org>
+
+commit 2226667a145db2e1f314d7f57fd644fe69863ab9 upstream.
+
+It appears that some devices are lying about their mask capability,
+pretending that they don't have it, while they actually do.
+The net result is that now that we don't enable MSIs on such
+endpoint.
+
+Add a new per-device flag to deal with this. Further patches will
+make use of it, sadly.
+
+Signed-off-by: Marc Zyngier <maz@kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
+Link: https://lore.kernel.org/r/20211104180130.3825416-2-maz@kernel.org
+Cc: Bjorn Helgaas <helgaas@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pci/msi.c   |    3 +++
+ include/linux/pci.h |    2 ++
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/pci/msi.c
++++ b/drivers/pci/msi.c
+@@ -477,6 +477,9 @@ msi_setup_entry(struct pci_dev *dev, int
+               goto out;
+ 
+       pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
++      /* Lies, damned lies, and MSIs */
++      if (dev->dev_flags & PCI_DEV_FLAGS_HAS_MSI_MASKING)
++              control |= PCI_MSI_FLAGS_MASKBIT;
+ 
+       entry->msi_attrib.is_msix       = 0;
+       entry->msi_attrib.is_64         = !!(control & PCI_MSI_FLAGS_64BIT);
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -233,6 +233,8 @@ enum pci_dev_flags {
+       PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
+       /* Don't use Relaxed Ordering for TLPs directed at this device */
+       PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
++      /* Device does honor MSI masking despite saying otherwise */
++      PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 << 12),
+ };
+ 
+ enum pci_irq_reroute_variant {

diff --git a/queue-5.15/series b/queue-5.15/series
index e746799279fb6850a51d7d4ee50c3be4167f2cb9..e236be94c490f5c804ce52cc59bffe076dbfc3f7 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -13,3 +13,5 @@ block-add-a-helper-to-validate-the-block-size.patch
 loop-use-blk_validate_block_size-to-validate-block-size.patch
 bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch
 parisc-entry-fix-trace-test-in-syscall-exit-path.patch
+pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch
+pci-add-msi-masking-quirk-for-nvidia-ion-ahci.patch