summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] fix megaraid.c lockingChristoph Hellwig2005-11-291-15/+14
| | | | | | | | | | | | | | This fixes locking in megaraid.c, namely: (1) make sure megaraid_queue release the adapter lock by changing the code to have a single return (2) remove the errornous scsi_assign_lock call Testing by Burton Windle. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Burton Windle <bwindle@fint.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] drivers/scsi/dpt_i2o.c: fix a NULL pointer dereferenceAdrian Bunk2005-11-271-4/+5
| | | | | | | | The Coverity checker spotted this obvious NULL pointer dereference. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Mark Salyzyn <mark_salyzyn@adaptec.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix a bug in scsi_get_commandMatthew Dobson2005-11-221-1/+1
| | | | | | | | | | | scsi_get_command() attempts to write into a structure that may not have been successfully allocated. Move this write inside the if statement that ensures we won't panic the kernel with a NULL pointer dereference. Signed-off-by: Matthew Dobson <colpatch@us.ibm.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2005-11-181-1/+1
|\
| * [PATCH] ide: remove ide_driver_t.owner fieldLaurent Riffard2005-11-181-1/+1
| | | | | | | | | | | | | | | | | | The structure ide_driver_t have a .owner field which is a duplicate of .gendriver.owner field (.gen_driver is a struct device_driver). This patch removes ide_driver_t's owner field. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
* | [libata sata_mv] update copyright, driver versionJeff Garzik2005-11-181-1/+2
| |
* | [PATCH] sil24: make error_intr less verboseTejun Heo2005-11-181-3/+9
| | | | | | | | | | | | | | | | | | | | sil24_error_intr logs all error interrupts. ATAPI devices generates many harmless errors which can be ignored and all serious ones are reported via sense data by SCSI layer. Don't log device errors from ATAPI devices. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] sil24: add ATAPI supportTejun Heo2005-11-181-26/+58
| | | | | | | | | | | | | | | | | | | | | | | | This patch implements ATAPI support for sil24 and bumps driver version to 0.23. Signed-off-by: Tejun Heo <htejun@gmail.com> -- Jeff, it has been converted to use ->dev_config as pointed out. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] sil24: use SRST for phy_resetTejun Heo2005-11-181-10/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be no way to obtain device signature from sil24 after SATA phy reset and SRST is needed anyway for later port multiplier suppport. This patch converts sil24_phy_reset to use SRST instaed. Signed-off-by: Tejun Heo <htejun@gmail.com> -- Jeff, I didn't remove the 10ms sleep just to be on the safe side. I think we can live with 10ms sleep on SRST. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] sil24: add sil24_restart_controllerTejun Heo2005-11-181-3/+32
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | When an error condition is raised by device via D2H FIS or SDB. sil24 controller should be restarted by setting PORT_CS_INIT and waiting until PORT_CS_RDY is asserted instead of resetting the controller. This patch implements sil24_restart_controller for those cases. This patch also makes sure that PORT_CS_RDY is asserted on sil24_reset_controller completion. Signed-off-by: Tejun Heo <htejun@gmail.com> -- Jeff, delay is reduced to 1us and cnt increased to 10k. My sil3124 turns on PORT_CS_RDY on the second iteration even without any delay. I think 10k * 1us should be more than enough. I tried to convert both restart and reset to use msleep's with work queue, but if we do that, host_set lock should be released after initiating restart or reset, leading to race condition among reset/restart, other interrupts and timeout. Implementing synchronization among those in low-level driver doesn't seem right. Well, reduced timeout should work for the time being. Thanks. Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [libata sata_mv] handle lack of hardware nIEN supportJeff Garzik2005-11-171-1/+6
| | | | | | | | | | | Handle errata (it was unintentional on this h/w, whereas its intentional on others) whereby the nIEN bit in Device Control is ignored, leading to a situation where a hardware interrupt completes the qc before the polling code has a chance to. This will get fixed The Right Way(tm) once Albert Lee's irq-pio branch is merged, as the more natural PIO method on this hardware is interrupt-driven.
* [libata sata_mv] SATA probe, DMA boundary fixesJeff Garzik2005-11-171-18/+70
| | | | | | | | - DMA boundary was being handled incorrectly. Copied the code from ata_fill_sg(), since Marvell has the same DMA boundary needs. (we can't use ata_fill_sg directly since we have different hardware descriptors) - cleaned up the SATA phy reset code, to deal with various errata
* [libata] add timeout to commands for which we call wait_completion()Jeff Garzik2005-11-171-4/+28
|
* Merge branch 'upstream-fixes'Jeff Garzik2005-11-1611-90/+133
|\
| * [libata] bump versionsJeff Garzik2005-11-168-8/+8
| |
| * [libata ahci] tone down ATAPI errorsJeff Garzik2005-11-161-13/+15
| | | | | | | | | | | | | | | | | | ATA devices don't generate many errors, so the preferred method is to printk() when they occur. ATAPI devices generate tons of exceptions during the normal course of operation, so this change skips logging the most common class of errors.
| * [PATCH] libata: honor the transfer cycle time speficied by the EIDE deviceAlbert Lee2005-11-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code segment is not functional because the transfer cycle time speficied by the EIDE device is later overwritten by ata_timing_quantize(): /* * If the drive is an EIDE drive, it can tell us it needs extended * PIO/MW_DMA cycle timing. */ if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); (snip) ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B); <== uninitialized "t" is used here } /* * Convert the timing to bus clock counts. */ ata_timing_quantize(s, t, T, UT); <== t is overwritten by quantized s The patch has been submitted for ide-timing.h before: http://marc.theaimsgroup.com/?l=linux-ide&m=110820013425454&w=2 Resubmitted for libata. Changes: - Minor fix to honor the following transfer cycle time speficied by the device - id[65]: Minimum Multiword DMA transfer cycle time per word - id[67]: Minimum PIO transfer cycle time without flow control - id[68]: Minimum PIO transfer cycle time with IORDY Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ======= Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sil24: add constantsTejun Heo2005-11-161-1/+20
| | | | | | | | | | | | | | | | Adds constants for ATAPI support to sata_sil24. This patch is originally from Jeff Garzik <jgarzik@pobox.com>. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [libata ahci] command completion fixes, improved debug msgsJeff Garzik2005-11-151-10/+15
| | | | | | | | | | | | | | | | | | - Fix a regression in command completion, which prevented the restart of the DMA engine after the device throws an error. - Pack more hardware info into the port-reset error message. - Promote "welcome to our timeout" message from debug msg to normal printk.
| * [libata] REQUEST SENSE handling fixesJeff Garzik2005-11-143-58/+43
| | | | | | | | | | | | | | | | - Move ATAPI check-condition handling out of the timeout handler - Use multi-qc-issue feature to issue REQUEST SENSE ATAPI PACKET command upon receiving an ATAPI check-condition. This cleans things up a lot, and eliminates a nasty recursion bug.
| * [libata] minor fixes, new helpersJeff Garzik2005-11-141-8/+3
| | | | | | | | | | | | | | | | | | | | - in ata_dev_identify(), don't assume that all devices are either ATA or ATAPI. In the future, this code will see port multipliers and other devices. - make a debugging printk less verbose - add new helper ata_qc_reinit() - add new helper BPRINTK() and port flag ATA_FLAG_DEBUGMSG, for fine-grained debugging use.
| * [libata] fix bugs in ATAPI padding DMA mapping codeJeff Garzik2005-11-141-5/+26
| | | | | | | | | | | | | | The ATAPI pad-to-next-32bit-boundary code modifies the scatterlist's length variable, sometimes to zero. x86-64 platform would oops if a zero-length scatterlist entry was asked to be mapped. Work around this by ensuring that we never DMA-map a zero length buffer or SG entry.
| * [libata ahci] error handling fixesJeff Garzik2005-11-141-5/+19
| | | | | | | | | | | | | | | | | | | | Needed to get ATAPI working. - dump hardware error bits, if hardware signals an error - only reset hardware during timeout if a command was active - call ata_qc_complete() with a fine-grained error mask. Needed so that atapi_qc_complete() can distinguish between device errors and other errors.
* | Merge branch 'master'Jeff Garzik2005-11-133-2/+8
|\|
| * [libata passthru] address slave devices correctlyMark Lord2005-11-131-0/+6
| |
| * [PATCH] libata: fix comments on ata_tf_from_fis()Mark Lord2005-11-131-2/+1
| | | | | | | | | | | | | | Fix description on comments for ata_tf_from_fis(). Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sil24: add missing ata_pad_free()Tejun Heo2005-11-131-0/+1
| | | | | | | | | | | | | | | | sil24_port_stop() is missing call to ata_pad_free() thus leaking pad buffer when a port is stopped. This patch adds it. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [libata sata_mv] fix tons of 50XX bugsJeff Garzik2005-11-131-49/+252
| |
* | [libata sata_mv] call phy fixups during init, as well as phy resetJeff Garzik2005-11-121-12/+26
| |
* | [libata sata_mv] move code aroundJeff Garzik2005-11-121-100/+100
| | | | | | | | No content changes. Move 60xx code to be closer to other 60xx code.
* | [libata sata_mv] hardware initialization workJeff Garzik2005-11-121-12/+105
| | | | | | | | | | Implement flash reset and PCI reset on 50xx and 60xx. Implement LED enable on 50xx.
* | [libata sata_mv] mv_hw_ops for hardware families; new errataJeff Garzik2005-11-121-138/+158
| | | | | | | | | | | | - eliminate a bunch of redundant tests by creating a per-chip-family set of hooks, mv_hw_ops - implement more errata, from newer Marvell GPL'd driver
* | [libata sata_mv] move code aroundJeff Garzik2005-11-121-48/+48
| | | | | | | | No content change, just prepping up future mv_hw_ops modularization.
* | [libata sata_mv] implement a bunch of errata workaroundsJeff Garzik2005-11-121-7/+261
| | | | | | | | Based largely on the GPL'd Marvell vendor driver.
* | [libata sata_mv] note driver is "HIGHLY EXPERIMENTAL" in KconfigJeff Garzik2005-11-121-1/+1
| |
* | [libata sata_mv] trim trailing whitespaceJeff Garzik2005-11-121-38/+38
| |
* | [libata sata_mv] minor fixesJeff Garzik2005-11-121-10/+22
|/ | | | | - clear SError and EDMA irq cause registers, after re-init'ing the phy - move enums with type suffix 'U' to their own enum
* [libata ahci] set port ATAPI bit correctlyJeff Garzik2005-11-121-2/+16
| | | | | | Although according to the documentation this largely only affects desktop LED control, let's make sure we set the ATAPI bit when we have an ATAPI device attached to the port.
* [libata ahci, qstor] fix miscount of scatter/gather entriesJeff Garzik2005-11-122-6/+17
| | | | | Don't directly reference qc->n_elem, as that might cause an off-by-one error for misaligned (padded) ATAPI transfers.
* [PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc ↵Mike Christie2005-11-111-29/+11
| | | | | | | | | | changes) scsi_wait_req does not exist any more in the SCSI layer. This patch makes it so libata can compile again. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6Linus Torvalds2005-11-11127-5019/+1410
|\
| * Merge by hand (whitespace conflicts in libata.h)James Bottomley2005-11-1037-56/+17
| |\ | | | | | | | | | Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] qla2xxx: Update version number to 8.01.03-k.Andrew Vasquez2005-11-091-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] qla2xxx: Correct ISP24xx soft-reset handling.Andrew Vasquez2005-11-092-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A driver must wait 100us before attempting an MMIO operation to the RISC after a soft-reset has been initiated. A similar delay was needed with earlier ISPs. Note: a PCI config-space read is used to flush the MMIO write to the ISP, since the ISP's state machines are unable to respond to any MMIO read during the reset process. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] qla2xxx: Correct abort issue during loop-down state.Ravi Anand2005-11-091-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Correct issue where abort I/O command was not being issued when the loop-state was down. Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] qla2xxx: Correct loop-in-transition issuesRavi Anand2005-11-092-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | When mulitple initiators are coming up in an FCAL topology. Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] qla2xxx: Correct additional posting issues during NVRAM accesses.Andrew Vasquez2005-11-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MMIO relaxed-order platforms, it is possible for the proper delay during NVRAM access to begin before the request passes through the PCI bus (via a MMIO write) to the ISP. Thus, causing a subsequent read to the NVRAM part to fail. Add a MMIO read, after the MMIO write to insure any posted writes are flushed. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] aacraid: Fix read capacity 16 return dataMark Haverkamp2005-11-091-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Received from Mark Salyzyn. The return data from a read capacity 16 needs to have RTO_EN and PROT_EN zeroed out. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] remove Scsi_Device typedefChristoph Hellwig2005-11-0920-64/+63
| | | | | | | | | | | | Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [SCSI] remove Scsi_Pointer typedefChristoph Hellwig2005-11-0911-26/+25
| | | | | | | | | | | | Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>