Commit 6fb0caa4 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

parents 7cfa132c fdd0edf2
...@@ -1004,8 +1004,8 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) ...@@ -1004,8 +1004,8 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
return FAILED; return FAILED;
} }
fc->rst_pkt->eh_state = SCSI_STATE_UNUSED; fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
return SUCCESS;
#endif #endif
return SUCCESS;
} }
static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt) static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
......
...@@ -1264,14 +1264,12 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo, ...@@ -1264,14 +1264,12 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
} }
switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) { switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
case AHC_DEV_Q_BASIC: case AHC_DEV_Q_BASIC:
scsi_adjust_queue_depth(sdev, scsi_set_tag_type(sdev, MSG_SIMPLE_TAG);
MSG_SIMPLE_TASK, scsi_activate_tcq(sdev, dev->openings + dev->active);
dev->openings + dev->active);
break; break;
case AHC_DEV_Q_TAGGED: case AHC_DEV_Q_TAGGED:
scsi_adjust_queue_depth(sdev, scsi_set_tag_type(sdev, MSG_ORDERED_TAG);
MSG_ORDERED_TASK, scsi_activate_tcq(sdev, dev->openings + dev->active);
dev->openings + dev->active);
break; break;
default: default:
/* /*
...@@ -1280,9 +1278,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo, ...@@ -1280,9 +1278,7 @@ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
* serially on the controller/device. This should * serially on the controller/device. This should
* remove some latency. * remove some latency.
*/ */
scsi_adjust_queue_depth(sdev, scsi_deactivate_tcq(sdev, 2);
/*NON-TAGGED*/0,
/*queue depth*/2);
break; break;
} }
} }
...@@ -1635,9 +1631,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel, ...@@ -1635,9 +1631,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel,
spi_period(starget) = tinfo->curr.period; spi_period(starget) = tinfo->curr.period;
spi_width(starget) = tinfo->curr.width; spi_width(starget) = tinfo->curr.width;
spi_offset(starget) = tinfo->curr.offset; spi_offset(starget) = tinfo->curr.offset;
spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0;
spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ; spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0;
spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ; spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0;
spi_display_xfer_agreement(starget); spi_display_xfer_agreement(starget);
break; break;
} }
...@@ -2429,12 +2425,14 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt) ...@@ -2429,12 +2425,14 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt)
unsigned int ppr_options = tinfo->goal.ppr_options unsigned int ppr_options = tinfo->goal.ppr_options
& ~MSG_EXT_PPR_DT_REQ; & ~MSG_EXT_PPR_DT_REQ;
unsigned int period = tinfo->goal.period; unsigned int period = tinfo->goal.period;
unsigned int width = tinfo->goal.width;
unsigned long flags; unsigned long flags;
struct ahc_syncrate *syncrate; struct ahc_syncrate *syncrate;
if (dt) { if (dt) {
period = 9; /* 12.5ns is the only period valid for DT */
ppr_options |= MSG_EXT_PPR_DT_REQ; ppr_options |= MSG_EXT_PPR_DT_REQ;
if (!width)
ahc_linux_set_width(starget, 1);
} else if (period == 9) } else if (period == 9)
period = 10; /* if resetting DT, period must be >= 25ns */ period = 10; /* if resetting DT, period must be >= 25ns */
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
enum srp_types { enum srp_types {
SRP_LOGIN_REQ_TYPE = 0x00, SRP_LOGIN_REQ_TYPE = 0x00,
SRP_LOGIN_RSP_TYPE = 0xC0, SRP_LOGIN_RSP_TYPE = 0xC0,
SRP_LOGIN_REJ_TYPE = 0x80, SRP_LOGIN_REJ_TYPE = 0xC2,
SRP_I_LOGOUT_TYPE = 0x03, SRP_I_LOGOUT_TYPE = 0x03,
SRP_T_LOGOUT_TYPE = 0x80, SRP_T_LOGOUT_TYPE = 0x80,
SRP_TSK_MGMT_TYPE = 0x01, SRP_TSK_MGMT_TYPE = 0x01,
......
...@@ -133,10 +133,12 @@ ...@@ -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); ...@@ -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"
......
...@@ -87,15 +87,14 @@ ...@@ -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 @@ ...@@ -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 { ...@@ -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 { ...@@ -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 ""
......
...@@ -4149,12 +4149,10 @@ static int __init init_st(void) ...@@ -4149,12 +4149,10 @@ static int __init init_st(void)
do_create_driverfs_files(); do_create_driverfs_files();
return 0; return 0;
} }
if (st_sysfs_class)
class_destroy(st_sysfs_class);
unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
ST_MAX_TAPE_ENTRIES); ST_MAX_TAPE_ENTRIES);
} }
class_destroy(st_sysfs_class);
printk(KERN_ERR "Unable to get major %d for SCSI tapes\n", SCSI_TAPE_MAJOR); printk(KERN_ERR "Unable to get major %d for SCSI tapes\n", SCSI_TAPE_MAJOR);
return 1; return 1;
...@@ -4162,13 +4160,11 @@ static int __init init_st(void) ...@@ -4162,13 +4160,11 @@ static int __init init_st(void)
static void __exit exit_st(void) static void __exit exit_st(void)
{ {
if (st_sysfs_class)
class_destroy(st_sysfs_class);
st_sysfs_class = NULL;
do_remove_driverfs_files(); do_remove_driverfs_files();
scsi_unregister_driver(&st_template.gendrv); scsi_unregister_driver(&st_template.gendrv);
unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0), unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
ST_MAX_TAPE_ENTRIES); ST_MAX_TAPE_ENTRIES);
class_destroy(st_sysfs_class);
kfree(scsi_tapes); kfree(scsi_tapes);
printk(KERN_INFO "st: Unloaded.\n"); printk(KERN_INFO "st: Unloaded.\n");
} }
......
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