Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1212663f 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: (39 commits)
  [SCSI] qla2xxx: Update version number to 8.02.00-k5.
  [SCSI] qla2xxx: Correct display of ISP serial-number.
  [SCSI] qla2xxx: Correct residual-count handling discrepancies during UNDERRUN handling.
  [SCSI] qla2xxx: Make driver (mostly) legacy I/O port free.
  [SCSI] qla2xxx: Fix issue where final flash-segment updates were falling into the slow-path write handler.
  [SCSI] qla2xxx: Handle unaligned sector writes during NVRAM/VPD updates.
  [SCSI] qla2xxx: Defer explicit interrupt-polling processing to init-time scenarios.
  [SCSI] qla2xxx: Resync with latest HBA SSID specification -- 2.2u.
  [SCSI] sym53c8xx: Remove sym_xpt_async_sent_bdr
  [SCSI] sym53c8xx: Remove pci_dev pointer from sym_shcb
  [SCSI] sym53c8xx: Make interrupt handler capable of returning IRQ_NONE
  [SCSI] sym53c8xx: Get rid of IRQ_FMT and IRQ_PRM
  [SCSI] sym53c8xx: Use scmd_printk where appropriate
  [SCSI] sym53c8xx: Simplify DAC DMA handling
  [SCSI] sym53c8xx: Remove tag_ctrl module parameter
  [SCSI] sym53c8xx: Remove io_ws, mmio_ws and ram_ws elements
  [SCSI] sym53c8xx: Remove ->device_id
  [SCSI] sym53c8xx: Use pdev->revision
  [SCSI] sym53c8xx: PCI Error Recovery support
  [SCSI] sym53c8xx: Stop overriding scsi_done
  ...
parents af76bbab af2709fd

Documentation/scsi/sym53c8xx_2.txt

+5 −16
Original line number Diff line number Diff line
@@ -449,25 +449,14 @@ options as above. 
        cmd_per_lun=#tags (#tags > 1) tagged command queuing enabled

  #tags will be truncated to the max queued commands configuration parameter.



10.2.2  Detailed control of tagged commands

  This option allows you to specify a command queue depth for each device 

  that supports tagged command queueing.

  Example:

      tag_ctrl=10/t2t3q16-t5q24/t1u2q32

  will set devices queue depth as follow:

      - controller #0 target #2 and target #3                  -> 16 commands,

      - controller #0 target #5                                -> 24 commands,

      - controller #1 target #1 logical unit #2                -> 32 commands,

      - all other logical units (all targets, all controllers) -> 10 commands.



10.2.3 Burst max

10.2.2 Burst max

        burst=0    burst disabled

        burst=255  get burst length from initial IO register settings.

        burst=#x   burst enabled (1<<#x burst transfers max)

  #x is an integer value which is log base 2 of the burst transfers max.

  By default the driver uses the maximum value supported by the chip.



10.2.4 LED support

10.2.3 LED support

        led=1      enable  LED support

        led=0      disable LED support

  Do not enable LED support if your scsi board does not use SDMS BIOS.
@@ -560,9 +549,9 @@ Previously, the sym2 driver accepted arguments of the form 
	sym53c8xx=tags:4,sync:10,debug:0x200



As a result of the new module parameters, this is no longer available.

Most of the options have remained the same, but tags has split into

cmd_per_lun and tag_ctrl for its two different purposes.  The sample above

would be specified as:

Most of the options have remained the same, but tags has become

cmd_per_lun to reflect its different purposes.  The sample above would

be specified as:

	modprobe sym53c8xx cmd_per_lun=4 sync=10 debug=0x200



or on the kernel boot line as:

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -325,6 +325,12 @@ M: Juergen Fischer <fischer@norbit.de> 
L:	linux-scsi@vger.kernel.org

S:	Maintained



AIC7XXX / AIC79XX SCSI DRIVER

P:	Hannes Reinecke

M:	hare@suse.de

L:	linux-scsi@vger.kernel.org

S:	Maintained



ALCATEL SPEEDTOUCH USB DRIVER

P:	Duncan Sands

M:	duncan.sands@free.fr

arch/sparc64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -460,8 +460,6 @@ source "drivers/Kconfig" 


source "drivers/sbus/char/Kconfig"



source "drivers/fc4/Kconfig"



source "fs/Kconfig"



source "kernel/Kconfig.instrumentation"

drivers/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ obj-$(CONFIG_NUBUS) += nubus/ 
obj-$(CONFIG_ATM)		+= atm/

obj-y				+= macintosh/

obj-$(CONFIG_IDE)		+= ide/

obj-$(CONFIG_FC4)		+= fc4/

obj-$(CONFIG_SCSI)		+= scsi/

obj-$(CONFIG_ATA)		+= ata/

obj-$(CONFIG_FUSION)		+= message/

drivers/fc4/Kconfig

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
#

# FC4 device configuration

#



menu "Fibre Channel support"



config FC4

	tristate "Fibre Channel and FC4 SCSI support"

	---help---

	  Fibre Channel is a high speed serial protocol mainly used to

	  connect large storage devices to the computer; it is compatible with

	  and intended to replace SCSI.



	  This is an experimental support for storage arrays connected to your

	  computer using optical fibre cables and the "X3.269-199X Fibre

	  Channel Protocol for SCSI" specification. If you want to use this,

	  you need to say Y here and to "SCSI support" as well as to the

	  drivers for the storage array itself and for the interface adapter

	  such as SOC or SOC+. This subsystem could even serve for IP

	  networking, with some code extensions.



	  If unsure, say N.



comment "FC4 drivers"

	depends on FC4



config FC4_SOC

	tristate "Sun SOC/Sbus"

	depends on FC4!=n && SPARC

	help

	  Serial Optical Channel is an interface card with one or two Fibre

	  Optic ports, each of which can be connected to a disk array. Note

	  that if you have older firmware in the card, you'll need the

	  microcode from the Solaris driver to make it work.



	  To compile this support as a module, choose M here: the module will

	  be called soc.



config FC4_SOCAL

	tristate "Sun SOC+ (aka SOCAL)"

	depends on FC4!=n && SPARC

	---help---

	  Serial Optical Channel Plus is an interface card with up to two

	  Fibre Optic ports. This card supports FC Arbitrated Loop (usually

	  A5000 or internal FC disks in E[3-6]000 machines through the

	  Interface Board). You'll probably need the microcode from the

	  Solaris driver to make it work.



	  To compile this support as a module, choose M here: the module will

	  be called socal.



comment "FC4 targets"

	depends on FC4



config SCSI_PLUTO

	tristate "SparcSTORAGE Array 100 and 200 series"

	depends on FC4!=n && SCSI

	help

	  If you never bought a disk array made by Sun, go with N.



	  To compile this support as a module, choose M here: the module will

	  be called pluto.



config SCSI_FCAL

	tristate "Sun Enterprise Network Array (A5000 and EX500)" if SPARC

	depends on FC4!=n && SCSI

	help

	  This driver drives FC-AL disks connected through a Fibre Channel

	  card using the drivers/fc4 layer (currently only SOCAL). The most

	  common is either A5000 array or internal disks in E[3-6]000

	  machines.



	  To compile this support as a module, choose M here: the module will

	  be called fcal.



config SCSI_FCAL

	prompt "Generic FC-AL disk driver"

	depends on FC4!=n && SCSI && !SPARC



endmenu