Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a11d9b62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
  [SCSI] Skip deleted devices in __scsi_device_lookup_by_target()
  [SCSI] Add SUN Universal Xport to no attach blacklist
  [SCSI] iscsi_tcp: make padbuf non-static
  [SCSI] mpt fusion: Add Firmware debug support
  [SCSI] mpt fusion: Add separate msi enable disable for FC,SPI,SAS
  [SCSI] mpt fusion: Update MPI Headers to version 01.05.19
  [SCSI] qla2xxx: Fix ISP restart bug in multiq code
parents 4c44323d 32aeef60

drivers/message/fusion/lsi/mpi.h

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *          Title:  MPI Message independent structures and definitions

 *  Creation Date:  July 27, 2000

 *

 *    mpi.h Version:  01.05.13

 *    mpi.h Version:  01.05.16

 *

 *  Version History

 *  ---------------
@@ -79,6 +79,9 @@ 
 *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.

 *  10-11-06  01.05.12  Bumped MPI_HEADER_VERSION_UNIT.

 *  05-24-07  01.05.13  Bumped MPI_HEADER_VERSION_UNIT.

 *  08-07-07  01.05.14  Bumped MPI_HEADER_VERSION_UNIT.

 *  01-15-08  01.05.15  Bumped MPI_HEADER_VERSION_UNIT.

 *  03-28-08  01.05.16  Bumped MPI_HEADER_VERSION_UNIT.

 *  --------------------------------------------------------------------------

 */
@@ -109,7 +112,7 @@ 
/* Note: The major versions of 0xe0 through 0xff are reserved */



/* versioning for this MPI header set */

#define MPI_HEADER_VERSION_UNIT             (0x10)

#define MPI_HEADER_VERSION_UNIT             (0x13)

#define MPI_HEADER_VERSION_DEV              (0x00)

#define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)

#define MPI_HEADER_VERSION_UNIT_SHIFT       (8)

drivers/message/fusion/lsi/mpi_cnfg.h

+45 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 *          Title:  MPI Config message, structures, and Pages

 *  Creation Date:  July 27, 2000

 *

 *    mpi_cnfg.h Version:  01.05.15

 *    mpi_cnfg.h Version:  01.05.18

 *

 *  Version History

 *  ---------------
@@ -308,6 +308,20 @@ 
 *                      Expander Page 0 Flags field.

 *                      Fixed define for

 *                      MPI_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED.

 *  08-07-07  01.05.16  Added MPI_IOCPAGE6_CAP_FLAGS_MULTIPORT_DRIVE_SUPPORT

 *                      define.

 *                      Added BIOS Page 4 structure.

 *                      Added MPI_RAID_PHYS_DISK1_PATH_MAX define for RAID

 *                      Physcial Disk Page 1.

 *  01-15-07  01.05.17  Added additional bit defines for ExtFlags field of

 *                      Manufacturing Page 4.

 *                      Added Solid State Drives Supported bit to IOC Page 6

 *                      Capabilities Flags.

 *                      Added new value for AccessStatus field of SAS Device

 *                      Page 0 (_SATA_NEEDS_INITIALIZATION).

 *  03-28-08  01.05.18  Defined new bits in Manufacturing Page 4 ExtFlags field

 *                      to control coercion size and the mixing of SAS and SATA

 *                      SSD drives.

 *  --------------------------------------------------------------------------

 */
@@ -686,6 +700,14 @@ typedef struct _CONFIG_PAGE_MANUFACTURING_4 
#define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA                 (0x01)



/* defines for the ExtFlags field */

#define MPI_MANPAGE4_EXTFLAGS_MASK_COERCION_SIZE        (0x0180)

#define MPI_MANPAGE4_EXTFLAGS_SHIFT_COERCION_SIZE       (7)

#define MPI_MANPAGE4_EXTFLAGS_1GB_COERCION_SIZE         (0)

#define MPI_MANPAGE4_EXTFLAGS_128MB_COERCION_SIZE       (1)



#define MPI_MANPAGE4_EXTFLAGS_NO_MIX_SSD_SAS_SATA       (0x0040)

#define MPI_MANPAGE4_EXTFLAGS_MIX_SSD_AND_NON_SSD       (0x0020)

#define MPI_MANPAGE4_EXTFLAGS_DUAL_PORT_SUPPORT         (0x0010)

#define MPI_MANPAGE4_EXTFLAGS_HIDE_NON_IR_METADATA      (0x0008)

#define MPI_MANPAGE4_EXTFLAGS_SAS_CACHE_DISABLE         (0x0004)

#define MPI_MANPAGE4_EXTFLAGS_SATA_CACHE_DISABLE        (0x0002)
@@ -1159,6 +1181,8 @@ typedef struct _CONFIG_PAGE_IOC_6 


/* IOC Page 6 Capabilities Flags */



#define MPI_IOCPAGE6_CAP_FLAGS_SSD_SUPPORT              (0x00000020)

#define MPI_IOCPAGE6_CAP_FLAGS_MULTIPORT_DRIVE_SUPPORT  (0x00000010)

#define MPI_IOCPAGE6_CAP_FLAGS_DISABLE_SMART_POLLING    (0x00000008)



#define MPI_IOCPAGE6_CAP_FLAGS_MASK_METADATA_SIZE       (0x00000006)
@@ -1428,6 +1452,15 @@ typedef struct _CONFIG_PAGE_BIOS_2 
#define MPI_BIOSPAGE2_FORM_SAS_WWN                      (0x05)

#define MPI_BIOSPAGE2_FORM_ENCLOSURE_SLOT               (0x06)



typedef struct _CONFIG_PAGE_BIOS_4

{

    CONFIG_PAGE_HEADER      Header;                     /* 00h */

    U64                     ReassignmentBaseWWID;       /* 04h */

} CONFIG_PAGE_BIOS_4, MPI_POINTER PTR_CONFIG_PAGE_BIOS_4,

  BIOSPage4_t, MPI_POINTER pBIOSPage4_t;



#define MPI_BIOSPAGE4_PAGEVERSION                       (0x00)





/****************************************************************************

*   SCSI Port Config Pages
@@ -2419,6 +2452,15 @@ typedef struct _RAID_PHYS_DISK1_PATH 
#define MPI_RAID_PHYSDISK1_FLAG_BROKEN          (0x0002)

#define MPI_RAID_PHYSDISK1_FLAG_INVALID         (0x0001)





/*

 * Host code (drivers, BIOS, utilities, etc.) should leave this define set to

 * one and check Header.PageLength or NumPhysDiskPaths at runtime.

 */

#ifndef MPI_RAID_PHYS_DISK1_PATH_MAX

#define MPI_RAID_PHYS_DISK1_PATH_MAX    (1)

#endif



typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1

{

    CONFIG_PAGE_HEADER              Header;             /* 00h */
@@ -2426,7 +2468,7 @@ typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1 
    U8                              PhysDiskNum;        /* 05h */

    U16                             Reserved2;          /* 06h */

    U32                             Reserved1;          /* 08h */

    RAID_PHYS_DISK1_PATH            Path[1];            /* 0Ch */

    RAID_PHYS_DISK1_PATH            Path[MPI_RAID_PHYS_DISK1_PATH_MAX];/* 0Ch */

} CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,

  RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
@@ -2844,6 +2886,7 @@ typedef struct _CONFIG_PAGE_SAS_DEVICE_0 
#define MPI_SAS_DEVICE0_ASTATUS_SATA_INIT_FAILED            (0x01)

#define MPI_SAS_DEVICE0_ASTATUS_SATA_CAPABILITY_FAILED      (0x02)

#define MPI_SAS_DEVICE0_ASTATUS_SATA_AFFILIATION_CONFLICT   (0x03)

#define MPI_SAS_DEVICE0_ASTATUS_SATA_NEEDS_INITIALIZATION   (0x04)

/* specific values for SATA Init failures */

#define MPI_SAS_DEVICE0_ASTATUS_SIF_UNKNOWN                 (0x10)

#define MPI_SAS_DEVICE0_ASTATUS_SIF_AFFILIATION_CONFLICT    (0x11)

drivers/message/fusion/lsi/mpi_fc.h

+1 −1
Original line number Diff line number Diff line 
/*

 *  Copyright (c) 2000-2004 LSI Corporation.

 *  Copyright (c) 2000-2008 LSI Corporation.

 *

 *

 *           Name:  mpi_fc.h

drivers/message/fusion/lsi/mpi_history.txt

+60 −26
Original line number Diff line number Diff line
@@ -3,28 +3,28 @@ 
 MPI Header File Change History

 ==============================



 Copyright (c) 2000-2007 LSI Corporation.

 Copyright (c) 2000-2008 LSI Corporation.



 ---------------------------------------

 Header Set Release Version:    01.05.16

 Header Set Release Date:       05-24-07

 Header Set Release Version:    01.05.19

 Header Set Release Date:       03-28-08

 ---------------------------------------



 Filename               Current version     Prior version

 ----------             ---------------     -------------

 mpi.h                  01.05.13            01.05.12

 mpi_ioc.h              01.05.14            01.05.13

 mpi_cnfg.h             01.05.15            01.05.14

 mpi.h                  01.05.16            01.05.15

 mpi_ioc.h              01.05.16            01.05.15

 mpi_cnfg.h             01.05.18            01.05.17

 mpi_init.h             01.05.09            01.05.09

 mpi_targ.h             01.05.06            01.05.06

 mpi_fc.h               01.05.01            01.05.01

 mpi_lan.h              01.05.01            01.05.01

 mpi_raid.h             01.05.03            01.05.03

 mpi_raid.h             01.05.05            01.05.05

 mpi_tool.h             01.05.03            01.05.03

 mpi_inb.h              01.05.01            01.05.01

 mpi_sas.h              01.05.04            01.05.04

 mpi_sas.h              01.05.05            01.05.05

 mpi_type.h             01.05.02            01.05.02

 mpi_history.txt        01.05.14            01.05.14

 mpi_history.txt        01.05.19            01.05.18





 *  Date      Version   Description
@@ -96,6 +96,9 @@ mpi.h 
 *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.

 *  10-11-06  01.05.12  Bumped MPI_HEADER_VERSION_UNIT.

 *  05-24-07  01.05.13  Bumped MPI_HEADER_VERSION_UNIT.

 *  08-07-07  01.05.14  Bumped MPI_HEADER_VERSION_UNIT.

 *  01-15-08  01.05.15  Bumped MPI_HEADER_VERSION_UNIT.

 *  03-28-08  01.05.16  Bumped MPI_HEADER_VERSION_UNIT.

 *  --------------------------------------------------------------------------



mpi_ioc.h
@@ -127,7 +130,7 @@ mpi_ioc.h 
 *  08-08-01  01.02.01  Original release for v1.2 work.

 *                      New format for FWVersion and ProductId in

 *                      MSG_IOC_FACTS_REPLY and MPI_FW_HEADER.

 *  08-31-01  01.02.02  Added event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and

 *  08-31-01  01.02.02  Addded event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and

 *                      related structure and defines.

 *                      Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED.

 *                      Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE.
@@ -187,7 +190,7 @@ mpi_ioc.h 
 *  10-11-06  01.05.12  Added MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED.

 *                      Added MaxInitiators field to PortFacts reply.

 *                      Added SAS Device Status Change ReasonCode for

 *                      asynchronous notification.

 *                      asynchronous notificaiton.

 *                      Added MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE and event

 *                      data structure.

 *                      Added new ImageType values for FWDownload and FWUpload
@@ -199,6 +202,16 @@ mpi_ioc.h 
 *                      added _MULTI_PORT_DOMAIN.

 *  05-24-07  01.05.14  Added Common Boot Block type to FWDownload Request.

 *                      Added Common Boot Block type to FWUpload Request.

 *  08-07-07  01.05.15  Added MPI_EVENT_SAS_INIT_RC_REMOVED define.

 *                      Added MPI_EVENT_IR2_RC_DUAL_PORT_ADDED and

 *                      MPI_EVENT_IR2_RC_DUAL_PORT_REMOVED for IR2 event data.

 *                      Added SASAddress field to SAS Initiator Device Table

 *                      Overflow event data structure.

 *  03-28-08  01.05.16  Added two new ReasonCode values to SAS Device Status

 *                      Change Event data to indicate completion of internally

 *                      generated task management.

 *                      Added MPI_EVENT_DSCVRY_ERR_DS_SATA_INIT_FAILURE define.

 *                      Added MPI_EVENT_SAS_INIT_RC_INACCESSIBLE define.

 *  --------------------------------------------------------------------------



mpi_cnfg.h
@@ -496,6 +509,20 @@ mpi_cnfg.h 
 *                      Expander Page 0 Flags field.

 *                      Fixed define for

 *                      MPI_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED.

 *  08-07-07  01.05.16  Added MPI_IOCPAGE6_CAP_FLAGS_MULTIPORT_DRIVE_SUPPORT

 *                      define.

 *                      Added BIOS Page 4 structure.

 *                      Added MPI_RAID_PHYS_DISK1_PATH_MAX define for RAID

 *                      Physcial Disk Page 1.

 *  01-15-07  01.05.17  Added additional bit defines for ExtFlags field of

 *                      Manufacturing Page 4.

 *                      Added Solid State Drives Supported bit to IOC Page 6

 *                      Capabilities Flags.

 *                      Added new value for AccessStatus field of SAS Device

 *                      Page 0 (_SATA_NEEDS_INITIALIZATION).

 *  03-28-08  01.05.18  Defined new bits in Manufacturing Page 4 ExtFlags field

 *                      to control coercion size and the mixing of SAS and SATA

 *                      SSD drives.

 *  --------------------------------------------------------------------------



mpi_init.h
@@ -661,6 +688,9 @@ mpi_raid.h 
 *                      _SET_RESYNC_RATE and _SET_DATA_SCRUB_RATE.

 *  02-28-07  01.05.03  Added new RAID Action, Device FW Update Mode, and

 *                      associated defines.

 *  08-07-07  01.05.04  Added Disable Full Rebuild bit to the ActionDataWord

 *                      for the RAID Action MPI_RAID_ACTION_DISABLE_VOLUME.

 *  01-15-08  01.05.05  Added define for MPI_RAID_ACTION_SET_VOLUME_NAME.

 *  --------------------------------------------------------------------------



mpi_tool.h
@@ -694,6 +724,10 @@ mpi_sas.h 
 *                      reply.

 *  10-11-06  01.05.04  Fixed the name of a define for Operation field of SAS IO

 *                      Unit Control request.

 *  01-15-08  01.05.05  Added support for MPI_SAS_OP_SET_IOC_PARAMETER,

 *                      including adding IOCParameter and IOCParameter value

 *                      fields to SAS IO Unit Control Request.

 *                      Added MPI_SAS_DEVICE_INFO_PRODUCT_SPECIFIC define.

 *  --------------------------------------------------------------------------



mpi_type.h
@@ -709,20 +743,20 @@ mpi_type.h 


mpi_history.txt         Parts list history



Filename    01.05.15   01.05.15

----------  --------   --------

mpi.h       01.05.12   01.05.13

mpi_ioc.h   01.05.13   01.05.14

mpi_cnfg.h  01.05.14   01.05.15

mpi_init.h  01.05.09   01.05.09

mpi_targ.h  01.05.06   01.05.06

mpi_fc.h    01.05.01   01.05.01

mpi_lan.h   01.05.01   01.05.01

mpi_raid.h  01.05.03   01.05.03

mpi_tool.h  01.05.03   01.05.03

mpi_inb.h   01.05.01   01.05.01

mpi_sas.h   01.05.04   01.05.04

mpi_type.h  01.05.02   01.05.02

Filename    01.05.19   01.05.18   01.05.17   01.05.16   01.05.15

----------  --------   --------   --------   --------   --------

mpi.h       01.05.16   01.05.15   01.05.14   01.05.13   01.05.12

mpi_ioc.h   01.05.16   01.05.15   01.05.15   01.05.14   01.05.13

mpi_cnfg.h  01.05.18   01.05.17   01.05.16   01.05.15   01.05.14

mpi_init.h  01.05.09   01.05.09   01.05.09   01.05.09   01.05.09

mpi_targ.h  01.05.06   01.05.06   01.05.06   01.05.06   01.05.06

mpi_fc.h    01.05.01   01.05.01   01.05.01   01.05.01   01.05.01

mpi_lan.h   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01

mpi_raid.h  01.05.05   01.05.05   01.05.04   01.05.03   01.05.03

mpi_tool.h  01.05.03   01.05.03   01.05.03   01.05.03   01.05.03

mpi_inb.h   01.05.01   01.05.01   01.05.01   01.05.01   01.05.01

mpi_sas.h   01.05.05   01.05.05   01.05.04   01.05.04   01.05.04

mpi_type.h  01.05.02   01.05.02   01.05.02   01.05.02   01.05.02



Filename    01.05.14   01.05.13   01.05.12   01.05.11   01.05.10   01.05.09

----------  --------   --------   --------   --------   --------   --------

drivers/message/fusion/lsi/mpi_init.h

+1 −1
Original line number Diff line number Diff line 
/*

 *  Copyright (c) 2000-2007 LSI Corporation.

 *  Copyright (c) 2000-2008 LSI Corporation.

 *

 *

 *           Name:  mpi_init.h