diff --git a/[refs] b/[refs] index 9daddb91b879..f501189a5590 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae01d2798d1825307044d75de11eb5c9ffb79c5a +refs/heads/master: 811265b8e8bf84e3b91507bf6a3a8eea20e7a4b7 diff --git a/trunk/Documentation/aoe/mkshelf.sh b/trunk/Documentation/aoe/mkshelf.sh index 32615814271c..8bacf9f2c7cc 100644 --- a/trunk/Documentation/aoe/mkshelf.sh +++ b/trunk/Documentation/aoe/mkshelf.sh @@ -8,15 +8,13 @@ fi n_partitions=${n_partitions:-16} dir=$1 shelf=$2 -nslots=16 -maxslot=`echo $nslots 1 - p | dc` MAJOR=152 set -e -minor=`echo $nslots \* $shelf \* $n_partitions | bc` +minor=`echo 10 \* $shelf \* $n_partitions | bc` endp=`echo $n_partitions - 1 | bc` -for slot in `seq 0 $maxslot`; do +for slot in `seq 0 9`; do for part in `seq 0 $endp`; do name=e$shelf.$slot test "$part" != "0" && name=${name}p$part diff --git a/trunk/Documentation/cciss.txt b/trunk/Documentation/cciss.txt index 68a711fb82cf..c8f9a73111da 100644 --- a/trunk/Documentation/cciss.txt +++ b/trunk/Documentation/cciss.txt @@ -17,9 +17,7 @@ This driver is known to work with the following cards: * SA P600 * SA P800 * SA E400 - * SA P400i - * SA E200 - * SA E200i + * SA E300 If nodes are not already created in the /dev/cciss directory, run as root: diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index 24adfe9af3ca..96bea278bbf6 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -55,7 +55,6 @@ aic7*seq.h* aicasm aicdb.h* asm -asm-offsets.* asm_offsets.* autoconf.h* bbootsect diff --git a/trunk/Documentation/fb/intel810.txt b/trunk/Documentation/fb/intel810.txt index 4f0d6bc789ef..fd68b162e4a1 100644 --- a/trunk/Documentation/fb/intel810.txt +++ b/trunk/Documentation/fb/intel810.txt @@ -5,7 +5,6 @@ Intel 810/815 Framebuffer driver March 17, 2002 First Released: July 2001 - Last Update: September 12, 2005 ================================================================ A. Introduction @@ -45,8 +44,6 @@ B. Features - Hardware Cursor Support - - Supports EDID probing either by DDC/I2C or through the BIOS - C. List of available options a. "video=i810fb" @@ -55,17 +52,14 @@ C. List of available options Recommendation: required b. "xres:" - select horizontal resolution in pixels. (This parameter will be - ignored if 'mode_option' is specified. See 'o' below). + select horizontal resolution in pixels Recommendation: user preference (default = 640) c. "yres:" select vertical resolution in scanlines. If Discrete Video Timings - is enabled, this will be ignored and computed as 3*xres/4. (This - parameter will be ignored if 'mode_option' is specified. See 'o' - below) + is enabled, this will be ignored and computed as 3*xres/4. Recommendation: user preference (default = 480) @@ -92,8 +86,7 @@ C. List of available options g. "hsync1/hsync2:" select the minimum and maximum Horizontal Sync Frequency of the monitor in KHz. If a using a fixed frequency monitor, hsync1 must - be equal to hsync2. If EDID probing is successful, these will be - ignored and values will be taken from the EDID block. + be equal to hsync2. Recommendation: check monitor manual for correct values default (29/30) @@ -101,8 +94,7 @@ C. List of available options h. "vsync1/vsync2:" select the minimum and maximum Vertical Sync Frequency of the monitor in Hz. You can also use this option to lock your monitor's refresh - rate. If EDID probing is successful, these will be ignored and values - will be taken from the EDID block. + rate. Recommendation: check monitor manual for correct values (default = 60/60) @@ -162,11 +154,7 @@ C. List of available options Recommendation: do not set (default = not set) - o. x[-][@] - The driver will now accept specification of boot mode option. If this - is specified, the options 'xres' and 'yres' will be ignored. See - Documentation/fb/modedb.txt for usage. - + D. Kernel booting Separate each option/option-pair by commas (,) and the option from its value @@ -188,10 +176,7 @@ will be computed based on the hsync1/hsync2 and vsync1/vsync2 values. IMPORTANT: You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes -better than 640x480 at 60Hz. HOWEVER, if your chipset/display combination -supports I2C and has an EDID block, you can safely exclude hsync1, hsync2, -vsync1 and vsync2 parameters. These parameters will be taken from the EDID -block. +better than 640x480 at 60Hz. E. Module options @@ -232,21 +217,32 @@ F. Setup This is required. The option is under "Character Devices" d. Under "Graphics Support", select "Intel 810/815" either statically - or as a module. Choose "use VESA Generalized Timing Formula" if - you need to maximize the capability of your display. To be on the + or as a module. Choose "use VESA GTF for video timings" if you + need to maximize the capability of your display. To be on the safe side, you can leave this unselected. - e. If you want support for DDC/I2C probing (Plug and Play Displays), - set 'Enable DDC Support' to 'y'. To make this option appear, set - 'use VESA Generalized Timing Formula' to 'y'. - - f. If you want a framebuffer console, enable it under "Console + e. If you want a framebuffer console, enable it under "Console Drivers" - g. Compile your kernel. + f. Compile your kernel. - h. Load the driver as described in section D and E. + g. Load the driver as described in section D and E. + Optional: + h. If you are going to run XFree86 with its native drivers, the + standard XFree86 4.1.0 and 4.2.0 drivers should work as is. + However, there's a bug in the XFree86 i810 drivers. It attempts + to use XAA even when switched to the console. This will crash + your server. I have a fix at this site: + + http://i810fb.sourceforge.net. + + You can either use the patch, or just replace + + /usr/X11R6/lib/modules/drivers/i810_drv.o + + with the one provided at the website. + i. Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver patch to see the chipset in action (or inaction :-). diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index b67189a8d8d4..784e08c1c80a 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -17,6 +17,15 @@ Who: Greg Kroah-Hartman --------------------------- +What: io_remap_page_range() (macro or function) +When: September 2005 +Why: Replaced by io_remap_pfn_range() which allows more memory space + addressabilty (by using a pfn) and supports sparc & sparc64 + iospace as part of the pfn. +Who: Randy Dunlap + +--------------------------- + What: RAW driver (CONFIG_RAW_DRIVER) When: December 2005 Why: declared obsolete since kernel 2.6.3 diff --git a/trunk/Documentation/firmware_class/firmware_sample_driver.c b/trunk/Documentation/firmware_class/firmware_sample_driver.c index 4bef8c25172c..e1c56a7e6583 100644 --- a/trunk/Documentation/firmware_class/firmware_sample_driver.c +++ b/trunk/Documentation/firmware_class/firmware_sample_driver.c @@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size) u8 buf[size+1]; memcpy(buf, firmware, size); buf[size] = '\0'; - printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf); + printk("firmware_sample_driver: firmware: %s\n", buf); } static void sample_probe_default(void) { /* uses the default method to get the firmware */ const struct firmware *fw_entry; - printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n"); + printk("firmware_sample_driver: a ghost device got inserted :)\n"); if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0) { @@ -61,7 +61,7 @@ static void sample_probe_specific(void) /* NOTE: This currently doesn't work */ - printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n"); + printk("firmware_sample_driver: a ghost device got inserted :)\n"); if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0) { @@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context) return; } - printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n", + printk("firmware_sample_driver: device pointer \"%s\"\n", (char *)context); sample_firmware_load(fw->data, fw->size); } diff --git a/trunk/Documentation/input/appletouch.txt b/trunk/Documentation/input/appletouch.txt deleted file mode 100644 index b48d11d0326d..000000000000 --- a/trunk/Documentation/input/appletouch.txt +++ /dev/null @@ -1,84 +0,0 @@ -Apple Touchpad Driver (appletouch) ----------------------------------- - Copyright (C) 2005 Stelian Pop - -appletouch is a Linux kernel driver for the USB touchpad found on post -February 2005 Apple Alu Powerbooks. - -This driver is derived from Johannes Berg's appletrackpad driver[1], but it has -been improved in some areas: - * appletouch is a full kernel driver, no userspace program is necessary - * appletouch can be interfaced with the synaptics X11 driver, in order - to have touchpad acceleration, scrolling, etc. - -Credits go to Johannes Berg for reverse-engineering the touchpad protocol, -Frank Arnold for further improvements, and Alex Harper for some additional -information about the inner workings of the touchpad sensors. - -Usage: ------- - -In order to use the touchpad in the basic mode, compile the driver and load -the module. A new input device will be detected and you will be able to read -the mouse data from /dev/input/mice (using gpm, or X11). - -In X11, you can configure the touchpad to use the synaptics X11 driver, which -will give additional functionalities, like acceleration, scrolling, 2 finger -tap for middle button mouse emulation, 3 finger tap for right button mouse -emulation, etc. In order to do this, make sure you're using a recent version of -the synaptics driver (tested with 0.14.2, available from [2]), and configure a -new input device in your X11 configuration file (take a look below for an -example). For additional configuration, see the synaptics driver documentation. - - Section "InputDevice" - Identifier "Synaptics Touchpad" - Driver "synaptics" - Option "SendCoreEvents" "true" - Option "Device" "/dev/input/mice" - Option "Protocol" "auto-dev" - Option "LeftEdge" "0" - Option "RightEdge" "850" - Option "TopEdge" "0" - Option "BottomEdge" "645" - Option "MinSpeed" "0.4" - Option "MaxSpeed" "1" - Option "AccelFactor" "0.02" - Option "FingerLow" "0" - Option "FingerHigh" "30" - Option "MaxTapMove" "20" - Option "MaxTapTime" "100" - Option "HorizScrollDelta" "0" - Option "VertScrollDelta" "30" - Option "SHMConfig" "on" - EndSection - - Section "ServerLayout" - ... - InputDevice "Mouse" - InputDevice "Synaptics Touchpad" - ... - EndSection - -Fuzz problems: --------------- - -The touchpad sensors are very sensitive to heat, and will generate a lot of -noise when the temperature changes. This is especially true when you power-on -the laptop for the first time. - -The appletouch driver tries to handle this noise and auto adapt itself, but it -is not perfect. If finger movements are not recognized anymore, try reloading -the driver. - -You can activate debugging using the 'debug' module parameter. A value of 0 -deactivates any debugging, 1 activates tracing of invalid samples, 2 activates -full tracing (each sample is being traced): - modprobe appletouch debug=1 - or - echo "1" > /sys/module/appletouch/parameters/debug - -Links: ------- - -[1]: http://johannes.sipsolutions.net/PowerBook/touchpad/ -[2]: http://web.telia.com/~u89404340/touchpad/index.html diff --git a/trunk/Documentation/kdump/kdump.txt b/trunk/Documentation/kdump/kdump.txt index 5f08f9ce6046..1f5f7d28c9e6 100644 --- a/trunk/Documentation/kdump/kdump.txt +++ b/trunk/Documentation/kdump/kdump.txt @@ -66,11 +66,11 @@ SETUP c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems). CONFIG_PROC_VMCORE=y d) Disable SMP support and build a UP kernel (Until it is fixed). - CONFIG_SMP=n + CONFIG_SMP=n e) Enable "Local APIC support on uniprocessors". - CONFIG_X86_UP_APIC=y + CONFIG_X86_UP_APIC=y f) Enable "IO-APIC support on uniprocessors" - CONFIG_X86_UP_IOAPIC=y + CONFIG_X86_UP_IOAPIC=y Note: i) Options a) and b) depend upon "Configure standard kernel features (for small systems)" (under General setup). @@ -95,11 +95,6 @@ SETUP hence have memory less than 4GB. iii) Specify "irqpoll" as command line parameter. This reduces driver initialization failures in second kernel due to shared interrupts. - iv) needs to be specified in a format corresponding to - the root device name in the output of mount command. - v) If you have built the drivers required to mount root file - system as modules in , then, specify - --initrd=. 5) System reboots into the second kernel when a panic occurs. A module can be written to force the panic or "ALT-SysRq-c" can be used initiate a crash diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 7086f0a90d14..db2603ceabba 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -164,15 +164,6 @@ running once the system is up. over-ride platform specific driver. See also Documentation/acpi-hotkey.txt. - enable_timer_pin_1 [i386,x86-64] - Enable PIN 1 of APIC timer - Can be useful to work around chipset bugs (in particular on some ATI chipsets) - The kernel tries to set a reasonable default. - - disable_timer_pin_1 [i386,x86-64] - Disable PIN 1 of APIC timer - Can be useful to work around chipset bugs. - ad1816= [HW,OSS] Format: ,,, See also Documentation/sound/oss/AD1816. diff --git a/trunk/Documentation/oops-tracing.txt b/trunk/Documentation/oops-tracing.txt index 66eaaab7773d..da711028e5f7 100644 --- a/trunk/Documentation/oops-tracing.txt +++ b/trunk/Documentation/oops-tracing.txt @@ -205,8 +205,8 @@ Phone: 701-234-7556 Tainted kernels: Some oops reports contain the string 'Tainted: ' after the program -counter. This indicates that the kernel has been tainted by some -mechanism. The string is followed by a series of position-sensitive +counter, this indicates that the kernel has been tainted by some +mechanism. The string is followed by a series of position sensitive characters, each representing a particular tainted value. 1: 'G' if all modules loaded have a GPL or compatible license, 'P' if @@ -214,25 +214,16 @@ characters, each representing a particular tainted value. MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by insmod as GPL compatible are assumed to be proprietary. - 2: 'F' if any module was force loaded by "insmod -f", ' ' if all + 2: 'F' if any module was force loaded by insmod -f, ' ' if all modules were loaded normally. 3: 'S' if the oops occurred on an SMP kernel running on hardware that - hasn't been certified as safe to run multiprocessor. - Currently this occurs only on various Athlons that are not - SMP capable. - - 4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all - modules were unloaded normally. - - 5: 'M' if any processor has reported a Machine Check Exception, - ' ' if no Machine Check Exceptions have occurred. - - 6: 'B' if a page-release function has found a bad page reference or - some unexpected page flags. + hasn't been certified as safe to run multiprocessor. + Currently this occurs only on various Athlons that are not + SMP capable. The primary reason for the 'Tainted: ' string is to tell kernel debuggers if this is a clean kernel or if anything unusual has -occurred. Tainting is permanent: even if an offending module is -unloaded, the tainted value remains to indicate that the kernel is not +occurred. Tainting is permanent, even if an offending module is +unloading the tainted value remains to indicate that the kernel is not trustworthy. diff --git a/trunk/Documentation/pm.txt b/trunk/Documentation/pm.txt index 2ea1149bf6b0..cc63ae18d147 100644 --- a/trunk/Documentation/pm.txt +++ b/trunk/Documentation/pm.txt @@ -38,12 +38,6 @@ system the associated daemon will exit gracefully. Driver Interface -- OBSOLETE, DO NOT USE! ----------------************************* - -Note: pm_register(), pm_access(), pm_dev_idle() and friends are -obsolete. Please do not use them. Instead you should properly hook -your driver into the driver model, and use its suspend()/resume() -callbacks to do this kind of stuff. - If you are writing a new driver or maintaining an old driver, it should include power management support. Without power management support, a single driver may prevent a system with power management diff --git a/trunk/Documentation/scsi/00-INDEX b/trunk/Documentation/scsi/00-INDEX index fef92ebf266f..f9cb5bdcce41 100644 --- a/trunk/Documentation/scsi/00-INDEX +++ b/trunk/Documentation/scsi/00-INDEX @@ -60,8 +60,6 @@ scsi.txt - short blurb on using SCSI support as a module. scsi_mid_low_api.txt - info on API between SCSI layer and low level drivers -scsi_eh.txt - - info on SCSI midlayer error handling infrastructure st.txt - info on scsi tape driver sym53c500_cs.txt diff --git a/trunk/Documentation/scsi/scsi_eh.txt b/trunk/Documentation/scsi/scsi_eh.txt deleted file mode 100644 index 534a50922a7b..000000000000 --- a/trunk/Documentation/scsi/scsi_eh.txt +++ /dev/null @@ -1,479 +0,0 @@ - -SCSI EH -====================================== - - This document describes SCSI midlayer error handling infrastructure. -Please refer to Documentation/scsi/scsi_mid_low_api.txt for more -information regarding SCSI midlayer. - -TABLE OF CONTENTS - -[1] How SCSI commands travel through the midlayer and to EH - [1-1] struct scsi_cmnd - [1-2] How do scmd's get completed? - [1-2-1] Completing a scmd w/ scsi_done - [1-2-2] Completing a scmd w/ timeout - [1-3] How EH takes over -[2] How SCSI EH works - [2-1] EH through fine-grained callbacks - [2-1-1] Overview - [2-1-2] Flow of scmds through EH - [2-1-3] Flow of control - [2-2] EH through hostt->eh_strategy_handler() - [2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions - [2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions - [2-2-3] Things to consider - - -[1] How SCSI commands travel through the midlayer and to EH - -[1-1] struct scsi_cmnd - - Each SCSI command is represented with struct scsi_cmnd (== scmd). A -scmd has two list_head's to link itself into lists. The two are -scmd->list and scmd->eh_entry. The former is used for free list or -per-device allocated scmd list and not of much interest to this EH -discussion. The latter is used for completion and EH lists and unless -otherwise stated scmds are always linked using scmd->eh_entry in this -discussion. - - -[1-2] How do scmd's get completed? - - Once LLDD gets hold of a scmd, either the LLDD will complete the -command by calling scsi_done callback passed from midlayer when -invoking hostt->queuecommand() or SCSI midlayer will time it out. - - -[1-2-1] Completing a scmd w/ scsi_done - - For all non-EH commands, scsi_done() is the completion callback. It -does the following. - - 1. Delete timeout timer. If it fails, it means that timeout timer - has expired and is going to finish the command. Just return. - - 2. Link scmd to per-cpu scsi_done_q using scmd->en_entry - - 3. Raise SCSI_SOFTIRQ - - SCSI_SOFTIRQ handler scsi_softirq calls scsi_decide_disposition() to -determine what to do with the command. scsi_decide_disposition() -looks at the scmd->result value and sense data to determine what to do -with the command. - - - SUCCESS - scsi_finish_command() is invoked for the command. The - function does some maintenance choirs and notify completion by - calling scmd->done() callback, which, for fs requests, would - be HLD completion callback - sd:sd_rw_intr, sr:rw_intr, - st:st_intr. - - - NEEDS_RETRY - - ADD_TO_MLQUEUE - scmd is requeued to blk queue. - - - otherwise - scsi_eh_scmd_add(scmd, 0) is invoked for the command. See - [1-3] for details of this funciton. - - -[1-2-2] Completing a scmd w/ timeout - - The timeout handler is scsi_times_out(). When a timeout occurs, this -function - - 1. invokes optional hostt->eh_timedout() callback. Return value can - be one of - - - EH_HANDLED - This indicates that eh_timedout() dealt with the timeout. The - scmd is passed to __scsi_done() and thus linked into per-cpu - scsi_done_q. Normal command completion described in [1-2-1] - follows. - - - EH_RESET_TIMER - This indicates that more time is required to finish the - command. Timer is restarted. This action is counted as a - retry and only allowed scmd->allowed + 1(!) times. Once the - limit is reached, action for EH_NOT_HANDLED is taken instead. - - *NOTE* This action is racy as the LLDD could finish the scmd - after the timeout has expired but before it's added back. In - such cases, scsi_done() would think that timeout has occurred - and return without doing anything. We lose completion and the - command will time out again. - - - EH_NOT_HANDLED - This is the same as when eh_timedout() callback doesn't exist. - Step #2 is taken. - - 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the - command. See [1-3] for more information. - - -[1-3] How EH takes over - - scmds enter EH via scsi_eh_scmd_add(), which does the following. - - 1. Turns on scmd->eh_eflags as requested. It's 0 for error - completions and SCSI_EH_CANCEL_CMD for timeouts. - - 2. Links scmd->eh_entry to shost->eh_cmd_q - - 3. Sets SHOST_RECOVERY bit in shost->shost_state - - 4. Increments shost->host_failed - - 5. Wakes up SCSI EH thread if shost->host_busy == shost->host_failed - - As can be seen above, once any scmd is added to shost->eh_cmd_q, -SHOST_RECOVERY shost_state bit is turned on. This prevents any new -scmd to be issued from blk queue to the host; eventually, all scmds on -the host either complete normally, fail and get added to eh_cmd_q, or -time out and get added to shost->eh_cmd_q. - - If all scmds either complete or fail, the number of in-flight scmds -becomes equal to the number of failed scmds - i.e. shost->host_busy == -shost->host_failed. This wakes up SCSI EH thread. So, once woken up, -SCSI EH thread can expect that all in-flight commands have failed and -are linked on shost->eh_cmd_q. - - Note that this does not mean lower layers are quiescent. If a LLDD -completed a scmd with error status, the LLDD and lower layers are -assumed to forget about the scmd at that point. However, if a scmd -has timed out, unless hostt->eh_timedout() made lower layers forget -about the scmd, which currently no LLDD does, the command is still -active as long as lower layers are concerned and completion could -occur at any time. Of course, all such completions are ignored as the -timer has already expired. - - We'll talk about how SCSI EH takes actions to abort - make LLDD -forget about - timed out scmds later. - - -[2] How SCSI EH works - - LLDD's can implement SCSI EH actions in one of the following two -ways. - - - Fine-grained EH callbacks - LLDD can implement fine-grained EH callbacks and let SCSI - midlayer drive error handling and call appropriate callbacks. - This will be dicussed further in [2-1]. - - - eh_strategy_handler() callback - This is one big callback which should perform whole error - handling. As such, it should do all choirs SCSI midlayer - performs during recovery. This will be discussed in [2-2]. - - Once recovery is complete, SCSI EH resumes normal operation by -calling scsi_restart_operations(), which - - 1. Checks if door locking is needed and locks door. - - 2. Clears SHOST_RECOVERY shost_state bit - - 3. Wakes up waiters on shost->host_wait. This occurs if someone - calls scsi_block_when_processing_errors() on the host. - (*QUESTION* why is it needed? All operations will be blocked - anyway after it reaches blk queue.) - - 4. Kicks queues in all devices on the host in the asses - - -[2-1] EH through fine-grained callbacks - -[2-1-1] Overview - - If eh_strategy_handler() is not present, SCSI midlayer takes charge -of driving error handling. EH's goals are two - make LLDD, host and -device forget about timed out scmds and make them ready for new -commands. A scmd is said to be recovered if the scmd is forgotten by -lower layers and lower layers are ready to process or fail the scmd -again. - - To achieve these goals, EH performs recovery actions with increasing -severity. Some actions are performed by issueing SCSI commands and -others are performed by invoking one of the following fine-grained -hostt EH callbacks. Callbacks may be omitted and omitted ones are -considered to fail always. - -int (* eh_abort_handler)(struct scsi_cmnd *); -int (* eh_device_reset_handler)(struct scsi_cmnd *); -int (* eh_bus_reset_handler)(struct scsi_cmnd *); -int (* eh_host_reset_handler)(struct scsi_cmnd *); - - Higher-severity actions are taken only when lower-severity actions -cannot recover some of failed scmds. Also, note that failure of the -highest-severity action means EH failure and results in offlining of -all unrecovered devices. - - During recovery, the following rules are followed - - - Recovery actions are performed on failed scmds on the to do list, - eh_work_q. If a recovery action succeeds for a scmd, recovered - scmds are removed from eh_work_q. - - Note that single recovery action on a scmd can recover multiple - scmds. e.g. resetting a device recovers all failed scmds on the - device. - - - Higher severity actions are taken iff eh_work_q is not empty after - lower severity actions are complete. - - - EH reuses failed scmds to issue commands for recovery. For - timed-out scmds, SCSI EH ensures that LLDD forgets about a scmd - before reusing it for EH commands. - - When a scmd is recovered, the scmd is moved from eh_work_q to EH -local eh_done_q using scsi_eh_finish_cmd(). After all scmds are -recovered (eh_work_q is empty), scsi_eh_flush_done_q() is invoked to -either retry or error-finish (notify upper layer of failure) recovered -scmds. - - scmds are retried iff its sdev is still online (not offlined during -EH), REQ_FAILFAST is not set and ++scmd->retries is less than -scmd->allowed. - - -[2-1-2] Flow of scmds through EH - - 1. Error completion / time out - ACTION: scsi_eh_scmd_add() is invoked for scmd - - set scmd->eh_eflags - - add scmd to shost->eh_cmd_q - - set SHOST_RECOVERY - - shost->host_failed++ - LOCKING: shost->host_lock - - 2. EH starts - ACTION: move all scmds to EH's local eh_work_q. shost->eh_cmd_q - is cleared. - LOCKING: shost->host_lock (not strictly necessary, just for - consistency) - - 3. scmd recovered - ACTION: scsi_eh_finish_cmd() is invoked to EH-finish scmd - - shost->host_failed-- - - clear scmd->eh_eflags - - scsi_setup_cmd_retry() - - move from local eh_work_q to local eh_done_q - LOCKING: none - - 4. EH completes - ACTION: scsi_eh_flush_done_q() retries scmds or notifies upper - layer of failure. - - scmd is removed from eh_done_q and scmd->eh_entry is cleared - - if retry is necessary, scmd is requeued using - scsi_queue_insert() - - otherwise, scsi_finish_command() is invoked for scmd - LOCKING: queue or finish function performs appropriate locking - - -[2-1-3] Flow of control - - EH through fine-grained callbacks start from scsi_unjam_host(). - -<> - - 1. Lock shost->host_lock, splice_init shost->eh_cmd_q into local - eh_work_q and unlock host_lock. Note that shost->eh_cmd_q is - cleared by this action. - - 2. Invoke scsi_eh_get_sense. - - <> - - This action is taken for each error-completed - (!SCSI_EH_CANCEL_CMD) commands without valid sense data. Most - SCSI transports/LLDDs automatically acquire sense data on - command failures (autosense). Autosense is recommended for - performance reasons and as sense information could get out of - sync inbetween occurrence of CHECK CONDITION and this action. - - Note that if autosense is not supported, scmd->sense_buffer - contains invalid sense data when error-completing the scmd - with scsi_done(). scsi_decide_disposition() always returns - FAILED in such cases thus invoking SCSI EH. When the scmd - reaches here, sense data is acquired and - scsi_decide_disposition() is called again. - - 1. Invoke scsi_request_sense() which issues REQUEST_SENSE - command. If fails, no action. Note that taking no action - causes higher-severity recovery to be taken for the scmd. - - 2. Invoke scsi_decide_disposition() on the scmd - - - SUCCESS - scmd->retries is set to scmd->allowed preventing - scsi_eh_flush_done_q() from retrying the scmd and - scsi_eh_finish_cmd() is invoked. - - - NEEDS_RETRY - scsi_eh_finish_cmd() invoked - - - otherwise - No action. - - 3. If !list_empty(&eh_work_q), invoke scsi_eh_abort_cmds(). - - <> - - This action is taken for each timed out command. - hostt->eh_abort_handler() is invoked for each scmd. The - handler returns SUCCESS if it has succeeded to make LLDD and - all related hardware forget about the scmd. - - If a timedout scmd is successfully aborted and the sdev is - either offline or ready, scsi_eh_finish_cmd() is invoked for - the scmd. Otherwise, the scmd is left in eh_work_q for - higher-severity actions. - - Note that both offline and ready status mean that the sdev is - ready to process new scmds, where processing also implies - immediate failing; thus, if a sdev is in one of the two - states, no further recovery action is needed. - - Device readiness is tested using scsi_eh_tur() which issues - TEST_UNIT_READY command. Note that the scmd must have been - aborted successfully before reusing it for TEST_UNIT_READY. - - 4. If !list_empty(&eh_work_q), invoke scsi_eh_ready_devs() - - <> - - This function takes four increasingly more severe measures to - make failed sdevs ready for new commands. - - 1. Invoke scsi_eh_stu() - - <> - - For each sdev which has failed scmds with valid sense data - of which scsi_check_sense()'s verdict is FAILED, - START_STOP_UNIT command is issued w/ start=1. Note that - as we explicitly choose error-completed scmds, it is known - that lower layers have forgotten about the scmd and we can - reuse it for STU. - - If STU succeeds and the sdev is either offline or ready, - all failed scmds on the sdev are EH-finished with - scsi_eh_finish_cmd(). - - *NOTE* If hostt->eh_abort_handler() isn't implemented or - failed, we may still have timed out scmds at this point - and STU doesn't make lower layers forget about those - scmds. Yet, this function EH-finish all scmds on the sdev - if STU succeeds leaving lower layers in an inconsistent - state. It seems that STU action should be taken only when - a sdev has no timed out scmd. - - 2. If !list_empty(&eh_work_q), invoke scsi_eh_bus_device_reset(). - - <> - - This action is very similar to scsi_eh_stu() except that, - instead of issuing STU, hostt->eh_device_reset_handler() - is used. Also, as we're not issuing SCSI commands and - resetting clears all scmds on the sdev, there is no need - to choose error-completed scmds. - - 3. If !list_empty(&eh_work_q), invoke scsi_eh_bus_reset() - - <> - - hostt->eh_bus_reset_handler() is invoked for each channel - with failed scmds. If bus reset succeeds, all failed - scmds on all ready or offline sdevs on the channel are - EH-finished. - - 4. If !list_empty(&eh_work_q), invoke scsi_eh_host_reset() - - <> - - This is the last resort. hostt->eh_host_reset_handler() - is invoked. If host reset succeeds, all failed scmds on - all ready or offline sdevs on the host are EH-finished. - - 5. If !list_empty(&eh_work_q), invoke scsi_eh_offline_sdevs() - - <> - - Take all sdevs which still have unrecovered scmds offline - and EH-finish the scmds. - - 5. Invoke scsi_eh_flush_done_q(). - - <> - - At this point all scmds are recovered (or given up) and - put on eh_done_q by scsi_eh_finish_cmd(). This function - flushes eh_done_q by either retrying or notifying upper - layer of failure of the scmds. - - -[2-2] EH through hostt->eh_strategy_handler() - - hostt->eh_strategy_handler() is invoked in the place of -scsi_unjam_host() and it is responsible for whole recovery process. -On completion, the handler should have made lower layers forget about -all failed scmds and either ready for new commands or offline. Also, -it should perform SCSI EH maintenance choirs to maintain integrity of -SCSI midlayer. IOW, of the steps described in [2-1-2], all steps -except for #1 must be implemented by eh_strategy_handler(). - - -[2-2-1] Pre hostt->eh_strategy_handler() SCSI midlayer conditions - - The following conditions are true on entry to the handler. - - - Each failed scmd's eh_flags field is set appropriately. - - - Each failed scmd is linked on scmd->eh_cmd_q by scmd->eh_entry. - - - SHOST_RECOVERY is set. - - - shost->host_failed == shost->host_busy - - -[2-2-2] Post hostt->eh_strategy_handler() SCSI midlayer conditions - - The following conditions must be true on exit from the handler. - - - shost->host_failed is zero. - - - Each scmd's eh_eflags field is cleared. - - - Each scmd is in such a state that scsi_setup_cmd_retry() on the - scmd doesn't make any difference. - - - shost->eh_cmd_q is cleared. - - - Each scmd->eh_entry is cleared. - - - Either scsi_queue_insert() or scsi_finish_command() is called on - each scmd. Note that the handler is free to use scmd->retries and - ->allowed to limit the number of retries. - - -[2-2-3] Things to consider - - - Know that timed out scmds are still active on lower layers. Make - lower layers forget about them before doing anything else with - those scmds. - - - For consistency, when accessing/modifying shost data structure, - grab shost->host_lock. - - - On completion, each failed sdev must have forgotten about all - active scmds. - - - On completion, each failed sdev must be ready for new commands or - offline. - - --- -Tejun Heo -htejun@gmail.com -11th September 2005 diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index 13cba955cb5a..ebfcdf28485f 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -75,7 +75,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. adsp_map - PCM device number maps assigned to the 2st OSS device. - Default: 1 nonblock_open - - Don't block opening busy PCM devices. Default: 1 + - Don't block opening busy PCM devices. For example, when dsp_map=2, /dev/dsp will be mapped to PCM #2 of the card #0. Similarly, when adsp_map=0, /dev/adsp will be mapped @@ -148,16 +148,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module supports up to 8 cards. This module does not support autoprobe thus main port must be specified!!! Other ports are optional. - Module snd-ad1889 - ----------------- - - Module for Analog Devices AD1889 chips. - - ac97_quirk - AC'97 workaround for strange hardware - See the description of intel8x0 module for details. - - This module supports up to 8 cards. - Module snd-ali5451 ------------------ @@ -199,20 +189,15 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-atiixp ----------------- - Module for ATI IXP 150/200/250/400 AC97 controllers. + Module for ATI IXP 150/200/250 AC97 controllers. - ac97_clock - AC'97 clock (default = 48000) + ac97_clock - AC'97 clock (defalut = 48000) ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + See the description of intel8x0 module for details. spdif_aclink - S/PDIF transfer over AC-link (default = 1) This module supports up to 8 cards and autoprobe. - ATI IXP has two different methods to control SPDIF output. One is - over AC-link and another is over the "direct" SPDIF output. The - implementation depends on the motherboard, and you'll need to - choose the correct one via spdif_aclink module option. - Module snd-atiixp-modem ----------------------- @@ -245,7 +230,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. The hardware EQ hardware and SPDIF is only present in the Vortex2 and Advantage. - Note: Some ALSA mixer applications don't handle the SPDIF sample rate + Note: Some ALSA mixer applicactions don't handle the SPDIF samplerate control correctly. If you have problems regarding this, try another ALSA compliant mixer (alsamixer works). @@ -317,7 +302,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. mpu_port - 0x300,0x310,0x320,0x330, 0 = disable (default) fm_port - 0x388 (default), 0 = disable (default) - soft_ac3 - Software-conversion of raw SPDIF packets (model 033 only) + soft_ac3 - Sofware-conversion of raw SPDIF packets (model 033 only) (default = 1) joystick_port - Joystick port address (0 = disable, 1 = auto-detect) @@ -399,7 +384,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module for PCI sound cards based on CS4610/CS4612/CS4614/CS4615/CS4622/ CS4624/CS4630/CS4280 PCI chips. - external_amp - Force to enable external amplifier. + external_amp - Force to enable external amplifer. thinkpad - Force to enable Thinkpad's CLKRUN control. mmap_valid - Support OSS mmap mode (default = 0). @@ -635,7 +620,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. VIA VT8251/VT8237A model - force the model name - position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) + position_fix - Fix DMA pointer (0 = FIFO size, 1 = none, 2 = POSBUF) Module supports up to 8 cards. @@ -671,11 +656,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. allout 5-jack in back, 2-jack in front, SPDIF out auto auto-config reading BIOS (default) - If the default configuration doesn't work and one of the above - matches with your device, report it together with the PCI - subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel - ML (see the section "Links and Addresses"). - Note 2: If you get click noises on output, try the module option position_fix=1 or 2. position_fix=1 will use the SD_LPIB register value without FIFO size correction as the current @@ -803,13 +783,20 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ac97_clock - AC'97 codec clock base (0 = auto-detect) ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + The following strings are accepted: + default = don't override the default setting + disable = disable the quirk + hp_only = use headphone control as master + swap_hp = swap headphone and master controls + swap_surround = swap master and surround controls + ad_sharing = for AD1985, turn on OMS bit and use headphone + alc_jack = for ALC65x, turn on the jack sense mode + inv_eapd = inverted EAPD implementation + mute_led = bind EAPD bit for turning on/off mute LED + For backward compatibility, the corresponding integer + value -1, 0, ... are accepted, too. buggy_irq - Enable workaround for buggy interrupts on some - motherboards (default yes on nForce chips, - otherwise off) - buggy_semaphore - Enable workaround for hardwares with buggy - semaphores (e.g. on some ASUS laptops) - (default off) + motherboards (default off) Module supports autoprobe and multiple bus-master chips (max 8). @@ -821,6 +808,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. motherboard has these devices, use the ns558 or snd-mpu401 modules, respectively. + The ac97_quirk option is used to enable/override the workaround + for specific devices. Some hardware have swapped output pins + between Master and Headphone, or Surround. The driver provides + the auto-detection of known problematic devices, but some might + be unknown or wrongly detected. In such a case, pass the proper + value with this option. + The power-management is supported. Module snd-intel8x0m @@ -972,7 +966,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. with machines with other (most likely CS423x or OPL3SAx) chips, even though the device is detected in lspci. In such a case, try other drivers, e.g. snd-cs4232 or snd-opl3sa2. Some has ISA-PnP - but some doesn't have ISA PnP. You'll need to specify isapnp=0 + but some doesn't have ISA PnP. You'll need to speicfy isapnp=0 and proper hardware parameters in the case without ISA PnP. Note: some laptops need a workaround for AC97 RESET. For the @@ -1308,7 +1302,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. channels [VIA8233/C, 8235, 8237 only] ac97_quirk - AC'97 workaround for strange hardware - See "AC97 Quirk Option" section below. + See the description of intel8x0 module for details. Module supports autoprobe and multiple bus-master chips (max 8). @@ -1333,17 +1327,16 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. "lspci -nv"). If dxs_support=5 does not work, try dxs_support=4; if it doesn't work too, try dxs_support=1. (dxs_support=1 is - usually for old motherboards. The correct implemented + usually for old motherboards. The correct implementated board should work with 4 or 5.) If it still doesn't work and the default setting is ok, dxs_support=3 is the right choice. If the default setting doesn't work at all, try dxs_support=2 to disable the DXS channels. In any cases, please let us know the result and the - subsystem vendor/device ids. See "Links and Addresses" - below. + subsystem vendor/device ids. Note: for the MPU401 on VIA823x, use snd-mpu401 driver - additionally. The mpu_port option is for VIA686 chips only. + additonally. The mpu_port option is for VIA686 chips only. Module snd-via82xx-modem ------------------------ @@ -1405,10 +1398,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module supports up to 8 cards. The module is compiled only when PCMCIA is supported on kernel. - With the older 2.6.x kernel, to activate the driver via the card - manager, you'll need to set up /etc/pcmcia/vxpocket.conf. See the - sound/pcmcia/vx/vxpocket.c. 2.6.13 or later kernel requires no - longer require a config file. + To activate the driver via the card manager, you'll need to set + up /etc/pcmcia/vxpocket.conf. See the sound/pcmcia/vx/vxpocket.c. When the driver is compiled as a module and the hotplug firmware is supported, the firmware data is loaded via hotplug automatically. @@ -1420,9 +1411,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Note: the driver is build only when CONFIG_ISA is set. - Note2: snd-vxp440 driver is merged to snd-vxpocket driver since - ALSA 1.0.10. - Module snd-ymfpci ----------------- @@ -1448,37 +1436,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Note: the driver is build only when CONFIG_ISA is set. -AC97 Quirk Option -================= - -The ac97_quirk option is used to enable/override the workaround for -specific devices on drivers for on-board AC'97 controllers like -snd-intel8x0. Some hardware have swapped output pins between Master -and Headphone, or Surround (thanks to confusion of AC'97 -specifications from version to version :-) - -The driver provides the auto-detection of known problematic devices, -but some might be unknown or wrongly detected. In such a case, pass -the proper value with this option. - -The following strings are accepted: - - default Don't override the default setting - - disable Disable the quirk - - hp_only Bind Master and Headphone controls as a single control - - swap_hp Swap headphone and master controls - - swap_surround Swap master and surround controls - - ad_sharing For AD1985, turn on OMS bit and use headphone - - alc_jack For ALC65x, turn on the jack sense mode - - inv_eapd Inverted EAPD implementation - - mute_led Bind EAPD bit for turning on/off mute LED - -For backward compatibility, the corresponding integer value -1, 0, -... are accepted, too. - -For example, if "Master" volume control has no effect on your device -but only "Headphone" does, pass ac97_quirk=hp_only module option. - - Configuring Non-ISAPNP Cards ============================ @@ -1596,8 +1553,6 @@ Proc interfaces (/proc/asound) - whole-frag write only whole fragments (optimization affecting playback only) - no-silence do not fill silence ahead to avoid clicks - - buggy-ptr Returns the whitespace blocks in GETOPTR ioctl - instead of filled blocks Example: echo "x11amp 128 16384" > /proc/asound/card0/pcm0p/oss echo "squake 0 0 disable" > /proc/asound/card0/pcm0c/oss @@ -1634,14 +1589,9 @@ commands to the snd-page-alloc driver: use. -Links and Addresses -=================== +Links +===== ALSA project homepage http://www.alsa-project.org - ALSA Bug Tracking System - https://bugtrack.alsa-project.org/bugs/ - - ALSA Developers ML - mailto:alsa-devel@lists.sourceforge.net diff --git a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl index 24e85520890b..0475478c2484 100644 --- a/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl +++ b/trunk/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl @@ -447,7 +447,7 @@ .... /* allocate a chip-specific data with zero filled */ - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); if (chip == NULL) return -ENOMEM; @@ -949,7 +949,7 @@ After allocating a card instance via snd_card_new() (with NULL on the 4th arg), call - kzalloc(). + kcalloc(). @@ -958,7 +958,7 @@ mychip_t *chip; card = snd_card_new(index[dev], id[dev], THIS_MODULE, NULL); ..... - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); ]]> @@ -1136,7 +1136,7 @@ return -ENXIO; } - chip = kzalloc(sizeof(*chip), GFP_KERNEL); + chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); if (chip == NULL) { pci_disable_device(pci); return -ENOMEM; @@ -1292,7 +1292,7 @@ need to initialize this number as -1 before actual allocation, since irq 0 is valid. The port address and its resource pointer can be initialized as null by - kzalloc() automatically, so you + kcalloc() automatically, so you don't have to take care of resetting them. diff --git a/trunk/Documentation/usb/proc_usb_info.txt b/trunk/Documentation/usb/proc_usb_info.txt index f86550fe38ee..729c72d34c89 100644 --- a/trunk/Documentation/usb/proc_usb_info.txt +++ b/trunk/Documentation/usb/proc_usb_info.txt @@ -20,7 +20,7 @@ the /proc/bus/usb/BBB/DDD files. to /etc/fstab. This will mount usbfs at each reboot. You can then issue `cat /proc/bus/usb/devices` to extract - USB device information, and user mode drivers can use usbfs + USB device information, and user mode drivers can use usbfs to interact with USB devices. There are a number of mount options supported by usbfs. @@ -32,7 +32,7 @@ the /proc/bus/usb/BBB/DDD files. still see references to the older "usbdevfs" name. For more information on mounting the usbfs file system, see the -"USB Device Filesystem" section of the USB Guide. The latest copy +"USB Device Filesystem" section of the USB Guide. The latest copy of the USB Guide can be found at http://www.linux-usb.org/ @@ -133,7 +133,7 @@ B: Alloc=ddd/ddd us (xx%), #Int=ddd, #Iso=ddd are the only transfers that reserve bandwidth. Control and bulk transfers use all other bandwidth, including reserved bandwidth that is not used for transfers (such as for short packets). - + The percentage is how much of the "reserved" bandwidth is scheduled by those transfers. For a low or full speed bus (loosely, "USB 1.1"), 90% of the bus bandwidth is reserved. For a high speed bus (loosely, @@ -197,7 +197,7 @@ C:* #Ifs=dd Cfg#=dd Atr=xx MPwr=dddmA | | |__NumberOfInterfaces | |__ "*" indicates the active configuration (others are " ") |__Config info tag - + USB devices may have multiple configurations, each of which act rather differently. For example, a bus-powered configuration might be much less capable than one that is self-powered. Only @@ -228,7 +228,7 @@ I: If#=dd Alt=dd #EPs=dd Cls=xx(sssss) Sub=xx Prot=xx Driver=ssss For example, default settings may not use more than a small amount of periodic bandwidth. To use significant fractions of bus bandwidth, drivers must select a non-default altsetting. - + Only one setting for an interface may be active at a time, and only one driver may bind to an interface at a time. Most devices have only one alternate setting per interface. @@ -297,21 +297,18 @@ S: SerialNumber=dce0 C:* #Ifs= 1 Cfg#= 1 Atr=40 MxPwr= 0mA I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub E: Ad=81(I) Atr=03(Int.) MxPS= 8 Ivl=255ms - T: Bus=00 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 4 D: Ver= 1.00 Cls=09(hub ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 P: Vendor=0451 ProdID=1446 Rev= 1.00 C:* #Ifs= 1 Cfg#= 1 Atr=e0 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 1 Cls=09(hub ) Sub=00 Prot=00 Driver=hub E: Ad=81(I) Atr=03(Int.) MxPS= 1 Ivl=255ms - T: Bus=00 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=1.5 MxCh= 0 D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 P: Vendor=04b4 ProdID=0001 Rev= 0.00 C:* #Ifs= 1 Cfg#= 1 Atr=80 MxPwr=100mA I: If#= 0 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=01 Prot=02 Driver=mouse E: Ad=81(I) Atr=03(Int.) MxPS= 3 Ivl= 10ms - T: Bus=00 Lev=02 Prnt=02 Port=02 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 D: Ver= 1.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 P: Vendor=0565 ProdID=0001 Rev= 1.08 diff --git a/trunk/Documentation/x86_64/boot-options.txt b/trunk/Documentation/x86_64/boot-options.txt index ffe1c062088b..678e8f192db2 100644 --- a/trunk/Documentation/x86_64/boot-options.txt +++ b/trunk/Documentation/x86_64/boot-options.txt @@ -11,11 +11,6 @@ Machine check If your BIOS doesn't do that it's a good idea to enable though to make sure you log even machine check events that result in a reboot. - mce=tolerancelevel (number) - 0: always panic, 1: panic if deadlock possible, - 2: try to avoid panic, 3: never panic or exit (for testing) - default is 1 - Can be also set using sysfs which is preferable. nomce (for compatibility with i386): same as mce=off diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d1e0eb46d201..f038dca34ee8 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -370,10 +370,7 @@ W: http://atmelwlandriver.sourceforge.net/ S: Maintained AUDIT SUBSYSTEM -P: David Woodhouse -M: dwmw2@infradead.org -L: linux-audit@redhat.com -W: http://people.redhat.com/sgrubb/audit/ +L: linux-audit@redhat.com (subscribers-only) S: Maintained AX.25 NETWORK LAYER @@ -967,13 +964,6 @@ L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.nu/ S: Maintained -HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER -P: Robert Love -M: rlove@rlove.org -M: linux-kernel@vger.kernel.org -W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/ -S: Maintained - HARMONY SOUND DRIVER P: Kyle McMartin M: kyle@parisc-linux.org diff --git a/trunk/Makefile b/trunk/Makefile index 4e0d7c68d223..45e5a38fbc7a 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 14 -EXTRAVERSION =-rc1 +SUBLEVEL = 13 +EXTRAVERSION = NAME=Affluent Albatross # *DOCUMENTATION* diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig index 3e5f69bb5ac4..405a55f2287c 100644 --- a/trunk/arch/arm/mach-pxa/Kconfig +++ b/trunk/arch/arm/mach-pxa/Kconfig @@ -20,66 +20,40 @@ config ARCH_PXA_IDP select PXA25x config PXA_SHARPSL - bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" + bool "SHARP SL-5600 and SL-C7xx Models" + select PXA25x select SHARP_SCOOP select SHARP_PARAM help Say Y here if you intend to run this kernel on a - Sharp Zaurus SL-5600 (Poodle), SL-C700 (Corgi), - SL-C750 (Shepherd), SL-C760 (Husky), SL-C1000 (Akita), - SL-C3000 (Spitz) or SL-C3100 (Borzoi) handheld computer. + Sharp SL-5600 (Poodle), Sharp SL-C700 (Corgi), + SL-C750 (Shepherd) or a Sharp SL-C760 (Husky) + handheld computer. endchoice -if PXA_SHARPSL - -choice - prompt "Select target Sharp Zaurus device range" - -config PXA_SHARPSL_25x - bool "Sharp PXA25x models (SL-5600 and SL-C7xx)" - select PXA25x - -config PXA_SHARPSL_27x - bool "Sharp PXA270 models (SL-Cxx00)" - select PXA27x - -endchoice - -endif - endmenu config MACH_POODLE bool "Enable Sharp SL-5600 (Poodle) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select SHARP_LOCOMO config MACH_CORGI bool "Enable Sharp SL-C700 (Corgi) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx config MACH_SHEPHERD bool "Enable Sharp SL-C750 (Shepherd) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx config MACH_HUSKY bool "Enable Sharp SL-C760 (Husky) Support" - depends PXA_SHARPSL_25x + depends PXA_SHARPSL select PXA_SHARP_C7xx -config MACH_SPITZ - bool "Enable Sharp Zaurus SL-3000 (Spitz) Support" - depends PXA_SHARPSL_27x - select PXA_SHARP_Cxx00 - -config MACH_BORZOI - bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support" - depends PXA_SHARPSL_27x - select PXA_SHARP_Cxx00 - config PXA25x bool help @@ -100,9 +74,4 @@ config PXA_SHARP_C7xx help Enable support for all Sharp C7xx models -config PXA_SHARP_Cxx00 - bool - help - Enable common support for Sharp Cxx00 models - endif diff --git a/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile index f609a0f232cb..33dae99ec2d8 100644 --- a/trunk/arch/arm/mach-pxa/Makefile +++ b/trunk/arch/arm/mach-pxa/Makefile @@ -12,7 +12,6 @@ obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o obj-$(CONFIG_ARCH_PXA_IDP) += idp.o obj-$(CONFIG_PXA_SHARP_C7xx) += corgi.o corgi_ssp.o corgi_lcd.o ssp.o -obj-$(CONFIG_PXA_SHARP_Cxx00) += spitz.o corgi_ssp.o corgi_lcd.o ssp.o obj-$(CONFIG_MACH_POODLE) += poodle.o # Support for blinky lights diff --git a/trunk/arch/arm/mach-pxa/corgi.c b/trunk/arch/arm/mach-pxa/corgi.c index 426c2bc517eb..07b5dd453565 100644 --- a/trunk/arch/arm/mach-pxa/corgi.c +++ b/trunk/arch/arm/mach-pxa/corgi.c @@ -41,7 +41,6 @@ #include #include "generic.h" -#include "sharpsl.h" /* @@ -95,30 +94,14 @@ struct platform_device corgissp_device = { .id = -1, }; -struct corgissp_machinfo corgi_ssp_machinfo = { - .port = 1, - .cs_lcdcon = CORGI_GPIO_LCDCON_CS, - .cs_ads7846 = CORGI_GPIO_ADS7846_CS, - .cs_max1111 = CORGI_GPIO_MAX1111_CS, - .clk_lcdcon = 76, - .clk_ads7846 = 2, - .clk_max1111 = 8, -}; - /* * Corgi Backlight Device */ -static struct corgibl_machinfo corgi_bl_machinfo = { - .max_intensity = 0x2f, - .set_bl_intensity = corgi_bl_set_intensity, -}; - static struct platform_device corgibl_device = { .name = "corgi-bl", .dev = { .parent = &corgifb_device.dev, - .platform_data = &corgi_bl_machinfo, }, .id = -1, }; @@ -136,29 +119,12 @@ static struct platform_device corgikbd_device = { /* * Corgi Touch Screen Device */ -static struct resource corgits_resources[] = { - [0] = { - .start = CORGI_IRQ_GPIO_TP_INT, - .end = CORGI_IRQ_GPIO_TP_INT, - .flags = IORESOURCE_IRQ, - }, -}; - -static struct corgits_machinfo corgi_ts_machinfo = { - .get_hsync_len = corgi_get_hsync_len, - .put_hsync = corgi_put_hsync, - .wait_hsync = corgi_wait_hsync, -}; - static struct platform_device corgits_device = { .name = "corgi-ts", .dev = { .parent = &corgissp_device.dev, - .platform_data = &corgi_ts_machinfo, }, .id = -1, - .num_resources = ARRAY_SIZE(corgits_resources), - .resource = corgits_resources, }; @@ -259,10 +225,7 @@ static struct platform_device *devices[] __initdata = { static void __init corgi_init(void) { - corgi_ssp_set_machinfo(&corgi_ssp_machinfo); - pxa_gpio_mode(CORGI_GPIO_USB_PULLUP | GPIO_OUT); - pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN); pxa_set_udc_info(&udc_info); pxa_set_mci_info(&corgi_mci_platform_data); diff --git a/trunk/arch/arm/mach-pxa/corgi_lcd.c b/trunk/arch/arm/mach-pxa/corgi_lcd.c index c5efcd04fcbc..deac29c00290 100644 --- a/trunk/arch/arm/mach-pxa/corgi_lcd.c +++ b/trunk/arch/arm/mach-pxa/corgi_lcd.c @@ -1,14 +1,10 @@ /* * linux/drivers/video/w100fb.c * - * Corgi/Spitz LCD Specific Code + * Corgi LCD Specific Code for ATI Imageon w100 (Wallaby) * * Copyright (C) 2005 Richard Purdie * - * Connectivity: - * Corgi - LCD to ATI Imageon w100 (Wallaby) - * Spitz - LCD to PXA Framebuffer - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. @@ -18,17 +14,9 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include #include -#include "generic.h" +#include