From bc8b045b57a9af2a2a5081ab14f642b629a0406a Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Apr 03 2023 10:41:44 +0000
Subject: scsi: smartpqi: Add new controller PCI IDs (bsc#1207315).


---

diff --git a/patches.suse/scsi-smartpqi-Add-new-controller-PCI-IDs.patch b/patches.suse/scsi-smartpqi-Add-new-controller-PCI-IDs.patch
new file mode 100644
index 0000000..e43852c
--- /dev/null
+++ b/patches.suse/scsi-smartpqi-Add-new-controller-PCI-IDs.patch
@@ -0,0 +1,127 @@
+From: Mike McGowen <mike.mcgowen@microchip.com>
+Date: Tue, 8 Nov 2022 13:21:43 -0600
+Subject: scsi: smartpqi: Add new controller PCI IDs
+Patch-mainline: v6.2-rc1
+Git-commit: 0b93cf2a9097b1c3d75642ef878ba87f15f03043
+References: bsc#1207315
+
+All PCI ID entries in Hex.
+Add PCI IDs for ByteDance controllers:
+                                            VID  / DID  / SVID / SDID
+                                            ----   ----   ----   ----
+    ByteHBA JGH43024-8                      9005 / 028f / 1e93 / 1000
+    ByteHBA JGH43034-8                      9005 / 028f / 1e93 / 1001
+    ByteHBA JGH44014-8                      9005 / 028f / 1e93 / 1002
+
+Add PCI IDs for new Inspur controllers:
+                                            VID  / DID  / SVID / SDID
+                                            ----   ----   ----   ----
+    INSPUR RT0800M7E                        9005 / 028f / 1bd4 / 0086
+    INSPUR RT0800M7H                        9005 / 028f / 1bd4 / 0087
+    INSPUR RT0804M7R                        9005 / 028f / 1bd4 / 0088
+    INSPUR RT0808M7R                        9005 / 028f / 1bd4 / 0089
+
+Add PCI IDs for new FAB A controllers:
+                                            VID  / DID  / SVID / SDID
+                                            ----   ----   ----   ----
+    Adaptec SmartRAID 3254-16e /e           9005 / 028f / 9005 / 1475
+    Adaptec HBA 1200-16e                    9005 / 028f / 9005 / 14c3
+    Adaptec HBA 1200-8e                     9005 / 028f / 9005 / 14c4
+
+Add H3C controller PCI IDs:
+                                            VID  / DID  / SVID / SDID
+                                            ----   ----   ----   ----
+    H3C H4508-Mf-8i                         9005 / 028f / 193d / 110b
+
+Reviewed-by: Scott Benesh <scott.benesh@microchip.com>
+Reviewed-by: Scott Teel <scott.teel@microchip.com>
+Signed-off-by: Mike McGowen <mike.mcgowen@microchip.com>
+Signed-off-by: Don Brace <don.brace@microchip.com>
+Link: https://lore.kernel.org/r/166793530327.322537.6056884426657539311.stgit@brunhilda
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Martin Wilck <mwilck@suse.com>
+---
+ drivers/scsi/smartpqi/smartpqi_init.c |   44 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+
+--- a/drivers/scsi/smartpqi/smartpqi_init.c
++++ b/drivers/scsi/smartpqi/smartpqi_init.c
+@@ -9322,6 +9322,10 @@ static const struct pci_device_id pqi_pc
+ 	},
+ 	{
+ 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       0x193d, 0x110b)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+ 			       0x193d, 0x8460)
+ 	},
+ 	{
+@@ -9422,6 +9426,22 @@ static const struct pci_device_id pqi_pc
+ 	},
+ 	{
+ 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       0x1bd4, 0x0086)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       0x1bd4, 0x0087)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       0x1bd4, 0x0088)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       0x1bd4, 0x0089)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+ 			       0x19e5, 0xd227)
+ 	},
+ 	{
+@@ -9670,6 +9690,10 @@ static const struct pci_device_id pqi_pc
+ 	},
+ 	{
+ 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       PCI_VENDOR_ID_ADAPTEC2, 0x1475)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+ 			       PCI_VENDOR_ID_ADAPTEC2, 0x1480)
+ 	},
+ 	{
+@@ -9726,6 +9750,14 @@ static const struct pci_device_id pqi_pc
+ 	},
+ 	{
+ 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       PCI_VENDOR_ID_ADAPTEC2, 0x14c3)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++			       PCI_VENDOR_ID_ADAPTEC2, 0x14c4)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+ 			       PCI_VENDOR_ID_ADAPTEC2, 0x14d0)
+ 	},
+ 	{
+@@ -9962,6 +9994,18 @@ static const struct pci_device_id pqi_pc
+ 	},
+ 	{
+ 		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++				0x1e93, 0x1000)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++				0x1e93, 0x1001)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
++				0x1e93, 0x1002)
++	},
++	{
++		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
+ 			       PCI_ANY_ID, PCI_ANY_ID)
+ 	},
+ 	{ 0 }
diff --git a/series.conf b/series.conf
index f2823e1..934f654 100644
--- a/series.conf
+++ b/series.conf
@@ -36432,6 +36432,7 @@
 	patches.suse/scsi-qla2xxx-Remove-unused-variable-found_devs.patch
 	patches.suse/scsi-lpfc-Remove-redundant-pointer-lp.patch
 	patches.suse/scsi-smartpqi-Convert-to-host_tagset.patch
+	patches.suse/scsi-smartpqi-Add-new-controller-PCI-IDs.patch
 	patches.suse/scsi-scsi_debug-Fix-a-warning-in-resp_write_scat.patch
 	patches.suse/scsi-lpfc-Use-memset_startat-helper.patch
 	patches.suse/scsi-lpfc-Fix-WQ-CQ-EQ-resource-check.patch