From: Markus Lidel <Markus.Lidel@shadowconnect.com>

- use compat_ptr to convert 32-bit pointer to 64-bit pointer in
  i2o_cfg_passthru32.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

- i2o.h and i2o-dev.h are now formated using Lindent.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

- New notification system for i2o_driver's which get now a notification if a
  I2O controller is added or removed.

- SCSI-OSM now uses notifications to create the Scsi_Host to the
  corresponding I2O controller.

- Use __scsi_add_device to preset hostdata.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

- Add a new function __scsi_add_device, which has an additional parameter
  compared to scsi_add_device.  This parameter is used to preset the hostdata
  pointer.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

generic:
- split i2o_core into several files, grouped by same function
- I2O devices are now registered as devices and show up in sysfs
- the various I2O OSM's (e.g. i2o_scsi) now register in the I2O core
   and also use the 2.6 driver mechanism.
- I2O messages will be created in the message frame instead of creating
   it in local memory and copying it over later on.
- context list for 64 pointer to 32 context conversion now uses a
   double linked list

PCI:
- driver now registers as a PCI device driver and uses probe function to
   get the possible controllers. (needed for hotplugging)
- converted DMA handling from pci_* to generic dma_* functions

Block OSM:
- use one request queue per I2O block device instead of one per
   controller
- I2O block devices and queues are allocated dynamically and therefore
   no more limit of block devices

SCSI OSM:
- corrected bug in SCSI reply function which caused the memory to be
   freed before the done function was called.
- one I2O controller registers as one scsi host instead of one scsi host
   per channel
- no more ch,id,lun => tid mapping table

Config OSM:
- added ioctl32 for passthru and getiops.
- removed ioctl_html

Documentation:
- removed TODO entries from README
- moved docs under Documentation/i2o
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	Mukker, Atul <Atulm@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The problems with domain validation were just the tip of the iceberg in
the sym2 driver.  Most of its problems seem to come from an overly
complex set of negotiating rules, which I've swept away with this patch.

I also removed the ability to set parameters in the on-board bios and
have the driver respect them. (this hasn't worked for a while in 2.6
because after the driver sets them, Domain Validation resets them
again).

Finally, there was a really nasty bug where the driver negotiates
improperly when turning off DT clocking.  If you simply turn it off, the
driver originally fell back to using the old WDTR/SDTR method of
negotiation.  However, since it thought the bus was already wide, it
only emitted a SDTR, which causes the device to reset from wide to
narrow.  Hence the driver thinks the device is wide and the device
thinks it is narrow => boom.

I redid the negotiation to predicate PPR messages on whether the device
claims support for them or not.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

So, the kernel needs a 'sleep', but that token is far too common, so I
chose ssleep().

scsi_sleep() is a manually implemented msleep(), so I remove it.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

 - cleanup checks in ->queuecommand, we only get here either for
   inquiry or a found device now
 - DCBmap in the acb is gone, was only used for debug prints after
   the prevous changes
 - kill some more debugging keyed of by ->scan_devices
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

hrrible code like all proc_info implementations and no really usefull
information.  We might want to add sysfs attributes if some users really
miss anything.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Andrey Panin <pazke@donpac.ru>

attached patch fixes qla1280 SCSI driver build failure on visws due to
undefined RD_REG_WORD_dmasync() macro.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

There's a bad hang where the driver locks the system solid trying to do
domain validation with certain devices.  The one I've managed to
reproduce it with is a Quantum Atlas.

What happens is that setting the offset to zero is an async negotiation
message.  However, the driver still seems to have DT set (which is
illegal).  Most devices just reject this as stupid, but the Quantum
seems to try to obey it and hangs the bus.

The simple fix is to reset all PPR options when the offset is set to
zero.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Ran into a couple small issues with the patch. First,
blk_queue_resize_tags wasn't getting exported, so I sent Jens a patch to
fix this, which he has now sent upstream. Second, the comment above
blk_queue_resize_tags says the queue_lock must be held when calling this
routine. Attached is an updated patch that grabs the lock. Other than
that, it looks good.

James Bottomley wrote:
> On Tue, 2004-08-03 at 10:50, Brian King wrote:
>>Currently, it is possible to call scsi_activate_tcq with a small queue depth,
>>then later call scsi_adjust_queue_depth with a larger queue depth. This results
>>in the scsi layer having a larger queue depth than the block layer knows about.
>>This results in these additional commands being issued as untagged ops rather than
>>tagged ops. This patch changes scsi_activate_tcq to call blk_queue_init_tags with
>>the maximum supported number of tags so this cannot occur.
>
>
> Sorry, been away at conferences with not enough time to remember what
> went on here.
>
> The reason it looks the way it does is historical...when the blk layer
> tcq interfaces were created, there was no way to resize the queue.  Jens
> later added resize (for me) and I forgot to incorporate it into the
> code.
>
> Another small point is that the max number of tags can be greater than
> 256.  256 is a SPI limit only (and even the qla1280, a SPI card which
> could use the tag as its global queue index would take > 256).  The
> limit in scsi_adjust_queue_depth has long since been obsoleted by our
> dynamic command allocation.
>
> I think the attached should work correctly (as long as it compiles...I
> coded it up on the flight home).
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The non unique SCSI ioctls:

SCSI_IOCTL_SEND_COMMAND
SCSI_IOCTL_TEST_UNIT_READY
SCSI_IOCTL_BENCHMARK_COMMAND
SCSI_IOCTL_SYNC
SCSI_IOCTL_START_UNIT
SCSI_IOCTL_STOP_UNIT

Have been deprecated for a while now.  We should make the kernel
complain when a program actually uses one of them, so users have had
adequate warning before they are removed.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/megaraid/megaraid_mm.c: In function `mraid_mm_init':
drivers/scsi/megaraid/megaraid_mm.c:1069: `mraid_mm_compat_ioctl' undeclared (first use in this function)
drivers/scsi/megaraid/megaraid_mm.c:1069: (Each undeclared identifier is reported only once
drivers/scsi/megaraid/megaraid_mm.c:1069: for each function it appears in.)
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

make it universally include linux/ioctl32.h for
its compat ioctl.

This fixes a build failure on parisc64
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Mukker, Atul <Atulm@lsil.com>

This is a complete re-write to replace the now obsoleted megaraid2
driver.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch against scsi-misc-2.6 reorders a call to scsi_forget_host in
the scsi_remove_host function. This removes the error message
"Synchronizing SCSI cache..." on rmmod of a scsi host driver module as
shown in example output 1 and 2 below.

I had previous created a much more complicated patch to work around this
problem. In response Christoph mention a simpler solution (pointer to
thread below) which is this patch.

http://marc.theaimsgroup.com/?l=linux-scsi&m=108720042210331&w=2

Example output.

1.) Before patch.

elm:~# scsi1 : scsi_debug, version 1.73 [20040518], dev_size_mb=8,
opts=0x0
  Vendor: Linux     Model: scsi_debug        Rev: 0004
  Type:   Direct-Access                      ANSI SCSI revision: 03
SCSI device sdc: 16384 512-byte hdwr sectors (8 MB)
SCSI device sdc: drive cache: write back
 sdc: unknown partition table
Attached scsi disk sdc at scsi1, channel 0, id 0, lun 0
Attached scsi generic sg4 at scsi1, channel 0, id 0, lun 0,  type 0
Synchronizing SCSI cache for disk sdc: <4>FAILED
  status = 0, message = 00, host = 1, driver = 00

2.) After patch.

elm:~# scsi1 : scsi_debug, version 1.73 [20040518], dev_size_mb=8, opts=0x0
  Vendor: Linux     Model: scsi_debug        Rev: 0004
  Type:   Direct-Access                      ANSI SCSI revision: 03
SCSI device sdc: 16384 512-byte hdwr sectors (8 MB)
SCSI device sdc: drive cache: write back
 sdc: unknown partition table
Attached scsi disk sdc at scsi1, channel 0, id 0, lun 0
Attached scsi generic sg4 at scsi1, channel 0, id 0, lun 0,  type 0
Synchronizing SCSI cache for disk sdc:
Signed-off-by: Mike Anderson <andmike@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Highlights of this release:
- Patch provided by Christoph Hellwig to remove the isense code.
- Fix compile errors when CONFIG_PROC_FS=n.
- A fix for the module parameter "mptscsih" which was not being exported.
- The port of the 2.05.17 thru 2.05.23 of the lk 2.4 mpt driver.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Switch sd.c device number allocation to use idr, this limits memory
usage for lowend setups and highend setups are only limited by the
available names now.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	Kenn Humborg <kenn@linux.ie>

round line 2470 in NCR5380.c, if a command fails, and AUTOSENSE is on,
the current command is converted into a REQUEST_SENSE command and
put at the top of the request queue.  Part of this setup, is setting
up cmd->SCp to point at the sense_buffer, so that the received sense
data goes straight into the sense buffer.

Around line 1730, NCR5380_select() calls initialize_SCp() which ends
up clobbering cmd->SCp, and the sense data get written into the 
original request buffer.

This is what happens if cmd->use_sg = 0.  I haven't looked at what
happens if use_sg is non-zero, but I expect the effect will be the same.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Here are some changes from Adaptec for the AACRAID driver.

Change the pae_support flag to dac_support.  This was suggested sometime
last year and never made it in.
Fix some cast problems in pci_set_dma_mask.  Was casting the mask to
dma_addr_t when it should be a u64.
Fix SCp.ptr problem, should be SCp.dma_handle.

Applies to the scsi-misc bk tree.

Signed-off by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

> Andrew Vasquez wrote:
>
> >
> >This allocation should be done with GFP_ATOMIC flags.  The attached
> >patch should apply cleanly to any recent kernel
> >
>
> and seems to work fine.
>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

I got the following warning in 2.6.8-rc3-mm2:

<--  snip  -->

...
  CC      drivers/scsi/gdth.o
drivers/scsi/gdth.c:622:1: warning: "__devinitdata" redefined
In file included from include/linux/moduleparam.h:4,
                 from include/linux/module.h:20,
                 from drivers/scsi/gdth.c:375:
include/linux/init.h:227:1: warning: this is the location of the
previous definition
...

<--  snip  -->


The #define in question seems bogus, and the following patch simply
removes it:
Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Here is a patch from Adaptec for new adapter support.
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Nishanth Aravamudan <nacc@us.ibm.com>
Subject: [PATCH] scsi/ipr: replace schedule_timeout() with msleep()
Description: Use msleep() instead of schedule_timeout() to
guarantee the task delays for the desired time.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The following patch adds an adapter response code to the
table in the driver to prevent an error from being logged
when this response is received.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This fixes ipr to only allow eh initiated start_unit commands
following erp to disk devices.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The following patch fixes a hang in i/o that could occur if an
adapter was ever declared "dead" by the ipr driver due to repeated
failed attempts to revive the card. The patch now allows ipr to fail
new commands when in this state rather than endlessly return
SCSI_MLQUEUE_HOST_BUSY.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Mika Kukkonen <mika@osdl.org>
The following patch fixes some sparse warnings.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch correctly enables tagged command queuing for the ipr driver.
I had misinterpreted scsi_mid_low_api.txt. The following patch has the
appropriate scsi_activate_tcq/scsi_deactivate_tcq calls.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Alan Cox <alan@redhat.com>
Subject: PATCH: Fix assorted dma_addr_t typing errors in ipr driver
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Add a couple new devices supported by the ipr device driver. This patch
has already been sent to pciids-devel@lists.sourceforge.net.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The following patch adds my email address to the block comment
at the start of each file of the ipr driver to make it easier to find.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The following patch converts ipr to use a kref rather than a kobject to
do reference counting on an internal data structure. The added overhead
of a kobject is not needed.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Francois Romieu <romieu@fr.zoreil.com>
Subject: [PATCH 2.6.7-mm3] ipr: minor fixes and assorted nit

- balance pci_enable_device() with pci_disable_device() where appropriate;
- pci_release_regions() replaces release_mem_region();
- ipr_alloc_mem() can not simply issue a call to ipr_free_mem() when
  something goes wrong as it would lead to pci_free_consistent() of
  unset data. Let ipr_alloc_mem() carefully release whatever it has
  allocated instead;
- no need to memset(..., 0, ...) an area returned by pci_alloc_consistent;
- ipr_probe_ioa:
  + DMA_32BIT_MASK for all;
  + error path rework (includes bug fix when ipr_alloc_mem fails);
- ipr_init() can fail: return adequate status code.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch adds support for 2 new ipr adapters.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>