aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMoore, Eric <Eric.Moore@lsil.com>2006-02-02 19:19:33 -0500
committer <jejb@mulgrave.il.steeleye.com>2006-02-04 17:31:29 -0500
commit9cc1cfbc67d77164f5b612fcf833460eca4d81e9 (patch)
treed2706627405b95fdfd22dcb14d2b9d06d9ac42c0 /drivers
parent096f7a2a094af3007937d6fd21560e28dca0994d (diff)
[SCSI] fusion - mptctl - adding support for bus_type=SAS
Add bus_type recognization in ioctl path for SAS. Signed-off-by: Eric Moore <Eric.Moore@lsil.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/message/fusion/mptctl.c8
-rw-r--r--drivers/message/fusion/mptctl.h4
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 70a812a2514d..1a1bc66c8e9c 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1145,7 +1145,9 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
1145 /* Fill in the data and return the structure to the calling 1145 /* Fill in the data and return the structure to the calling
1146 * program 1146 * program
1147 */ 1147 */
1148 if (ioc->bus_type == FC) 1148 if (ioc->bus_type == SAS)
1149 karg->adapterType = MPT_IOCTL_INTERFACE_SAS;
1150 else if (ioc->bus_type == FC)
1149 karg->adapterType = MPT_IOCTL_INTERFACE_FC; 1151 karg->adapterType = MPT_IOCTL_INTERFACE_FC;
1150 else 1152 else
1151 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI; 1153 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
@@ -2391,7 +2393,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
2391 2393
2392 karg.base_io_addr = pci_resource_start(pdev, 0); 2394 karg.base_io_addr = pci_resource_start(pdev, 0);
2393 2395
2394 if (ioc->bus_type == FC) 2396 if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
2395 karg.bus_phys_width = HP_BUS_WIDTH_UNK; 2397 karg.bus_phys_width = HP_BUS_WIDTH_UNK;
2396 else 2398 else
2397 karg.bus_phys_width = HP_BUS_WIDTH_16; 2399 karg.bus_phys_width = HP_BUS_WIDTH_16;
@@ -2480,7 +2482,7 @@ mptctl_hp_targetinfo(unsigned long arg)
2480 2482
2481 /* There is nothing to do for FCP parts. 2483 /* There is nothing to do for FCP parts.
2482 */ 2484 */
2483 if (ioc->bus_type == FC) 2485 if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
2484 return 0; 2486 return 0;
2485 2487
2486 if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL)) 2488 if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL))
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h
index 518996e03481..a2f8a97992e6 100644
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
@@ -169,8 +169,10 @@ struct mpt_ioctl_pci_info2 {
169 * Read only. 169 * Read only.
170 * Data starts at offset 0xC 170 * Data starts at offset 0xC
171 */ 171 */
172#define MPT_IOCTL_INTERFACE_FC (0x01)
173#define MPT_IOCTL_INTERFACE_SCSI (0x00) 172#define MPT_IOCTL_INTERFACE_SCSI (0x00)
173#define MPT_IOCTL_INTERFACE_FC (0x01)
174#define MPT_IOCTL_INTERFACE_FC_IP (0x02)
175#define MPT_IOCTL_INTERFACE_SAS (0x03)
174#define MPT_IOCTL_VERSION_LENGTH (32) 176#define MPT_IOCTL_VERSION_LENGTH (32)
175 177
176struct mpt_ioctl_iocinfo { 178struct mpt_ioctl_iocinfo {