summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.h
diff options
context:
space:
mode:
authorWayne Boyer <wayneb@linux.vnet.ibm.com>2009-06-17 09:55:35 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-21 10:52:47 -0500
commit1be7bd82bf4c5d9d3efd1de0e2ebe2c5b1db8340 (patch)
tree119d8afd7e8168626faee5332788c2b75fce261f /drivers/scsi/ipr.h
parent95fecd90397ec1f85eb31ede955d846a86d2077b (diff)
downloadlinux-1be7bd82bf4c5d9d3efd1de0e2ebe2c5b1db8340.tar.gz
linux-1be7bd82bf4c5d9d3efd1de0e2ebe2c5b1db8340.tar.bz2
linux-1be7bd82bf4c5d9d3efd1de0e2ebe2c5b1db8340.zip
ipr: differentiate pci-x and pci-e based adapters
MSI has only been tested on and known to work with PCI-E based adapters. This patch adds a field to struct ipr_chip_t to indicate which type of interrupt to use based on what is known about the chip. Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com> Acked-by: Brian King <brking@linux.vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r--drivers/scsi/ipr.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 2d9269b26f88..4b63dd6b1c81 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1025,6 +1025,9 @@ struct ipr_chip_cfg_t {
struct ipr_chip_t {
u16 vendor;
u16 device;
+ u16 intr_type;
+#define IPR_USE_LSI 0x00
+#define IPR_USE_MSI 0x01
const struct ipr_chip_cfg_t *cfg;
};
@@ -1160,6 +1163,7 @@ struct ipr_ioa_cfg {
unsigned int transop_timeout;
const struct ipr_chip_cfg_t *chip_cfg;
+ const struct ipr_chip_t *ipr_chip;
void __iomem *hdw_dma_regs; /* iomapped PCI memory space */
unsigned long hdw_dma_regs_pci; /* raw PCI memory space */