01 May, 2011

1 commit


31 Mar, 2011

1 commit


17 Nov, 2010

1 commit

  • Move the mid-layer's ->queuecommand() invocation from being locked
    with the host lock to being unlocked to facilitate speeding up the
    critical path for drivers who don't need this lock taken anyway.

    The patch below presents a simple SCSI host lock push-down as an
    equivalent transformation. No locking or other behavior should change
    with this patch. All existing bugs and locking orders are preserved.

    Additionally, add one parameter to queuecommand,
    struct Scsi_Host *
    and remove one parameter from queuecommand,
    void (*done)(struct scsi_cmnd *)

    Scsi_Host* is a convenient pointer that most host drivers need anyway,
    and 'done' is redundant to struct scsi_cmnd->scsi_done.

    Minimal code disturbance was attempted with this change. Most drivers
    needed only two one-line modifications for their host lock push-down.

    Signed-off-by: Jeff Garzik
    Acked-by: James Bottomley
    Signed-off-by: Linus Torvalds

    Jeff Garzik
     

06 Apr, 2010

1 commit

  • * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
    [SCSI] qla1280: retain firmware for error recovery
    [SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init
    [SCSI] advansys: fix regression with request_firmware change
    [SCSI] qla2xxx: Updated version number to 8.03.02-k2.
    [SCSI] qla2xxx: Prevent sending mbx commands from sysfs during isp reset.
    [SCSI] qla2xxx: Disable MSI on qla24xx chips other than QLA2432.
    [SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time.
    [SCSI] qla2xxx: Correct vp_idx checking during PORT_UPDATE processing.
    [SCSI] qla2xxx: Honour "Extended BB credits" bit for CNAs.
    [SCSI] scsi_transport_fc: Make sure commands are completed when rport is offline
    [SCSI] libiscsi: Fix recovery slowdown regression

    Linus Torvalds
     

30 Mar, 2010

1 commit

  • …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

28 Mar, 2010

1 commit

  • The qla1280 driver acquires its firmware via udev. During boot the firmware
    is located in the initrd. If, after root is mounted, the adapter needs to
    reload firmware (host reset), the firmware load may fail if the root device
    is on the adapter being reset. This patch modifies qla1280 to retain the
    firmware loaded via the initial request_firmware() for use during error
    recovery.

    [jejb: fix up checkpatch issues]
    Signed-off-by: Michael Reed
    Acked-by: Jes Sorensen
    Signed-off-by: James Bottomley

    Michael Reed
     

09 Feb, 2010

1 commit


21 May, 2009

2 commits

  • The driver now waits for the scsi commands associated with a
    particular error recovery step to be returned to the mid-layer,
    and returns the appropriate SUCCESS or FAILED status. Removes
    unneeded polling of chip for interrupts.

    This patch also bumps the driver version number.

    Signed-off-by: Michael Reed
    Signed-off-by: James Bottomley

    Michael Reed
     
  • Remove some unneeded, inactive and unused code, make some trivial
    corrections to comments and a printk, and return a proper status
    in qla1280_queuecommand. No fundamental logic changes are made.

    Signed-off-by: Michael Reed
    Signed-off-by: James Bottomley

    Michael Reed
     

11 Apr, 2009

1 commit

  • * git://git.infradead.org/~dwmw2/firmware-2.6:
    qla1280: Fix off-by-some error in firmware loading.
    Add README.AddingFirmware file. Basically telling people not to.
    firmware: Remove newly-added slicoss and sxg firmware images
    firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw
    ALSA: wavefront - Always use request_firmware()
    Remove fdump tool for av7110 firmware
    firmware: convert av7110 driver to request_firmware()
    Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card"
    Revert "fix modules_install via NFS"

    Add-add conflicts in firmware/WHENCE fixed manually

    Linus Torvalds
     

08 Apr, 2009

1 commit


07 Apr, 2009

2 commits


03 Apr, 2009

1 commit


06 Jan, 2009

1 commit


30 Dec, 2008

1 commit


09 Oct, 2008

1 commit

  • Right now SCSI and others do their own command timeout handling.
    Move those bits to the block layer.

    Instead of having a timer per command, we try to be a bit more clever
    and simply have one per-queue. This avoids the overhead of having to
    tear down and setup a timer for each command, so it will result in a lot
    less timer fiddling.

    Signed-off-by: Mike Anderson
    Signed-off-by: Jens Axboe

    Jens Axboe
     

27 Jul, 2008

1 commit


23 May, 2008

1 commit

  • drivers/scsi/aha152x.c:3585:60: warning: Using plain integer as NULL pointer
    drivers/scsi/aha152x.c:3845:56: warning: Using plain integer as NULL pointer
    drivers/scsi/qla1280.c:2814:37: warning: Using plain integer as NULL pointer
    drivers/scsi/atp870u.c:750:47: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1281:36: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1293:36: warning: Using plain integer as NULL pointer
    drivers/scsi/3w-9xxx.c:1301:35: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:447:10: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:457:10: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:479:24: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:483:22: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:1213:23: warning: Using plain integer as NULL pointer
    drivers/scsi/hptiop.c:1214:23: warning: Using plain integer as NULL pointer

    Signed-off-by: Harvey Harrison
    Signed-off-by: Linus Torvalds

    Harvey Harrison
     

14 May, 2008

1 commit

  • The qla1280 driver was ANDing the output value of mailbox register
    0 with (1 << target-number) to determine whether to enable queueing
    on the target in question.

    But mailbox register 0 has the status code for the mailbox command
    (in this case, Set Target Parameters). Potential values are:
    /*
    * ISP mailbox command complete status codes
    */

    So clearly that is in error. I can't think what the author of that
    line was looking for in a mailbox register, so I just eliminated the
    AND. flag is used later in the function, and I think that the later
    usage was also wrong, though it was used to set values that aren't
    used. Oh well, an overhaul of this driver is not what I want to do
    now -- just a bugfix.

    After the fix, I found that my disks were getting a queue depth of
    255, which is far too many. Most SCSI disks are limited to 32 or
    64. In any case, there's no point, queueing up a bunch of commands
    to the adapter that will just result in queue full or starve other
    targets from being issued commands due to running out of internal
    memory. So I dropped default queue depth to 32 (from which 1 is
    subtracted elsewhere, giving net of 31).

    I tested with a Seagate ST336753LC, and results look good, so
    I'm satisfied with this patch.

    Signed-off-by: Jeremy Higdon
    Acked-by: Jes Sorensen
    Cc: Stable Tree
    Signed-off-by: James Bottomley

    Jeremy Higdon
     

02 May, 2008

1 commit

  • - struct scsi_cmnd had a 16 bytes command buffer of its own.
    This is an unnecessary duplication and copy of request's
    cmd. It is probably left overs from the time that scsi_cmnd
    could function without a request attached. So clean that up.

    - Once above is done, few places, apart from scsi-ml, needed
    adjustments due to changing the data type of scsi_cmnd->cmnd.

    - Lots of drivers still use MAX_COMMAND_SIZE. So I have left
    that #define but equate it to BLK_MAX_CDB. The way I see it
    and is reflected in the patch below is.
    MAX_COMMAND_SIZE - means: The longest fixed-length (*) SCSI CDB
    as per the SCSI standard and is not related
    to the implementation.
    BLK_MAX_CDB. - The allocated space at the request level

    - I have audit all ISA drivers and made sure none use ->cmnd in a DMA
    Operation. Same audit was done by Andi Kleen.

    (*)fixed-length here means commands that their size can be determined
    by their opcode and the CDB does not carry a length specifier, (unlike
    the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly
    true and the SCSI standard also defines extended commands and
    vendor specific commands that can be bigger than 16 bytes. The kernel
    will support these using the same infrastructure used for VARLEN CDB's.
    So in effect MAX_COMMAND_SIZE means the maximum size command
    scsi-ml supports without specifying a cmd_len by ULD's

    Signed-off-by: Boaz Harrosh
    Signed-off-by: James Bottomley

    Boaz Harrosh
     

18 Apr, 2008

1 commit


31 Jan, 2008

1 commit

  • With the sg table code, every SCSI driver is now either chain capable
    or broken (or has sg_tablesize set so chaining is never activated), so
    there's no need to have a check in the host template.

    Also tidy up the code by moving the scatterlist size defines into the
    SCSI includes and permit the last entry of the scatterlist pools not
    to be a power of two.
    Signed-off-by: James Bottomley

    James Bottomley
     

24 Jan, 2008

1 commit


10 Jan, 2008

1 commit

  • There's an error remaining in the 32 bit descriptor code after the
    conversion to dma accessors: req_cnt is left uninitialised.

    qla1280_32bit_start_scsi gives the following warnings:

    drivers/scsi/qla1280.c: In function 'qla1280_32bit_start_scsi':
    drivers/scsi/qla1280.c:3044: warning: unused variable 'dma_handle'
    drivers/scsi/qla1280.c: In function 'qla1280_queuecommand':
    drivers/scsi/qla1280.c:3060: warning: 'req_cnt' is used uninitialized in this function
    drivers/scsi/qla1280.c:3042: note: 'req_cnt' was declared here

    Signed-off-by: FUJITA Tomonori
    Signed-off-by: James Bottomley

    FUJITA Tomonori
     

15 Nov, 2007

1 commit

  • - remove the unnecessary map_single path.
    - convert to use the new accessors for the sg lists and the parameters.

    Fixed to missing initialization of sg lists before calling
    for_each_sg() by Jes Sorensen - sg list needs to be initialized before
    trying to pull the elements out of it.

    Signed-off-by: FUJITA Tomonori
    Signed-off-by: Jes Sorensen
    Signed-off-by: James Bottomley

    Jes Sorensen
     

21 Oct, 2007

1 commit


16 Oct, 2007

3 commits


13 Oct, 2007

1 commit

  • The pid field is a duplicate of the serial_number field and has been
    scheduled for removal for a long time. A few drivers were still using
    it, so just change them to use serial_number instead.

    Signed-off-by: Matthew Wilcox
    Signed-off-by: James Bottomley

    Matthew Wilcox
     

06 May, 2007

1 commit


15 Feb, 2007

1 commit

  • After Al Viro (finally) succeeded in removing the sched.h #include in module.h
    recently, it makes sense again to remove other superfluous sched.h includes.
    There are quite a lot of files which include it but don't actually need
    anything defined in there. Presumably these includes were once needed for
    macros that used to live in sched.h, but moved to other header files in the
    course of cleaning it up.

    To ease the pain, this time I did not fiddle with any header files and only
    removed #includes from .c-files, which tend to cause less trouble.

    Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha,
    arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig,
    allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all
    configs in arch/arm/configs on arm. I also checked that no new warnings were
    introduced by the patch (actually, some warnings are removed that were emitted
    by unnecessarily included header files).

    Signed-off-by: Tim Schmielau
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tim Schmielau
     

06 Jan, 2007

1 commit


26 Oct, 2006

1 commit


05 Oct, 2006

2 commits

  • Maintain a per-CPU global "struct pt_regs *" variable which can be used instead
    of passing regs around manually through all ~1800 interrupt handlers in the
    Linux kernel.

    The regs pointer is used in few places, but it potentially costs both stack
    space and code to pass it around. On the FRV arch, removing the regs parameter
    from all the genirq function results in a 20% speed up of the IRQ exit path
    (ie: from leaving timer_interrupt() to leaving do_IRQ()).

    Where appropriate, an arch may override the generic storage facility and do
    something different with the variable. On FRV, for instance, the address is
    maintained in GR28 at all times inside the kernel as part of general exception
    handling.

    Having looked over the code, it appears that the parameter may be handed down
    through up to twenty or so layers of functions. Consider a USB character
    device attached to a USB hub, attached to a USB controller that posts its
    interrupts through a cascaded auxiliary interrupt controller. A character
    device driver may want to pass regs to the sysrq handler through the input
    layer which adds another few layers of parameter passing.

    I've build this code with allyesconfig for x86_64 and i386. I've runtested the
    main part of the code on FRV and i386, though I can't test most of the drivers.
    I've also done partial conversion for powerpc and MIPS - these at least compile
    with minimal configurations.

    This will affect all archs. Mostly the changes should be relatively easy.
    Take do_IRQ(), store the regs pointer at the beginning, saving the old one:

    struct pt_regs *old_regs = set_irq_regs(regs);

    And put the old one back at the end:

    set_irq_regs(old_regs);

    Don't pass regs through to generic_handle_irq() or __do_IRQ().

    In timer_interrupt(), this sort of change will be necessary:

    - update_process_times(user_mode(regs));
    - profile_tick(CPU_PROFILING, regs);
    + update_process_times(user_mode(get_irq_regs()));
    + profile_tick(CPU_PROFILING);

    I'd like to move update_process_times()'s use of get_irq_regs() into itself,
    except that i386, alone of the archs, uses something other than user_mode().

    Some notes on the interrupt handling in the drivers:

    (*) input_dev() is now gone entirely. The regs pointer is no longer stored in
    the input_dev struct.

    (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does
    something different depending on whether it's been supplied with a regs
    pointer or not.

    (*) Various IRQ handler function pointers have been moved to type
    irq_handler_t.

    Signed-Off-By: David Howells
    (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)

    David Howells
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (54 commits)
    [SCSI] Initial Commit of qla4xxx
    [SCSI] raid class: handle component-add errors
    [SCSI] SCSI megaraid_sas: handle thrown errors
    [SCSI] SCSI aic94xx: handle sysfs errors
    [SCSI] SCSI st: fix error handling in module init, sysfs
    [SCSI] SCSI sd: fix module init/exit error handling
    [SCSI] SCSI osst: add error handling to module init, sysfs
    [SCSI] scsi: remove hosts.h
    [SCSI] scsi: Scsi_Cmnd convertion in aic7xxx_old.c
    [SCSI] megaraid_sas: sets ioctl timeout and updates version,changelog
    [SCSI] megaraid_sas: adds tasklet for cmd completion
    [SCSI] megaraid_sas: prints pending cmds before setting hw_crit_error
    [SCSI] megaraid_sas: function pointer for disable interrupt
    [SCSI] megaraid_sas: frame count optimization
    [SCSI] megaraid_sas: FW transition and q size changes
    [SCSI] qla2xxx: Update version number to 8.01.07-k2.
    [SCSI] qla2xxx: Stall mid-layer error handlers while rport is blocked.
    [SCSI] qla2xxx: Add MODULE_FIRMWARE tags.
    [SCSI] qla2xxx: Add support for host port state FC transport attribute.
    [SCSI] qla2xxx: Add support for fabric name FC transport attribute.
    ...

    Linus Torvalds
     

01 Oct, 2006

1 commit


27 Sep, 2006

2 commits

  • Converts pci_module_init() to pci_register_driver() in the scsi subsys on
    23 drivers which only return the value of pci_module_init().

    Signed-off-by: Henrik Kretzschmar
    Signed-off-by: Andrew Morton
    Signed-off-by: James Bottomley

    Henrik Kretzschmar
     
  • Original patch from Ian Dall in bugzilla. Set command timeout as
    specified by the SCSI layer rather than hardcode it to 30 seconds. I
    have received a couple of reports of people hitting this one with
    various tape configurations and the patch looks obviously correct.
    - Jes

    From http://bugzilla.kernel.org/show_bug.cgi?id=6275

    ian@beware.dropbear.id.au (Ian Dall):

    The command sent to the card was using a 30second timeout regardless of the
    timeout requested in the scsi command passed down from higher levels.

    Signed-off-by: Jes Sorensen
    Signed-off-by: James Bottomley

    Jes Sorensen