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

9b73e76f · Linus Torvalds <[email protected]> · 2008-01-25 17:19:08 -08:00

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

Commit: 9b73e76f3cf63379dcf45fcd4f112f5812418d0a
Parents: 50d9a126 · 23c3e290

Merge commit. Changes below are compared with the first parent: 50d9a126.

Changes

210 files changed · +10523 −9023

File	Status	Add	Del	Content
Documentation/DocBook/Makefile	modified	+1	−1	View file
Documentation/DocBook/scsi.tmpl	added	+409	−0	View file
Documentation/dontdiff	modified	+0	−2	View file
Documentation/kernel-parameters.txt	modified	+7	−1	View file
Documentation/m68k/kernel-options.txt	modified	+0	−60	View file
Documentation/scsi/00-INDEX	modified	+0	−2	View file
Documentation/scsi/ChangeLog.megaraid_sas	modified	+159	−0	View file
Documentation/scsi/aacraid.txt	modified	+4	−0	View file
Documentation/scsi/hptiop.txt	modified	+21	−9	View file
Documentation/scsi/ncr53c7xx.txt	deleted	+0	−40	View before deletion
MAINTAINERS	modified	+4	−2	View file
block/bsg.c	modified	+12	−2	View file
block/ll_rw_blk.c	modified	+24	−0	View file
drivers/ata/libata-scsi.c	modified	+9	−2	View file
drivers/base/attribute_container.c	modified	+12	−2	View file
drivers/firewire/fw-sbp2.c	modified	+6	−0	View file
drivers/ieee1394/sbp2.c	modified	+6	−0	View file
drivers/infiniband/ulp/iser/iscsi_iser.c	modified	+7	−8	View file
drivers/infiniband/ulp/iser/iser_initiator.c	modified	+1	−3	View file
drivers/message/fusion/mptbase.c	modified	+52	−42	View file
drivers/message/fusion/mptbase.h	modified	+1	−1	View file
drivers/message/fusion/mptsas.c	modified	+2	−0	View file
drivers/message/fusion/mptscsih.c	modified	+1	−1	View file
drivers/message/i2o/i2o_scsi.c	modified	+1	−1	View file
drivers/s390/scsi/zfcp_aux.c	modified	+0	−2	View file
drivers/s390/scsi/zfcp_ccw.c	modified	+3	−0	View file
drivers/s390/scsi/zfcp_dbf.c	modified	+0	−6	View file
drivers/s390/scsi/zfcp_def.h	modified	+16	−6	View file
drivers/s390/scsi/zfcp_erp.c	modified	+7	−7	View file
drivers/s390/scsi/zfcp_fsf.c	modified	+35	−35	View file
drivers/s390/scsi/zfcp_scsi.c	modified	+11	−13	View file
drivers/scsi/.gitignore	modified	+0	−2	View file
drivers/scsi/3w-9xxx.c	modified	+1	−0	View file
drivers/scsi/53c700.c	modified	+6	−5	View file
drivers/scsi/BusLogic.c	modified	+1	−1	View file
drivers/scsi/Kconfig	modified	+3	−29	View file
drivers/scsi/Makefile	modified	+1	−4	View file
drivers/scsi/NCR5380.c	modified	+12	−11	View file
drivers/scsi/a2091.c	modified	+5	−31	View file
drivers/scsi/a3000.c	modified	+3	−12	View file
drivers/scsi/aacraid/aachba.c	modified	+215	−185	View file
drivers/scsi/aacraid/aacraid.h	modified	+174	−161	View file
drivers/scsi/aacraid/commctrl.c	modified	+58	−54	View file
drivers/scsi/aacraid/comminit.c	modified	+2	−2	View file
drivers/scsi/aacraid/commsup.c	modified	+239	−155	View file
drivers/scsi/aacraid/dpcsup.c	modified	+5	−5	View file
drivers/scsi/aacraid/linit.c	modified	+165	−77	View file
drivers/scsi/aacraid/rx.c	modified	+4	−2	View file
drivers/scsi/advansys.c	modified	+7	−7	View file
drivers/scsi/aha152x.c	modified	+8	−30	View file
drivers/scsi/aha1542.c	modified	+12	−37	View file
drivers/scsi/aha1740.c	modified	+1	−1	View file
drivers/scsi/aic7xxx/Makefile	modified	+18	−27	View file
drivers/scsi/aic7xxx/aic79xx_osm.c	modified	+3	−3	View file
drivers/scsi/aic7xxx/aic7xxx_osm.c	modified	+3	−3	View file
drivers/scsi/aic7xxx_old.c	modified	+5	−6	View file
drivers/scsi/aic94xx/aic94xx_dev.c	modified	+3	−3	View file
drivers/scsi/aic94xx/aic94xx_dump.c	modified	+2	−2	View file
drivers/scsi/aic94xx/aic94xx_hwi.c	modified	+1	−1	View file
drivers/scsi/aic94xx/aic94xx_hwi.h	modified	+3	−0	View file
drivers/scsi/aic94xx/aic94xx_init.c	modified	+187	−3	View file
drivers/scsi/aic94xx/aic94xx_scb.c	modified	+3	−3	View file
drivers/scsi/aic94xx/aic94xx_sds.c	modified	+389	−0	View file
drivers/scsi/aic94xx/aic94xx_sds.h	added	+121	−0	View file
drivers/scsi/aic94xx/aic94xx_task.c	modified	+17	−33	View file
drivers/scsi/aic94xx/aic94xx_tmf.c	modified	+6	−6	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+3	−3	View file
drivers/scsi/atari_NCR5380.c	modified	+12	−12	View file
drivers/scsi/atp870u.c	modified	+17	−85	View file
drivers/scsi/ch.c	modified	+109	−106	View file
drivers/scsi/constants.c	modified	+1	−2	View file
drivers/scsi/dc395x.c	modified	+7	−9	View file
drivers/scsi/dpt_i2o.c	modified	+2	−3	View file
drivers/scsi/eata.c	modified	+2	−2	View file
drivers/scsi/eata_pio.c	modified	+6	−7	View file
drivers/scsi/fd_mcs.c	modified	+11	−25	View file
drivers/scsi/gdth.c	modified	+10	−12	View file
drivers/scsi/hosts.c	modified	+1	−3	View file
drivers/scsi/hptiop.c	modified	+464	−129	View file
drivers/scsi/hptiop.h	modified	+89	−35	View file
drivers/scsi/ibmvscsi/ibmvscsi.c	modified	+99	−56	View file
drivers/scsi/ibmvscsi/ibmvstgt.c	modified	+1	−1	View file
drivers/scsi/imm.c	modified	+5	−8	View file
drivers/scsi/in2000.c	modified	+5	−5	View file
drivers/scsi/ipr.c	modified	+1	−1	View file
drivers/scsi/ips.c	modified	+154	−172	View file
drivers/scsi/ips.h	modified	+14	−18	View file
drivers/scsi/iscsi_tcp.c	modified	+896	−1187	View file
drivers/scsi/iscsi_tcp.h	modified	+51	−83	View file
drivers/scsi/libiscsi.c	modified	+713	−378	View file
drivers/scsi/libsas/Kconfig	modified	+9	−0	View file
drivers/scsi/libsas/Makefile	modified	+3	−1	View file
drivers/scsi/libsas/sas_ata.c	modified	+1	−1	View file
drivers/scsi/libsas/sas_discover.c	modified	+1	−1	View file
drivers/scsi/libsas/sas_expander.c	modified	+26	−9	View file
drivers/scsi/libsas/sas_host_smp.c	added	+274	−0	View file
drivers/scsi/libsas/sas_internal.h	modified	+15	−1	View file
drivers/scsi/libsas/sas_scsi_host.c	modified	+6	−3	View file
drivers/scsi/libsas/sas_task.c	added	+36	−0	View file
drivers/scsi/libsrp.c	modified	+12	−11	View file
drivers/scsi/lpfc/lpfc.h	modified	+46	−7	View file
drivers/scsi/lpfc/lpfc_attr.c	modified	+191	−26	View file
drivers/scsi/lpfc/lpfc_crtn.h	modified	+14	−19	View file
drivers/scsi/lpfc/lpfc_ct.c	modified	+218	−86	View file
drivers/scsi/lpfc/lpfc_debugfs.c	modified	+127	−30	View file
drivers/scsi/lpfc/lpfc_disc.h	modified	+1	−1	View file
drivers/scsi/lpfc/lpfc_els.c	modified	+439	−184	View file
drivers/scsi/lpfc/lpfc_hbadisc.c	modified	+242	−130	View file
drivers/scsi/lpfc/lpfc_hw.h	modified	+99	−13	View file
drivers/scsi/lpfc/lpfc_init.c	modified	+318	−111	View file
drivers/scsi/lpfc/lpfc_logmsg.h	modified	+1	−0	View file
drivers/scsi/lpfc/lpfc_mbox.c	modified	+27	−5	View file
drivers/scsi/lpfc/lpfc_mem.c	modified	+1	−0	View file
drivers/scsi/lpfc/lpfc_nportdisc.c	modified	+132	−28	View file
drivers/scsi/lpfc/lpfc_scsi.c	modified	+37	−17	View file
drivers/scsi/lpfc/lpfc_scsi.h	modified	+1	−0	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+358	−176	View file
drivers/scsi/lpfc/lpfc_sli.h	modified	+5	−7	View file
drivers/scsi/lpfc/lpfc_version.h	modified	+3	−3	View file
drivers/scsi/lpfc/lpfc_vport.c	modified	+57	−36	View file
drivers/scsi/lpfc/lpfc_vport.h	modified	+1	−1	View file
drivers/scsi/megaraid.c	modified	+1	−1	View file
drivers/scsi/megaraid/megaraid_mbox.c	modified	+3	−3	View file
drivers/scsi/megaraid/megaraid_sas.c	modified	+448	−124	View file
drivers/scsi/megaraid/megaraid_sas.h	modified	+12	−6	View file
drivers/scsi/ncr53c8xx.c	modified	+2	−1	View file
drivers/scsi/pcmcia/Kconfig	modified	+2	−1	View file
drivers/scsi/pcmcia/nsp_cs.c	modified	+34	−20	View file
drivers/scsi/ppa.c	modified	+5	−7	View file
drivers/scsi/psi240i.c	deleted	+0	−689	View before deletion
drivers/scsi/psi240i.h	deleted	+0	−315	View before deletion
drivers/scsi/psi_chip.h	deleted	+0	−195	View before deletion
drivers/scsi/qla1280.c	modified	+2	−2	View file
drivers/scsi/qla2xxx/Makefile	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_attr.c	modified	+35	−19	View file
drivers/scsi/qla2xxx/qla_dbg.c	modified	+22	−15	View file
drivers/scsi/qla2xxx/qla_dbg.h	modified	+19	−0	View file
drivers/scsi/qla2xxx/qla_def.h	modified	+28	−24	View file
drivers/scsi/qla2xxx/qla_dfs.c	added	+175	−0	View file
drivers/scsi/qla2xxx/qla_fw.h	modified	+24	−6	View file
drivers/scsi/qla2xxx/qla_gbl.h	modified	+21	−30	View file
drivers/scsi/qla2xxx/qla_init.c	modified	+70	−27	View file
drivers/scsi/qla2xxx/qla_isr.c	modified	+54	−66	View file
drivers/scsi/qla2xxx/qla_mbx.c	modified	+144	−286	View file
drivers/scsi/qla2xxx/qla_mid.c	modified	+20	−26	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+29	−51	View file
drivers/scsi/qla2xxx/qla_sup.c	modified	+12	−6	View file
drivers/scsi/qla2xxx/qla_version.h	modified	+1	−1	View file
drivers/scsi/qla4xxx/ql4_init.c	modified	+3	−1	View file
drivers/scsi/qla4xxx/ql4_isr.c	modified	+4	−7	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+2	−5	View file
drivers/scsi/qlogicpti.c	modified	+8	−23	View file
drivers/scsi/scsi.c	modified	+168	−114	View file
drivers/scsi/scsi_debug.c	modified	+10	−27	View file
drivers/scsi/scsi_devinfo.c	modified	+15	−19	View file
drivers/scsi/scsi_error.c	modified	+64	−67	View file
drivers/scsi/scsi_ioctl.c	modified	+17	−9	View file
drivers/scsi/scsi_lib.c	modified	+72	−45	View file
drivers/scsi/scsi_netlink.c	modified	+7	−12	View file
drivers/scsi/scsi_proc.c	modified	+108	−2	View file
drivers/scsi/scsi_scan.c	modified	+23	−13	View file
drivers/scsi/scsi_sysfs.c	modified	+1	−0	View file
drivers/scsi/scsi_tgt_if.c	modified	+1	−1	View file
drivers/scsi/scsi_tgt_lib.c	modified	+13	−17	View file
drivers/scsi/scsi_transport_fc.c	modified	+46	−56	View file
drivers/scsi/scsi_transport_iscsi.c	modified	+185	−145	View file
drivers/scsi/scsi_transport_sas.c	modified	+22	−19	View file
drivers/scsi/scsi_transport_spi.c	modified	+176	−82	View file
drivers/scsi/scsi_transport_srp.c	modified	+6	−7	View file
drivers/scsi/scsicam.c	modified	+24	−11	View file
drivers/scsi/sd.c	modified	+33	−11	View file
drivers/scsi/seagate.c	deleted	+0	−1667	View before deletion
drivers/scsi/sg.c	modified	+16	−8	View file
drivers/scsi/sgiwd93.c	modified	+1	−0	View file
drivers/scsi/sr.c	modified	+24	−11	View file
drivers/scsi/sr.h	modified	+4	−0	View file
drivers/scsi/sr_ioctl.c	modified	+34	−14	View file
drivers/scsi/st.c	modified	+4	−5	View file
drivers/scsi/sun3_NCR5380.c	modified	+12	−12	View file
drivers/scsi/sym53c416.c	modified	+1	−15	View file
drivers/scsi/sym53c8xx_2/sym_glue.c	modified	+11	−11	View file
drivers/scsi/tmscsim.c	modified	+3	−3	View file
drivers/scsi/u14-34f.c	modified	+2	−2	View file
drivers/scsi/ultrastor.c	modified	+11	−4	View file
drivers/scsi/wd33c93.c	modified	+5	−5	View file
drivers/scsi/wd7000.c	modified	+6	−6	View file
drivers/usb/storage/freecom.c	modified	+6	−8	View file
drivers/usb/storage/isd200.c	modified	+46	−20	View file
drivers/usb/storage/protocol.c	modified	+53	−73	View file
drivers/usb/storage/scsiglue.c	modified	+14	−10	View file
drivers/usb/storage/sddr09.c	modified	+3	−6	View file
drivers/usb/storage/shuttle_usbat.c	modified	+26	−42	View file
drivers/usb/storage/transport.c	modified	+28	−17	View file
drivers/usb/storage/transport.h	modified	+2	−0	View file
fs/sysfs/file.c	modified	+9	−2	View file
fs/sysfs/group.c	modified	+16	−10	View file
include/linux/attribute_container.h	modified	+1	−0	View file
include/linux/blkdev.h	modified	+1	−0	View file
include/linux/sysfs.h	modified	+2	−0	View file
include/scsi/iscsi_if.h	modified	+20	−0	View file
include/scsi/iscsi_proto.h	modified	+13	−1	View file
include/scsi/libiscsi.h	modified	+65	−17	View file
include/scsi/libsas.h	modified	+14	−14	View file
include/scsi/sas.h	modified	+6	−7	View file
include/scsi/scsi_cmnd.h	modified	+1	−1	View file
include/scsi/scsi_device.h	modified	+9	−4	View file
include/scsi/scsi_transport_iscsi.h	modified	+7	−3	View file
include/scsi/scsi_transport_sas.h	modified	+5	−11	View file
include/scsi/sd.h	modified	+1	−0	View file
kernel/params.c	modified	+1	−1	View file

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

Documentation/DocBook/Makefile

View file

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 4953bc2..6a0ad47 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    genericirq.xml s390-drivers.xml uio-howto.xml
+	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml
 
 ###
 # The build process is as follows (targets):

Documentation/DocBook/scsi.tmpl

View file

diff --git a/Documentation/DocBook/scsi.tmpl b/Documentation/DocBook/scsi.tmpl
new file mode 100644
index 0000000..f299ab1
--- /dev/null
+++ b/Documentation/DocBook/scsi.tmpl
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>
+
+<book id="scsimid">
+  <bookinfo>
+    <title>SCSI Interfaces Guide</title>
+
+    <authorgroup>
+      <author>
+        <firstname>James</firstname>
+        <surname>Bottomley</surname>
+        <affiliation>
+          <address>
+            <email>[email protected]</email>
+          </address>
+        </affiliation>
+      </author>
+
+      <author>
+        <firstname>Rob</firstname>
+        <surname>Landley</surname>
+        <affiliation>
+          <address>
+            <email>[email protected]</email>
+          </address>
+        </affiliation>
+      </author>
+
+    </authorgroup>
+
+    <copyright>
+      <year>2007</year>
+      <holder>Linux Foundation</holder>
+    </copyright>
+
+    <legalnotice>
+      <para>
+        This documentation is free software; you can redistribute
+        it and/or modify it under the terms of the GNU General Public
+        License version 2.
+      </para>
+
+      <para>
+        This program is distributed in the hope that it will be
+        useful, but WITHOUT ANY WARRANTY; without even the implied
+        warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+        For more details see the file COPYING in the source
+        distribution of Linux.
+      </para>
+    </legalnotice>
+  </bookinfo>
+
+  <toc></toc>
+
+  <chapter id="intro">
+    <title>Introduction</title>
+    <sect1 id="protocol_vs_bus">
+      <title>Protocol vs bus</title>
+      <para>
+        Once upon a time, the Small Computer Systems Interface defined both
+        a parallel I/O bus and a data protocol to connect a wide variety of
+        peripherals (disk drives, tape drives, modems, printers, scanners,
+        optical drives, test equipment, and medical devices) to a host
+        computer.
+      </para>
+      <para>
+        Although the old parallel (fast/wide/ultra) SCSI bus has largely
+        fallen out of use, the SCSI command set is more widely used than ever
+        to communicate with devices over a number of different busses.
+      </para>
+      <para>
+        The <ulink url='http://www.t10.org/scsi-3.htm'>SCSI protocol</ulink>
+        is a big-endian peer-to-peer packet based protocol.  SCSI commands
+        are 6, 10, 12, or 16 bytes long, often followed by an associated data
+        payload.
+      </para>
+      <para>
+        SCSI commands can be transported over just about any kind of bus, and
+        are the default protocol for storage devices attached to USB, SATA,
+        SAS, Fibre Channel, FireWire, and ATAPI devices.  SCSI packets are
+        also commonly exchanged over Infiniband,
+        <ulink url='http://i2o.shadowconnect.com/faq.php'>I20</ulink>, TCP/IP
+        (<ulink url='http://en.wikipedia.org/wiki/ISCSI'>iSCSI</ulink>), even
+        <ulink url='http://cyberelk.net/tim/parport/parscsi.html'>Parallel
+        ports</ulink>.
+      </para>
+    </sect1>
+    <sect1 id="subsystem_design">
+      <title>Design of the Linux SCSI subsystem</title>
+      <para>
+        The SCSI subsystem uses a three layer design, with upper, mid, and low
+        layers.  Every operation involving the SCSI subsystem (such as reading
+        a sector from a disk) uses one driver at each of the 3 levels: one
+        upper layer driver, one lower layer driver, and the SCSI midlayer.
+      </para>
+      <para>
+        The SCSI upper layer provides the interface between userspace and the
+        kernel, in the form of block and char device nodes for I/O and
+        ioctl().  The SCSI lower layer contains drivers for specific hardware
+        devices.
+      </para>
+      <para>
+        In between is the SCSI mid-layer, analogous to a network routing
+        layer such as the IPv4 stack.  The SCSI mid-layer routes a packet
+        based data protocol between the upper layer's /dev nodes and the
+        corresponding devices in the lower layer.  It manages command queues,
+        provides error handling and power management functions, and responds
+        to ioctl() requests.
+      </para>
+    </sect1>
+  </chapter>
+
+  <chapter id="upper_layer">
+    <title>SCSI upper layer</title>
+    <para>
+      The upper layer supports the user-kernel interface by providing
+      device nodes.
+    </para>
+    <sect1 id="sd">
+      <title>sd (SCSI Disk)</title>
+      <para>sd (sd_mod.o)</para>
+<!-- !Idrivers/scsi/sd.c -->
+    </sect1>
+    <sect1 id="sr">
+      <title>sr (SCSI CD-ROM)</title>
+      <para>sr (sr_mod.o)</para>
+    </sect1>
+    <sect1 id="st">
+      <title>st (SCSI Tape)</title>
+      <para>st (st.o)</para>
+    </sect1>
+    <sect1 id="sg">
+      <title>sg (SCSI Generic)</title>
+      <para>sg (sg.o)</para>
+    </sect1>
+    <sect1 id="ch">
+      <title>ch (SCSI Media Changer)</title>
+      <para>ch (ch.c)</para>
+    </sect1>
+  </chapter>
+
+  <chapter id="mid_layer">
+    <title>SCSI mid layer</title>
+
+    <sect1 id="midlayer_implementation">
+      <title>SCSI midlayer implementation</title>
+      <sect2 id="scsi_device.h">
+        <title>include/scsi/scsi_device.h</title>
+        <para>
+        </para>
+!Iinclude/scsi/scsi_device.h
+      </sect2>
+
+      <sect2 id="scsi.c">
+        <title>drivers/scsi/scsi.c</title>
+        <para>Main file for the SCSI midlayer.</para>
+!Edrivers/scsi/scsi.c
+      </sect2>
+      <sect2 id="scsicam.c">
+        <title>drivers/scsi/scsicam.c</title>
+        <para>
+          <ulink url='http://www.t10.org/ftp/t10/drafts/cam/cam-r12b.pdf'>SCSI
+          Common Access Method</ulink> support functions, for use with
+          HDIO_GETGEO, etc.
+        </para>
+!Edrivers/scsi/scsicam.c
+      </sect2>
+      <sect2 id="scsi_error.c">
+        <title>drivers/scsi/scsi_error.c</title>
+        <para>Common SCSI error/timeout handling routines.</para>
+!Edrivers/scsi/scsi_error.c
+      </sect2>
+      <sect2 id="scsi_devinfo.c">
+        <title>drivers/scsi/scsi_devinfo.c</title>
+        <para>
+          Manage scsi_dev_info_list, which tracks blacklisted and whitelisted
+          devices.
+        </para>
+!Idrivers/scsi/scsi_devinfo.c
+      </sect2>
+      <sect2 id="scsi_ioctl.c">
+        <title>drivers/scsi/scsi_ioctl.c</title>
+        <para>
+          Handle ioctl() calls for SCSI devices.
+        </para>
+!Edrivers/scsi/scsi_ioctl.c
+      </sect2>
+      <sect2 id="scsi_lib.c">
+        <title>drivers/scsi/scsi_lib.c</title>
+        <para>
+          SCSI queuing library.
+        </para>
+!Edrivers/scsi/scsi_lib.c
+      </sect2>
+      <sect2 id="scsi_lib_dma.c">
+        <title>drivers/scsi/scsi_lib_dma.c</title>
+        <para>
+          SCSI library functions depending on DMA
+          (map and unmap scatter-gather lists).
+        </para>
+!Edrivers/scsi/scsi_lib_dma.c
+      </sect2>
+      <sect2 id="scsi_module.c">
+        <title>drivers/scsi/scsi_module.c</title>
+        <para>
+          The file drivers/scsi/scsi_module.c contains legacy support for
+          old-style host templates.  It should never be used by any new driver.
+        </para>
+      </sect2>
+      <sect2 id="scsi_proc.c">
+        <title>drivers/scsi/scsi_proc.c</title>
+        <para>
+          The functions in this file provide an interface between
+          the PROC file system and the SCSI device drivers
+          It is mainly used for debugging, statistics and to pass
+          information directly to the lowlevel driver.
+
+          I.E. plumbing to manage /proc/scsi/*
+        </para>
+!Idrivers/scsi/scsi_proc.c
+      </sect2>
+      <sect2 id="scsi_netlink.c">
+        <title>drivers/scsi/scsi_netlink.c</title>
+        <para>
+          Infrastructure to provide async events from transports to userspace
+          via netlink, using a single NETLINK_SCSITRANSPORT protocol for all
+          transports.
+
+          See <ulink url='http://marc.info/?l=linux-scsi&amp;m=115507374832500&amp;w=2'>the
+          original patch submission</ulink> for more details.
+        </para>
+!Idrivers/scsi/scsi_netlink.c
+      </sect2>
+      <sect2 id="scsi_scan.c">
+        <title>drivers/scsi/scsi_scan.c</title>
+        <para>
+          Scan a host to determine which (if any) devices are attached.
+
+          The general scanning/probing algorithm is as follows, exceptions are
+          made to it depending on device specific flags, compilation options,
+          and global variable (boot or module load time) settings.
+
+          A specific LUN is scanned via an INQUIRY command; if the LUN has a
+          device attached, a scsi_device is allocated and setup for it.
+
+          For every id of every channel on the given host, start by scanning
+          LUN 0.  Skip hosts that don't respond at all to a scan of LUN 0.
+          Otherwise, if LUN 0 has a device attached, allocate and setup a
+          scsi_device for it.  If target is SCSI-3 or up, issue a REPORT LUN,
+          and scan all of the LUNs returned by the REPORT LUN; else,
+          sequentially scan LUNs up until some maximum is reached, or a LUN is
+          seen that cannot have a device attached to it.
+        </para>
+!Idrivers/scsi/scsi_scan.c
+      </sect2>
+      <sect2 id="scsi_sysctl.c">
+        <title>drivers/scsi/scsi_sysctl.c</title>
+        <para>
+          Set up the sysctl entry: "/dev/scsi/logging_level"
+          (DEV_SCSI_LOGGING_LEVEL) which sets/returns scsi_logging_level.
+        </para>
+      </sect2>
+      <sect2 id="scsi_sysfs.c">
+        <title>drivers/scsi/scsi_sysfs.c</title>
+        <para>
+          SCSI sysfs interface routines.
+        </para>
+!Edrivers/scsi/scsi_sysfs.c
+      </sect2>
+      <sect2 id="hosts.c">
+        <title>drivers/scsi/hosts.c</title>
+        <para>
+          mid to lowlevel SCSI driver interface
+        </para>
+!Edrivers/scsi/hosts.c
+      </sect2>
+      <sect2 id="constants.c">
+        <title>drivers/scsi/constants.c</title>
+        <para>
+          mid to lowlevel SCSI driver interface
+        </para>
+!Edrivers/scsi/constants.c
+      </sect2>
+    </sect1>
+
+    <sect1 id="Transport_classes">
+      <title>Transport classes</title>
+      <para>
+        Transport classes are service libraries for drivers in the SCSI
+        lower layer, which expose transport attributes in sysfs.
+      </para>
+      <sect2 id="Fibre_Channel_transport">
+        <title>Fibre Channel transport</title>
+        <para>
+          The file drivers/scsi/scsi_transport_fc.c defines transport attributes
+          for Fibre Channel.
+        </para>
+!Edrivers/scsi/scsi_transport_fc.c
+      </sect2>
+      <sect2 id="iSCSI_transport">
+        <title>iSCSI transport class</title>
+        <para>
+          The file drivers/scsi/scsi_transport_iscsi.c defines transport
+          attributes for the iSCSI class, which sends SCSI packets over TCP/IP
+          connections.
+        </para>
+!Edrivers/scsi/scsi_transport_iscsi.c
+      </sect2>
+      <sect2 id="SAS_transport">
+        <title>Serial Attached SCSI (SAS) transport class</title>
+        <para>
+          The file drivers/scsi/scsi_transport_sas.c defines transport
+          attributes for Serial Attached SCSI, a variant of SATA aimed at
+          large high-end systems.
+        </para>
+        <para>
+          The SAS transport class contains common code to deal with SAS HBAs,
+          an aproximated representation of SAS topologies in the driver model,
+          and various sysfs attributes to expose these topologies and managment
+          interfaces to userspace.
+        </para>
+        <para>
+          In addition to the basic SCSI core objects this transport class
+          introduces two additional intermediate objects:  The SAS PHY
+          as represented by struct sas_phy defines an "outgoing" PHY on
+          a SAS HBA or Expander, and the SAS remote PHY represented by
+          struct sas_rphy defines an "incoming" PHY on a SAS Expander or
+          end device.  Note that this is purely a software concept, the
+          underlying hardware for a PHY and a remote PHY is the exactly
+          the same.
+        </para>
+        <para>
+          There is no concept of a SAS port in this code, users can see
+          what PHYs form a wide port based on the port_identifier attribute,
+          which is the same for all PHYs in a port.
+        </para>
+!Edrivers/scsi/scsi_transport_sas.c
+      </sect2>
+      <sect2 id="SATA_transport">
+        <title>SATA transport class</title>
+        <para>
+          The SATA transport is handled by libata, which has its own book of
+          documentation in this directory.
+        </para>
+      </sect2>
+      <sect2 id="SPI_transport">
+        <title>Parallel SCSI (SPI) transport class</title>
+        <para>
+          The file drivers/scsi/scsi_transport_spi.c defines transport
+          attributes for traditional (fast/wide/ultra) SCSI busses.
+        </para>
+!Edrivers/scsi/scsi_transport_spi.c
+      </sect2>
+      <sect2 id="SRP_transport">
+        <title>SCSI RDMA (SRP) transport class</title>
+        <para>
+          The file drivers/scsi/scsi_transport_srp.c defines transport
+          attributes for SCSI over Remote Direct Memory Access.
+        </para>
+!Edrivers/scsi/scsi_transport_srp.c
+      </sect2>
+    </sect1>
+
+  </chapter>
+
+  <chapter id="lower_layer">
+    <title>SCSI lower layer</title>
+    <sect1 id="hba_drivers">
+      <title>Host Bus Adapter transport types</title>
+      <para>
+        Many modern device controllers use the SCSI command set as a protocol to
+        communicate with their devices through many different types of physical
+        connections.
+      </para>
+      <para>
+        In SCSI language a bus capable of carrying SCSI commands is
+        called a "transport", and a controller connecting to such a bus is
+        called a "host bus adapter" (HBA).
+      </para>
+      <sect2 id="scsi_debug.c">
+        <title>Debug transport</title>
+        <para>
+          The file drivers/scsi/scsi_debug.c simulates a host adapter with a
+          variable number of disks (or disk like devices) attached, sharing a
+          common amount of RAM.  Does a lot of checking to make sure that we are
+          not getting blocks mixed up, and panics the kernel if anything out of
+          the ordinary is seen.
+        </para>
+        <para>
+          To be more realistic, the simulated devices have the transport
+          attributes of SAS disks.
+        </para>
+        <para>
+          For documentation see
+          <ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink>
+        </para>
+<!-- !Edrivers/scsi/scsi_debug.c -->
+      </sect2>
+      <sect2 id="todo">
+        <title>todo</title>
+        <para>Parallel (fast/wide/ultra) SCSI, USB, SATA,
+        SAS, Fibre Channel, FireWire, ATAPI devices, Infiniband,
+        I20, iSCSI, Parallel ports, netlink...
+        </para>
+      </sect2>
+    </sect1>
+  </chapter>
+</book>

Documentation/dontdiff

View file

diff --git a/Documentation/dontdiff b/Documentation/dontdiff
index f2d658a..c09a96b 100644
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
@@ -46,8 +46,6 @@
 .mailmap
 .mm
 53c700_d.h
-53c7xx_d.h
-53c7xx_u.h
 53c8xx_d.h*
 BitKeeper
 COPYING

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 17fc60e..65de5ba 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1598,7 +1598,13 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format: <vendor>:<model>:<flags>
 			(flags are integer value)
 
-	scsi_logging=	[SCSI]
+	scsi_logging_level=	[SCSI] a bit mask of logging levels
+			See drivers/scsi/scsi_logging.h for bits.  Also
+			settable via sysctl at dev.scsi.logging_level
+			(/proc/sys/dev/scsi/logging_level).
+			There is also a nice 'scsi_logging_level' script in the
+			S390-tools package, available for download at
+			http://www-128.ibm.com/developerworks/linux/linux390/s390-tools-1.5.4.html
 
 	scsi_mod.scan=	[SCSI] sync (default) scans SCSI busses as they are
 			discovered.  async scans them in kernel threads,

Documentation/m68k/kernel-options.txt

View file

diff --git a/Documentation/m68k/kernel-options.txt b/Documentation/m68k/kernel-options.txt
index 248589e..c93bed6 100644
--- a/Documentation/m68k/kernel-options.txt
+++ b/Documentation/m68k/kernel-options.txt
@@ -867,66 +867,6 @@ controller and should be autodetected by the driver. An example is the
 24 bit region which is specified by a mask of 0x00fffffe.
 
 
-5.5) 53c7xx=
-------------
-
-Syntax: 53c7xx=<sub-options...>
-
-These options affect the A4000T, A4091, WarpEngine, Blizzard 603e+,
-and GForce 040/060 SCSI controllers on the Amiga, as well as the
-builtin MVME 16x SCSI controller.
-
-The <sub-options> is a comma-separated list of the sub-options listed
-below.
-
-5.5.1) nosync
--------------
-
-Syntax: nosync:0
-
-  Disables sync negotiation for all devices.  Any value after the
-  colon is acceptable (and has the same effect).
-
-5.5.2) noasync
---------------
-
-[OBSOLETE, REMOVED]
-
-5.5.3) nodisconnect
--------------------
-
-Syntax: nodisconnect:0
-
-  Disables SCSI disconnects.  Any value after the colon is acceptable
-  (and has the same effect).
-
-5.5.4) validids
----------------
-
-Syntax: validids:0xNN
-
-  Specify which SCSI ids the driver should pay attention to.  This is
-  a bitmask (i.e. to only pay attention to ID#4, you'd use 0x10).
-  Default is 0x7f (devices 0-6).
-
-5.5.5) opthi
-5.5.6) optlo
-------------
-
-Syntax: opthi:M,optlo:N
-
-  Specify options for "hostdata->options".  The acceptable definitions
-  are listed in drivers/scsi/53c7xx.h; the 32 high bits should be in
-  opthi and the 32 low bits in optlo.  They must be specified in the
-  order opthi=M,optlo=N.
-
-5.5.7) next
------------
-
-  No argument. Used to separate blocks of keywords when there's more
-  than one 53c7xx host adapter in the system.
-
-
 /* Local Variables: */
 /* mode: text       */
 /* End:             */

Documentation/scsi/00-INDEX

View file

diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX
index aa1f7e9..c2e18e1 100644
--- a/Documentation/scsi/00-INDEX
+++ b/Documentation/scsi/00-INDEX
@@ -64,8 +64,6 @@ 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
 	- info on driver for NCR53c8xx based adapters
 osst.txt

Documentation/scsi/ChangeLog.megaraid_sas

View file

diff --git a/Documentation/scsi/ChangeLog.megaraid_sas b/Documentation/scsi/ChangeLog.megaraid_sas
index 5eb9275..91c81db 100644
--- a/Documentation/scsi/ChangeLog.megaraid_sas
+++ b/Documentation/scsi/ChangeLog.megaraid_sas
@@ -1,3 +1,162 @@
+1 Release Date    : Thur. Nov. 07 16:30:43 PST 2007 -
+			(emaild-id:[email protected])
+			Sumant Patro
+			Bo Yang
+
+2 Current Version : 00.00.03.16
+3 Older Version   : 00.00.03.15
+
+1. Increased MFI_POLL_TIMEOUT_SECS to 60 seconds from 10. FW may take
+	a max of 60 seconds to respond to the INIT cmd.
+
+1 Release Date    : Fri. Sep. 07 16:30:43 PST 2007 -
+			(emaild-id:[email protected])
+			Sumant Patro
+			Bo Yang
+
+2 Current Version : 00.00.03.15
+3 Older Version   : 00.00.03.14
+
+1. Added module parameter "poll_mode_io" to support for "polling"
+	(reduced interrupt operation).  In this mode, IO completion
+	interrupts are delayed. At the end of initiating IOs, the
+	driver schedules for cmd completion if there are pending cmds
+	to be completed.  A timer-based interrupt has also been added
+	to prevent IO completion processing from being delayed
+	indefinitely in the case that no new IOs are initiated.
+
+1 Release Date    : Fri. Sep. 07 16:30:43 PST 2007 -
+			(emaild-id:[email protected])
+			Sumant Patro
+			Bo Yang
+
+2 Current Version : 00.00.03.14
+3 Older Version   : 00.00.03.13
+
+1. Setting the max_sectors_per_req based on max SGL supported by the
+	FW. Prior versions calculated this value from controller info
+	(max_sectors_1, max_sectors_2). For certain controllers/FW,
+	this was resulting in a value greater than max SGL supported
+	by the FW. Issue was first reported by users running LUKS+XFS
+	with megaraid_sas.  Thanks to RB for providing the logs and
+	duplication steps that helped to get to the root cause of the
+	issue.  2. Increased MFI_POLL_TIMEOUT_SECS to 60 seconds from
+	10. FW may take a max of 60 seconds to respond to the INIT
+	cmd.
+
+1 Release Date    : Fri. June. 15 16:30:43 PST 2007 -
+			(emaild-id:[email protected])
+			Sumant Patro
+			Bo Yang
+