From: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> lpfc: Add new messaging Bugzilla: https://bugzilla.redhat.com/2039068 Upstream Status: RHEL only commit b5244176b671a54e03b97ff41236492f0c311b9f Author: Ewan D. Milne <emilne@xxxxxxxxxx> Date: Tue Jan 11 12:26:55 2022 -0500 lpfc: Add new messaging Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2039068 Upstream Status: RHEL-only New messages based on input from BU and RH Engineering. Signed-off-by: Ewan D. Milne <emilne@xxxxxxxxxx> Signed-off-by: Peter Georg <peter.georg@xxxxxxxxxxxxxxxxxxxxxxxx> diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h index blahblah..blahblah 100644 --- a/drivers/scsi/lpfc/lpfc_ids.h +++ b/drivers/scsi/lpfc/lpfc_ids.h @@ -140,3 +140,29 @@ const struct pci_device_id lpfc_id_table[] = { PCI_ANY_ID, PCI_ANY_ID, }, { 0 } }; + +#ifdef CONFIG_RHEL_DIFFERENCES +static const struct pci_device_id rh_deprecated_pci_table[] = { + { 0 } +}; + +static const struct pci_device_id rh_unmaintained_pci_table[] = { + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SKYHAWK, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB, + PCI_ANY_ID, PCI_ANY_ID, }, + {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S, + PCI_ANY_ID, PCI_ANY_ID, }, + { 0 } +}; + +static const struct pci_device_id rh_disabled_pci_table[] = { + { 0 } +}; +#endif diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index blahblah..blahblah 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -15283,6 +15283,14 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) int rc; struct lpfc_sli_intf intf; +#ifdef CONFIG_RHEL_DIFFERENCES + if (pci_hw_disabled(rh_disabled_pci_table, pdev)) + return -ENODEV; + + pci_hw_deprecated(rh_deprecated_pci_table, pdev); + pci_hw_unmaintained(rh_unmaintained_pci_table, pdev); +#endif + if (pci_read_config_dword(pdev, LPFC_SLI_INTF, &intf.word0)) return -ENODEV; -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1610 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
