scsi: arcmsr: Support new PCI device IDs 1883 and 1886

[ Upstream commit 41c8a1a1e90fa4721f856bf3cf71211fd16d6434 ]

Add support for Areca RAID controllers with PCI device IDs 1883 and 1886.

Signed-off-by: ching Huang <ching2048@areca.com.tw>
Link: https://lore.kernel.org/r/7732e743eaad57681b1552eec9c6a86c76dbe459.camel@areca.com.tw
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
index 5d054d5c70a59e82c5d6e51f405ab7037f589c6a..f2e587e66e19dad62254e120bd15dfa41b723086 100644 (file)
--- a/drivers/scsi/arcmsr/arcmsr.h
+++ b/drivers/scsi/arcmsr/arcmsr.h
@@ -77,9 +77,13 @@ struct device_attribute;
 #ifndef PCI_DEVICE_ID_ARECA_1203
 #define PCI_DEVICE_ID_ARECA_1203       0x1203
 #endif
+#ifndef PCI_DEVICE_ID_ARECA_1883
+#define PCI_DEVICE_ID_ARECA_1883       0x1883
+#endif
 #ifndef PCI_DEVICE_ID_ARECA_1884
 #define PCI_DEVICE_ID_ARECA_1884       0x1884
 #endif
+#define PCI_DEVICE_ID_ARECA_1886_0     0x1886
 #define PCI_DEVICE_ID_ARECA_1886       0x188A
 #define        ARCMSR_HOURS                    (1000 * 60 * 60 * 4)
 #define        ARCMSR_MINUTES                  (1000 * 60 * 60)

diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 9294a2c677b3ef9146c3d103313d936fe71e07d6..199b102f31a24d5577552895b9c9406211eabb07 100644 (file)
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -208,8 +208,12 @@ static struct pci_device_id arcmsr_device_id_table[] = {
                .driver_data = ACB_ADAPTER_TYPE_A},
        {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1880),
                .driver_data = ACB_ADAPTER_TYPE_C},
+       {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1883),
+               .driver_data = ACB_ADAPTER_TYPE_C},
        {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1884),
                .driver_data = ACB_ADAPTER_TYPE_E},
+       {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1886_0),
+               .driver_data = ACB_ADAPTER_TYPE_F},
        {PCI_DEVICE(PCI_VENDOR_ID_ARECA, PCI_DEVICE_ID_ARECA_1886),
                .driver_data = ACB_ADAPTER_TYPE_F},
        {0, 0}, /* Terminating entry */
@@ -4701,9 +4705,11 @@ static const char *arcmsr_info(struct Scsi_Host *host)
        case PCI_DEVICE_ID_ARECA_1680:
        case PCI_DEVICE_ID_ARECA_1681:
        case PCI_DEVICE_ID_ARECA_1880:
+       case PCI_DEVICE_ID_ARECA_1883:
        case PCI_DEVICE_ID_ARECA_1884:
                type = "SAS/SATA";
                break;
+       case PCI_DEVICE_ID_ARECA_1886_0:
        case PCI_DEVICE_ID_ARECA_1886:
                type = "NVMe/SAS/SATA";
                break;