Commit 80af11be authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.export

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents 7a2b1693 99baa651
...@@ -709,7 +709,8 @@ W: http://www.uni-mainz.de/~langm000/linux.html ...@@ -709,7 +709,8 @@ W: http://www.uni-mainz.de/~langm000/linux.html
S: Maintained S: Maintained
IBM ServeRAID RAID DRIVER IBM ServeRAID RAID DRIVER
P: Keith Mitchell P: Jack Hammer
P: Dave Jeffrey
M: ipslinux@us.ibm.com M: ipslinux@us.ibm.com
W: http://www.developer.ibm.com/welcome/netfinity/serveraid.html W: http://www.developer.ibm.com/welcome/netfinity/serveraid.html
S: Supported S: Supported
......
VERSION = 2 VERSION = 2
PATCHLEVEL = 5 PATCHLEVEL = 5
SUBLEVEL = 16 SUBLEVEL = 17
EXTRAVERSION = EXTRAVERSION =
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
IBM ServeRAID driver Change Log IBM ServeRAID driver Change Log
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5.00.01 - Sarasota ( 5i ) adapters must always be scanned first
- Get rid on IOCTL_NEW_COMMAND code
- Add Extended DCDB Commands for Tape Support in 5I
4.90.11 - Don't actually RESET unless it's physically required
- Remove unused compile options
4.90.08 - Data Corruption if First Scatter Gather Element is > 64K
4.90.08 - Increase Delays in Flashing ( Trombone Only - 4H )
4.90.05 - Use New PCI Architecture to facilitate Hot Plug Development
4.90.01 - Add ServeRAID Version Checking
4.80.26 - Clean up potential code problems ( Arjan's recommendations )
4.80.21 - Change memcpy() to copy_to_user() in NVRAM Page 5 IOCTL path
4.80.20 - Set max_sectors in Scsi_Host structure ( if >= 2.4.7 kernel )
- 5 second delay needed after resetting an i960 adapter
4.80.14 - Take all semaphores off stack
- Clean Up New_IOCTL path
4.80.04 - Eliminate calls to strtok() if 2.4.x or greater
- Adjustments to Device Queue Depth
4.80.00 - Make ia64 Safe
4.72.01 - I/O Mapped Memory release ( so "insmod ips" does not Fail )
- Don't Issue Internal FFDC Command if there are Active Commands
- Close Window for getting too many IOCTL's active
4.72.00 - Allow for a Scatter-Gather Element to exceed MAX_XFER Size 4.72.00 - Allow for a Scatter-Gather Element to exceed MAX_XFER Size
4.71.00 - Change all memory allocations to not use GFP_DMA flag 4.71.00 - Change all memory allocations to not use GFP_DMA flag
Code Clean-Up for 2.4.x kernel - Code Clean-Up for 2.4.x kernel
4.70.15 - Fix Breakup for very large ( non-SG ) requests 4.70.15 - Fix Breakup for very large ( non-SG ) requests
...@@ -86,4 +120,3 @@ IBM ServeRAID driver Change Log ...@@ -86,4 +120,3 @@ IBM ServeRAID driver Change Log
- Fixed read/write errors when the adapter is using an - Fixed read/write errors when the adapter is using an
8K stripe size. 8K stripe size.

\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -50,12 +50,6 @@ ...@@ -50,12 +50,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
/* type definitions */
#define u_int8_t uint8_t
#define u_int16_t uint16_t
#define u_int32_t uint32_t
#define u_int64_t uint64_t
/* Prototypes */ /* Prototypes */
extern int ips_detect(Scsi_Host_Template *); extern int ips_detect(Scsi_Host_Template *);
extern int ips_release(struct Scsi_Host *); extern int ips_release(struct Scsi_Host *);
...@@ -64,7 +58,7 @@ ...@@ -64,7 +58,7 @@
extern int ips_queue(Scsi_Cmnd *, void (*) (Scsi_Cmnd *)); extern int ips_queue(Scsi_Cmnd *, void (*) (Scsi_Cmnd *));
extern int ips_biosparam(Disk *, kdev_t, int *); extern int ips_biosparam(Disk *, kdev_t, int *);
extern const char * ips_info(struct Scsi_Host *); extern const char * ips_info(struct Scsi_Host *);
extern void do_ipsintr(int, void *, struct pt_regs *); extern void do_ips(int, void *, struct pt_regs *);
/* /*
* Some handy macros * Some handy macros
...@@ -91,11 +85,7 @@ ...@@ -91,11 +85,7 @@
(ips_force_memio))) ? 1 : 0) (ips_force_memio))) ? 1 : 0)
#ifndef VIRT_TO_BUS #ifndef VIRT_TO_BUS
#define VIRT_TO_BUS(x) (unsigned int)virt_to_bus((void *) x) #define VIRT_TO_BUS(x) (uint32_t) virt_to_bus((void *) x)
#endif
#ifndef UDELAY
#define UDELAY udelay
#endif #endif
#ifndef MDELAY #ifndef MDELAY
...@@ -178,9 +168,14 @@ ...@@ -178,9 +168,14 @@
#define IPS_CMD_WRITE_SG 0x83 #define IPS_CMD_WRITE_SG 0x83
#define IPS_CMD_DCDB 0x04 #define IPS_CMD_DCDB 0x04
#define IPS_CMD_DCDB_SG 0x84 #define IPS_CMD_DCDB_SG 0x84
#define IPS_CMD_EXTENDED_DCDB 0x95
#define IPS_CMD_EXTENDED_DCDB_SG 0x96
#define IPS_CMD_CONFIG_SYNC 0x58 #define IPS_CMD_CONFIG_SYNC 0x58
#define IPS_CMD_ERROR_TABLE 0x17 #define IPS_CMD_ERROR_TABLE 0x17
#define IPS_CMD_DOWNLOAD 0x20
#define IPS_CMD_RW_BIOSFW 0x22 #define IPS_CMD_RW_BIOSFW 0x22
#define IPS_CMD_GET_VERSION_INFO 0xC6
#define IPS_CMD_RESET_CHANNEL 0x1A
/* /*
* Adapter Equates * Adapter Equates
...@@ -206,10 +201,9 @@ ...@@ -206,10 +201,9 @@
#define IPS_GOOD_POST_STATUS 0x80 #define IPS_GOOD_POST_STATUS 0x80
#define IPS_SEM_TIMEOUT 2000 #define IPS_SEM_TIMEOUT 2000
#define IPS_IOCTL_COMMAND 0x0D #define IPS_IOCTL_COMMAND 0x0D
#define IPS_IOCTL_NEW_COMMAND 0x81
#define IPS_INTR_ON 0 #define IPS_INTR_ON 0
#define IPS_INTR_IORL 1 #define IPS_INTR_IORL 1
#define IPS_INTR_HAL 2 #define IPS_FFDC 99
#define IPS_ADAPTER_ID 0xF #define IPS_ADAPTER_ID 0xF
#define IPS_VENDORID 0x1014 #define IPS_VENDORID 0x1014
#define IPS_DEVICEID_COPPERHEAD 0x002E #define IPS_DEVICEID_COPPERHEAD 0x002E
...@@ -218,6 +212,8 @@ ...@@ -218,6 +212,8 @@
#define IPS_SUBDEVICEID_4L 0x01BF #define IPS_SUBDEVICEID_4L 0x01BF
#define IPS_SUBDEVICEID_4MX 0x0208 #define IPS_SUBDEVICEID_4MX 0x0208
#define IPS_SUBDEVICEID_4LX 0x020E #define IPS_SUBDEVICEID_4LX 0x020E
#define IPS_SUBDEVICEID_5I2 0x0259
#define IPS_SUBDEVICEID_5I1 0x0258
#define IPS_IOCTL_SIZE 8192 #define IPS_IOCTL_SIZE 8192
#define IPS_STATUS_SIZE 4 #define IPS_STATUS_SIZE 4
#define IPS_STATUS_Q_SIZE (IPS_MAX_CMDS+1) * IPS_STATUS_SIZE #define IPS_STATUS_Q_SIZE (IPS_MAX_CMDS+1) * IPS_STATUS_SIZE
...@@ -298,6 +294,8 @@ ...@@ -298,6 +294,8 @@
#define IPS_ADTYPE_SERVERAID4L 0x09 #define IPS_ADTYPE_SERVERAID4L 0x09
#define IPS_ADTYPE_SERVERAID4MX 0x0A #define IPS_ADTYPE_SERVERAID4MX 0x0A
#define IPS_ADTYPE_SERVERAID4LX 0x0B #define IPS_ADTYPE_SERVERAID4LX 0x0B
#define IPS_ADTYPE_SERVERAID5I2 0x0C
#define IPS_ADTYPE_SERVERAID5I1 0x0D
/* /*
* Adapter Command/Status Packet Definitions * Adapter Command/Status Packet Definitions
...@@ -390,6 +388,8 @@ ...@@ -390,6 +388,8 @@
*/ */
#define IPS_SCB_ACTIVE 0x00001 #define IPS_SCB_ACTIVE 0x00001
#define IPS_SCB_WAITING 0x00002 #define IPS_SCB_WAITING 0x00002
#define IPS_SCB_MAP_SG 0x00008
#define IPS_SCB_MAP_SINGLE 0X00010
/* /*
* Passthru stuff * Passthru stuff
...@@ -400,6 +400,14 @@ ...@@ -400,6 +400,14 @@
#define IPS_CTRLINFO (('C'<<8) | 69) #define IPS_CTRLINFO (('C'<<8) | 69)
#define IPS_FLASHBIOS (('C'<<8) | 70) #define IPS_FLASHBIOS (('C'<<8) | 70)
/* flashing defines */
#define IPS_FW_IMAGE 0x00
#define IPS_BIOS_IMAGE 0x01
#define IPS_WRITE_FW 0x01
#define IPS_WRITE_BIOS 0x02
#define IPS_ERASE_BIOS 0x03
#define IPS_BIOS_HEADER 0xC0
/* time oriented stuff */ /* time oriented stuff */
#define IPS_IS_LEAP_YEAR(y) (((y % 4 == 0) && ((y % 100 != 0) || (y % 400 == 0))) ? 1 : 0) #define IPS_IS_LEAP_YEAR(y) (((y % 4 == 0) && ((y % 100 != 0) || (y % 400 == 0))) ? 1 : 0)
#define IPS_NUM_LEAP_YEARS_THROUGH(y) ((y) / 4 - (y) / 100 + (y) / 400) #define IPS_NUM_LEAP_YEARS_THROUGH(y) ((y) / 4 - (y) / 100 + (y) / 400)
...@@ -415,7 +423,7 @@ ...@@ -415,7 +423,7 @@
/* /*
* Scsi_Host Template * Scsi_Host Template
*/ */
#if LINUX_VERSION_CODE < LinuxVersionCode(2,3,27) #if LINUX_VERSION_CODE < LinuxVersionCode(2,4,0)
#define IPS { \ #define IPS { \
next : NULL, \ next : NULL, \
module : NULL, \ module : NULL, \
...@@ -443,8 +451,36 @@ ...@@ -443,8 +451,36 @@
present : 0, \ present : 0, \
unchecked_isa_dma : 0, \ unchecked_isa_dma : 0, \
use_clustering : ENABLE_CLUSTERING, \ use_clustering : ENABLE_CLUSTERING, \
use_new_eh_code : 1, \ use_new_eh_code : 1 \
highmem_io : 1 \ }
#elif LINUX_VERSION_CODE < LinuxVersionCode(2,5,0)
#define IPS { \
next : NULL, \
module : NULL, \
proc_info : NULL, \
name : NULL, \
detect : ips_detect, \
release : ips_release, \
info : ips_info, \
command : NULL, \
queuecommand : ips_queue, \
eh_strategy_handler : NULL, \
eh_abort_handler : ips_eh_abort, \
eh_device_reset_handler : NULL, \
eh_bus_reset_handler : NULL, \
eh_host_reset_handler : ips_eh_reset, \
abort : NULL, \
reset : NULL, \
slave_attach : NULL, \
bios_param : ips_biosparam, \
can_queue : 0, \
this_id: -1, \
sg_tablesize : IPS_MAX_SG, \
cmd_per_lun: 16, \
present : 0, \
unchecked_isa_dma : 0, \
use_clustering : ENABLE_CLUSTERING, \
use_new_eh_code : 1 \
} }
#else #else
#define IPS { \ #define IPS { \
...@@ -473,6 +509,7 @@ ...@@ -473,6 +509,7 @@
present : 0, \ present : 0, \
unchecked_isa_dma : 0, \ unchecked_isa_dma : 0, \
use_clustering : ENABLE_CLUSTERING, \ use_clustering : ENABLE_CLUSTERING, \
highmem_io : 1 \
} }
#endif #endif
...@@ -480,146 +517,175 @@ ...@@ -480,146 +517,175 @@
* IBM PCI Raid Command Formats * IBM PCI Raid Command Formats
*/ */
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t log_drv; uint8_t log_drv;
u_int8_t sg_count; uint8_t sg_count;
u_int32_t lba; uint32_t lba;
u_int32_t sg_addr; uint32_t sg_addr;
u_int16_t sector_count; uint16_t sector_count;
u_int16_t reserved; uint16_t reserved;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_IO_CMD, *PIPS_IO_CMD; } IPS_IO_CMD, *PIPS_IO_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int16_t reserved; uint16_t reserved;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_LD_CMD, *PIPS_LD_CMD; } IPS_LD_CMD, *PIPS_LD_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t reserved; uint8_t reserved;
u_int8_t reserved2; uint8_t reserved2;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int32_t reserved4; uint32_t reserved4;
} IPS_IOCTL_CMD, *PIPS_IOCTL_CMD; } IPS_IOCTL_CMD, *PIPS_IOCTL_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int16_t reserved; uint8_t channel;
u_int32_t reserved2; uint8_t reserved3;
u_int32_t dcdb_address; uint8_t reserved4;
u_int32_t reserved3; uint8_t reserved5;
u_int32_t ccsar; uint8_t reserved6;
u_int32_t cccr; uint8_t reserved7;
uint8_t reserved8;
uint8_t reserved9;
uint8_t reserved10;
uint8_t reserved11;
uint8_t reserved12;
uint8_t reserved13;
uint8_t reserved14;
uint8_t adapter_flag;
} IPS_RESET_CMD, *PIPS_RESET_CMD;
typedef struct {
uint8_t op_code;
uint8_t command_id;
uint16_t reserved;
uint32_t reserved2;
uint32_t dcdb_address;
uint32_t reserved3;
uint32_t ccsar;
uint32_t cccr;
} IPS_DCDB_CMD, *PIPS_DCDB_CMD; } IPS_DCDB_CMD, *PIPS_DCDB_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t channel; uint8_t channel;
u_int8_t source_target; uint8_t source_target;
u_int32_t reserved; uint32_t reserved;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_CS_CMD, *PIPS_CS_CMD; } IPS_CS_CMD, *PIPS_CS_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t log_drv; uint8_t log_drv;
u_int8_t control; uint8_t control;
u_int32_t reserved; uint32_t reserved;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_US_CMD, *PIPS_US_CMD; } IPS_US_CMD, *PIPS_US_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t reserved; uint8_t reserved;
u_int8_t state; uint8_t state;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t reserved4; uint32_t reserved4;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_FC_CMD, *PIPS_FC_CMD; } IPS_FC_CMD, *PIPS_FC_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t reserved; uint8_t reserved;
u_int8_t desc; uint8_t desc;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int32_t reserved3; uint32_t reserved3;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_STATUS_CMD, *PIPS_STATUS_CMD; } IPS_STATUS_CMD, *PIPS_STATUS_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t page; uint8_t page;
u_int8_t write; uint8_t write;
u_int32_t reserved; uint32_t reserved;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int32_t reserved2; uint32_t reserved2;
u_int32_t ccsar; uint32_t ccsar;
u_int32_t cccr; uint32_t cccr;
} IPS_NVRAM_CMD, *PIPS_NVRAM_CMD; } IPS_NVRAM_CMD, *PIPS_NVRAM_CMD;
typedef struct
{
uint8_t op_code;
uint8_t command_id;
uint16_t reserved;
uint32_t count;
uint32_t buffer_addr;
uint32_t reserved2;
} IPS_VERSION_INFO, *PIPS_VERSION_INFO;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t reset_count; uint8_t reset_count;
u_int8_t reset_type; uint8_t reset_type;
u_int8_t second; uint8_t second;
u_int8_t minute; uint8_t minute;
u_int8_t hour; uint8_t hour;
u_int8_t day; uint8_t day;
u_int8_t reserved1[4]; uint8_t reserved1[4];
u_int8_t month; uint8_t month;
u_int8_t yearH; uint8_t yearH;
u_int8_t yearL; uint8_t yearL;
u_int8_t reserved2; uint8_t reserved2;
} IPS_FFDC_CMD, *PIPS_FFDC_CMD; } IPS_FFDC_CMD, *PIPS_FFDC_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t type; uint8_t type;
u_int8_t direction; uint8_t direction;
u_int32_t count; uint32_t count;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int8_t total_packets; uint8_t total_packets;
u_int8_t packet_num; uint8_t packet_num;
u_int16_t reserved; uint16_t reserved;
} IPS_FLASHFW_CMD, *PIPS_FLASHFW_CMD; } IPS_FLASHFW_CMD, *PIPS_FLASHFW_CMD;
typedef struct { typedef struct {
u_int8_t op_code; uint8_t op_code;
u_int8_t command_id; uint8_t command_id;
u_int8_t type; uint8_t type;
u_int8_t direction; uint8_t direction;
u_int32_t count; uint32_t count;
u_int32_t buffer_addr; uint32_t buffer_addr;
u_int32_t offset; uint32_t offset;
} IPS_FLASHBIOS_CMD, *PIPS_FLASHBIOS_CMD; } IPS_FLASHBIOS_CMD, *PIPS_FLASHBIOS_CMD;
typedef union { typedef union {
...@@ -635,46 +701,63 @@ typedef union { ...@@ -635,46 +701,63 @@ typedef union {
IPS_FFDC_CMD ffdc; IPS_FFDC_CMD ffdc;
IPS_FLASHFW_CMD flashfw; IPS_FLASHFW_CMD flashfw;
IPS_FLASHBIOS_CMD flashbios; IPS_FLASHBIOS_CMD flashbios;
IPS_VERSION_INFO version_info;
IPS_RESET_CMD reset;
} IPS_HOST_COMMAND, *PIPS_HOST_COMMAND; } IPS_HOST_COMMAND, *PIPS_HOST_COMMAND;
typedef struct { typedef struct {
u_int8_t logical_id; uint8_t logical_id;
u_int8_t reserved; uint8_t reserved;
u_int8_t raid_level; uint8_t raid_level;
u_int8_t state; uint8_t state;
u_int32_t sector_count; uint32_t sector_count;
} IPS_DRIVE_INFO, *PIPS_DRIVE_INFO; } IPS_DRIVE_INFO, *PIPS_DRIVE_INFO;
typedef struct { typedef struct {
u_int8_t no_of_log_drive; uint8_t no_of_log_drive;
u_int8_t reserved[3]; uint8_t reserved[3];
IPS_DRIVE_INFO drive_info[IPS_MAX_LD]; IPS_DRIVE_INFO drive_info[IPS_MAX_LD];
} IPS_LD_INFO, *PIPS_LD_INFO; } IPS_LD_INFO, *PIPS_LD_INFO;
typedef struct { typedef struct {
u_int8_t device_address; uint8_t device_address;
u_int8_t cmd_attribute; uint8_t cmd_attribute;
u_int16_t transfer_length; uint16_t transfer_length;
u_int32_t buffer_pointer; uint32_t buffer_pointer;
u_int8_t cdb_length; uint8_t cdb_length;
u_int8_t sense_length; uint8_t sense_length;
u_int8_t sg_count; uint8_t sg_count;
u_int8_t reserved; uint8_t reserved;
u_int8_t scsi_cdb[12]; uint8_t scsi_cdb[12];
u_int8_t sense_info[64]; uint8_t sense_info[64];
u_int8_t scsi_status; uint8_t scsi_status;
u_int8_t reserved2[3]; uint8_t reserved2[3];
} IPS_DCDB_TABLE, *PIPS_DCDB_TABLE; } IPS_DCDB_TABLE, *PIPS_DCDB_TABLE;
typedef struct {
uint8_t device_address;
uint8_t cmd_attribute;
uint8_t cdb_length;
uint8_t reserved_for_LUN;
uint32_t transfer_length;
uint32_t buffer_pointer;
uint16_t sg_count;
uint8_t sense_length;
uint8_t scsi_status;
uint32_t reserved;
uint8_t scsi_cdb[16];
uint8_t sense_info[56];
} IPS_DCDB_TABLE_TAPE, *PIPS_DCDB_TABLE_TAPE;
typedef union { typedef union {
struct { struct {
volatile u_int8_t reserved; volatile uint8_t reserved;
volatile u_int8_t command_id; volatile uint8_t command_id;
volatile u_int8_t basic_status; volatile uint8_t basic_status;
volatile u_int8_t extended_status; volatile uint8_t extended_status;
} fields; } fields;
volatile u_int32_t value; volatile uint32_t value;
} IPS_STATUS, *PIPS_STATUS; } IPS_STATUS, *PIPS_STATUS;
typedef struct { typedef struct {
...@@ -682,110 +765,134 @@ typedef struct { ...@@ -682,110 +765,134 @@ typedef struct {
volatile PIPS_STATUS p_status_start; volatile PIPS_STATUS p_status_start;
volatile PIPS_STATUS p_status_end; volatile PIPS_STATUS p_status_end;
volatile PIPS_STATUS p_status_tail; volatile PIPS_STATUS p_status_tail;
volatile u_int32_t hw_status_start; volatile uint32_t hw_status_start;
volatile u_int32_t hw_status_tail; volatile uint32_t hw_status_tail;
IPS_LD_INFO logical_drive_info; IPS_LD_INFO logical_drive_info;
} IPS_ADAPTER, *PIPS_ADAPTER; } IPS_ADAPTER, *PIPS_ADAPTER;
typedef struct { typedef struct {
u_int8_t ucLogDriveCount; uint8_t ucLogDriveCount;
u_int8_t ucMiscFlag; uint8_t ucMiscFlag;
u_int8_t ucSLTFlag; uint8_t ucSLTFlag;
u_int8_t ucBSTFlag; uint8_t ucBSTFlag;
u_int8_t ucPwrChgCnt; uint8_t ucPwrChgCnt;
u_int8_t ucWrongAdrCnt; uint8_t ucWrongAdrCnt;
u_int8_t ucUnidentCnt; uint8_t ucUnidentCnt;
u_int8_t ucNVramDevChgCnt; uint8_t ucNVramDevChgCnt;
u_int8_t CodeBlkVersion[8]; uint8_t CodeBlkVersion[8];
u_int8_t BootBlkVersion[8]; uint8_t BootBlkVersion[8];
u_int32_t ulDriveSize[IPS_MAX_LD]; uint32_t ulDriveSize[IPS_MAX_LD];
u_int8_t ucConcurrentCmdCount; uint8_t ucConcurrentCmdCount;
u_int8_t ucMaxPhysicalDevices; uint8_t ucMaxPhysicalDevices;
u_int16_t usFlashRepgmCount; uint16_t usFlashRepgmCount;
u_int8_t ucDefunctDiskCount; uint8_t ucDefunctDiskCount;
u_int8_t ucRebuildFlag; uint8_t ucRebuildFlag;
u_int8_t ucOfflineLogDrvCount; uint8_t ucOfflineLogDrvCount;
u_int8_t ucCriticalDrvCount; uint8_t ucCriticalDrvCount;
u_int16_t usConfigUpdateCount; uint16_t usConfigUpdateCount;
u_int8_t ucBlkFlag; uint8_t ucBlkFlag;
u_int8_t reserved; uint8_t reserved;
u_int16_t usAddrDeadDisk[IPS_MAX_CHANNELS * IPS_MAX_TARGETS]; uint16_t usAddrDeadDisk[IPS_MAX_CHANNELS * IPS_MAX_TARGETS];
} IPS_ENQ, *PIPS_ENQ; } IPS_ENQ, *PIPS_ENQ;
typedef struct { typedef struct {
u_int8_t ucInitiator; uint8_t ucInitiator;
u_int8_t ucParameters; uint8_t ucParameters;
u_int8_t ucMiscFlag; uint8_t ucMiscFlag;
u_int8_t ucState; uint8_t ucState;
u_int32_t ulBlockCount; uint32_t ulBlockCount;
u_int8_t ucDeviceId[28]; uint8_t ucDeviceId[28];
} IPS_DEVSTATE, *PIPS_DEVSTATE; } IPS_DEVSTATE, *PIPS_DEVSTATE;
typedef struct { typedef struct {
u_int8_t ucChn; uint8_t ucChn;
u_int8_t ucTgt; uint8_t ucTgt;
u_int16_t ucReserved; uint16_t ucReserved;
u_int32_t ulStartSect; uint32_t ulStartSect;
u_int32_t ulNoOfSects; uint32_t ulNoOfSects;
} IPS_CHUNK, *PIPS_CHUNK; } IPS_CHUNK, *PIPS_CHUNK;
typedef struct { typedef struct {
u_int16_t ucUserField; uint16_t ucUserField;
u_int8_t ucState; uint8_t ucState;
u_int8_t ucRaidCacheParam; uint8_t ucRaidCacheParam;
u_int8_t ucNoOfChunkUnits; uint8_t ucNoOfChunkUnits;
u_int8_t ucStripeSize; uint8_t ucStripeSize;
u_int8_t ucParams; uint8_t ucParams;
u_int8_t ucReserved; uint8_t ucReserved;
u_int32_t ulLogDrvSize; uint32_t ulLogDrvSize;
IPS_CHUNK chunk[IPS_MAX_CHUNKS]; IPS_CHUNK chunk[IPS_MAX_CHUNKS];
} IPS_LD, *PIPS_LD; } IPS_LD, *PIPS_LD;
typedef struct { typedef struct {
u_int8_t board_disc[8]; uint8_t board_disc[8];
u_int8_t processor[8]; uint8_t processor[8];
u_int8_t ucNoChanType; uint8_t ucNoChanType;
u_int8_t ucNoHostIntType; uint8_t ucNoHostIntType;
u_int8_t ucCompression; uint8_t ucCompression;
u_int8_t ucNvramType; uint8_t ucNvramType;
u_int32_t ulNvramSize; uint32_t ulNvramSize;
} IPS_HARDWARE, *PIPS_HARDWARE; } IPS_HARDWARE, *PIPS_HARDWARE;
typedef struct { typedef struct {
u_int8_t ucLogDriveCount; uint8_t ucLogDriveCount;
u_int8_t ucDateD; uint8_t ucDateD;
u_int8_t ucDateM; uint8_t ucDateM;
u_int8_t ucDateY; uint8_t ucDateY;
u_int8_t init_id[4]; uint8_t init_id[4];
u_int8_t host_id[12]; uint8_t host_id[12];
u_int8_t time_sign[8]; uint8_t time_sign[8];
u_int32_t UserOpt; uint32_t UserOpt;
u_int16_t user_field; uint16_t user_field;
u_int8_t ucRebuildRate; uint8_t ucRebuildRate;
u_int8_t ucReserve; uint8_t ucReserve;
IPS_HARDWARE hardware_disc; IPS_HARDWARE hardware_disc;
IPS_LD logical_drive[IPS_MAX_LD]; IPS_LD logical_drive[IPS_MAX_LD];
IPS_DEVSTATE dev[IPS_MAX_CHANNELS][IPS_MAX_TARGETS+1]; IPS_DEVSTATE dev[IPS_MAX_CHANNELS][IPS_MAX_TARGETS+1];
u_int8_t reserved[512]; uint8_t reserved[512];
} IPS_CONF, *PIPS_CONF; } IPS_CONF, *PIPS_CONF;
typedef struct { typedef struct {
u_int32_t signature; uint32_t signature;
u_int8_t reserved; uint8_t reserved1;
u_int8_t adapter_slot; uint8_t adapter_slot;
u_int16_t adapter_type; uint16_t adapter_type;
u_int8_t bios_high[4]; uint8_t ctrl_bios[8];
u_int8_t bios_low[4]; uint8_t versioning; /* 1 = Versioning Supported, else 0 */
u_int16_t reserved2; uint8_t version_mismatch; /* 1 = Versioning MisMatch, else 0 */
u_int8_t reserved3; uint8_t reserved2;
u_int8_t operating_system; uint8_t operating_system;
u_int8_t driver_high[4]; uint8_t driver_high[4];
u_int8_t driver_low[4]; uint8_t driver_low[4];
u_int8_t reserved4[100]; uint8_t BiosCompatibilityID[8];
uint8_t ReservedForOS2[8];
uint8_t bios_high[4]; /* Adapter's Flashed BIOS Version */
uint8_t bios_low[4];
uint8_t Filler[76];
} IPS_NVRAM_P5, *PIPS_NVRAM_P5; } IPS_NVRAM_P5, *PIPS_NVRAM_P5;
/*--------------------------------------------------------------------------*/
/* Data returned from a GetVersion Command */
/*--------------------------------------------------------------------------*/
/* SubSystem Parameter[4] */
#define IPS_GET_VERSION_SUPPORT 0x00018000 /* Mask for Versioning Support */
typedef struct
{
uint32_t revision;
uint8_t bootBlkVersion[32];
uint8_t bootBlkAttributes[4];
uint8_t codeBlkVersion[32];
uint8_t biosVersion[32];
uint8_t biosAttributes[4];
uint8_t compatibilityId[32];
uint8_t reserved[4];
} IPS_VERSION_DATA;
typedef struct _IPS_SUBSYS { typedef struct _IPS_SUBSYS {
u_int32_t param[128]; uint32_t param[128];
} IPS_SUBSYS, *PIPS_SUBSYS; } IPS_SUBSYS, *PIPS_SUBSYS;
/** /**
...@@ -796,102 +903,103 @@ typedef struct _IPS_SUBSYS { ...@@ -796,102 +903,103 @@ typedef struct _IPS_SUBSYS {
* Inquiry Data Format * Inquiry Data Format
*/ */
typedef struct { typedef struct {
u_int8_t DeviceType; uint8_t DeviceType;
u_int8_t DeviceTypeQualifier; uint8_t DeviceTypeQualifier;
u_int8_t Version; uint8_t Version;
u_int8_t ResponseDataFormat; uint8_t ResponseDataFormat;
u_int8_t AdditionalLength; uint8_t AdditionalLength;
u_int8_t Reserved; uint8_t Reserved;
u_int8_t Flags[2]; uint8_t Flags[2];
char VendorId[8]; uint8_t VendorId[8];
char ProductId[16]; uint8_t ProductId[16];
char ProductRevisionLevel[4]; uint8_t ProductRevisionLevel[4];
uint8_t Reserved2; /* Provides NULL terminator to name */
} IPS_SCSI_INQ_DATA, *PIPS_SCSI_INQ_DATA; } IPS_SCSI_INQ_DATA, *PIPS_SCSI_INQ_DATA;
/* /*
* Read Capacity Data Format * Read Capacity Data Format
*/ */
typedef struct { typedef struct {
u_int32_t lba; uint32_t lba;
u_int32_t len; uint32_t len;
} IPS_SCSI_CAPACITY; } IPS_SCSI_CAPACITY;
/* /*
* Request Sense Data Format * Request Sense Data Format
*/ */
typedef struct { typedef struct {
u_int8_t ResponseCode; uint8_t ResponseCode;
u_int8_t SegmentNumber; uint8_t SegmentNumber;
u_int8_t Flags; uint8_t Flags;
u_int8_t Information[4]; uint8_t Information[4];
u_int8_t AdditionalLength; uint8_t AdditionalLength;
u_int8_t CommandSpecific[4]; uint8_t CommandSpecific[4];
u_int8_t AdditionalSenseCode; uint8_t AdditionalSenseCode;
u_int8_t AdditionalSenseCodeQual; uint8_t AdditionalSenseCodeQual;
u_int8_t FRUCode; uint8_t FRUCode;
u_int8_t SenseKeySpecific[3]; uint8_t SenseKeySpecific[3];
} IPS_SCSI_REQSEN; } IPS_SCSI_REQSEN;
/* /*
* Sense Data Format - Page 3 * Sense Data Format - Page 3
*/ */
typedef struct { typedef struct {
u_int8_t PageCode; uint8_t PageCode;
u_int8_t PageLength; uint8_t PageLength;
u_int16_t TracksPerZone; uint16_t TracksPerZone;
u_int16_t AltSectorsPerZone; uint16_t AltSectorsPerZone;
u_int16_t AltTracksPerZone; uint16_t AltTracksPerZone;
u_int16_t AltTracksPerVolume; uint16_t AltTracksPerVolume;
u_int16_t SectorsPerTrack; uint16_t SectorsPerTrack;
u_int16_t BytesPerSector; uint16_t BytesPerSector;
u_int16_t Interleave; uint16_t Interleave;
u_int16_t TrackSkew; uint16_t TrackSkew;
u_int16_t CylinderSkew; uint16_t CylinderSkew;
u_int8_t flags; uint8_t flags;
u_int8_t reserved[3]; uint8_t reserved[3];
} IPS_SCSI_MODE_PAGE3; } IPS_SCSI_MODE_PAGE3;
/* /*
* Sense Data Format - Page 4 * Sense Data Format - Page 4
*/ */
typedef struct { typedef struct {
u_int8_t PageCode; uint8_t PageCode;
u_int8_t PageLength; uint8_t PageLength;
u_int16_t CylindersHigh; uint16_t CylindersHigh;
u_int8_t CylindersLow; uint8_t CylindersLow;
u_int8_t Heads; uint8_t Heads;
u_int16_t WritePrecompHigh; uint16_t WritePrecompHigh;
u_int8_t WritePrecompLow; uint8_t WritePrecompLow;
u_int16_t ReducedWriteCurrentHigh; uint16_t ReducedWriteCurrentHigh;
u_int8_t ReducedWriteCurrentLow; uint8_t ReducedWriteCurrentLow;
u_int16_t StepRate; uint16_t StepRate;
u_int16_t LandingZoneHigh; uint16_t LandingZoneHigh;
u_int8_t LandingZoneLow; uint8_t LandingZoneLow;
u_int8_t flags; uint8_t flags;
u_int8_t RotationalOffset; uint8_t RotationalOffset;
u_int8_t Reserved; uint8_t Reserved;
u_int16_t MediumRotationRate; uint16_t MediumRotationRate;
u_int8_t Reserved2[2]; uint8_t Reserved2[2];
} IPS_SCSI_MODE_PAGE4; } IPS_SCSI_MODE_PAGE4;
/* /*
* Sense Data Format - Block Descriptor (DASD) * Sense Data Format - Block Descriptor (DASD)
*/ */
typedef struct { typedef struct {
u_int32_t NumberOfBlocks; uint32_t NumberOfBlocks;
u_int8_t DensityCode; uint8_t DensityCode;
u_int16_t BlockLengthHigh; uint16_t BlockLengthHigh;
u_int8_t BlockLengthLow; uint8_t BlockLengthLow;
} IPS_SCSI_MODE_PAGE_BLKDESC; } IPS_SCSI_MODE_PAGE_BLKDESC;
/* /*
* Sense Data Format - Mode Page Header * Sense Data Format - Mode Page Header
*/ */
typedef struct { typedef struct {
u_int8_t DataLength; uint8_t DataLength;
u_int8_t MediumType; uint8_t MediumType;
u_int8_t Reserved; uint8_t Reserved;
u_int8_t BlockDescLength; uint8_t BlockDescLength;
} IPS_SCSI_MODE_PAGE_HEADER; } IPS_SCSI_MODE_PAGE_HEADER;
typedef struct { typedef struct {
...@@ -908,8 +1016,8 @@ typedef struct { ...@@ -908,8 +1016,8 @@ typedef struct {
* Scatter Gather list format * Scatter Gather list format
*/ */
typedef struct ips_sglist { typedef struct ips_sglist {
u_int32_t address; uint32_t address;
u_int32_t length; uint32_t length;
} IPS_SG_LIST, *PIPS_SG_LIST; } IPS_SG_LIST, *PIPS_SG_LIST;
typedef struct _IPS_INFOSTR { typedef struct _IPS_INFOSTR {
...@@ -928,24 +1036,24 @@ typedef struct { ...@@ -928,24 +1036,24 @@ typedef struct {
typedef struct { typedef struct {
void *userbuffer; void *userbuffer;
u_int32_t usersize; uint32_t usersize;
void *kernbuffer; void *kernbuffer;
u_int32_t kernsize; uint32_t kernsize;
void *ha; void *ha;
void *SC; void *SC;
void *pt; void *pt;
struct semaphore *sem; struct semaphore *sem;
u_int32_t offset; uint32_t offset;
u_int32_t retcode; uint32_t retcode;
} IPS_FLASH_DATA; } IPS_FLASH_DATA;
/* /*
* Status Info * Status Info
*/ */
typedef struct ips_stat { typedef struct ips_stat {
u_int32_t residue_len; uint32_t residue_len;
void *scb_addr; void *scb_addr;
u_int8_t padding[12 - sizeof(void *)]; uint8_t padding[12 - sizeof(void *)];
} ips_stat_t; } ips_stat_t;
/* /*
...@@ -954,8 +1062,8 @@ typedef struct ips_stat { ...@@ -954,8 +1062,8 @@ typedef struct ips_stat {
typedef struct ips_scb_queue { typedef struct ips_scb_queue {
struct ips_scb *head; struct ips_scb *head;
struct ips_scb *tail; struct ips_scb *tail;
u_int32_t count; int count;
u_int32_t cpu_flags; unsigned long cpu_flags;
spinlock_t lock; spinlock_t lock;
} ips_scb_queue_t; } ips_scb_queue_t;
...@@ -965,8 +1073,8 @@ typedef struct ips_scb_queue { ...@@ -965,8 +1073,8 @@ typedef struct ips_scb_queue {
typedef struct ips_wait_queue { typedef struct ips_wait_queue {
Scsi_Cmnd *head; Scsi_Cmnd *head;
Scsi_Cmnd *tail; Scsi_Cmnd *tail;
u_int32_t count; int count;
u_int32_t cpu_flags; unsigned long cpu_flags;
spinlock_t lock; spinlock_t lock;
} ips_wait_queue_t; } ips_wait_queue_t;
...@@ -979,8 +1087,8 @@ typedef struct ips_copp_wait_item { ...@@ -979,8 +1087,8 @@ typedef struct ips_copp_wait_item {
typedef struct ips_copp_queue { typedef struct ips_copp_queue {
struct ips_copp_wait_item *head; struct ips_copp_wait_item *head;
struct ips_copp_wait_item *tail; struct ips_copp_wait_item *tail;
u_int32_t count; int count;
u_int32_t cpu_flags; unsigned long cpu_flags;
spinlock_t lock; spinlock_t lock;
} ips_copp_queue_t; } ips_copp_queue_t;
...@@ -994,27 +1102,27 @@ typedef struct { ...@@ -994,27 +1102,27 @@ typedef struct {
int (*isintr)(struct ips_ha *); int (*isintr)(struct ips_ha *);
int (*init)(struct ips_ha *); int (*init)(struct ips_ha *);
int (*erasebios)(struct ips_ha *); int (*erasebios)(struct ips_ha *);
int (*programbios)(struct ips_ha *, char *, u_int32_t, u_int32_t); int (*programbios)(struct ips_ha *, char *, uint32_t, uint32_t);
int (*verifybios)(struct ips_ha *, char *, u_int32_t, u_int32_t); int (*verifybios)(struct ips_ha *, char *, uint32_t, uint32_t);
void (*statinit)(struct ips_ha *); void (*statinit)(struct ips_ha *);
void (*intr)(struct ips_ha *); void (*intr)(struct ips_ha *);
void (*enableint)(struct ips_ha *); void (*enableint)(struct ips_ha *);
u_int32_t (*statupd)(struct ips_ha *); uint32_t (*statupd)(struct ips_ha *);
} ips_hw_func_t; } ips_hw_func_t;
typedef struct ips_ha { typedef struct ips_ha {
u_int8_t ha_id[IPS_MAX_CHANNELS+1]; uint8_t ha_id[IPS_MAX_CHANNELS+1];
u_int32_t dcdb_active[IPS_MAX_CHANNELS]; uint32_t dcdb_active[IPS_MAX_CHANNELS];
u_int32_t io_addr; /* Base I/O address */ uint32_t io_addr; /* Base I/O address */
u_int8_t irq; /* IRQ for adapter */ uint8_t irq; /* IRQ for adapter */
u_int8_t ntargets; /* Number of targets */ uint8_t ntargets; /* Number of targets */
u_int8_t nbus; /* Number of buses */ uint8_t nbus; /* Number of buses */
u_int8_t nlun; /* Number of Luns */ uint8_t nlun; /* Number of Luns */
u_int16_t ad_type; /* Adapter type */ uint16_t ad_type; /* Adapter type */
u_int16_t host_num; /* Adapter number */ uint16_t host_num; /* Adapter number */
u_int32_t max_xfer; /* Maximum Xfer size */ uint32_t max_xfer; /* Maximum Xfer size */
u_int32_t max_cmds; /* Max concurrent commands */ uint32_t max_cmds; /* Max concurrent commands */
u_int32_t num_ioctl; /* Number of Ioctls */ uint32_t num_ioctl; /* Number of Ioctls */
ips_stat_t sp; /* Status packer pointer */ ips_stat_t sp; /* Status packer pointer */
struct ips_scb *scbs; /* Array of all CCBS */ struct ips_scb *scbs; /* Array of all CCBS */
struct ips_scb *scb_freelist; /* SCB free list */ struct ips_scb *scb_freelist; /* SCB free list */
...@@ -1028,23 +1136,24 @@ typedef struct ips_ha { ...@@ -1028,23 +1136,24 @@ typedef struct ips_ha {
IPS_NVRAM_P5 *nvram; /* NVRAM page 5 data */ IPS_NVRAM_P5 *nvram; /* NVRAM page 5 data */
IPS_SUBSYS *subsys; /* Subsystem parameters */ IPS_SUBSYS *subsys; /* Subsystem parameters */
char *ioctl_data; /* IOCTL data area */ char *ioctl_data; /* IOCTL data area */
u_int32_t ioctl_datasize; /* IOCTL data size */ uint32_t ioctl_datasize; /* IOCTL data size */
u_int32_t cmd_in_progress; /* Current command in progress*/ uint32_t cmd_in_progress; /* Current command in progress*/
unsigned long flags; /* HA flags */ unsigned long flags; /* HA flags */
u_int8_t waitflag; /* are we waiting for cmd */ uint8_t waitflag; /* are we waiting for cmd */
u_int8_t active; uint8_t active;
u_int16_t reset_count; /* number of resets */ int ioctl_reset; /* IOCTL Requested Reset Flag */
u_int32_t last_ffdc; /* last time we sent ffdc info*/ uint16_t reset_count; /* number of resets */
u_int8_t revision_id; /* Revision level */ time_t last_ffdc; /* last time we sent ffdc info*/
u_int16_t device_id; /* PCI device ID */ uint8_t revision_id; /* Revision level */
u_int8_t slot_num; /* PCI Slot Number */ uint16_t device_id; /* PCI device ID */
u_int16_t subdevice_id; /* Subsystem device ID */ uint8_t slot_num; /* PCI Slot Number */
u_int8_t ioctl_order; /* Number of pages in ioctl */ uint16_t subdevice_id; /* Subsystem device ID */
u_int8_t reserved2; /* Empty */ uint8_t ioctl_order; /* Number of pages in ioctl */
u_int8_t bios_version[8]; /* BIOS Revision */ uint8_t reserved2; /* Empty */
u_int32_t mem_addr; /* Memory mapped address */ uint8_t bios_version[8]; /* BIOS Revision */
u_int32_t io_len; /* Size of IO Address */ uint32_t mem_addr; /* Memory mapped address */
u_int32_t mem_len; /* Size of memory address */ uint32_t io_len; /* Size of IO Address */
uint32_t mem_len; /* Size of memory address */
char *mem_ptr; /* Memory mapped Ptr */ char *mem_ptr; /* Memory mapped Ptr */
char *ioremap_ptr; /* ioremapped memory pointer */ char *ioremap_ptr; /* ioremapped memory pointer */
ips_hw_func_t func; /* hw function pointers */ ips_hw_func_t func; /* hw function pointers */
...@@ -1054,9 +1163,9 @@ typedef struct ips_ha { ...@@ -1054,9 +1163,9 @@ typedef struct ips_ha {
spinlock_t ips_lock; spinlock_t ips_lock;
struct semaphore ioctl_sem; /* Semaphore for new IOCTL's */ struct semaphore ioctl_sem; /* Semaphore for new IOCTL's */
struct semaphore flash_ioctl_sem; /* Semaphore for Flashing */ struct semaphore flash_ioctl_sem; /* Semaphore for Flashing */
char *save_ioctl_data; /* Save Area for ioctl_data */ char *flash_data; /* Save Area for flash data */
u8 save_ioctl_order; /* Save Area for ioctl_order */ u8 flash_order; /* Save Area for flash size order */
u32 save_ioctl_datasize;/* Save Area for ioctl_datasize */ u32 flash_datasize; /* Save Area for flash data size */
} ips_ha_t; } ips_ha_t;
typedef void (*ips_scb_callback) (ips_ha_t *, struct ips_scb *); typedef void (*ips_scb_callback) (ips_ha_t *, struct ips_scb *);
...@@ -1067,45 +1176,47 @@ typedef void (*ips_scb_callback) (ips_ha_t *, struct ips_scb *); ...@@ -1067,45 +1176,47 @@ typedef void (*ips_scb_callback) (ips_ha_t *, struct ips_scb *);
typedef struct ips_scb { typedef struct ips_scb {
IPS_HOST_COMMAND cmd; IPS_HOST_COMMAND cmd;
IPS_DCDB_TABLE dcdb; IPS_DCDB_TABLE dcdb;
u_int8_t target_id; uint8_t target_id;
u_int8_t bus; uint8_t bus;
u_int8_t lun; uint8_t lun;
u_int8_t cdb[12]; uint8_t cdb[12];
u_int32_t scb_busaddr; uint32_t scb_busaddr;
u_int32_t data_busaddr; uint32_t data_busaddr;
u_int32_t timeout; uint32_t timeout;
u_int8_t basic_status; uint8_t basic_status;
u_int8_t extended_status; uint8_t extended_status;
u_int8_t breakup; uint8_t breakup;
u_int8_t sg_break; uint8_t sg_break;
u_int32_t data_len; uint32_t data_len;
u_int32_t sg_len; uint32_t sg_len;
u_int32_t flags; uint32_t flags;
u_int32_t op_code; uint32_t op_code;
IPS_SG_LIST *sg_list; IPS_SG_LIST *sg_list;
Scsi_Cmnd *scsi_cmd; Scsi_Cmnd *scsi_cmd;
struct ips_scb *q_next; struct ips_scb *q_next;
ips_scb_callback callback; ips_scb_callback callback;
struct semaphore *sem; struct semaphore *sem;
uint32_t sg_busaddr;
int sg_count;
} ips_scb_t; } ips_scb_t;
typedef struct ips_scb_pt { typedef struct ips_scb_pt {
IPS_HOST_COMMAND cmd; IPS_HOST_COMMAND cmd;
IPS_DCDB_TABLE dcdb; IPS_DCDB_TABLE dcdb;
u_int8_t target_id; uint8_t target_id;
u_int8_t bus; uint8_t bus;
u_int8_t lun; uint8_t lun;
u_int8_t cdb[12]; uint8_t cdb[12];
u_int32_t scb_busaddr; uint32_t scb_busaddr;
u_int32_t data_busaddr; uint32_t data_busaddr;
u_int32_t timeout; uint32_t timeout;
u_int8_t basic_status; uint8_t basic_status;
u_int8_t extended_status; uint8_t extended_status;
u_int16_t breakup; uint16_t breakup;
u_int32_t data_len; uint32_t data_len;
u_int32_t sg_len; uint32_t sg_len;
u_int32_t flags; uint32_t flags;
u_int32_t op_code; uint32_t op_code;
IPS_SG_LIST *sg_list; IPS_SG_LIST *sg_list;
Scsi_Cmnd *scsi_cmd; Scsi_Cmnd *scsi_cmd;
struct ips_scb *q_next; struct ips_scb *q_next;
...@@ -1116,20 +1227,87 @@ typedef struct ips_scb_pt { ...@@ -1116,20 +1227,87 @@ typedef struct ips_scb_pt {
* Passthru Command Format * Passthru Command Format
*/ */
typedef struct { typedef struct {
u_int8_t CoppID[4]; uint8_t CoppID[4];
u_int32_t CoppCmd; uint32_t CoppCmd;
u_int32_t PtBuffer; uint32_t PtBuffer;
u_int8_t *CmdBuffer; uint8_t *CmdBuffer;
u_int32_t CmdBSize; uint32_t CmdBSize;
ips_scb_pt_t CoppCP; ips_scb_pt_t CoppCP;
u_int32_t TimeOut; uint32_t TimeOut;
u_int8_t BasicStatus; uint8_t BasicStatus;
u_int8_t ExtendedStatus; uint8_t ExtendedStatus;
u_int16_t reserved; uint8_t AdapterType;
uint8_t reserved;
} ips_passthru_t; } ips_passthru_t;
#endif #endif
/* The Version Information below gets created by SED during the build process. */
/* Do not modify the next line; it's what SED is looking for to do the insert. */
/* Version Info */
/*************************************************************************
*
* VERSION.H -- version numbers and copyright notices in various formats
*
*************************************************************************/
#define IPS_VER_MAJOR 5
#define IPS_VER_MAJOR_STRING "5"
#define IPS_VER_MINOR 10
#define IPS_VER_MINOR_STRING "10"
#define IPS_VER_BUILD_STRING "13"
#define IPS_VER_STRING "5.10.13-BETA"
#define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All Rights Reserved."
#define IPS_NT_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002."
/* Version numbers for various adapters */
#define IPS_VER_SERVERAID1 "2.25.01"
#define IPS_VER_SERVERAID2 "2.88.13"
#define IPS_VER_NAVAJO "2.88.13"
#define IPS_VER_SERVERAID3 "5.10.01"
#define IPS_VER_SERVERAID4H "5.10.01"
#define IPS_VER_SERVERAID4MLx "5.10.01"
#define IPS_VER_SARASOTA "5.10.05"
/* Compatability IDs for various adapters */
#define IPS_COMPAT_UNKNOWN ""
#define IPS_COMPAT_CURRENT "SA510"
#define IPS_COMPAT_SERVERAID1 "2.25.01"
#define IPS_COMPAT_SERVERAID2 "2.88.13"
#define IPS_COMPAT_NAVAJO "2.88.13"
#define IPS_COMPAT_KIOWA "2.88.13"
#define IPS_COMPAT_SERVERAID3H "5.10.01"
#define IPS_COMPAT_SERVERAID3L "5.10.01"
#define IPS_COMPAT_SERVERAID4H "5.10.01"
#define IPS_COMPAT_SERVERAID4M "SA510"
#define IPS_COMPAT_SERVERAID4L "SA510"
#define IPS_COMPAT_SERVERAID4Mx "SA510"
#define IPS_COMPAT_SERVERAID4Lx "SA510"
#define IPS_COMPAT_SARASOTA "SA510"
#define IPS_COMPAT_BIOS "SA510"
#define IPS_COMPAT_MAX_ADAPTER_TYPE 14
#define IPS_COMPAT_ID_LENGTH 8
#define IPS_DEFINE_COMPAT_TABLE(tablename) \
char tablename[IPS_COMPAT_MAX_ADAPTER_TYPE] [IPS_COMPAT_ID_LENGTH] = { \
IPS_COMPAT_UNKNOWN, \
IPS_COMPAT_SERVERAID1, \
IPS_COMPAT_SERVERAID2, \
IPS_COMPAT_NAVAJO, \
IPS_COMPAT_KIOWA, \
IPS_COMPAT_SERVERAID3H, \
IPS_COMPAT_SERVERAID3L, \
IPS_COMPAT_SERVERAID4H, \
IPS_COMPAT_SERVERAID4M, \
IPS_COMPAT_SERVERAID4L, \
IPS_COMPAT_SERVERAID4Mx, \
IPS_COMPAT_SERVERAID4Lx, \
IPS_COMPAT_SARASOTA, \
IPS_COMPAT_SARASOTA \
}
/* /*
* Overrides for Emacs so that we almost follow Linus's tabbing style. * Overrides for Emacs so that we almost follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically * Emacs will notice this stuff at the end of the file and automatically
......
...@@ -13,7 +13,7 @@ dep_tristate ' Sequencer support' CONFIG_SND_SEQUENCER $CONFIG_SND ...@@ -13,7 +13,7 @@ dep_tristate ' Sequencer support' CONFIG_SND_SEQUENCER $CONFIG_SND
if [ "$CONFIG_SND_SEQUENCER" != "n" ]; then if [ "$CONFIG_SND_SEQUENCER" != "n" ]; then
dep_tristate ' Sequencer dummy client' CONFIG_SND_SEQ_DUMMY $CONFIG_SND_SEQUENCER dep_tristate ' Sequencer dummy client' CONFIG_SND_SEQ_DUMMY $CONFIG_SND_SEQUENCER
fi fi
dep_bool ' OSS API emulation' CONFIG_SND_OSSEMUL $CONFIG_SND dep_mbool ' OSS API emulation' CONFIG_SND_OSSEMUL $CONFIG_SND
if [ "$CONFIG_SND_OSSEMUL" = "y" ]; then if [ "$CONFIG_SND_OSSEMUL" = "y" ]; then
dep_tristate ' OSS Mixer API' CONFIG_SND_MIXER_OSS $CONFIG_SND dep_tristate ' OSS Mixer API' CONFIG_SND_MIXER_OSS $CONFIG_SND
dep_tristate ' OSS PCM API' CONFIG_SND_PCM_OSS $CONFIG_SND dep_tristate ' OSS PCM API' CONFIG_SND_PCM_OSS $CONFIG_SND
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment