summaryrefslogtreecommitdiffstats
path: root/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.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-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.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-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch')
-rw-r--r--0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch
new file mode 100644
index 000000000..af550ec64
--- /dev/null
+++ b/0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch
@@ -0,0 +1,56 @@
+From 887f53d23da5b992e6c1e41ab96690f9339db19c Mon Sep 17 00:00:00 2001
+From: Chad Dupuis <cdupuis@redhat.com>
+Date: Thu, 2 Jan 2020 14:24:39 -0500
+Subject: [PATCH] qla4xxx: Remove deprecated PCI IDs from RHEL 8
+
+Message-id: <1524063895-23086-1-git-send-email-cdupuis@redhat.com>
+Patchwork-id: 209742
+O-Subject: [RHEL 8 e-stor PATCH] qla4xxx: Remove depricated PCI IDs from RHEL 8.
+Bugzilla: 1518874
+RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
+RH-Acked-by: Jarod Wilson <jarod@redhat.com>
+
+Bugzilla: 1518874
+
+RHEL 8 specific
+
+Brew build: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID822250
+
+Three PCI device IDs are marked as deprecated in RHEL 7:
+
+PCI_DEVICE_ID_QLOGIC_ISP8022
+PCI_DEVICE_ID_QLOGIC_ISP8324
+PCI_DEVICE_ID_QLOGIC_ISP8042
+
+This patch removes them from the PCI table in RHEL 8 so the
+qla4xxx driver will not bind to the hardware.
+
+Upstream Status: RHEL only
+Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
+---
+ drivers/scsi/qla4xxx/ql4_os.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
+index 5504ab11decc..e83771818767 100644
+--- a/drivers/scsi/qla4xxx/ql4_os.c
++++ b/drivers/scsi/qla4xxx/ql4_os.c
+@@ -9842,6 +9842,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ },
++#ifndef CONFIG_RHEL_DIFFERENCES
+ {
+ .vendor = PCI_VENDOR_ID_QLOGIC,
+ .device = PCI_DEVICE_ID_QLOGIC_ISP8022,
+@@ -9860,6 +9861,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ },
++#endif
+ {0, 0},
+ };
+ MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
+--
+2.26.0
+