mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SCSI] Add Documentation and integrate into docbook build

Browse source 
Add Documentation/DocBook/scsi_midlayer.tmpl, add to Makefile, and update
lots of kerneldoc comments in drivers/scsi/*.

Updated with comments from Stefan Richter, Stephen M. Cameron,
 James Bottomley and Randy Dunlap.

Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Rob Landley 2007-11-03 13:30:39 -05:00 committed by James Bottomley
parent 3f48985823
commit eb44820c28
17 changed files with 821 additions and 289 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/DocBook/Makefile
View file

@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
procfs-guide.xml writing_usb_driver.xml \ procfs-guide.xml writing_usb_driver.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml \ kernel-api.xml filesystems.xml lsm.xml usb.xml \
gadget.xml libata.xml mtdnand.xml librs.xml rapidio.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_midlayer.xml
### ###
# The build process is as follows (targets): # The build process is as follows (targets):

409
Documentation/DocBook/scsi_midlayer.tmpl Normal file
View file

@ -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 Mid Layer Guide</title>
<authorgroup>
<author>
<firstname>James</firstname>
<surname>Bottomley</surname>
<affiliation>
<address>
<email>James.Bottomley@steeleye.com</email>
</address>
</affiliation>
</author>
<author>
<firstname>Rob</firstname>
<surname>Landley</surname>
<affiliation>
<address>
<email>rob@landley.net</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>

1
drivers/scsi/constants.c
View file

@ -362,7 +362,6 @@ void scsi_print_command(struct scsi_cmnd *cmd)
EXPORT_SYMBOL(scsi_print_command); EXPORT_SYMBOL(scsi_print_command);
/** /**
*
* scsi_print_status - print scsi status description * scsi_print_status - print scsi status description
* @scsi_status: scsi status value * @scsi_status: scsi status value
* *

4
drivers/scsi/hosts.c
View file

@ -54,8 +54,7 @@ static struct class shost_class = {
}; };
/** /**
* scsi_host_set_state - Take the given host through the host * scsi_host_set_state - Take the given host through the host state model.
* state model.
* @shost: scsi host to change the state of. * @shost: scsi host to change the state of.
* @state: state to change to. * @state: state to change to.
* *
@ -431,7 +430,6 @@ EXPORT_SYMBOL(scsi_unregister);
/** /**
* scsi_host_lookup - get a reference to a Scsi_Host by host no * scsi_host_lookup - get a reference to a Scsi_Host by host no
*
* @hostnum: host number to locate * @hostnum: host number to locate
* *
* Return value: * Return value:

175
drivers/scsi/scsi.c
View file

@ -122,6 +122,11 @@ static const char *const scsi_device_types[] = {
"Automation/Drive ", "Automation/Drive ",
}; };
/**
* scsi_device_type - Return 17 char string indicating device type.
* @type: type number to look up
*/
const char * scsi_device_type(unsigned type) const char * scsi_device_type(unsigned type)
{ {
if (type == 0x1e) if (type == 0x1e)
@ -156,6 +161,14 @@ static struct scsi_host_cmd_pool scsi_cmd_dma_pool = {
static DEFINE_MUTEX(host_cmd_pool_mutex); static DEFINE_MUTEX(host_cmd_pool_mutex);
/**
* __scsi_get_command - Allocate a struct scsi_cmnd
* @shost: host to transmit command
* @gfp_mask: allocation mask
*
* Description: allocate a struct scsi_cmd from host's slab, recycling from the
* host's free_list if necessary.
*/
struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask) struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
{ {
struct scsi_cmnd *cmd; struct scsi_cmnd *cmd;
@ -179,13 +192,10 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
} }
EXPORT_SYMBOL_GPL(__scsi_get_command); EXPORT_SYMBOL_GPL(__scsi_get_command);
/* /**
* Function: scsi_get_command() * scsi_get_command - Allocate and setup a scsi command block
* * @dev: parent scsi device
* Purpose: Allocate and setup a scsi command block * @gfp_mask: allocator flags
*
* Arguments: dev - parent scsi device
* gfp_mask- allocator flags
* *
* Returns: The allocated scsi command structure. * Returns: The allocated scsi command structure.
*/ */
@ -217,6 +227,12 @@ struct scsi_cmnd *scsi_get_command(struct scsi_device *dev, gfp_t gfp_mask)
} }
EXPORT_SYMBOL(scsi_get_command); EXPORT_SYMBOL(scsi_get_command);
/**
* __scsi_put_command - Free a struct scsi_cmnd
* @shost: dev->host
* @cmd: Command to free
* @dev: parent scsi device
*/
void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd, void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd,
struct device *dev) struct device *dev)
{ {
@ -237,12 +253,9 @@ void __scsi_put_command(struct Scsi_Host *shost, struct scsi_cmnd *cmd,
} }
EXPORT_SYMBOL(__scsi_put_command); EXPORT_SYMBOL(__scsi_put_command);
/* /**
* Function: scsi_put_command() * scsi_put_command - Free a scsi command block
* * @cmd: command block to free
* Purpose: Free a scsi command block
*
* Arguments: cmd - command block to free
* *
* Returns: Nothing. * Returns: Nothing.
* *
@ -263,12 +276,13 @@ void scsi_put_command(struct scsi_cmnd *cmd)
} }
EXPORT_SYMBOL(scsi_put_command); EXPORT_SYMBOL(scsi_put_command);
/* /**
* Function: scsi_setup_command_freelist() * scsi_setup_command_freelist - Setup the command freelist for a scsi host.
* @shost: host to allocate the freelist for.
* *
* Purpose: Setup the command freelist for a scsi host. * Description: The command freelist protects against system-wide out of memory
* * deadlock by preallocating one SCSI command structure for each host, so the
* Arguments: shost - host to allocate the freelist for. * system can always write to a swap file on a device associated with that host.
* *
* Returns: Nothing. * Returns: Nothing.
*/ */
@ -282,7 +296,7 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
/* /*
* Select a command slab for this host and create it if not * Select a command slab for this host and create it if not
* yet existant. * yet existent.
*/ */
mutex_lock(&host_cmd_pool_mutex); mutex_lock(&host_cmd_pool_mutex);
pool = (shost->unchecked_isa_dma ? &scsi_cmd_dma_pool : &scsi_cmd_pool); pool = (shost->unchecked_isa_dma ? &scsi_cmd_dma_pool : &scsi_cmd_pool);
@ -318,12 +332,9 @@ int scsi_setup_command_freelist(struct Scsi_Host *shost)
} }
/* /**
* Function: scsi_destroy_command_freelist() * scsi_destroy_command_freelist - Release the command freelist for a scsi host.
* * @shost: host whose freelist is going to be destroyed
* Purpose: Release the command freelist for a scsi host.
*
* Arguments: shost - host that's freelist is going to be destroyed
*/ */
void scsi_destroy_command_freelist(struct Scsi_Host *shost) void scsi_destroy_command_freelist(struct Scsi_Host *shost)
{ {
@ -441,8 +452,12 @@ void scsi_log_completion(struct scsi_cmnd *cmd, int disposition)
} }
#endif #endif
/* /**
* Assign a serial number to the request for error recovery * scsi_cmd_get_serial - Assign a serial number to a command
* @host: the scsi host
* @cmd: command to assign serial number to
*
* Description: a serial number identifies a request for error recovery
* and debugging purposes. Protected by the Host_Lock of host. * and debugging purposes. Protected by the Host_Lock of host.
*/ */
static inline void scsi_cmd_get_serial(struct Scsi_Host *host, struct scsi_cmnd *cmd) static inline void scsi_cmd_get_serial(struct Scsi_Host *host, struct scsi_cmnd *cmd)
@ -452,14 +467,12 @@ static inline void scsi_cmd_get_serial(struct Scsi_Host *host, struct scsi_cmnd
cmd->serial_number = host->cmd_serial_number++; cmd->serial_number = host->cmd_serial_number++;
} }
/* /**
* Function: scsi_dispatch_command * scsi_dispatch_command - Dispatch a command to the low-level driver.
* @cmd: command block we are dispatching.
* *
* Purpose: Dispatch a command to the low-level driver. * Return: nonzero return request was rejected and device's queue needs to be
* * plugged.
* Arguments: cmd - command block we are dispatching.
*
* Notes:
*/ */
int scsi_dispatch_cmd(struct scsi_cmnd *cmd) int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
{ {
@ -585,7 +598,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
/** /**
* scsi_req_abort_cmd -- Request command recovery for the specified command * scsi_req_abort_cmd -- Request command recovery for the specified command
* cmd: pointer to the SCSI command of interest * @cmd: pointer to the SCSI command of interest
* *
* This function requests that SCSI Core start recovery for the * This function requests that SCSI Core start recovery for the
* command by deleting the timer and adding the command to the eh * command by deleting the timer and adding the command to the eh
@ -606,9 +619,9 @@ EXPORT_SYMBOL(scsi_req_abort_cmd);
* @cmd: The SCSI Command for which a low-level device driver (LLDD) gives * @cmd: The SCSI Command for which a low-level device driver (LLDD) gives
* ownership back to SCSI Core -- i.e. the LLDD has finished with it. * ownership back to SCSI Core -- i.e. the LLDD has finished with it.
* *
* This function is the mid-level's (SCSI Core) interrupt routine, which * Description: This function is the mid-level's (SCSI Core) interrupt routine,
* regains ownership of the SCSI command (de facto) from a LLDD, and enqueues * which regains ownership of the SCSI command (de facto) from a LLDD, and
* the command to the done queue for further processing. * enqueues the command to the done queue for further processing.
* *
* This is the producer of the done queue who enqueues at the tail. * This is the producer of the done queue who enqueues at the tail.
* *
@ -617,7 +630,7 @@ EXPORT_SYMBOL(scsi_req_abort_cmd);
static void scsi_done(struct scsi_cmnd *cmd) static void scsi_done(struct scsi_cmnd *cmd)
{ {
/* /*
* We don't have to worry about this one timing out any more. * We don't have to worry about this one timing out anymore.
* If we are unable to remove the timer, then the command * If we are unable to remove the timer, then the command
* has already timed out. In which case, we have no choice but to * has already timed out. In which case, we have no choice but to
* let the timeout function run, as we have no idea where in fact * let the timeout function run, as we have no idea where in fact
@ -660,10 +673,11 @@ static struct scsi_driver *scsi_cmd_to_driver(struct scsi_cmnd *cmd)
return *(struct scsi_driver **)cmd->request->rq_disk->private_data; return *(struct scsi_driver **)cmd->request->rq_disk->private_data;
} }
/* /**
* Function: scsi_finish_command * scsi_finish_command - cleanup and pass command back to upper layer
* @cmd: the command
* *
* Purpose: Pass command off to upper layer for finishing of I/O * Description: Pass command off to upper layer for finishing of I/O
* request, waking processes that are waiting on results, * request, waking processes that are waiting on results,
* etc. * etc.
*/ */
@ -708,16 +722,12 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
} }
EXPORT_SYMBOL(scsi_finish_command); EXPORT_SYMBOL(scsi_finish_command);
/* /**
* Function: scsi_adjust_queue_depth() * scsi_adjust_queue_depth - Let low level drivers change a device's queue depth
* * @sdev: SCSI Device in question
* Purpose: Allow low level drivers to tell us to change the queue depth * @tagged: Do we use tagged queueing (non-0) or do we treat
* on a specific SCSI device
*
* Arguments: sdev - SCSI Device in question
* tagged - Do we use tagged queueing (non-0) or do we treat
* this device as an untagged device (0) * this device as an untagged device (0)
* tags - Number of tags allowed if tagged queueing enabled, * @tags: Number of tags allowed if tagged queueing enabled,
* or number of commands the low level driver can * or number of commands the low level driver can
* queue up in non-tagged mode (as per cmd_per_lun). * queue up in non-tagged mode (as per cmd_per_lun).
* *
@ -742,8 +752,8 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
spin_lock_irqsave(sdev->request_queue->queue_lock, flags); spin_lock_irqsave(sdev->request_queue->queue_lock, flags);
/* Check to see if the queue is managed by the block layer /* Check to see if the queue is managed by the block layer.
* if it is, and we fail to adjust the depth, exit */ * If it is, and we fail to adjust the depth, exit. */
if (blk_queue_tagged(sdev->request_queue) && if (blk_queue_tagged(sdev->request_queue) &&
blk_queue_resize_tags(sdev->request_queue, tags) != 0) blk_queue_resize_tags(sdev->request_queue, tags) != 0)
goto out; goto out;
@ -772,20 +782,17 @@ void scsi_adjust_queue_depth(struct scsi_device *sdev, int tagged, int tags)
} }
EXPORT_SYMBOL(scsi_adjust_queue_depth); EXPORT_SYMBOL(scsi_adjust_queue_depth);
/* /**
* Function: scsi_track_queue_full() * scsi_track_queue_full - track QUEUE_FULL events to adjust queue depth
* @sdev: SCSI Device in question
* @depth: Current number of outstanding SCSI commands on this device,
* not counting the one returned as QUEUE_FULL.
* *
* Purpose: This function will track successive QUEUE_FULL events on a * Description: This function will track successive QUEUE_FULL events on a
* specific SCSI device to determine if and when there is a * specific SCSI device to determine if and when there is a
* need to adjust the queue depth on the device. * need to adjust the queue depth on the device.
* *
* Arguments: sdev - SCSI Device in question * Returns: 0 - No change needed, >0 - Adjust queue depth to this new depth,
* depth - Current number of outstanding SCSI commands on
* this device, not counting the one returned as
* QUEUE_FULL.
*
* Returns: 0 - No change needed
* >0 - Adjust queue depth to this new depth
* -1 - Drop back to untagged operation using host->cmd_per_lun * -1 - Drop back to untagged operation using host->cmd_per_lun
* as the untagged command depth * as the untagged command depth
* *
@ -824,10 +831,10 @@ int scsi_track_queue_full(struct scsi_device *sdev, int depth)
EXPORT_SYMBOL(scsi_track_queue_full); EXPORT_SYMBOL(scsi_track_queue_full);
/** /**
* scsi_device_get - get an addition reference to a scsi_device * scsi_device_get - get an additional reference to a scsi_device
* @sdev: device to get a reference to * @sdev: device to get a reference to
* *
* Gets a reference to the scsi_device and increments the use count * Description: Gets a reference to the scsi_device and increments the use count
* of the underlying LLDD module. You must hold host_lock of the * of the underlying LLDD module. You must hold host_lock of the
* parent Scsi_Host or already have a reference when calling this. * parent Scsi_Host or already have a reference when calling this.
*/ */
@ -849,8 +856,8 @@ EXPORT_SYMBOL(scsi_device_get);
* scsi_device_put - release a reference to a scsi_device * scsi_device_put - release a reference to a scsi_device
* @sdev: device to release a reference on. * @sdev: device to release a reference on.
* *
* Release a reference to the scsi_device and decrements the use count * Description: Release a reference to the scsi_device and decrements the use
* of the underlying LLDD module. The device is freed once the last * count of the underlying LLDD module. The device is freed once the last
* user vanishes. * user vanishes.
*/ */
void scsi_device_put(struct scsi_device *sdev) void scsi_device_put(struct scsi_device *sdev)
@ -867,7 +874,7 @@ void scsi_device_put(struct scsi_device *sdev)
} }
EXPORT_SYMBOL(scsi_device_put); EXPORT_SYMBOL(scsi_device_put);
/* helper for shost_for_each_device, thus not documented */ /* helper for shost_for_each_device, see that for documentation */
struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *shost, struct scsi_device *__scsi_iterate_devices(struct Scsi_Host *shost,
struct scsi_device *prev) struct scsi_device *prev)
{ {
@ -895,6 +902,8 @@ EXPORT_SYMBOL(__scsi_iterate_devices);
/** /**
* starget_for_each_device - helper to walk all devices of a target * starget_for_each_device - helper to walk all devices of a target
* @starget: target whose devices we want to iterate over. * @starget: target whose devices we want to iterate over.
* @data: Opaque passed to each function call.
* @fn: Function to call on each device
* *
* This traverses over each device of @starget. The devices have * This traverses over each device of @starget. The devices have
* a reference that must be released by scsi_host_put when breaking * a reference that must be released by scsi_host_put when breaking
@ -946,13 +955,13 @@ EXPORT_SYMBOL(__starget_for_each_device);
* @starget: SCSI target pointer * @starget: SCSI target pointer
* @lun: SCSI Logical Unit Number * @lun: SCSI Logical Unit Number
* *
* Looks up the scsi_device with the specified @lun for a give * Description: Looks up the scsi_device with the specified @lun for a given
* @starget. The returned scsi_device does not have an additional * @starget. The returned scsi_device does not have an additional
* reference. You must hold the host's host_lock over this call and * reference. You must hold the host's host_lock over this call and
* any access to the returned scsi_device. * any access to the returned scsi_device.
* *
* Note: The only reason why drivers would want to use this is because * Note: The only reason why drivers would want to use this is because
* they're need to access the device list in irq context. Otherwise you * they need to access the device list in irq context. Otherwise you
* really want to use scsi_device_lookup_by_target instead. * really want to use scsi_device_lookup_by_target instead.
**/ **/
struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *starget, struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *starget,
@ -974,9 +983,9 @@ EXPORT_SYMBOL(__scsi_device_lookup_by_target);
* @starget: SCSI target pointer * @starget: SCSI target pointer
* @lun: SCSI Logical Unit Number * @lun: SCSI Logical Unit Number
* *
* Looks up the scsi_device with the specified @channel, @id, @lun for a * Description: Looks up the scsi_device with the specified @channel, @id, @lun
* give host. The returned scsi_device has an additional reference that * for a given host. The returned scsi_device has an additional reference that
* needs to be release with scsi_host_put once you're done with it. * needs to be released with scsi_device_put once you're done with it.
**/ **/
struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *starget, struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *starget,
uint lun) uint lun)
@ -996,19 +1005,19 @@ struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *starget,
EXPORT_SYMBOL(scsi_device_lookup_by_target); EXPORT_SYMBOL(scsi_device_lookup_by_target);
/** /**
* scsi_device_lookup - find a device given the host (UNLOCKED) * __scsi_device_lookup - find a device given the host (UNLOCKED)
* @shost: SCSI host pointer * @shost: SCSI host pointer
* @channel: SCSI channel (zero if only one channel) * @channel: SCSI channel (zero if only one channel)
* @pun: SCSI target number (physical unit number) * @id: SCSI target number (physical unit number)
* @lun: SCSI Logical Unit Number * @lun: SCSI Logical Unit Number
* *
* Looks up the scsi_device with the specified @channel, @id, @lun for a * Description: Looks up the scsi_device with the specified @channel, @id, @lun
* give host. The returned scsi_device does not have an additional reference. * for a given host. The returned scsi_device does not have an additional
* You must hold the host's host_lock over this call and any access to the * reference. You must hold the host's host_lock over this call and any access
* returned scsi_device. * to the returned scsi_device.
* *
* Note: The only reason why drivers would want to use this is because * Note: The only reason why drivers would want to use this is because
* they're need to access the device list in irq context. Otherwise you * they need to access the device list in irq context. Otherwise you
* really want to use scsi_device_lookup instead. * really want to use scsi_device_lookup instead.
**/ **/
struct scsi_device *__scsi_device_lookup(struct Scsi_Host *shost, struct scsi_device *__scsi_device_lookup(struct Scsi_Host *shost,
@ -1033,9 +1042,9 @@ EXPORT_SYMBOL(__scsi_device_lookup);
* @id: SCSI target number (physical unit number) * @id: SCSI target number (physical unit number)
* @lun: SCSI Logical Unit Number * @lun: SCSI Logical Unit Number
* *
* Looks up the scsi_device with the specified @channel, @id, @lun for a * Description: Looks up the scsi_device with the specified @channel, @id, @lun
* give host. The returned scsi_device has an additional reference that * for a given host. The returned scsi_device has an additional reference that
* needs to be release with scsi_host_put once you're done with it. * needs to be released with scsi_device_put once you're done with it.
**/ **/
struct scsi_device *scsi_device_lookup(struct Scsi_Host *shost, struct scsi_device *scsi_device_lookup(struct Scsi_Host *shost,
uint channel, uint id, uint lun) uint channel, uint id, uint lun)

34
drivers/scsi/scsi_devinfo.c
View file

@ -276,11 +276,12 @@ static void scsi_strcpy_devinfo(char *name, char *to, size_t to_length,
} }
/** /**
* scsi_dev_info_list_add: add one dev_info list entry. * scsi_dev_info_list_add - add one dev_info list entry.
* @compatible: if true, null terminate short strings. Otherwise space pad.
* @vendor: vendor string * @vendor: vendor string
* @model: model (product) string * @model: model (product) string
* @strflags: integer string * @strflags: integer string
* @flag: if strflags NULL, use this flag value * @flags: if strflags NULL, use this flag value
* *
* Description: * Description:
* Create and add one dev_info entry for @vendor, @model, @strflags or * Create and add one dev_info entry for @vendor, @model, @strflags or
@ -322,8 +323,7 @@ static int scsi_dev_info_list_add(int compatible, char *vendor, char *model,
} }
/** /**
* scsi_dev_info_list_add_str: parse dev_list and add to the * scsi_dev_info_list_add_str - parse dev_list and add to the scsi_dev_info_list.
* scsi_dev_info_list.
* @dev_list: string of device flags to add * @dev_list: string of device flags to add
* *
* Description: * Description:
@ -374,15 +374,15 @@ static int scsi_dev_info_list_add_str(char *dev_list)
} }
/** /**
* get_device_flags - get device specific flags from the dynamic device * get_device_flags - get device specific flags from the dynamic device list.
* list. Called during scan time. * @sdev: &scsi_device to get flags for
* @vendor: vendor name * @vendor: vendor name
* @model: model name * @model: model name
* *
* Description: * Description:
* Search the scsi_dev_info_list for an entry matching @vendor and * Search the scsi_dev_info_list for an entry matching @vendor and
* @model, if found, return the matching flags value, else return * @model, if found, return the matching flags value, else return
* the host or global default settings. * the host or global default settings. Called during scan time.
**/ **/
int scsi_get_device_flags(struct scsi_device *sdev, int scsi_get_device_flags(struct scsi_device *sdev,
const unsigned char *vendor, const unsigned char *vendor,
@ -483,13 +483,11 @@ static int proc_scsi_devinfo_read(char *buffer, char **start,
} }
/* /*
* proc_scsi_dev_info_write: allow additions to the scsi_dev_info_list via * proc_scsi_dev_info_write - allow additions to scsi_dev_info_list via /proc.
* /proc.
* *
* Use: echo "vendor:model:flag" > /proc/scsi/device_info * Description: Adds a black/white list entry for vendor and model with an
* * integer value of flag to the scsi device info list.
* To add a black/white list entry for vendor and model with an integer * To use, echo "vendor:model:flag" > /proc/scsi/device_info
* value of flag to the scsi device info list.
*/ */
static int proc_scsi_devinfo_write(struct file *file, const char __user *buf, static int proc_scsi_devinfo_write(struct file *file, const char __user *buf,
unsigned long length, void *data) unsigned long length, void *data)
@ -532,8 +530,7 @@ MODULE_PARM_DESC(default_dev_flags,
"scsi default device flag integer value"); "scsi default device flag integer value");
/** /**
* scsi_dev_info_list_delete: called from scsi.c:exit_scsi to remove * scsi_dev_info_list_delete - called from scsi.c:exit_scsi to remove the scsi_dev_info_list.
* the scsi_dev_info_list.
**/ **/
void scsi_exit_devinfo(void) void scsi_exit_devinfo(void)
{ {
@ -552,13 +549,12 @@ void scsi_exit_devinfo(void)
} }
/** /**
* scsi_dev_list_init: set up the dynamic device list. * scsi_dev_list_init - set up the dynamic device list.
* @dev_list: string of device flags to add
* *
* Description: * Description:
* Add command line @dev_list entries, then add * Add command line entries from scsi_dev_flags, then add
* scsi_static_device_list entries to the scsi device info list. * scsi_static_device_list entries to the scsi device info list.
**/ */
int __init scsi_init_devinfo(void) int __init scsi_init_devinfo(void)
{ {
#ifdef CONFIG_SCSI_PROC_FS #ifdef CONFIG_SCSI_PROC_FS

46
drivers/scsi/scsi_error.c
View file

@ -779,7 +779,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)
* Notes: * Notes:
* We don't want to use the normal command completion while we are are * We don't want to use the normal command completion while we are are
* still handling errors - it may cause other commands to be queued, * still handling errors - it may cause other commands to be queued,
* and that would disturb what we are doing. thus we really want to * and that would disturb what we are doing. Thus we really want to
* keep a list of pending commands for final completion, and once we * keep a list of pending commands for final completion, and once we
* are ready to leave error handling we handle completion for real. * are ready to leave error handling we handle completion for real.
**/ **/
@ -794,7 +794,7 @@ EXPORT_SYMBOL(scsi_eh_finish_cmd);
/** /**
* scsi_eh_get_sense - Get device sense data. * scsi_eh_get_sense - Get device sense data.
* @work_q: Queue of commands to process. * @work_q: Queue of commands to process.
* @done_q: Queue of proccessed commands.. * @done_q: Queue of processed commands.
* *
* Description: * Description:
* See if we need to request sense information. if so, then get it * See if we need to request sense information. if so, then get it
@ -802,7 +802,7 @@ EXPORT_SYMBOL(scsi_eh_finish_cmd);
* *
* Notes: * Notes:
* This has the unfortunate side effect that if a shost adapter does * This has the unfortunate side effect that if a shost adapter does
* not automatically request sense information, that we end up shutting * not automatically request sense information, we end up shutting
* it down before we request it. * it down before we request it.
* *
* All drivers should request sense information internally these days, * All drivers should request sense information internally these days,
@ -858,7 +858,7 @@ EXPORT_SYMBOL_GPL(scsi_eh_get_sense);
/** /**
* scsi_eh_tur - Send TUR to device. * scsi_eh_tur - Send TUR to device.
* @scmd: Scsi cmd to send TUR * @scmd: &scsi_cmnd to send TUR
* *
* Return value: * Return value:
* 0 - Device is ready. 1 - Device NOT ready. * 0 - Device is ready. 1 - Device NOT ready.
@ -887,14 +887,14 @@ static int scsi_eh_tur(struct scsi_cmnd *scmd)
} }
/** /**
* scsi_eh_abort_cmds - abort canceled commands. * scsi_eh_abort_cmds - abort pending commands.
* @shost: scsi host being recovered. * @work_q: &list_head for pending commands.
* @eh_done_q: list_head for processed commands. * @done_q: &list_head for processed commands.
* *
* Decription: * Decription:
* Try and see whether or not it makes sense to try and abort the * Try and see whether or not it makes sense to try and abort the
* running command. this only works out to be the case if we have one * running command. This only works out to be the case if we have one
* command that has timed out. if the command simply failed, it makes * command that has timed out. If the command simply failed, it makes
* no sense to try and abort the command, since as far as the shost * no sense to try and abort the command, since as far as the shost
* adapter is concerned, it isn't running. * adapter is concerned, it isn't running.
**/ **/
@ -931,7 +931,7 @@ static int scsi_eh_abort_cmds(struct list_head *work_q,
/** /**
* scsi_eh_try_stu - Send START_UNIT to device. * scsi_eh_try_stu - Send START_UNIT to device.
* @scmd: Scsi cmd to send START_UNIT * @scmd: &scsi_cmnd to send START_UNIT
* *
* Return value: * Return value:
* 0 - Device is ready. 1 - Device NOT ready. * 0 - Device is ready. 1 - Device NOT ready.
@ -956,8 +956,9 @@ static int scsi_eh_try_stu(struct scsi_cmnd *scmd)
/** /**
* scsi_eh_stu - send START_UNIT if needed * scsi_eh_stu - send START_UNIT if needed
* @shost: scsi host being recovered. * @shost: &scsi host being recovered.
* @eh_done_q: list_head for processed commands. * @work_q: &list_head for pending commands.
* @done_q: &list_head for processed commands.
* *
* Notes: * Notes:
* If commands are failing due to not ready, initializing command required, * If commands are failing due to not ready, initializing command required,
@ -1008,10 +1009,11 @@ static int scsi_eh_stu(struct Scsi_Host *shost,
/** /**
* scsi_eh_bus_device_reset - send bdr if needed * scsi_eh_bus_device_reset - send bdr if needed
* @shost: scsi host being recovered. * @shost: scsi host being recovered.
* @eh_done_q: list_head for processed commands. * @work_q: &list_head for pending commands.
* @done_q: &list_head for processed commands.
* *
* Notes: * Notes:
* Try a bus device reset. still, look to see whether we have multiple * Try a bus device reset. Still, look to see whether we have multiple
* devices that are jammed or not - if we have multiple devices, it * devices that are jammed or not - if we have multiple devices, it
* makes no sense to try bus_device_reset - we really would need to try * makes no sense to try bus_device_reset - we really would need to try
* a bus_reset instead. * a bus_reset instead.
@ -1063,8 +1065,9 @@ static int scsi_eh_bus_device_reset(struct Scsi_Host *shost,
/** /**
* scsi_eh_bus_reset - send a bus reset * scsi_eh_bus_reset - send a bus reset
* @shost: scsi host being recovered. * @shost: &scsi host being recovered.
* @eh_done_q: list_head for processed commands. * @work_q: &list_head for pending commands.
* @done_q: &list_head for processed commands.
**/ **/
static int scsi_eh_bus_reset(struct Scsi_Host *shost, static int scsi_eh_bus_reset(struct Scsi_Host *shost,
struct list_head *work_q, struct list_head *work_q,
@ -1440,7 +1443,8 @@ static void scsi_restart_operations(struct Scsi_Host *shost)
/** /**
* scsi_eh_ready_devs - check device ready state and recover if not. * scsi_eh_ready_devs - check device ready state and recover if not.
* @shost: host to be recovered. * @shost: host to be recovered.
* @eh_done_q: list_head for processed commands. * @work_q: &list_head for pending commands.
* @done_q: &list_head for processed commands.
* *
**/ **/
void scsi_eh_ready_devs(struct Scsi_Host *shost, void scsi_eh_ready_devs(struct Scsi_Host *shost,
@ -1824,9 +1828,7 @@ int scsi_command_normalize_sense(struct scsi_cmnd *cmd,
EXPORT_SYMBOL(scsi_command_normalize_sense); EXPORT_SYMBOL(scsi_command_normalize_sense);
/** /**
* scsi_sense_desc_find - search for a given descriptor type in * scsi_sense_desc_find - search for a given descriptor type in descriptor sense data format.
* descriptor sense data format.
*
* @sense_buffer: byte array of descriptor format sense data * @sense_buffer: byte array of descriptor format sense data
* @sb_len: number of valid bytes in sense_buffer * @sb_len: number of valid bytes in sense_buffer
* @desc_type: value of descriptor type to find * @desc_type: value of descriptor type to find
@ -1865,9 +1867,7 @@ const u8 * scsi_sense_desc_find(const u8 * sense_buffer, int sb_len,
EXPORT_SYMBOL(scsi_sense_desc_find); EXPORT_SYMBOL(scsi_sense_desc_find);
/** /**
* scsi_get_sense_info_fld - attempts to get information field from * scsi_get_sense_info_fld - get information field from sense data (either fixed or descriptor format)
* sense data (either fixed or descriptor format)
*
* @sense_buffer: byte array of sense data * @sense_buffer: byte array of sense data
* @sb_len: number of valid bytes in sense_buffer * @sb_len: number of valid bytes in sense_buffer
* @info_out: pointer to 64 integer where 8 or 4 byte information * @info_out: pointer to 64 integer where 8 or 4 byte information

24
drivers/scsi/scsi_ioctl.c
View file

@ -174,10 +174,15 @@ static int scsi_ioctl_get_pci(struct scsi_device *sdev, void __user *arg)
} }
/* /**
* the scsi_ioctl() function differs from most ioctls in that it does * scsi_ioctl - Dispatch ioctl to scsi device
* not take a major/minor number as the dev field. Rather, it takes * @sdev: scsi device receiving ioctl
* a pointer to a scsi_devices[] element, a structure. * @cmd: which ioctl is it
* @arg: data associated with ioctl
*
* Description: The scsi_ioctl() function differs from most ioctls in that it
* does not take a major/minor number as the dev field. Rather, it takes
* a pointer to a &struct scsi_device.
*/ */
int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg) int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
{ {
@ -264,9 +269,12 @@ int scsi_ioctl(struct scsi_device *sdev, int cmd, void __user *arg)
} }
EXPORT_SYMBOL(scsi_ioctl); EXPORT_SYMBOL(scsi_ioctl);
/* /**
* the scsi_nonblock_ioctl() function is designed for ioctls which may * scsi_nonblock_ioctl() - Handle SG_SCSI_RESET
* be executed even if the device is in recovery. * @sdev: scsi device receiving ioctl
* @cmd: Must be SC_SCSI_RESET
* @arg: pointer to int containing SG_SCSI_RESET_{DEVICE,BUS,HOST}
* @filp: either NULL or a &struct file which must have the O_NONBLOCK flag.
*/ */
int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
void __user *arg, struct file *filp) void __user *arg, struct file *filp)
@ -276,7 +284,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
/* The first set of iocts may be executed even if we're doing /* The first set of iocts may be executed even if we're doing
* error processing, as long as the device was opened * error processing, as long as the device was opened
* non-blocking */ * non-blocking */
if (filp && filp->f_flags & O_NONBLOCK) { if (filp && (filp->f_flags & O_NONBLOCK)) {
if (scsi_host_in_recovery(sdev->host)) if (scsi_host_in_recovery(sdev->host))
return -ENODEV; return -ENODEV;
} else if (!scsi_block_when_processing_errors(sdev)) } else if (!scsi_block_when_processing_errors(sdev))

42
drivers/scsi/scsi_lib.c
View file

@ -175,7 +175,7 @@ int scsi_queue_insert(struct scsi_cmnd *cmd, int reason)
* *
* returns the req->errors value which is the scsi_cmnd result * returns the req->errors value which is the scsi_cmnd result
* field. * field.
**/ */
int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
int data_direction, void *buffer, unsigned bufflen, int data_direction, void *buffer, unsigned bufflen,
unsigned char *sense, int timeout, int retries, int flags) unsigned char *sense, int timeout, int retries, int flags)
@ -274,7 +274,7 @@ static void scsi_bi_endio(struct bio *bio, int error)
/** /**
* scsi_req_map_sg - map a scatterlist into a request * scsi_req_map_sg - map a scatterlist into a request
* @rq: request to fill * @rq: request to fill
* @sg: scatterlist * @sgl: scatterlist
* @nsegs: number of elements * @nsegs: number of elements
* @bufflen: len of buffer * @bufflen: len of buffer
* @gfp: memory allocation flags * @gfp: memory allocation flags
@ -365,14 +365,16 @@ static int scsi_req_map_sg(struct request *rq, struct scatterlist *sgl,
* @sdev: scsi device * @sdev: scsi device
* @cmd: scsi command * @cmd: scsi command
* @cmd_len: length of scsi cdb * @cmd_len: length of scsi cdb
* @data_direction: data direction * @data_direction: DMA_TO_DEVICE, DMA_FROM_DEVICE, or DMA_NONE
* @buffer: data buffer (this can be a kernel buffer or scatterlist) * @buffer: data buffer (this can be a kernel buffer or scatterlist)
* @bufflen: len of buffer * @bufflen: len of buffer
* @use_sg: if buffer is a scatterlist this is the number of elements * @use_sg: if buffer is a scatterlist this is the number of elements
* @timeout: request timeout in seconds * @timeout: request timeout in seconds
* @retries: number of times to retry request * @retries: number of times to retry request
* @flags: or into request flags * @privdata: data passed to done()
**/ * @done: callback function when done
* @gfp: memory allocation flags
*/
int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd, int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
int cmd_len, int data_direction, void *buffer, unsigned bufflen, int cmd_len, int data_direction, void *buffer, unsigned bufflen,
int use_sg, int timeout, int retries, void *privdata, int use_sg, int timeout, int retries, void *privdata,
@ -1804,7 +1806,7 @@ void scsi_exit_queue(void)
* @timeout: command timeout * @timeout: command timeout
* @retries: number of retries before failing * @retries: number of retries before failing
* @data: returns a structure abstracting the mode header data * @data: returns a structure abstracting the mode header data
* @sense: place to put sense data (or NULL if no sense to be collected). * @sshdr: place to put sense data (or NULL if no sense to be collected).
* must be SCSI_SENSE_BUFFERSIZE big. * must be SCSI_SENSE_BUFFERSIZE big.
* *
* Returns zero if successful; negative error number or scsi * Returns zero if successful; negative error number or scsi
@ -1871,8 +1873,7 @@ scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage,
EXPORT_SYMBOL_GPL(scsi_mode_select); EXPORT_SYMBOL_GPL(scsi_mode_select);
/** /**
* scsi_mode_sense - issue a mode sense, falling back from 10 to * scsi_mode_sense - issue a mode sense, falling back from 10 to six bytes if necessary.
* six bytes if necessary.
* @sdev: SCSI device to be queried * @sdev: SCSI device to be queried
* @dbd: set if mode sense will allow block descriptors to be returned * @dbd: set if mode sense will allow block descriptors to be returned
* @modepage: mode page being requested * @modepage: mode page being requested
@ -1881,13 +1882,13 @@ EXPORT_SYMBOL_GPL(scsi_mode_select);
* @timeout: command timeout * @timeout: command timeout
* @retries: number of retries before failing * @retries: number of retries before failing
* @data: returns a structure abstracting the mode header data * @data: returns a structure abstracting the mode header data
* @sense: place to put sense data (or NULL if no sense to be collected). * @sshdr: place to put sense data (or NULL if no sense to be collected).
* must be SCSI_SENSE_BUFFERSIZE big. * must be SCSI_SENSE_BUFFERSIZE big.
* *
* Returns zero if unsuccessful, or the header offset (either 4 * Returns zero if unsuccessful, or the header offset (either 4
* or 8 depending on whether a six or ten byte command was * or 8 depending on whether a six or ten byte command was
* issued) if successful. * issued) if successful.
**/ */
int int
scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage,
unsigned char *buffer, int len, int timeout, int retries, unsigned char *buffer, int len, int timeout, int retries,
@ -2007,14 +2008,13 @@ scsi_test_unit_ready(struct scsi_device *sdev, int timeout, int retries)
EXPORT_SYMBOL(scsi_test_unit_ready); EXPORT_SYMBOL(scsi_test_unit_ready);
/** /**
* scsi_device_set_state - Take the given device through the device * scsi_device_set_state - Take the given device through the device state model.
* state model.
* @sdev: scsi device to change the state of. * @sdev: scsi device to change the state of.
* @state: state to change to. * @state: state to change to.
* *
* Returns zero if unsuccessful or an error if the requested * Returns zero if unsuccessful or an error if the requested
* transition is illegal. * transition is illegal.
**/ */
int int
scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state)
{ {
@ -2264,7 +2264,7 @@ EXPORT_SYMBOL_GPL(sdev_evt_send_simple);
* Must be called with user context, may sleep. * Must be called with user context, may sleep.
* *
* Returns zero if unsuccessful or an error if not. * Returns zero if unsuccessful or an error if not.
**/ */
int int
scsi_device_quiesce(struct scsi_device *sdev) scsi_device_quiesce(struct scsi_device *sdev)
{ {
@ -2289,7 +2289,7 @@ EXPORT_SYMBOL(scsi_device_quiesce);
* queues. * queues.
* *
* Must be called with user context, may sleep. * Must be called with user context, may sleep.
**/ */
void void
scsi_device_resume(struct scsi_device *sdev) scsi_device_resume(struct scsi_device *sdev)
{ {
@ -2326,8 +2326,7 @@ scsi_target_resume(struct scsi_target *starget)
EXPORT_SYMBOL(scsi_target_resume); EXPORT_SYMBOL(scsi_target_resume);
/** /**
* scsi_internal_device_block - internal function to put a device * scsi_internal_device_block - internal function to put a device temporarily into the SDEV_BLOCK state
* temporarily into the SDEV_BLOCK state
* @sdev: device to block * @sdev: device to block
* *
* Block request made by scsi lld's to temporarily stop all * Block request made by scsi lld's to temporarily stop all
@ -2342,7 +2341,7 @@ EXPORT_SYMBOL(scsi_target_resume);
* state, all commands are deferred until the scsi lld reenables * state, all commands are deferred until the scsi lld reenables
* the device with scsi_device_unblock or device_block_tmo fires. * the device with scsi_device_unblock or device_block_tmo fires.
* This routine assumes the host_lock is held on entry. * This routine assumes the host_lock is held on entry.
**/ */
int int
scsi_internal_device_block(struct scsi_device *sdev) scsi_internal_device_block(struct scsi_device *sdev)
{ {
@ -2382,7 +2381,7 @@ EXPORT_SYMBOL_GPL(scsi_internal_device_block);
* (which must be a legal transition) allowing the midlayer to * (which must be a legal transition) allowing the midlayer to
* goose the queue for this device. This routine assumes the * goose the queue for this device. This routine assumes the
* host_lock is held upon entry. * host_lock is held upon entry.
**/ */
int int
scsi_internal_device_unblock(struct scsi_device *sdev) scsi_internal_device_unblock(struct scsi_device *sdev)
{ {
@ -2460,7 +2459,7 @@ EXPORT_SYMBOL_GPL(scsi_target_unblock);
/** /**
* scsi_kmap_atomic_sg - find and atomically map an sg-elemnt * scsi_kmap_atomic_sg - find and atomically map an sg-elemnt
* @sg: scatter-gather list * @sgl: scatter-gather list
* @sg_count: number of segments in sg * @sg_count: number of segments in sg
* @offset: offset in bytes into sg, on return offset into the mapped area * @offset: offset in bytes into sg, on return offset into the mapped area
* @len: bytes to map, on return number of bytes mapped * @len: bytes to map, on return number of bytes mapped
@ -2509,8 +2508,7 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sgl, int sg_count,
EXPORT_SYMBOL(scsi_kmap_atomic_sg); EXPORT_SYMBOL(scsi_kmap_atomic_sg);
/** /**
* scsi_kunmap_atomic_sg - atomically unmap a virtual address, previously * scsi_kunmap_atomic_sg - atomically unmap a virtual address, previously mapped with scsi_kmap_atomic_sg
* mapped with scsi_kmap_atomic_sg
* @virt: virtual address to be unmapped * @virt: virtual address to be unmapped
*/ */
void scsi_kunmap_atomic_sg(void *virt) void scsi_kunmap_atomic_sg(void *virt)

19
drivers/scsi/scsi_netlink.c
View file

@ -32,11 +32,12 @@ EXPORT_SYMBOL_GPL(scsi_nl_sock);
/** /**
* scsi_nl_rcv_msg - * scsi_nl_rcv_msg - Receive message handler.
* Receive message handler. Extracts message from a receive buffer. * @skb: socket receive buffer
*
* Description: Extracts message from a receive buffer.
* Validates message header and calls appropriate transport message handler * Validates message header and calls appropriate transport message handler
* *
* @skb: socket receive buffer
* *
**/ **/
static void static void
@ -99,9 +100,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)
/** /**
* scsi_nl_rcv_event - * scsi_nl_rcv_event - Event handler for a netlink socket.
* Event handler for a netlink socket.
*
* @this: event notifier block * @this: event notifier block
* @event: event type * @event: event type
* @ptr: event payload * @ptr: event payload
@ -129,9 +128,7 @@ static struct notifier_block scsi_netlink_notifier = {
/** /**
* scsi_netlink_init - * scsi_netlink_init - Called by SCSI subsystem to intialize the SCSI transport netlink interface
* Called by SCSI subsystem to intialize the SCSI transport netlink
* interface
* *
**/ **/
void void
@ -160,9 +157,7 @@ scsi_netlink_init(void)
/** /**
* scsi_netlink_exit - * scsi_netlink_exit - Called by SCSI subsystem to disable the SCSI transport netlink interface
* Called by SCSI subsystem to disable the SCSI transport netlink
* interface
* *
**/ **/
void void

110
drivers/scsi/scsi_proc.c
View file

@ -45,6 +45,16 @@ static struct proc_dir_entry *proc_scsi;
/* Protect sht->present and sht->proc_dir */ /* Protect sht->present and sht->proc_dir */
static DEFINE_MUTEX(global_host_template_mutex); static DEFINE_MUTEX(global_host_template_mutex);
/**
* proc_scsi_read - handle read from /proc by calling host's proc_info() command
* @buffer: passed to proc_info
* @start: passed to proc_info
* @offset: passed to proc_info
* @length: passed to proc_info
* @eof: returns whether length read was less than requested
* @data: pointer to a &struct Scsi_Host
*/
static int proc_scsi_read(char *buffer, char **start, off_t offset, static int proc_scsi_read(char *buffer, char **start, off_t offset,
int length, int *eof, void *data) int length, int *eof, void *data)
{ {
@ -57,6 +67,13 @@ static int proc_scsi_read(char *buffer, char **start, off_t offset,
return n; return n;
} }
/**
* proc_scsi_write_proc - Handle write to /proc by calling host's proc_info()
* @file: not used
* @buf: source of data to write.
* @count: number of bytes (at most PROC_BLOCK_SIZE) to write.
* @data: pointer to &struct Scsi_Host
*/
static int proc_scsi_write_proc(struct file *file, const char __user *buf, static int proc_scsi_write_proc(struct file *file, const char __user *buf,
unsigned long count, void *data) unsigned long count, void *data)
{ {
@ -80,6 +97,13 @@ static int proc_scsi_write_proc(struct file *file, const char __user *buf,
return ret; return ret;
} }
/**
* scsi_proc_hostdir_add - Create directory in /proc for a scsi host
* @sht: owner of this directory
*
* Sets sht->proc_dir to the new directory.
*/
void scsi_proc_hostdir_add(struct scsi_host_template *sht) void scsi_proc_hostdir_add(struct scsi_host_template *sht)
{ {
if (!sht->proc_info) if (!sht->proc_info)
@ -97,6 +121,10 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
mutex_unlock(&global_host_template_mutex); mutex_unlock(&global_host_template_mutex);
} }
/**
* scsi_proc_hostdir_rm - remove directory in /proc for a scsi host
* @sht: owner of directory
*/
void scsi_proc_hostdir_rm(struct scsi_host_template *sht) void scsi_proc_hostdir_rm(struct scsi_host_template *sht)
{ {
if (!sht->proc_info) if (!sht->proc_info)
@ -110,6 +138,11 @@ void scsi_proc_hostdir_rm(struct scsi_host_template *sht)
mutex_unlock(&global_host_template_mutex); mutex_unlock(&global_host_template_mutex);
} }
/**
* scsi_proc_host_add - Add entry for this host to appropriate /proc dir
* @shost: host to add
*/
void scsi_proc_host_add(struct Scsi_Host *shost) void scsi_proc_host_add(struct Scsi_Host *shost)
{ {
struct scsi_host_template *sht = shost->hostt; struct scsi_host_template *sht = shost->hostt;
@ -133,6 +166,10 @@ void scsi_proc_host_add(struct Scsi_Host *shost)
p->owner = sht->module; p->owner = sht->module;
} }
/**
* scsi_proc_host_rm - remove this host's entry from /proc
* @shost: which host
*/
void scsi_proc_host_rm(struct Scsi_Host *shost) void scsi_proc_host_rm(struct Scsi_Host *shost)
{ {
char name[10]; char name[10];
@ -143,7 +180,14 @@ void scsi_proc_host_rm(struct Scsi_Host *shost)
sprintf(name,"%d", shost->host_no); sprintf(name,"%d", shost->host_no);
remove_proc_entry(name, shost->hostt->proc_dir); remove_proc_entry(name, shost->hostt->proc_dir);
} }
/**
* proc_print_scsidevice - return data about this host
* @dev: A scsi device
* @data: &struct seq_file to output to.
*
* Description: prints Host, Channel, Id, Lun, Vendor, Model, Rev, Type,
* and revision.
*/
static int proc_print_scsidevice(struct device *dev, void *data) static int proc_print_scsidevice(struct device *dev, void *data)
{ {
struct scsi_device *sdev = to_scsi_device(dev); struct scsi_device *sdev = to_scsi_device(dev);
@ -189,6 +233,21 @@ static int proc_print_scsidevice(struct device *dev, void *data)
return 0; return 0;
} }
/**
* scsi_add_single_device - Respond to user request to probe for/add device
* @host: user-supplied decimal integer
* @channel: user-supplied decimal integer
* @id: user-supplied decimal integer
* @lun: user-supplied decimal integer
*
* Description: called by writing "scsi add-single-device" to /proc/scsi/scsi.
*
* does scsi_host_lookup() and either user_scan() if that transport
* type supports it, or else scsi_scan_host_selected()
*
* Note: this seems to be aimed exclusively at SCSI parallel busses.
*/
static int scsi_add_single_device(uint host, uint channel, uint id, uint lun) static int scsi_add_single_device(uint host, uint channel, uint id, uint lun)
{ {
struct Scsi_Host *shost; struct Scsi_Host *shost;
@ -206,6 +265,16 @@ static int scsi_add_single_device(uint host, uint channel, uint id, uint lun)
return error; return error;
} }
/**
* scsi_remove_single_device - Respond to user request to remove a device
* @host: user-supplied decimal integer
* @channel: user-supplied decimal integer
* @id: user-supplied decimal integer
* @lun: user-supplied decimal integer
*
* Description: called by writing "scsi remove-single-device" to
* /proc/scsi/scsi. Does a scsi_device_lookup() and scsi_remove_device()
*/
static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun) static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun)
{ {
struct scsi_device *sdev; struct scsi_device *sdev;
@ -226,6 +295,25 @@ static int scsi_remove_single_device(uint host, uint channel, uint id, uint lun)
return error; return error;
} }
/**
* proc_scsi_write - handle writes to /proc/scsi/scsi
* @file: not used
* @buf: buffer to write
* @length: length of buf, at most PAGE_SIZE
* @ppos: not used
*
* Description: this provides a legacy mechanism to add or remove devices by
* Host, Channel, ID, and Lun. To use,
* "echo 'scsi add-single-device 0 1 2 3' > /proc/scsi/scsi" or
* "echo 'scsi remove-single-device 0 1 2 3' > /proc/scsi/scsi" with
* "0 1 2 3" replaced by the Host, Channel, Id, and Lun.
*
* Note: this seems to be aimed at parallel SCSI. Most modern busses (USB,
* SATA, Firewire, Fibre Channel, etc) dynamically assign these values to
* provide a unique identifier and nothing more.
*/
static ssize_t proc_scsi_write(struct file *file, const char __user *buf, static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
size_t length, loff_t *ppos) size_t length, loff_t *ppos)
{ {
@ -291,6 +379,11 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf,
return err; return err;
} }
/**
* proc_scsi_show - show contents of /proc/scsi/scsi (attached devices)
* @s: output goes here
* @p: not used
*/
static int proc_scsi_show(struct seq_file *s, void *p) static int proc_scsi_show(struct seq_file *s, void *p)
{ {
seq_printf(s, "Attached devices:\n"); seq_printf(s, "Attached devices:\n");
@ -298,10 +391,17 @@ static int proc_scsi_show(struct seq_file *s, void *p)
return 0; return 0;
} }
/**
* proc_scsi_open - glue function
* @inode: not used
* @file: passed to single_open()
*
* Associates proc_scsi_show with this file
*/
static int proc_scsi_open(struct inode *inode, struct file *file) static int proc_scsi_open(struct inode *inode, struct file *file)
{ {
/* /*
* We don't really needs this for the write case but it doesn't * We don't really need this for the write case but it doesn't
* harm either. * harm either.
*/ */
return single_open(file, proc_scsi_show, NULL); return single_open(file, proc_scsi_show, NULL);
@ -315,6 +415,9 @@ static const struct file_operations proc_scsi_operations = {
.release = single_release, .release = single_release,
}; };
/**
* scsi_init_procfs - create scsi and scsi/scsi in procfs
*/
int __init scsi_init_procfs(void) int __init scsi_init_procfs(void)
{ {
struct proc_dir_entry *pde; struct proc_dir_entry *pde;
@ -336,6 +439,9 @@ int __init scsi_init_procfs(void)
return -ENOMEM; return -ENOMEM;
} }
/**
* scsi_exit_procfs - Remove scsi/scsi and scsi from procfs
*/
void scsi_exit_procfs(void) void scsi_exit_procfs(void)
{ {
remove_proc_entry("scsi/scsi", NULL); remove_proc_entry("scsi/scsi", NULL);

32
drivers/scsi/scsi_scan.c
View file

@ -221,6 +221,9 @@ static void scsi_unlock_floptical(struct scsi_device *sdev,
/** /**
* scsi_alloc_sdev - allocate and setup a scsi_Device * scsi_alloc_sdev - allocate and setup a scsi_Device
* @starget: which target to allocate a &scsi_device for
* @lun: which lun
* @hostdata: usually NULL and set by ->slave_alloc instead
* *
* Description: * Description:
* Allocate, initialize for io, and return a pointer to a scsi_Device. * Allocate, initialize for io, and return a pointer to a scsi_Device.
@ -472,7 +475,6 @@ static void scsi_target_reap_usercontext(struct work_struct *work)
/** /**
* scsi_target_reap - check to see if target is in use and destroy if not * scsi_target_reap - check to see if target is in use and destroy if not
*
* @starget: target to be checked * @starget: target to be checked
* *
* This is used after removing a LUN or doing a last put of the target * This is used after removing a LUN or doing a last put of the target
@ -928,8 +930,7 @@ static inline void scsi_destroy_sdev(struct scsi_device *sdev)
#ifdef CONFIG_SCSI_LOGGING #ifdef CONFIG_SCSI_LOGGING
/** /**
* scsi_inq_str - print INQUIRY data from min to max index, * scsi_inq_str - print INQUIRY data from min to max index, strip trailing whitespace
* strip trailing whitespace
* @buf: Output buffer with at least end-first+1 bytes of space * @buf: Output buffer with at least end-first+1 bytes of space
* @inq: Inquiry buffer (input) * @inq: Inquiry buffer (input)
* @first: Offset of string into inq * @first: Offset of string into inq
@ -957,9 +958,10 @@ static unsigned char *scsi_inq_str(unsigned char *buf, unsigned char *inq,
* scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it * scsi_probe_and_add_lun - probe a LUN, if a LUN is found add it
* @starget: pointer to target device structure * @starget: pointer to target device structure
* @lun: LUN of target device * @lun: LUN of target device
* @sdevscan: probe the LUN corresponding to this scsi_device
* @sdevnew: store the value of any new scsi_device allocated
* @bflagsp: store bflags here if not NULL * @bflagsp: store bflags here if not NULL
* @sdevp: probe the LUN corresponding to this scsi_device
* @rescan: if nonzero skip some code only needed on first scan
* @hostdata: passed to scsi_alloc_sdev()
* *
* Description: * Description:
* Call scsi_probe_lun, if a LUN with an attached device is found, * Call scsi_probe_lun, if a LUN with an attached device is found,
@ -1110,6 +1112,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
* scsi_sequential_lun_scan - sequentially scan a SCSI target * scsi_sequential_lun_scan - sequentially scan a SCSI target
* @starget: pointer to target structure to scan * @starget: pointer to target structure to scan
* @bflags: black/white list flag for LUN 0 * @bflags: black/white list flag for LUN 0
* @scsi_level: Which version of the standard does this device adhere to
* @rescan: passed to scsi_probe_add_lun()
* *
* Description: * Description:
* Generally, scan from LUN 1 (LUN 0 is assumed to already have been * Generally, scan from LUN 1 (LUN 0 is assumed to already have been
@ -1220,7 +1224,7 @@ EXPORT_SYMBOL(scsilun_to_int);
/** /**
* int_to_scsilun: reverts an int into a scsi_lun * int_to_scsilun: reverts an int into a scsi_lun
* @int: integer to be reverted * @lun: integer to be reverted
* @scsilun: struct scsi_lun to be set. * @scsilun: struct scsi_lun to be set.
* *
* Description: * Description:
@ -1252,18 +1256,22 @@ EXPORT_SYMBOL(int_to_scsilun);
/** /**
* scsi_report_lun_scan - Scan using SCSI REPORT LUN results * scsi_report_lun_scan - Scan using SCSI REPORT LUN results
* @sdevscan: scan the host, channel, and id of this scsi_device * @starget: which target
* @bflags: Zero or a mix of BLIST_NOLUN, BLIST_REPORTLUN2, or BLIST_NOREPORTLUN
* @rescan: nonzero if we can skip code only needed on first scan
* *
* Description: * Description:
* If @sdevscan is for a SCSI-3 or up device, send a REPORT LUN * Fast scanning for modern (SCSI-3) devices by sending a REPORT LUN command.
* command, and scan the resulting list of LUNs by calling * Scan the resulting list of LUNs by calling scsi_probe_and_add_lun.
* scsi_probe_and_add_lun.
* *
* Modifies sdevscan->lun. * If BLINK_REPORTLUN2 is set, scan a target that supports more than 8
* LUNs even if it's older than SCSI-3.
* If BLIST_NOREPORTLUN is set, return 1 always.
* If BLIST_NOLUN is set, return 0 always.
* *
* Return: * Return:
* 0: scan completed (or no memory, so further scanning is futile) * 0: scan completed (or no memory, so further scanning is futile)
* 1: no report lun scan, or not configured * 1: could not scan with REPORT LUN
**/ **/
static int scsi_report_lun_scan(struct scsi_target *starget, int bflags, static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
int rescan) int rescan)

102
drivers/scsi/scsi_transport_fc.c
View file

@ -481,9 +481,9 @@ MODULE_PARM_DESC(dev_loss_tmo,
" exceeded, the scsi target is removed. Value should be" " exceeded, the scsi target is removed. Value should be"
" between 1 and SCSI_DEVICE_BLOCK_MAX_TIMEOUT."); " between 1 and SCSI_DEVICE_BLOCK_MAX_TIMEOUT.");
/** /*
* Netlink Infrastructure * Netlink Infrastructure
**/ */
static atomic_t fc_event_seq; static atomic_t fc_event_seq;
@ -491,10 +491,10 @@ static atomic_t fc_event_seq;
* fc_get_event_number - Obtain the next sequential FC event number * fc_get_event_number - Obtain the next sequential FC event number
* *
* Notes: * Notes:
* We could have inline'd this, but it would have required fc_event_seq to * We could have inlined this, but it would have required fc_event_seq to
* be exposed. For now, live with the subroutine call. * be exposed. For now, live with the subroutine call.
* Atomic used to avoid lock/unlock... * Atomic used to avoid lock/unlock...
**/ */
u32 u32
fc_get_event_number(void) fc_get_event_number(void)
{ {
@ -505,7 +505,6 @@ EXPORT_SYMBOL(fc_get_event_number);
/** /**
* fc_host_post_event - called to post an even on an fc_host. * fc_host_post_event - called to post an even on an fc_host.
*
* @shost: host the event occurred on * @shost: host the event occurred on
* @event_number: fc event number obtained from get_fc_event_number() * @event_number: fc event number obtained from get_fc_event_number()
* @event_code: fc_host event being posted * @event_code: fc_host event being posted
@ -513,7 +512,7 @@ EXPORT_SYMBOL(fc_get_event_number);
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
void void
fc_host_post_event(struct Scsi_Host *shost, u32 event_number, fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
enum fc_host_event_code event_code, u32 event_data) enum fc_host_event_code event_code, u32 event_data)
@ -579,17 +578,16 @@ EXPORT_SYMBOL(fc_host_post_event);
/** /**
* fc_host_post_vendor_event - called to post a vendor unique event on * fc_host_post_vendor_event - called to post a vendor unique event on an fc_host
* a fc_host
*
* @shost: host the event occurred on * @shost: host the event occurred on
* @event_number: fc event number obtained from get_fc_event_number() * @event_number: fc event number obtained from get_fc_event_number()
* @data_len: amount, in bytes, of vendor unique data * @data_len: amount, in bytes, of vendor unique data
* @data_buf: pointer to vendor unique data * @data_buf: pointer to vendor unique data
* @vendor_id: Vendor id
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
void void
fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
u32 data_len, char * data_buf, u64 vendor_id) u32 data_len, char * data_buf, u64 vendor_id)
@ -1900,7 +1898,6 @@ static int fc_vport_match(struct attribute_container *cont,
/** /**
* fc_timed_out - FC Transport I/O timeout intercept handler * fc_timed_out - FC Transport I/O timeout intercept handler
*
* @scmd: The SCSI command which timed out * @scmd: The SCSI command which timed out
* *
* This routine protects against error handlers getting invoked while a * This routine protects against error handlers getting invoked while a
@ -1920,7 +1917,7 @@ static int fc_vport_match(struct attribute_container *cont,
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
static enum scsi_eh_timer_return static enum scsi_eh_timer_return
fc_timed_out(struct scsi_cmnd *scmd) fc_timed_out(struct scsi_cmnd *scmd)
{ {
@ -2133,7 +2130,7 @@ EXPORT_SYMBOL(fc_release_transport);
* 1 - work queued for execution * 1 - work queued for execution
* 0 - work is already queued * 0 - work is already queued
* -EINVAL - work queue doesn't exist * -EINVAL - work queue doesn't exist
**/ */
static int static int
fc_queue_work(struct Scsi_Host *shost, struct work_struct *work) fc_queue_work(struct Scsi_Host *shost, struct work_struct *work)
{ {
@ -2152,7 +2149,7 @@ fc_queue_work(struct Scsi_Host *shost, struct work_struct *work)
/** /**
* fc_flush_work - Flush a fc_host's workqueue. * fc_flush_work - Flush a fc_host's workqueue.
* @shost: Pointer to Scsi_Host bound to fc_host. * @shost: Pointer to Scsi_Host bound to fc_host.
**/ */
static void static void
fc_flush_work(struct Scsi_Host *shost) fc_flush_work(struct Scsi_Host *shost)
{ {
@ -2175,7 +2172,7 @@ fc_flush_work(struct Scsi_Host *shost)
* *
* Return value: * Return value:
* 1 on success / 0 already queued / < 0 for error * 1 on success / 0 already queued / < 0 for error
**/ */
static int static int
fc_queue_devloss_work(struct Scsi_Host *shost, struct delayed_work *work, fc_queue_devloss_work(struct Scsi_Host *shost, struct delayed_work *work,
unsigned long delay) unsigned long delay)
@ -2195,7 +2192,7 @@ fc_queue_devloss_work(struct Scsi_Host *shost, struct delayed_work *work,
/** /**
* fc_flush_devloss - Flush a fc_host's devloss workqueue. * fc_flush_devloss - Flush a fc_host's devloss workqueue.
* @shost: Pointer to Scsi_Host bound to fc_host. * @shost: Pointer to Scsi_Host bound to fc_host.
**/ */
static void static void
fc_flush_devloss(struct Scsi_Host *shost) fc_flush_devloss(struct Scsi_Host *shost)
{ {
@ -2212,21 +2209,20 @@ fc_flush_devloss(struct Scsi_Host *shost)
/** /**
* fc_remove_host - called to terminate any fc_transport-related elements * fc_remove_host - called to terminate any fc_transport-related elements for a scsi host.
* for a scsi host. * @shost: Which &Scsi_Host
* @rport: remote port to be unblocked.
* *
* This routine is expected to be called immediately preceeding the * This routine is expected to be called immediately preceeding the
* a driver's call to scsi_remove_host(). * a driver's call to scsi_remove_host().
* *
* WARNING: A driver utilizing the fc_transport, which fails to call * WARNING: A driver utilizing the fc_transport, which fails to call
* this routine prior to scsi_remote_host(), will leave dangling * this routine prior to scsi_remove_host(), will leave dangling
* objects in /sys/class/fc_remote_ports. Access to any of these * objects in /sys/class/fc_remote_ports. Access to any of these
* objects can result in a system crash !!! * objects can result in a system crash !!!
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
void void
fc_remove_host(struct Scsi_Host *shost) fc_remove_host(struct Scsi_Host *shost)
{ {
@ -2281,10 +2277,10 @@ EXPORT_SYMBOL(fc_remove_host);
/** /**
* fc_starget_delete - called to delete the scsi decendents of an rport * fc_starget_delete - called to delete the scsi decendents of an rport
* (target and all sdevs)
*
* @work: remote port to be operated on. * @work: remote port to be operated on.
**/ *
* Deletes target and all sdevs.
*/
static void static void
fc_starget_delete(struct work_struct *work) fc_starget_delete(struct work_struct *work)
{ {
@ -2303,9 +2299,8 @@ fc_starget_delete(struct work_struct *work)
/** /**
* fc_rport_final_delete - finish rport termination and delete it. * fc_rport_final_delete - finish rport termination and delete it.
*
* @work: remote port to be deleted. * @work: remote port to be deleted.
**/ */
static void static void
fc_rport_final_delete(struct work_struct *work) fc_rport_final_delete(struct work_struct *work)
{ {
@ -2375,7 +2370,7 @@ fc_rport_final_delete(struct work_struct *work)
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
static struct fc_rport * static struct fc_rport *
fc_rport_create(struct Scsi_Host *shost, int channel, fc_rport_create(struct Scsi_Host *shost, int channel,
struct fc_rport_identifiers *ids) struct fc_rport_identifiers *ids)
@ -2462,8 +2457,7 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
} }
/** /**
* fc_remote_port_add - notifies the fc transport of the existence * fc_remote_port_add - notify fc transport of the existence of a remote FC port.
* of a remote FC port.
* @shost: scsi host the remote port is connected to. * @shost: scsi host the remote port is connected to.
* @channel: Channel on shost port connected to. * @channel: Channel on shost port connected to.
* @ids: The world wide names, fc address, and FC4 port * @ids: The world wide names, fc address, and FC4 port
@ -2499,7 +2493,7 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
struct fc_rport * struct fc_rport *
fc_remote_port_add(struct Scsi_Host *shost, int channel, fc_remote_port_add(struct Scsi_Host *shost, int channel,
struct fc_rport_identifiers *ids) struct fc_rport_identifiers *ids)
@ -2683,19 +2677,18 @@ EXPORT_SYMBOL(fc_remote_port_add);
/** /**
* fc_remote_port_delete - notifies the fc transport that a remote * fc_remote_port_delete - notifies the fc transport that a remote port is no longer in existence.
* port is no longer in existence.
* @rport: The remote port that no longer exists * @rport: The remote port that no longer exists
* *
* The LLDD calls this routine to notify the transport that a remote * The LLDD calls this routine to notify the transport that a remote
* port is no longer part of the topology. Note: Although a port * port is no longer part of the topology. Note: Although a port
* may no longer be part of the topology, it may persist in the remote * may no longer be part of the topology, it may persist in the remote
* ports displayed by the fc_host. We do this under 2 conditions: * ports displayed by the fc_host. We do this under 2 conditions:
* - If the port was a scsi target, we delay its deletion by "blocking" it. * 1) If the port was a scsi target, we delay its deletion by "blocking" it.
* This allows the port to temporarily disappear, then reappear without * This allows the port to temporarily disappear, then reappear without
* disrupting the SCSI device tree attached to it. During the "blocked" * disrupting the SCSI device tree attached to it. During the "blocked"
* period the port will still exist. * period the port will still exist.
* - If the port was a scsi target and disappears for longer than we * 2) If the port was a scsi target and disappears for longer than we
* expect, we'll delete the port and the tear down the SCSI device tree * expect, we'll delete the port and the tear down the SCSI device tree
* attached to it. However, we want to semi-persist the target id assigned * attached to it. However, we want to semi-persist the target id assigned
* to that port if it eventually does exist. The port structure will * to that port if it eventually does exist. The port structure will
@ -2709,7 +2702,8 @@ EXPORT_SYMBOL(fc_remote_port_add);
* temporary blocked state. From the LLDD's perspective, the rport no * temporary blocked state. From the LLDD's perspective, the rport no
* longer exists. From the SCSI midlayer's perspective, the SCSI target * longer exists. From the SCSI midlayer's perspective, the SCSI target
* exists, but all sdevs on it are blocked from further I/O. The following * exists, but all sdevs on it are blocked from further I/O. The following
* is then expected: * is then expected.
*
* If the remote port does not return (signaled by a LLDD call to * If the remote port does not return (signaled by a LLDD call to
* fc_remote_port_add()) within the dev_loss_tmo timeout, then the * fc_remote_port_add()) within the dev_loss_tmo timeout, then the
* scsi target is removed - killing all outstanding i/o and removing the * scsi target is removed - killing all outstanding i/o and removing the
@ -2731,7 +2725,7 @@ EXPORT_SYMBOL(fc_remote_port_add);
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
void void
fc_remote_port_delete(struct fc_rport *rport) fc_remote_port_delete(struct fc_rport *rport)
{ {
@ -2792,12 +2786,12 @@ fc_remote_port_delete(struct fc_rport *rport)
EXPORT_SYMBOL(fc_remote_port_delete); EXPORT_SYMBOL(fc_remote_port_delete);
/** /**
* fc_remote_port_rolechg - notifies the fc transport that the roles * fc_remote_port_rolechg - notifies the fc transport that the roles on a remote may have changed.
* on a remote may have changed.
* @rport: The remote port that changed. * @rport: The remote port that changed.
* @roles: New roles for this port.
* *
* The LLDD calls this routine to notify the transport that the roles * Description: The LLDD calls this routine to notify the transport that the
* on a remote port may have changed. The largest effect of this is * roles on a remote port may have changed. The largest effect of this is
* if a port now becomes a FCP Target, it must be allocated a * if a port now becomes a FCP Target, it must be allocated a
* scsi target id. If the port is no longer a FCP target, any * scsi target id. If the port is no longer a FCP target, any
* scsi target id value assigned to it will persist in case the * scsi target id value assigned to it will persist in case the
@ -2810,7 +2804,7 @@ EXPORT_SYMBOL(fc_remote_port_delete);
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
void void
fc_remote_port_rolechg(struct fc_rport *rport, u32 roles) fc_remote_port_rolechg(struct fc_rport *rport, u32 roles)
{ {
@ -2875,12 +2869,12 @@ fc_remote_port_rolechg(struct fc_rport *rport, u32 roles)
EXPORT_SYMBOL(fc_remote_port_rolechg); EXPORT_SYMBOL(fc_remote_port_rolechg);
/** /**
* fc_timeout_deleted_rport - Timeout handler for a deleted remote port, * fc_timeout_deleted_rport - Timeout handler for a deleted remote port.
* which we blocked, and has now failed to return
* in the allotted time.
*
* @work: rport target that failed to reappear in the allotted time. * @work: rport target that failed to reappear in the allotted time.
**/ *
* Description: An attempt to delete a remote port blocks, and if it fails
* to return in the allotted time this gets called.
*/
static void static void
fc_timeout_deleted_rport(struct work_struct *work) fc_timeout_deleted_rport(struct work_struct *work)
{ {
@ -2984,14 +2978,12 @@ fc_timeout_deleted_rport(struct work_struct *work)
} }
/** /**
* fc_timeout_fail_rport_io - Timeout handler for a fast io failing on a * fc_timeout_fail_rport_io - Timeout handler for a fast io failing on a disconnected SCSI target.
* disconnected SCSI target.
*
* @work: rport to terminate io on. * @work: rport to terminate io on.
* *
* Notes: Only requests the failure of the io, not that all are flushed * Notes: Only requests the failure of the io, not that all are flushed
* prior to returning. * prior to returning.
**/ */
static void static void
fc_timeout_fail_rport_io(struct work_struct *work) fc_timeout_fail_rport_io(struct work_struct *work)
{ {
@ -3008,9 +3000,8 @@ fc_timeout_fail_rport_io(struct work_struct *work)
/** /**
* fc_scsi_scan_rport - called to perform a scsi scan on a remote port. * fc_scsi_scan_rport - called to perform a scsi scan on a remote port.
*
* @work: remote port to be scanned. * @work: remote port to be scanned.
**/ */
static void static void
fc_scsi_scan_rport(struct work_struct *work) fc_scsi_scan_rport(struct work_struct *work)
{ {
@ -3047,7 +3038,7 @@ fc_scsi_scan_rport(struct work_struct *work)
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
static int static int
fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev, fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
struct fc_vport_identifiers *ids, struct fc_vport **ret_vport) struct fc_vport_identifiers *ids, struct fc_vport **ret_vport)
@ -3172,7 +3163,7 @@ fc_vport_create(struct Scsi_Host *shost, int channel, struct device *pdev,
* *
* Notes: * Notes:
* This routine assumes no locks are held on entry. * This routine assumes no locks are held on entry.
**/ */
int int
fc_vport_terminate(struct fc_vport *vport) fc_vport_terminate(struct fc_vport *vport)
{ {
@ -3232,9 +3223,8 @@ EXPORT_SYMBOL(fc_vport_terminate);
/** /**
* fc_vport_sched_delete - workq-based delete request for a vport * fc_vport_sched_delete - workq-based delete request for a vport
*
* @work: vport to be deleted. * @work: vport to be deleted.
**/ */
static void static void
fc_vport_sched_delete(struct work_struct *work) fc_vport_sched_delete(struct work_struct *work)
{ {

17
drivers/scsi/scsi_transport_iscsi.c
View file

@ -328,9 +328,10 @@ EXPORT_SYMBOL_GPL(iscsi_add_session);
* iscsi_create_session - create iscsi class session * iscsi_create_session - create iscsi class session
* @shost: scsi host * @shost: scsi host
* @transport: iscsi transport * @transport: iscsi transport
* @target_id: which target
* *
* This can be called from a LLD or iscsi_transport. * This can be called from a LLD or iscsi_transport.
**/ */
struct iscsi_cls_session * struct iscsi_cls_session *
iscsi_create_session(struct Scsi_Host *shost, iscsi_create_session(struct Scsi_Host *shost,
struct iscsi_transport *transport, struct iscsi_transport *transport,
@ -382,7 +383,7 @@ EXPORT_SYMBOL_GPL(iscsi_free_session);
* *
* Can be called by a LLD or iscsi_transport. There must not be * Can be called by a LLD or iscsi_transport. There must not be
* any running connections. * any running connections.
**/ */
int iscsi_destroy_session(struct iscsi_cls_session *session) int iscsi_destroy_session(struct iscsi_cls_session *session)
{ {
iscsi_remove_session(session); iscsi_remove_session(session);
@ -418,7 +419,7 @@ static int iscsi_is_conn_dev(const struct device *dev)
* for software iscsi we could be trying to preallocate a connection struct * for software iscsi we could be trying to preallocate a connection struct
* in which case there could be two connection structs and cid would be * in which case there could be two connection structs and cid would be
* non-zero. * non-zero.
**/ */
struct iscsi_cls_conn * struct iscsi_cls_conn *
iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid) iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)
{ {
@ -465,10 +466,10 @@ EXPORT_SYMBOL_GPL(iscsi_create_conn);
/** /**
* iscsi_destroy_conn - destroy iscsi class connection * iscsi_destroy_conn - destroy iscsi class connection
* @session: iscsi cls session * @conn: iscsi cls session
* *
* This can be called from a LLD or iscsi_transport. * This can be called from an LLD or iscsi_transport.
**/ */
int iscsi_destroy_conn(struct iscsi_cls_conn *conn) int iscsi_destroy_conn(struct iscsi_cls_conn *conn)
{ {
transport_unregister_device(&conn->dev); transport_unregister_device(&conn->dev);
@ -690,7 +691,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh)
* *
* This is called by HW iscsi LLDs to notify userpsace that its HW has * This is called by HW iscsi LLDs to notify userpsace that its HW has
* removed a session. * removed a session.
**/ */
int iscsi_if_destroy_session_done(struct iscsi_cls_conn *conn) int iscsi_if_destroy_session_done(struct iscsi_cls_conn *conn)
{ {
struct iscsi_internal *priv; struct iscsi_internal *priv;
@ -751,7 +752,7 @@ EXPORT_SYMBOL_GPL(iscsi_if_destroy_session_done);
* *
* This is called by HW iscsi LLDs to notify userpsace that its HW has * This is called by HW iscsi LLDs to notify userpsace that its HW has
* created a session or a existing session is back in the logged in state. * created a session or a existing session is back in the logged in state.
**/ */
int iscsi_if_create_session_done(struct iscsi_cls_conn *conn) int iscsi_if_create_session_done(struct iscsi_cls_conn *conn)
{ {
struct iscsi_internal *priv; struct iscsi_internal *priv;

40
drivers/scsi/scsi_transport_sas.c
View file

@ -323,7 +323,7 @@ static int do_sas_phy_delete(struct device *dev, void *data)
} }
/** /**
* sas_remove_children -- tear down a devices SAS data structures * sas_remove_children - tear down a devices SAS data structures
* @dev: device belonging to the sas object * @dev: device belonging to the sas object
* *
* Removes all SAS PHYs and remote PHYs for a given object * Removes all SAS PHYs and remote PHYs for a given object
@ -336,7 +336,7 @@ void sas_remove_children(struct device *dev)
EXPORT_SYMBOL(sas_remove_children); EXPORT_SYMBOL(sas_remove_children);
/** /**
* sas_remove_host -- tear down a Scsi_Host's SAS data structures * sas_remove_host - tear down a Scsi_Host's SAS data structures
* @shost: Scsi Host that is torn down * @shost: Scsi Host that is torn down
* *
* Removes all SAS PHYs and remote PHYs for a given Scsi_Host. * Removes all SAS PHYs and remote PHYs for a given Scsi_Host.
@ -577,7 +577,7 @@ static void sas_phy_release(struct device *dev)
} }
/** /**
* sas_phy_alloc -- allocates and initialize a SAS PHY structure * sas_phy_alloc - allocates and initialize a SAS PHY structure
* @parent: Parent device * @parent: Parent device
* @number: Phy index * @number: Phy index
* *
@ -618,7 +618,7 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
EXPORT_SYMBOL(sas_phy_alloc); EXPORT_SYMBOL(sas_phy_alloc);
/** /**
* sas_phy_add -- add a SAS PHY to the device hierarchy * sas_phy_add - add a SAS PHY to the device hierarchy
* @phy: The PHY to be added * @phy: The PHY to be added
* *
* Publishes a SAS PHY to the rest of the system. * Publishes a SAS PHY to the rest of the system.
@ -638,7 +638,7 @@ int sas_phy_add(struct sas_phy *phy)
EXPORT_SYMBOL(sas_phy_add); EXPORT_SYMBOL(sas_phy_add);
/** /**
* sas_phy_free -- free a SAS PHY * sas_phy_free - free a SAS PHY
* @phy: SAS PHY to free * @phy: SAS PHY to free
* *
* Frees the specified SAS PHY. * Frees the specified SAS PHY.
@ -655,7 +655,7 @@ void sas_phy_free(struct sas_phy *phy)
EXPORT_SYMBOL(sas_phy_free); EXPORT_SYMBOL(sas_phy_free);
/** /**
* sas_phy_delete -- remove SAS PHY * sas_phy_delete - remove SAS PHY
* @phy: SAS PHY to remove * @phy: SAS PHY to remove
* *
* Removes the specified SAS PHY. If the SAS PHY has an * Removes the specified SAS PHY. If the SAS PHY has an
@ -677,7 +677,7 @@ sas_phy_delete(struct sas_phy *phy)
EXPORT_SYMBOL(sas_phy_delete); EXPORT_SYMBOL(sas_phy_delete);
/** /**
* scsi_is_sas_phy -- check if a struct device represents a SAS PHY * scsi_is_sas_phy - check if a struct device represents a SAS PHY
* @dev: device to check * @dev: device to check
* *
* Returns: * Returns:
@ -843,7 +843,6 @@ EXPORT_SYMBOL(sas_port_alloc_num);
/** /**
* sas_port_add - add a SAS port to the device hierarchy * sas_port_add - add a SAS port to the device hierarchy
*
* @port: port to be added * @port: port to be added
* *
* publishes a port to the rest of the system * publishes a port to the rest of the system
@ -868,7 +867,7 @@ int sas_port_add(struct sas_port *port)
EXPORT_SYMBOL(sas_port_add); EXPORT_SYMBOL(sas_port_add);
/** /**
* sas_port_free -- free a SAS PORT * sas_port_free - free a SAS PORT
* @port: SAS PORT to free * @port: SAS PORT to free
* *
* Frees the specified SAS PORT. * Frees the specified SAS PORT.
@ -885,7 +884,7 @@ void sas_port_free(struct sas_port *port)
EXPORT_SYMBOL(sas_port_free); EXPORT_SYMBOL(sas_port_free);
/** /**
* sas_port_delete -- remove SAS PORT * sas_port_delete - remove SAS PORT
* @port: SAS PORT to remove * @port: SAS PORT to remove
* *
* Removes the specified SAS PORT. If the SAS PORT has an * Removes the specified SAS PORT. If the SAS PORT has an
@ -924,7 +923,7 @@ void sas_port_delete(struct sas_port *port)
EXPORT_SYMBOL(sas_port_delete); EXPORT_SYMBOL(sas_port_delete);
/** /**
* scsi_is_sas_port -- check if a struct device represents a SAS port * scsi_is_sas_port - check if a struct device represents a SAS port
* @dev: device to check * @dev: device to check
* *
* Returns: * Returns:
@ -1309,6 +1308,7 @@ static void sas_rphy_initialize(struct sas_rphy *rphy)
/** /**
* sas_end_device_alloc - allocate an rphy for an end device * sas_end_device_alloc - allocate an rphy for an end device
* @parent: which port
* *
* Allocates an SAS remote PHY structure, connected to @parent. * Allocates an SAS remote PHY structure, connected to @parent.
* *
@ -1345,6 +1345,8 @@ EXPORT_SYMBOL(sas_end_device_alloc);
/** /**
* sas_expander_alloc - allocate an rphy for an end device * sas_expander_alloc - allocate an rphy for an end device
* @parent: which port
* @type: SAS_EDGE_EXPANDER_DEVICE or SAS_FANOUT_EXPANDER_DEVICE
* *
* Allocates an SAS remote PHY structure, connected to @parent. * Allocates an SAS remote PHY structure, connected to @parent.
* *
@ -1383,7 +1385,7 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
EXPORT_SYMBOL(sas_expander_alloc); EXPORT_SYMBOL(sas_expander_alloc);
/** /**
* sas_rphy_add -- add a SAS remote PHY to the device hierarchy * sas_rphy_add - add a SAS remote PHY to the device hierarchy
* @rphy: The remote PHY to be added * @rphy: The remote PHY to be added
* *
* Publishes a SAS remote PHY to the rest of the system. * Publishes a SAS remote PHY to the rest of the system.
@ -1430,8 +1432,8 @@ int sas_rphy_add(struct sas_rphy *rphy)
EXPORT_SYMBOL(sas_rphy_add); EXPORT_SYMBOL(sas_rphy_add);
/** /**
* sas_rphy_free -- free a SAS remote PHY * sas_rphy_free - free a SAS remote PHY
* @rphy SAS remote PHY to free * @rphy: SAS remote PHY to free
* *
* Frees the specified SAS remote PHY. * Frees the specified SAS remote PHY.
* *
@ -1459,7 +1461,7 @@ void sas_rphy_free(struct sas_rphy *rphy)
EXPORT_SYMBOL(sas_rphy_free); EXPORT_SYMBOL(sas_rphy_free);
/** /**
* sas_rphy_delete -- remove and free SAS remote PHY * sas_rphy_delete - remove and free SAS remote PHY
* @rphy: SAS remote PHY to remove and free * @rphy: SAS remote PHY to remove and free
* *
* Removes the specified SAS remote PHY and frees it. * Removes the specified SAS remote PHY and frees it.
@ -1473,7 +1475,7 @@ sas_rphy_delete(struct sas_rphy *rphy)
EXPORT_SYMBOL(sas_rphy_delete); EXPORT_SYMBOL(sas_rphy_delete);
/** /**
* sas_rphy_remove -- remove SAS remote PHY * sas_rphy_remove - remove SAS remote PHY
* @rphy: SAS remote phy to remove * @rphy: SAS remote phy to remove
* *
* Removes the specified SAS remote PHY. * Removes the specified SAS remote PHY.
@ -1504,7 +1506,7 @@ sas_rphy_remove(struct sas_rphy *rphy)
EXPORT_SYMBOL(sas_rphy_remove); EXPORT_SYMBOL(sas_rphy_remove);
/** /**
* scsi_is_sas_rphy -- check if a struct device represents a SAS remote PHY * scsi_is_sas_rphy - check if a struct device represents a SAS remote PHY
* @dev: device to check * @dev: device to check
* *
* Returns: * Returns:
@ -1604,7 +1606,7 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,
SETUP_TEMPLATE(expander_attrs, expander_##field, S_IRUGO, 1) SETUP_TEMPLATE(expander_attrs, expander_##field, S_IRUGO, 1)
/** /**
* sas_attach_transport -- instantiate SAS transport template * sas_attach_transport - instantiate SAS transport template
* @ft: SAS transport class function template * @ft: SAS transport class function template
*/ */
struct scsi_transport_template * struct scsi_transport_template *
@ -1715,7 +1717,7 @@ sas_attach_transport(struct sas_function_template *ft)
EXPORT_SYMBOL(sas_attach_transport); EXPORT_SYMBOL(sas_attach_transport);
/** /**
* sas_release_transport -- release SAS transport template instance * sas_release_transport - release SAS transport template instance
* @t: transport template instance * @t: transport template instance
*/ */
void sas_release_transport(struct scsi_transport_template *t) void sas_release_transport(struct scsi_transport_template *t)

10
drivers/scsi/scsi_transport_srp.c
View file

@ -242,8 +242,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
EXPORT_SYMBOL_GPL(srp_rport_add); EXPORT_SYMBOL_GPL(srp_rport_add);
/** /**
* srp_rport_del -- remove a SRP remote port * srp_rport_del - remove a SRP remote port
* @port: SRP remote port to remove * @rport: SRP remote port to remove
* *
* Removes the specified SRP remote port. * Removes the specified SRP remote port.
*/ */
@ -271,7 +271,7 @@ static int do_srp_rport_del(struct device *dev, void *data)
} }
/** /**
* srp_remove_host -- tear down a Scsi_Host's SRP data structures * srp_remove_host - tear down a Scsi_Host's SRP data structures
* @shost: Scsi Host that is torn down * @shost: Scsi Host that is torn down
* *
* Removes all SRP remote ports for a given Scsi_Host. * Removes all SRP remote ports for a given Scsi_Host.
@ -297,7 +297,7 @@ static int srp_it_nexus_response(struct Scsi_Host *shost, u64 nexus, int result)
} }
/** /**
* srp_attach_transport -- instantiate SRP transport template * srp_attach_transport - instantiate SRP transport template
* @ft: SRP transport class function template * @ft: SRP transport class function template
*/ */
struct scsi_transport_template * struct scsi_transport_template *
@ -337,7 +337,7 @@ srp_attach_transport(struct srp_function_template *ft)
EXPORT_SYMBOL_GPL(srp_attach_transport); EXPORT_SYMBOL_GPL(srp_attach_transport);
/** /**
* srp_release_transport -- release SRP transport template instance * srp_release_transport - release SRP transport template instance
* @t: transport template instance * @t: transport template instance
*/ */
void srp_release_transport(struct scsi_transport_template *t) void srp_release_transport(struct scsi_transport_template *t)

35
drivers/scsi/scsicam.c
View file

@ -24,6 +24,14 @@
static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds, static int setsize(unsigned long capacity, unsigned int *cyls, unsigned int *hds,
unsigned int *secs); unsigned int *secs);
/**
* scsi_bios_ptable - Read PC partition table out of first sector of device.
* @dev: from this device
*
* Description: Reads the first sector from the device and returns %0x42 bytes
* starting at offset %0x1be.
* Returns: partition table in kmalloc(GFP_KERNEL) memory, or NULL on error.
*/
unsigned char *scsi_bios_ptable(struct block_device *dev) unsigned char *scsi_bios_ptable(struct block_device *dev)
{ {
unsigned char *res = kmalloc(66, GFP_KERNEL); unsigned char *res = kmalloc(66, GFP_KERNEL);
@ -43,15 +51,17 @@ unsigned char *scsi_bios_ptable(struct block_device *dev)
} }
EXPORT_SYMBOL(scsi_bios_ptable); EXPORT_SYMBOL(scsi_bios_ptable);
/* /**
* Function : int scsicam_bios_param (struct block_device *bdev, ector_t capacity, int *ip) * scsicam_bios_param - Determine geometry of a disk in cylinders/heads/sectors.
* @bdev: which device
* @capacity: size of the disk in sectors
* @ip: return value: ip[0]=heads, ip[1]=sectors, ip[2]=cylinders
* *
* Purpose : to determine the BIOS mapping used for a drive in a * Description : determine the BIOS mapping/geometry used for a drive in a
* SCSI-CAM system, storing the results in ip as required * SCSI-CAM system, storing the results in ip as required
* by the HDIO_GETGEO ioctl(). * by the HDIO_GETGEO ioctl().
* *
* Returns : -1 on failure, 0 on success. * Returns : -1 on failure, 0 on success.
*
*/ */
int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip) int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip)
@ -98,15 +108,18 @@ int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip)
} }
EXPORT_SYMBOL(scsicam_bios_param); EXPORT_SYMBOL(scsicam_bios_param);
/* /**
* Function : static int scsi_partsize(unsigned char *buf, unsigned long * scsi_partsize - Parse cylinders/heads/sectors from PC partition table
* capacity,unsigned int *cyls, unsigned int *hds, unsigned int *secs); * @buf: partition table, see scsi_bios_ptable()
* @capacity: size of the disk in sectors
* @cyls: put cylinders here
* @hds: put heads here
* @secs: put sectors here
* *
* Purpose : to determine the BIOS mapping used to create the partition * Description: determine the BIOS mapping/geometry used to create the partition
* table, storing the results in *cyls, *hds, and *secs * table, storing the results in *cyls, *hds, and *secs
* *
* Returns : -1 on failure, 0 on success. * Returns: -1 on failure, 0 on success.
*
*/ */
int scsi_partsize(unsigned char *buf, unsigned long capacity, int scsi_partsize(unsigned char *buf, unsigned long capacity,
@ -194,7 +207,7 @@ EXPORT_SYMBOL(scsi_partsize);
* *
* WORKING X3T9.2 * WORKING X3T9.2
* DRAFT 792D * DRAFT 792D
* * see http://www.t10.org/ftp/t10/drafts/cam/cam-r12b.pdf
* *
* Revision 6 * Revision 6
* 10-MAR-94 * 10-MAR-94