aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
Commit message (Collapse)AuthorAge
* Merge Paulus' treeStephen Rothwell2005-11-02
|\
| * [PATCH] revert ide-scsi highmem cleanupAndrew Morton2005-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | Jeff Garzik <jgarzik@pobox.com> points out that this was wrong: we need to disable local interrupts while holding KM_IRQ0 due to IRQ sharing. And holding interrupts off during a big PIO opration is expensive, so we only want to do that if we know the page was highmem. So revert commit 17fd47ab4d33e764216b87006d8118fa050b4c92 Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge branch 'upstream-linus' of ↵Linus Torvalds2005-10-31
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * [libata] locking rewrite (== fix)Jeff Garzik2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of power packed into a little patch. This change eliminates the sharing between our controller-wide spinlock and the SCSI core's Scsi_Host lock. As the locking in libata was already highly compartmentalized, always referencing our own lock, and never scsi_host::host_lock. As a side effect, this change eliminates a deadlock from calling scsi_finish_command() while inside our spinlock.
| | * [libata] ata_tf_to_host cleanupsJeff Garzik2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate ata_exec() and ata_tf_to_host() into their only caller, ata_bus_edd(). Rename ata_tf_to_host_nolock() to ata_tf_to_host(). This makes locking a bit easier to review, and may help pave the way for future changes.
| * | Merge master.kernel.org:/home/rmk/linux-2.6-drvmodelLinus Torvalds2005-10-31
| |\ \ | | | | | | | | | | | | Manual #include fixups for clashes - there may be some unnecessary
| | * | Create platform_device.h to contain all the platform device details.Russell King2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert everyone who uses platform_bus_type to include linux/platform_device.h. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
* | | | merge filename and modify references to iseries/vio.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
* | | | merge filename and modify references to iseries/hv_types.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
* | | | merge filename and modify references to iseries/hv_lp_event.hKelly Daly2005-11-01
| | | | | | | | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
* | | | merge filename and modify reference to iseries/hv_lp_config.hKelly Daly2005-11-01
|/ / / | | | | | | | | | Signed-off-by: Kelly Daly <kelly@au.ibm.com>
* | | Merge ../linux-2.6 by handPaul Mackerras2005-10-30
|\ \ \
| * | | [PATCH] fix missing includesTim Schmielau2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I recently picked up my older work to remove unnecessary #includes of sched.h, starting from a patch by Dave Jones to not include sched.h from module.h. This reduces the number of indirect includes of sched.h by ~300. Another ~400 pointless direct includes can be removed after this disentangling (patch to follow later). However, quite a few indirect includes need to be fixed up for this. In order to feed the patches through -mm with as little disturbance as possible, I've split out the fixes I accumulated up to now (complete for i386 and x86_64, more archs to follow later) and post them before the real patch. This way this large part of the patch is kept simple with only adding #includes, and all hunks are independent of each other. So if any hunk rejects or gets in the way of other patches, just drop it. My scripts will pick it up again in the next round. Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] Typo fix: explictly -> explicitlyJean Delvare2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (akpm: I don't do typo patches, but one of these is in a printk string) Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | | [PATCH] ide-scsi highmem cleanupAndrew Morton2005-10-30
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | It's not necessary to test PageHighmem in here - kmap_atomic() does the right thing. Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [libata] use dev_printk() throughout driversJeff Garzik2005-10-30
| | | | | | | | | | | | | | | | | | A few drivers were not following the standard meme of printing out their driver name and version at module load time; this is fixed as well.
| * | [libata ata_piix] fix native mode probe, after recent updatesJeff Garzik2005-10-30
| | |
| * | [libata ata_piix] use dev_printk() where appropriateJeff Garzik2005-10-30
| | |
| * | [libata] fix legacy IDE probingJeff Garzik2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | ata_pci_init_one() receives an array of struct ata_port_info. Recent updates to the code had always obtained port information from array element 0, rather than array element N. Change to avoid hardcoding port_info[0], thereby restoring proper hardware information to secondary legacy ports.
| * | [libata] change ata_qc_complete() to take error mask as second argJeff Garzik2005-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second argument to ata_qc_complete() was being used for two purposes: communicate the ATA Status register to the completion function, and indicate an error. On legacy PCI IDE hardware, the latter is often implicit in the former. On more modern hardware, the driver often completely emulated a Status register value, passing ATA_ERR as an indication that something went wrong. Now that previous code changes have eliminated the need to use drv_stat arg to communicate the ATA Status register value, we can convert it to a mask of possible error classes. This will lead to more flexible error handling in the future.
| * | Merge branch 'master'Jeff Garzik2005-10-30
| |\ \
| | * \ Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2005-10-30
| | |\ \
| | | * | [PATCH] Use sg_set_buf/sg_init_one where applicableDavid Hardeman2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses sg_set_buf/sg_init_one in some places where it was duplicated. Signed-off-by: David Hardeman <david@2gen.com> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: Greg KH <greg@kroah.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| | * | | [PATCH] core remove PageReservedNick Piggin2005-10-30
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove PageReserved() calls from core code by tightening VM_RESERVED handling in mm/ to cover PageReserved functionality. PageReserved special casing is removed from get_page and put_page. All setting and clearing of PageReserved is retained, and it is now flagged in the page_alloc checks to help ensure we don't introduce any refcount based freeing of Reserved pages. MAP_PRIVATE, PROT_WRITE of VM_RESERVED regions is tentatively being deprecated. We never completely handled it correctly anyway, and is be reintroduced in future if required (Hugh has a proof of concept). Once PageReserved() calls are removed from kernel/power/swsusp.c, and all arch/ and driver code, the Set and Clear calls, and the PG_reserved bit can be trivially removed. Last real user of PageReserved is swsusp, which uses PageReserved to determine whether a struct page points to valid memory or not. This still needs to be addressed (a generic page_is_ram() should work). A last caveat: the ZERO_PAGE is now refcounted and managed with rmap (and thus mapcounted and count towards shared rss). These writes to the struct page could cause excessive cacheline bouncing on big systems. There are a number of ways this could be addressed if it is an issue. Signed-off-by: Nick Piggin <npiggin@suse.de> Refcount bug fix for filemap_xip.c Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * / / [libata] remove ata_chk_err(), ->check_err() hook.Jeff Garzik2005-10-29
| |/ / | | | | | | | | | | | | We now depend on ->tf_read() to provide us with the contents of the Error shadow register.
| * | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2005-10-29
| |\ \
| | * | dec_esp: Use physical addressesMaciej W. Rozycki2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These should really be addresses obtained with ioremap() or some bus-specific backend, but for now... Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | | Merge branch 'upstream-linus' of ↵Linus Torvalds2005-10-29
| |\ \ \ | | |/ / | |/| | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| | * | [PATCH] sata_sil24 iomem annotations and fixesAl Viro2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | trivial iomem annotations + missing memcpy_fromio() caught by those Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | [PATCH] libata-core cleanups (updated)Randy Dunlap2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libata-core cleanups: - use kzalloc() instead of kmalloc() + memset(); - use one exit path in ata_device_add(); Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | [libata] ensure ->tf_read() hook reads Status and Error registersJeff Garzik2005-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want ->tf_read() to get a complete snapshot of all taskfile registers, without requiring the callers to manually call ata_chk_status() and ata_chk_err() themselves. This also fixes a minor bug in sata_vsc where the lower bits of the feature register were incorrectly placed in the HOB (high order bits) portion of struct ata_taskfile.
| | * | Merge branch 'master'Jeff Garzik2005-10-28
| | |\ \
| | * | | [PATCH] libata: add support for Promise SATA 300 TX2plus PDC40775Ed Kear2005-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm using this card in a RAID1 with 2 new SATA drives with no problems. Card - SATA 300 TX2plus PDC40775 (3d73) Signed-off-by: Ed Kear <ed@kear.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [libata sata_promise] add pci idJeff Garzik2005-10-28
| | | | | | | | | | | | | | | | | | | | Contributed by Daniel Mueller @ Siemens AG.
| | * | | [libata scsi] MODE SELECT, strengthen mode senseDouglas Gilbert2005-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move default mode pages to the front of libata-scsi.c so various functions can access them - partial annotation of these pages, point out divergence from sat-r06 - replace various mode page magic numbers with defines - strengthen MODE SENSE command decoding: handle DBD bit in cdb, yield block descriptor (per sat-r06) and handle mode sub pages Signed-off-by: Douglas Gilbert <dougg@torque.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| | * | | [libata pdc_adma] minor fixes and cleanupsJeff Garzik2005-10-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes mostly from Mark Lord. - fix bugs in probe-time error handling - only complete qc if not NULL - check port-level polling flags
| | * | | Merge branch 'master'Jeff Garzik2005-10-28
| | |\ \ \
| | * \ \ \ Merge branch 'upstream'Jeff Garzik2005-10-21
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'upstream'Jeff Garzik2005-10-18
| | |\ \ \ \ \
| | * | | | | | [libata passthru] update ATAPI completion for new error handlingJeff Garzik2005-10-09
| | | | | | | |
| | * | | | | | Merge branch 'upstream'Jeff Garzik2005-10-09
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-10-09
| | |\ \ \ \ \ \ \
| | * | | | | | | | [libata passthru] add (DRIVER_SENSE << 24) to all check-conditionsJeff Garzik2005-10-06
| | | | | | | | | |
| | * | | | | | | | [libata passthru] fix leak on errorJeff Raubitschek2005-10-04
| | | | | | | | | |
| | * | | | | | | | Merge /spare/repo/linux-2.6/Jeff Garzik2005-10-04
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge /spare/repo/linux-2.6/Jeff Garzik2005-09-24
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge /spare/repo/linux-2.6/ Jeff Garzik2005-09-14
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge /spare/repo/linux-2.6/ Jeff Garzik2005-09-08
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ /spare/repo/libata-dev branch 'master'Jeff Garzik2005-08-30
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge upstream kernel into libata 'passthru' branchJeff Garzik2005-08-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \