commit c4d198d5183ec7bbf8b53216cfc5ded7ebb0ec0c Author: Avi Kivity Date: Sat Jul 21 09:06:46 2007 +0300 KVM: MMU: Fix cleaning up the shadow page allocation cache __free_page() wants a struct page, not a virtual address. Signed-off-by: Avi Kivity Signed-off-by: Linus Torvalds commit 5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 Merge: c2e6805... 964f9ce... Author: Linus Torvalds Date: Fri Jul 20 18:10:03 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: sdhci: make sure to clear the error interrupt mmc: at91_mci: wakeup on card insertion (or removal) mmc: add maintainer for at91 commit c2e68052429fdf87702fccd272951282bef1c60a Merge: d6f410b... 1256efd... Author: Linus Torvalds Date: Fri Jul 20 17:35:25 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: fix section mismatch warning in mdesc.c [SPARC64]: fix section mismatch warning in pci_sunv4 [SPARC64]: Stop using drivers/char/rtc.c [SPARC64]: Convert parport to of_platform_driver. [SPARC]: Implement fb_is_primary_device(). [SPARC64]: Fix virq decomposition. [SPARC64]: Use KERN_ERR in IRQ manipulation error printks. [SPARC64]: Do not flood log with failed DS messages. [SPARC64]: Add proper multicast support to VNET driver. [SPARC64]: Handle multiple domain-services-port nodes properly. [SPARC64]: Improve VIO device naming further. [SPARC]: Make sure dev_archdata is filled in for all devices. [SPARC]: Define minimal struct dev_archdata, similarly to sparc64. [SPARC]: Fix serial console device detection. commit 1256efd5519a8eca2dfa6039ce5cf58f44d1626d Author: Sam Ravnborg Date: Fri Jul 20 17:20:56 2007 -0700 [SPARC64]: fix section mismatch warning in mdesc.c Fix following warning: WARNING: vmlinux.o(.text+0x35264): Section mismatch: reference to .init.text:__alloc_bootmem (between 'mdesc_bootmem_alloc' and 'mdesc_bootmem_free') Rename mdesc_mem_ops to *_ops so modpost ignores __init references and declare mdesc_bootmem_alloc __init since it is only used during __init context. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit f0429bf7a099c28b4806b68812b821ef6d1ddbcb Author: Sam Ravnborg Date: Fri Jul 20 17:19:56 2007 -0700 [SPARC64]: fix section mismatch warning in pci_sunv4 Fix following warning: WARNING: vmlinux.o(.text+0x3cf50): Section mismatch: reference to .init.text:page_in_phys_avail (between 'pci_sun4v_pbm_init' and 'sun4v_pci_init') pci_sun4v_pbm_init and sun4v_pci_init was only used under __init context so declare them _init. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit cdee99d7461d928815db6219fb14d37f99241d44 Author: David S. Miller Date: Thu Jul 19 13:59:58 2007 -0700 [SPARC64]: Stop using drivers/char/rtc.c The existing sparc64 mini_rtc driver can handle CMOS based rtcs trivially with just a few lines of code and the simplifies things tremendously. Tested on SB1500. Signed-off-by: David S. Miller commit 0fe85d504b47267bcdb25a563c535aa2ae075ff4 Author: David S. Miller Date: Wed Jul 18 23:15:04 2007 -0700 [SPARC64]: Convert parport to of_platform_driver. Signed-off-by: David S. Miller commit 3adf55ad5c0fcabf1c53bb274f39953cb1d6698f Author: David S. Miller Date: Wed Jul 18 22:03:58 2007 -0700 [SPARC]: Implement fb_is_primary_device(). Signed-off-by: David S. Miller commit 93b3238ef8b04f1383b2aa7704487fb3c0e44193 Author: David S. Miller Date: Fri Jul 20 02:58:28 2007 -0700 [SPARC64]: Fix virq decomposition. The dev_handle and dev_ino fields don't match up exactly to the traditional IMAP_IGN and IMAP_INO masks. So store them away in a table and look them up directly. Signed-off-by: David S. Miller commit e83fb17f9ba6ea0c64d084cca0c557d7e7dc9693 Author: David S. Miller Date: Fri Jul 20 02:39:04 2007 -0700 [SPARC64]: Use KERN_ERR in IRQ manipulation error printks. Signed-off-by: David S. Miller commit afd69ed142a3aa8df81ea54e5e78d77dbcf08467 Author: David S. Miller Date: Fri Jul 20 02:34:41 2007 -0700 [SPARC64]: Do not flood log with failed DS messages. When booting up a control node it's quite common to not be able to register several service types. And likewise on guests at least one or two are going to not be there. Signed-off-by: David S. Miller commit 028ebff26915df18ab0cda664e2f0582650af155 Author: David S. Miller Date: Fri Jul 20 02:30:25 2007 -0700 [SPARC64]: Add proper multicast support to VNET driver. Signed-off-by: David S. Miller commit 5fc986100cb253897b4e16992e805343d30a819e Author: David S. Miller Date: Thu Jul 19 23:25:35 2007 -0700 [SPARC64]: Handle multiple domain-services-port nodes properly. Signed-off-by: David S. Miller commit 58fb666643acee28d347de0b59bb938844c22f83 Author: David S. Miller Date: Thu Jul 19 22:51:07 2007 -0700 [SPARC64]: Improve VIO device naming further. The best scheme to get uniqueness seems to be: FOO -- If node lacks "id" property FOO-$(ID) -- If node has "id" but parent lacks "cfg-handle" FOO-$(ID)-$(CFG_HANDLE) -- If node has both Signed-off-by: David S. Miller commit 3d6e470236bc759f43c9f2377899b526a50e2e63 Author: David S. Miller Date: Wed Jul 18 22:03:25 2007 -0700 [SPARC]: Make sure dev_archdata is filled in for all devices. Signed-off-by: David S. Miller commit e865f3e6f4ef2d2617f5003c7c819ed15b5a511b Author: David S. Miller Date: Wed Jul 18 20:59:54 2007 -0700 [SPARC]: Define minimal struct dev_archdata, similarly to sparc64. Signed-off-by: David S. Miller commit c73fcc846c91f53fd2c67fd9c6c04888a9e5892e Author: David S. Miller Date: Fri Jul 20 16:59:26 2007 -0700 [SPARC]: Fix serial console device detection. The current scheme works on static interpretation of text names, which is wrong. The output-device setting, for example, must be resolved via an alias or similar to a full path name to the console device. Paths also contain an optional set of 'options', which starts with a colon at the end of the path. The option area is used to specify which of two serial ports ('a' or 'b') the path refers to when a device node drives multiple ports. 'a' is assumed if the option specification is missing. This was caught by the UltraSPARC-T1 simulator. The 'output-device' property was set to 'ttya' and we didn't pick upon the fact that this is an OBP alias set to '/virtual-devices/console'. Instead we saw it as the first serial console device, instead of the hypervisor console. The infrastructure is now there to take advantage of this to resolve the console correctly even in multi-head situations in fbcon too. Thanks to Greg Onufer for the bug report. Signed-off-by: David S. Miller commit d6f410bdbcb435c744c4f8259d6659ae2c6e447a Merge: eaf729c... 1b2232a... Author: Linus Torvalds Date: Fri Jul 20 14:54:35 2007 -0700 Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module V4L/DVB (5877): radio-gemtek-pci: remove unused structure member V4L/DVB (5871): Conexant 2388x: check for kthread_run V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next. V4L/DVB (5867): videodev2.h: add missing for userspace V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134 V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage. V4L/DVB (5854): ivtv: cleanup of driver messages V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages. V4L/DVB (5852): ivtv: don't recompile needlessly V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option V4L/DVB (5850): ivtv: improve API command debugging V4L/DVB (5848): Av7110: fix typo commit eaf729c8a8bfc9c7a5ff5659e3b2584bf2ef22e1 Author: Linus Torvalds Date: Fri Jul 20 14:53:52 2007 -0700 Un-ignore "vmlinux.lds.S" in .gitignore We ignore all the generated files called "vmlinux*" from the top-level gitignore, but that also ends up catching a few files that we track, and that people do edit. Notably the "vmlinux.lds.S" file, that each architecture has. You can always use "git add -f" to override the ignore file, but we might as well just make it explicit for this file. Bitten-by-and-tested-by: Ingo Molnar Signed-off-by: Linus Torvalds commit ede13d81b4dda409a6d271b34b8e2ec9383e255d Merge: 2008220... 486acd4... Author: Linus Torvalds Date: Fri Jul 20 13:45:53 2007 -0700 Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 * 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6: (37 commits) [CELL] spufs: rework list management and associated locking [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks [CELL] spu_base: locking cleanup [CELL] cell: indexing of SPUs based on firmware vicinity properties [CELL] spufs: integration of SPE affinity with the scheduller [CELL] cell: add placement computation for scheduling of affinity contexts [CELL] spufs: extension of spu_create to support affinity definition [CELL] cell: add hardcoded spu vicinity information for QS20 [CELL] cell: add vicinity information on spus [CELL] cell: add per BE structure with info about its SPUs [CELL] spufs: use find_first_bit() instead of sched_find_first_bit() [CELL] spufs: remove unused file argument from spufs_run_spu() [CELL] spufs: change decrementer restore timing [CELL] spufs: dont halt decrementer at restore step 47 [CELL] spufs: limit saving MFC_CNTL bits [CELL] spufs: fix read and write for decr_status file [CELL] spufs: fix decr_status meanings [CELL] spufs: remove needless context save/restore code [CELL] spufs: fix array size of channel index ... commit 1b2232ab879993fcf5b9391c3febf6ab5d78201e Author: Hans Verkuil Date: Fri Jul 20 06:25:22 2007 -0300 V4L/DVB (5880): wm8775/wm8739: Fix memory leak when unloading module State struct was never freed. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2fc9e2f78acd06d0a76a05abb2802cc4616453e3 Author: Trent Piepho Date: Fri Jul 20 04:11:36 2007 -0300 V4L/DVB (5877): radio-gemtek-pci: remove unused structure member The drivers reads the PCI subsystem ID into its state structure, but it's never used anywhere. Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab commit 32b78de7fee70a0bdb2081b23fc2b676ec566814 Author: Cyrill Gorcunov Date: Thu Jul 19 11:44:11 2007 -0300 V4L/DVB (5871): Conexant 2388x: check for kthread_run The patch adds checking of kthread_run return code and issues a message if it fails. Signed-off-by: Cyrill Gorcunov Signed-off-by: Mauro Carvalho Chehab commit a46c5fbc6912c4e34cb7ded314249b639dc244a6 Author: Hans Verkuil Date: Thu Jul 19 04:53:36 2007 -0300 V4L/DVB (5869): Add check for valid control ID to v4l2_ctrl_next. If v4l2_ctrl_next is called without the V4L2_CTRL_FLAG_NEXT_CTRL then it should check whether the passed control ID is valid and return 0 if it isn't. Otherwise a for-loop over the control IDs will never end. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3d58ffe2aa107df6db57f875dba5368960b17cde Author: Hans Verkuil Date: Wed Jul 18 18:41:08 2007 -0300 V4L/DVB (5867): videodev2.h: add missing for userspace When videodev2.h is included by an application, it needs to include for the timeval struct. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dd1e729d63f74a0b6290ca417bafd3fd8665db50 Author: Hans Verkuil Date: Wed Jul 18 13:22:06 2007 -0300 V4L/DVB (5866): ivtv: fix DMA timeout when capturing VBI + another stream The VBI DMA is handled in a special way and is marked with a bit. However, that bit was set at the wrong time and could be cleared by mistake if a PCM (or other) DMA request would arrive before the VBI DMA was completed. So on completion of the VBI DMA the driver no longer knew that that DMA transfer was for VBI data. And this in turn caused havoc with the card's DMA engine. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 201700d3544c653d453716a60976efe1987110af Author: Mauro Carvalho Chehab Date: Thu Jul 19 11:21:04 2007 -0300 V4L/DVB (5865): Remove usage of HZ on ivtv driver, replacing by msecs_to_jiffies Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fe06fe0a4d0f781f8ae0570e4d7e517a81878c1d Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:36:20 2007 -0300 V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134 Signed-off-by: Mauro Carvalho Chehab commit 818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:29:07 2007 -0300 V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers Signed-off-by: Mauro Carvalho Chehab commit f7518bd2d9ecad8c404c300e7872f7c2ab4961ad Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:27:30 2007 -0300 V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout Signed-off-by: Mauro Carvalho Chehab commit 09df5cbe46511611410274f09571ada229231ddb Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:25:38 2007 -0300 V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers Signed-off-by: Mauro Carvalho Chehab commit a2d66a37c743ba201e85c93c4ec29d58ca94b728 Author: Mauro Carvalho Chehab Date: Tue Jul 17 16:15:58 2007 -0300 V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers Signed-off-by: Mauro Carvalho Chehab commit 7809b4cba2bc0165c804ab4eaf10308aad14fc8e Author: Hans Verkuil Date: Tue Jul 17 13:50:46 2007 -0300 V4L/DVB (5855): ivtv: fix Kconfig typo and refer to the driver homepage. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ae38d93bd710d8014925f1cb9b689dc89c13d778 Author: Hans Verkuil Date: Tue Jul 17 13:42:43 2007 -0300 V4L/DVB (5854): ivtv: cleanup of driver messages Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 11d28766deedc8bcadc87db8a65775a41c15789a Author: Hans Verkuil Date: Tue Jul 17 12:47:38 2007 -0300 V4L/DVB (5853): ivtv: add support to suppress high volume i2c debug messages. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4b9bc014bf4c65e1da86fbc9721f04e2763feca9 Author: Alexey Dobriyan Date: Tue Jul 17 09:03:14 2007 -0300 V4L/DVB (5852): ivtv: don't recompile needlessly Driver prints banner including kernel version. Was a leftover from when the driver was standalone. Signed-off-by: Alexey Dobriyan Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c9b9a5817afc8f969b1ae834f88af6929f70de41 Author: Hans Verkuil Date: Tue Jul 17 06:45:42 2007 -0300 V4L/DVB (5851): ivtv: fix missing I2C_ALGOBIT config option I2C_ALGOBIT must also be selected when ivtv is selected. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 67632e17da1e90a0c43283823f94080c0ee07088 Author: Hans Verkuil Date: Tue Jul 17 06:38:43 2007 -0300 V4L/DVB (5850): ivtv: improve API command debugging Turn off debugging of API commands that occur during encoding or decoding, unless they are explicitly requested. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f40a9f5325cdceddb1610cb3dfd8cb532f5a618 Author: Yoann Padioleau Date: Mon Jul 16 16:54:49 2007 -0300 V4L/DVB (5848): Av7110: fix typo Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 2008220879af095d00ca27eb168a55c8595fbc0b Author: Linus Torvalds Date: Fri Jul 20 13:28:54 2007 -0700 Revert "sys_time() speedup" This basically reverts commit 4e44f3497d41db4c3b9051c61410dee8ae4fb49c, while waiting for it to be re-done more completely. There are cases of people mixing "time()" with higher-resolution time sources, and we need to take the nanosecond offsets into account. Ingo has a patch that does that, but it's still under some discussion. In the meantime, just revert back to the old simple situation of just doing the whole exact timesource calculations. But rather than using do_gettimeofday(), use the internal nanosecond resolution getnstimeofday(), which at least avoids one unnecessary conversion (since we really don't care about whether the fractional seconds are nanoseconds or microseconds - we'll just throw them away). Signed-off-by: Linus Torvalds commit 486acd4850dde6d2f8c7f431432f3914c4bfb5f5 Author: Christoph Hellwig Date: Fri Jul 20 21:39:54 2007 +0200 [CELL] spufs: rework list management and associated locking This sorts out the various lists and related locks in the spu code. In detail: - the per-node free_spus and active_list are gone. Instead struct spu gained an alloc_state member telling whether the spu is free or not - the per-node spus array is now locked by a per-node mutex, which takes over from the global spu_lock and the per-node active_mutex - the spu_alloc* and spu_free function are gone as the state change is now done inline in the spufs code. This allows some more sharing of code for the affinity vs normal case and more efficient locking - some little refactoring in the affinity code for this locking scheme Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann commit 1474855d0878cced6f39f51f3c2bd7428b44cb1e Author: Bob Nelson Date: Fri Jul 20 21:39:53 2007 +0200 [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs From: Maynard Johnson This patch updates the existing arch/powerpc/oprofile/op_model_cell.c to add in the SPU profiling capabilities. In addition, a 'cell' subdirectory was added to arch/powerpc/oprofile to hold Cell-specific SPU profiling code. Exports spu_set_profile_private_kref and spu_get_profile_private_kref which are used by OProfile to store private profile information in spufs data structures. Also incorporated several fixes from other patches (rrn). Check pointer returned from kzalloc. Eliminated unnecessary cast. Better error handling and cleanup in the related area. 64-bit unsigned long parameter was being demoted to 32-bit unsigned int and eventually promoted back to unsigned long. Signed-off-by: Carl Love Signed-off-by: Maynard Johnson Signed-off-by: Bob Nelson Signed-off-by: Arnd Bergmann Acked-by: Paul Mackerras commit 36aaccc1e96481e8310b1d13600096da0f24ff43 Author: Bob Nelson Date: Fri Jul 20 21:39:52 2007 +0200 [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks From: Maynard Johnson This patch adds to the capability of spu_switch_event_register so that the caller is also notified of currently active SPU tasks. Exports spu_switch_event_register and spu_switch_event_unregister so that OProfile can get access to the notifications provided. Signed-off-by: Maynard Johnson Signed-off-by: Carl Love Signed-off-by: Bob Nelson Signed-off-by: Arnd Bergmann Acked-by: Paul Mackerras commit 2414059420311e5384de646eebfd529c184afd3c Author: Christoph Hellwig Date: Fri Jul 20 21:39:51 2007 +0200 [CELL] spu_base: locking cleanup Sort out the locking mess in spu_base and document the current rules. As an added benefit spu_alloc* and spu_free don't block anymore. Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann commit 9e7cbcbb6ede4299d52c839e352aae527c06124a Author: Arnd Bergmann Date: Fri Jul 20 21:39:50 2007 +0200 [CELL] cell: indexing of SPUs based on firmware vicinity properties This patch links spus according to their physical position using information provided by the firmware through a special vicinity device-tree property. This property is present in current version of Malta firmware. Example of vicinity properties for a node in Malta: Node: Vicinity property contains phandles of: spe@0 [ spe@100000 , mic-tm@50a000 ] spe@100000 [ spe@0 , spe@200000 ] spe@200000 [ spe@100000 , spe@300000 ] spe@300000 [ spe@200000 , bif0@512000 ] spe@80000 [ spe@180000 , mic-tm@50a000 ] spe@180000 [ spe@80000 , spe@280000 ] spe@280000 [ spe@180000 , spe@380000 ] spe@380000 [ spe@280000 , bif0@512000 ] Only spe@* have a vicinity property (e.g., bif0@512000 and mic-tm@50a000 do not have it). Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit cbc23d3e7cb3c9fd3c9fce0bc3f44f687a9517c0 Author: Arnd Bergmann Date: Fri Jul 20 21:39:49 2007 +0200 [CELL] spufs: integration of SPE affinity with the scheduller This patch makes the scheduller honor affinity information for each context being scheduled. If the context has no affinity information, behaviour is unchanged. If there are affinity information, context is schedulled to be run on the exact spu recommended by the affinity placement algorithm. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit c5fc8d2a92461fcabd00dfd678204cba36b93119 Author: Arnd Bergmann Date: Fri Jul 20 21:39:48 2007 +0200 [CELL] cell: add placement computation for scheduling of affinity contexts This patch provides the spu affinity placement logic for the spufs scheduler. Each time a gang is going to be scheduled, the placement of a reference context is defined. The placement of all other contexts with affinity from the gang is defined based on this reference context location and on a precomputed displacement offset. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 8e68e2f248332a9c3fd4f08258f488c209bd3e0c Author: Arnd Bergmann Date: Fri Jul 20 21:39:47 2007 +0200 [CELL] spufs: extension of spu_create to support affinity definition This patch adds support for additional flags at spu_create, which relate to the establishment of affinity between contexts and contexts to memory. A fourth, optional, parameter is supported. This parameter represent a affinity neighbor of the context being created, and is used when defining SPU-SPU affinity. Affinity is represented as a doubly linked list of spu_contexts. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 3ad216cae837d90415c605e1149e6fd88f51c973 Author: Arnd Bergmann Date: Fri Jul 20 21:39:46 2007 +0200 [CELL] cell: add hardcoded spu vicinity information for QS20 This patch allows the use of spu affinity on QS20, whose original FW does not provide affinity information. This is done through two hardcoded arrays, and by reading the reg property from each spu. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 9d92af621f193c1c889ac8b6fd8c987ccd8aae1f Author: Arnd Bergmann Date: Fri Jul 20 21:39:45 2007 +0200 [CELL] cell: add vicinity information on spus This patch adds affinity data to each spu instance. A doubly linked list is created, meant to connect the spus in the physical order they are placed in the BE. SPUs near to memory should be marked as having memory affinity. Adjustments of the fields acording to FW properties is done in separate patches, one for CPBW, one for Malta (patch for Malta under testing). Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit aa6d5b20254a21b69092dd839b70ee148303ef25 Author: Arnd Bergmann Date: Fri Jul 20 21:39:44 2007 +0200 [CELL] cell: add per BE structure with info about its SPUs Addition of a spufs-global "cbe_info" array. Each entry contains information about one Cell/B.E. node, namelly: * list of spus (both free and busy spus are in this list); * list of free spus (replacing the static spu_list from spu_base.c) * number of spus; * number of reserved (non scheduleable) spus. SPE affinity implementation actually requires only access to one spu per BE node (since it implements its own pointer to walk through the other spus of the ring) and the number of scheduleable spus (n_spus - non_sched_spus) However having this more general structure can be useful for other functionalities, concentrating per-cbe statistics / data. Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit 7e90b74967ea54dbd6eb539e1cb151ec37f63d7f Author: Masato Noguchi Date: Fri Jul 20 21:39:43 2007 +0200 [CELL] spufs: use find_first_bit() instead of sched_find_first_bit() spu_sched->bitmap has MAX_PRIO(=140) width in bits.However, since ff80a77f20f811c0cc5b251d0f657cbc6f788385, sched_find_first_bit() only supports 100-bit bitmaps. Thus, spu_sched->bitmap should be treated by generic find_first_bit(). Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 50af32a94beef566664022254d677504e51b6139 Author: Jeremy Kerr Date: Fri Jul 20 21:39:42 2007 +0200 [CELL] spufs: remove unused file argument from spufs_run_spu() From: Sebastian Siewior The 'file' argument is unused in spufs_run_spu(). This change removes it. Signed-off-by: Sebastian Siewior Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit ca53da3abb1d49748931ff2acb66d5a6eeeba2a1 Author: Masato Noguchi Date: Fri Jul 20 21:39:41 2007 +0200 [CELL] spufs: change decrementer restore timing The SPU decrementer should be restored after the LSCSA DMA has completed. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit cf17df223c8cd56a92f34162f2a362eec9f4b157 Author: Masato Noguchi Date: Fri Jul 20 21:39:40 2007 +0200 [CELL] spufs: dont halt decrementer at restore step 47 No need to halt the SPE decrementer at context restore step 47, it will be done in step 7. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit a103f347a5ae2735b9bf0a725a36c34be3f24c88 Author: Masato Noguchi Date: Fri Jul 20 21:39:39 2007 +0200 [CELL] spufs: limit saving MFC_CNTL bits At save step 8, the mfc control register in the CSA should be written _only_ with Sc and Sm bits (at least MFC_CNTL[Dh] should be set to 0) Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d40a01d4f4f205d0645beb371edc153d9ec8fb9f Author: Masato Noguchi Date: Fri Jul 20 21:39:38 2007 +0200 [CELL] spufs: fix read and write for decr_status file The decr_status in the LSCSA is valid only in the sequence of context restore. Thus, it's nonsense to read and/or write it through spufs. This patch changes decr_status node to access MFC_CNTL[Ds] in the CSA. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 1cfc0f86eb0348dd04ace8c2171642ebe9cd87bb Author: Masato Noguchi Date: Fri Jul 20 21:39:37 2007 +0200 [CELL] spufs: fix decr_status meanings The decr_status in the LSCSA is confusedly used as two meanings: * SPU decrementer was running * SPU decrementer was wrapped as a result of adjust and the code to set decr_status is missing. This patch fixes these problems by using the decr_status argument as a set of flags. This requires a rebuild of the shipped spu_restore code. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit cfd529b25d9b1d48423b85d76066348e2459e646 Author: Masato Noguchi Date: Fri Jul 20 21:39:36 2007 +0200 [CELL] spufs: remove needless context save/restore code The following steps are not needed in the SPE context save/restore paths: Save Step 12: save_mfc_decr() save suspend_time to CSA (It will be done by step 14) save ch 7 (decrementer value will be saved in LSCSA by spe-side step 10) Restore Step 59: restore_ch_part1() restore ch 1 (it will be done by spe-side step 15) This change removes the unnecessary steps. Signed-off-by: Masato Noguchi Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit daced0f718b92b0bcdb9790622c255d4660f51ce Author: Jeremy Kerr Date: Fri Jul 20 21:39:35 2007 +0200 [CELL] spufs: fix array size of channel index Based on a fix from Masato Noguchi . Remove the (incorrect) array size declarations in the spufs channel arrays, and use ARRAY_SIZE rather than hardcoded values. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 27b1ea091f0c088ecad0d492f37fbe7b8d54d7dc Author: Christoph Hellwig Date: Fri Jul 20 21:39:34 2007 +0200 [CELL] spufs: make sure context are scheduled again after spu_acquire_saved Currently a process is removed from the physical spu when spu_acquire_saved is saved but never put back. This patch adds a new spu_release_saved that is to be paired with spu_acquire_saved and put the process back if it has been in RUNNABLE state before. Niether Jeremy not be are entirely happy about this exact patch because it adds another spu_activate call outside of the owner thread, but I feel this is the best short-term fix we can come up with. Signed-off-by: Christoph Hellwig Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 27ec41d3a1d4df2b7cd190e93aad22ab86a72aa1 Author: Andre Detsch Date: Fri Jul 20 21:39:33 2007 +0200 [CELL] spufs: add spu stats in sysfs and ctx stat file in spufs This patch exports per-context statistics in spufs as long as spu statistics in sysfs. It was formed by merging: "spufs: add spu stats in sysfs" From: Christoph Hellwig "spufs: add stat file to spufs" From: Christoph Hellwig "spufs: fix libassist accounting" From: Jeremy Kerr "spusched: fix spu utilization statistics" From: Luke Browning And some adjustments by myself, after suggestions on cbe-oss-dev. Having separate patches was making the review process harder than it should, as we end up integrating spus and ctx statistics accounting much more than it was on the first implementation. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit e840cfe6814d6f13ecb86cff7097ad7259df502e Author: Jeremy Kerr Date: Fri Jul 20 21:39:32 2007 +0200 [CELL] spufs: Remove spurious WARN_ON for spu_deactivate for NOSCHED contexts In 6cbf93960e64f313f6e247cbca7afaa50e3ee2c we added a WARN_ON for calling spu_deactivate on contexts created with the SPU_CREATE_NOSCHED flag. However, all NOSCHED contexts will need to be deactivated when the context is destroyed, so this gives a spurious warning when any NOSCHED context is closed. This change removes the WARN_ON. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d054b36ffd302ec65aabec16a0c60ddd9e6b5a62 Author: Jeremy Kerr Date: Fri Jul 20 21:39:31 2007 +0200 [CELL] spufs: Make signal-notification files readonly for NOSCHED contexts Reading from the signal{1,2} files requires a spu_acquire_saved, so make these files write-only for contexts created with SPU_CREATE_NOSCHED. Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit 49776d30aea903fb2f9966c8e9b6f23ae5f7c937 Author: Kazunori Asayama Date: Fri Jul 20 21:39:30 2007 +0200 [CELL] spufs: Avoid unexpectedly restaring MFC during context save The current SPU context saving procedure in SPUFS unexpectedly restarts MFC when halting decrementer, because MFC_CNTL[Dh] is set without MFC_CNTL[Sm]. This bug causes, for example, saving broken DMA queues. Here is a patch to fix the problem. Signed-off-by: Kazunori Asayama Signed-off-by: Jeremy Kerr Signed-off-by: Arnd Bergmann commit d1450317554d52e0e4a454806c4d05bb2a834f00 Author: Sebastian Siewior Date: Fri Jul 20 21:39:29 2007 +0200 [CELL] spufs: remove section mismatch warning WARNING: arch/powerpc/platforms/cell/spufs/spufs.o(.init.text+0x158): Section mismatch: reference to .exit.text:.spu_sched_exit (between '.init_module' and '.spu_sched_init') was introduced by c99c1994a2bb9493b4ac372b2b6ee2606d291171 This patch removes the warning. Cc: Christoph Hellwig Signed-off-by: Sebastian Siewior Signed-off-by: Arnd Bergmann commit ce21b3c9648ae55181787bf25ee00cf91dfd5c91 Author: Michael Ellerman Date: Fri Jul 20 21:39:28 2007 +0200 [CELL] add support for MSI on Axon-based Cell systems This patch adds support for the setup and decoding of MSIs on Axon-based Cell systems, using the MSIC mechanism. This involves setting up an area of BE memory which the Axon then uses as a FIFO for MSI messages. When one or more MSIs are decoded by the MSIC we receive an interrupt on the MPIC, and the MSI messages are written into the FIFO. At the moment we use a 64KB FIFO, one per MSIC/BE. Signed-off-by: Michael Ellerman Signed-off-by: Arnd Bergmann commit 8d2655e621bfc3c3f925016f881a36739d479f69 Author: Andre Detsch Date: Fri Jul 20 21:39:27 2007 +0200 [CELL] saving spus information for kexec crash This patch adds support for investigating spus information after a kernel crash event, through kdump vmcore file. Implementation is based on xmon code, but the new functionality was kept independent from xmon. Signed-off-by: Lucio Jose Herculano Correia Signed-off-by: Andre Detsch Signed-off-by: Arnd Bergmann commit dbdf04c40161f81d74e27f04e201acb3a5dfad69 Author: Maxim Shchetynin Date: Fri Jul 20 21:39:26 2007 +0200 [CELL] driver for DDR2 memory on AXON The Axon bridge chip used on new Cell/B.E. based blade servers comes with a DDR2 memory controller that can be used to attach cheap memory modules, as opposed to the high-speed XDR memory that is used by the CPU itself. Since the memory controller does not participate in the cache coherency protocol, we can not use the memory direcly for Linux applications, but by providing a block device it can be used for swap space, temporary file storage and through the use of the direct_access block device operation for mapping into user addresses, when it is mounted with an appropriate file system. Signed-off-by: Maxim Shchetynin Signed-off-by: Arnd Bergmann commit b86ce01c7700cfc74665799355a46dcadf920ebd Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:25 2007 +0200 [CELL] allow linux to map Cell regs on legacy SLOF tree. The platforms missing the "cpus" property in the "be" node are mono-Cell platforms such as CAB or Getaway. Therefore it is possible to assume that if there is no "cpus" properties under the "be" node then we can safely return the "device node" without more checking. This is a bit hacky but ... it allows it to work on these platforms. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 827e3648dc2c31e01db7cd2e4498061cf78a97a9 Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:24 2007 +0200 [CELL] fix cbe_thermal for legacy SLOF tree. Previous patch changed based on Christian Krafft's comment. On some legacy SLOF tree the generic code is unable to ioremap some Cell BE registers. Therefore the "generic" functions are returning a NULL pointer, triggering a crash on such platforms. Let's handle this more gracefully. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Kraff Signed-off-by: Arnd Bergmann commit 64bafa9db7e92d5a46402613188b71800924ca1f Author: Jean-Christophe DUBOIS Date: Fri Jul 20 21:39:23 2007 +0200 [CELL] fix cbe_cpufreq for legacy SLOF tree. Previous patch changed based on Christian Krafft's comment. On some legacy SLOF tree the generic code is unable to ioremap some Cell BE registers. Therefore the "generic" functions are returning a NULL pointer, triggering a crash on such platforms. Let's handle this more gracefully. Signed-off-by: Jean-Christophe DUBOIS Acked-by: Christian Kraff Signed-off-by: Arnd Bergmann commit 74889e41d9a1f80928130a02af9b010673bc5ba7 Author: Christian Krafft Date: Fri Jul 20 21:39:22 2007 +0200 [CELL] cbe_cpufreq: reorganize code This patch reorganizes the code of the driver into three files. Two cbe_cpufreq_pmi.c and cbe_cpufreq_pervasive.c care about hardware. cbe_cpufreq.c contains the logic. There is no changed behaviour, except that the PMI related function is now located in a seperate module cbe_cpufreq_pmi. This module will be required by cbe_cpufreq, if CONFIG_CBE_CPUFREQ_PMI has been set. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 1e21fd5af3797a2c322e1723c69732e77aa74f48 Author: Christian Krafft Date: Fri Jul 20 21:39:21 2007 +0200 [CELL] cbe_cpufreq: fix minor issues Minor issues have been fixed: * added a missing call to of_node_put() * signedness of a function parameter * added some line breaks * changed global pmi_frequency_limit to a per node pmi_slow_mode_limit array Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit e5ecc8719212e2566440818491ec5741689f3743 Author: Christian Krafft Date: Fri Jul 20 21:39:20 2007 +0200 [CELL] cbe_cpufreq: fix initialization This patch fixes the initialization of the cbe_cpufreq driver. The code that initializes the PMI related functions was called per cpu: * registering cpufreq notifier block * registering a pmi handler This ends in a bug that the notifier block gets called in an endless loop. The initialization code is being put to the module init code path by this patch. This way it only gets called once. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit a964b9be3e475f30aee334654b4ff200bcdc0092 Author: Christian Krafft Date: Fri Jul 20 21:39:19 2007 +0200 [CELL] cbe_cpufreq: fix latency measurement This patch fixes the debug code that calculates the transition time when changing the slow modes on a Cell BE cpu. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 813f90728e7d74e9b753e6ef6c6915cd2a047adb Author: Christian Krafft Date: Fri Jul 20 21:39:18 2007 +0200 [CELL] pmi: remove support for mutiple devices. The pmi driver got simplified by removing support for multiple devices. As there is no more than one pmi device per maschine, there is no need to specify the device for listening and sending messages. This way the caller (cbe_cpufreq) doesn't need to scan the device tree. When registering the handler on a board without a pmi interface, pmi.c will just return -ENODEV. The patch that fixed the breakage of cell_defconfig has been broken out of the earlier version of this patch. So this is the version that applies cleanly on top of it. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann commit 1d4ec7b1d6f130818f9b62dea3411d9ee2ff6ff6 Author: Roland Dreier Date: Fri Jul 20 12:13:20 2007 -0700 Fix ZERO_OR_NULL_PTR(ZERO_SIZE_PTR) The comparison with ZERO_SIZE_PTR in ZERO_OR_NULL_PTR() needs to be <= (not just <) so that ZERO_OR_NULL_PTR(ZERO_SIZE_PTR) is 1. Signed-off-by: Roland Dreier [ Duh! - Linus ] Signed-off-by: Linus Torvalds commit efa7e8673c78cc6de2d6c367eb6f50449c57ed90 Merge: 02d6112... bd807f9... Author: Linus Torvalds Date: Fri Jul 20 12:02:20 2007 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Prevent people from directly including . [IA64] remove time interpolator [IA64] Convert to generic timekeeping/clocksource [IA64] refresh some config files for 64K pagesize [IA64] Delete iosapic_free_rte() [IA64] fallocate system call [IA64] Enable percpu vector domain for IA64_DIG [IA64] Enable percpu vector domain for IA64_GENERIC [IA64] Support irq migration across domain [IA64] Add support for vector domain [IA64] Add mapping table between irq and vector [IA64] Check if irq is sharable [IA64] Fix invalid irq vector assumption for iosapic [IA64] Use dynamic irq for iosapic interrupts [IA64] Use per iosapic lock for indirect iosapic register access [IA64] Cleanup lock order in iosapic_register_intr [IA64] Remove duplicated members in iosapic_rte_info [IA64] Remove block structure for locking in iosapic.c commit 02d6112cd7d75bf30685ee4b2e9dc0291b4d3133 Merge: 0b1937a... 9410910... Author: Linus Torvalds Date: Fri Jul 20 12:01:59 2007 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] User stack pointer randomisation [MIPS] Remove unused include/asm-mips/gfx.h [MIPS] Remove unused include/asm-mips/ds1216.h [MIPS] Workaround for RM7000 WAIT instruction aka erratum 38 [MIPS] Make support for weakly ordered LL/SC a config option. [MIPS] Disable UserLocal runtime detection on platforms which never have it. [MIPS] Disable MT runtime detection on platforms which never support MT. commit 0b1937ac0ef1541c0ea44e6f81c33d2f59803957 Author: David Howells Date: Fri Jul 20 17:02:04 2007 +0100 FRV: Fix linkage problems Make it possible to use __start_notes and __stop_notes without getting a GPREL overflow error from the FRV linker. Small variables that would otherwise be in .data or .bss may, depending on the arch, be placed in special sections (.sdata or .sbss) that permit single instruction references on fixed instruction width machines. __start_notes and __stop_notes aren't really char variables, and certainly don't refer to data in .data or .bss. Making them type "void" fools the compiler into not assuming anything about them. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 03ce11048b3832f5f0c471ccdb3363a870a14ac1 Author: Reiner Sailer Date: Fri Jul 20 10:03:02 2007 -0400 Fix memory leak in tpm_binary_bios_measurements_open() The same problem that was fixed for tpm_ascii_bios_measurements_open() in commit 178554ae75739e91dc4d7c3e42a3db95448cc5bf also occurs in tpm_binary_bios measurements(). Thanks for noticing this Satyam! I tested the attached patch to fix tpm_binary_bios_measurments as well. Signed-off-by: Reiner Sailer Signed-off-by: Linus Torvalds commit bd807f9c5b90c236c3d173a5815d620bc1b1316d Author: Robert P. J. Day Date: Wed Jul 18 07:33:08 2007 -0400 [IA64] Prevent people from directly including . Signed-off-by: Robert P. J. Day Signed-off-by: Tony Luck commit c36c282b88963d0957368a443168588e62301fda Merge: f4fbfb0... 1f564ad... Author: Tony Luck Date: Fri Jul 20 11:26:47 2007 -0700 Pull ia64-clocksource into release branch commit 1f564ad6d4182859612cbae452122e5eb2d62a76 Author: Bob Picco Date: Wed Jul 18 15:51:28 2007 -0700 [IA64] remove time interpolator Remove time_interpolator code (This is generic code, but only user was ia64. It has been superseded by the CONFIG_GENERIC_TIME code). Signed-off-by: Bob Picco Signed-off-by: John Stultz Signed-off-by: Peter Keilty Signed-off-by: Tony Luck commit 0aa366f351d044703e25c8425e508170e80d83b1 Author: Tony Luck Date: Fri Jul 20 11:22:30 2007 -0700 [IA64] Convert to generic timekeeping/clocksource This is a merge of Peter Keilty's initial patch (which was revived by Bob Picco) for this with Hidetoshi Seto's fixes and scaling improvements. Acked-by: Bob Picco Signed-off-by: Tony Luck commit 941091024ef0f2f7e09eb81201d293ac18833cc8 Author: Franck Bui-Huu Date: Thu Jul 19 14:04:21 2007 +0200 [MIPS] User stack pointer randomisation Signed-off-by: Franck Bui-Huu Signed-off-by: Ralf Baechle commit c55757b261038d17c729068fcdaef646a665385f Author: Yoichi Yuasa Date: Tue Jul 17 23:07:44 2007 +0900 [MIPS] Remove unused include/asm-mips/gfx.h Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit ca002ba8be889f882d5e31cb5f2a9a0bf2b2d7b1 Author: Yoichi Yuasa Date: Tue Jul 17 23:06:24 2007 +0900 [MIPS] Remove unused include/asm-mips/ds1216.h Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 5a81299928f3d9abfaced60bedd85214cf9921a4 Author: Ralf Baechle Date: Tue Jul 17 18:49:48 2007 +0100 [MIPS] Workaround for RM7000 WAIT instruction aka erratum 38 Signed-off-by: Ralf Baechle commit 17099b1142f6c0359fca60a3464dea8fb30badea Author: Ralf Baechle Date: Sat Jul 14 13:24:05 2007 +0100 [MIPS] Make support for weakly ordered LL/SC a config option. None of weakly ordered processor supported in tree need this but it seems like this could change ... Signed-off-by: Ralf Baechle commit ed203dadcd1373e80e95b04075e1eefc554a914b Author: Ralf Baechle Date: Fri Jul 13 18:58:25 2007 +0100 [MIPS] Disable UserLocal runtime detection on platforms which never have it. Signed-off-by: Ralf Baechle commit 798d9023e440085f00b352f1c1af8894959ff63e Author: Ralf Baechle Date: Fri Jul 13 18:54:10 2007 +0100 [MIPS] Disable MT runtime detection on platforms which never support MT. Signed-off-by: Ralf Baechle commit c1158e63dfeb3928e94c768f0a403b3e0e799f70 Author: Avi Kivity Date: Fri Jul 20 08:18:27 2007 +0300 KVM: MMU: Fix oopses with SLUB The kvm mmu uses page->private on shadow page tables; so does slub, and an oops result. Fix by allocating regular pages for shadows instead of using slub. Tested-by: S.Çağlar Onur Signed-off-by: Avi Kivity commit 35f3f28613bc7263949db23a4c7078e425810c8c Author: Avi Kivity Date: Tue Jul 17 14:20:30 2007 +0300 KVM: x86 emulator: implement rdmsr and wrmsr Allow real-mode emulation of rdmsr and wrmsr. This allows smp Windows to boot, presumably for its sipi trampoline. Signed-off-by: Avi Kivity commit 90cb0529dd230548a7f0d6b315997be854caea1b Author: Avi Kivity Date: Tue Jul 17 13:04:56 2007 +0300 KVM: Fix memory slot management functions for guest smp The memory slot management functions were oriented against vcpu 0, where they should be kvm-wide. This causes hangs starting X on guest smp. Fix by making the functions (and resultant tail in the mmu) non-vcpu-specific. Unfortunately this reduces the efficiency of the mmu object cache a bit. We may have to revisit this later. Signed-off-by: Avi Kivity commit d55e2cb20123cdb5020ec4a2b2f1eace5038c292 Author: Avi Kivity Date: Tue Jul 10 17:50:55 2007 +0300 KVM: MMU: Store nx bit for large page shadows We need to distinguish between large page shadows which have the nx bit set and those which don't. The problem shows up when booting a newer smp Linux kernel, where the trampoline page (which is in real mode, which uses the same shadow pages as large pages) is using the same mapping as a kernel data page, which is mapped using nx, causing kvm to spin on that page. Signed-off-by: Avi Kivity commit 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 Author: Pierre Ossman Date: Fri Jul 20 18:20:36 2007 +0200 sdhci: make sure to clear the error interrupt The controller has a bit indicating that one of the higher bits (the error bits) are set. A previous bug caused this bit to be masked, but since that bug has been fixed we have to clear it explicictly. Signed-off-by: Pierre Ossman commit 63b66438860f246f25f5563cde4978cf255cb810 Author: Marc Pignat Date: Mon Jul 16 11:07:02 2007 +0200 mmc: at91_mci: wakeup on card insertion (or removal) This piece of code enable the system to be wake-up by a card insertion or removal. Signed-off-by: Marc Pignat Signed-off-by: Nicolas Ferre Signed-off-by: Pierre Ossman commit 81764fa9a472dd72b93385f30f718ed4f98ec129 Author: Pierre Ossman Date: Sun Jul 15 18:47:38 2007 +0200 mmc: add maintainer for at91 Nicolas Ferre has taken it upon himself to look after the AT91 MMC host driver. Signed-off-by: Pierre Ossman commit 2cb7e714229681408e323852bed939989faf6991 Merge: d638d49... 3f23de1... Author: Linus Torvalds Date: Fri Jul 20 09:18:08 2007 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons: Create drivers/of/platform.c Create linux/of_platorm.h [SPARC/64] Rename some functions like PowerPC Begin consolidation of of_device.h Begin to consolidate of_device.c Consolidate of_find_node_by routines Consolidate of_get_next_child Consolidate of_get_parent Consolidate of_find_property Consolidate of_device_is_compatible Start split out of common open firmware code Split out common parts of prom.h commit d638d4990bfb99998420e78e8fd4607bca5cf8d0 Merge: 8c6b065... 5a6eb67... Author: Linus Torvalds Date: Fri Jul 20 09:16:07 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: appletouch - improve powersaving for Geyser3 devices Input: lifebook - fix an oops on Panasonic CF-18 Input: document intended meaning of KEY_SWITCHVIDEOMODE Input: switch to using seq_list_xxx helpers Input: i8042 - give more trust to PNP data on i386 Input: add driver for Fujitsu serial touchscreens Input: ads7846 - re-check pendown status before reporting events Input: ads7846 - introduce sample settling delay Input: xpad - add support for leds on xbox 360 pad commit 8c6b065b792061c2e471d530127f2348fd9d243d Author: Alan Cox Date: Fri Jul 20 15:36:31 2007 +0100 pata_cs5520: Fix probe bug regression introduced in 2.6.22 Signed-off-by: Alan Cox Signed-off-by: Linux Torvalds commit 6a860c979b35469e4d77da781a96bdb2ca05ae64 Author: Jens Axboe Date: Fri Jul 20 15:18:12 2007 +0200 splice: fix bad unlock_page() in error case If add_to_page_cache_lru() fails, the page will not be locked. But splice jumps to an error path that does a page release and unlock, causing a BUG() in unlock_page(). Fix this by adding one more label that just releases the page. This bug was actually triggered on EL5 by gurudas pai using fio. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 9d1ca6f13cfedfd127f3be7e447bd6d922806a65 Author: Rusty Russell Date: Fri Jul 20 22:15:01 2007 +1000 lguest: override sched_clock Guests currently use the default scheduler clock: this means they always use jiffies even if TSC is actually available. It doesn't make any noticeable difference here, but it's a better thing to do. Also remove commented-out asm/sched-clock.h from -mm tree. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit 876be9d89e9c8a007577e6372e331042edf4020b Author: Rusty Russell Date: Fri Jul 20 22:12:56 2007 +1000 lguest: trivial: We now have asm/processor-flags.h, so use it. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit e5faff45b381e053c31214713ed783d97f49177b Author: Rusty Russell Date: Fri Jul 20 22:11:13 2007 +1000 lguest: fix sense if IF flag on interrupt injection The sense of the IF bit is backwards in the host interrupt handling. This means we always save "IF=1" on the stack when injecting an interrupt. It turns out this is almost always correct (unless the guest is taking a page fault in an interrupt due to an unpopulated vmalloc mapping), so went unnoticed. Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit bd6dc742a4b1945861795a66dc27c65365c5f28e Author: David Howells Date: Fri Jul 20 10:59:41 2007 +0100 AFS: Use patched rxrpc_kernel_send_data() correctly Fix afs_send_simple_reply() to accept a greater-than-zero return value from rxrpc_kernel_send_data() as being a successful return rather than thinking it an error and aborting the call. rxrpc_kernel_send_data() previously returned zero incorrectly when it worked successfully, but has been patched to return the number of bytes it transmitted. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5f7e08ca7b657f5678dd62a080f7f3a8f923ad02 Merge: 7f46e6c... 56386f6... Author: Linus Torvalds Date: Fri Jul 20 08:52:53 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits) sh: intc - add support for SH7750 and its variants sh: Move entry point code to .text.head. sh: heartbeat: Shut up resource size warning. sh: update r2d defconfig and fix SH7751R pci compliation sh: Many symbol exports for nommu allmodconfig. sh: zero terminate 8250 platform data for r2d board sh: cpufreq: Fix up the build for SH-2. sh: Make on-chip DMA channel selection explicit. sh: Fix up CPU dependencies for on-chip DMAC. sh: cpufreq: clock framework support. sh: Support rate rounding for SH7722 FRQCR clocks. sh: Implement clk_round_rate() in the clock framework. sh: Fix up PCI section mismatch warnings. sh: Wire up fallocate() syscall. sh: intc - add support for 7780 sh: intc - improve group support sh: Fix up SH-3 and SH-4 driver dependencies. sh: push-switch: Correct license string. sh: cpufreq: Fix driver dependencies and flag as broken. sh: IPR/INTC2 IRQ setup consolidation. ... commit 7f46e6ca0183568a688e6bfe40e3ab9adb305d03 Merge: c8e16aa... 53555eb... Author: Linus Torvalds Date: Fri Jul 20 08:52:06 2007 -0700 Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (102 commits) [ALSA] version 1.0.14 [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.h [ALSA] hda-codec - Fix input with STAC92xx [ALSA] hda-intel: support for iMac 24'' released on 09/2006 [ALSA] hda-codec - Add quirk for Asus P5LD2 [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio. [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading. [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m. [ALSA] cs46xx - Fix PM resume [ALSA] hda: Enable SPDIF in/out on some stac9205 boards [ALSA] timer: check for incorrect device state in non-debug compiles, too [ALSA] snd-aoa-codec-onyx: fix typo [ALSA] hda-codec - Add quirks for HP dx2200/dx2250 [ALSA] hda-codec - Rename HP model-specific quirks [ALSA] hda-codec - Add quirk for HP Samba [ALSA] hda-codec - Add LG LW20 line-in capture source [ALSA] usb-audio - Fix AC3 with M-Audio Audiophile USB [ALSA] hda: stac9202 mixer fix [ALSA] Make s3c24xx_i2s_set_clkdiv() change the correct bits [ALSA] hda-codec - Add LG LW20 si3054 modem id ... commit c8e16aa291c7d1ff14d3784e52bd376bcae17d54 Merge: 6936b17... fad9e7d... Author: Linus Torvalds Date: Fri Jul 20 08:51:11 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: Flag sh64_get_page() as __init_refok. sh64: Move entry point code to .text.head. sh64: Fix up PCI section mismatch warnings. sh64: Update cayman defconfig. sh64: Wire up fallocate() syscall. commit 6936b17ea03f54525f01b12819d558ba52a86b46 Merge: 5c72fc5... 8350163... Author: Linus Torvalds Date: Fri Jul 20 08:50:49 2007 -0700 Merge branch 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block * 'cfq' of git://git.kernel.dk/data/git/linux-2.6-block: cfq: Write-only stuff in CFQ data structures cfq: async queue allocation per priority commit 5c72fc5cad68f5e1bfe0910cca9f63723e4a5c4a Author: Nick Piggin Date: Fri Jul 20 09:21:06 2007 +0200 arm: fix up handle_mm_fault changes Update arm to use bitwise types for its VM_FAULT_ constants. Signed-off-by: Nick Piggin Cc: Russell King Signed-off-by: Linus Torvalds commit dee2383784212c67819fdda1cbd4339f11d23b99 Merge: e609ccc... 5ddf24c... Author: Linus Torvalds Date: Fri Jul 20 08:46:42 2007 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits) libata: implement EH fast drain libata: schedule probing after SError access failure during autopsy libata: clear HOTPLUG flag after a reset libata: reorganize ata_ehi_hotplugged() libata: improve SCSI scan failure handling libata: quickly trigger SATA SPD down after debouncing failed libata: improve SATA PHY speed down logic The SATA controller device ID is different according to ahci: implement SCR_NOTIFICATION r/w ahci: make NO_NCQ handling more consistent libata: make ->scr_read/write callbacks return error code libata: implement AC_ERR_NCQ libata: improve EH report formatting sata_sil24: separate out sil24_do_softreset() sata_sil24: separate out sil24_exec_polled_cmd() sata_sil24: replace sil24_update_tf() with sil24_read_tf() ahci: separate out ahci_do_softreset() ahci: separate out ahci_exec_polled_cmd() ahci: separate out ahci_kick_engine() ahci: use deadline instead of fixed timeout for 1st FIS for SRST ... commit e609ccc3161ead8a685b15533d9b6958ed368358 Author: Matthew Wilcox Date: Fri Jul 20 09:29:50 2007 -0600 Fix Lindent to not indent preprocessor comments so far I recently ran Lindent over the AdvanSys driver and it moved the comments on #else and #endif lines way over to the right: #else /* ADVANSYS_DEBUG */ This doesn't match what I expect from kernel style, but it is documented. We just need another flag to indent to make this look like: #else /* ADVANSYS_DEBUG */ Signed-off-by: Matthew Wilcox Signed-off-by: Linus Torvalds commit 178554ae75739e91dc4d7c3e42a3db95448cc5bf Author: Jesper Juhl Date: Fri Jul 20 00:31:48 2007 -0700 Memory leak in tpm_ascii_bios_measurements_open() Coverity found a memory leak in tpm_ascii_bios_measurements_open(). If "read_log(log)" fails, then we may leak 'log' and 'log->bios_event_log'. Signed-off-by: Jesper Juhl Cc: Seiji Munetoh Cc: Stefan Berger Cc: Reiner Sailer Cc: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22982a5687d8abf7bafe6d307585464f47089f18 Author: Greg Ungerer Date: Fri Jul 20 00:31:47 2007 -0700 m68knommu: reformat show_cpuinfo() Reformat show_cpuinfo() to be consistent with normal coding style (and rest of this file). Signed-off-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3bbb3f05339de438faf54124f25c92e6fe4ac2e Author: Jesper Juhl Date: Fri Jul 20 00:31:47 2007 -0700 cr_backlight_probe() allocates too little storage for struct cr_panel The Coverity checker noticed that we allocate too little storage for "struct cr_panel *crp" in cr_backlight_probe(). Signed-off-by: Jesper Juhl Cc: Thomas Hellstrom Cc: Alan Hourihane Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0645a8b1f14da300f40bb9f424640cd1181fbf Author: Dan Williams Date: Fri Jul 20 00:31:46 2007 -0700 async_tx: fix kmap_atomic usage in async_memcpy Andrew Morton: [async_memcpy] is very wrong if both ASYNC_TX_KMAP_DST and ASYNC_TX_KMAP_SRC can ever be set. We'll end up using the same kmap slot for both src add dest and we get either corrupted data or a BUG. Evgeniy Polyakov: Btw, shouldn't it always be kmap_atomic() even if flag is not set. That pages are usual one returned by alloc_page(). So fix the usage of kmap_atomic and kill the ASYNC_TX_KMAP_DST and ASYNC_TX_KMAP_SRC flags. Cc: Andrew Morton Cc: Evgeniy Polyakov Signed-off-by: Dan Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c6129c68fe90a61166800b40217a850b8faee98 Author: Stephen Rothwell Date: Fri Jul 20 00:31:45 2007 -0700 dpt_i2o depends on virt_to_bus Signed-off-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1833633803c7ef4d8f09877d3f1549cbd252f477 Author: Nick Piggin Date: Fri Jul 20 00:31:45 2007 -0700 fix some conversion overflows Fix page index to offset conversion overflows in buffer layer, ecryptfs, and ocfs2. It would be nice to convert the whole tree to page_offset, but for now just fix the bugs. Signed-off-by: Nick Piggin Cc: Michael Halcrow Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e228929bc257b963523ed75aa60d2ad77ece2189 Author: Paul Mundt Date: Fri Jul 20 00:31:44 2007 -0700 mm: fix memory hotplug oops from ZONE_MOVABLE changes. zone_movable_pfn is presently marked as __initdata and referenced from adjust_zone_range_for_zone_movable(), which in turn is referenced by zone_spanned_pages_in_node(). Both of these are __meminit annotated. When memory hotplug is enabled, this will oops on a hot-add, due to zone_movable_pfn having been freed. __meminitdata annotation gives the desired behaviour. This will only impact platforms that enable both memory hotplug and ARCH_POPULATES_NODE_MAP. Signed-off-by: Paul Mundt Acked-by: Mel Gorman Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d1b87530e7df5c9541a69910ef7f786f034eca0 Author: Adrian Bunk Date: Fri Jul 20 00:31:44 2007 -0700 arch/i386/xen/events.c should #include Every file should include the headers containing the prototypes for its global functions. Signed-off-by: Adrian Bunk Acked-by: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2eea68e7db759ce67807b42b7407236cccfde71 Author: Roland McGrath Date: Fri Jul 20 00:31:43 2007 -0700 xen: disable vdso "nosegneg" on native boot One of the nice ideas behind paravirt is that CONFIG_XEN=y can be included in a standard configuration and be no worse for native booting than as a Xen guest. The glibc feature that supports the vDSO "nosegneg" note is designed specifically to make this easy. You just have to flip one bit at boot time. This patch makes Xen flip the bit, so a CONFIG_XEN=y kernel on bare hardware does not make glibc use the less-optimized library builds. Signed-off-by: Roland McGrath Acked-by: Jeremy Fitzhardinge Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ac12c6fe1b5fbda0d0caedb8214cde545a5737c Merge: 52a2368... 78d0012... Author: Linus Torvalds Date: Fri Jul 20 08:26:54 2007 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix two year old bug in early bootup asm. [SPARC64]: Update defconfig. [SPARC64]: Fix log message type in vio_create_one(). [SPARC64]: Tweak assertions in sun4v_build_virq(). [SPARC64]: Tweak kernel log messages in power_probe(). [SPARC64]: Fix handling of multiple vdc-port nodes. [SPARC64]: Fix device type matching in VIO's devspec_show(). [SPARC64]: Fix MODULE_DEVICE_TABLE() specification in VDC and VNET. [SPARC]: Add sys_fallocate() entries. [SPARC64]: Use orderly_poweroff(). commit 52a23685f37c06d0cd00eeb8f517a90de3f2c338 Merge: d046943... d20da3c... Author: Linus Torvalds Date: Fri Jul 20 08:25:49 2007 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (44 commits) USB: drivers/usb/storage/dpcm.c whitespace cleanup USB: r8a66597-hcd: fixes some problem USB: change name of spinlock in hcd.c USB: move routines in hcd.c USB: misc: uss720: clean up urb->status usage USB: misc: usbtest: clean up urb->status usage USB: misc: usblcd: clean up urb->status usage USB: misc: phidgetmotorcontrol: clean up urb->status usage USB: misc: phidgetkit: clean up urb->status usage USB: misc: legousbtower: clean up urb->status usage USB: misc: ldusb: clean up urb->status usage USB: misc: iowarrior: clean up urb->status usage USB: misc: ftdi-elan: clean up urb->status usage USB: misc: auerswald: clean up urb->status usage USB: misc: appledisplay: clean up urb->status usage USB: misc: adtux: clean up urb->status usage USB: core: message: clean up urb->status usage USB: image: microtek: clean up urb->status usage USB: image: mdc800: clean up urb->status usage USB: storage: onetouch: clean up urb->status usage ... commit d046943cbaf332f75284ad99f4b3e60bae7ffff2 Author: Al Viro Date: Fri Jul 20 16:18:06 2007 +0100 fix gfp_t annotations for slub Since we have use like ~SLUB_DMA, we ought to have the type set right in both cases. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8d4bc5b6b0ce030f51a2db836caeaf687b986791 Author: Al Viro Date: Fri Jul 20 16:15:28 2007 +0100 ANSIfy a couple of functions in netfilter It's C, not C++... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6d14bfe77b8246a45670b7158d3a49bfe55662c7 Author: Al Viro Date: Fri Jul 20 16:10:24 2007 +0100 Fix lguest misannotation It's void __user *, not void * __user... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 25cccecce8e29f92eb5a0445bc97ee01ef2da379 Author: Al Viro Date: Fri Jul 20 16:07:33 2007 +0100 Fix up sky2 breakage Doing |= 1 << 19 to 16bit unsigned is not particulary useful; that register is 32bit, unlike the ones dealt with in the rest of function, so we need u32 variable here. Signed-off-by: Al Viro Acked-by: Stephen Hemminger Signed-off-by: Linus Torvalds commit a9204879b4242c2bed3a172399906acd371a8081 Author: Al Viro Date: Fri Jul 20 16:03:40 2007 +0100 Fix buggered kmalloc() call argument order Wrong order of arguments Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit dfedfaf55a452637d72bfc482c80f902a470ebb7 Author: Al Viro Date: Fri Jul 20 04:33:58 2007 +0100 m68k: exclude more unbuildable drivers anything that wants working dma-mapping won't work parport_pc won't work on m68k unless we have ISA Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 446df4c1e5f56cb68ec0cd9c29bbb2c7b04a513e Author: Al Viro Date: Fri Jul 20 04:33:48 2007 +0100 mac89x0: missing __init Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f6ea2090e08abf3b95e1b692f1eec596bce69e9c Author: Al Viro Date: Fri Jul 20 04:33:38 2007 +0100 m68k: remove empty ->setup is several consoles Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 66a3f820cb6a88ef0481e042d4b48b2299deab7e Author: Al Viro Date: Fri Jul 20 04:33:28 2007 +0100 m68k: missing __init Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 88f8bb780e13fd31f207e1752ee8624dc786381f Author: Al Viro Date: Fri Jul 20 04:33:18 2007 +0100 m68k: missing exports Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7e5de05169b766b86b4bc7c196f53d57e1952bff Author: Al Viro Date: Fri Jul 20 04:33:08 2007 +0100 m68k: use .text.head i.e. tell modpost that entry point code (that has to be outside of .init.text for external reasons) is OK to refer to .init.* Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f9569e1d1540791f664aeb935b1ec11b6e56507c Author: Al Viro Date: Fri Jul 20 04:32:58 2007 +0100 m68k iomem (based on Geert's tree + memcpy_... stuff) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3a5df1d451cfe3a3d6d63f144554cac286eecba1 Author: Al Viro Date: Fri Jul 20 04:32:48 2007 +0100 m68k: teach modpost about .m68_fixup Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8a0236743ecd591f16a749f5c06670c6ae9661be Author: Al Viro Date: Fri Jul 20 00:24:22 2007 +0100 more isa/eisa/pci-only drivers marked as such Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5ddf24c5ea9d715dc4f5d5d5dd1c9337d90466dc Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: implement EH fast drain In most cases, when EH is scheduled, all in-flight commands are aborted causing EH to kick in immediately. However, in some cases (especially with PMP), it's unclear which commands are affected by the error condition and although aborting all in-flight commands work, it isn't optimal and may cause unnecessary disruption. On the other hand, waiting for in-flight commands to drain themselves can take up to 30seconds. This patch implements EH fast drain to handle such situations. It gives in-flight commands some time to finish up but doesn't wait for too long. After EH is scheduled, fast drain timer is started and if no other completion occurs in ATA_EH_FASTDRAIN_INTERVAL all in-flight commands are aborted. If any completion occurred in the interval, the port is given another interval to finish up itself. Currently ATA_EH_FASTDRAIN_INTERVAL is 3 secs which should be enough for finishing up most commands. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4e57c517b3cbaceb7438eeec879ca129fc17442c Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: schedule probing after SError access failure during autopsy If SError isn't accessible, EH can't tell whether hotplug has happened or not. Report SError read failure with AC_ERR_OTHER and schedule probing with hardreset. This will be mainly useful for PMPs. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fccb6ea5c240b9f29baa55448488fd6aee49f5a5 Author: Tejun Heo Date: Mon Jul 16 14:29:41 2007 +0900 libata: clear HOTPLUG flag after a reset ATA_EHI_HOTPLUGGED is a hint for reset functions indicating the the port might have gone through hotplug/unplug just before entering EH. Reset functions modify their behaviors a bit to handle the situation better - e.g. using longer debouncing delay. Currently, once HOTPLUG is set, it isn't cleared till the end of EH. This is unnecessary and makes EH take longer. Clear the HOTPLUGGED flag after a reset try (successful or not). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f8f1e1cc0cd4d75c73e9a55a0ede8958e4fa14f1 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: reorganize ata_ehi_hotplugged() __ata_ehi_hotplugged() now has no users. Regorganize ata_ehi_hotplugged() such that a new function ata_ehi_schedule_probe() deals with scheduling probing. ata_ehi_hotplugged() calls it and additionally marks hotplug specific flags. ata_ehi_schedule_probe() will be used laster. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 1ae463171cc1b1ea6dad7bcb298e96c073e7373e Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: improve SCSI scan failure handling SCSI scan may fail due to memory allocation failure even if EH is not in progress. Due to use of GFP_ATOMIC in SCSI scan path, allocation failure isn't too rare especially while probing multiple devices at once which is the case when a bunch of devices are connected to PMP. This patch moves SCSI scan failure detetion logic from ata_scsi_hotplug() to ata_scsi_scan_host() and implement synchronous scan behavior. The synchronous path sleeps briefly and repeats SCSI scan if some devices aren't attached properly. It contains robust retry loop to minimize the chance of device misdetection during boot and falls back to async retry if everything fails. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f1545154a5c96590b1992aac8ee1e2c445e301ed Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: quickly trigger SATA SPD down after debouncing failed Debouncing failure is a good indicator of basic link problem. Use -EPIPE to indicate debouncing failure and make ata_eh_reset() invoke sata_down_spd_limit() if the error occurs during reset. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 008a78961ec72990d09d7625ef9499d7317d040d Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: improve SATA PHY speed down logic sata_down_spd_limit() first reads the current SPD from SStatus and limit the speed to the lower one of one below the current limit or one below the current SPD in SStatus. SPD may not be accessible or valid when SPD down is requested making sata_down_spd_limit() fail when it's most needed. This patch makes the current SPD cached after each successful reset and forces GEN I speed (1.5Gbps) if neither of SStatus or the cached value is valid, so sata_down_spd_limit() is now guaranteed to lower the speed limit if lower speed is available. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit badc2341579511a247f5993865aa68379e283c5c Author: su henry Date: Fri Jul 20 08:07:46 2007 -0400 The SATA controller device ID is different according to the onchip SATA type set in the system BIOS: Device Device ID SATA in IDE mode 0x4390 SATA in AHCI mode 0x4391 SATA in non-raid5 driver 0x4392 SATA in raid5 driver 0x4393 Although the device ID is different, they use the same AHCI driver .The attached file is the patch for adding these device IDs for ATI SB700. Signed-off-by: henry.su.ati@gmail.com Signed-off-by: Jeff Garzik commit 203ef6c456ad70e660cca67921d3d872b13aa516 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 ahci: implement SCR_NOTIFICATION r/w Make ahci_scr_read/write() handle SCR_NOTIFICATION if the controller supports it. Also, print "sntf" in the cap line if supported. While at it, convert eight space into a tab in ahci_print_info(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 274c1fde5c775a53331427d454745b9ecc5c783b Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 ahci: make NO_NCQ handling more consistent ahci_save_initial_config() is responsible for reading, screening the host CAP register and storing the modified result into hpriv->cap for the rest of the driver. Move ATA_FLAG_NO_NCQ handling into ahci_save_initial_config(). It's more consistent this way and the rest of the driver can always refer to hpriv->cap to determine configured capability. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit da3dbb17a0e9a9ec7f5aed95f1fddadb790edc9d Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: make ->scr_read/write callbacks return error code Convert ->scr_read/write callbacks to return error code to better indicate failure. This will help handling of SCR_NOTIFICATION. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 5335b729064e03319cd2d5219770451dbb1d7f67 Author: Tejun Heo Date: Mon Jul 16 14:29:40 2007 +0900 libata: implement AC_ERR_NCQ When an NCQ command fails, all commands in flight are aborted and the offending one is reported using log page 10h. Depending on controller characteristics and LLD implementation, all commands may appear as having a device error due to shared TF status making it hard to determine what's actually going on. This patch adds AC_ERR_NCQ, marks the command reported by log page 10h with it and print extra "" after the error report for the command to help distinguishing the offending command. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit b64bbc39f2122a2276578e40144af69ef01decd4 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 libata: improve EH report formatting Requiring LLDs to format multiple error description messages properly doesn't work too well. Help LLDs a bit by making ata_ehi_push_desc() insert ", " on each invocation. __ata_ehi_push_desc() is the raw version without the automatic separator. While at it, make ehi_desc interface proper functions instead of macros. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 975530e8a33fdeb1ad80d82fde11d56bf9ed2760 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: separate out sil24_do_softreset() Separate out sil24_do_softreset() which takes @pmp as its last argument. This will be used to implement sil24_pmp_softreset(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 37b99cba8c2a3fd05a3a9f652cc2b3e48d1b9197 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: separate out sil24_exec_polled_cmd() Separate out sil24_exec_polled_cmd() from sil24_softreset(). This will be used to implement sil24_pmp_read/write(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit e59f0dad33176a13803ff8a41cc639a06c43d381 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 sata_sil24: replace sil24_update_tf() with sil24_read_tf() Replace sil24_update_tf() to sil24_read_tf() which reads TF into passed int result TF argument and can read TFs of PMP links. This will be used by PMP support. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a9cf5e858100b2f82ad61028c26a1a3de11c4839 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_do_softreset() Separate out ahci_do_softreset() which takes @pmp as its last argument. This will be used to implement ahci_pmp_softreset(). Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 91c4a2e09267b0ddc8e59d121e3748cd18675739 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_exec_polled_cmd() Separate out ahci_exec_polled_cmd() from ahci_softreset(). This will be used to implement ahci_pmp_read/write(). ahci_exec_polled_cmd() performs reset_engine before returning if the command fails (times out). This is to improve robustness. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit d2e75dfffbe9e86e1d646264792ac9bcd2cc4267 Author: Tejun Heo Date: Mon Jul 16 14:29:39 2007 +0900 ahci: separate out ahci_kick_engine() Separate out stop_engine - CLO - start_engine sequence from ahci_softreset() and ahci_clo() into ahci_reset_engine() and use it in ahci_softreset() and ahci_post_internal_cmd(). The function will also be used to prepare for and clean up after PMP register access commands. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 2cbb79ebbd4be07041368da5379a64f89f8ad518 Author: Tejun Heo Date: Mon Jul 16 14:29:38 2007 +0900 ahci: use deadline instead of fixed timeout for 1st FIS for SRST Use deadline instead of fixed timeout for 1st FIS for SRST to improve robustness of SRST. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9977126c4b65c1396b665f7a0eeb8c7dede336f9 Author: Tejun Heo Date: Mon Jul 16 14:29:38 2007 +0900 libata: add @is_cmd to ata_tf_to_fis() Add @is_cmd to ata_tf_to_fis(). This controls bit 7 of the second byte which tells the device whether this H2D FIS is for a command or not. This cleans up ahci a bit and will be used by PMP. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fe36cb53cfd82f3c0796a0826e1c9caf198c8f97 Author: Petr Vandrovec Date: Fri Jul 20 07:44:44 2007 -0400 [libata] Fix reported task file values in sense data ata_tf_read was setting HOB bit when lba48 command was submitted, but was not clearing it before reading "normal" data. As it is only place which sets HOB bit in control register, and register reads should not be affected by other bits, let's just clear it when we are done with reading upper bytes so non-48bit commands do not have to touch ctl at all. pata_scc suffered from same problem... Signed-off-by: Petr Vandrovec Signed-off-by: Jeff Garzik commit f3a03b0934fb83a030ccd3e6f1fbe845a9c44d49 Author: Dave Jones Date: Mon Jul 16 11:23:03 2007 -0400 Correct comment in libata-sff.c The filename in the file header is incorrect. Signed-off-by: Dave Jones Signed-off-by: Jeff Garzik commit dcd0344775c1c0bf8ff3b9541863beea5088a7c9 Author: Akira Iguchi Date: Tue Jul 17 12:10:17 2007 +0900 pata_scc.c: small fixes (Workaround for errata A308) This patch fixes some issues of the previous patch: - Use mode_filter() hook to limit ATAPI UDMA mode - "data loss" warning message - handling of udma_mask Signed-off-by: Kou Ishizaki Signed-off-by: Akira Iguchi Signed-off-by: Jeff Garzik commit 028a2596336b19a7e3713cfa9fe04d0d32e95876 Author: Alexey Dobriyan Date: Tue Jul 17 23:48:48 2007 +0400 ahci.c: fix CONFIG_PM=n compilation Commit df69c9c5438b4e396a64d42608b2a6c48a3e7475 moved only prototype of out of CONFIG_PM. Move function out as well. Box seems to boot fine. Signed-off-by: Alexey Dobriyan Signed-off-by: Jeff Garzik commit 3fb6589ceaf06d9c65bdf2382249d818771e913b Author: Tejun Heo Date: Fri Jul 20 12:49:38 2007 +0900 libata: add ST9160821AS 3.CLF to NONCQ blacklist Yay, the first one from Seagate. 3.ALC firmware is okay. This was reported by Sam Freed on bugzilla bug 8759. Signed-off-by: Tejun Heo Signed-off-by: Sam Freed Signed-off-by: Jeff Garzik commit 83b6839ec33becca78ebf6035489733a62e750bb Author: Magnus Damm Date: Fri Jul 20 12:50:58 2007 +0900 pata_platform: Fix NULL pointer dereference pata_platform: Fix NULL pointer dereference pata_platform currently dereferences a NULL pointer in pata_platform_probe() if pdev->dev.platform_data is set to NULL. This breakage was most likely introduced by commit 5f45bc50976ee1f408f7171af155aec646655a37. Signed-off-by: Magnus Damm Signed-off-by: Jeff Garzik commit 0ea9e179f436f153fc19fdaef7abbc1e0da20762 Author: Jeff Garzik Date: Fri Jul 13 17:06:45 2007 -0400 [libata] sata_mv: minor cleanups * trim trailing whitespace * document some flags, registers, and register bits * fix locking around EDMA on/off and configuration * continue replacing "constant OP var" with "var OP constant" * use new pci_try_set_mwi() Signed-off-by: Jeff Garzik commit 6c1153e00af8de755ec278d873a97c9ce2a72d10 Author: Jeff Garzik Date: Fri Jul 13 15:20:15 2007 -0400 [libata] sata_mv: Micro-optimization and cleanups * Micro-optimization in the EDMA interrupt handling code * s/EDMA_ERR_CRBQ_PAR/EDMA_ERR_CRQB_PAR/ * Document EDMA Error Interrupt Cause register bits Signed-off-by: Jeff Garzik commit 56386f6424f242cff46e2cfd7be44624cd37dce1 Author: Magnus Damm Date: Fri Jul 20 18:44:49 2007 +0900 sh: intc - add support for SH7750 and its variants This patch converts the cpu specific 7750 setup code to use the new intc controller. Many new vectors are added and multiple processor variants including 7091, 7750, 7750s, 7750r, 7751 and 7751r should all have the correct vectors hooked up. IRLM interrupts can be enabled using ipr_irq_enable_irlm() which now is marked as __init. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 53555eb758388fff3982875129ca96080caed147 Author: Jaroslav Kysela Date: Fri Jul 20 11:13:35 2007 +0200 [ALSA] version 1.0.14 Signed-off-by: Jaroslav Kysela commit 1f6268e982c7d35adee34d8f92a17644c7b3f78a Author: Jaroslav Kysela perex@suse.cz Date: Fri Jul 20 10:42:56 2007 +0200 [ALSA] remove duplicate Logitech Quickcam USB ID in usbquirks.h Signed-off-by: Jaroslav Kysela commit aafc03398baefaac380b34a1ee6356e7eed8e663 Author: Takashi Iwai Date: Tue May 29 18:01:06 2007 +0200 [ALSA] hda-codec - Fix input with STAC92xx The recent fix for STAC92xx surround outputs broke the input pin setting for shared line-in and mic jacks. This patch fixes the breakage. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c54728d8aa59283ece86cb745e5085ece8b4eedb Author: Nicola Fagnani Date: Thu Jul 19 23:28:52 2007 +0200 [ALSA] hda-intel: support for iMac 24'' released on 09/2006 Basic audio support for the iMac 24'' model released on 09/2006, including headphone jack detection with automatic speaker muting. This iMac uses the Realtek ALC885 codec, not a Sigmatel one as in other models. Functionality has been tested for internal speakers, headphone and microphone. Signed-off-by: Nicola Fagnani Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c5d9f1cdbf067b5500886c5171159e99657341ce Author: Claudio Matsuoka Date: Thu Jul 19 23:18:32 2007 +0200 [ALSA] hda-codec - Add quirk for Asus P5LD2 Without the proper model setting, the Asus P5LD2 rear outputs remain completely silent unlike other systems where the front speakers usually work. This patch adds the P5LD2 to the quirk table. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8632649b1c991aab883a8538e493c33e362d077a Author: James Courtier-Dutton Date: Fri May 18 20:35:50 2007 +0100 [ALSA] snd-ca0106: Add support for X-Fi Extreme Audio. This card is just a normal SB Live 24bit, but under a different marketing name. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit d9e8a552d486eff3281e58754d126500782dcd74 Author: James Courtier-Dutton Date: Sat Jul 14 10:24:49 2007 +0100 [ALSA] snd-emu10k1:Enable E-Mu 1616m notebook firmware loading. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit 3663d845e557989d09e856c1e9e708e80a976dd4 Author: James Courtier-Dutton Date: Sat Jul 14 02:18:26 2007 +0100 [ALSA] snd-emu10k1: Initial support for E-Mu 1616 and 1616m. Signed-off-by: James Courtier-Dutton Signed-off-by: Jaroslav Kysela commit 89f157d9e6bf08b65f93dcb1dca1de037079885f Author: Takashi Iwai Date: Thu Jul 19 11:23:21 2007 +0200 [ALSA] cs46xx - Fix PM resume Fixed PM resume of cs46xx devices. It now restores properly the DSP image and kick-off the DSP. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 87d483630a4bd5af2beb2155c7ae8c408729a1a6 Author: Matthew Ranostay Date: Tue Jul 17 11:52:24 2007 +0200 [ALSA] hda: Enable SPDIF in/out on some stac9205 boards Added support for some boards with SPDIF in/out, and cleaned up the GPIO enable function. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7c64ec343a7d7b2d73b19e6bb8d9fd15f0462890 Author: Clemens Ladisch Date: Mon Jul 16 11:01:30 2007 +0200 [ALSA] timer: check for incorrect device state in non-debug compiles, too Convert the snd_assert()s to simple if()s to prevent crashes when one of the timer instance ioctls is called before the file is bound to a timer device. Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit c28054d4b31d78272f65c0d11db0796f50fb9569 Author: Yoann Padioleau Date: Sat Jul 14 00:33:15 2007 +0200 [ALSA] snd-aoa-codec-onyx: fix typo Parse error in ifdef or bad use of macro. Signed-off-by: Yoann Padioleau Signed-off-by: Andrew Morton Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ef64adbbba1b215e8b523b50ef9d568b4bf2e1e3 Author: Claudio Matsuoka Date: Sat Jul 14 00:26:16 2007 +0200 [ALSA] hda-codec - Add quirks for HP dx2200/dx2250 HP dx2200 and dx2250 use Micro-Star International (MSI) motherboards (models MS-7254 and MS-7297 respectively) with an ALC862 codec in threestack configuration. Adding this quirk allows correct 5.1 sound output in these systems. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4723c022e1960abb5608b37ef61443da7d6296bb Author: Claudio Matsuoka Date: Fri Jul 13 14:36:19 2007 +0200 [ALSA] hda-codec - Rename HP model-specific quirks Rename ALC888_HP_NETTLE and ALC888_HP_LUCKNOW models to the more generic names ALC888_6ST_HP and ALC888_3ST_HP since HP seems to be consistent in the wiring of their 3stack and 6stack ALC888-based systems. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e87f97a3e842a816f30f087d5bfac68ef2afaef2 Author: Claudio Matsuoka Date: Fri Jul 13 11:51:32 2007 +0200 [ALSA] hda-codec - Add quirk for HP Samba This patch fixes 5.1 surround output for the HP Samba using the same quirk as the HP Lucknow. If HP machines are uniform in their wiring, we should rename ALC888_HP_NETTLE to ALC888_6ST_HP and ALC888_HP_LUCKNOW to ALC888_3ST_HP for generic HP 6stack and 3stack configurations. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e4f41da9e5f03e67ebe6067aad40c6a79443c3ae Author: Claudio Matsuoka Date: Fri Jul 13 11:51:06 2007 +0200 [ALSA] hda-codec - Add LG LW20 line-in capture source Add line-in to the list of LG LW20 capture sources. Also fix the LG LW pin assignment list comment. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cac19c3ba123369b7c1199e20bb01fb265004ff5 Author: Thibault Le Meur Date: Fri Jul 13 11:50:23 2007 +0200 [ALSA] usb-audio - Fix AC3 with M-Audio Audiophile USB Fixed AC3 interface in device_setup=0x00 mode thanks to Hakan Lennestal and updated documentation Signed-off-by: Thibault Le Meur Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1b290a510c12be91b6a2f7d6a07ef61b8ee9f06a Author: Matthew Ranostay Date: Thu Jul 12 15:17:34 2007 +0200 [ALSA] hda: stac9202 mixer fix Added support for line out controls for STAC9202 cards, and fixed issue where master mixer control was being created twice for headphone and speaker outs. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 82fb159aa3d187aac0fce076739d7d8884e7a0af Author: Matt Reimer Date: Thu Jul 12 12:27:24 2007 +0200 [ALSA] Make s3c24xx_i2s_set_clkdiv() change the correct bits Make s3c24xx_i2s_set_clkdiv() change the correct bits. Signed-off-by: Matt Reimer Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit ef2ec0dd65bc542f9ab45ea2fac6920cb1afa13b Author: Claudio Matsuoka Date: Thu Jul 12 11:27:37 2007 +0200 [ALSA] hda-codec - Add LG LW20 si3054 modem id Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f8c78b82b9e47d933629e7060e4a83a277b15ffe Author: Thibault Le Meur Date: Thu Jul 12 11:26:35 2007 +0200 [ALSA] usb-audio - Fix audiophile-USB quirk for little-endian Audiophile-usb fix (corrects little-endianness in 16bit modes, resets interfaces at device initialization, and updates the documentation). Signed-off-by: Thibault Le Meur Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit be38114a49853e441e694d690e631937de5fc524 Author: Claudio Matsuoka Date: Wed Jul 11 10:31:08 2007 +0200 [ALSA] hda-codec - Add VIA HDA to si3054 Add VIA HDA identification to use the HDA-based Motorola modem of the Clevo m540 laptop. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2dcd522f89d17936d08665c22ab0ee415b8c5d56 Author: Tobin Davis Date: Tue Jul 10 17:04:57 2007 +0200 [ALSA] HDA-Intel - Add support for MSI K9AGM2-FIH motherboard This patch adds support for the MSI K9AGM2-FIH on-board audio. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cfc24ec89b488eeb5dfe4189761205fca38eb58e Author: Ritesh Raj Sarraf Date: Tue Jul 10 13:03:57 2007 +0200 [ALSA] USB ID for intergrated quickcam on dell xps m1210 This patch adds Logitech QuickCam USB ID for Dell's XPS M1210 notebooks. Signed-off-by: Ritesh Raj Sarraf Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 706568967c7d99a5975b2a21aacd791dc838ea8c Author: Adrian Bunk Date: Tue Jul 10 11:34:32 2007 +0200 [ALSA] fix SND_CS5530=y, ISA=n compilation This patch fixes the following compile error with CONFIG_SND_CS5530=y, CONFIG_ISA=n: <-- snip --> ... LD .tmp_vmlinux1 sound/built-in.o: In function 'snd_sb16_capture_trigger': sb16_main.c:(.text+0x212ad): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x212cc): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x212f7): undefined reference to 'snd_sbdsp_command' sound/built-in.o: In function 'snd_sb16_playback_trigger': sb16_main.c:(.text+0x2136d): undefined reference to 'snd_sbdsp_command' sb16_main.c:(.text+0x2138c): undefined reference to 'snd_sbdsp_command' ... <-- snip --> Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f95474ec05106a2af46220fbf8624adc17fcb3e7 Author: Takashi Iwai Date: Tue Jul 10 00:47:43 2007 +0200 [ALSA] hda-codec - Fix default pin config of Abit AW9D-MAX Fix the default pin configuration of Abit AW9D-MAX. The board has a broken BIOS that doesn't set the correct pin default configs, which screws up the auto-configuration of snd-hda-intel driver. The patch enables the override of default pin config values. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 341d4eb0cffdcd5fbdbd696dc26671f91e7c418c Author: Takashi Iwai Date: Mon Jul 9 17:53:18 2007 +0200 [ALSA] hda-codec - Fix Toshiba A100 with ALC861 One of the newly added model entries causes a regression on Toshiba A100. It works fine with model=auto. So, let's deselect the entry again. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c34532da91c208bd5567419984ea6a4bf60dad60 Author: George Shapovalov Date: Mon Jul 9 10:42:35 2007 +0200 [ALSA] usb-audio: another Logitech camera/microphone ID match From: George Shapovalov Another case of ALSA ticket #3040: we need an explicit USB ID match for another Logitech camera/microphone device. Signed-off-by: Daniel Drake Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f167684a6454183d41588982ed26e4c6ee6feb48 Author: Takashi Iwai Date: Mon Jul 9 10:39:44 2007 +0200 [ALSA] usbaudio - Add quirk for Roland EXR series Added a quirk for Roland EXR series. Reported by Andre Coetzee. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d20b9b20e5f3bb82a6f38583154cb2f163d465d7 Author: Takashi Iwai Date: Mon Jul 9 10:36:22 2007 +0200 [ALSA] aica - fix behaviour in poor resource conditions Fix behaviour in poor resource conditions. With this new patch, tidied with indent and with SNDRV_PCM_TRIGGER_STOP being used. Signed-off by: Adrian McMenamin Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 43bbb6ccc67775b432c31d5fd2e1050329ffdcbf Author: Takashi Iwai Date: Fri Jul 6 20:22:05 2007 +0200 [ALSA] hda-intel - Show the last command in warning messages Show the last issued command in warning messages when any communication error with CORB/RIRB occurs. Also, a bit code clean-up for composing the command value in *_send_cmd(). Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a4eed138add1018846d17e813560b0c7c0ae8e01 Author: Takashi Iwai Date: Fri Jul 6 18:17:04 2007 +0200 [ALSA] hda-codec - Fix number of pin widgets with STAC codecs Use ARRAY_SIZE() to calculate the number of pin widgets for each codec chip. This also fixes a typo in STAC9205 code that gives a wrong number (14 instead of 12), which resulted in fatal communication errors. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 47a2327eac01fa944ab935fc5bb03c3032b2ec37 Author: Robert P. J. Day Date: Fri Jul 6 13:27:16 2007 +0200 [ALSA] Remove unreferenced header file include/sound/wavefront_fx.h Signed-off-by: Robert P. J. Day Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1a7fa543cb5d8185d293a03842b33136d8dcc04c Author: Takashi Iwai Date: Fri Jul 6 12:27:25 2007 +0200 [ALSA] Fix substream to check in PCM drain The check of a substream in snd_pcm_drain() might not be always correct since runtime can point a different substream (although the PCM state of each linked substream should be same, in theory). This patch fixes it. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 940d244851f8a204b5aedae678d9ab96c20b2fec Author: Takashi Iwai Date: Fri Jul 6 12:24:55 2007 +0200 [ALSA] Add missing model entries for HD-audio codecs Added missing model entries for HD-audio codecs in the module option list. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0f40502e0b5300a37c4cfc7bf93f84c2702dbbe9 Author: Takashi Iwai Date: Fri Jul 6 12:24:11 2007 +0200 [ALSA] hda-codec - Add missing model parameter strings for ALC262 Added the missing model option values for ALC262. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cdb0e9a7af3ad34f3f879fda9251039c4cad3403 Author: Claudio Matsuoka Date: Fri Jul 6 12:11:22 2007 +0200 [ALSA] Update Claudio's CREDITS information Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8341de60c76c400eaa453c91810ba6995d2fdb57 Author: Claudio Matsuoka Date: Fri Jul 6 12:10:45 2007 +0200 [ALSA] hda-codec - Add HP Lucknow 5.1 support Added HP Lucknow (ALC888) 5.1 surround support based on ALC883 6-channel threestack with changes in channel routing. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit cd1e3b40429c172b29c04a9c777be2ca1ac012e0 Author: Claudio Matsuoka Date: Fri Jul 6 12:10:01 2007 +0200 [ALSA] hda-codec - Fix HP Nettle 5.1 output Fixed HP Nettle 6ch/8ch channel routing based on ALC883 sixstack and swapping rear and center/LFE in verbs and mixer settings. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 1624cb9a35d4276c8ea0d939d580a6945ac72ac1 Author: Takashi Iwai Date: Thu Jul 5 13:10:51 2007 +0200 [ALSA] hda-codec - Fix the recording selection on VAIO laptop Fix the mismatch of init verb and capture mux with VAIO STAC9872. Also, changed the item names to be more intuitive. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 067b5a844c7b9703b0bdcd8cf003a621734c3bae Author: Kailang Yang Date: Thu Jul 5 12:35:15 2007 +0200 [ALSA] hda-codec - Fix ALC662 auto mode Fixed ALC662 auto mode, wrong NIDs were chosen. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 83c34218a867085f7108438408c8323b46dbfc4a Author: Kailang Yang Date: Thu Jul 5 11:43:05 2007 +0200 [ALSA] hda-codec - Some fixes for Realtek codec supports - Added BenQ T31-16 AMD Turion64x2 (ALC262) support - Added models for ASUS machines with ALC861 Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0a8c5da3c066a1e92a66a493e6fe04d5ce7a206d Author: Claudio Matsuoka Date: Wed Jul 4 15:17:38 2007 +0200 [ALSA] hda-codec - Fix 5.1 output in LG LW20 Implemented LG LW20 5.1 support based on ALC880 threestack modes. It was previously set to use one DAC and 2 jack modes, giving 2-channel output only. Analog CD playing support is still missing. Signed-off-by: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4210861964145617cf27b2b9c45860bff3e8290c Author: Paul Vojta Date: Wed Jul 4 10:35:29 2007 +0200 [ALSA] nm256 - Add mention of opl3sa2 to a diagnostic message Adds mention of opl3sa2 driver to a diagnostic message for NeoMagic nm256 driver. Signed-off-by: Paul Vojta Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4700418cfc045296ee453342dc2fb142dc752aed Author: Paul Vojta Date: Wed Jul 4 10:34:22 2007 +0200 [ALSA] opl3sa2 - Add Neomagic MagicWave 3D ISA PnP ID Add Neomagic MagicWave 3D to list of supported devices for opl3sa2 driver. Signed-off-by: Paul Vojta Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8f41b56645f03e6f50407211d6f0f0627ae95e4e Author: Claudio Matsuoka Date: Tue Jul 3 20:02:49 2007 +0200 [ALSA] hda-codec - Add support for HP Nettle Added the model for HP Nettle mobo with ALC883. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 8481da5a8d009d9bbac3d1483b579940e6dd9d59 Author: Claudio Matsuoka Date: Tue Jul 3 20:05:19 2007 +0200 [ALSA] hda-codec - Add support for HP Spartan Added the model for HP Spartan with Conexant codec chip. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 95093a23b9090025f8a6be0ac93859210fbba678 Author: Claudio Matsuoka Date: Tue Jul 3 20:07:39 2007 +0200 [ALSA] usb-audio - Add quirk for Roland Juno-G Added a quirk for Roland Juno-G. It's simply a copy of Fantom-X with the IDs changed. From: Claudio Matsuoka Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c454fd4e888dc2b1423b6a65106a619e99a2deb4 Author: Masakazu Mokuno Date: Tue Jul 3 12:54:49 2007 +0200 [ALSA] Add PS3 sound driver The patch adds the support for the sound feature of PS3 - the digital output of HDMI and SPDIF optical, and the analog output of AV multi. Signed-off-by: Masakazu Mokuno Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 87823090a8bd373f34bdb6f1d5cdc5f2f4da4905 Author: Carlo Beccaria Date: Tue Jul 3 08:04:25 2007 +0200 [ALSA] usb-audio: add Roland SH-201 support Add quirks to detect the Roland SH-201. Signed-off-by: Carlo Beccaria Signed-off-by: Clemens Ladisch Signed-off-by: Jaroslav Kysela commit df802952b723cdb08f2f8a3cba396c357290850b Author: Takashi Iwai Date: Mon Jul 2 19:18:00 2007 +0200 [ALSA] hda-codec - Fix the error in DAC assignment of STAC codec The STAC codec support code has the automatic recognition of additional side-output pins, and this may result in an error when the assigned pin has no corresponding DAC connection. The patch fixes the problem -- it corrects the line_outs again without such additional pins. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit d10ad1a26da03fe089c02846a95fa5938c3ca3ce Author: Adrian Bunk Date: Mon Jul 2 16:03:12 2007 +0200 [ALSA] sound/pci/hda/patch_realtek.c: remove dead code This patch removes some dead code spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 3c2b576d58b4542b1adc56cbfb92dbfa5eef89ee Author: Randy Dunlap Date: Wed Jun 27 11:52:39 2007 +0200 [ALSA] portman2x4 section mismatch FIx section mismatch when CONFIG_HOTPLUG=n: WARNING: sound/built-in.o(.exit.text+0x271): Section mismatch: reference to .init.text:snd_p ortman_unregister_all (between 'snd_portman_module_exit' and 'alsa_mpu401_uart_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 076c0e4fd80a43f64710fe9aabdc4c463b7f8621 Author: Randy Dunlap Date: Tue Jun 26 11:43:52 2007 +0200 [ALSA] fix ensoniq section mismatch Fix ensoniq driver sections when HOTPLUG=n, but code is used during resume, so it cannot be discarded: WARNING: sound/pci/snd-ens1371.o(.text+0x5c0): Section mismatch: reference to .init.text: (between 'snd_ensoniq_chip_init' and 'snd_ensoniq_free') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f8f794ab27dd3c6d9965ec5434775ead23d3d7a2 Author: Tobin Davis Date: Mon Jun 25 12:14:25 2007 +0200 [ALSA] HDA - Change default configuration for Fujitsu Si3515 This patch changes the default configuration for the Fujitsu Siemens Si3515 Laptop to the correct model=laptop. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 6963f84c428ecd31780c97224004c2462b0664f7 Author: Mike Crash Date: Mon Jun 25 12:12:51 2007 +0200 [ALSA] hda: support for S/PDIF out on ASUS M2V Added support for S/PDIF digital output on ASUS M2V motheboard - added new model '3stack-660-digout' and ALC660VD_3ST_DIG Signed-off-by: Mike Crash Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e65365de5ba280e058bd6b8b80c8790253268887 Author: Takashi Iwai Date: Mon Jun 25 12:09:32 2007 +0200 [ALSA] Fix invalid schedule_timeout_interruptible() Fixed the invalid use of schedule_timeout_interruptible() without checking pending signals. Simply replaced with schedule_timeout(). Suggestions thanks to Jeff Garzik. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit c12aad6efbee1d937438f1deabbef695add0628b Author: Randy Dunlap Date: Mon Jun 25 12:08:01 2007 +0200 [ALSA] more section mismatches Something about __init_or_module isn't working as expected (?). CONFIG_HOTPLUG=y CONFIG_MODULES=n Fix shared init/exit code helper: WARNING: sound/built-in.o(.exit.text+0x243): Section mismatch: reference to .init.text: (between 'alsa_card_mpu401_exit' and 'ac97_bus_exit') WARNING: sound/built-in.o(.exit.text+0x21b): Section mismatch: reference to .init.text: (between 'alsa_card_dummy_exit' and 'alsa_card_serial_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit bdec0c728256e1a3739820e244a5138bcfae5a91 Author: Randy Dunlap Date: Mon Jun 25 12:07:38 2007 +0200 [ALSA] fix section mismatch Fix shared init/exit function attributes: WARNING: sound/built-in.o(.exit.text+0x4a1): Section mismatch: reference to .init.text: (between 'alsa_card_virmidi_exit' and 'alsa_card_serial_exit') WARNING: sound/built-in.o(.exit.text+0x4c1): Section mismatch: reference to .init.text: (between 'alsa_card_serial_exit' and 'ac97_bus_exit') Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 0ac8551ea08e655fc6f35874803f091a17dacf90 Author: Takashi Iwai Date: Wed Jun 20 15:46:13 2007 +0200 [ALSA] hda-codec - Add AD1882 codec support Added AD1882 codec support. It has currently two models, 3stack and 6stack. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit e25c05f1d5cf4e332db88b15e9daa1cabd6e17e0 Author: Jonathan Phenix Date: Tue Jun 19 18:31:28 2007 +0200 [ALSA] hda-codec - Output MFG information for HDA devices This patch output information about the MFG (Modem Function Group) to the /proc/asound/card?/codec#? file. This information is important to identify if a HDA device has a modem or not. Signed-off-by: Jonathan Phenix Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 92a22beb756c53985e8ba98d39f2c8fc834557a4 Author: Matthew Ranostay Date: Tue Jun 19 16:48:28 2007 +0200 [ALSA] hda: add eapd support to additional idt codecs Added support for EAPD on the 927x, and 9227-8 IDT HDA codecs. Enabling EAPD powers the internal speaker amp otherwise there is no sound on systems with an internal amp. Signed-off-by: Matthew Ranostay Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 76c08828709129bdce6c6a325e0342ba73f2618f Author: Takashi Iwai Date: Tue Jun 19 12:17:42 2007 +0200 [ALSA] hda-codec - Add model dell for Dell XPS M1210 Added a new model 'dell' for Dell XPS M1210 with STAC922x codec chip. Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit b69f3748400517d1023337b97456a0a1cdc74a79 Author: Tobin Davis Date: Tue Jun 19 12:13:32 2007 +0200 [ALSA] hda-codec - Add Fujitsu Siemens v3515 support to patch_conexant This patch adds support for the Fujitsu Seimens Amilo Pro v3515 notebook. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2723f2a46823465f24b91cca0ace1e1389fe3507 Author: Graeme Gregory Date: Tue Jun 19 12:12:33 2007 +0200 [ALSA] ASoC S3C24xx machine drivers - lm4857-h missing patch Somewhere when dealing with the s3c24xx patches and requested changes I managed to miss this file on re-submission. Its a header file required for compilation of neo1973-wm8573.c and should be a no brainer. Si