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

Commit c1a15468 authored by Jack Hammer's avatar Jack Hammer Committed by James Bottomley
Browse files

[SCSI] ServeRAID V7.12.02 



I am resubmitting the 2.6 kernel patch for the Version 7.12.02 ips driver.
I have eliminated a couple of inappropriate changes pointed out by Arjan.

Signed-off-by: default avatarJack Hammer <jack_hammer@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent f7ff898a

drivers/scsi/ips.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -133,10 +133,12 @@ 
/* 6.10.00  - Remove 1G Addressing Limitations                               */

/* 6.10.00  - Remove 1G Addressing Limitations                               */

/* 6.11.xx  - Get VersionInfo buffer off the stack !              DDTS 60401 */

/* 6.11.xx  - Get VersionInfo buffer off the stack !              DDTS 60401 */

/* 6.11.xx  - Make Logical Drive Info structure safe for DMA      DDTS 60639 */

/* 6.11.xx  - Make Logical Drive Info structure safe for DMA      DDTS 60639 */

/* 7.10.xx  - Add highmem_io flag in SCSI Templete for 2.4 kernels           */

/* 7.10.18  - Add highmem_io flag in SCSI Templete for 2.4 kernels           */

/*          - Fix path/name for scsi_hosts.h include for 2.6 kernels         */

/*          - Fix path/name for scsi_hosts.h include for 2.6 kernels         */

/*          - Fix sort order of 7k                                           */

/*          - Fix sort order of 7k                                           */

/*          - Remove 3 unused "inline" functions                             */

/*          - Remove 3 unused "inline" functions                             */

/* 7.12.xx  - Use STATIC functions whereever possible                        */

/*          - Clean up deprecated MODULE_PARM calls                          */

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

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





/*

/*
@@ -207,8 +209,8 @@ module_param(ips, charp, 0); 
/*

/*

 * DRIVER_VER

 * DRIVER_VER

 */

 */

#define IPS_VERSION_HIGH        "7.10"

#define IPS_VERSION_HIGH        "7.12"

#define IPS_VERSION_LOW         ".18 "

#define IPS_VERSION_LOW         ".02 "





#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)

#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)

#warning "This driver has only been tested on the x86/ia64/x86_64 platforms"

#warning "This driver has only been tested on the x86/ia64/x86_64 platforms"

drivers/scsi/ips.h

+21 −18
Original line number Original line Diff line number Diff line
@@ -87,15 +87,14 @@ 
      #define scsi_set_pci_device(sh,dev) (0)

      #define scsi_set_pci_device(sh,dev) (0)

   #endif

   #endif





   #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

   #ifndef IRQ_NONE

   

      #ifndef irqreturn_t

      typedef void irqreturn_t;

      typedef void irqreturn_t;

      #endif 

      

      #define IRQ_NONE

      #define IRQ_NONE

      #define IRQ_HANDLED

      #define IRQ_HANDLED

      #define IRQ_RETVAL(x)

      #define IRQ_RETVAL(x)

   #endif

   

   #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)

      #define IPS_REGISTER_HOSTS(SHT)      scsi_register_module(MODULE_SCSI_HA,SHT)

      #define IPS_REGISTER_HOSTS(SHT)      scsi_register_module(MODULE_SCSI_HA,SHT)

      #define IPS_UNREGISTER_HOSTS(SHT)    scsi_unregister_module(MODULE_SCSI_HA,SHT)

      #define IPS_UNREGISTER_HOSTS(SHT)    scsi_unregister_module(MODULE_SCSI_HA,SHT)

      #define IPS_ADD_HOST(shost,device)

      #define IPS_ADD_HOST(shost,device)
@@ -124,6 +123,10 @@ 
      #define min(x,y) ((x) < (y) ? x : y)

      #define min(x,y) ((x) < (y) ? x : y)

   #endif

   #endif

   

   

   #ifndef __iomem       /* For clean compiles in earlier kernels without __iomem annotations */

      #define __iomem

   #endif



   #define pci_dma_hi32(a)         ((a >> 16) >> 16)

   #define pci_dma_hi32(a)         ((a >> 16) >> 16)

   #define pci_dma_lo32(a)         (a & 0xffffffff)

   #define pci_dma_lo32(a)         (a & 0xffffffff)
@@ -1206,13 +1209,13 @@ typedef struct { 




#define IPS_VER_MAJOR 7

#define IPS_VER_MAJOR 7

#define IPS_VER_MAJOR_STRING "7"

#define IPS_VER_MAJOR_STRING "7"

#define IPS_VER_MINOR 10

#define IPS_VER_MINOR 12

#define IPS_VER_MINOR_STRING "10"

#define IPS_VER_MINOR_STRING "12"

#define IPS_VER_BUILD 18

#define IPS_VER_BUILD 02

#define IPS_VER_BUILD_STRING "18"

#define IPS_VER_BUILD_STRING "02"

#define IPS_VER_STRING "7.10.18"

#define IPS_VER_STRING "7.12.02"

#define IPS_RELEASE_ID 0x00020000

#define IPS_RELEASE_ID 0x00020000

#define IPS_BUILD_IDENT 731

#define IPS_BUILD_IDENT 761

#define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All Rights Reserved."

#define IPS_LEGALCOPYRIGHT_STRING "(C) Copyright IBM Corp. 1994, 2002. All Rights Reserved."

#define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to 2004. All Rights Reserved."

#define IPS_ADAPTECCOPYRIGHT_STRING "(c) Copyright Adaptec, Inc. 2002 to 2004. All Rights Reserved."

#define IPS_DELLCOPYRIGHT_STRING "(c) Copyright Dell 2004. All Rights Reserved."

#define IPS_DELLCOPYRIGHT_STRING "(c) Copyright Dell 2004. All Rights Reserved."
@@ -1223,12 +1226,12 @@ typedef struct { 
#define IPS_VER_SERVERAID2 "2.88.13"

#define IPS_VER_SERVERAID2 "2.88.13"

#define IPS_VER_NAVAJO "2.88.13"

#define IPS_VER_NAVAJO "2.88.13"

#define IPS_VER_SERVERAID3 "6.10.24"

#define IPS_VER_SERVERAID3 "6.10.24"

#define IPS_VER_SERVERAID4H "7.10.11"

#define IPS_VER_SERVERAID4H "7.12.02"

#define IPS_VER_SERVERAID4MLx "7.10.18"

#define IPS_VER_SERVERAID4MLx "7.12.02"

#define IPS_VER_SARASOTA "7.10.18"

#define IPS_VER_SARASOTA "7.12.02"

#define IPS_VER_MARCO "7.10.18"

#define IPS_VER_MARCO "7.12.02"

#define IPS_VER_SEBRING "7.10.18"

#define IPS_VER_SEBRING "7.12.02"

#define IPS_VER_KEYWEST "7.10.18"

#define IPS_VER_KEYWEST "7.12.02"





/* Compatability IDs for various adapters */

/* Compatability IDs for various adapters */

#define IPS_COMPAT_UNKNOWN ""

#define IPS_COMPAT_UNKNOWN ""