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

While performing some PCI-X command register tuning with some of
QLogic's cards, I stumbled upon some suspect code in ipr.c.  It appears
the two functions ipr_save_pcix_cmd_reg() and ipr_set_pcix_cmd_reg() are
actually reading/updating the PCI-X capabilities register and not in
fact the PCI-X command register -- some code from
ipr_save_pcix_cmd_reg():

	...
        int pcix_cmd_reg = pci_find_capability(ioa_cfg->pdev, PCI_CAP_ID_PCIX);

        if (pcix_cmd_reg == 0) {
                dev_err(&ioa_cfg->pdev->dev, "Failed to save PCI-X command register\n");
                return -EIO;
        }

pcix_cmd_reg points to the PCI-X capabilities register.  Yet, the read:

        if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg,
                                 &ioa_cfg->saved_pcix_cmd_reg) != PCIBIOS_SUCCESSFUL) {
                dev_err(&ioa_cfg->pdev->dev, "Failed to save PCI-X command register\n");
                return -EIO;
        }

and subsequent update of the bits:

        ioa_cfg->saved_pcix_cmd_reg |= PCI_X_CMD_DPERR_E | PCI_X_CMD_ERO;

should actually apply to the PCI-X Command register 2 bytes further into
config space.  So, the following:

        if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg,

should actually read as:

        if (pci_read_config_word(ioa_cfg->pdev, pcix_cmd_reg + PCI_X_CMD,

The same is true for the 'save' case.

Luckily, most devices hardwire the PCI-X capabilities register so the
write is effectively a NOOP.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The ipr adapters support an adapter command directed at the device
resource called "Query Resource State". It can be used to retrieve
state information about the resource it is sent to, including the
currently negotiated scsi speed. The adapter interface requires the
IPR_RQTYPE_IOACMD to be set on this command, so we set it if the
command code matches.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

This patch adds support for new aacraid cards.
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

Originally, the 53c700 driver implemented queue_depth changing as an
attribute override, primarily as a demonstration of how it should be
done.  Now that a large number of drivers wish to implement this
functionality, it should become an API rather than an attribute
override, since the latter are supposed to be used as one off extensions
rather than the de-facto API.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Update version number to 8.00.02b4-k.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

Resync with latest released firmware -- 3.03.08.

Remove ql6322_fw.c file.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Recent ISP6312 FLX firmware can support both ISP6312 and
ISP6322 chips.  Consolidate ISP6322 handling into the
ISP6312 firmware loader files.

Remove ql6322.c file.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Misc. driver-code scrubbing:

     o Correct qla2300 module description.
     o Resync with latest firmware structure definitions.
     o White-space cleanup.
     o Add additional display of driver internals when debug
       is enabled.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Interrupt handler fixes:

     o Mark HBA offline in case the firmware cannot recover
       after and ISP system-error.
     o Correct issue where the loop-down-timer was not properly
       being cleared during a port-update event.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

     o Issue a big-hammer to recover if the driver is unable
       retrieve the host's loop-id.
     o Correct failure to not add an fc_lun_t object for lun
       0.
     o Interrogate only the relevant bits (peripheral
       qualifier and device-type) of INQUIRY data.
     o Correct issue where driver would incorrectly fail-out
       of initializing an ISP if an device-discovery SNS scan
       failed.
     o Correct issue where the qla2x00_fabric_login() would
       return an incorrect error status during mailbox
       command execution.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Resync with latest NVRAM subsystem ID list.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Address several NVRAM access issues:

     o Add support for write-protected NVRAM chips used with
       ISP2322 and ISP6322.
     o Correct code to not perform an erase data during NVRAM
       update.
     o Correct issuance of NVRAM delay after PCI posting call.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Add support for new transmit/receive sensitivity settings when
updating an ISPs serial-link options.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: Christoph Hellwig <hch@lst.de>

remove dead code, add missing statics
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

This patch updates the fc_transport with statistics for local FC ports
(e.g. Hosts).  The statistics are defined per HBAAPI v2.0 definitions.

Caveats:
------------
- The information below is supplied by a simple test driver 
that does not
  talk to real hardware, but fully acts as a LLDD that supports the
  fc transport.


This patch results in the following in /sys/class:
-----------------------------------------------------

[jsmart@elxware class]$ cd /sys/class
[jsmart@elxware class]$ ls
fc_host       graphics  misc     pci_bus       scsi_host  usb_host
fc_transport  input     net      scsi_device   tty        vc
firmware      mem       netlink  scsi_generic  usb
[jsmart@elxware class]$ cd fc_host
[jsmart@elxware fc_host]$ ls
host4

[jsmart@elxware fc_host]$ cd host4
[jsmart@elxware host4]$ ls
device                 host_link_down_tmo           statistics
[jsmart@elxware host4]$ ls -ld *
lrwxrwxrwx  1 root root    0 Oct 13 17:16 device -> 
../../../devices/platform/host4
-rw-r--r--  1 root root 4096 Oct 13 17:16 host_link_down_tmo
drwxr-xr-x  2 root root    0 Oct 13 17:16 statistics

[jsmart@elxware host4]$ cd statistics
dumped_frames         invalid_crc_count      
prim_seq_protocol_err_count
error_frames          invalid_tx_word_count  reset_statistics
fcp_control_requests  link_failure_count     rx_frames
fcp_input_megabytes   lip_count              rx_words
fcp_input_requests    loss_of_signal_count   seconds_since_last_reset
fcp_output_megabytes  loss_of_sync_count     tx_frames
fcp_output_requests   nos_count              tx_words
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

This patch adds the basic hooks to the scsi subsystem to 
support transport-specific statistics to be added to a host. 
Its basic nature follows the way in which net devices showed 
their statistics.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Make it a scsi logging message instead (under ERROR_RECOVERY)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The last time it was modified was 1997, so add the 
date range of applicability to its name.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The patch below (applies against both 2.4 and 2.6) removes the bouncing
email address of Deanna Bonds (I didn't find a nmore recent address).
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

The patch below makes the needlessly global function aic7xxx_info 
static.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

Here are new PCI ID's for SAS and Fibre Channel
LSI Logic controllers.
Signed-off-by: Eric Moore <Eric.Moore@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

OK, so I exported the wrong symbols ...
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

With rejection fixes around the removal of scsi_syms.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Lets show the mid layer as a good example and remove the host lock
around the scsi_done() call.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

===== drivers/scsi/scsi.c 1.148 vs edited =====

The patch below removes scsi_syms.c and moves the EXPORT_SYMBOL's to the
files where the actual functions are.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	Christoph Hellwig <hch@lst.de>

pass pointers to Scsi_Host and the private data around instead of using
indices into global arrays all over the place.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

the driver oopses on load for me currently, but to debug it I need to
actually be able to read the source..
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

into mulgrave.(none):/home/jejb/BK/scsi-misc-2.6

Building with gcc -W revealed this warning:
arch/i386/kernel/traps.c: In function `do_general_protection':
arch/i386/kernel/traps.c:506: warning: empty body in an if-statement

upon inspecting the code I see what looks like a mistakenly placed ";"

        if (!fixup_exception(regs)) {
                if (notify_die(DIE_GPF, "general protection fault", regs,
                                error_code, 13, SIGSEGV) == NOTIFY_STOP);
                        return;
                die("general protection fault", regs, error_code);
        }

That ";" after the second if should go away so the return; before die()
is not unconditional.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Tony Luck <tony.luck@intel.com>

into intel.com:/data/home/aegl/BK/linux-ia64-release-2.6.10

Len Brown convinced me that the problem with disabling
PCI routing entries wasn't the disable as much as the
fact that ELCR needs to be updated when removing the PCI
routing. So this reverts the previous cset and updates
ELCR as suggested by Len.

Ignore offline CPUs when registering IOSAPIC interrupts.  We previously
directed interrupts even to offline CPUs, which means that if you have some
unused CPUs (e.g., you used "maxcpus="), some interrupts won't work.

This really hurts because distro installs typically use "maxcpus=1".

Patch by Alex Williamson.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

This fixes at least some interrupt polarity setup cases.
The ACPI guys may want to eventually do this differently, but
in the meantime this makes ACPI behaviour closer to non-ACPI
behaviour, and fixes known problems.

I'll further argue that this protects non-PCI devices that may
just share the irq routing from being screwed, but that may or
may not be an argument that everybody buys into.

This depends on the previous ptrace single-step cleanup,
and makes sure that signal handling does not lose TF events.

This allows debuggers to trace programs that set TF on their
own.

(This makes the naming of "DTRACE" purely historical, since
on x86 it now means "single step in progress").

Update for the tuner module: add support for a new tuner chip.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

convert more modules to new-style insmod options.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

#ifdef out a currently unused (in-kernel) function, lets see if any
out-of-kernel users cry.  If not we can drop it altogether later on.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>