The patch to close all the open/close/hotplug races in sr left the
module refcounting broken so that the ULD housing the CD device now
can't be removed until the device itself is removed.

This patch (structurally identical to the one for sd.c to perform the
same function) fixes the module refcounting.

This fixes a situation where the handler can exit too early.

From: 	Brian King <brking@us.ibm.com>

Plumb old error handling into new eh infrastructure.

From: 	Bob Tracy <rct@gherkin.frus.com>

fix remaining style problems after Al ressurrected the drivers.

  Update version number to 8.00.00b12-k.

 drivers/scsi/qla2xxx/qla_version.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

From: 	Andrew Vasquez <andrew.vasquez@qlogic.com>

 drivers/scsi/qla2xxx/ql2300_fw.c |12380 +++++++++++++++++++--------------------
 drivers/scsi/qla2xxx/ql2322_fw.c |11812 ++++++++++++++++++-------------------
 drivers/scsi/qla2xxx/ql6312_fw.c |10174 ++++++++++++++++----------------
 drivers/scsi/qla2xxx/ql6322_fw.c |10352 ++++++++++++++++----------------
 4 files changed, 22368 insertions(+), 22350 deletions(-)

  Misc. driver scrubbing:

  	o Use kernel #define for PCI command register bit.

  	o Fix rate-limiting check the queue-depth module
  	  parameter.

  	o Clean-up comments.

 drivers/scsi/qla2xxx/qla_init.c |    2 +-
 drivers/scsi/qla2xxx/qla_mbx.c  |    1 -
 drivers/scsi/qla2xxx/qla_os.c   |    7 +++----
 3 files changed, 4 insertions(+), 6 deletions(-)

  RIO/ZIO fixes:

  	o Reduce register access during RIO operation by checking
  	  for a 'dirtied' signature.

  	o Fix problem where ZIO mode handling could result in a
  	  nasty recursive call-frame.

 drivers/scsi/qla2xxx/qla_os.c |    5 +----
 1 files changed, 1 insertion(+), 4 deletions(-)

  /proc file updates:

  	o Address 'unaligned access' message on ia64 platorms
  	  while displaying bit-field flags.

  	o Iterate through the the OS target array to display
  	  target ID bindings.

 drivers/scsi/qla2xxx/qla_os.c |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

  Jeremy Higdon <jeremy () sgi ! com>:

  	For those to whom this is new (it was discussed on linux-kernel
  	and linux-ia64 I believe), normal PCI register reads imply that
  	PCI DMA writes that occured prior to the PCI MMR (memory mapped
  	register) read (on the PCI bus) will be reflected in system
  	memory once the MMR read is complete.

  	On our platforms, we can speed up the MMR read significantly if
  	that ordering requirement is "relaxed".

  	So I attempted to find the common register reads that don't
  	have a need for this ordering so that I could make them use
  	this faster read.

 drivers/scsi/qla2xxx/qla_def.h  |    3 +++
 drivers/scsi/qla2xxx/qla_iocb.c |    6 +++---
 drivers/scsi/qla2xxx/qla_isr.c  |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

  Fix several problems when handling commands issued to tape devices:

  	1) insure commands are not prematurely returned to the mid-layer
  	   with a failed status during loop/fabric transitions.

  	2) tape commands tend to have rather 'long' timeout values,
  	   unfortunately, as the these values increase into the 17 to
  	   20 minute range (and larger), the cumulative skew of the
  	   RISC's own timer result in commands being held for seconds
  	   beyond their defined timeout values.  Compensate for this
  	   in the driver's command timeout function.

 drivers/scsi/qla2xxx/qla_def.h  |    3 +
 drivers/scsi/qla2xxx/qla_init.c |    4 ++
 drivers/scsi/qla2xxx/qla_isr.c  |   10 ++---
 drivers/scsi/qla2xxx/qla_os.c   |   74 ++++++++++++++++++++++++++++++++++++----
 4 files changed, 79 insertions(+), 12 deletions(-)

  Fix problem where during ISP initialization in a volatile topology
  (i.e. fabric environment with large number of streaming RSCNs) the
  driver would loop indefinitely or hang due to termination of an
  invalid thread pid.

 drivers/scsi/qla2xxx/qla_init.c |  142 ++++++++++++++++------------------------
 drivers/scsi/qla2xxx/qla_os.c   |    1
 2 files changed, 60 insertions(+), 83 deletions(-)

  Cleanup retrieval and update of firmware options:

  	o Update only valid for non-(2[12]00) ISPs.
  	o Instruct firmware to return completed IOCBs without
  	  waiting for an ABTS to complete.

 drivers/scsi/qla2xxx/qla_init.c |   79 +++++++++++++++++++++++++---------------
 1 files changed, 50 insertions(+), 29 deletions(-)

  Fix problem where the driver would incorrectly down-cast the target
  loop_id while retrieving link statistics.

 drivers/scsi/qla2xxx/qla_gbl.h |    2 +-
 drivers/scsi/qla2xxx/qla_mbx.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

  Issue a kernel warning message before initiating an ISP abort (big
  hammer) -- additional debugging mechanism in case of event.

 drivers/scsi/qla2xxx/qla_mbx.c  |    9 +++++++++
 drivers/scsi/qla2xxx/qla_os.c   |    2 ++
 drivers/scsi/qla2xxx/qla_rscn.c |    2 ++
 3 files changed, 13 insertions(+)

  Fix problem where port ID binding would not be honoured when
  a device was moved within the fabric.

 drivers/scsi/qla2xxx/qla_init.c |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

  Older, notably the ISP2100, chips have some contraints for the request
  queue depth and number of scatter-gather elements allowed for a
  given command.  For this chip, reduce request queue size to 128 and
  maximum number of scatter-gather entries for a command to 32.

 drivers/scsi/qla2xxx/qla_def.h  |   14 +++-----------
 drivers/scsi/qla2xxx/qla_init.c |    9 +++++----
 drivers/scsi/qla2xxx/qla_iocb.c |   14 +++++++-------
 drivers/scsi/qla2xxx/qla_os.c   |   14 +++++++++-----
 drivers/scsi/qla2xxx/qla_rscn.c |    2 +-
 5 files changed, 25 insertions(+), 28 deletions(-)

  Remove flash support from embedded driver:

  	o Remove unused option-rom variables from host structure.
  	o Remove flash manipulation routines.

 drivers/scsi/qla2xxx/qla_def.h  |    2
 drivers/scsi/qla2xxx/qla_gbl.h  |    8
 drivers/scsi/qla2xxx/qla_init.c |    3
 drivers/scsi/qla2xxx/qla_sup.c  |  446 ----------------------------------------
 4 files changed, 459 deletions(-)

  ISP dump routine fixes:

  	o Properly release hardware_lock in failure path.

  	o Fix inability to complete ISP2100 dump, by properly
  	  reseting the RISC after register reads.

 drivers/scsi/qla2xxx/qla_dbg.c |   34 ++++++++++++----------------------
 1 files changed, 12 insertions(+), 22 deletions(-)

From: 	Moore, Eric Dean <Emoore@lsil.com>

add a timeout field to struct scsi_device and expose it in in sysfs.

This patch allows LLDs to override the default timeout used for scsi devices
and exposes it in sysfs. The default timeout value used is too short for
many RAID array devices, such as those created by the ipr driver.

From: Pavel Machek <pavel@ucw.cz>

Marks threads as needed for suspend.
DESC
aic79xx_osm.c build fix
EDESC

drivers/scsi/aic7xxx/aic79xx_osm.c: In function `ahd_linux_dv_thread':
drivers/scsi/aic7xxx/aic79xx_osm.c:2594: `PF_IOTHREAD' undeclared (first use in this function)

From: Michael Veeck <michael.veeck@gmx.net>
Subject: [Kernel-janitors] [PATCH] drivers/scsi/53c* MIN/MAX removal


Patch (against 2.6.6-rc1) removes unnecessary min/max macros and changes
calls to use kernel.h macros instead.


 drivers/scsi/ncr53c8xx.c      |    6 +++---
 drivers/scsi/sym53c8xx_comm.h |    5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

From: Michael Veeck <michael.veeck@gmx.net>
Subject: [Kernel-janitors] [PATCH] drivers/scsi/nsp MIN/MAX/NUMBER removal

Patch (against 2.6.6-rc1) removes unnecessary min/max/number macros and
changes calls to use kernel.h macros instead.


 drivers/scsi/nsp32.c |   24 ++++++++++++------------
 drivers/scsi/nsp32.h |    4 ----
 2 files changed, 12 insertions(+), 16 deletions(-)

From: Michael Veeck <michael.veeck@gmx.net>
Subject: [Kernel-janitors] [PATCH] drivers/scsi/aic7xxx_old MIN/MAX/NUMBER
	removal

Patch (against 2.6.6-rc1) removes unnecessary min/max/number macros and
changes calls to use kernel.h macros instead.


 drivers/scsi/aic7xxx_old.c              |   43 ++++++++++++++------------------
 drivers/scsi/aic7xxx_old/aic7xxx_proc.c |    6 ++--
 2 files changed, 23 insertions(+), 26 deletions(-)

From: Michael Veeck <michael.veeck@gmx.net>
Subject: [Kernel-janitors] [PATCH] drivers/scsi/pcmcia MIN/MAX/NUMBER removal


Patch (against 2.6.6-rc1) removes unnecessary min/max/number macros and
changes calls to use kernel.h macros instead.


 drivers/scsi/pcmcia/nsp_cs.c |   12 ++++++------
 drivers/scsi/pcmcia/nsp_cs.h |    2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

We cannot call del_timer_sync() from within that timer's handler function!

On one of our big machines we found a problem with posted writes while
running AIM.

Two writes of the Request Queue In pointer went out of order, making
the chip think that it had a queue wrap.

I took advantage of this opportunity to add relaxed reads, which helps
the Altix.  It should not affect other arches.  All reads are relaxed
except for the read of the Semaphore register.

Some buggy USB storage devices can return Unit Attention status for
INQUIRY commands.  The current code in scsi_scan.c checks for ASC = 0x28 =
Not ready to ready transition, but these devices can also return ASC =
0x29 = Power-on or reset occurred.  In addition, the code doesn't retry
the INQUIRY when these codes are received.

Fifth attempt at a PCMCIA SCSI driver for the Symbios 53c500
controller.  This version has all the cleanup Christoph has requested
to date, including removal of support for the obsolete (in 2.6)
proc_info functionality.

Support for additional sysfs class device attributes has been added:
two are read-only (irq, ioport), one is read-write (fast_pio).  The
read-write attribute is a per-instance flag indicating the PIO speed
of the particular HBA: valid values are 1 (enabled -- default) and 0
(disabled).

This patch was causing a boot panic.  Now fixed.

scsi_get_device needs no NULL check

drivers/scsi/sd.c: In function `scsi_disk_release':
drivers/scsi/sd.c:1477: warning: unused variable `sdev'

Move scsi_device_get out of sd probe path to allow module to be unloaded
when devices are not open.

This patch includes the following driver changes:

   1.26.00.038 - Roll driver minor version to 26 to denote kernel 2.6.
                 Add support for cmds_per_lun module parameter.
   1.26.00.039 - Fix bug in tw_chrdev_ioctl() polling code.
                 Fix data_buffer_length usage in tw_chrdev_ioctl().
                 Update contact information.