Skip to content

Commit

Permalink
[SCSI] fusion - mptctl - adding support for bus_type=SAS
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Moore, Eric authored and Unknown committed Feb 4, 2006
1 parent 096f7a2 commit 9cc1cfb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 5 additions & 3 deletions drivers/message/fusion/mptctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,9 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
/* Fill in the data and return the structure to the calling
* program
*/
if (ioc->bus_type == FC)
if (ioc->bus_type == SAS)
karg->adapterType = MPT_IOCTL_INTERFACE_SAS;
else if (ioc->bus_type == FC)
karg->adapterType = MPT_IOCTL_INTERFACE_FC;
else
karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
Expand Down Expand Up @@ -2391,7 +2393,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)

karg.base_io_addr = pci_resource_start(pdev, 0);

if (ioc->bus_type == FC)
if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
karg.bus_phys_width = HP_BUS_WIDTH_UNK;
else
karg.bus_phys_width = HP_BUS_WIDTH_16;
Expand Down Expand Up @@ -2480,7 +2482,7 @@ mptctl_hp_targetinfo(unsigned long arg)

/* There is nothing to do for FCP parts.
*/
if (ioc->bus_type == FC)
if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
return 0;

if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL))
Expand Down
4 changes: 3 additions & 1 deletion drivers/message/fusion/mptctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,10 @@ struct mpt_ioctl_pci_info2 {
* Read only.
* Data starts at offset 0xC
*/
#define MPT_IOCTL_INTERFACE_FC (0x01)
#define MPT_IOCTL_INTERFACE_SCSI (0x00)
#define MPT_IOCTL_INTERFACE_FC (0x01)
#define MPT_IOCTL_INTERFACE_FC_IP (0x02)
#define MPT_IOCTL_INTERFACE_SAS (0x03)
#define MPT_IOCTL_VERSION_LENGTH (32)

struct mpt_ioctl_iocinfo {
Expand Down

0 comments on commit 9cc1cfb

Please sign in to comment.