Commit df3d80f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (207 commits)
  [SCSI] gdth: fix CONFIG_ISA build failure
  [SCSI] esp_scsi: remove __dev{init,exit}
  [SCSI] gdth: !use_sg cleanup and use of scsi accessors
  [SCSI] gdth: Move members from SCp to gdth_cmndinfo, stage 2
  [SCSI] gdth: Setup proper per-command private data
  [SCSI] gdth: Remove gdth_ctr_tab[]
  [SCSI] gdth: switch to modern scsi host registration
  [SCSI] gdth: gdth_interrupt() gdth_get_status() & gdth_wait() fixes
  [SCSI] gdth: clean up host private data
  [SCSI] gdth: Remove virt hosts
  [SCSI] gdth: Reorder scsi_host_template intitializers
  [SCSI] gdth: kill gdth_{read,write}[bwl] wrappers
  [SCSI] gdth: Remove 2.4.x support, in-kernel changelog
  [SCSI] gdth: split out pci probing
  [SCSI] gdth: split out eisa probing
  [SCSI] gdth: split out isa probing
  gdth: Make one abuse of scsi_cmnd less obvious
  [SCSI] NCR5380: Use scsi_eh API for REQUEST_SENSE invocation
  [SCSI] usb storage: use scsi_eh API in REQUEST_SENSE execution
  [SCSI] scsi_error: Refactoring scsi_error to facilitate in synchronous REQUEST_SENSE
  ...
parents 3d06f7a5 c8e91b0a

Documentation/scsi/00-INDEX

+31 −3
Original line number Diff line number Diff line
@@ -2,14 +2,20 @@ 
	- this file

53c700.txt

	- info on driver for 53c700 based adapters

AM53C974.txt

	- info on driver for AM53c974 based adapters

BusLogic.txt

	- info on driver for adapters with BusLogic chips

ChangeLog

ChangeLog.1992-1997

	- Changes to scsi files, if not listed elsewhere

ChangeLog.arcmsr

	- Changes to driver for ARECA's SATA RAID controller cards

ChangeLog.ips

	- IBM ServeRAID driver Changelog

ChangeLog.lpfc

	- Changes to lpfc driver

ChangeLog.megaraid

	- Changes to LSI megaraid controller.

ChangeLog.megaraid_sas

	- Changes to serial attached scsi version of LSI megaraid controller.

ChangeLog.ncr53c8xx

	- Changes to ncr53c8xx driver

ChangeLog.sym53c8xx
@@ -20,26 +26,44 @@ FlashPoint.txt 
	- info on driver for BusLogic FlashPoint adapters

LICENSE.FlashPoint

	- Licence of the Flashpoint driver

LICENSE.qla2xxx

	- License for QLogic Linux Fibre Channel HBA Driver firmware.

Mylex.txt

	- info on driver for Mylex adapters

NinjaSCSI.txt

	- info on WorkBiT NinjaSCSI-32/32Bi driver

aacraid.txt

	- Driver supporting Adaptec RAID controllers

aha152x.txt

	- info on driver for Adaptec AHA152x based adapters

aic79xx.txt

	- Adaptec Ultra320 SCSI host adapters

aic7xxx.txt

	- info on driver for Adaptec controllers

aic7xxx_old.txt

	- info on driver for Adaptec controllers, old generation

arcmsr_spec.txt

	- ARECA FIRMWARE SPEC (for IOP331 adapter)

dc395x.txt

	- README file for the dc395x SCSI driver

dpti.txt

	- info on driver for DPT SmartRAID and Adaptec I2O RAID based adapters

dtc3x80.txt

	- info on driver for DTC 2x80 based adapters

g_NCR5380.txt

	- info on driver for NCR5380 and NCR53c400 based adapters

hptiop.txt

	- HIGHPOINT ROCKETRAID 3xxx RAID DRIVER

ibmmca.txt

	- info on driver for IBM adapters with MCA bus

in2000.txt

	- info on in2000 driver

libsas.txt

	- Serial Attached SCSI management layer.

lpfc.txt

	- LPFC driver release notes

megaraid.txt

	- Common Management Module, shared code handling ioctls for LSI drivers

ncr53c7xx.txt

	- info on driver for NCR53c7xx based adapters

ncr53c8xx.txt
@@ -50,6 +74,8 @@ ppa.txt 
	- info on driver for IOmega zip drive

qlogicfas.txt

	- info on driver for QLogic FASxxx based adapters

scsi-changer.txt

	- README for the SCSI media changer driver

scsi-generic.txt

	- info on the sg driver for generic (non-disk/CD/tape) SCSI devices.

scsi.txt
@@ -58,6 +84,8 @@ scsi_mid_low_api.txt 
	- info on API between SCSI layer and low level drivers

scsi_eh.txt

	- info on SCSI midlayer error handling infrastructure

scsi_fc_transport.txt

	- SCSI Fiber Channel Tansport

st.txt

	- info on scsi tape driver

sym53c500_cs.txt

Documentation/scsi/ChangeLog.arcmsr

+16 −1
Original line number Diff line number Diff line
@@ -53,4 +53,19 @@ 
**						for linux standard list

**						enable usage of pci message signal interrupt

**						follow Randy.Danlup kindness suggestion cleanup this code

** 1.20.00.14   05/02/2007	 Erich Chen & Nick Cheng

**						1.implement PCI-Express error recovery function and AER capability

**						2.implement the selection of ARCMSR_MAX_XFER_SECTORS_B=4096

**				 		if firmware version is newer than 1.42

**						3.modify arcmsr_iop_reset to improve the ability

**						4.modify the ISR, arcmsr_interrupt routine,to prevent the

**						inconsistency with sg_mod driver if application	directly calls

**						the arcmsr driver w/o passing through scsi mid layer

**						specially thanks to Yanmin Zhang's openhanded help about AER

** 1.20.00.15   08/30/2007	 Erich Chen & Nick Cheng

**						1. support ARC1200/1201/1202 SATA RAID adapter, which is named

**						ACB_ADAPTER_TYPE_B

**						2. modify the arcmsr_pci_slot_reset function

**						3. modify the arcmsr_pci_ers_disconnect_forepart function

**						4. modify the arcmsr_pci_ers_need_reset_forepart function

**************************************************************************

Documentation/scsi/aacraid.txt

+6 −2
Original line number Diff line number Diff line
@@ -38,10 +38,8 @@ Supported Cards/Chipsets 
	9005:0286:9005:02ac	Adaptec	1800 (Typhoon44)

	9005:0285:9005:02b5	Adaptec	5445 (Voodoo44)

	9005:0285:15d9:02b5	SMC	AOC-USAS-S4i

	9005:0285:15d9:02c9	SMC	AOC-USAS-S4iR

	9005:0285:9005:02b6	Adaptec	5805 (Voodoo80)

	9005:0285:15d9:02b6	SMC	AOC-USAS-S8i

	9005:0285:15d9:02ca	SMC	AOC-USAS-S8iR

	9005:0285:9005:02b7	Adaptec	5085 (Voodoo08)

	9005:0285:9005:02bb	Adaptec	3405 (Marauder40LP)

	9005:0285:9005:02bc	Adaptec	3805 (Marauder80LP)
@@ -50,9 +48,14 @@ Supported Cards/Chipsets 
	9005:0285:9005:02be	Adaptec	31605 (Marauder160)

	9005:0285:9005:02c3	Adaptec	51205 (Voodoo120)

	9005:0285:9005:02c4	Adaptec	51605 (Voodoo160)

	9005:0285:15d9:02c9	SMC	AOC-USAS-S4iR

	9005:0285:15d9:02ca	SMC	AOC-USAS-S8iR

	9005:0285:9005:02ce	Adaptec	51245 (Voodoo124)

	9005:0285:9005:02cf	Adaptec	51645 (Voodoo164)

	9005:0285:9005:02d0	Adaptec	52445 (Voodoo244)

	9005:0285:9005:02d1	Adaptec	5405 (Voodoo40)

	9005:0285:15d9:02d2	SMC	AOC-USAS-S8i-LP

	9005:0285:15d9:02d3	SMC	AOC-USAS-S8iR-LP

	1011:0046:9005:0364	Adaptec	5400S (Mustang)

	9005:0287:9005:0800	Adaptec	Themisto (Jupiter)

	9005:0200:9005:0200	Adaptec	Themisto (Jupiter)
@@ -103,6 +106,7 @@ Supported Cards/Chipsets 
	9005:0285:108e:7aac	SUN	STK RAID REM (Voodoo44 Coyote)

	9005:0285:108e:0286	SUN	STK RAID INT (Cougar)

	9005:0285:108e:0287	SUN	STK RAID EXT (Prometheus)

	9005:0285:108e:7aae	SUN	STK RAID EM (Narvi)



People

-------------------------

Documentation/scsi/advansys.txt

0 → 100644
+243 −0
Original line number Diff line number Diff line 
AdvanSys (Advanced System Products, Inc.) manufactures the following

RISC-based, Bus-Mastering, Fast (10 Mhz) and Ultra (20 Mhz) Narrow

(8-bit transfer) SCSI Host Adapters for the ISA, EISA, VL, and PCI

buses and RISC-based, Bus-Mastering, Ultra (20 Mhz) Wide (16-bit

transfer) SCSI Host Adapters for the PCI bus.



The CDB counts below indicate the number of SCSI CDB (Command

Descriptor Block) requests that can be stored in the RISC chip

cache and board LRAM. A CDB is a single SCSI command. The driver

detect routine will display the number of CDBs available for each

adapter detected. The number of CDBs used by the driver can be

lowered in the BIOS by changing the 'Host Queue Size' adapter setting.



Laptop Products:

   ABP-480 - Bus-Master CardBus (16 CDB)



Connectivity Products:

   ABP510/5150 - Bus-Master ISA (240 CDB)

   ABP5140 - Bus-Master ISA PnP (16 CDB)

   ABP5142 - Bus-Master ISA PnP with floppy (16 CDB)

   ABP902/3902 - Bus-Master PCI (16 CDB)

   ABP3905 - Bus-Master PCI (16 CDB)

   ABP915 - Bus-Master PCI (16 CDB)

   ABP920 - Bus-Master PCI (16 CDB)

   ABP3922 - Bus-Master PCI (16 CDB)

   ABP3925 - Bus-Master PCI (16 CDB)

   ABP930 - Bus-Master PCI (16 CDB)

   ABP930U - Bus-Master PCI Ultra (16 CDB)

   ABP930UA - Bus-Master PCI Ultra (16 CDB)

   ABP960 - Bus-Master PCI MAC/PC (16 CDB)

   ABP960U - Bus-Master PCI MAC/PC Ultra (16 CDB)



Single Channel Products:

   ABP542 - Bus-Master ISA with floppy (240 CDB)

   ABP742 - Bus-Master EISA (240 CDB)

   ABP842 - Bus-Master VL (240 CDB)

   ABP940 - Bus-Master PCI (240 CDB)

   ABP940U - Bus-Master PCI Ultra (240 CDB)

   ABP940UA/3940UA - Bus-Master PCI Ultra (240 CDB)

   ABP970 - Bus-Master PCI MAC/PC (240 CDB)

   ABP970U - Bus-Master PCI MAC/PC Ultra (240 CDB)

   ABP3960UA - Bus-Master PCI MAC/PC Ultra (240 CDB)

   ABP940UW/3940UW - Bus-Master PCI Ultra-Wide (253 CDB)

   ABP970UW - Bus-Master PCI MAC/PC Ultra-Wide (253 CDB)

   ABP3940U2W - Bus-Master PCI LVD/Ultra2-Wide (253 CDB)



Multi-Channel Products:

   ABP752 - Dual Channel Bus-Master EISA (240 CDB Per Channel)

   ABP852 - Dual Channel Bus-Master VL (240 CDB Per Channel)

   ABP950 - Dual Channel Bus-Master PCI (240 CDB Per Channel)

   ABP950UW - Dual Channel Bus-Master PCI Ultra-Wide (253 CDB Per Channel)

   ABP980 - Four Channel Bus-Master PCI (240 CDB Per Channel)

   ABP980U - Four Channel Bus-Master PCI Ultra (240 CDB Per Channel)

   ABP980UA/3980UA - Four Channel Bus-Master PCI Ultra (16 CDB Per Chan.)

   ABP3950U2W - Bus-Master PCI LVD/Ultra2-Wide and Ultra-Wide (253 CDB)

   ABP3950U3W - Bus-Master PCI Dual LVD2/Ultra3-Wide (253 CDB)



Driver Compile Time Options and Debugging



The following constants can be defined in the source file.



1. ADVANSYS_ASSERT - Enable driver assertions (Def: Enabled)



   Enabling this option adds assertion logic statements to the

   driver. If an assertion fails a message will be displayed to

   the console, but the system will continue to operate. Any

   assertions encountered should be reported to the person

   responsible for the driver. Assertion statements may proactively

   detect problems with the driver and facilitate fixing these

   problems. Enabling assertions will add a small overhead to the

   execution of the driver.



2. ADVANSYS_DEBUG - Enable driver debugging (Def: Disabled)



   Enabling this option adds tracing functions to the driver and the

   ability to set a driver tracing level at boot time.  This option is

   very useful for debugging the driver, but it will add to the size

   of the driver execution image and add overhead to the execution of

   the driver.



   The amount of debugging output can be controlled with the global

   variable 'asc_dbglvl'. The higher the number the more output. By

   default the debug level is 0.



   If the driver is loaded at boot time and the LILO Driver Option

   is included in the system, the debug level can be changed by

   specifying a 5th (ASC_NUM_IOPORT_PROBE + 1) I/O Port. The

   first three hex digits of the pseudo I/O Port must be set to

   'deb' and the fourth hex digit specifies the debug level: 0 - F.

   The following command line will look for an adapter at 0x330

   and set the debug level to 2.



      linux advansys=0x330,0,0,0,0xdeb2



   If the driver is built as a loadable module this variable can be

   defined when the driver is loaded. The following insmod command

   will set the debug level to one.



      insmod advansys.o asc_dbglvl=1



   Debugging Message Levels:

      0: Errors Only

      1: High-Level Tracing

      2-N: Verbose Tracing



   To enable debug output to console, please make sure that:



   a. System and kernel logging is enabled (syslogd, klogd running).

   b. Kernel messages are routed to console output. Check

      /etc/syslog.conf for an entry similar to this:



           kern.*                  /dev/console



   c. klogd is started with the appropriate -c parameter

      (e.g. klogd -c 8)



   This will cause printk() messages to be be displayed on the

   current console. Refer to the klogd(8) and syslogd(8) man pages

   for details.



   Alternatively you can enable printk() to console with this

   program. However, this is not the 'official' way to do this.

   Debug output is logged in /var/log/messages.



     main()

     {

             syscall(103, 7, 0, 0);

     }



   Increasing LOG_BUF_LEN in kernel/printk.c to something like

   40960 allows more debug messages to be buffered in the kernel

   and written to the console or log file.



3. ADVANSYS_STATS - Enable statistics (Def: Enabled)



   Enabling this option adds statistics collection and display

   through /proc to the driver. The information is useful for

   monitoring driver and device performance. It will add to the

   size of the driver execution image and add minor overhead to

   the execution of the driver.



   Statistics are maintained on a per adapter basis. Driver entry

   point call counts and transfer size counts are maintained.

   Statistics are only available for kernels greater than or equal

   to v1.3.0 with the CONFIG_PROC_FS (/proc) file system configured.



   AdvanSys SCSI adapter files have the following path name format:



      /proc/scsi/advansys/{0,1,2,3,...}



   This information can be displayed with cat. For example:



      cat /proc/scsi/advansys/0



   When ADVANSYS_STATS is not defined the AdvanSys /proc files only

   contain adapter and device configuration information.



Driver LILO Option



If init/main.c is modified as described in the 'Directions for Adding

the AdvanSys Driver to Linux' section (B.4.) above, the driver will

recognize the 'advansys' LILO command line and /etc/lilo.conf option.

This option can be used to either disable I/O port scanning or to limit

scanning to 1 - 4 I/O ports. Regardless of the option setting EISA and

PCI boards will still be searched for and detected. This option only

affects searching for ISA and VL boards.



Examples:

  1. Eliminate I/O port scanning:

       boot: linux advansys=

         or

       boot: linux advansys=0x0

  2. Limit I/O port scanning to one I/O port:

       boot: linux advansys=0x110

  3. Limit I/O port scanning to four I/O ports:

       boot: linux advansys=0x110,0x210,0x230,0x330



For a loadable module the same effect can be achieved by setting

the 'asc_iopflag' variable and 'asc_ioport' array when loading

the driver, e.g.



      insmod advansys.o asc_iopflag=1 asc_ioport=0x110,0x330



If ADVANSYS_DEBUG is defined a 5th (ASC_NUM_IOPORT_PROBE + 1)

I/O Port may be added to specify the driver debug level. Refer to

the 'Driver Compile Time Options and Debugging' section above for

more information.



Credits (Chronological Order)



Bob Frey <bfrey@turbolinux.com.cn> wrote the AdvanSys SCSI driver

and maintained it up to 3.3F. He continues to answer questions

and help maintain the driver.



Nathan Hartwell <mage@cdc3.cdc.net> provided the directions and

basis for the Linux v1.3.X changes which were included in the

1.2 release.



Thomas E Zerucha <zerucha@shell.portal.com> pointed out a bug

in advansys_biosparam() which was fixed in the 1.3 release.



Erik Ratcliffe <erik@caldera.com> has done testing of the

AdvanSys driver in the Caldera releases.



Rik van Riel <H.H.vanRiel@fys.ruu.nl> provided a patch to

AscWaitTixISRDone() which he found necessary to make the

driver work with a SCSI-1 disk.



Mark Moran <mmoran@mmoran.com> has helped test Ultra-Wide

support in the 3.1A driver.



Doug Gilbert <dgilbert@interlog.com> has made changes and

suggestions to improve the driver and done a lot of testing.



Ken Mort <ken@mort.net> reported a DEBUG compile bug fixed

in 3.2K.



Tom Rini <trini@kernel.crashing.org> provided the CONFIG_ISA

patch and helped with PowerPC wide and narrow board support.



Philip Blundell <philb@gnu.org> provided an

advansys_interrupts_enabled patch.



Dave Jones <dave@denial.force9.co.uk> reported the compiler

warnings generated when CONFIG_PROC_FS was not defined in

the 3.2M driver.



Jerry Quinn <jlquinn@us.ibm.com> fixed PowerPC support (endian

problems) for wide cards.



Bryan Henderson <bryanh@giraffe-data.com> helped debug narrow

card error handling.



Manuel Veloso <veloso@pobox.com> worked hard on PowerPC narrow

board support and fixed a bug in AscGetEEPConfig().



Arnaldo Carvalho de Melo <acme@conectiva.com.br> made

save_flags/restore_flags changes.



Andy Kellner <AKellner@connectcom.net> continued the Advansys SCSI

driver development for ConnectCom (Version > 3.3F).



Ken Witherow for extensive testing during the development of version 3.4.

MAINTAINERS

+12 −1
Original line number Diff line number Diff line
@@ -297,6 +297,12 @@ P: Colin Leroy 
M:	colin@colino.net

S:	Maintained



ADVANSYS SCSI DRIVER

P:	Matthew Wilcox

M:	matthew@wil.cx

L:	linux-scsi@vger.kernel.org

S:	Maintained



AEDSP16 DRIVER

P:	Riccardo Facchetti

M:	fizban@tin.it
@@ -1889,6 +1895,11 @@ M: Gadi Oxman <gadio@netvision.net.il> 
L:	linux-kernel@vger.kernel.org

S:	Maintained



IDE-SCSI DRIVER

L:	linux-ide@vger.kernel.org

L:	linux-scsi@vger.kernel.org

S:	Orphan



IEEE 1394 SUBSYSTEM

P:	Ben Collins

M:	ben.collins@ubuntu.com
@@ -2404,7 +2415,7 @@ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) 
P:	Eric Moore

M:	Eric.Moore@lsi.com

M:	support@lsi.com

L:	mpt_linux_developer@lsi.com

L:	DL-MPTFusionLinux@lsi.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsilogic.com/support

S:	Supported

CRA Git | Maintained and supported by SUSTech CRA and CCSE