summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-01-0441-137/+34
|\
| * Documentation/filesystems/00-INDEX: remove entry for fat_cvf.txtPaolo 'Blaisorblade' Giarrusso2006-01-031-2/+0
| | | | | | | | | | | | | | Remove non-existing entry for fat_cvf.txt (was it ever supported?). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * arch/arm26/nwfpe/fpmodule.c: remove kernel 2.0 #ifdefAdrian Bunk2006-01-031-2/+1
| | | | | | | | | | | | This patch removes an #ifdef for kernel 2.0 . Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * update the email address of Randy DunlapAdrian Bunk2006-01-039-11/+10
| | | | | | | | | | | | | | | | This patch removes all references to the bouncing address rddunlap@osdl.org and one dead web page from the kernel. Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
| * Documentation/filesystems/vfs.txt: typo fixJim Cromie2006-01-031-3/+2
| | | | | | | | | | | | | | This patch removes an extra occurrence of 'generic'. Acked-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * Documentation/SubmittingPatches: update Trivial Patch Monkey informationKees Cook2006-01-031-2/+2
| | | | | | | | | | | | | | | | While looking for where to send trivial patches, I found old contact information in Documentation/SubmittingPatches. Signed-off-by: Kees Cook <kees@outflux.net> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * update for Documentation/sysrq.txtAdam D. Moss2006-01-031-5/+1
| | | | | | | | | | | | | | | | This patch for 2.4.x updates the dead email address for 'Mydraal' and since he no longer wishes to field questions concerning SysRq or this document removes the statement stating otherwise. Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * s/retreiv/retriev/gMatt Mackall2006-01-037-16/+16
| | | | | | | | | | | | | | As everyone knows, the rule is: "i before e.. um.. always." Signed-off-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
| * fs/qnx4/bitmap.c: #if 0 qnx4_new_block()Adrian Bunk2006-01-031-0/+2
| | | | | | | | | | | | | | qnx4_new_block() is neither implemented nor used. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Anders Larsen <al@alarsen.net>
| * remove pointers to the defunct UDF mailing listAdrian Bunk2006-01-0320-96/+0
| | | | | | | | | | | | This patch removes pointers to the defunct UDF mailing list. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | Merge branch 'upstream' of ↵Linus Torvalds2006-01-0415-252/+412
|\ \ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
| * \ Merge branch 'master'Jeff Garzik2006-01-03147-894/+1194
| |\ \ | | |/
| * | Merge branch 'master'Jeff Garzik2005-12-24119-1509/+1172
| |\ \
| * \ \ Merge branch 'master'Jeff Garzik2005-12-133-4/+5
| |\ \ \
| * | | | [PATCH] add boot option to control Intel SATA/PATA combined modeJesse Barnes2005-12-132-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combined mode sucks. Especially when both libata and the legacy IDE drivers try to drive ports on the same device, since that makes DMA rather difficult. This patch addresses the problem by allowing the user to control which driver binds to the ports in a combined mode configuration. In many cases, they'll probably want the libata driver to control both ports since it can use DMA for talking with ATAPI devices (when libata.atapi_enabled=1 of course). It also allows the user to get old school behavior by letting the legacy IDE driver bind to both ports. But neither is forced, the patch doesn't change current behavior unless one of combined_mode=ide or combined_mode=libata is passed on the boot line. Either of those options may require you to access your devices via different device nodes (/dev/hd* in the ide case and /dev/sd* in the libata case), though of course if you have udev installed nicely you may not notice anything. :) Let me know if the documentation is too cryptic, I'd be happy to expand on it if necessary. I think most users will want to boot with 'combined_mode=libata' and add 'options libata atapi_enabled=1' to their modules.conf to get good DVD playing and disk behavior (haven't tested CD or DVD writing though). I'd much rather things behave sanely by default (i.e. DMA for devices on both ports), but apparently that's difficult given the various chip bugs and hardware configs out there (not to mention that people's drives may suddenly change from /dev/hdc to /dev/sdb), so this boot option may be the correct long term fix. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-135-10/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'master'Jeff Garzik2005-12-1321-99/+307
| |\ \ \ \ \
| * | | | | | [PATCH] libata: remove unused qc->waitingTejun Heo2005-12-132-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no user of qc->waiting left after ata_exec_internal() changes. Kill the field. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | [PATCH] libata: remove unused functionsTejun Heo2005-12-132-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no user of ata_qc_wait_err() and ata_qc_complete_noop() after ata_exec_internal() changes. Remove unused functions. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | [PATCH] libata: use ata_exec_internal()Tejun Heo2005-12-131-101/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch converts all users of libata internal commands to use ata_exec_internal(). Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | [PATCH] libata: implement ata_exec_internal()Tejun Heo2005-12-132-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements ata_exec_internal() function which performs libata internal command execution. Previously, this was done by each user by manually initializing a qc, issueing it, waiting for its completion and handling errors. In addition to obvious code factoring, using ata_exec_internal() fixes the following bugs. * qc not freed on issue failure * ap->qactive clearing could race with the next internal command * race between timeout handling and irq * ignoring error condition not represented in tf->status Also, qc & hardware are not accessed anymore once it's completed, making internal commands more conformant with general semantics. ata_exec_internal() also makes it easy to issue internal commands from multiple threads if that becomes necessary. This patch only implements ata_exec_internal(). A following patch will convert all users. Signed-off-by: Tejun Heo <htejun@gmail.com> -- Jeff, all patches have been regenerated against upstream branch as of today. (575ab52a218e4ff0667a6cbd972c3af443ee8713) Also, I took out a debug printk from ata_exec_internal (don't know how that one got left there). Other than that, all patches are identical to the previous posting. Thanks. :-) Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-1217-113/+341
| |\ \ \ \ \ \
| * | | | | | | [PATCH] libata: ata_piix 450NX errataAlan Cox2005-12-121-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | Merge branch 'master'Jeff Garzik2005-12-12198-3600/+3843
| |\ \ \ \ \ \ \
| * | | | | | | | [PATCH] libata: add ata_piix notesAlan Cox2005-12-121-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ok lets start with the 'easy' stuff. This includes my research and summary of chip errata into the new driver so that people can refer to it when updating ata_piix. No code changes Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | [PATCH] libata: err_mask misc fixAlbert Lee2005-12-061-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. ata_pio_complete(): It seems unnecessary to wait for the clearing of the DRQ bit. (Waiting for BSY=0 should be enough. ata_ok() also checks the correctness of the status bits later.) 2. ata_pio_block(): - added error checking, before transfering data. - minor comments fix Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | [PATCH] libata: determine the err_mask directly in atapi_packet_task()Albert Lee2005-12-061-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - set qc->err_mask directly when we found the error - remove the code to determine err_mask from device status Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | [PATCH] libata: determine the err_mask when the error is foundAlbert Lee2005-12-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move "qc->err_mask |= AC_ERR_ATA_BUS" to where the error is found - add "assert(qc->err_mask)" to ata_pio_error() to make sure qc->err_mask was available when we enter the error state Signed-off-by: Albert Lee <albertcc@tw.ibm.com> ============ Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | [PATCH] libata: move err_mask to ata_queued_cmdAlbert Lee2005-12-0611-56/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove err_mask from the parameter list of the complete functions - move err_mask to ata_queued_cmd - initialize qc->err_mask when needed - for each function call to ata_qc_complete(), replace the err_mask parameter with qc->err_mask. Signed-off-by: Albert Lee <albertcc@tw.ibm.com> =============== Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | [PATCH] libata: minor patch before moving err_maskAlbert Lee2005-12-061-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add qc to ata_pio_poll() - reorder the initialization of qc in ata_pio_complete() Signed-off-by: Albert Lee <albertcc@tw.ibm.com> =================== Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | Merge branch 'master'Jeff Garzik2005-12-064-11/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-12-03179-4986/+4550
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [PATCH] mark several libata datastructures constArjan van de Ven2005-12-018-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hi, the patch below marks several libata (and libata-driver) structures const so that they end up in the .rodata segment and don't false-share cachelines with things that get dirtied often. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-01112-645/+1134
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [libata sata_promise] minor whitespace cleanupJeff Garzik2005-11-301-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-29280-2869/+3370
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [libata] Print out SATA speed, if link is upJeff Garzik2005-11-201-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the SATA phy probe messages a bit more informative. Note this only applies to drivers that use __sata_phy_reset(), which excludes some drivers.
| * | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-2060-693/+470
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-1873-1202/+1675
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-18240-8387/+3858
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-1753-580/+1708
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-1610-24/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-15451-14550/+13491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-151-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [libata ata_piix] cleanup: remove duplicate ata_port_info recordsJeff Garzik2005-11-141-33/+7
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | [libata] remove two unused fields from struct ata_portJeff Garzik2005-11-141-2/+0
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-0467-2390/+11404
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2006-01-03147-894/+1194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: version 0.11Stephen Hemminger2005-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version number change. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: handle hardware packet overrunStephen Hemminger2005-12-241-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for hardware to get confused when an oversized frame is received. In that case, just drop the packet and increment a counter. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
OpenPOWER on IntegriCloud