Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

f3f62a38 · Linus Torvalds <[email protected]> · 2014-12-08 21:19:19 -08:00

Pull SCSI updates from James Bottomley:
 "This patch is the usual mix of driver updates (srp, ipr, scsi_debug,
  NCR5380, fnic, 53c974, ses, wd719x, hpsa, megaraid_sas).

  Of those, wd7a9x is new and 53c974 is a rewrite of the old tmscsim
  driver and the extensive work by Finn Thain rewrites all the NCR5380
  based drivers.

  There's also extensive infrastructure updates: a new logging
  infrastructure for sense information and a rewrite of the tagged
  command queue API and an assortment of minor updates"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (183 commits)
  scsi: set fmt to NULL scsi_extd_sense_format() by default
  libsas: remove task_collector mode
  wd719x: remove dma_cache_sync call
  scsi_debug: add Report supported opcodes+tmfs; Compare and write
  scsi_debug: change SCSI command parser to table driven
  scsi_debug: add Capacity Changed Unit Attention
  scsi_debug: append inject error flags onto scsi_cmnd object
  scsi_debug: pinpoint invalid field in sense data
  wd719x: Add firmware documentation
  wd719x: Introduce Western Digital WD7193/7197/7296 PCI SCSI card driver
  eeprom-93cx6: Add (read-only) support for 8-bit mode
  esas2r: fix an oversight in setting return value
  esas2r: fix an error path in esas2r_ioctl_handler
  esas2r: fir error handling in do_fm_api
  scsi: add SPC-3 command definitions
  scsi: rename SERVICE_ACTION_IN to SERVICE_ACTION_IN_16
  scsi: remove scsi_driver owner field
  scsi: move scsi_dispatch_cmd to scsi_lib.c
  scsi: stop passing a gfp_mask argument down the command setup path
  scsi: remove scsi_next_command
  ...

Commit: f3f62a38ceda4e4d34a1dc3ebbc0f8d426c9e8d9
Parents: 140dfc92 · 096cbc35

Merge commit. Changes below are compared with the first parent: 140dfc92.

Changes

222 files changed · +8454 −14789

File	Status	Add	Del	Content
Documentation/ABI/stable/sysfs-driver-ib_srp	modified	+19	−6	View file
Documentation/block/biodoc.txt	modified	+0	−4	View file
Documentation/scsi/libsas.txt	modified	+4	−78	View file
Documentation/scsi/scsi_mid_low_api.txt	modified	+13	−53	View file
Documentation/scsi/st.txt	modified	+5	−3	View file
Documentation/scsi/wd719x.txt	added	+21	−0	View file
MAINTAINERS	modified	+9	−8	View file
arch/m68k/atari/config.c	modified	+27	−0	View file
arch/m68k/atari/stdma.c	modified	+40	−21	View file
arch/m68k/include/asm/atari_stdma.h	modified	+2	−2	View file
arch/m68k/include/asm/macintosh.h	modified	+4	−0	View file
arch/m68k/mac/config.c	modified	+132	−14	View file
arch/m68k/sun3/config.c	modified	+60	−0	View file
block/blk-core.c	modified	+2	−2	View file
block/blk-mq-tag.c	modified	+28	−0	View file
block/blk-mq.c	modified	+2	−0	View file
block/scsi_ioctl.c	modified	+1	−1	View file
drivers/ata/libata-scsi.c	modified	+6	−13	View file
drivers/ata/sata_nv.c	modified	+1	−1	View file
drivers/block/nvme-scsi.c	modified	+2	−2	View file
drivers/infiniband/ulp/iser/iscsi_iser.c	modified	+2	−1	View file
drivers/infiniband/ulp/srp/ib_srp.c	modified	+670	−430	View file
drivers/infiniband/ulp/srp/ib_srp.h	modified	+49	−26	View file
drivers/message/fusion/mptsas.c	modified	+1	−0	View file
drivers/message/fusion/mptscsih.c	modified	+5	−17	View file
drivers/message/fusion/mptscsih.h	modified	+1	−2	View file
drivers/misc/eeprom/eeprom_93cx6.c	modified	+61	−1	View file
drivers/misc/enclosure.c	modified	+40	−4	View file
drivers/s390/scsi/zfcp_aux.c	modified	+4	−2	View file
drivers/s390/scsi/zfcp_ccw.c	modified	+27	−5	View file
drivers/s390/scsi/zfcp_def.h	modified	+2	−1	View file
drivers/s390/scsi/zfcp_erp.c	modified	+0	−7	View file
drivers/s390/scsi/zfcp_ext.h	modified	+1	−0	View file
drivers/s390/scsi/zfcp_fc.c	modified	+49	−3	View file
drivers/s390/scsi/zfcp_fc.h	modified	+1	−13	View file
drivers/s390/scsi/zfcp_fsf.c	modified	+1	−2	View file
drivers/s390/scsi/zfcp_scsi.c	modified	+3	−23	View file
drivers/s390/scsi/zfcp_sysfs.c	modified	+57	−9	View file
drivers/scsi/3w-9xxx.c	modified	+1	−14	View file
drivers/scsi/3w-sas.c	modified	+1	−14	View file
drivers/scsi/3w-xxxx.c	modified	+1	−14	View file
drivers/scsi/53c700.c	modified	+19	−32	View file
drivers/scsi/BusLogic.c	modified	+2	−2	View file
drivers/scsi/Kconfig	modified	+14	−4	View file
drivers/scsi/Makefile	modified	+2	−1	View file
drivers/scsi/NCR5380.c	modified	+115	−195	View file
drivers/scsi/NCR5380.h	modified	+38	−40	View file
drivers/scsi/aacraid/aachba.c	modified	+2	−2	View file
drivers/scsi/aacraid/linit.c	modified	+8	−12	View file
drivers/scsi/advansys.c	modified	+3	−8	View file
drivers/scsi/aha152x.c	modified	+224	−770	View file
drivers/scsi/aha1740.c	modified	+1	−1	View file
drivers/scsi/aic7xxx/aic79xx_osm.c	modified	+4	−15	View file
drivers/scsi/aic7xxx/aic7xxx_osm.c	modified	+6	−17	View file
drivers/scsi/aic94xx/aic94xx.h	modified	+1	−1	View file
drivers/scsi/aic94xx/aic94xx_hwi.c	modified	+1	−2	View file
drivers/scsi/aic94xx/aic94xx_init.c	modified	+2	−11	View file
drivers/scsi/aic94xx/aic94xx_task.c	modified	+6	−7	View file
drivers/scsi/am53c974.c	added	+586	−0	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+2	−7	View file
drivers/scsi/arm/acornscsi.c	modified	+6	−6	View file
drivers/scsi/arm/cumana_1.c	modified	+1	−17	View file
drivers/scsi/arm/fas216.c	modified	+15	−24	View file
drivers/scsi/arm/oak.c	modified	+2	−21	View file
drivers/scsi/atari_NCR5380.c	modified	+472	−514	View file
drivers/scsi/atari_scsi.c	modified	+288	−385	View file
drivers/scsi/atari_scsi.h	deleted	+0	−60	View before deletion
drivers/scsi/be2iscsi/be_main.c	modified	+2	−2	View file
drivers/scsi/bfa/bfad_debugfs.c	modified	+6	−24	View file
drivers/scsi/bfa/bfad_im.c	modified	+5	−13	View file
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	modified	+6	−3	View file
drivers/scsi/bnx2fc/bnx2fc_io.c	modified	+3	−15	View file
drivers/scsi/bnx2i/bnx2i_iscsi.c	modified	+2	−1	View file
drivers/scsi/ch.c	modified	+21	−15	View file
drivers/scsi/constants.c	modified	+244	−355	View file
drivers/scsi/csiostor/csio_scsi.c	modified	+7	−30	View file
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c	modified	+2	−1	View file
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c	modified	+2	−1	View file
drivers/scsi/device_handler/scsi_dh.c	modified	+41	−14	View file
drivers/scsi/device_handler/scsi_dh_alua.c	modified	+25	−57	View file
drivers/scsi/device_handler/scsi_dh_emc.c	modified	+28	−58	View file
drivers/scsi/device_handler/scsi_dh_hp_sw.c	modified	+25	−56	View file
drivers/scsi/device_handler/scsi_dh_rdac.c	modified	+25	−57	View file
drivers/scsi/dmx3191d.c	modified	+11	−20	View file
drivers/scsi/dpt_i2o.c	modified	+1	−3	View file
drivers/scsi/dtc.c	modified	+30	−55	View file
drivers/scsi/dtc.h	modified	+1	−25	View file
drivers/scsi/eata.c	modified	+3	−5	View file
drivers/scsi/esas2r/esas2r.h	modified	+0	−5	View file
drivers/scsi/esas2r/esas2r_ioctl.c	modified	+13	−9	View file
drivers/scsi/esas2r/esas2r_main.c	modified	+4	−60	View file
drivers/scsi/esp_scsi.c	modified	+247	−181	View file
drivers/scsi/esp_scsi.h	modified	+19	−3	View file
drivers/scsi/fcoe/fcoe.c	modified	+4	−2	View file
drivers/scsi/fnic/fnic.h	modified	+1	−1	View file
drivers/scsi/fnic/fnic_fcs.c	modified	+5	−0	View file
drivers/scsi/fnic/fnic_main.c	modified	+16	−7	View file
drivers/scsi/fnic/fnic_scsi.c	modified	+31	−12	View file
drivers/scsi/fnic/fnic_trace.c	modified	+2	−2	View file
drivers/scsi/g_NCR5380.c	modified	+12	−212	View file
drivers/scsi/g_NCR5380.h	modified	+2	−24	View file
drivers/scsi/gdth.c	modified	+2	−3	View file
drivers/scsi/hosts.c	modified	+2	−3	View file
drivers/scsi/hpsa.c	modified	+204	−305	View file
drivers/scsi/hpsa.h	modified	+10	−23	View file
drivers/scsi/hpsa_cmd.h	modified	+21	−13	View file
drivers/scsi/hptiop.c	modified	+2	−6	View file
drivers/scsi/ibmvscsi/ibmvfc.c	modified	+8	−50	View file
drivers/scsi/ibmvscsi/ibmvscsi.c	modified	+2	−9	View file
drivers/scsi/ipr.c	modified	+68	−107	View file
drivers/scsi/ipr.h	modified	+1	−1	View file
drivers/scsi/ips.c	modified	+1	−1	View file
drivers/scsi/isci/init.c	modified	+2	−2	View file
drivers/scsi/isci/task.c	modified	+70	−77	View file
drivers/scsi/isci/task.h	modified	+0	−1	View file
drivers/scsi/iscsi_tcp.c	modified	+2	−1	View file
drivers/scsi/libfc/fc_fcp.c	modified	+1	−51	View file
drivers/scsi/libiscsi.c	modified	+0	−19	View file
drivers/scsi/libsas/sas_ata.c	modified	+1	−8	View file
drivers/scsi/libsas/sas_expander.c	modified	+1	−1	View file
drivers/scsi/libsas/sas_init.c	modified	+0	−21	View file
drivers/scsi/libsas/sas_internal.h	modified	+0	−2	View file
drivers/scsi/libsas/sas_scsi_host.c	modified	+11	−212	View file
drivers/scsi/lpfc/lpfc_scsi.c	modified	+11	−147	View file
drivers/scsi/mac_scsi.c	modified	+236	−316	View file
drivers/scsi/mac_scsi.h	deleted	+0	−74	View before deletion
drivers/scsi/megaraid.c	modified	+4	−4	View file
drivers/scsi/megaraid/megaraid_mbox.c	modified	+1	−22	View file
drivers/scsi/megaraid/megaraid_sas.h	modified	+11	−12	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+98	−66	View file
drivers/scsi/megaraid/megaraid_sas_fp.c	modified	+18	−15	View file
drivers/scsi/megaraid/megaraid_sas_fusion.c	modified	+44	−68	View file
drivers/scsi/megaraid/megaraid_sas_fusion.h	modified	+9	−9	View file
drivers/scsi/mpt2sas/mpt2sas_scsih.c	modified	+11	−71	View file
drivers/scsi/mpt3sas/mpt3sas_scsih.c	modified	+15	−69	View file
drivers/scsi/mvsas/mv_init.c	modified	+2	−22	View file
drivers/scsi/mvsas/mv_sas.c	modified	+4	−105	View file
drivers/scsi/mvsas/mv_sas.h	modified	+1	−9	View file
drivers/scsi/ncr53c8xx.c	modified	+1	−4	View file
drivers/scsi/osd/osd_uld.c	modified	+1	−1	View file
drivers/scsi/osst.c	modified	+15	−14	View file
drivers/scsi/pas16.c	modified	+32	−74	View file
drivers/scsi/pas16.h	modified	+1	−20	View file
drivers/scsi/pm8001/pm8001_init.c	modified	+2	−2	View file
drivers/scsi/pm8001/pm8001_sas.c	modified	+5	−17	View file
drivers/scsi/pm8001/pm8001_sas.h	modified	+1	−2	View file
drivers/scsi/pmcraid.c	modified	+13	−81	View file
drivers/scsi/ps3rom.c	modified	+0	−4	View file
drivers/scsi/qla1280.c	modified	+2	−3	View file
drivers/scsi/qla2xxx/qla_gbl.h	modified	+0	−2	View file
drivers/scsi/qla2xxx/qla_iocb.c	modified	+3	−89	View file
drivers/scsi/qla2xxx/qla_mr.c	modified	+0	−13	View file
drivers/scsi/qla2xxx/qla_nx2.c	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+5	−78	View file
drivers/scsi/qla4xxx/ql4_iocb.c	modified	+0	−10	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+6	−29	View file
drivers/scsi/scsi.c	modified	+40	−171	View file
drivers/scsi/scsi_debug.c	modified	+1330	−677	View file
drivers/scsi/scsi_error.c	modified	+111	−100	View file
drivers/scsi/scsi_ioctl.c	modified	+14	−60	View file
drivers/scsi/scsi_lib.c	modified	+127	−38	View file
drivers/scsi/scsi_logging.h	modified	+1	−0	View file
drivers/scsi/scsi_priv.h	modified	+0	−2	View file
drivers/scsi/scsi_scan.c	modified	+17	−10	View file
drivers/scsi/scsi_sysfs.c	modified	+9	−9	View file
drivers/scsi/scsi_trace.c	modified	+1	−1	View file
drivers/scsi/scsi_transport_spi.c	modified	+23	−0	View file
drivers/scsi/scsicam.c	modified	+2	−2	View file
drivers/scsi/sd.c	modified	+53	−61	View file
drivers/scsi/sd.h	modified	+3	−3	View file
drivers/scsi/ses.c	modified	+1	−1	View file
drivers/scsi/sg.c	modified	+18	−44	View file
drivers/scsi/sr.c	modified	+7	−12	View file
drivers/scsi/sr.h	modified	+1	−2	View file
drivers/scsi/sr_ioctl.c	modified	+5	−5	View file
drivers/scsi/st.c	modified	+30	−17	View file
drivers/scsi/stex.c	modified	+4	−26	View file
drivers/scsi/storvsc_drv.c	modified	+3	−3	View file
drivers/scsi/sun3_NCR5380.c	deleted	+0	−2933	View before deletion
drivers/scsi/sun3_scsi.c	modified	+221	−291	View file
drivers/scsi/sun3_scsi.h	modified	+0	−84	View file
drivers/scsi/sym53c8xx_2/sym_glue.c	modified	+1	−3	View file
drivers/scsi/t128.c	modified	+26	−57	View file
drivers/scsi/t128.h	modified	+1	−22	View file
drivers/scsi/tmscsim.c	deleted	+0	−2620	View before deletion
drivers/scsi/tmscsim.h	deleted	+0	−551	View before deletion
drivers/scsi/u14-34f.c	modified	+5	−5	View file
drivers/scsi/ufs/ufshcd.c	modified	+10	−29	View file
drivers/scsi/virtio_scsi.c	modified	+20	−20	View file
drivers/scsi/vmw_pvscsi.c	modified	+3	−29	View file
drivers/scsi/wd7000.c	modified	+0	−1	View file
drivers/scsi/wd719x.c	added	+996	−0	View file
drivers/scsi/wd719x.h	added	+249	−0	View file
drivers/target/loopback/tcm_loop.c	modified	+5	−70	View file
drivers/target/target_core_alua.c	modified	+1	−1	View file
drivers/target/target_core_pr.c	modified	+1	−1	View file
drivers/target/target_core_sbc.c	modified	+1	−1	View file
drivers/usb/gadget/legacy/tcm_usb_gadget.c	modified	+1	−1	View file
drivers/usb/storage/debug.c	modified	+6	−4	View file
drivers/usb/storage/uas.c	modified	+3	−4	View file
drivers/xen/xen-scsiback.c	modified	+0	−4	View file
include/linux/blk-mq.h	modified	+17	−0	View file
include/linux/blkdev.h	modified	+0	−1	View file
include/linux/eeprom_93cx6.h	modified	+4	−0	View file
include/linux/libata.h	modified	+2	−2	View file
include/scsi/libfc.h	modified	+0	−2	View file
include/scsi/libiscsi.h	modified	+0	−2	View file
include/scsi/libsas.h	modified	+2	−15	View file
include/scsi/scsi.h	modified	+8	−4	View file
include/scsi/scsi_cmnd.h	modified	+5	−1	View file
include/scsi/scsi_dbg.h	modified	+16	−12	View file
include/scsi/scsi_device.h	modified	+11	−10	View file
include/scsi/scsi_driver.h	modified	+0	−1	View file
include/scsi/scsi_eh.h	modified	+8	−16	View file
include/scsi/scsi_host.h	modified	+20	−19	View file
include/scsi/scsi_ioctl.h	modified	+2	−2	View file
include/scsi/scsi_tcq.h	modified	+13	−74	View file
include/scsi/scsi_transport_spi.h	modified	+1	−0	View file
include/scsi/sg.h	modified	+4	−1	View file
include/trace/events/scsi.h	modified	+1	−1	View file
include/trace/events/target.h	modified	+1	−1	View file
tools/lib/traceevent/plugin_scsi.c	modified	+6	−3	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/stable/sysfs-driver-ib_srp

View file

diff --git a/Documentation/ABI/stable/sysfs-driver-ib_srp b/Documentation/ABI/stable/sysfs-driver-ib_srp
index b9688de..7049a2b 100644
--- a/Documentation/ABI/stable/sysfs-driver-ib_srp
+++ b/Documentation/ABI/stable/sysfs-driver-ib_srp
@@ -55,12 +55,12 @@ Description:	Interface for making ib_srp connect to a new target.
 		  only safe with partial memory descriptor list support enabled
 		  (allow_ext_sg=1).
 		* comp_vector, a number in the range 0..n-1 specifying the
-		  MSI-X completion vector. Some HCA's allocate multiple (n)
-		  MSI-X vectors per HCA port. If the IRQ affinity masks of
-		  these interrupts have been configured such that each MSI-X
-		  interrupt is handled by a different CPU then the comp_vector
-		  parameter can be used to spread the SRP completion workload
-		  over multiple CPU's.
+		  MSI-X completion vector of the first RDMA channel. Some
+		  HCA's allocate multiple (n) MSI-X vectors per HCA port. If
+		  the IRQ affinity masks of these interrupts have been
+		  configured such that each MSI-X interrupt is handled by a
+		  different CPU then the comp_vector parameter can be used to
+		  spread the SRP completion workload over multiple CPU's.
 		* tl_retry_count, a number in the range 2..7 specifying the
 		  IB RC retry count.
 		* queue_size, the maximum number of commands that the
@@ -88,6 +88,13 @@ Description:	Whether ib_srp is allowed to include a partial memory
 		descriptor list in an SRP_CMD when communicating with an SRP
 		target.
 
+What:		/sys/class/scsi_host/host<n>/ch_count
+Date:		April 1, 2015
+KernelVersion:	3.19
+Contact:	[email protected]
+Description:	Number of RDMA channels used for communication with the SRP
+		target.
+
 What:		/sys/class/scsi_host/host<n>/cmd_sg_entries
 Date:		May 19, 2011
 KernelVersion:	2.6.39
@@ -95,6 +102,12 @@ Contact:	[email protected]
 Description:	Maximum number of data buffer descriptors that may be sent to
 		the target in a single SRP_CMD request.
 
+What:		/sys/class/scsi_host/host<n>/comp_vector
+Date:		September 2, 2013
+KernelVersion:	3.11
+Contact:	[email protected]
+Description:	Completion vector used for the first RDMA channel.
+
 What:		/sys/class/scsi_host/host<n>/dgid
 Date:		June 17, 2006
 KernelVersion:	2.6.17

Documentation/block/biodoc.txt

View file

diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 2101e71..6b972b2 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -827,10 +827,6 @@ but in the event of any barrier requests in the tag queue we need to ensure
 that requests are restarted in the order they were queue. This may happen
 if the driver needs to use blk_queue_invalidate_tags().
 
-Tagging also defines a new request flag, REQ_QUEUED. This is set whenever
-a request is currently tagged. You should not use this flag directly,
-blk_rq_tagged(rq) is the portable way to do so.
-
 3.3 I/O Submission
 
 The routine submit_bio() is used to submit a single io. Higher level i/o

Documentation/scsi/libsas.txt

View file

diff --git a/Documentation/scsi/libsas.txt b/Documentation/scsi/libsas.txt
index 3cc9c78..8cac649 100644
--- a/Documentation/scsi/libsas.txt
+++ b/Documentation/scsi/libsas.txt
@@ -226,9 +226,6 @@ static int register_sas_ha(struct my_sas_ha *my_ha)
 	my_ha->sas_ha.lldd_dev_found = my_dev_found;
 	my_ha->sas_ha.lldd_dev_gone = my_dev_gone;
 
-	my_ha->sas_ha.lldd_max_execute_num = lldd_max_execute_num; (1)
-
-	my_ha->sas_ha.lldd_queue_size = ha_can_queue;
 	my_ha->sas_ha.lldd_execute_task = my_execute_task;
 
 	my_ha->sas_ha.lldd_abort_task     = my_abort_task;
@@ -247,28 +244,6 @@ static int register_sas_ha(struct my_sas_ha *my_ha)
 	return sas_register_ha(&my_ha->sas_ha);
 }
 
-(1) This is normally a LLDD parameter, something of the
-lines of a task collector.  What it tells the SAS Layer is
-whether the SAS layer should run in Direct Mode (default:
-value 0 or 1) or Task Collector Mode (value greater than 1).
-
-In Direct Mode, the SAS Layer calls Execute Task as soon as
-it has a command to send to the SDS, _and_ this is a single
-command, i.e. not linked.
-
-Some hardware (e.g. aic94xx) has the capability to DMA more
-than one task at a time (interrupt) from host memory.  Task
-Collector Mode is an optional feature for HAs which support
-this in their hardware.  (Again, it is completely optional
-even if your hardware supports it.)
-
-In Task Collector Mode, the SAS Layer would do _natural_
-coalescing of tasks and at the appropriate moment it would
-call your driver to DMA more than one task in a single HA
-interrupt. DMBS may want to use this by insmod/modprobe
-setting the lldd_max_execute_num to something greater than
-1.
-
 (2) SAS 1.1 does not define I_T Nexus Reset TMF.
 
 Events
@@ -325,71 +300,22 @@ PHYE_SPINUP_HOLD -- SATA is present, COMWAKE not sent.
 
 The Execute Command SCSI RPC:
 
-	int (*lldd_execute_task)(struct sas_task *, int num,
-				 unsigned long gfp_flags);
+	int (*lldd_execute_task)(struct sas_task *, gfp_t gfp_flags);
 
-Used to queue a task to the SAS LLDD.  @task is the tasks to
-be executed.  @num should be the number of tasks being
-queued at this function call (they are linked listed via
-task::list), @gfp_mask should be the gfp_mask defining the
-context of the caller.
+Used to queue a task to the SAS LLDD.  @task is the task to be executed.
+@gfp_mask is the gfp_mask defining the context of the caller.
 
 This function should implement the Execute Command SCSI RPC,
-or if you're sending a SCSI Task as linked commands, you
-should also use this function.
 
-That is, when lldd_execute_task() is called, the command(s)
+That is, when lldd_execute_task() is called, the command
 go out on the transport *immediately*.  There is *no*
 queuing of any sort and at any level in a SAS LLDD.
 
-The use of task::list is two-fold, one for linked commands,
-the other discussed below.
-
-It is possible to queue up more than one task at a time, by
-initializing the list element of struct sas_task, and
-passing the number of tasks enlisted in this manner in num.
-
 Returns: -SAS_QUEUE_FULL, -ENOMEM, nothing was queued;
 	 0, the task(s) were queued.
 
-If you want to pass num > 1, then either
-A) you're the only caller of this function and keep track
-   of what you've queued to the LLDD, or
-B) you know what you're doing and have a strategy of
-   retrying.
-
-As opposed to queuing one task at a time (function call),
-batch queuing of tasks, by having num > 1, greatly
-simplifies LLDD code, sequencer code, and _hardware design_,
-and has some performance advantages in certain situations
-(DBMS).
-
-The LLDD advertises if it can take more than one command at
-a time at lldd_execute_task(), by setting the
-lldd_max_execute_num parameter (controlled by "collector"
-module parameter in aic94xx SAS LLDD).
-
-You should leave this to the default 1, unless you know what
-you're doing.
-
-This is a function of the LLDD, to which the SAS layer can
-cater to.
-
-int lldd_queue_size
-	The host adapter's queue size.  This is the maximum
-number of commands the lldd can have pending to domain
-devices on behalf of all upper layers submitting through
-lldd_execute_task().
-
-You really want to set this to something (much) larger than
-1.
-
-This _really_ has absolutely nothing to do with queuing.
-There is no queuing in SAS LLDDs.
-
 struct sas_task {
 	dev -- the device this task is destined to
-	list -- must be initialized (INIT_LIST_HEAD)
 	task_proto -- _one_ of enum sas_proto
 	scatter -- pointer to scatter gather list array
 	num_scatter -- number of elements in scatter

Documentation/scsi/scsi_mid_low_api.txt

View file

diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index d6a9bde..731bc4f 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -149,7 +149,7 @@ scsi_add_host()  ---->
 scsi_scan_host()  -------+
                          |
                     slave_alloc()
-                    slave_configure() -->  scsi_adjust_queue_depth()
+                    slave_configure() -->  scsi_change_queue_depth()
                          |
                     slave_alloc()
                     slave_configure()
@@ -159,7 +159,7 @@ scsi_scan_host()  -------+
 ------------------------------------------------------------
 
 If the LLD wants to adjust the default queue settings, it can invoke
-scsi_adjust_queue_depth() in its slave_configure() routine.
+scsi_change_queue_depth() in its slave_configure() routine.
 
 *** For scsi devices that the mid level tries to scan but do not
     respond, a slave_alloc(), slave_destroy() pair is called.
@@ -203,7 +203,7 @@ LLD                   mid level                    LLD
 scsi_add_device()  ------+
                          |
                     slave_alloc()
-                    slave_configure()   [--> scsi_adjust_queue_depth()]
+                    slave_configure()   [--> scsi_change_queue_depth()]
 ------------------------------------------------------------
 
 In a similar fashion, an LLD may become aware that a SCSI device has been
@@ -261,7 +261,7 @@ init_this_scsi_driver() ----+
                             |                scsi_register()
                             |
                       slave_alloc()
-                      slave_configure()  -->  scsi_adjust_queue_depth()
+                      slave_configure()  -->  scsi_change_queue_depth()
                       slave_alloc()   ***
                       slave_destroy() ***
                             |
@@ -271,9 +271,9 @@ init_this_scsi_driver() ----+
                       slave_destroy() ***
 ------------------------------------------------------------
 
-The mid level invokes scsi_adjust_queue_depth() with tagged queuing off and
-"cmd_per_lun" for that host as the queue length. These settings can be
-overridden by a slave_configure() supplied by the LLD.
+The mid level invokes scsi_change_queue_depth() with "cmd_per_lun" for that
+host as the queue length. These settings can be overridden by a
+slave_configure() supplied by the LLD.
 
 *** For scsi devices that the mid level tries to scan but do not
     respond, a slave_alloc(), slave_destroy() pair is called.
@@ -366,13 +366,11 @@ is initialized. The functions below are listed alphabetically and their
 names all start with "scsi_".
 
 Summary:
-   scsi_activate_tcq - turn on tag command queueing
    scsi_add_device - creates new scsi device (lu) instance
    scsi_add_host - perform sysfs registration and set up transport class
-   scsi_adjust_queue_depth - change the queue depth on a SCSI device
+   scsi_change_queue_depth - change the queue depth on a SCSI device
    scsi_bios_ptable - return copy of block device's partition table
    scsi_block_requests - prevent further commands being queued to given host
-   scsi_deactivate_tcq - turn off tag command queueing
    scsi_host_alloc - return a new scsi_host instance whose refcount==1
    scsi_host_get - increments Scsi_Host instance's refcount
    scsi_host_put - decrements Scsi_Host instance's refcount (free if 0)
@@ -390,24 +388,6 @@ Summary:
 Details:
 
 /**
- * scsi_activate_tcq - turn on tag command queueing ("ordered" task attribute)
- * @sdev:       device to turn on TCQ for
- * @depth:      queue depth
- *
- *      Returns nothing
- *
- *      Might block: no
- *
- *      Notes: Eventually, it is hoped depth would be the maximum depth
- *      the device could cope with and the real queue depth
- *      would be adjustable from 0 to depth.
- *
- *      Defined (inline) in: include/scsi/scsi_tcq.h
- **/
-void scsi_activate_tcq(struct scsi_device *sdev, int depth)
-
-
-/**
  * scsi_add_device - creates new scsi device (lu) instance
  * @shost:   pointer to scsi host instance
  * @channel: channel number (rarely other than 0)
@@ -456,11 +436,8 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
 
 
 /**
- * scsi_adjust_queue_depth - allow LLD to change queue depth on a SCSI device
+ * scsi_change_queue_depth - allow LLD to change queue depth on a SCSI device
  * @sdev:       pointer to SCSI device to change queue depth on
- * @tagged:     0 - no tagged queuing
- *              MSG_SIMPLE_TAG - simple tagged queuing
- *              MSG_ORDERED_TAG - ordered tagged queuing
  * @tags        Number of tags allowed if tagged queuing enabled,
  *              or number of commands the LLD can queue up
  *              in non-tagged mode (as per cmd_per_lun).
@@ -471,15 +448,12 @@ int scsi_add_host(struct Scsi_Host *shost, struct device * dev)
  *
  *      Notes: Can be invoked any time on a SCSI device controlled by this
  *      LLD. [Specifically during and after slave_configure() and prior to
- *      slave_destroy().] Can safely be invoked from interrupt code. Actual
- *      queue depth change may be delayed until the next command is being
- *      processed. See also scsi_activate_tcq() and scsi_deactivate_tcq().
+ *      slave_destroy().] Can safely be invoked from interrupt code.
  *
  *      Defined in: drivers/scsi/scsi.c [see source code for more notes]
  *
  **/
-void scsi_adjust_queue_depth(struct scsi_device * sdev, int tagged, 
-                             int tags)
+int scsi_change_queue_depth(struct scsi_device *sdev, int tags)
 
 
 /**
@@ -515,20 +489,6 @@ void scsi_block_requests(struct Scsi_Host * shost)
 
 
 /**
- * scsi_deactivate_tcq - turn off tag command queueing
- * @sdev:       device to turn off TCQ for
- * @depth:      queue depth (stored in sdev)
- *
- *      Returns nothing
- *
- *      Might block: no
- *
- *      Defined (inline) in: include/scsi/scsi_tcq.h
- **/
-void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
-
-
-/**
  * scsi_host_alloc - create a scsi host adapter instance and perform basic
  *                   initialization.
  * @sht:        pointer to scsi host template
@@ -1254,7 +1214,7 @@ of interest:
                    for disk firmware uploads.
     cmd_per_lun  - maximum number of commands that can be queued on devices
                    controlled by the host. Overridden by LLD calls to
-                   scsi_adjust_queue_depth().
+                   scsi_change_queue_depth().
     unchecked_isa_dma - 1=>only use bottom 16 MB of ram (ISA DMA addressing
                    restriction), 0=>can use full 32 bit (or better) DMA
                    address space
@@ -1294,7 +1254,7 @@ struct scsi_cmnd
 Instances of this structure convey SCSI commands to the LLD and responses
 back to the mid level. The SCSI mid level will ensure that no more SCSI
 commands become queued against the LLD than are indicated by
-scsi_adjust_queue_depth() (or struct Scsi_Host::cmd_per_lun). There will
+scsi_change_queue_depth() (or struct Scsi_Host::cmd_per_lun). There will
 be at least one instance of struct scsi_cmnd available for each SCSI device.
 Members of interest:
     cmnd         - array containing SCSI command

Documentation/scsi/st.txt

View file

diff --git a/Documentation/scsi/st.txt b/Documentation/scsi/st.txt
index f346abb..0d5bdb1 100644
--- a/Documentation/scsi/st.txt
+++ b/Documentation/scsi/st.txt
@@ -506,9 +506,11 @@ user does not request data that far.)
 
 DEBUGGING HINTS
 
-To enable debugging messages, edit st.c and #define DEBUG 1. As seen
-above, debugging can be switched off with an ioctl if debugging is
-compiled into the driver. The debugging output is not voluminous.
+Debugging code is now compiled in by default but debugging is turned off
+with the kernel module parameter debug_flag defaulting to 0.  Debugging
+can still be switched on and off with an ioctl.  To enable debug at
+module load time add debug_flag=1 to the module load options, the
+debugging output is not voluminous.
 
 If the tape seems to hang, I would be very interested to hear where
 the driver is waiting. With the command 'ps -l' you can see the state

Documentation/scsi/wd719x.txt

View file

diff --git a/Documentation/scsi/wd719x.txt b/Documentation/scsi/wd719x.txt
new file mode 100644
index 0000000..0816b02
--- /dev/null
+++ b/Documentation/scsi/wd719x.txt
@@ -0,0 +1,21 @@
+Driver for Western Digital WD7193, WD7197 and WD7296 SCSI cards
+---------------------------------------------------------------
+
+The card requires firmware that can be cut out of the Windows NT driver that
+can be downloaded from WD at:
+http://support.wdc.com/product/download.asp?groupid=801&sid=27&lang=en
+
+There is no license anywhere in the file or on the page - so the firmware
+probably cannot be added to linux-firmware.
+
+This script downloads and extracts the firmware, creating wd719x-risc.bin and
+d719x-wcs.bin files. Put them in /lib/firmware/.
+
+#!/bin/sh
+wget http://support.wdc.com/download/archive/pciscsi.exe
+lha xi pciscsi.exe pci-scsi.exe
+lha xi pci-scsi.exe nt/wd7296a.sys
+rm pci-scsi.exe
+dd if=wd7296a.sys of=wd719x-risc.bin bs=1 skip=5760 count=14336
+dd if=wd7296a.sys of=wd719x-wcs.bin bs=1 skip=20096 count=514
+rm wd7296a.sys

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index c721042..8ef028d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2862,11 +2862,10 @@ F:	Documentation/networking/dmfe.txt
 F:	drivers/net/ethernet/dec/tulip/dmfe.c
 
 DC390/AM53C974 SCSI driver
-M:	Kurt Garloff <[email protected]>
-W:	http://www.garloff.de/kurt/linux/dc390/
-M:	Guennadi Liakhovetski <[email protected]>
+M:	Hannes Reinecke <[email protected]>
+L:	[email protected]
 S:	Maintained
-F:	drivers/scsi/tmscsim.*
+F:	drivers/scsi/am53c974.c
 
 DC395x SCSI driver
 M:	Oliver Neukum <[email protected]>
@@ -5991,10 +5990,13 @@ W:	http://linuxtv.org
 S:	Odd Fixes
 F:	drivers/media/parport/pms*
 
-MEGARAID SCSI DRIVERS
-M:	Neela Syam Kolli <[email protected]>
+MEGARAID SCSI/SAS DRIVERS
+M:	Kashyap Desai <[email protected]>
+M:	Sumit Saxena <[email protected]>
+M:	Uday Lingala <[email protected]>
+L:	[email protected]
 L:	[email protected]
-W:	http://megaraid.lsilogic.com
+W:	http://www.lsi.com
 S:	Maintained
 F:	Documentation/scsi/megaraid.txt
 F:	drivers/scsi/megaraid.*
@@ -6305,7 +6307,6 @@ F:	drivers/scsi/g_NCR5380.*
 F:	drivers/scsi/g_NCR5380_mmio.c
 F:	drivers/scsi/mac_scsi.*
 F:	drivers/scsi/pas16.*
-F:	drivers/scsi/sun3_NCR5380.c
 F:	drivers/scsi/sun3_scsi.*
 F:	drivers/scsi/sun3_scsi_vme.c
 F:	drivers/scsi/t128.*

arch/m68k/atari/config.c

View file

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 01a6216..192b00f 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -858,6 +858,24 @@ static struct platform_device *atari_netusbee_devices[] __initdata = {
 };
 #endif /* CONFIG_ATARI_ETHERNEC */
 
+#ifdef CONFIG_ATARI_SCSI
+static const struct resource atari_scsi_st_rsrc[] __initconst = {
+	{
+		.flags = IORESOURCE_IRQ,
+		.start = IRQ_MFP_FSCSI,
+		.end   = IRQ_MFP_FSCSI,
+	},
+};
+
+static const struct resource atari_scsi_tt_rsrc[] __initconst = {
+	{
+		.flags = IORESOURCE_IRQ,
+		.start = IRQ_TT_MFP_SCSI,
+		.end   = IRQ_TT_MFP_SCSI,
+	},
+};
+#endif
+
 int __init atari_platform_init(void)
 {
 	int rv = 0;
@@ -892,6 +910,15 @@ int __init atari_platform_init(void)
 	}
 #endif
 
+#ifdef CONFIG_ATARI_SCSI
+	if (ATARIHW_PRESENT(ST_SCSI))
+		platform_device_register_simple("atari_scsi", -1,
+			atari_scsi_st_rsrc, ARRAY_SIZE(atari_scsi_st_rsrc));
+	else if (ATARIHW_PRESENT(TT_SCSI))
+		platform_device_register_simple("atari_scsi", -1,
+			atari_scsi_tt_rsrc, ARRAY_SIZE(atari_scsi_tt_rsrc));
+#endif
+
 	return rv;
 }
 

arch/m68k/atari/stdma.c

View file

diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
index ddbf43c..e5a6659 100644
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
@@ -59,6 +59,31 @@ static irqreturn_t stdma_int (int irq, void *dummy);
 /************************* End of Prototypes **************************/
 
 
+/**
+ * stdma_try_lock - attempt to acquire ST DMA interrupt "lock"
+ * @handler: interrupt handler to use after acquisition
+ *
+ * Returns !0 if lock was acquired; otherwise 0.
+ */
+
+int stdma_try_lock(irq_handler_t handler, void *data)
+{
+	unsigned long flags;
+
+	local_irq_save(flags);
+	if (stdma_locked) {
+		local_irq_restore(flags);
+		return 0;
+	}
+
+	stdma_locked   = 1;
+	stdma_isr      = handler;
+	stdma_isr_data = data;
+	local_irq_restore(flags);
+	return 1;
+}
+EXPORT_SYMBOL(stdma_try_lock);
+
 
 /*
  * Function: void stdma_lock( isrfunc isr, void *data )
@@ -78,19 +103,10 @@ static irqreturn_t stdma_int (int irq, void *dummy);
 
 void stdma_lock(irq_handler_t handler, void *data)
 {
-	unsigned long flags;
-
-	local_irq_save(flags);		/* protect lock */
-
 	/* Since the DMA is used for file system purposes, we
 	 have to sleep uninterruptible (there may be locked
 	 buffers) */
-	wait_event(stdma_wait, !stdma_locked);
-
-	stdma_locked   = 1;
-	stdma_isr      = handler;
-	stdma_isr_data = data;
-	local_irq_restore(flags);
+	wait_event(stdma_wait, stdma_try_lock(handler, data));
 }
 EXPORT_SYMBOL(stdma_lock);
 
@@ -122,22 +138,25 @@ void stdma_release(void)
 EXPORT_SYMBOL(stdma_release);
 
 
-/*
- * Function: int stdma_others_waiting( void )
- *
- * Purpose: Check if someone waits for the ST-DMA lock.
- *
- * Inputs: none
- *
- * Returns: 0 if no one is waiting, != 0 otherwise
+/**
+ * stdma_is_locked_by - allow lock holder to check whether it needs to release.
+ * @handler: interrupt handler previously used to acquire lock.
  *
+ * Returns !0 if locked for the given handler; 0 otherwise.
  */
 
-int stdma_others_waiting(void)
+int stdma_is_locked_by(irq_handler_t handler)
 {
-	return waitqueue_active(&stdma_wait);
+	unsigned long flags;
+	int result;
+
+	local_irq_save(flags);
+	result = stdma_locked && (stdma_isr == handler);
+	local_irq_restore(flags);
+
+	return result;
 }
-EXPORT_SYMBOL(stdma_others_waiting);
+EXPORT_SYMBOL(stdma_is_locked_by);
 
 
 /*

arch/m68k/include/asm/atari_stdma.h

View file

diff --git a/arch/m68k/include/asm/atari_stdma.h b/arch/m68k/include/asm/atari_stdma.h
index 8e389b7..d24e34d 100644
--- a/arch/m68k/include/asm/atari_stdma.h
+++ b/arch/m68k/include/asm/atari_stdma.h
@@ -8,11 +8,11 @@
 
 /***************************** Prototypes *****************************/
 
+int stdma_try_lock(irq_handler_t, void *);
 void stdma_lock(irq_handler_t handler, void *data);
 void stdma_release( void );
-int stdma_others_waiting( void );
 int stdma_islocked( void );
-void *stdma_locked_by( void );
+int stdma_is_locked_by(irq_handler_t);
 void stdma_init( void );
 
 /************************* End of Prototypes **************************/

arch/m68k/include/asm/macintosh.h

View file

diff --git a/arch/m68k/include/asm/macintosh.h b/arch/m68k/include/asm/macintosh.h
index d323b2c..29c7c6c 100644
--- a/arch/m68k/include/asm/macintosh.h
+++ b/arch/m68k/include/asm/macintosh.h
@@ -53,6 +53,10 @@ struct mac_model
 #define MAC_SCSI_QUADRA		2

This diff is incomplete. Download the complete patch.