4.9-stable patches

added patches:
	pci-add-defines-for-normal-and-subtractive-pci-bridges.patch

diff --git a/queue-4.9/pci-add-defines-for-normal-and-subtractive-pci-bridges.patch b/queue-4.9/pci-add-defines-for-normal-and-subtractive-pci-bridges.patch
new file mode 100644 (file)
index 0000000..1bfa04d
--- /dev/null
+++ b/queue-4.9/pci-add-defines-for-normal-and-subtractive-pci-bridges.patch
@@ -0,0 +1,43 @@
+From 904b10fb189cc15376e9bfce1ef0282e68b0b004 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
+Date: Mon, 14 Feb 2022 12:41:08 +0100
+Subject: PCI: Add defines for normal and subtractive PCI bridges
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Pali Rohár <pali@kernel.org>
+
+commit 904b10fb189cc15376e9bfce1ef0282e68b0b004 upstream.
+
+Add these PCI class codes to pci_ids.h:
+
+  PCI_CLASS_BRIDGE_PCI_NORMAL
+  PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE
+
+Use these defines in all kernel code for describing PCI class codes for
+normal and subtractive PCI bridges.
+
+[bhelgaas: similar change in pci-mvebu.c]
+Link: https://lore.kernel.org/r/20220214114109.26809-1-pali@kernel.org
+Signed-off-by: Pali Rohár <pali@kernel.org>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Cc: Guenter Roeck <linux@roeck-us.net>a
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+[ gregkh - take only the pci_ids.h portion for stable backports ]
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/pci_ids.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -55,6 +55,8 @@
+ #define PCI_CLASS_BRIDGE_EISA         0x0602
+ #define PCI_CLASS_BRIDGE_MC           0x0603
+ #define PCI_CLASS_BRIDGE_PCI          0x0604
++#define PCI_CLASS_BRIDGE_PCI_NORMAL           0x060400
++#define PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE      0x060401
+ #define PCI_CLASS_BRIDGE_PCMCIA               0x0605
+ #define PCI_CLASS_BRIDGE_NUBUS                0x0606
+ #define PCI_CLASS_BRIDGE_CARDBUS      0x0607

diff --git a/queue-4.9/series b/queue-4.9/series
index 13ec8cb4a90ebf5e623f7f94828120ff72dbb20a..092eddd6cc075b2bc3d20500fc72ba20589c7602 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -39,6 +39,7 @@ fuse-limit-nsec.patch
 md-raid10-fix-kasan-warning.patch
 mbcache-don-t-reclaim-used-entries.patch
 ia64-processor-fix-wincompatible-pointer-types-in-ia64_get_irr.patch
+pci-add-defines-for-normal-and-subtractive-pci-bridges.patch
 powerpc-fsl-pci-fix-class-code-of-pcie-root-port.patch
 powerpc-powernv-avoid-crashing-if-rng-is-null.patch
 mips-cpuinfo-fix-a-warning-for-config_cpumask_offstack.patch