commit 5a7ede120625710f9198a19010b2a81421208a75 Author: Guillem Jover Date: Thu Sep 15 20:34:02 2011 +0200 Add support for LSI 53c895A SCSI controllers * linux/src/drivers/scsi/ncr53c8xx.c * linux/src/drivers/scsi/ncr53c8xx.h * linux/src/include/linux/pci.h diff --git a/linux/src/drivers/scsi/ncr53c8xx.c b/linux/src/drivers/scsi/ncr53c8xx.c index 1be3d9f..61d1450 100644 --- a/linux/src/drivers/scsi/ncr53c8xx.c +++ b/linux/src/drivers/scsi/ncr53c8xx.c @@ -9394,6 +9394,12 @@ static int ncr53c8xx_pci_init(Scsi_Host_Template *tpnt, base = (base & 0x00FFFFFF) | 0x01000000; pcibios_write_config_dword(bus, device_fn, PCI_BASE_ADDRESS_1, base); } +#else + if ((command & PCI_COMMAND_MASTER) != PCI_COMMAND_MASTER) { + printk("ncr53c8xx : setting PCI master command bit\n"); + command |= PCI_COMMAND_MASTER; + pcibios_write_config_word(bus, device_fn, PCI_COMMAND, command); + } #endif /* diff --git a/linux/src/drivers/scsi/ncr53c8xx.h b/linux/src/drivers/scsi/ncr53c8xx.h index cc009ca..2fa1e28 100644 --- a/linux/src/drivers/scsi/ncr53c8xx.h +++ b/linux/src/drivers/scsi/ncr53c8xx.h @@ -504,6 +504,9 @@ typedef struct { {PCI_DEVICE_ID_NCR_53C895, 0xff, "895", 7, 31, 7, \ FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM}\ , \ + {PCI_DEVICE_ID_LSI_53C895A, 0xff, "895a", 7, 31, 7, \ + FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM}\ + , \ {PCI_DEVICE_ID_NCR_53C896, 0xff, "896", 7, 31, 7, \ FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_BOF|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM}\ } @@ -522,6 +525,7 @@ typedef struct { PCI_DEVICE_ID_NCR_53C875J, \ PCI_DEVICE_ID_NCR_53C885, \ PCI_DEVICE_ID_NCR_53C895, \ + PCI_DEVICE_ID_LSI_53C895A, \ PCI_DEVICE_ID_NCR_53C896 \ } diff --git a/linux/src/include/linux/pci.h b/linux/src/include/linux/pci.h index 3508979..4e86be8 100644 --- a/linux/src/include/linux/pci.h +++ b/linux/src/include/linux/pci.h @@ -243,6 +243,7 @@ #define PCI_DEVICE_ID_NCR_53C895 0x000c #define PCI_DEVICE_ID_NCR_53C885 0x000d #define PCI_DEVICE_ID_NCR_53C875 0x000f +#define PCI_DEVICE_ID_LSI_53C895A 0x0012 #define PCI_DEVICE_ID_NCR_53C875J 0x008f #define PCI_VENDOR_ID_ATI 0x1002