forked from rpms/kernel
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
|
From ae2a3882e8ea0ef04ed2c0e29d8b725d19dfafd6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||
|
|
Date: Sat, 16 Mar 2024 14:09:29 -0400
|
||
|
|
Subject: [PATCH 5/6] Bring back deprecated pci ids to hpsa driver
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/scsi/hpsa.c | 12 +++++++++---
|
||
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
|
||
|
|
index db7e1af75..cc592f8f9 100644
|
||
|
|
--- a/drivers/scsi/hpsa.c
|
||
|
|
+++ b/drivers/scsi/hpsa.c
|
||
|
|
@@ -91,6 +91,11 @@ MODULE_PARM_DESC(hpsa_simple_mode,
|
||
|
|
|
||
|
|
/* define the PCI info for the cards we can control */
|
||
|
|
static const struct pci_device_id hpsa_pci_device_id[] = {
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3223},
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3234},
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3235},
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x3237},
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSC, 0x103C, 0x323D},
|
||
|
|
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3241},
|
||
|
|
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3243},
|
||
|
|
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3245},
|
||
|
|
@@ -144,6 +149,10 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
|
||
|
|
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
|
||
|
|
{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
|
||
|
|
{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
|
||
|
|
+ {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
|
||
|
|
+ PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
|
||
|
|
+ {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
|
||
|
|
+ PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
|
||
|
|
{0,}
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -8652,9 +8661,6 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||
|
|
unsigned long flags;
|
||
|
|
u32 board_id;
|
||
|
|
|
||
|
|
-#ifdef CONFIG_RHEL_DIFFERENCES
|
||
|
|
- pci_hw_deprecated(hpsa_pci_device_id, pdev);
|
||
|
|
-#endif
|
||
|
|
|
||
|
|
if (number_of_controllers == 0)
|
||
|
|
printk(KERN_INFO DRIVER_NAME "\n");
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|