summaryrefslogtreecommitdiffstats
path: root/0001-mptsas-pci-id-table-changes.patch
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2020-04-23 16:47:21 -0400
committerJeremy Cline <jcline@redhat.com>2020-04-23 16:47:21 -0400
commitd1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (patch)
tree842b7a6410c2572bc8c1643196f83d2e19d80e1e /0001-mptsas-pci-id-table-changes.patch
parent4f478aae8055f932b9a8fdd88d93db6b9da5709e (diff)
downloadkernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.gz
kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.tar.xz
kernel-d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236.zip
kernel-5.7.0-0.rc2.20200423git7adc4b399952.1
* Thu Apr 23 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc2.20200423git7adc4b399952.1] - 7adc4b399952 rebase - Match template format in kernel.spec.template ("Justin M. Forbes") - Break out the Patches into individual files for dist-git ("Justin M. Forbes") - Break the Red Hat patch into individual commits (Jeremy Cline) - Adjust module filtering so CONFIG_DRM_DP_CEC can be set (Jeremy Cline) - Add a script to generate release tags and branches (Jeremy Cline) - Set CONFIG_VDPA for fedora ("Justin M. Forbes") - Provide defaults in ark-rebase-patches.sh (Jeremy Cline) - Default ark-rebase-patches.sh to not report issues (Jeremy Cline) Resolves: rhbz# Signed-off-by: Jeremy Cline <jcline@redhat.com>
Diffstat (limited to '0001-mptsas-pci-id-table-changes.patch')
-rw-r--r--0001-mptsas-pci-id-table-changes.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/0001-mptsas-pci-id-table-changes.patch b/0001-mptsas-pci-id-table-changes.patch
new file mode 100644
index 000000000..ed02cf9ad
--- /dev/null
+++ b/0001-mptsas-pci-id-table-changes.patch
@@ -0,0 +1,58 @@
+From 17b7b240a30ab7342db5e2853d13a41fb88bf2ee Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Thu, 2 Jan 2020 14:24:47 -0500
+Subject: [PATCH] mptsas: pci-id table changes
+
+Author: Tomas Henzl <thenzl@redhat.com>
+Date: Thu Jan 31 16:54:51 2019 -0500
+
+ [message] mptsas: pci-id table changes
+
+ Message-id: <20190131165452.7562-3-thenzl@redhat.com>
+ Patchwork-id: 239765
+ O-Subject: [RHEL8 e-stor 2/3] mptsas: pci-id table changes
+ Bugzilla: 1666730
+ RH-Acked-by: Jarod Wilson <jarod@redhat.com>
+ RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
+ RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
+
+ RHEL-only
+
+ We want to provide this driver only for the virtualisation use case,
+ so we remove all other entries from the pci-id table and add only the
+ single entry needed for virtualisation.
+
+ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
+
+Upstream Status: RHEL only
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ drivers/message/fusion/mptsas.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
+index c17614cd6ed8..ca44a35ec411 100644
+--- a/drivers/message/fusion/mptsas.c
++++ b/drivers/message/fusion/mptsas.c
+@@ -5358,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev)
+ }
+
+ static struct pci_device_id mptsas_pci_table[] = {
++#ifdef CONFIG_RHEL_DIFFERENCES
++ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
++ PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
++#else
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
+ PCI_ANY_ID, PCI_ANY_ID },
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
+@@ -5370,6 +5374,7 @@ static struct pci_device_id mptsas_pci_table[] = {
+ PCI_ANY_ID, PCI_ANY_ID },
+ { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
+ PCI_ANY_ID, PCI_ANY_ID },
++#endif
+ {0} /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
+--
+2.26.0
+