commit 06a79b82b2a3e4bebb9a20638ca208c780e9e507 Merge: 4912002 a9c9b44 Author: Linus Torvalds Date: Fri Feb 26 17:22:53 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Fix preallocating of memory PM / Hibernate: Remove swsusp.c finally PM / Hibernate: Remove trailing space in message PM: Allow SCSI devices to suspend/resume asynchronously PM: Allow USB devices to suspend/resume asynchronously USB: implement non-tree resume ordering constraints for PCI host controllers PM: Allow PCI devices to suspend/resume asynchronously PM / Hibernate: Swap, remove useless check from swsusp_read() PM / Hibernate: Really deprecate deprecated user ioctls PM: Allow device drivers to use dpm_wait() PM: Start asynchronous resume threads upfront PM: Add facility for advanced testing of async suspend/resume PM: Add a switch for disabling/enabling asynchronous suspend/resume PM: Asynchronous suspend and resume of devices PM: Add parent information to timing messages PM: Document device power attributes in sysfs PM / Runtime: Add sysfs switch for disabling device run-time PM commit 4912002fffa377e66c5caefc2c311732a4ad5fb8 Author: Christian Kujau Date: Fri Feb 26 17:25:14 2010 +0000 Remove EXPERIMENTAL from NFS_FSCACHE There's currently an open Ubuntu bug[0], with the intent to compile NFS_FSCACHE (and possibly AFS_FSCACHE, 9P_FSCACHE) into the standard Ubuntu kernel. However, since *_FSCACHE still depends on EXPERIMENTAL, this won't happen. As Arjan van de Ven pointed out[1], the EXPERIMENTAL flag doesn't mean that much any more, I propose the following patch to fs/nfs/Kconfig. I'd do the same for fs/9p/Kconfig and fs/afs/Kconfig, but as I did not test 9p or AFS, I feel it would not be appropriate for me to remove the flag. [0] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/440522/comments/5 [1] http://lkml.org/lkml/2010/1/23/145 Signed-off-by: Christian Kujau Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 98723153dc32106e5be701da15551853c9f785a9 Merge: 4cbd551 6335e4d Author: Linus Torvalds Date: Fri Feb 26 17:20:18 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: toshiba_acpi: Add full hotkey support hp-wmi: Add support for tablet rotation key dell-laptop: Add another Dell laptop to the DMI whitelist classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases dell-laptop: Pay attention to which devices the hardware switch controls dell-laptop: Use buffer with 32-bit physical address dell-laptop: Blacklist machines not supporting dell-laptop dell-laptop: Block software state changes when rfkill hard blocked dell-laptop: Fix small memory leak dell-laptop: Fix platform device unregistration dell-laptop: Update rfkill state on kill switch compal-laptop: Replace sysfs support with rfkill support compal-laptop: Add support for known Compal made Dell laptops MAINTAINERS: update drivers/platform/x86 information commit 4cbd55188fe01f22783815cbb6d4f55a0ebf5969 Merge: b305956 b6fa879 Author: Linus Torvalds Date: Fri Feb 26 17:19:30 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: dlm: use bastmode in debugfs output dlm: Send lockspace name with uevents dlm: send reply before bast dlm: fix ordering of bast and cast commit b305956abc3c50c52598bbf39b7a5f4850058ba8 Merge: 4163095 398007f Author: Linus Torvalds Date: Fri Feb 26 17:18:52 2010 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: (52 commits) fs/xfs: Correct NULL test xfs: optimize log flushing in xfs_fsync xfs: only clear the suid bit once in xfs_write xfs: kill xfs_bawrite xfs: log changed inodes instead of writing them synchronously xfs: remove invalid barrier optimization from xfs_fsync xfs: kill the unused XFS_QMOPT_* flush flags V2 xfs: Use delay write promotion for dquot flushing xfs: Sort delayed write buffers before dispatch xfs: Don't issue buffer IO direct from AIL push V2 xfs: Use delayed write for inodes rather than async V2 xfs: Make inode reclaim states explicit xfs: more reserved blocks fixups xfs: turn off sign warnings xfs: don't hold onto reserved blocks on remount,ro xfs: quota limit statvfs available blocks xfs: replace KM_LARGE with explicit vmalloc use xfs: cleanup up xfs_log_force calling conventions xfs: kill XLOG_VEC_SET_TYPE xfs: remove duplicate buffer flags ... commit 41630959ed5ce694ec2e8c0f3c69743e011394c8 Merge: 2b8c70b c4d1409 Author: Linus Torvalds Date: Fri Feb 26 17:18:11 2010 -0800 Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6 * 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: ibft: Update MAINTAINERS file. drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 commit 2b8c70b2174402ca3dec13310ce56597233392d7 Merge: 29e1fa3 3621263 Author: Linus Torvalds Date: Fri Feb 26 17:16:20 2010 -0800 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (362 commits) V4L-DVB: cx88-dvb: remove extra attribution for core V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index V4L/DVB: Add support for SMT7020 to cx88 V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix V4L/DVB: gspca_stv06xx: Add support for camera button V4L/DVB: gspca_ov519: add support for the button on ov511 based cams V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams V4L/DVB: gspca_ov519: add support for the button on ov519 based cams V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set V4L/DVB: gspca_main: some input error handling fixes V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs V4L/DVB: gspca_pac7302: much improved exposure control V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls V4L/DVB: Documentation: gspca.txt: update known mr97310a cams V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480 V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl ... commit 29e1fa3565a7951cc415c634eb2b78dbdbee151d Author: Ang Way Chuang Date: Thu Feb 25 09:45:03 2010 +0800 dvb-core: Fix DoS bug in ULE decapsulation code that can be triggered by an invalid Payload Pointer ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation has a bug that causes endless loop when Payload Pointer of MPEG2-TS frame is 182 or 183. Anyone who sends malicious MPEG2-TS frame will cause the receiver of ULE SNDU to go into endless loop. This patch was generated and tested against linux-2.6.32.9 and should apply cleanly to linux-2.6.33 as well because there was only one typo fix to dvb_net.c since v2.6.32. This bug was brought to you by modern day Santa Claus who decided to shower the satellite dish at Keio University with heavy snow causing huge burst of errors. We, receiver end, received Santa Claus's gift in the form of kernel bug. Care has been taken not to introduce more bug by fixing this bug, but please scrutinize the code for I always produces buggy code. Signed-off-by: Ang Way Chuang Acked-by: Mauro Carvalho Chehab Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 2594a57a13f1a6c32d90d73d7ebe51d4b8d88421 Merge: f24407d 6adad2d Author: Linus Torvalds Date: Fri Feb 26 17:11:11 2010 -0800 Merge branch 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'kmemcheck-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: kmemcheck: Test the full object in kmemcheck_is_obj_initialized() commit f24407d2bde27a4eb75ce5e52069bf4f1ba0e8a5 Merge: 6544517 73c77e2 Author: Linus Torvalds Date: Fri Feb 26 17:05:10 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/xfs-vipt: xfs: fix xfs to work with Virtually Indexed architectures sh: add mm API for DMA to vmalloc/vmap areas arm: add mm API for DMA to vmalloc/vmap areas parisc: add mm API for DMA to vmalloc/vmap areas mm: add coherence API for DMA to vmalloc/vmap areas commit 654451748b779b28077d9058442d0f354251870d Merge: 64d497f 77c9cfc Author: Linus Torvalds Date: Fri Feb 26 16:55:27 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (158 commits) [SCSI] Fix printing of failed 32-byte commands [SCSI] Fix printing of variable length commands [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list [SCSI] scsi_dh_alua: add netapp to dev list [SCSI] qla2xxx: Update version number to 8.03.02-k1. [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset. [SCSI] qla2xxx: Add firmware ETS burst support. [SCSI] qla2xxx: Correct loop-resync issues during SNS scans. [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback. [SCSI] qla2xxx: Correct EH bus-reset handling. [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out. [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev [SCSI] fix refcounting bug in scsi_get_host_dev [SCSI] fix memory leak in scsi_report_lun_scan [SCSI] lpfc: correct PPC build failure [SCSI] raid_class: add raid1e [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes. [SCSI] zfcp: Introduce header file for qdio structs and inline functions ... commit 64d497f55379b1e320a08ec2426468d96f5642ec Merge: 37d4008 b5f5fe8 Author: Linus Torvalds Date: Fri Feb 26 16:54:27 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits) sh: remove dead LED code for migo-r and ms7724se sh: ecovec build fix for CONFIG_I2C=n sh: ecovec r-standby support sh: ms7724se r-standby support sh: SH-Mobile R-standby register save/restore clocksource: Fix up a registration/IRQ race in the sh drivers. sh: ms7724: modify scan_timing for KEYSC sh: ms7724: Add sh_sir support sh: mach-ecovec24: Add sh_sir support sh: wire up SET/GET_UNALIGN_CTL. sh: allow alignment fault mode to be configured at kernel boot. sh: sh7724: Update FSI/SPU2 clock sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec sh: add sh7724 kick callback to clk_div4_table sh: introduce struct clk_div4_table sh: clock-cpg div4 set_rate() shift fix sh: Turn on speculative return for SH7785 and SH7786 sh: Merge legacy and dynamic PMB modes. sh: Use uncached I/O helpers in PMB setup. sh: Provide uncached I/O helpers. ... commit 37d4008484977f60d5d37499a2670c79b214dd46 Merge: 68c6b85 8d0c123 Author: Linus Torvalds Date: Fri Feb 26 16:50:02 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits) crypto: aes_generic - Fix checkpatch errors crypto: fcrypt - Fix checkpatch errors crypto: ecb - Fix checkpatch errors crypto: des_generic - Fix checkpatch errors crypto: deflate - Fix checkpatch errors crypto: crypto_null - Fix checkpatch errors crypto: cipher - Fix checkpatch errors crypto: crc32 - Fix checkpatch errors crypto: compress - Fix checkpatch errors crypto: cast6 - Fix checkpatch errors crypto: cast5 - Fix checkpatch errors crypto: camellia - Fix checkpatch errors crypto: authenc - Fix checkpatch errors crypto: api - Fix checkpatch errors crypto: anubis - Fix checkpatch errors crypto: algapi - Fix checkpatch errors crypto: blowfish - Fix checkpatch errors crypto: aead - Fix checkpatch errors crypto: ablkcipher - Fix checkpatch errors crypto: pcrypt - call the complete function on error ... commit c4d1409bbed8cf2a11b48ce3a075e142f686a588 Author: Konrad Rzeszutek Wilk Date: Fri Feb 26 03:53:00 2010 +0000 ibft: Update MAINTAINERS file. Provide the right e-mail and names for me and Peter. Signed-off-by: Konrad Rzeszutek Wilk commit 00e7825b943f486e80ff1305cd0594d8791870f8 Author: Joe Perches Date: Thu Jan 14 11:34:19 2010 -0500 drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4 Convert netmask to __be32 and format it with %pI4 Signed-off-by: Joe Perches Signed-off-by: Konrad Rzeszutek Reviewed-by: Mike Christie Cc: Peter Jones Cc: James Bottomley Signed-off-by: Andrew Morton commit 398007f863a4af2b4a5a07219c5a617f1a098115 Merge: d67b1b0 60b341b Author: Alex Elder Date: Fri Feb 26 14:34:02 2010 -0600 Merge branch 'linux-2.6.33' commit a9c9b4429df437982d2fbfab1f4b46b01329e9ed Author: Rafael J. Wysocki Date: Thu Feb 25 22:32:37 2010 +0100 PM / Hibernate: Fix preallocating of memory The hibernate memory preallocation code allocates memory to push some user space data out of physical RAM, so that the hibernation image is not too large. It allocates more memory than necessary for creating the image, so it has to release some pages to make room for allocations made while suspending devices and disabling nonboot CPUs, or the system will hang due to the lack of free pages to allocate from. Unfortunately, the function used for freeing these pages, free_unnecessary_pages(), contains a bug that prevents it from doing the job on all systems without highmem. Fix this problem, which is a regression from the 2.6.30 kernel, by using the right condition for the termination of the loop in free_unnecessary_pages(). Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Alan Jenkins Cc: stable@kernel.org commit f8bb0db8188c7ef9ef08515883dae9f9eb980984 Author: Jiri Slaby Date: Sun Feb 21 22:14:44 2010 +0100 PM / Hibernate: Remove swsusp.c finally Its contents and entry in Makefile were already removed in 8e60c6a1348e17e68ad73589a52a03876e7059be (Shift remaining code from swsusp.c to hibernate.c) but somehow it remained in-place (rjw: which most likely was my mistake). Signed-off-by: Jiri Slaby Acked-by: Nigel Cunningham Signed-off-by: Rafael J. Wysocki commit 07c3bb5797d0a9a48524cca17ceb95711b48890b Author: Frans Pop Date: Thu Feb 11 23:09:08 2010 +0100 PM / Hibernate: Remove trailing space in message Remove a trailing space from a message in swsusp_save(). Signed-off-by: Frans Pop Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit 4cb077d93a57fb8bb64c277ec4ce637823cd76f4 Author: Rafael J. Wysocki Date: Mon Feb 8 19:18:26 2010 +0100 PM: Allow SCSI devices to suspend/resume asynchronously Set power.async_suspend for all SCSI devices, targets and hosts, so that they can be suspended and resumed in parallel with the main suspend/resume thread and possibly with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). The power.async_suspend flag is also set for devices that don't have suspend or resume callbacks, because otherwise they would make the main suspend/resume thread wait for their "asynchronous" children (during suspend) or parents (during resume), effectively negating the possible gains from executing these devices' suspend and resume callbacks asynchronously. Signed-off-by: Rafael J. Wysocki commit 927bc9165d3cd01054b472f9b25d91a8707209c8 Author: Rafael J. Wysocki Date: Mon Feb 8 19:18:16 2010 +0100 PM: Allow USB devices to suspend/resume asynchronously Set power.async_suspend for USB devices, endpoints and interfaces, allowing them to be suspended and resumed asynchronously during system sleep transitions. The power.async_suspend flag is also set for devices that don't have suspend or resume callbacks, because otherwise they would make the main suspend/resume thread wait for their "asynchronous" children (during suspend) or parents (during resume), effectively negating the possible gains from executing these devices' suspend and resume callbacks asynchronously. Signed-off-by: Rafael J. Wysocki commit 6d19c009cc780c63de25a046509ebc9473809fd6 Author: Alan Stern Date: Fri Feb 12 12:21:11 2010 +0100 USB: implement non-tree resume ordering constraints for PCI host controllers This patch (as1331) adds non-tree ordering constraints needed for proper resume of PCI USB host controllers from hibernation. The main issue is that non-high-speed devices must not be resumed before the high-speed root hub, because it is the ehci_bus_resume() routine which takes care of handing the device connection over to the companion controller. If the device resume is attempted before the handover then the device won't be found and it will be treated as though it had disconnected. The patch adds a new field to the usb_bus structure; for each full/low-speed bus this field will contain a pointer to the companion high-speed bus (if one exists). It is used during normal device resume; if the hs_companion pointer isn't NULL then we wait for the root-hub device on the hs_companion bus. A secondary issue is that an EHCI controlller shouldn't be resumed before any of its companions. On some machines I have observed handovers failing if the companion controller is reinitialized after the handover. Thus, the EHCI resume routine must wait for the companion controllers to be resumed. The patch also fixes a small bug in usb_hcd_pci_probe(); an error path jumps to the wrong label, causing a memory leak. [rjw: Fixed compilation for CONFIG_PM_SLEEP unset.] Signed-off-by: Alan Stern Acked-by: Greg Kroah-Hartman Signed-off-by: Rafael J. Wysocki commit a1e4d72cd3024999bfb6703092ea271438805c89 Author: Rafael J. Wysocki Date: Mon Feb 8 19:16:33 2010 +0100 PM: Allow PCI devices to suspend/resume asynchronously Set power.async_suspend for all PCI devices and PCIe port services, so that they can be suspended and resumed in parallel with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). This only affects the "regular" suspend and resume stages, which means in particular that the restoration of the PCI devices' standard configuration registers during resume will still be carried out synchronously (at the "early" resume stage). Signed-off-by: Rafael J. Wysocki commit 09c09bc618a4ceec387c57542031b4fc35826e16 Author: Jiri Slaby Date: Wed Jan 27 23:47:56 2010 +0100 PM / Hibernate: Swap, remove useless check from swsusp_read() It will never reach here if the sws_resume_bdev is erratic. swsusp_read() is called only from software_resume(), but after swsusp_check() which would catch the error state. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki commit b694e52ebdd439e4591d4a6651658026196174f6 Author: Jiri Slaby Date: Wed Jan 27 23:47:50 2010 +0100 PM / Hibernate: Really deprecate deprecated user ioctls They were deprecated and removed from exported headers more than 2 years ago. Inform users about their removal in the future now. (Switch cases needed to be reorderded for an easy fall through.) And add an entry to feature-removal-schedule. Signed-off-by: Jiri Slaby Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit f8824cee405c62ba465b85365201166d9cf86a14 Author: Rafael J. Wysocki Date: Wed Jan 27 23:47:38 2010 +0100 PM: Allow device drivers to use dpm_wait() There are some dependencies between devices (in particular, between EHCI USB controllers and their OHCI/UHCI siblings) which are not reflected by the structure of the device tree. With synchronous suspend and resume these dependencies are taken into accout automatically, because the devices in question are always registered in the right order, but to meet these constraints with asynchronous suspend and resume the drivers of these devices will need to use dpm_wait() in their suspend/resume routines, so introduce a helper function allowing them to do that. Signed-off-by: Rafael J. Wysocki commit 97df8c12995c5bac73e3bfeea4c5be155c1f4401 Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:31 2010 +0100 PM: Start asynchronous resume threads upfront It has been shown by testing that total device resume time can be reduced significantly (by as much as 50% or more) if the async threads executing some devices' resume routines are all started before the main resume thread starts to handle the "synchronous" devices. This is a consequence of the fact that the slowest devices tend to be located at the end of dpm_list, so their resume routines are started very late. Consequently, they have to wait for all the preceding "synchronous" devices before their resume routines can be started by the main resume thread, even if they are "asynchronous". By starting their async threads upfront we effectively move those devices towards the beginning of dpm_list, without breaking their ordering with respect to their parents and children. As a result, their resume routines are started much earlier and we are able to save much more device resume time this way. Signed-off-by: Rafael J. Wysocki commit 5a2eb8585f3b38e01e30aacaa8b985a1520a993d Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:23 2010 +0100 PM: Add facility for advanced testing of async suspend/resume Add configuration switch CONFIG_PM_ADVANCED_DEBUG for compiling in extra PM debugging/testing code allowing one to access some PM-related attributes of devices from the user space via sysfs. If CONFIG_PM_ADVANCED_DEBUG is set, add sysfs attribute power/async for every device allowing the user space to access the device's power.async_suspend flag and modify it, if desired. Signed-off-by: Rafael J. Wysocki commit 0e06b4a891c6a108412fe24b4500f499da2cf8a1 Author: Rafael J. Wysocki Date: Sat Jan 23 22:25:15 2010 +0100 PM: Add a switch for disabling/enabling asynchronous suspend/resume Add sysfs attribute /sys/power/pm_async allowing the user space to disable/enable asynchronous suspend/resume of devices. Signed-off-by: Rafael J. Wysocki commit 5af84b82701a96be4b033aaa51d86c72e2ded061 Author: Rafael J. Wysocki Date: Sat Jan 23 22:23:32 2010 +0100 PM: Asynchronous suspend and resume of devices Theoretically, the total time of system sleep transitions (suspend to RAM, hibernation) can be reduced by running suspend and resume callbacks of device drivers in parallel with each other. However, there are dependencies between devices such that we're not allowed to suspend the parent of a device before suspending the device itself. Analogously, we're not allowed to resume a device before resuming its parent. The most straightforward way to take these dependencies into accout is to start the async threads used for suspending and resuming devices at the core level, so that async_schedule() is called for each suspend and resume callback supposed to be executed asynchronously. For this purpose, introduce a new device flag, power.async_suspend, used to mark the devices whose suspend and resume callbacks are to be executed asynchronously (ie. in parallel with the main suspend/resume thread and possibly in parallel with each other) and helper function device_enable_async_suspend() allowing one to set power.async_suspend for given device (power.async_suspend is unset by default for all devices). For each device with the power.async_suspend flag set the PM core will use async_schedule() to execute its suspend and resume callbacks. The async threads started for different devices as a result of calling async_schedule() are synchronized with each other and with the main suspend/resume thread with the help of completions, in the following way: (1) There is a completion, power.completion, for each device object. (2) Each device's completion is reset before calling async_schedule() for the device or, in the case of devices with the power.async_suspend flags unset, before executing the device's suspend and resume callbacks. (3) During suspend, right before running the bus type, device type and device class suspend callbacks for the device, the PM core waits for the completions of all the device's children to be completed. (4) During resume, right before running the bus type, device type and device class resume callbacks for the device, the PM core waits for the completion of the device's parent to be completed. (5) The PM core completes power.completion for each device right after the bus type, device type and device class suspend (or resume) callbacks executed for the device have returned. Signed-off-by: Rafael J. Wysocki commit 8cc6b39ff36b4bbce2d7471da088df122b0e9033 Author: Rafael J. Wysocki Date: Sat Jan 23 22:03:29 2010 +0100 PM: Add parent information to timing messages Add parent information to the messages printed by the suspend/resume core when initcall_debug is set. Signed-off-by: Rafael J. Wysocki commit 971cb7fba0c84dd74c39020f4596b08398f58199 Author: Rafael J. Wysocki Date: Sat Jan 23 22:03:22 2010 +0100 PM: Document device power attributes in sysfs There are sysfs attributes in /sys/devices/.../power/ that haven't been documented yet in Documentation/ABI/. Document them as appropriate. Signed-off-by: Rafael J. Wysocki commit 53823639173cc9e9a261f68f4abefe62364b86c6 Author: Rafael J. Wysocki Date: Sat Jan 23 22:02:51 2010 +0100 PM / Runtime: Add sysfs switch for disabling device run-time PM Add new device sysfs attribute, power/control, allowing the user space to block the run-time power management of the devices. If this attribute is set to "on", the driver of the device won't be able to power manage it at run time (without breaking the rules) and the device will always be in the full power state (except when the entire system goes into a sleep state). Signed-off-by: Rafael J. Wysocki Acked-by: Alan Stern commit 3621263a4d9679726b7bc1e2546c1c03941a59b4 Author: Mauro Carvalho Chehab Date: Fri Feb 26 15:58:11 2010 -0300 V4L-DVB: cx88-dvb: remove extra attribution for core This is not needed, since the function already do it. Also, it causes a warning at the compilation, since a new var is declared in the middle of the code. Signed-off-by: Mauro Carvalho Chehab commit 68c6b859846bd078b37c6ca5f3882032f129e72d Merge: a4a47bc bb8d413 Author: Linus Torvalds Date: Fri Feb 26 10:35:27 2010 -0800 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (48 commits) x86/PCI: Prevent mmconfig memory corruption ACPI: Use GPE reference counting to support shared GPEs x86/PCI: use host bridge _CRS info by default on 2008 and newer machines PCI: augment bus resource table with a list PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs PCI: read bridge windows before filling in subtractive decode resources PCI: split up pci_read_bridge_bases() PCIe PME: use pci_pcie_cap() PCI PM: Run-time callbacks for PCI bus type PCIe PME: use pci_is_pcie() PCI / ACPI / PM: Platform support for PCI PME wake-up ACPI / ACPICA: Multiple system notify handlers per device ACPI / PM: Add more run-time wake-up fields ACPI: Use GPE reference counting to support shared GPEs PCI PM: Make it possible to force using INTx for PCIe PME signaling PCI PM: PCIe PME root port service driver PCI PM: Add function for checking PME status of devices PCI: mark is_pcie obsolete PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges PCI: pciehp: second try to get big range for pcie devices ... commit b6fa8796b2da0390e9f4115e8789a01004fc1c9b Author: David Teigland Date: Thu Feb 25 12:20:57 2010 -0600 dlm: use bastmode in debugfs output The bast mode that appears in the debugfs output should be useful on both master and process nodes. lkb_highbast is currently printed, and is only useful on the master node. lkb_bastmode is only useful on the process node. This patch sets lkb_bastmode on the master node as well, and uses that value in the debugfs print. Signed-off-by: David Teigland commit b4a5d4bc377e49239374f266f0a0e2772c29749c Author: Steven Whitehouse Date: Wed Feb 17 09:41:34 2010 +0000 dlm: Send lockspace name with uevents Although it is possible to get this information from the path, its much easier to provide the lockspace as a seperate env variable. Signed-off-by: Steven Whitehouse Signed-off-by: David Teigland commit 84f3751d6a6f766780dee509433bf7b3dfcdf465 Author: Baruch Siach Date: Fri Feb 19 14:09:25 2010 -0300 V4L/DVB: v4l: soc_camera: fix bound checking of mbus_fmt[] index When code <= V4L2_MBUS_FMT_FIXED soc_mbus_get_fmtdesc returns a pointer to mbus_fmt[x], where x < 0. Fix this. Signed-off-by: Baruch Siach Signed-off-by: Guennadi Liakhovetski CC: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 4f3ca2f152844c5f6ea853077f56d0db877d1f7a Author: Dirk Herrendoerfer Date: Thu Feb 11 18:06:34 2010 -0300 V4L/DVB: Add support for SMT7020 to cx88 This patch adds support for the built-in dvb device of a Samsung SMT7020s (x86 based STB) to the cx88 family. Signed-off-by: Dirk Herrendoerfer Signed-off-by: Helmut Auer Signed-off-by: Mauro Carvalho Chehab commit 144dcdceb6ca320d7b3dffa6eea6c0a57cbfbb18 Author: Tobias Lorenz Date: Thu Feb 18 16:33:46 2010 -0300 V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment This cosmetic patch corrects a wrong unicode "micro" character in a comment. Signed-off-by: Tobias Lorenz Signed-off-by: Mauro Carvalho Chehab commit d2fa21876147005ba942cef1d9e5a5039b4326bd Author: Joe Perches Date: Tue Feb 23 14:08:20 2010 -0300 V4L/DVB: MAINTAINERS: Telegent tlg2300 section fix linux-next commit 2ff8223957d901999bf76aaf2c6183e33a6ad14e exposes an infinite loop defect in scripts/get_maintainer.pl Fix the incorrect format of the MAINTAINERS "M:" entries. Signed-off-by: Joe Perches Acked-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 0158e98fa15f6980568d7c3f67f035d3783319cd Author: Hans de Goede Date: Sat Feb 20 11:26:07 2010 -0300 V4L/DVB: gspca_stv06xx: Add support for camera button Only tested with an stv6422 based cam, as that is the only stv06xx cam I have with a button. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 88e8d20a8c7c84533e1aa89dd45354cb5edded37 Author: Hans de Goede Date: Sat Feb 20 04:45:49 2010 -0300 V4L/DVB: gspca_ov519: add support for the button on ov511 based cams Due to hardware limitations this only works while the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 92e232acd61f610e09449dad3f6ff6d3c78887e9 Author: Hans de Goede Date: Sat Feb 20 04:30:45 2010 -0300 V4L/DVB: gspca_ov519: Add support for the button on ov518 based cams Due to hardware limitations this only works while the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 417a4d26591e3f2b7784791246048ed315f3fdce Author: Hans de Goede Date: Fri Feb 19 07:37:08 2010 -0300 V4L/DVB: gspca_ov519: add support for the button on ov519 based cams Note due to hardware limitiations (no interrupt endpoint), this only works when the camera is streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit e7637521ac92ce99045b8f8a9c1419bb7814ff9a Author: Hans de Goede Date: Fri Feb 19 05:11:09 2010 -0300 V4L/DVB: gspca_main: Fix a compile error when CONFIG_INPUT is not set gspca_main: Fix a compile error when CONFIG_INPUT is not set. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 10ee2402004d03b31555aad7badf7e499fa686d3 Author: Hans de Goede Date: Fri Feb 19 04:41:40 2010 -0300 V4L/DVB: gspca_main: some input error handling fixes 2 small changes to input device error handling: 1) Make it fatal when we fail to create an input device (it is either this or add checks for gspca_dev->input_dev being NULL in a lot of places) 2) Since we allow gspca_input_create_urb() to fail everywhere we call it, and thus never check its return value, make it void. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ac82f59f9cc6aae3300430fcc3422e59f83d89ae Author: Hans de Goede Date: Fri Feb 19 04:28:39 2010 -0300 V4L/DVB: gspca_main: Allow use of input device creation code for non int. inputs Allow use of the gspca core input device creation code by subdrivers which have non interrupt driven camera buttons. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 5fb2dde28122e74bbab9dae3cc04bcbc8c08b332 Author: Hans de Goede Date: Wed Feb 17 11:59:19 2010 -0300 V4L/DVB: gspca_pac7302: much improved exposure control My experience with fixing up the controls for the PAS sensors in sonixb, has lead me to re-investigate the exposure control for the pac7302. I've now found a regular exposure register in register bank 3 (which seems to be the sensor registers bank), and with this added a proper fine grained exposure control. This patch also updates the do_autogain function to work properly with this new finer grained control. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 0e4b91c30605ae030d4ff63c5160e54c1bc2682c Author: Hans de Goede Date: Wed Feb 10 20:29:43 2010 -0300 V4L/DVB: gspca_sonixb: Make sonixb driver handle pas106 and pas202 cameras Make the sonixb driver handle pas106 and pas202 cameras, when both it and the sn9c102 driver are enabled in the kernel configuration. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 421763e7764e424dcb14ef17ef72ae1eb4ec79fe Author: Hans de Goede Date: Wed Feb 10 18:57:40 2010 -0300 V4L/DVB: gspca_sonixb: pas106: fixup bright ctrl and add gain and exposure ctrls Fixup brightness ctrl and add gain and exposure ctrls for PAS106B sensors, this allows enabling autogain (done), and makes the cam usable in low light conditions. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 606f8428ca1c2fbc665f726b4f810b8d50b87954 Author: Hans de Goede Date: Wed Feb 10 06:49:23 2010 -0300 V4L/DVB: Documentation: gspca.txt: update known mr97310a cams Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9d3103d061224e939272d05d54192038f66ffd54 Author: Theodore Kilgore Date: Tue Feb 9 18:05:25 2010 -0300 V4L/DVB: gspca_mr97310a: add support for the Sakar 1638x CyberPix This camera has a sensor type we did not support sofar, this patch adds support for the new sensor type found in the Sakar 1638x CyberPix. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 10bb7530108cc11fedd0d615467a54f341079778 Author: Hans de Goede Date: Thu Feb 4 06:10:55 2010 -0300 V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480 In 640x480, if the reg11 has less than 4, the image is unstable (the bridge goes into a higher compression mode which we have not reverse engineered yet). Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 82e839c9c5f79c4e55dc1b6ecb2cf1c055f753c5 Author: Hans de Goede Date: Wed Feb 3 14:37:30 2010 -0300 V4L/DVB: gspca_sonixb: pas202: fixup brightness ctrl and add gain and exposure ctrls Fixup brightness ctrl and add gain and exposure ctrls for PAS202BCB sensors, this allows enabling autogain (done), and makes the cam usable in low light conditions. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 26984b09952d01afabaa38e747fbee083dde0374 Author: Hans de Goede Date: Mon Feb 1 13:18:37 2010 -0300 V4L/DVB: gscpa_sonixb: Differentiate between sensors with a coarse and fine expo ctrl Some sensors only allow controlling the exposure by changing the clockdiv, which means that exposure takes pretty large jumps (for example when going from a div of 1 to 2, the exposure doubles). Use 2 different entries in the controls array for these 2 different types of exposure (always disabling one), and; Add a new autogain algorithm for the coarse exposure case, which normally changes the gain setting, only touching the exposure setting if the desired luminance cannot be reached with gain, and after an exposure change once more first tries gain, etc. Thus avoiding exposure changes, and the resulting oscilation because of the huge steps these exposure controls take. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 4efcfa0af11d75fa6311ef62180eefcd654be3c1 Author: Hans de Goede Date: Mon Feb 1 07:48:17 2010 -0300 V4L/DVB: gspca_sonixb: leave bridge gain at 1.0 when we have a sensor gain Leave bridge gain at 1.0 when we have a sensor gain, while at it also change the bridge gain setting code to write both registers in one go saving us a usb transaction. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9712a8be6b842ba9ffbd1b74a8d9b04c785b8ac1 Author: Hans de Goede Date: Sun Jan 31 12:54:29 2010 -0300 V4L/DVB: gspca_sonixj: Add camera button support gspca_sonixj: Add camera button support Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit f65e93d60050ae4cf281b55b59864e7e7a08eb58 Author: Hans de Goede Date: Sun Jan 31 10:35:15 2010 -0300 V4L/DVB: gspca_sonixb: Add support for camera button gspca_sonixb: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 1a3510265b45e2d7f55879c7ff576b947e0b1bd7 Author: Hans de Goede Date: Fri Jan 29 11:05:25 2010 -0300 V4L/DVB: gscpa_zc3xx: Add support for camera button gscpa_zc3xx: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 32ea3e44b9d9125960e23f56ce86c39700447717 Author: Hans de Goede Date: Fri Jan 29 11:04:19 2010 -0300 V4L/DVB: gscpa_pac7311: Add support for camera button gscpa_pac7311: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 937a6f54e31f3899c93cbe975d2ea7599dadd666 Author: Hans de Goede Date: Fri Jan 29 11:02:10 2010 -0300 V4L/DVB: gscpa_pac207: Add support for camera button gscpa_pac207: Add support for camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 4f3a89e48a9975ab3f777ea15ac161267e4b8794 Author: Hans de Goede Date: Sun Jan 17 10:45:13 2010 -0300 V4L/DVB: gscpa Documentation: add cpia1 cameras gscpa Documentation: add cpia1 cameras Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit eb900690519e2a8f18076bc821baccc6f6236c74 Author: Hans de Goede Date: Sun Jan 17 10:42:55 2010 -0300 V4L/DVB: gspca_sq905c: Add an additional USB-ID gspca_sq905c: Add an additional USB-ID Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c260fe936de6a52010a3247f9c3e8da47d9726e8 Author: Theodore Kilgore Date: Fri Jan 15 05:54:36 2010 -0300 V4L/DVB: gspca_mr97310a: Simplify sensor detection Simplify sensor detection a bit (share more of the code between cif and vga cameras). Also remove an unnecessary write from zero_the_pointer(). Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c1ea5b7424e4d1d3f56de1504a257ec2419259e8 Author: Andy Walls Date: Sat Feb 20 21:28:39 2010 -0300 V4L/DVB: ivtv: Tweak Sony GigaPocket Kikyou card entry based on experiments Based on experiments by Eric Wescott, edit the Sony GigaPocket (Kikyou) card entry video and audio mux settings. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7c12167bae57994e30cc5258e8aaa6fb06258f46 Author: Eric Anderson Date: Wed Feb 10 22:14:54 2010 -0300 V4L/DVB: ivtv: Add initial entry for Sony VAIO Giga Pocket (Kikyou) cards This is a slightly modified version of Eric Anderson's original patch for the Sony Giga Pocket board. It has been updated to apply to the latest ivtv driver version by Hans Verkuil and Andy Walls . Also Andy Walls modified the patch to use a new Sony BTF-Pnx01Z tuner entry based on Eric Anderson's experimental findings for the bandswitch. >From Eric Anderson's original email: 1. The tuner on the card doesn't seem to match any standard ones. I modified an existing tuner entry. Ideally a new tuner entry should be created. (The only difference from the one I modified is that the low-to-mid range frequency cut-off is slightly different, as are the bit config settings.) 2. It wasn't obvious how to choose a second audio input other than using "radio" as an option. Basically there's two GPIO audio inputs. Using radio allowed me to avoid major restructuring to the code. (perhaps other cards don't have this often...) 3. It's not clear that there's a mute setting that works. Not sure why. 4. I haven't had a chance to test the two Svideo inputs. I set them to COMPOSITE1 and SVIDEO2, but I'm not sure those are the correct settings. The standard composite video inputs seem to work. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit dbb9de9bc137e08dc47db960d5730e3251932e2b Author: Andy Walls Date: Wed Feb 10 19:02:58 2010 -0300 V4L/DVB: tuner-types: Add Sony BTF-Pxn01Z tuner type used on GigaPocket cards Sony makes custome tuners for its GigaPocket line of ivtv based capture cards. This adds an entry to the tuner-types list for such tuners. Parameters are based on experiments by Eric Anderson . Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 587808d5f59e842f9258a15e88ad530fcf6e6763 Author: Andy Walls Date: Wed Feb 10 15:34:46 2010 -0300 V4L/DVB: ivtv: Fix ivtv_api_get_data() to avoid unneeded IO during IRQ handling ivtv_api_get_data() was performing more PCI MMIO than needed, resulting often in it accounting for more than half the total time spent in ivtv_irq_handler(). Now it only reads at most 7 of the 16 mailbox data words over the PCI bus, and in some instances only 2 or 3 data words as needed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 00cb9f6920aaeb34bcef146085ae57e363641a85 Author: Murali Karicheri Date: Sun Feb 21 15:52:45 2010 -0300 V4L/DVB: V4L - vpfe capture - build environment for isif driver Adding Makefile and Kconfig for ISIF driver Reviewed-by: Hans Verkuil Reviewed-by: Sergei Shtylyov Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit 85b848caf77a0cc6a9df0a0f40d876211b394682 Author: Murali Karicheri Date: Sun Feb 21 15:51:14 2010 -0300 V4L/DVB: V4L - vpfe capture - vpss driver enhancements for DM365 Enhancements to support DM365 ISP5 and VPSS module configuration. Also cleaned up the driver by removing redundant variables. Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit 63e3ab142fa3f46c290891655681c6a6304bd2b3 Author: Murali Karicheri Date: Sun Feb 21 15:48:27 2010 -0300 V4L/DVB: V4L - vpfe capture - source for ISIF driver on DM365 This is the source file for ISIF driver on DM365. ISIF driver is equivalent to CCDC driver on DM355 and DM644x. This driver is tested for YUV capture from TVP514x driver. This patch contains the header files required for this driver. Reviewed-by: Nori, Sekhar Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit e8417683eb15f05941f4c2aad7d358472eaf8a32 Author: Murali Karicheri Date: Sun Feb 21 15:46:01 2010 -0300 V4L/DVB: V4L - vpfe capture - header files for ISIF driver This is the header file for ISIF driver on DM365. ISIF driver is equivalent to CCDC driver on DM355 and DM644x. This driver is tested for YUV capture from TVP514x driver. This patch contains the header files required for this driver. Reviewed-by: Nori, Sekhar Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Murali Karicheri Signed-off-by: Mauro Carvalho Chehab commit a30d6744cf3bfc62d5cdcc9756e7e8e97fe39f17 Author: Murali Karicheri Date: Mon Feb 1 19:36:19 2010 -0300 V4L/DVB: DaVinci - Adding platform & board changes for vpfe capture on DM365 This patch adds following changes:- 1) add sub device configuration data for TVP5146 used by vpfe capture 2) registers platform devices for vpfe_capture, isif and vpss 3) defines hardware resources for the devices listed under 2) 4) defines clock aliase for isif driver 5) adding setup_pinmux() for isif Reviewed-by: Kevin Hilman Signed-off-by: Murali Karicheri Signed-off-by: Kevin Hilman Signed-off-by: Mauro Carvalho Chehab commit fb640224ad9e4e33726b8762bcfed2a266243b4e Author: Mike Isely Date: Sat Feb 6 02:17:17 2010 -0300 V4L/DVB: pvrusb2: Adjust 300msec digitizer wait to be more selective We know that the 300msec settling time after starting the digitizer is only really needed when the digitizer is a SAA7115. So if we're not using a SAA7115, skip the delay. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 91b5b489c5ea0fb206922f1bfbd0bd843b6f326f Author: Mike Isely Date: Sat Feb 6 02:12:33 2010 -0300 V4L/DVB: pvrusb2: Reduce encoder quiet period After implementing a 300msec wait between digitizer start and encoder start, it has been determined that we don't need to wait quite as long before configuring the encoder. This reduces the wait period from 100msec back to 50msec. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 6e9313755aacdb9fd4eec58cbd9653212e2e2cdc Author: Mike Isely Date: Sat Feb 6 02:10:38 2010 -0300 V4L/DVB: pvrusb2: Enforce a 300msec stabilization interval during stream strart Martin Dauskardt has determined that the encoder has a much better chance of starting cleanly if we deliberately hold off starting it util the video digitizer has had a chance to run for at least 300msec first. These changes implement an enforced 300msec wait in the state machine that orchestrates streaming start / stop. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7cae112ebe10e186c3bdae1f20865941717e37a2 Author: Mauro Carvalho Chehab Date: Mon Feb 22 18:55:00 2010 -0300 V4L/DVB: V4L2 docs: replace spaces by tabs CC: Jonathan Corbet CC: Reviewed-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 4b586a38b048b0d78874721e5b26cb6476fafb60 Author: Jonathan Corbet Date: Mon Feb 22 17:47:46 2010 -0300 V4L/DVB: V4L2: Add a document describing the videobuf layer Videobuf is a moderately complex API which most V4L2 drivers should use, but its documentation is...sparse. This document attempts to improve the situation. Signed-off-by: Jonathan Corbet Reviewed-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 995f5fefb0c6abba3688b3aadf40e422b64b814a Author: Hans Verkuil Date: Sat Feb 20 09:41:03 2010 -0300 V4L/DVB: media-spec: Fix documentation mistakes regarding I/O streaming The media spec contains several errors in the description of the I/O streaming ioctls, in particular with respect to the userptr I/O method. The most important change is that you really need to set count and index in v4l2_requestbuffer and v4l2_buffer when dealing with user pointer streaming. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 340dde817a4f68af79453ed295ca0e8de7232669 Author: Hans Verkuil Date: Sat Feb 20 08:07:51 2010 -0300 V4L/DVB: saa7115: fix saa7111a support When the saa7111 driver was merged into saa7115 several bugs were introduced, in particular with the saa7111a support as is used in the mxb.c driver. This patch fixes the saa7111a support. This was tested with the mxb driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cd7d9beb09d89d62bc3c6336e4cb9a2ee3da6163 Author: Hans Verkuil Date: Sat Feb 20 07:56:25 2010 -0300 V4L/DVB: saa7146_vv: fix regression where v4l2_device was registered too late v4l2_device_register needs to be called before the i2c subdevs are loaded. However, it was called afterwards in the saa7146 driver. This caused an oops when loading the mxb and hexium drivers. The vv_init function is now split into two: one registers the v4l2_device, the other does the rest of the initialization. The three drivers that depend on this have been updated to call the new vv_devinit function. Thanks to Michael Hunold for reporting this. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8d55662512127c84ac90873fb68ba44842e2c426 Author: Laurent Pinchart Date: Thu Feb 4 21:43:37 2010 -0300 V4L/DVB: uvcvideo: Check uvc_ctrl_begin return value in VIDIOC_S_CTRL The function return value wasn't checked due to a missing variable assignment. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 9405e3cbd5dd6767875c573574672cb85c4d7374 Author: Laurent Pinchart Date: Wed Feb 3 06:49:35 2010 -0300 V4L/DVB: uvcvideo: Blacklist gain control for Asus EeePC T91 integrated webcam The Asus EeePC T91 integrated webcam exposes a gain control in the processing unit but stalls when the control is queried. Blacklist the gain control for that camera. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit e54532e591cd5b9ce77dbc8d9786ae9f600f101a Author: Laurent Pinchart Date: Sat Jan 23 07:07:53 2010 -0300 V4L/DVB: uvcvideo: Clamp control values to the minimum and maximum values When setting a control, the V4L2 specification requires drivers to either clamp the control value to the [minimum, maximum] range or return the -ERANGE error. Fix the driver to clamp control values to the valid range in uvc_ctrl_set() and make sure the value differs from the minimum by an integer multiple of step. Signed-off-by: Laurent Pinchart Tested-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 59529081e092506edb81a42d914e2d0522f65ca7 Author: Laurent Pinchart Date: Sat Jan 23 06:30:20 2010 -0300 V4L/DVB: uvcvideo: Cache control min, max, res and def query results Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 8a4e76c14cbe0609fdb5c558f867fe7c556bb1c7 Author: Laurent Pinchart Date: Thu Jan 21 16:53:11 2010 -0300 V4L/DVB: uvcvideo: Return -ERANGE when setting a control to an out-of-range menu index The V4L2 specification states that out of bounds control values must either be clamped to the valid range or result in a -ERANGE error code. Fix the driver to return -ERANGE instead of -EINVAL when setting a menu control to an invalid value. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 36bd883ef98ac6003ab6ec7b91f66d3fb2159318 Author: Laurent Pinchart Date: Tue Jan 19 09:06:22 2010 -0300 V4L/DVB: uvcvideo: Use %pUl printk format specifier to print GUIDs Replace the UVC_GUID_FORMAT and UVC_GUID_ARGS macros with the new %pUl printk format specifier. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 56d15cd313d0d0d7a16c1a2e2cc519f18ab4725a Author: Laurent Pinchart Date: Tue Jan 19 08:59:21 2010 -0300 V4L/DVB: uvcvideo: Increase the streaming control timeout to 5 seconds This fixes timeout issues with some Logitech webcams. The timeout value seems to match the one used in the Logitech Windows driver, so no further increase should be necessary. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit e070bf9ef85e293d9dc586fbfabc008795564c0e Author: Jean-François Moine Date: Thu Feb 18 15:02:51 2010 -0300 V4L/DVB: gspca - main: Fix a compile error when CONFIG_INPUT is not set Reported-by: Randy Dunlap Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 1e5eb1133aac7982dd941b473e23cd396acb2706 Author: Jean-François Moine Date: Thu Feb 18 14:56:33 2010 -0300 V4L/DVB: gspca - sonixj: Set the vertical flip at capture start for all sensors Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f6b22e5e8e93d03046d3878664a9ba375ccded96 Author: Jean-François Moine Date: Thu Feb 18 04:12:06 2010 -0300 V4L/DVB: gspca - sonixj: Add vertical flip control for sensor hv7131r Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit bee527f97963ece5e3f6e6587402197af889865b Author: Pawel Osciak Date: Mon Feb 22 13:10:06 2010 -0300 V4L/DVB: videobuf: add missing checks for kzalloc returning NULL Signed-off-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit cca80b973244cf7cf721b05b33178ba4826dbc5e Author: Clemens Ladisch Date: Mon Feb 22 06:45:07 2010 -0300 V4L/DVB: cx88-alsa: prevent out-of-range volume setting Ensure that volume values are always in the allowed range. Otherwise, it would be possible to set other bits in the AUD_VOL_CTL register or to get a wrong sign in the AUD_BAL_CTL register. Signed-off-by: Clemens Ladisch Signed-off-by: Mauro Carvalho Chehab commit 071193ff4182c8f785e770c54e35f3ea2bb98b84 Author: Richard Röjfors Date: Fri Feb 19 19:41:54 2010 -0300 V4L/DVB: mfd: Add timb-radio to the timberdale MFD This patch addes timb-radio to all configurations of the timberdale MFD. Connected to the FPGA is a TEF6862 tuner and a SAA7706H DSP, the I2C board info of these devices is passed via the timb-radio platform data. Signed-off-by: Richard Röjfors Cc: sameo@linux.intel.com Signed-off-by: Mauro Carvalho Chehab commit 1f39b5834a3c6c9f107b869d38dca0622e913a3d Author: Roel Kluin Date: Mon Feb 15 19:30:38 2010 -0300 V4L/DVB: dvb-usb/opera1: misplaced parenthesis The parenthesis was misplaced, tmp is set to 0 or break occurs, while debugging opera1_usb_i2c_msgxfer() retval was not shown. Signed-off-by: Roel Kluin CC: Marco Gittler Signed-off-by: Mauro Carvalho Chehab commit 7d3502844609df0985932365197f905e4ea95d22 Author: Mauro Carvalho Chehab Date: Fri Feb 19 20:08:06 2010 -0200 V4L/DVB: tuner-xc2028: Fix demod breakage for XC3028L A small mistake on the last patch broke demod s-code setup for XC3028L (firmware 3.2 and upper). Fix it. Thanks-to: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7f2199c03b4946f1b79514b3411e3dbf130a6bba Author: Mauro Carvalho Chehab Date: Fri Feb 19 02:45:00 2010 -0200 V4L/DVB: tuner-xc2028: fix tuning logic to solve a regression in Australia There's one reported regression in Australia (DTV7) and some reported troubles with newer firmwares found on xc3028l chips. Rework the logic to improve tuner on those cases. Thanks-to: Robert Lowery Thanks-to: Stefan Ringel Tested-by: Robert Lowery CC: stable.kernel.org Signed-off-by: Mauro Carvalho Chehab commit d90a4ae4ae5a5e535782ab090507898e042db81a Author: Jean Delvare Date: Tue Feb 16 14:22:37 2010 -0300 V4L/DVB: bttv: Let the user disable IR support Add a new module parameter "disable_ir" to disable IR support. Several other drivers do that already, and this can be very handy for debugging purposes. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 656380118d1a1c0176e58e4e3e46d736d0dd2000 Author: Catimimi Date: Thu Feb 18 18:06:32 2010 -0300 V4L/DVB: em28xx : Terratec Cinergy Hybrid T USB XS FR is working I succeeded in running Cinergy Hybrid T USB XS FR in both modes. Signed-off-by: Mauro Carvalho Chehab commit 7ccf1eea972177064b4df9d5ba68958604781db6 Author: Randy Dunlap Date: Sun Feb 14 23:39:32 2010 -0300 V4L/DVB: dvb: fix sparse warnings Fix sparse warnings in media/dvb/frontends: drivers/media/dvb/frontends/dibx000_common.c:177:13: warning: non-ANSI function declaration of function 'systime' drivers/media/dvb/frontends/tda665x.c:136:55: warning: right shift by bigger than source value [mchehab@redhat.com: removed the change at dib0090 since it got fixed by a previous patch] Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 18718c96e3e10e6b821d32c50adde9fa5cc6565a Author: Jiri Slaby Date: Sun Feb 14 17:36:25 2010 -0300 V4L/DVB: V4L: dvb-usb, add extra sync to down-up input events Userspace is allowed to coalesce events between SYNCs. And since the code emits UP right after DOWN for the same key, it may be missed (up+down=nothing). Add an extra sync in between UP and DOWN events to disable the coalesce. Signed-off-by: Jiri Slaby Cc: Patrick Boettcher Acked-by: Dmitry Torokhov Signed-off-by: Mauro Carvalho Chehab commit fdd70c3399fc448a87487b287f4f0dcfb2e9c52c Author: Lars Hanisch Date: Sun Feb 14 08:57:39 2010 -0300 V4L/DVB: add missing 'p' at card name 'Hauppauge HD PVR' I don't know if there are applications which rely on this name, but after all it's a spelling mistake. Signed-off-by: Lars Hanisch CC: Janne Granau Signed-off-by: Mauro Carvalho Chehab commit 9a0a75a5abb2806969a599e10b0fb287befcb3a7 Author: Franklin Meng Date: Sat Feb 13 02:37:15 2010 -0300 V4L/DVB: Add an entry for Kworld 315U remote Signed-off-by: Franklin Meng Signed-off-by: Mauro Carvalho Chehab commit 536004403d35b707bbac43d629586ee9c944084f Author: Randy Dunlap Date: Fri Feb 12 18:02:35 2010 -0300 V4L/DVB: radio_timberdale: depends on I2c RADIO_TIMBERDALE selects RADIO_SAA7706H, but RADIO_SAA7706H depends on I2C, so make RADIO_TIMBERDALE depend on I2C also; otherwise there are build errors: drivers/media/radio/saa7706h.c:139: error: implicit declaration of function 'i2c_master_send' drivers/media/radio/saa7706h.c:148: error: implicit declaration of function 'i2c_transfer' drivers/media/radio/saa7706h.c:372: error: implicit declaration of function 'i2c_check_functionality' drivers/media/radio/saa7706h.c:375: error: implicit declaration of function 'i2c_adapter_id' drivers/media/radio/saa7706h.c:438: error: implicit declaration of function 'i2c_add_driver' drivers/media/radio/saa7706h.c:443: error: implicit declaration of function 'i2c_del_driver' Signed-off-by: Randy Dunlap Cc: Mocean Laboratories Signed-off-by: Mauro Carvalho Chehab commit 08cf8a57c51da7db9633c2827b3dbabfb7df51fd Author: Randy Dunlap Date: Fri Feb 12 18:02:29 2010 -0300 V4L/DVB: media/video/tlg2300: fix build when CONFIG_PM=n When CONFIG_PM is not enabled, tlg2300 has build errors, so handle that case, mostly via stubs. drivers/media/video/tlg2300/pd-alsa.c:237: error: 'struct poseidon' has no member named 'msg' drivers/media/video/tlg2300/pd-main.c:412: error: implicit declaration of function 'find_old_poseidon' drivers/media/video/tlg2300/pd-main.c:418: error: implicit declaration of function 'set_map_flags' drivers/media/video/tlg2300/pd-main.c:462: error: implicit declaration of function 'get_pd' Cc: linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org Signed-off-by: Randy Dunlap Cc: Huang Shijie Cc: Kang Yong Cc: Zhang Xiaobing Signed-off-by: Mauro Carvalho Chehab commit 546e29b66a1aeec3b6a710aceeb2149871570416 Author: Randy Dunlap Date: Fri Feb 12 12:30:55 2010 -0300 V4L/DVB: timberdale: fix mfd build Fix mfd/timberdale build error -- add depends GPIOLIB. include/linux/spi/max7301.h:14: error: field 'chip' has incomplete type build-r7353.out:make[3]: *** [drivers/mfd/timberdale.o] Error 1 Repairs commit ff7a26e08a16bb31158d830dbf60db2ff47019ab Author: Richard Rjfors AuthorDate: Thu Feb 4 08:18:52 2010 -0300 Commit: Mauro Carvalho Chehab CommitDate: Fri Feb 5 12:25:37 2010 -0200 V4L/DVB: mfd: Add support for the timberdale FPGA Signed-off-by: Randy Dunlap Cc: Richard Rojfors Cc: Samuel Ortiz Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 1952c9bd5d75e65453bfb823098bd63e11723b05 Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:57 2009 -0300 V4L/DVB: Kbuild addition for TVP7002 driver This patch provides menu configuration options for the TVP7002 decoder driver in DM365. Includes only TVP7002. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit dfbd5d4d324e630aedc40b7519351a9c0fe94dc9 Author: Hans Verkuil Date: Thu Feb 25 17:34:09 2010 -0300 V4L/DVB: tvp7002: fix compilation breakage when advanced debug is enabled > On Mon, 22 Feb 2010 08:21:44 -0800 Randy Dunlap wrote: > drivers/media/video/tvp7002.c:896: error: 'struct tvp7002' has no member named 'registers' > > so where are these registers?? Hmm, that code is a remnant from older revisions of this driver. Unfortunately, when I compiled this driver before creating my pull request I forgot to turn on the CONFIG_VIDEO_ADV_DEBUG option and so I never saw it. Also fixed the g_register function: it never returned a register value in the original code. Signed-off-by: Hans Verkuil Acked-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 0b67553657330b5ad5c78a974ce84273a515fe4e Author: Santiago Nunez-Corrales Date: Mon Dec 21 16:14:04 2009 -0300 V4L/DVB: TVP7002 driver for DM365 This patch provides the implementation of the TVP7002 decoder driver for DM365. Implemented using the V4L2 DV presets API. Removed shadow register values. Testing shows that the device needs not to be powered down and up for correct behaviour. Improved readability. Uses helper function for preset information. [mchehab@redhat.com: Fix bad Whitespacing] Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit d2da2611cc7641a194a868f41fbe4a83cb46964c Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:39 2009 -0300 V4L/DVB: Definitions for TVP7002 in DM365 This patch provides the required definitions for the TVP7002 driver in DM365. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ff9118a516cd4d58f984dded2e39937395867a4b Author: Santiago Nunez-Corrales Date: Fri Dec 18 14:07:29 2009 -0300 V4L/DVB: Support for TVP7002 in v4l2 definitions This patch provides required chip identification definitions within v4l2. Included only definitions for TVP7002. Signed-off-by: Santiago Nunez-Corrales Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4105ed5df1e16afbbea4c96f8d513bda21248308 Author: Manu Abraham Date: Sun Feb 14 17:07:28 2010 -0300 V4L/DVB: AZ6027: Fix build warnings drivers/media/dvb/dvb-usb/az6027.c:390: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:390: warning: (near initialization for ‘az6027_rc_keys[0]’) drivers/media/dvb/dvb-usb/az6027.c:391: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:391: warning: (near initialization for ‘az6027_rc_keys[1]’) drivers/media/dvb/dvb-usb/az6027.c:759: warning: ‘az6027_read_mac_addr’ defined but not used Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 32f8aca4affc9cc5699a8e45b3ce08e76d7b847b Author: Mauro Carvalho Chehab Date: Wed Feb 17 23:54:07 2010 -0200 Revert "V4L/DVB: az6027: az6027_read_mac_addr is currently unused" This reverts commit 1e08370814e8902074d59cc57f2b4c1a62f00ee8. Patch were wrongly applied. Signed-off-by: Mauro Carvalho Chehab commit b00380fcb760070d5bfdc69ed7273084a629db4d Author: Mauro Carvalho Chehab Date: Wed Feb 17 23:53:04 2010 -0200 Revert "V4L/DVB: az6027: IR RC keys are using the old struct with 3 parameters, instead of 2" This reverts commit 234497b022c464532976b8a12614819bcf67f41b. Patch were wrongly applied. Signed-off-by: Mauro Carvalho Chehab commit d07602a07acfb9f6d1dbc24fd0416fed5d194bbc Author: Guennadi Liakhovetski Date: Tue Feb 9 18:00:38 2010 +0100 sh_mobile_ceu_camera: pass .set_parm and .get_parm down to subdevices Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c9f6ef69865ede81265c808227fc4fe9c925319a Author: Guennadi Liakhovetski Date: Tue Feb 9 18:00:30 2010 +0100 soc-camera: add support for VIDIOC_S_PARM and VIDIOC_G_PARM ioctls Just pass VIDIOC_S_PARM and VIDIOC_G_PARM down to host drivers. So far no special handling in soc-camera core. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit d74f841c32f0b00a513d87bba646d019ef7d1f67 Author: Magnus Damm Date: Tue Feb 9 17:40:40 2010 +0900 soc-camera: return -ENODEV if sensor is missing Update the soc-camera i2c code to return -ENODEV if a camera sensor is missing instead of -ENOMEM. Signed-off-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 6b727c68ea7083acd008da7c9734a19a4cdd52dc Author: Antonio Ospite Date: Tue Nov 17 23:04:23 2009 +0100 pxa_camera: remove init() callback pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or even to request GPIOs to be used by the camera *sensor*. These initializations can be performed statically in machine init functions. The current semantics for this init() callback is ambiguous anyways, it is invoked in pxa_camera_activate(), hence at device node open, but its users use it like a generic initialization to be done at module init time (configure MFP, request GPIOs for *sensor* control). Signed-off-by: Antonio Ospite Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 81355e40826acea76274c2ef5ff7d156ff28d183 Author: Guennadi Liakhovetski Date: Thu Dec 24 14:12:15 2009 +0100 soc-camera: adjust coding style to match V4L preferences Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 3675c750cf2effc6a2d9582cd1b9d3043aded3b6 Author: Kuninori Morimoto Date: Wed Jan 6 18:42:16 2010 +0900 soc-camera: ov772x: Modify buswidth control This patch removes "buswidth" struct member, and sets the default buswidth to the natively supported 10 bit. You can select 8 bit buswidth by new flag. This patch also modify ap325rxa/migor setup.c Signed-off-by: Kuninori Morimoto Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 906b101886b1b3d9e4d374aa84a67b7dbd349f16 Author: Guennadi Liakhovetski Date: Thu Feb 4 11:24:00 2010 +0100 tw9910: use TABs for indentation Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 4a9ce75516982b0a349df55f326bc0cee572ffc1 Author: Guennadi Liakhovetski Date: Thu Feb 4 11:17:48 2010 +0100 soc-camera: update mt9v022 to take into account board signal routing Use soc_camera_apply_sensor_flags() in mt9v022 to account for any inverters in video signal paths. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 917c50090ea3daa4c048b824a2dcb4730b3d7656 Author: Mauro Carvalho Chehab Date: Wed Feb 17 21:13:19 2010 -0200 V4L/DVB: az6027: az6027_read_mac_addr is currently unused drivers/media/dvb/dvb-usb/az6027.c:759: warning: ‘az6027_read_mac_addr’ defined but not used While there's some code that uses it, it is currently commented. So, comment also the function itself. CC: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2ed3f0c625faaace7a4dcfbb4e11baa17d993c5f Author: Mauro Carvalho Chehab Date: Wed Feb 17 21:11:06 2010 -0200 V4L/DVB: az6027: IR RC keys are using the old struct with 3 parameters, instead of 2 drivers/media/dvb/dvb-usb/az6027.c:390: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:390: warning: (near initialization for ‘az6027_rc_keys[0]’) drivers/media/dvb/dvb-usb/az6027.c:391: warning: excess elements in struct initializer drivers/media/dvb/dvb-usb/az6027.c:391: warning: (near initialization for ‘az6027_rc_keys[1]’) CC: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 5f0e1cff5d19935bef1a6a2cdbd7f39b92031726 Author: Manu Abraham Date: Sun Feb 14 16:58:10 2010 -0300 V4L/DVB: AZ6027: Fix checkpatch violations Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3c3233ec76118634cfd74d35c45d984e74acfc37 Author: Manu Abraham Date: Sun Feb 14 15:10:54 2010 -0300 V4L/DVB: AZ6027: Add driver supported ID's Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit bafa50ffb11eca44496332f3ee742144f097f29b Author: Manu Abraham Date: Sun Feb 14 15:03:39 2010 -0300 V4L/DVB: AZ6027: Update Build Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 91d8f7ae6eb8cc1c0f701e6afd0f7095c8091b2a Author: Manu Abraham Date: Sun Feb 14 14:59:39 2010 -0300 V4L/DVB: AZ6027: Add driver supported ID's Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 76f9a820c8672ada12ffa0903652c9e6f2429462 Author: Adams Xu Date: Sun Feb 14 14:34:07 2010 -0300 V4L/DVB: AZ6027: Initial import of the driver Signed-off-by: Manu Abaraham Signed-off-by: Mauro Carvalho Chehab commit 007ad830364e795316d2825f1ab68b3a53a3d56c Author: Huang Shijie Date: Thu Feb 11 03:53:51 2010 -0300 V4L/DVB: tlg2300: remove the country code for analog tv and radio video : use the V4L2_STD macros to select the proper audio setting. radio : add preemphasis ctr. test it by the command: v4l2-ctl -d /dev/radio0 --set-ctrl=pre_emphasis_settings=1 [mchehab@redhat.com: folded documentation patch] Signed-off-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 5b3f03f044ad6dffc8cd8c9c50bc5d7769cbd89f Author: Huang Shijie Date: Tue Feb 2 04:07:47 2010 -0300 V4L/DVB: Add driver for Telegent tlg2300 pd-common.h contains the common data structures, while vendorcmds.h contains the vendor commands for firmware. [mchehab@redhat.com: Folded the 10 patches with the driver] Signed-off-by: Huang Shijie Signed-off-by: Mauro Carvalho Chehab commit 433763faec55e5f0e3aeb084da504c566134a934 Author: Franklin Meng Date: Thu Feb 11 02:50:56 2010 -0300 V4L/DVB: Kworld 315U remote support Adds remote support for the Kworld 315U device I have added the change for the IR_TYPE_NEC that Mauro suggested. Note: I believe I got most of the mappings correct. Though the source and shutdown button probably could be mapped to something better. [mchehab@redhat.com: Fix CodingStyle] Signed-off-by: Franklin Meng Signed-off-by: Mauro Carvalho Chehab commit 96dd6de3d058a454a5bc4ce2f561a053dd90bfae Author: Darren Jenkins Date: Thu Feb 11 08:07:53 2010 -0300 V4L/DVB: drivers/media/radio/si470x/radio-si470x-usb.c fix use after free In si470x_usb_driver_disconnect() radio->disconnect_lock is accessed after it is freed. This fixes the problem. Coverity CID: 2530 Signed-off-by: Darren Jenkins Signed-off-by: Mauro Carvalho Chehab commit 8ef4c21130832cb51d5a5940ad3d4b7140720218 Author: Antti Palosaari Date: Wed Feb 10 21:33:12 2010 -0300 V4L/DVB: af901x: inform NXP TDA18218 tuner as know but not supported There is no driver for new NXP TDA18218 tuner which is used by few recent af9015 designs. af9015 uses number 179 as ID for that tuner. Inform this tuner is not supported when device using that tuner is meet. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 58c811df63a7c494639b4fe49d7af8fd0b32019b Author: Antti Palosaari Date: Wed Feb 10 20:44:12 2010 -0300 V4L/DVB: af9015: MYGICTV U718 remote autodetection Autodetect MYGICTV U718 from eeprom hash and select remote automatically. Remove old iManufacturer string compare based remote selection logic. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit db02d9dc544be25330fe491eddd2766d1fb7e325 Author: Antti Palosaari Date: Wed Feb 10 20:20:41 2010 -0300 V4L/DVB: af9015: A-Link DTU(m) remote autodetection Autodetect A-Link DTU(m) based eeprom hash and select correct remote. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 809c1e8ae8310a863b147c8571adfb6addeddd43 Author: Antti Palosaari Date: Wed Feb 10 20:07:30 2010 -0300 V4L/DVB: af9015: support for Leadtek WinFast DTV2000DS Add USB ID 0413:6a04 for Leadtek WinFast DTV2000DS. Thanks to Gavin Ramm for reporting this. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit fa1df55c3f99d32eccf3eeb3c9dad4456ebcf1f4 Author: Antti Palosaari Date: Wed Feb 10 20:05:48 2010 -0300 V4L/DVB: af9015: support for DigitalNow TinyTwin v2 Add USB ID 1b80:e402 for DigitalNow TinyTwin version 2. Thanks to Trevor Phillips for reporting this. Signed-off-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit fd9be0dc9b0b2baf203cfef8c8109859d05d0e01 Author: Jiri Slaby Date: Wed Feb 10 20:32:42 2010 -0300 V4L/DVB: DVB: ngene, fix memset parameters Switch second and third memset parameter to stamp the length buffer bytes by 0xff's, not 255 bytes by low 8 bits of Length. Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Matthias Benesch , Ralph Metzler , Oliver Endriss Signed-off-by: Jiri Slaby Cc: Matthias Benesch Cc: Ralph Metzler Cc: Oliver Endriss Cc: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit 7ca7ef6011e92b52a365ddc78f6668e01793c572 Author: Andrea.Amorosi76@gmail.com Date: Tue Feb 9 17:53:38 2010 -0300 V4L/DVB: em28xx: add Dikom DK300 hybrid USB tuner Adds digital and analogue tv support for Dikom DK300 hybrid usb card. Not working: remote controller To be done: it seems that with the proposed patch the digital demodulator remains activated if the tuner is switched from digital to analogue mode. Workaround is to unplug and replug the device when switching from digital to analogue. If someone can explain how to verify the gpio settings using the usbsnoop, the above issue perhaps can be resolved. Signed-off-by: Andrea Amorosi Signed-off-by: Mauro Carvalho Chehab commit 62bdbb735c0415c2ffdddc2269a860a76f7f716a Author: Julia Lawall Date: Sat Feb 6 05:43:58 2010 -0300 V4L/DVB: drivers/media: Correct NULL test In each case, the NULL test has been performed already. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit f0289efa1938eac27a98883bf33af946b13e1110 Author: Klaas de Waal Date: Sun Feb 7 14:09:16 2010 -0300 V4L/DVB: dst: fixes for DVB-C Twinhan VP2031 Remove check "state->dst_type == DST_DTYPE_IS_CABLE" in function dst_get_tuna (around line 1352) to select the correct checksum computation Fill in the .caps field in struct dst_dvbc_ops (around line 1824) with all the supported QAM modulation methods to match the capabilities of the card as implemented in function dst_set_modulation (around line 502). Note that beginning with linux kernel version 2.6.32 the modulation method is checked (by function dvb_frontend_check_parameters in file drivers/media/dvb/dvb-core/dvb_frontend.c) and thus tuning fails if you use a modulation method that is not present in the .caps field. This patch has been tested on a Twinhan VP2031A DVB-C card with the 2.6.32.2 kernel. Signed-off-by: Klaas de Waal Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit dd6ed861d64f86493e7a6bf92c6fcd99d5e3391c Author: Sean Young Date: Sat Feb 6 10:58:41 2010 -0300 V4L/DVB: saa7134 can capture 720x480 when capturing NTSC When capturing NTSC, the saa7134 can capture 720x480. While doing Laserdisc captures using this card, I noticed that right side was truncated/cropped. The highest geometry the driver allows is 704x480, even though in Windows XP it is 720x480. This results in no cropping and the same results as in Windows. Tested on an AverMedia GO 007 FM Plus. Signed-off-by: Sean Young Signed-off-by: Mauro Carvalho Chehab commit fad93fdb14f13e7b869a878c0fba3b6e0f91e0b6 Author: Abylay Ospan Date: Sat Feb 6 05:55:47 2010 -0300 V4L/DVB: STV0900 Cut 3.0 AGC2 fix for NetUP Dual DVB-S2-CI card if the AGC2 > 1400 then no signal on this frequency for STV0900 Cut 3.0. For Cut 2.0 this value is 700. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 0a71102f105870a4a245edd1b291fa723a8f3a48 Author: Douglas Schilling Landgraf Date: Fri Feb 5 14:33:38 2010 -0200 V4L/DVB: Fix logic for Leadtek winfast tv usbii deluxe As pointed by Magnus Alm , commit 99dbd128bb applied a hunk at the wrong place. This patch moves the code to the right place. Signed-off-by: Mauro Carvalho Chehab commit 87147ff03a8aa27b9cc94872b195e6f8bb922feb Author: Oliver Endriss Date: Fri Feb 5 07:57:58 2010 -0300 V4L/DVB: get_dvb_firmware: Fix typo, sort list of components Commiter: Oliver Endriss Fix typo. Sort list of components for better readability. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit e7e41d3b59877475e4c19ddd0d33cb3ef5298f87 Author: Oliver Endriss Date: Fri Feb 5 07:52:44 2010 -0300 V4L/DVB: get_dvb_firmware: Add function to retrieve nGene firmwares Commiter: Oliver Endriss Use 'get_dvb_firmware ngene' to download 'ngene_15.fw' and 'ngene_17.fw'. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6fd2d0f924e352e50a35ac9d9534ccc91b5c9bb9 Author: Stephen Rothwell Date: Fri Feb 5 02:46:47 2010 -0300 V4L/DVB: using vmalloc requires include linux/vmalloc.h After merging the scsi-post-merge tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_release_buffers': drivers/media/dvb/ngene/ngene-core.c:1443: error: implicit declaration of function 'vfree' drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_get_buffers': drivers/media/dvb/ngene/ngene-core.c:1454: error: implicit declaration of function 'vmalloc' drivers/media/dvb/ngene/ngene-core.c:1454: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c:1461: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c:1467: warning: assignment makes pointer from integer without a cast drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_probe': drivers/media/dvb/ngene/ngene-core.c:1836: warning: assignment makes pointer from integer without a cast Caused by commit b54c755d6263efe376f3dfc8c72c8e7b4fb4f4c1 ("V4L/DVB: ngene: Initial check-in"). Signed-off-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab commit 8edbede9ebf5959ec9951175a239925225440f5f Author: Richard Röjfors Date: Thu Feb 4 08:18:52 2010 -0300 V4L/DVB: mfd: Add support for the timberdale FPGA The timberdale FPGA is found on the Intel in-Vehicle Infotainment reference board russelville. The driver is a PCI driver which chunks up the I/O memory and distributes interrupts to a number of platform devices for each IP inside the FPGA. Signed-off-by: Richard Röjfors Signed-off-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit d44d1f3bfaef71ce27b4fd2284ec528b52617977 Author: Richard Röjfors Date: Wed Feb 3 12:59:39 2010 -0300 V4L/DVB: radio: Add radio-timb This patch add supports for the radio system on the Intel Russellville board. It's a In-Vehicle Infotainment board with a radio tuner and DSP. This umbrella driver has the DSP and tuner as V4L2 subdevs and calls them when needed. Signed-off-by: Richard Röjfors Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6525e67c01d303153272c26cb8118a3c314f4a1f Author: Oliver Endriss Date: Wed Feb 3 22:06:15 2010 -0300 V4L/DVB: ngene: Fix I2C initialisation Use I2C_CLASS_TV_DIGITAL, not I2C_ADAP_CLASS_TV_DIGITAL. Remove initialisation of bus_lock mutex. Thanks to Mauro for pointing out. Signed-off-by: Oliver Endriss Thanks-to: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab commit 684688d87d697724c46be77858641ee2e8885b02 Author: Oliver Endriss Date: Wed Feb 3 18:59:20 2010 -0300 V4L/DVB: ngene: Make checkpatch.pl happy Make checkpatch.pl happy. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit e890e7c0426ab99b032d5b387b1ca9fad6928895 Author: Oliver Endriss Date: Wed Feb 3 13:57:58 2010 -0300 V4L/DVB: ngene: Use correct name for cineS2 cards Cards 18c3:abc3/18c3:abc4 should be displayed as 'Linux4Media cineS2'. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit ace30f74ac1b3f20ab8f98995510a5e0d643c42c Author: Oliver Endriss Date: Wed Jan 20 19:03:22 2010 -0300 V4L/DVB: ngene: Take care of late interrupts Request might already have been processed when the interrupt arrives. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit b1ec9532341fafacfce8b1951c5f388eae014e16 Author: Oliver Endriss Date: Wed Jan 20 18:06:51 2010 -0300 V4L/DVB: ngene: Workaround for command timeout Implement workaround for comamnd timeout. Use FW15 and avoid switching DMA on and off. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 589816c61b74d8f16218a5ffdb95b1bf1897f65c Author: Oliver Endriss Date: Wed Jan 20 17:53:06 2010 -0300 V4L/DVB: ngene: Set ADC ranges to 1Vpp Set ADC1 and ADC2 range of the stv0900 to 1Vpp. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83e74554d4b1c6f4906c8a4fff270fcd42978987 Author: Oliver Endriss Date: Mon Feb 1 22:01:31 2010 -0300 V4L/DVB: ngene: Adapt to current frontend drivers Adapt to current stv090x + stv6110 drivers. [mchehab@redhat.com: removed compilation hack added by me on a prev patch] Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit edad22a7b0e5899ee503794543ce4c77cfb34d58 Author: Matthias Benesch Date: Fri Jan 8 17:38:03 2010 -0300 V4L/DVB: ngene: Mystique SaTiX-S2 Dual Identify card 18c3:db01 as 'Mystique SaTiX-S2 Dual'. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c58b5ecd46bf1b4a54b769d4a17afd97af23188d Author: Manu Abraham Date: Sat Dec 26 16:56:26 2009 -0300 V4L/DVB: [nGene] Trivial I2C related fixes/cleanups Trivial I2C related fixes/cleanups - Remove Unused I2C ID - point the I2C device to the physical device Signed-off-by: Manu Abraham Acked-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 9fdd797659de7a989025c64c336542ac9c15d4d1 Author: Oliver Endriss Date: Wed Dec 23 16:26:17 2009 -0300 V4L/DVB: ngene: Code cleanup Remove/comment-out unused code, make some functions/declarations static. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit cf1b12f2b355a29c44dad426f545db8fa26bd81c Author: Matthias Benesch Date: Wed Dec 23 05:55:02 2009 -0300 V4L/DVB: ngene: Added module parameter "one_adapter" If parameter "one_adapter" is set, only one adapter per device will be attached. Otherwise an adapter for every frontend will be attached. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 126cd4bc5fa9cdbedb89bbe7e568140c94900ca7 Author: Oliver Endriss Date: Tue Dec 22 04:37:53 2009 -0300 V4L/DVB: DVB: Export dvb_ringbuffer_flush() again Add EXPORT_SYMBOL(dvb_ringbuffer_flush) again, replace my_dvb_ringbuffer_flush() in ngene driver. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 948a119547cf5043b40c2151d6f6913fbcf65e38 Author: Oliver Endriss Date: Tue Dec 22 03:34:29 2009 -0300 V4L/DVB: ngene: Remove kernel version check for dvb_[un]register_adapter Remove kernel version check for dvb_[un]register_adapter. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 44cdd064aa698c033e0a345ed187db7c24134d93 Author: Oliver Endriss Date: Sun Dec 20 02:30:52 2009 -0300 V4L/DVB: ngene: Change severity of some diagnostic messages Changed severity of some diagnostic messages. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 236fa316baf6bb89b2f361230d570093a2a79794 Author: Oliver Endriss Date: Sat Dec 19 22:55:59 2009 -0300 V4L/DVB: ngene: Speed-up tuning Remove stray mleep() which prevented fast tuning. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dc35c9ae193564af2003117857848d69af24d534 Author: Roland Praml Date: Sat Dec 19 22:48:14 2009 -0300 V4L/DVB: ngene: Fix unloading of module Fixed unloading of module ngene. Signed-off-by: Roland Praml Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit adc1d21eec74afbd38a9099f4aff4bcd5b9eaea2 Author: Matthias Benesch Date: Sat Dec 19 12:57:16 2009 -0300 V4L/DVB: ngene: Remove firmware debugging Remove firmware debugging, because setting ngene_fw_debug and requesting firmware from file causes a kernel error. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 8bba2607f1927cf3166a64dfd4e4c38a2e3af990 Author: Matthias Benesch Date: Sat Dec 19 12:48:22 2009 -0300 V4L/DVB: ngene: Added Media-Pointer MP-S2/CineS2 DVB-S2 Twin Tuner Added support for nGene based Media-Pointer DVB-S2 twin tuner cards. [mchehab@redhat.com: Fix compilation error: unknown field ‘ref_clk’] Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6ed36e6670635b162cc59e40cdb0fbcc51d59d1e Author: Matthias Benesch Date: Sat Dec 19 22:18:53 2009 -0300 V4L/DVB: ngene: Additional clean-up Remove and disable unnecessary code. Disable define ONE_ADAPTER. Signed-off-by: Matthias Benesch Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 0027ebb73eff5bf0709f016edcad2be0605a3e4f Author: Oliver Endriss Date: Sat Dec 19 06:38:05 2009 -0300 V4L/DVB: ngene: Always use firmware loader Always use firmware loader. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 83f3c7157e087ace8fc67fd759bc3d7b3b64531e Author: Oliver Endriss Date: Sat Dec 19 04:54:44 2009 -0300 V4L/DVB: ngene: Driver compiles now Remove LNBH21 routines, disable code which broke compilation. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit dae52d009fc950b5c209260d50fcc000f5becd3c Author: Matthias Benesch Date: Fri Dec 18 22:13:26 2009 -0300 V4L/DVB: ngene: Initial check-in Add Micronas nGene PCIe bridge driver. The source code was provided by Micronas / Ralph Metzler, and has been reformatted to comply with Linux Codingstyle. Signed-off-by: Matthias Benesch Signed-off-by: Ralph Metzler Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c22425ffa10792e2e8aba321dded98a5867d2a86 Author: Janne Grunau Date: Wed Feb 3 15:51:23 2010 +0100 V4L/DVB: hdpvr: add new USB product id Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit 85d682b9ee1a89a82c2a75182558e392749d81fc Author: Márton Németh Date: Sat Jan 23 14:44:34 2010 +0100 V4L/DVB: hdpvr-video: cleanup signedness The fifth parameter of usb_bulk_msg() is a pointer to signed (see ) so also call this function with pointer to signed. This will remove the following sparse warning (see "make C=1"): * warning: incorrect type in argument 5 (different signedness) expected int *actual_length got unsigned int * Signed-off-by: Márton Németh Signed-off-by: Janne Grunau Signed-off-by: Mauro Carvalho Chehab commit e3a0cc62c80a997512295d8f714ee09fafbb4c99 Author: Jiri Slaby Date: Fri Jan 22 12:10:55 2010 -0300 V4L/DVB: media: dvb/af9015, add hashes support So as a final patch, add support for hash and one hash entry for MSI digi vox mini II: iManufacturer 1 Afatech iProduct 2 DVB-T 2 iSerial 3 010101010600001 It is now handled with proper IR and key map tables. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 26c3b8b060b3a06f912e5c50bc8ef6ed96195458 Author: Jiri Slaby Date: Fri Jan 22 12:10:54 2010 -0300 V4L/DVB: media: dvb/af9015, refactor remote setting Add af9015_setup structure to hold (right now only remote) setup of distinct receivers. Add af9015_setup_match for matching ids against tables. This is for easier matching different kind of ids against tables to obtain setups. Currently module parameters and usb vendor ids are switched into and matched against tables. Hashes will follow. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 634d2d757a435037576bac465a84a02a72c747b6 Author: Jiri Slaby Date: Fri Jan 22 12:10:53 2010 -0300 V4L/DVB: media: dvb/af9015, factor out remote setting This is just a code shuffle without functional changes. For easier review of later changes, i.e. preparation. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 6c614044ff00bf3e7403ac6c4ed4e53db8c349f3 Author: Jiri Slaby Date: Fri Jan 22 12:10:52 2010 -0300 V4L/DVB: media: dvb/af9015, implement eeprom hashing This will be useful for matching of IR tables later. We read the eeprom anyway for dumping. Switch the dumping to print_hex_dump_bytes and compute hash above that by hash = 0; for (u32 VAL) in (eeprom): hash *= GOLDEN_RATIO_PRIME_32 hash += VAL; // while preserving endinaness The computation is moved earlier to the flow, namely from af9015_af9013_frontend_attach to af9015_read_config, so that we can access the sum in af9015_read_config already. Signed-off-by: Jiri Slaby Acked-by: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 0b32d65cd7938d31eebd9c62aab6a59a3c4cf0f8 Author: Kusanagi Kouichi Date: Fri Jan 22 04:55:28 2010 -0300 V4L/DVB: cx23885: Add support for LEADTEK WinFast PxTV1200 I tested only tv and composite. Video works fine but no audio. Signed-off-by: Kusanagi Kouichi Signed-off-by: Mauro Carvalho Chehab commit b38aa09df33d931defe4958582e826db59a9731c Author: Márton Németh Date: Fri Jan 29 17:30:53 2010 -0300 V4L/DVB: hdpvr-core: make module parameters local The default_video_input and default_audio_input module parameters are only used inside the hdpvr-core.c file so make them static. This will remove the following sparse warnings (see "make C=1"): * warning: symbol 'default_video_input' was not declared. Should it be static? * warning: symbol 'default_audio_input' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit ee4b9dbb83c73c5408d7f479a501551a63ec57d3 Author: Richard Röjfors Date: Tue Feb 2 19:40:49 2010 -0300 V4L/DVB: radio: add support for SAA7706H Car Radio DSP Initial support for the SAA7706H Car Radio DSP. It is a I2C device and currently the mute control is supported. When the device is unmuted it is brought out of reset and initiated using the proposed intialisation sequence. When muted the DSP is brought into reset state. [akpm@linux-foundation.org: include delay.h] Signed-off-by: Richard Röjfors Cc: Douglas Schilling Landgraf Cc: Hans Verkuil Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 08c45cd58560f10e08e0ec4686845625b7030e8c Author: Andrew Morton Date: Tue Feb 2 19:40:51 2010 -0300 V4L/DVB: drivers/media/dvb/frontends/stv090x.c: fix use-uninitlalised Mad guess. Signed-off-by: Andrew Morton Reviewed-by: Manu Abraham Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 690c79ae7a0d928459ee6a09be781a2503c27e3e Author: Andrew Morton Date: Tue Feb 2 19:40:50 2010 -0300 V4L/DVB: drivers/media/dvb/frontends/stv090x.c: fix use-uninitialised drivers/media/dvb/frontends/stv090x.c: In function 'stv090x_blind_search': drivers/media/dvb/frontends/stv090x.c:1967: warning: 'coarse_fail' may be used uninitialized in this function Cc: Manu Abraham Cc: Mauro Carvalho Chehab Signed-off-by: Andrew Morton Reviewed-by: Manu Abraham Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c2312f60d741df833abf48fee4a30aa523e55a58 Author: Andrew Morton Date: Tue Feb 2 19:40:49 2010 -0300 V4L/DVB: drivers/media/video/cx18/cx18-alsa-pcm.c: fix printk warning drivers/media/video/cx18/cx18-alsa-pcm.c: In function 'cx18_alsa_announce_pcm_data': drivers/media/video/cx18/cx18-alsa-pcm.c:82: warning: format '%d' expects type 'int', but argument 5 has type 'size_t' Cc: Andy Walls Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 407df29363f10642d87dbe49854c97eb57c84c94 Author: Roel Kluin Date: Tue Feb 2 11:29:46 2010 -0300 V4L/DVB: dvb: return -ENOMEM if kzalloc failed in dvb_usb_device_init() If in a cold state and the download succeeded ret is zero, but we should return -ENOMEM. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit ca39d84d438b609af127f2eb161cd9029afbc9a7 Author: Magnus Alm Date: Fri Nov 13 05:48:24 2009 -0300 V4L/DVB: em28xx: fix for "Leadtek winfast tv usbii deluxe" fix Video/Sound support "Leadtek winfast tv usbii deluxe". Now, it is working Stereo, IR, Radio, TV, Svideo and Composite. Signed-off-by: Mauro Carvalho Chehab commit 5d26b6443292027314a2e2c9178140e60acd3587 Author: Márton Németh Date: Fri Jan 29 17:42:17 2010 -0300 V4L/DVB: smsir: make local variables static Make the file local parameters static. This will remove the following sparse warnings (see "make C=1"): * warning: symbol 'ir_pos' was not declared. Should it be static? * warning: symbol 'ir_word' was not declared. Should it be static? * warning: symbol 'ir_toggle' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 3d36f5c652d9d1b4406b0f8f32d9452eaad8e33a Author: Massimo Del Fedele Date: Sat Oct 24 13:12:37 2009 -0300 V4L/DVB: m920x: Add support for Pinnacle PCTV310e card Adds support to Pinnacle PCTV310e hybrid tuner card, for DVB-T and remote control, still no analog video. [mchehab@redhat.com: fix CodingStyle issues] Signed-off-by: Mauro Carvalho Chehab commit 0faf6f6b892aeb25934c9adc7fe328350d2d25cc Author: Alexander Strakh Date: Fri Sep 11 15:13:21 2009 -0300 V4L/DVB: cafe_ccic: Fix lock imbalances Fix lock imbalances in function device_authorization. Signed-off-by: Alexander Strakh Signed-off-by: Mauro Carvalho Chehab commit fb3ab105a5ef43b03d2788e9b124c7c69112682f Author: Roel Kluin Date: Sat Aug 29 15:31:49 2009 -0300 V4L/DVB: stv0900: dereference of state->internal in fe_stv0900_error stv0900_init_internal() state->internal allocation may fail as well as the allocation of stv0900_first_inode or new_node->next_inode in append_internal(). Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 6adb21c8719feef3b1629f5a9b5535e914f897ed Author: Andy Walls Date: Sat Jan 30 16:20:27 2010 -0300 V4L/DVB: cx18: Add missing serialization locks to cx18-dvb Operations that manipulates the state of the encoder or global instance flags and variables should be serialized. This adds some serialization locks that have been missing from cx18-dvb. Since the DVB part of the CX23418 doesn't affect the encoder, no one would likely have ever noticed a race in changing card instance variables. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b3b6dc620626eda13d7c1330cf3733862fe29420 Author: Andy Walls Date: Sat Jan 30 15:57:32 2010 -0300 V4L/DVB: cx18: Increment driver version for the addition of cx18-alsa and fixes Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 831f476cee704c37e7f96510135a90dfec6d00e9 Author: Andy Walls Date: Sat Jan 30 15:50:51 2010 -0300 V4L/DVB: cx18: Fix memory leak in cx18-alsa starting of PCM captures The cx18_open_id is normally dynamically allocated and stored in the filp->private_data for v4l2 file operations. The cx18-alsa routines should not dynamically allocate a cx18_open_id because they never store it anywhere and never free it. This change fixes that and plugs a memory leak. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b4729dcbba5431bf636d3d6615709383ad5e0d34 Author: Andy Walls Date: Sat Jan 30 15:28:22 2010 -0300 V4L/DVB: cx18: Add missing serialization locking to cx18-alsa File operations that manipulate the state of the encoder, or video or audio subdevices or some of the stream flags need to be serialized. Add the serilization locks to cx18-alsa in a manner consistent with the locking for the v4l2 file operations. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 83695009a439b86c520f9001c80cc5a042c2d940 Author: Andy Walls Date: Sat Jan 30 14:27:29 2010 -0300 V4L/DVB: cx18: Rename snd_cx18_mixer_lock to snd_cx18_lock and increase visibility Rename snd_cx18_mixer_lock() to snd_cx18_lock() in anticpation of using it in the cx18-alsa-pcm.c file routines. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 10e43d90da572f088f15cadfb5cc83cd762041c3 Author: Kusanagi Kouichi Date: Fri Jan 22 04:54:46 2010 -0300 V4L/DVB: cx25840: Fix composite detection If CX25840_VIN1_CH1 and the like is used, input is not detected as composite. Their value is 0x800000XX and CX25840_COMPONENT_ON is 0x80000200. So 739 else if ((vid_input & CX25840_COMPONENT_ON) == 0) this condition never be true. Signed-off-by: Kusanagi Kouichi Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 55461f4c584e812bb8e19c3fb1924edd512ea74c Author: Jean-François Moine Date: Sat Jan 30 16:03:02 2010 -0300 V4L/DVB: gspca - main: Change version to 2.9.0. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 00e8006db5bc0956ac1522be149936228ccb847e Author: Nicolau Werneck Date: Sat Jan 30 16:00:15 2010 -0300 V4L/DVB: gspca - t613: Support for LT168G sensor. Signed-off-by: Nicolau Werneck Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit cc2f82c22f3f954f0858642bd782f48e8ccbf058 Author: Jean-Francois Moine Date: Thu Jan 28 16:35:40 2010 -0300 V4L/DVB: gspca - pac7302: Change latin1 text to utf-8. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit aed6f1b5fe4e95cf8a9fc149e25041aa8cc7c78a Author: Márton Németh Date: Thu Jan 28 16:33:38 2010 -0300 V4L/DVB: gspca - pac7302: Add support for camera button. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0274d42e052ecd9bc6b5f69fbfc8792ce2cc0fb6 Author: Márton Németh Date: Thu Jan 28 06:39:49 2010 -0300 V4L/DVB: gspca - main: Add input support for interrupt endpoints. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 2abf6dd8e8754db6b18a4d55d3e4425c0a22d280 Author: Jean Delvare Date: Tue Jan 26 16:46:58 2010 -0300 V4L/DVB: dvb/bt8xx: Clean-up init and exit functions The init and exit functions are needlessly complex. Remove the bloat: * Drop irrelevant/outdated comments. * Remove useless bt878_pci_driver_registered global variable. Signed-off-by: Jean Delvare Signed-off-by: Mauro Carvalho chehab Signed-off-by: Mauro Carvalho Chehab commit 22c859faf5e10e7f7b04a2c643a98eeee69c1815 Author: Arnaud Patard Date: Mon Jan 25 12:02:31 2010 -0300 V4L/DVB: Fix VIDIOC_QBUF compat ioctl32 When using VIDIOC_QBUF with memory type set to V4L2_MEMORY_MMAP, the v4l2_buffer buffer gets unmodified on drivers like uvc (well, only bytesused field is modified). Then some apps like gstreamer are reusing the same buffer later to call munmap (eg passing the buffer "length" field as 2nd parameter of munmap). It's working fine on full 32bits but on 32bits systems with 64bit kernel, the get_v4l2_buffer32() doesn't copy length/m.offset values and then copy garbage to userspace in put_v4l2_buffer32(). This has for consequence things like that in the libv4l2 logs: libv4l2: v4l2 unknown munmap 0x2e2b0000, -2145144908 libv4l2: v4l2 unknown munmap 0x2e530000, -2145144908 The buffer are not unmap'ed and then if the application close and open again the device, it won't work and logs will show something like: libv4l2: error setting pixformat: Device or resource busy The easy solution is to read length and m.offset in get_v4l2_buffer32(). Signed-off-by: Arnaud Patard Signed-off-by: Mauro Carvalho Chehab commit 6aba72cf76d21527dc73403e4147397375c8c232 Author: Márton Németh Date: Sat Jan 23 10:44:14 2010 -0300 V4L/DVB: zoran: remove variable shadowing The loop counter j is declared twice in function error_handler(). Remove the redundant declaration. This will remove the following sparse warning (see "make C=1"): * symbol 'j' shadows an earlier one Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit db1b72650d22b8ac3ce56aa90c4fe1314f1876cb Author: Márton Németh Date: Sat Jan 23 03:58:20 2010 -0300 V4L/DVB: zoran: match parameter signedness of g_input_status The second parameter of g_input_status operation in is unsigned so also call it with unsigned paramter. This will remove the following sparse warning (see "make C=1"): * incorrect type in argument 2 (different signedness) expected unsigned int [usertype] *status got int * Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 26ee91efd941ea7fd40f6ee004f2f4d72f334564 Author: Roel Kluin Date: Tue Jan 19 21:47:30 2010 -0300 V4L/DVB: cx23885: Wrong command printed in cmd_to_str() The wrong command was printed for case CX2341X_ENC_SET_DNR_FILTER_MODE, and a typo in case CX2341X_ENC_SET_PCR_ID. Signed-off-by: Roel Kluin Acked-By: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 1e4348c85a2643441174cfb7073f8cb1a313366f Author: Stefan Richter Date: Wed Nov 18 16:03:31 2009 -0300 V4L/DVB: firedtv: reduce memset()s Before each FCP transdaction, the entire 512 bytes of the FCP frame were cleared, then values filled in. Clear only the bytes between filled-in bytes and end of the - request frame, or - response frame if data from a larger response will be needed, or - whole frame if data from a variable length response will be taken. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 6385c5bf98a9922917a563af3fdbd514888fa4ac Author: Stefan Richter Date: Wed Nov 18 16:03:03 2009 -0300 V4L/DVB: firedtv: remove check for interrupting signal FCP transactions as well as CMP transactions were serialized with mutex_lock_interruptible. It is extremely unlikly though that a signal will arrive while a concurrent process holds the mutex. And even if one does, the duration of a transaction is reasonably short (1.2 seconds if all retries time out, usually much shorter). Hence simplify the code to plain mutex_lock. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 3fb80ef3bc0f2b1008e14f695dcb32415cbacc90 Author: Stefan Richter Date: Wed Nov 18 16:02:01 2009 -0300 V4L/DVB: firedtv: do not DMA-map stack addresses This is a portability fix and reduces stack usage. The DMA mapping API cannot map on-stack addresses, as explained in Documentation/DMA-mapping.txt. Convert the two cases of on-stack packet payload buffers in firedtv (payload of write requests in avc_write and of lock requests in cmp_lock) to slab-allocated memory. We use the 512 bytes sized FCP frame buffer in struct firedtv for this purpose. Previously it held only incoming FCP responses, now it holds pending FCP requests and is then overwriten by an FCP response from the tuner subunit. Ditto for CMP lock requests and responses. Accesses to the payload buffer are serialized by fdtv->avc_mutex. As a welcome side effect, stack usage of the AV/C transaction functions is reduced by 512 bytes. Alas, avc_register_remote_control() is a special case: It previously did not wait for a response. To fit better in with the other FCP transactions, let it wait for an interim response. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit 9420048c6e3ce43b428cb5965ba0d568bc145978 Author: Mauro Carvalho Chehab Date: Thu Jan 28 00:28:58 2010 -0200 Fix the __init/__exit annotations WARNING: drivers/media/video/cx18/cx18-alsa.o(.text+0x4de): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/video/cx18/built-in.o(.text+0x1c022): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/video/built-in.o(.text+0x28cc56): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. WARNING: drivers/media/built-in.o(.text+0x2d2432): Section mismatch in reference from the function cx18_alsa_load() to the function .init.text:snd_cx18_init() The function cx18_alsa_load() references the function __init snd_cx18_init(). This is often because cx18_alsa_load lacks a __init annotation or the annotation of snd_cx18_init is wrong. Signed-off-by: Mauro Carvalho Chehab commit 583d338ddda291e3244c7f3a785973c51dcce84e Author: Mauro Carvalho Chehab Date: Thu Jan 28 00:19:00 2010 -0200 cx18: Fix compilation when CONFIG_MODULE is disabled drivers/media/video/cx18/cx18-driver.c:252: warning: ‘request_modules’ used but never defined Signed-off-by: Mauro Carvalho Chehab commit 914e8713f22fc01da14670c1647603edcb7c7b0a Author: Jean-Francois Moine Date: Sun Jan 17 03:58:51 2010 -0300 V4L/DVB: gspca - sq905c: Fix a compilation warning Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 11edebc264f14d3f9e05525f238b91da7f5fa81f Author: Antonio Ospite Date: Sun Jan 17 03:42:14 2010 -0300 V4L/DVB: gspca - ov534: Fix end of frame handling Fix a regression, introduced in the driver split, which made the ov534 driver unusable. Plus, the debug message should reflect that we discard also packets beyond the expected frame size. Signed-off-by: Antonio Ospite Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 29b87f045552910f964972b7a45e9be054401a0b Author: Antonio Ospite Date: Sun Jan 17 03:27:04 2010 -0300 V4L/DVB: gspca - ov534: Allow enumerating supported framerates Signed-off-by: Antonio Ospite Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 4b27d074748553916ebbdeed9630a6959c85e7de Author: Jean-Francois Moine Date: Wed Jan 13 15:40:36 2010 -0300 V4L/DVB: gspca - ov534_9: Propagate USB errors to higher level Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ab6c8cf21e180bcee1a6669f59ef62c0cceaf5d6 Author: Jean-Francois Moine Date: Wed Jan 13 15:34:27 2010 -0300 V4L/DVB: gspca - main: Clear any previous USB error when starting the transfer Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 14799f6cf35f843806019f548e80ffa669d16102 Author: Jean-Francois Moine Date: Wed Jan 13 15:28:22 2010 -0300 V4L/DVB: gspca - pac7311: Use usb_err to propagate USB errors Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit be927befd091481f88c5806aa0585f25ab2ee3a1 Author: Jean-Francois Moine Date: Wed Jan 13 15:09:14 2010 -0300 V4L/DVB: gspca - pac7302: Use usb_err to propagate USB errors Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 23a5de202bc385b69eb91a5db36699e9579ec03e Author: Jean-Francois Moine Date: Wed Jan 13 08:30:30 2010 -0300 V4L/DVB: gspca - pac7302/pac7311: Remove the unused page loading There is only one page to load (page 3 for pac7302 and page 4 for pac7311). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 9919fe891da1bd61fad78a0e1e3c0f21cd127eca Author: Hans de Goede Date: Wed Jan 13 07:12:28 2010 -0300 V4L/DVB: gspca - zc3xx: Change the resolutions of some sensors The sensors adcm2700, mc501cb and ov7620 cannot have the full height permitted by the zc3xx bridges. This change removes 8 pixels at the bottom of the images. Signed-off-by: Hans de Goede Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6aeb0905620f2ba3adecfaabc7000ae0481a263b Author: Stephen Rothwell Date: Wed Jan 27 03:53:39 2010 -0300 V4L/DVB: using vmalloc requires include of linux/vmalloc.h Signed-off-by: Stephen Rothwell Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 2c1fee024d86b718b3198f664747c9028776c751 Author: Huang Weiyi Date: Tue Jan 19 19:43:44 2010 -0300 V4L/DVB: [Mantis] remove duplicated #include Remove duplicated #include('s) in drivers/media/dvb/mantis/mantis_hif.c drivers/media/dvb/mantis/mantis_pci.c Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit 43e3e6d9df13da0c82b99e1144de053043545894 Author: Márton Németh Date: Sat Jan 16 14:35:03 2010 -0300 V4L/DVB: dib0090: cleanup dib0090_dcc_freq() 'extern' is not needed at function definition. This will remove the following sparse warning (see "make C=1"): * function 'dib0090_dcc_freq' with external linkage has definition Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit b9fb9b791a05e52b6daba953637705fa30610ab3 Author: Márton Németh Date: Sat Jan 16 14:08:39 2010 -0300 V4L/DVB: bt819: cleanup v4l2_subdev_notify() parameters The 3rd parameter v4l2_subdev_notify() is passed to the notify() callback which is a pointer, see and . This will remove the following sparse warning (see "make C=1"): * Using plain integer as NULL pointer Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 936c05e7f677640a9bc4d77354899f199d7d958f Author: Márton Németh Date: Sat Jan 16 13:41:43 2010 -0300 V4L/DVB: stv0900: make more local functions static Some functions are only used locally so mark them static. This will remove the following sparse warnings (see "make C=1"): * symbol 'extract_mask_pos' was not declared. Should it be static? * symbol 'stv0900_initialize' was not declared. Should it be static? * symbol 'stv0900_get_mclk_freq' was not declared. Should it be static? * symbol 'stv0900_set_mclk' was not declared. Should it be static? * symbol 'stv0900_get_err_count' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 521e86eb4354080dc2d178e3d8a7ebd8f0e8b4e5 Author: Márton Németh Date: Sat Jan 16 13:35:36 2010 -0300 V4L/DVB: stv0900: make local functions static The functions stv0900_sw_algo() and stv0900_set_dvbs1_track_car_loop() are only used locally so mark them static. This will remove the following sparse warnings (see "make C=1"): * symbol 'stv0900_sw_algo' was not declared. Should it be static? * symbol 'stv0900_set_dvbs1_track_car_loop' was not declared. Should it be static? Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit d5abcc784ff337fbe9c6bc03235baecfd25191e5 Author: Márton Németh Date: Sat Jan 16 13:21:59 2010 -0300 V4L/DVB: cx231xx: cleanup dvb_attach() return value handling Remove the following sparse error (see "make C=1"): * error: incompatible types for operation (<) left side has type struct dvb_frontend * right side has type int Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 6e3924aa8dad3ac7d5cbfb4e27b6cdd2dc7b7e68 Author: Thiago Farina Date: Sat Jan 16 10:25:38 2010 -0300 V4L/DVB: dvb-core: remove unnecessary casting of kmalloc drivers/media/dvb/dvb-core/dvb_frontend.c | 6 ++---- Signed-off-by: Thiago Farina Signed-off-by: Mauro Carvalho Chehab commit cebedf15d2776e1629a86260b5aa7bcfff8401b2 Author: Márton Németh Date: Sat Jan 16 05:11:07 2010 -0300 V4L/DVB: zoran: cleanup pointer condition Remove the following sparse warning (see "make C=1"): * warning: Using plain integer as NULL pointer Signed-off-by: Márton Németh Signed-off-by: Mauro Carvalho Chehab commit 0633255ca28715fd452972d460f5bfbe2c793d72 Author: Ben Hutchings Date: Wed Jan 13 20:43:58 2010 -0300 V4L/DVB: dabusb: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit 77c8b5fb0ee6e367332167eaa26470d843596270 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:08 2010 -0300 V4L/DVB: vpfe-capture: converting ccdc drivers to platform-drivers This adds platform code for ccdc driver on DM355 and DM6446. 1) new ccdc platform devices added 2) added clock aliases master and slave for CCDC clocks 3) added dm355_ccdc_setup_pinmux() pin-mux setup hook in dm355 ccdc driver platform data Reviewed-by: Vaibhav Hiremath Reviewed-by: Kevin Hilman Reviewed-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 8d1b5946bf53b2593e633caba2330863838b7bf7 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:07 2010 -0300 V4L/DVB: vpfe-capture: converting dm644x ccdc driver to a platform driver 1) clocks are configured using generic clock names 2) converting the driver to a platform driver 3) cleanup - consolidate all static variables inside a structure, ccdc_cfg The ccdc driver now uses generic names for clocks - master and slave. On individual platforms these clocks will inherit from the platform specific clock. This will allow re-use of the driver for the same IP across different SoCs. Reviewed-by: Kevin Hilman Reviewed-by: Vaibhav Hiremath Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit c70fc2d2ccff1ce4cf0441ed060045022e6cc5c8 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:06 2010 -0300 V4L/DVB: vpfe-capture - converting dm355 ccdc driver to a platform driver 1) clocks are configured using generic clock names; 2) converts the driver to a platform driver; 3) cleanup - consolidate all static variables inside a structure, ccdc_cfg; The ccdc now uses a generic name for clocks. "master" and "slave". On individual platforms these clocks will inherit from the platform specific clock. This will allow re-use of the driver for the same IP across different SoCs. Updated based on Kevin's comments on clock configuration and error code (v3, v4). Reviewed-by: Kevin Hilman Reviewed-by: Vaibhav Hiremath Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 51444ea3d4f5baa0338297aba7065fd695528a36 Author: Muralidharan Karicheri Date: Wed Jan 13 20:27:05 2010 -0300 V4L/DVB: vpfe_capture: remove clock and platform code 1) removed the platform code and clk configuration. They are now part of ccdc driver (part of the ccdc patches and platform patches 2-4); 2) Added proper error codes for ccdc register function. Reviewed-by: Vaibhav Hiremath Reviewed-by: Kevin Hilman Reviewed-by: Hans Verkuil Signed-off-by: Hans Verkuil Signed-off-by: Muralidharan Karicheri Signed-off-by: Mauro Carvalho Chehab commit 986ce4510b37ba684aaebd3eb0e6ee0c03906ed8 Author: Pete Eberlein Date: Wed Jan 13 19:15:48 2010 -0300 V4L/DVB: s2250: Fix write_reg i2c address The kernel i2c model uses right-aligned 7-bit i2c addresses, but the 2250 firmware uses an 8-bit address in the usb vendor request. A previous patch by Jean Delvare shifted the i2c addresses 1 bit to the right, and this patch fixes the write_reg function to shift it back before sending the vendor request. To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Signed-off-by: Pete Eberlein Signed-off-by: Mauro Carvalho Chehab commit 94b12d9ea555851632deee1c2b06c4f281a45e12 Author: Devin Heitmueller Date: Thu Jan 7 00:56:14 2010 -0300 V4L/DVB: cx18-alsa: Fix the rates definition and move some buffer freeing code. Clarify the rates available for the device, and move the freeing of the buffer to the free routine instead of the close (per Takashi's suggestion). Thanks to Takashi Iwai for reviewing and providing feedback. This work was sponsored by ONELAN Limited. Cc: Takashi Iwai Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit c71fd169a13d34f26997b27183b510e0b7fc2623 Author: Devin Heitmueller Date: Thu Jan 7 00:52:39 2010 -0300 V4L/DVB: cx18: address possible passing of NULL to snd_card_free Eliminate the possibility of passing NULL to snd_card_free(). Thanks to Takashi Iwai for reviewing and pointing this out. This work was sponsored by ONELAN Limited. Cc: Takashi Iwai Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 60433e2ab8391d1884ddef2269bd19ecdaaa2d72 Author: Devin Heitmueller Date: Sun Dec 20 23:53:46 2009 -0300 V4L/DVB: cx18-alsa: codingstyle cleanup Move the cx18_alsa_announce_pcm_data() function further up in the file, since apparently "make checkpatch" has never heard of a forward declaration. Note that despite the hg diff showing everything else as having been deleted/added, in reality it was only that one function that got moved (and the forward declaration was removed from the top of the file). This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 71036ef26b0026742c8ab79a54937aac1439350d Author: Devin Heitmueller Date: Sun Dec 20 23:50:02 2009 -0300 V4L/DVB: cx18-alsa: codingstyle cleanup Remove some dead code and make a PCM specific module debug parameter to avoid an extern reference. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit f8bd9d26c59d0df0335bf43191feb732f2c8b6ad Author: Devin Heitmueller Date: Sun Dec 20 23:29:02 2009 -0300 V4L/DVB: cx18: codingstyle fixes Codingstyle fixes, some introduced as a result of the ALSA work, some pre-existing. This patch is a whitespace change only. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 780edb7ad60e5c657770f510747cc609c84b5b61 Author: Devin Heitmueller Date: Sun Dec 20 23:15:58 2009 -0300 V4L/DVB: cx18-alsa: codingstyle fixes Fix codingstyle issues, and make the minimum version for cx18-alsa required to be 2.6.17, so that we don't need all the #ifdefs related to the changes to ALSA structures. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4dae2f0f84374d4e7cd6c8d41385a7c250f0726d Author: Devin Heitmueller Date: Sun Dec 20 23:01:46 2009 -0300 V4L/DVB: cx18-alsa: fix codingstyle issue Address coding style issue with cx18-alsa-main.c This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1a8e0e33881c9dd8cf3514bfd0b5a7ef148da929 Author: Devin Heitmueller Date: Sat Dec 12 17:38:53 2009 -0300 V4L/DVB: cx18-alsa: fix memory leak in error condition If the stream is already in use, make sure we free up the memory allocated earlier. Thanks to Andy Wall for reviewing and pointing this out. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 485e319adef5d33a1dca4320cb26fb387b4a9381 Author: Devin Heitmueller Date: Sun Nov 22 23:42:33 2009 -0300 V4L/DVB: cx18-alsa: remove a couple of warnings Remove a couple of warnings from dead code during driver development. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 5eb9978f47ec09ce7ab5b9cc86d7b5d6ebb28a9d Author: Devin Heitmueller Date: Fri Nov 20 02:15:20 2009 -0300 V4L/DVB: cx18-alsa: name alsa device after the actual card Use the cx18 board name in the ALSA description, to make it easier for users who run "arecord -l" to see which device they should be looking for. Also, use strlcpy() instead of strcpy(). Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1ec1c9bc6fc63b08467c12ce585862ae4e97859c Author: Devin Heitmueller Date: Fri Nov 20 01:24:57 2009 -0300 V4L/DVB: cx18: cleanup cx18-alsa debug logging Fix the debug macro so that it is dependent on the modprobe parameter. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit d68b687b1e322e7325b1458d799e8234997e4ccd Author: Devin Heitmueller Date: Fri Nov 20 01:15:54 2009 -0300 V4L/DVB: cx18: rework cx18-alsa module loading to support automatic loading Restructure the way the module gets loaded so that it gets loaded automatically when cx18 is loaded, and make it work properly if there are multiple cards present (since the old code would only take one opportunity to connect to cx18 instances when the module first loaded). This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4a8cfe6a5c158133f57c2e8476f259366d4bdc4d Author: Devin Heitmueller Date: Thu Nov 19 23:35:36 2009 -0300 V4L/DVB: cx18-alsa: remove unneeded debug line Remove an unneeded debug line, which was preventing the cx18-alsa module from loading. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 0f4cf676728e186b53ba1bb60c442c0f503ffdbc Author: Devin Heitmueller Date: Thu Nov 19 23:23:57 2009 -0300 V4L/DVB: cx18: export more symbols required by cx18-alsa Export a couple of more symbols required by the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 700b8aecc99f3bef09bc20c745d20bb2868047cc Author: Devin Heitmueller Date: Thu Nov 19 23:17:40 2009 -0300 V4L/DVB: cx18: add cx18-alsa module to Makefile Add cx18-alsa to the Makefile and Kconfig This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 9972de904216828c9f9f9d638df52206aa2bacd1 Author: Devin Heitmueller Date: Mon Jan 18 21:29:51 2010 -0300 V4L/DVB: cx18: overhaul ALSA PCM device handling so it works Add code so that the PCM ALSA device actually works, and update the cx18-streams mechanism so that it passes the data off to the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 8ef22f794ea5577505bc71e468183585f429afde Author: Devin Heitmueller Date: Thu Nov 19 22:52:30 2009 -0300 V4L/DVB: cx18: export a couple of symbols so they can be shared with cx18-alsa Expose a couple of symbols in the cx18 module so that locking of the PCM stream can be shared with the cx18-alsa module. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 4cb565cc2700e6fcd57243cacc4c2826956bc088 Author: Devin Heitmueller Date: Thu Nov 19 22:46:10 2009 -0300 V4L/DVB: cx18: make it so cx18-alsa-main.c compiles Fix some basic compilation issues with Andy's original code. In particular, temporarily #ifdef out the mixer code, add some additional exception handling, fix a couple of typos, and add a copyright line. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 0d8e1d0637a4636b0c19c94ba633812421544d91 Author: Devin Heitmueller Date: Thu Nov 19 22:40:41 2009 -0300 V4L/DVB: cx18: rename cx18-alsa.c Rename cx18-alsa.c to cx18-alsa-main.c so that we can call the final .ko file cx18-alsa.ko Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit f9b071c77ad3b97fce3d598d2d417c097369ccaf Author: Andy Walls Date: Wed Jun 24 07:26:45 2009 -0300 V4L/DVB: cx18-alsa: Add non-working cx18-alsa-pcm.[ch] files to avoid data loss Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 9722c8f95a5bd51a3d392cb2f125c8240b745c48 Author: Andy Walls Date: Mon May 25 21:40:25 2009 -0300 V4L/DVB: cx18-alsa: Initial non-working cx18-alsa files Initial cx18-alsa module files check-in to avoid losing work. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5eb3291fe84b30a8e2fda31fd5fa44c40575f283 Author: Igor M. Liplianin Date: Sun Jan 17 12:23:04 2010 -0300 V4L/DVB: dm1105: use macro for read/write registers This is for better readability and smaller size of code lines. Also it is for future improvements like GPIO handling. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 34d2f9bf189c36ef8642cf6b64e80dfb756d888f Author: Igor M. Liplianin Date: Sun Jan 17 12:11:00 2010 -0300 V4L/DVB: dm1105: use dm1105_dev & dev instead of dm1105dvb This is for better readability and smaller size of code. Also it is similar to other drivers. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit ed7c847aef137a5e1f5de0eac0ad2c03e183839d Author: Igor M. Liplianin Date: Sun Jan 17 11:15:06 2010 -0300 V4L/DVB: dm1105: connect splitted else-if statements Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 8f50a3ee726b682f7481d29883d768bbd027788a Author: JD Louw Date: Sun Jan 17 09:57:46 2010 -0300 V4L/DVB: Compro S350 GPIO change This patch enables LNB power on newer revision d1 Compro S350 and S300 DVB-S cards. Signed-off-by: JD Louw Signed-off-by: Mauro Carvalho Chehab commit b4a0e816fbe2af815674c514588b6cb444ec5fd9 Author: Igor M. Liplianin Date: Sun Jan 17 10:32:26 2010 -0300 V4L/DVB: Add Support for DVBWorld DVB-S2 PCI 2004D card The PCI card contains dm1105 PCI bridge and ds3000 demod. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 95480f2773588eabb35ac9354d068b068ef11e70 Author: Andy Walls Date: Sun Jan 17 21:12:24 2010 -0300 V4L/DVB: ivtv: Adjust msleep() delays used to prevent tinny audio and PCI bus hang Martin Dauskardt has done extensive testing on what values can be used and and concluded that only 300 ms total is required to avoid bad video effects such as occasional black screen and short sync disturbances. Furthermore he determined how this 300 ms was split between the two msleep()s did matter very much, so he suggested 150ms/150ms as one acceptable alternative that is implemented here. Many thanks go to Martin. Tested-by: Martin Dauskardt Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 3ccc646b56a3f03029a259c6a8affd9cecc6020e Author: Andy Walls Date: Thu Dec 24 13:06:08 2009 -0300 V4L/DVB: cx25840, v4l2-subdev, ivtv, pvrusb2: Fix ivtv/cx25840 tinny audio This change attempts to fix the ivtv tinny audio problem by keeping digitizer to encoder audio clocks running, while disabling the video clocks as needed to avoid unpredictable PCI bus hangs. To accomplish this, for the cx25840 module enabling of audio streaming had to be separated from enabling video streaming, requiring an additional v4l2_subdev_audio_op and calls to this new op in the pvrusb2 and ivtv drivers. The cx231xx and cx23885 driver use the cx25840 module for affecting only video on s_stream calls, so those drivers needed no change. The CX23418 hardware does not exhibit either the tinny audio problem nor the PCI bus hang, so the cx18 driver did not need corresponding changes. CX2341[56] based cards that are not using the CX2584x family of chips do not seem to be affected by the tinny audio problem, and this change should not affect how they are configured. It will delay their first capture by starting by another 300 msec though. Many thanks go to Argus and Martin Dauskardt whose persistent testing and investigation of this problem will hopefully fix this problem once and for all for many ivtv users. Reported-by: Martin Dauskardt Reported-by: Argus Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b6e436b263b35476da4be06e0719cb1d5c8f8eed Author: Ian Armstrong Date: Mon Dec 21 22:59:26 2009 -0300 V4L/DVB: ivtv: Fix race condition for queued udma transfers There are several DMA related interrupts which wake up the dma_waitq. The udma routines use this queue while they wait for their transfer to complete. When woken, the udma routine will check the IVTV_F_I_UDMA_PENDING & IVTV_F_I_UDMA flags to see if the transfer is still queued or has finished. However, a small window exists between the IVTV_F_I_UDMA_PENDING flag being cleared and the IVTV_F_I_UDMA flag being set. Given that the completion of an unrelated DMA transfer may wake up the udma routine, it's possible for this check to fail and the udma routine will start unmapping pages when the transfer has only just started. The result of this is unpredictable. This fix simply delays the clearing of the IVTV_F_I_UDMA_PENDING flag until after IVTV_F_I_UDMA has been set. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0726681a7080cef6a9fd414894690fac16418772 Author: Abylay Ospan Date: Fri Jan 22 16:01:44 2010 -0300 V4L/DVB: 22-kHz set_tone fix for NetUP Dual DVB-S2-CI card. 22kHz logic controlled by demod 22-kHz tone can be driven in two ways: 1. LNBH24 can produce 22kHz continuous tone when TEN=1 ( 22 KHz tone output is always activated ). 2. LNBH24 can reproduce 22kHz tone timings from DSQIN or EXTM pin's when TEN=0. From LNBH24 datasheet: "In order to improve design flexibility an external tone input pin is available (EXTM). The EXTM is a Logic input pin which activates the 22 kHz tone output, on the VoTX pin, by using the LNBH24 integrated tone generator (similar to the DSQIN pin function). In fact, the output tone waveform characteristics will always be internally controlled by the LNBH24 tone generator and the EXTM signal will be used as a timing control for DiSEqC tone data encoding on the VoTX output." In NetUP Dual DVB-S2-CI card 22kHz tone timings on EXTM pin produced by STV0900 demod: .set_tone = stv0900_set_tone redefine to "set_tone = lnbp21_set_tone" is not correct for "NetUP Dual DVB-S2-CI card". Signed-off-by: Abylay Ospan Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 6b54ee082543294a04ea1d758abdc6013cbb4e2e Author: Hans de Goede Date: Thu Jan 14 10:00:31 2010 -0300 V4L/DVB (14005): media/video Kconfig: Mark gspca superceeded drivers as deprecated We have some duplicate functionality between the zc0301 and gspca-zc3xx, the sn9c102 and gspca-sonixb + gspca-sonix, and et61x251 and gscpa-etoms drivers. The non gspca versions of these drivers not only show a lot of code duplicty (amongsth each other), as they all copy the same generic usb webcam code instead of using some sort of framework. They also have not seen any updates for more then 2 years, where as the gspca drivers are actively maintained. So it is time for the non gspca versions of these drivers to go away, marking them as deprecated is the first step in this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 81b1061f96cf6f1ec3c91b80c6c183cb90a1f4e1 Author: Hans de Goede Date: Thu Jan 14 09:40:37 2010 -0300 V4L/DVB (14004): drivers/media/video/Kconfig: Turn deprecated drivers off by default drivers/media/video/Kconfig: Turn deprecated drivers off by default Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 54e8bc5d64a651e2fb8b2366637e6a7d920a4c70 Author: Hans de Goede Date: Thu Jan 14 09:37:18 2010 -0300 V4L/DVB (14003): gspca_cpai1: New gspca subdriver for CPIA CPiA version 1 cams This new driver supports USB PIA CPiA version 1 cams, replacing the old v4l1 driver. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ed9885aa8145d0cd531ac53d1456a6b3d238150c Author: Theodore Kilgore Date: Thu Jan 14 12:07:18 2010 -0300 V4L/DVB (14006): gscpa_sq905c: Better detection of CIF resolution cameras gscpa_sq905c: Better detection of CIF resolution cameras Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 127f548dbcdb561a7bf94578804abca0eccf7e4b Author: Hans de Goede Date: Sun Jan 10 19:34:57 2010 -0300 V4L/DVB (14002): gspca_sonixb / sn9c102: Make gspca handle 0c45:6007 When both the gspca_sonixb and the sn9c102 driver are enabled, make the gspca_sonixb driver handle cams with usb-id of 0c45:6007. The sn9c102 driver is being phased out and gspca driver has been successfully tested with an 0c45:6007 camara. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit b10af3f70bfaf98b6405dcd0561283b7ec485630 Author: Hans de Goede Date: Sun Jan 10 19:31:34 2010 -0300 V4L/DVB (14001): gscpa_sonixb: Differentiate between tas5110c and tas5110d and fix d hstart Our hstart value was wrong for tas5110d sensor using sonixb cams, this patch fixes this. Many thanks to Paulus (laudaka) for donating me a camera with such a sensor IC. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 8d0082fa3f3ac978075439e73b4a36ca0715e747 Author: Hans de Goede Date: Sat Jan 9 19:45:44 2010 -0300 V4L/DVB (14000): gspca_ov519: ov764x remove setting of AEC limits ov764x remove setting of AEC limits, as the custom values cause AEC oscilation in 320x240. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit d02134ddb6fc351ab25028bfb45a53d08a2bcfbf Author: Hans de Goede Date: Sat Jan 9 19:22:34 2010 -0300 V4L/DVB (13999): gspca_ov519: remove non functioning contrast control for ov764x sensor gspca_ov519: remove non functioning contrast control for ov764x sensor Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 035d3a3d3fb0104bb94dfb78ef70c7ec6f3f4ae4 Author: Hans de Goede Date: Sat Jan 9 08:14:43 2010 -0300 V4L/DVB (13998): gscpa_ov519: Fix 320x240 on ov519 + ov7648 Differentiate between ov7640 and ov7648 and handle the ov7648 320x240 on the ov519 bridge specially to fix r and b being swapped. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 859cc4700eebebe346572eb30898dd786a54e7a9 Author: Hans de Goede Date: Thu Jan 7 15:42:35 2010 -0300 V4L/DVB (13997): gspca_ov519: differentiate ov7620 and ov7620ae and fix 640x480 on the 7620 Michael Deegan , has reported issues with using 640x480 mode on his ov518+ webcam. The fix for this breaks things on my ov518+ cam (Trust 320 Sp@cecam), this patch thus adds differentiation in the driver between the OV7620 sensor his cam has and the OV7620AE sensor my cam has, and then only changes the init sequence for the ov518+ + OV7620 combo which was not working for Michael. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 388a6d54168923d0243d4c752586e87231a75291 Author: Hans de Goede Date: Thu Jan 7 15:31:48 2010 -0300 V4L/DVB (13996): gspca_stv0680: Fix streaming on vga cameras Streaming of VGA stv0680 based cams (instead of CIF ones) failed, because we were using the wrong control pipe for certain commands, this patch fixes this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 98184f78fcc1aea4f81e9101459c803a90e71f4f Author: Hans de Goede Date: Thu Jan 7 12:06:00 2010 -0300 V4L/DVB (13995): gspca_ov519: mark led on eyetoy II as inverted Mark led on eyetoy II as inverted, I have the feeling the led needs to be inverted for all 519 based cams (iow we got the set led code wrong), but lets just deal with this one cam at a time to avoid breaking currently working cams. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit ab269d300ef9fe7e2f60613d0ac160e12b84658e Author: Hans de Goede Date: Thu Jan 7 12:04:04 2010 -0300 V4L/DVB (13994): gscpa_stv0680: Fix camera initialization on hotplug stv0680 cameras currently only work when already plugged in when the system boots (or when manually re-loading the driver after boot). This patch fixes this. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 9336960d075839b41bef89a0c68899c4025e8289 Author: Theodore Kilgore Date: Fri Dec 25 05:19:24 2009 -0300 V4L/DVB (13993): gspca.txt: add cams supported by mr97310a, sq905(c) and sn9c2028 drivers gspca.txt: add cams supported by mr97310a, sq905(c) and sn9c2028 drivers Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 5bdd00b93e368acc793748340c15cd2811fdd02b Author: Theodore Kilgore Date: Fri Dec 25 05:16:32 2009 -0300 V4L/DVB (13992): gspca_sn9c2028: New gspca subdriver New gspca subdriver adding support for SN9C2028 dual-mode cameras. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 70136081fc67ea77d849f86fa323e5773c8e40ea Author: Theodore Kilgore Date: Fri Dec 25 05:15:10 2009 -0300 V4L/DVB (13991): gspca_mr973010a: Fix cif type 1 cameras not streaming on UHCI controllers If you read the mail to Oliver Neukum on the linux-usb list, then you know that I found a cure for the mysterious problem that the MR97310a CIF "type 1" cameras have been freezing up and refusing to stream if hooked up to a machine with a UHCI controller. Namely, the cure is that if the camera is an mr97310a CIF type 1 camera, you have to send it 0xa0, 0x00. Somehow, this is a timing reset command, or such. It un-blocks whatever was previously stopping the CIF type 1 cameras from working on the UHCI-based machines. Signed-off-by: Theodore Kilgore Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 225ee0ca190b2e5d1d20c6278b6369b987aaaddf Author: Arvo Järve Date: Sun Jan 10 17:15:57 2010 -0300 V4L/DVB (13989): [TDA8261] Fix TDA8261 I2C read bug The TDA8261 driver would crash when reading more than a byte as described. ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff:ff [ 8.430350] KNC1-2: MAC addr = 00:09:d6:65:2d:91 [ 8.610008] saa7146 (1) saa7146_i2c_writeout [irq]: timed out waiting for end of xfer [ 8.734457] stb0899_attach: Attaching STB0899 [ 8.768481] tda8261_attach: Attaching TDA8261 8PSK/QPSK tuner [ 8.768485] DVB: registering adapter 2 frontend 0 (STB0899 Multistandard)... Once I launch scan-s2: scan-s2 -vvvv -a 2 -s 1 -l UNIVERSAL /usr/share/dvb/dvb-s/Hotbird-13.0E I see the following via dmesg: [ 435.040017] saa7146 (1) saa7146_i2c_writeout [irq]: timed out waiting for end of xfer [ 435.778648] tda8261_get_bandwidth: Bandwidth=40000000 [ 435.781781] tda8261_get_bandwidth: Bandwidth=40000000 [ 435.783311] tda8261_set_state: Step size=1, Divider=1000, PG=0x793 (1939) [ 435.783512] tda8261_set_state: Waiting to Phase LOCK [ 435.810134] tda8261_get_status: Tuner Phase Locked [ 435.810137] tda8261_set_state: Tuner Phase locked: status=1 [ 435.810139] tda8261_set_frequency: Frequency=1939000 [ 435.810141] tda8261_get_frequency: Frequency=7574 [ 435.830008] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.402814] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.405946] tda8261_get_bandwidth: Bandwidth=40000000 [ 436.407458] general protection fault: 0000 [#1] SMP [ 436.407527] last sysfs file: /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor [ 436.407560] CPU 0 [ 436.407601] Modules linked in: tda8261 stb0899 dvb_pll mt352 lnbp21 budget_av saa7146_vv snd_hda_codec_realtek videodev stv0299 v4l1_compat coretemp snd_hda_intel v4l2_compat_ioctl32 i915 videobuf_dma_sg b2c2_flexcop_pci snd_hda_codec budget_ci videobuf_core b2c2_flexcop ir_common w83627ehf drm snd_hwdep cx24123 budget_core hwmon_vid snd_pcm cx24113 dvb_core iptable_filter snd_timer i2c_algo_bit ip_tables saa7146 s5h1420 snd ttpci_eeprom soundcore intel_agp video serio_raw pcspkr lp snd_page_alloc x_tables output parport pata_it8213 e1000e [ 436.408757] Pid: 1410, comm: kdvb-ad-2-fe-0 Not tainted 2.6.31-14-server #48-Ubuntu C2SBC-Q [ 436.408818] RIP: 0010:[] [] tda8261_set_state+0x51/0x250 [tda8261] [ 436.408903] RSP: 0018:ffff88013649bc70 EFLAGS: 00010283 [ 436.408945] RAX: 00000000000f1748 RBX: ffff880138870680 RCX: 0000000000000018 [ 436.408990] RDX: ffff88013649bcd0 RSI: 0000000000000001 RDI: ffff880135273010 [ 436.409035] RBP: ffff88013649bcc0 R08: 0000000000000001 R09: 0000000000000002 [ 436.409081] R10: ffff88013649bc40 R11: 0000000055555556 R12: 00000000001d9638 [ 436.409126] R13: 38ffffffa0261568 R14: 0000000000000000 R15: ffff880135273010 [ 436.409172] FS: 0000000000000000(0000) GS:ffff880028022000(0000) knlGS:0000000000000000 [ 436.409232] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b [ 436.409274] CR2: 00007fff925e4cd8 CR3: 000000013642a000 CR4: 00000000000406f0 [ 436.409320] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 436.409365] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 436.409411] Process kdvb-ad-2-fe-0 (pid: 1410, threadinfo ffff88013649a000, task ffff88013658ad60) [ 436.409473] Stack: [ 436.409508] ffff880136ee2af1 00000000bcd5d166 ffff000200000068 0000000035273000 [ 436.409608] <0> 0000000000000001 ffff880135273000 ffffffffa0265260 00003473bc000000 [ 436.409758] <0> 0000000000000000 ffff88013a4e05e0 ffff88013649bd00 ffffffffa025f133 [ 436.409938] Call Trace: [ 436.409978] [] tda8261_set_frequency+0x23/0x70 [budget_av] [ 436.410027] [] ? stb0899_i2c_gate_ctrl+0x49/0xf0 [stb0899] [ 436.410074] [] ? stb0899_write_reg+0x19/0x20 [stb0899] [ 436.410121] [] stb0899_dvbs_algo+0x3a2/0x13c8 [stb0899] [ 436.410170] [] ? i2c_transfer+0xbd/0x100 [ 436.410215] [] ? stb0899_write_regs+0xac/0x1b0 [stb0899] [ 436.410262] [] stb0899_search+0x489/0x750 [stb0899] [ 436.410308] [] ? down_interruptible+0x33/0x60 [ 436.410360] [] dvb_frontend_thread+0x57c/0x720 [dvb_core] [ 436.410407] [] ? autoremove_wake_function+0x0/0x40 [ 436.410457] [] ? dvb_frontend_thread+0x0/0x720 [dvb_core] [ 436.410504] [] kthread+0xa6/0xb0 [ 436.410547] [] child_rip+0xa/0x20 [ 436.410589] [] ? kthread+0x0/0xb0 [ 436.410631] [] ? child_rip+0x0/0x20 [ 436.410672] Code: 00 03 00 00 4c 8b 6b 10 c7 45 cc 00 00 00 00 0f 84 e8 01 00 00 44 8b 22 41 8d 84 24 10 81 f1 ff 3d 80 4f 12 00 0f 87 af 01 00 00 <41> 8b 75 04 31 d2 48 c7 c7 d8 46 02 a0 89 f0 8b 0c 85 f0 45 02 [ 436.411950] RIP [] tda8261_set_state+0x51/0x250 [tda8261] [ 436.412015] RSP [ 436.412064] ---[ end trace c1d7ae4d9e05c51b ]--- Signed-off-by: Arvo Järve Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit d8b5a8e449a08a1a87170144a42d0a0b167bcad6 Author: Oliver Endriss Date: Sun Jan 10 15:40:28 2010 -0300 V4L/DVB (13988): [STV090x] Configuration parameters adc1_range, adc2_range, tuner_bbgain Add parameters adc1_range, adc2_range and tuner_bbgain to the config struct. Defaults: adc1_range = adc2_range = 2Vpp, tuner_bbgain = 10db Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 41894b97009adcabc51c6a4943045fd944c46236 Author: Oliver Endriss Date: Sun Jan 10 15:39:45 2010 -0300 V4L/DVB (13987): [STV090x] Quit processing if the tuner did not lock Exit stv090x_algo() if the tuner did not lock. This might happen due to missing signal or invalid/incomplete tuning parameters. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 2c1f750ba3fbd4a54544a68b57087bb89f3ba92c Author: Oliver Endriss Date: Sun Jan 10 15:38:38 2010 -0300 V4L/DVB (13986): [STV090x] Disable I2C gate on error The I2C gate must also be disabled, if a tuner command failed. Otherwise the tuner mutex would be locked forever. Signed-off-by: Oliver Endriss Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 76b9ef97953c120172dfc07d48e6d219164c6f6a Author: Andreas Regel Date: Tue Jan 5 19:24:56 2010 -0300 V4L/DVB (13985): [STV090x] reset mclk and dev_ver of internal structure after allocating When mclk is not 0 then it will never be set to the correct value and the Demodulator will not work. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 93e32cdafbe70d66bd8c133dd1b663198723654f Author: Andreas Regel Date: Tue Jan 5 19:24:32 2010 -0300 V4L/DVB (13984): [BUDGET] Use a tuner clock output divider of 2 for TT S2-1600. This gives the STV090x and improved clock signal (rectangle instead of sine). Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ca108b39a75d9c6e8a18c8723ccb9c98fb8d6265 Author: Andreas Regel Date: Tue Jan 5 19:24:10 2010 -0300 V4L/DVB (13983): [STV6110x] add clk_div member to stv6110x_config structure Using clk_div member of stv6110x_config structure the tuner's clock output divider can be configured. It is set in stv6110x_attach. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9045e729447192ab0ca27191ccab324c6b97fceb Author: Andreas Regel Date: Tue Jan 5 19:23:41 2010 -0300 V4L/DVB (13982): [STV090x] setup master clock in stv090x_init instead of stv090x_setup. This is needed when clock input is driven from tuner and an output divider different from 1 is used. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ec2d3a62eff54b9dc556e9d9c9125b9bdc640171 Author: Andreas Regel Date: Tue Jan 5 19:23:13 2010 -0300 V4L/DVB (13981): [STV6110x] Add a local register map for each instance of the driver. Before there was used a static register map that could lead to issues when there are are multiple adapters with the STV6110(A). Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 0c3f9fd807d9ef842fcc7e47e447ed2c68d63e49 Author: Andreas Regel Date: Tue Jan 5 19:22:45 2010 -0300 V4L/DVB (13980): [STV6110x] Added function stv6110x_write_regs The function stv6110x_write_regs is used to write several registers at once. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit f91e59cb5e6add13d4e45c5cc8d45a614e1dc8e4 Author: Andreas Regel Date: Tue Jan 5 19:22:07 2010 -0300 V4L/DVB (13979): [STV090x] Added possibility to set a fixed TS output clock. This could be useful for p.e. Common Interface applications where data rate is limited. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit c369b7c2820dcad91b1354362097f6d8f9cf9307 Author: Andreas Regel Date: Tue Jan 5 19:21:30 2010 -0300 V4L/DVB (13978): [STV090x] set FE_HAS_SIGNAL flag in stv090x_read_status when locked. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 729cbafaca5e24b4fa0b42e7b0f79cb53f2ebad5 Author: Andreas Regel Date: Tue Jan 5 19:21:02 2010 -0300 V4L/DVB (13977): [STV090x] Test for valid frequency before starting to tune Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 96506a5086d0e9fd7332d6da74f115fa37bb58c6 Author: Andreas Regel Date: Tue Jan 5 19:20:21 2010 -0300 V4L/DVB (13976): [STV090x] Added mutex protection around tuner I2C access. With this change it is possible to have the same I2C address for both tuners. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 97f7a2ae1a8a1e44a481456375efced75210e5eb Author: Andreas Regel Date: Tue Jan 5 19:19:43 2010 -0300 V4L/DVB (13975): [STV090x] Added internal structure with shared settings and data. As the STV0900 features two demodulation paths in one chip there is some information used by both instances of the driver when used in dual mode. This information is now shared in an internal structure referenced by I2C adapter and address. Do initialisation of the demodulator only once when used in dual mode. Moved global mutex demod_lock to internal structure. Moved dev_ver and mclk to internal structure. Removed unused tuner_refclk from stv090x_state. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit b79c6df705e02b5dcb0e9360a15b28373813fec1 Author: Andreas Regel Date: Tue Jan 5 19:18:52 2010 -0300 V4L/DVB (13974): [STV090x] Fix locking reliabilty issues in automatic mode. In automatic S/S2 detection mode, locking of a DVB-S transponder could fail when coming from a DVB-S2 transponder. This change fixes the issue by first disabling DVB-S and DVB-S2 mode before enabling it again. Signed-off-by: Andreas Regel Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit ceb59cf068d54761c653c42dd45c14e1ecf0f7d3 Author: Abylay Ospan Date: Wed Jan 13 05:01:56 2010 -0300 V4L/DVB (13936): 22-kHz set_tone fix for NetUP Dual DVB-S2-CI card 22-kHz tone can be driven in two ways: 1. LNBH24 can produce 22kHz continuous tone when TEN=1 ( 22 KHz tone output is always activated ). 2. LNBH24 can reproduce 22kHz tone timings from DSQIN or EXTM pin's when TEN=0. From LNBH24 datasheet: "In order to improve design flexibility an external tone input pin is available (EXTM). The EXTM is a Logic input pin which activates the 22 kHz tone output, on the VoTX pin, by using the LNBH24 integrated tone generator (similar to the DSQIN pin function). In fact, the output tone waveform characteristics will always be internally controlled by the LNBH24 tone generator and the EXTM signal will be used as a timing control for DiSEqC tone data encoding on the VoTX output." In NetUP Dual DVB-S2-CI card 22kHz tone timings on EXTM pin produced by STV0900 demod: .set_tone = stv0900_set_tone redefine to "set_tone = lnbp21_set_tone" is not correct for "NetUP Dual DVB-S2-CI card". Signed-off-by: Mauro Carvalho Chehab commit c52af79916028f9d15638519b54a80ed1c10bce5 Author: Jean-Francois Moine Date: Thu Jan 7 05:18:16 2010 -0300 V4L/DVB (13916): gspca - ov534/ov534_9: Split the ov534 subdriver. The two sensors ov772x and ov965x have too much differences. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit de2d1549c2083e45ed84c779b64acf438ba5bf7f Author: Jean-Francois Moine Date: Sat Dec 19 07:03:43 2009 -0300 V4L/DVB (13869): gspca - sn9c20x: Cleanup code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 310b26286e5a88387feba0412a75aa2a943ec844 Author: Peter Huewe Date: Tue Dec 22 05:38:14 2009 -0300 V4L/DVB (13947): add __init/__exit macros to drivers/media/dvb/bt8xx/bt878.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/media/dvb/bt8xx/bt878.c Please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree. Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009 but also present in linus tree. Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit 42a39e05928c6262347fba4ec9f649124bfc7a6f Author: Joe Perches Date: Wed Jan 13 03:59:15 2010 -0300 V4L/DVB (13969): frontends/si21xx.c: Remove #define TRUE/FALSE, use bool And a little code refactoring/neatening around the removals Reduces object size a little bit: new: $ size drivers/media/dvb/frontends/si21xx.o text data bss dec hex filename 8984 56 1816 10856 2a68 drivers/media/dvb/frontends/si21xx.o old: $ size drivers/media/dvb/frontends/si21xx.o text data bss dec hex filename 9084 56 1792 10932 2ab4 drivers/media/dvb/frontends/si21xx.o Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit e34d375aa6dade342a266d40c6142d7f36e18683 Author: Jiri Slaby Date: Sun Jan 10 05:56:46 2010 -0300 V4L/DVB (13968): cx18, fix potential null dereference Stanse found a potential null dereference in cx18_dvb_start_feed and cx18_dvb_stop_feed. There is a check for stream being NULL, but it is dereferenced earlier. Move the dereference after the check. Signed-off-by: Jiri Slaby Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 8231152f74dd9bd6f76036cfd7fbbf94ad0073d8 Author: Alexander Beregalov Date: Sat Jan 9 13:51:14 2010 -0300 V4L/DVB: ir: fix memory leak Free ir_dev before exit. Found by cppcheck. Signed-off-by: Alexander Beregalov Signed-off-by: Mauro Carvalho Chehab commit 78b06e0201fb32716211959bce133740a13873c4 Author: Jiri Slaby Date: Wed Jan 6 19:04:07 2010 -0300 V4L/DVB (13965): zl10039, jump to error on error Stanse found an unreachable statement in zl10039_attach. There is a `break' followed by `goto error'. Remove that break, so that it can handle the error. Cc: Igor M. Liplianin Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit a570fb6eec804e99c7fd3ac1db192842e9269bbb Author: Jiri Slaby Date: Wed Jan 6 13:45:28 2010 -0300 V4L/DVB (13964): tuner-core, fix memory leak Stanse found a memory leak in tuner_probe. It is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit b46d37e61f886e901ba0b504125b135f450a19b5 Author: Jiri Slaby Date: Wed Jan 6 13:45:27 2010 -0300 V4L/DVB (13963): siano, fix memory leak Stanse found a memory leak in smscore_gpio_configure. buffer is not freed/assigned on all paths. Fix that. Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit ad695510bf27a4e73e0d04d48d80c0b8389f17d2 Author: Roel Kluin Date: Sun Jan 3 14:04:42 2010 -0300 V4L/DVB (12930): Wrong variable tested The return of saa7164_i2caddr_to_reglen() was not tested. Cc: Steven Toth Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 19f48cb105b7fa18d0dcab435919a3a29b7a7c4c Author: Francesco Lavra Date: Thu Dec 31 08:47:11 2009 -0300 V4L/DVB (13961): em28xx-dvb: fix memleak in dvb_fini() this patch fixes a memory leak which occurs when an em28xx card with DVB extension is unplugged or its DVB extension driver is unloaded. In dvb_fini(), dev->dvb must be freed before being set to NULL, as is done in dvb_init() in case of error. Note that this bug is also present in the latest stable kernel release. Signed-off-by: Francesco Lavra Signed-off-by: Mauro Carvalho Chehab commit be39515758f382e8b1d0d0012cd59008e9970dec Author: hartleys Date: Wed Dec 30 16:08:57 2009 -0300 V4L/DVB (13959): cx23885/cx23885-dvb.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Mauro Carvalho Chehab commit 2714b3b9be54076877fbb50c0811f9015b2906a5 Author: hartleys Date: Wed Dec 30 16:13:10 2009 -0300 V4L/DVB (13958): tveeprom.c: use %pM to show MAC address Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Mauro Carvalho Chehab commit 9714d587f138c1034b8fbeb14573e5f0320a2367 Author: Francesco Lavra Date: Tue Dec 29 15:48:04 2009 -0300 V4L/DVB (13957): IR: Fix sysfs attributes declaration This patch fixes the declaration of the sysfs attributes for IR's, which must be a NULL-terminated array of struct attribute *. Without this patch, my machine crashes when inserting a DVB card. Signed-off-by: Francesco Lavra Signed-off-by: Mauro Carvalho Chehab commit 211635654cb6785a5c102af6488f6b1d83b9a3c6 Author: Dan Carpenter Date: Mon Dec 28 14:48:49 2009 -0300 V4L/DVB (13956): fix weird array index in zl10036.c I was initially concerned about the weird array index (the 2 bumps into the next row of the array). Matthias Schwarzott look at the datasheet and it turns out it should be zl10036_init_tab[1][0] |= 0x01; Signed-off-by: Dan Carpenter Signed-off-by: Matthias Schwarzott Signed-off-by: Mauro Carvalho Chehab commit 3557aa4f7ddaec2903532595d2caccac32a5bbeb Author: Julia Lawall Date: Mon Dec 28 11:09:55 2009 -0300 V4L/DVB (13954): Correct NULL test Test the just-allocated value for NULL rather than some other value. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier f; @@ f(...) { <+... return NULL; ...+> } @@ expression *x; expression y; identifier r.f; statement S; @@ x = f(...); ( if ((x) == NULL) S | if ( - y + x == NULL) S ) // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit b2ad41f9ef72d7b3309a2578bf4432a262ff2b47 Author: Stefan Richter Date: Fri Dec 25 21:47:12 2009 -0300 V4L/DVB (13953): firedtv: add missing NULL pointer check If there is ever going to be a FireDTV or FloppyDTV firmware which does not provide a minimal ASCII textual descriptor for Model_Id --- or if the descriptor is provided indirectly in a descriptor directory --- the ieee1394 variant of the device probe of firedtv would dereference a NULL pointer. The firewire variant of firedtv's device probe is not affected. The fix makes sure that such an unexpected firmware is safely recognized by fdtv_alloc as an unknown firmware. Signed-off-by: Stefan Richter Signed-off-by: Mauro Carvalho Chehab commit f0ecba96e76295792a0b1ee2e03b505562e7b9f3 Author: Tobias Klauser Date: Wed Dec 23 09:53:14 2009 -0300 V4L/DVB (13952): gspca: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Cc: Jean-Francois Moine Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 9d68e8de9f8ab14077dd8d3c6ed9087ea61544a6 Author: Tobias Klauser Date: Wed Dec 23 09:53:12 2009 -0300 V4L/DVB (13951): rj54n1cb0: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Cc: Guennadi Liakhovetski Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 7b2d3983f2b54b002fd045f2801514405530d224 Author: Tobias Klauser Date: Wed Dec 23 09:53:13 2009 -0300 V4L/DVB (13950): usb-friio: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Mauro Carvalho Chehab commit 21ead03bdde189106e0625baac170385a6c360af Author: Julia Lawall Date: Tue Dec 22 18:00:07 2009 -0300 V4L/DVB (13949): Move a dereference below a NULL test If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit ed0ee8e1fbab49b494ef2994be92e7832dd6673c Author: Julia Lawall Date: Tue Dec 22 17:31:23 2009 -0300 V4L/DVB (13948): radio: Correct use after free It is not clear how to share the unlock in the case where the structure containing the lock has to be freed. So the unlock is now duplicated, with one copy moved before the free. The unlock label furthermore is no longer useful and is thus deleted. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x->f // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit e0572325d23b8c89930a08e0b8b3850a6fe75d7d Author: Alexey Dobriyan Date: Mon Dec 21 21:21:47 2009 -0300 V4L/DVB (13946): proc_fops: convert av7110 Drop S_IRUGO, proc entry doesn't contain read hooks. Drop S_IFREG, simply unnecessary. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 9c6f97a02358c78ed1db69cde702db263bc62cf6 Author: Dmitri Belimov Date: Mon Dec 21 02:00:38 2009 -0300 V4L/DVB (13945): Add lost config and PCI ID for card of Beholder Add lost configuration for our TV card. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit 7de0b8739f9b7856d2c3aa96e50e851283eeb24a Author: Roel Kluin Date: Wed Dec 16 13:06:33 2009 -0300 V4L/DVB (13944): vivi: Fix test of unsigned in vivi_create_instance() video_nr is unsigned so the test did not work. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit f2e6c6ad0207f22b55bb45a6b0958cecde3db8f1 Author: Roel Kluin Date: Wed Dec 16 11:35:45 2009 -0300 V4L/DVB: use correct size in put_v4l2_window32() Although these sizes may be the same it is better to calculate the size of the source, than the destiny. Signed-off-by: Roel Kluin Signed-off-by: Mauro Carvalho Chehab commit 66d9cbad5330d6df30c82f10ee18b62b096b84ef Author: Devin Heitmueller Date: Tue Nov 24 23:17:25 2009 -0300 V4L/DVB (13932): em28xx: add PAL support for VBI Make the VBI support work for PAL standards in addition to NTSC. This work was sponsored by EyeMagnet Limited. Thanks go out to Andy Walls for providing a CD containing test PAL/VBI captures and to Steven Toth for providing a PVR-350 to do signal generation with. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 6a2071006b72bf887e38c025c60f98d2998ceacb Author: Devin Heitmueller Date: Mon Jan 4 02:43:19 2010 -0300 V4L/DVB (13930): dib0700: rework IR logic for firmware 1.20 When firmware 1.20 was introduced, the dib0700 switched from a polling model using a USB control message, to the messages being delivered on a USB bulk pipe. The code I originally added would do a blocking read on the pipe with a 50ms timeout. Because the dvb-usb-remote code makes use of the global workqueue, this resulted in the global workqueue being blocked 50% of the time. Also, the synchronous urb_bulk_msg() call would burn excess CPU time (reflected as an abnormal increase in the system's load average when devices were connected). Rework the logic so that we now setup an asynchronous callback on the bulk pipe, so that we now only handle RC data when it arrives on the pipe. Note that we provide a stub function for the RC polling callback so that we can continue to leverage the shared code in dvb-usb-rc for the setting up of the input device. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit eac8f5fa5f5dcaf228694fe23e19b02b98e68879 Author: Jean-Francois Moine Date: Tue Jan 12 07:12:43 2010 -0300 V4L/DVB (13927): gspca - sonixj: Fix bad video mode for all webcams. The bug was introduced when adding the sensor adcm1700. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit cdf955cd8e45d8279c53b47a2c0e0c5decaaca86 Author: Jean-Francois Moine Date: Mon Jan 11 15:06:12 2010 -0300 V4L/DVB (13926): gspca - pac7302: Fix a random USB error. When loading the register 0x49 of the page 3, the usb_control_msg() sometimes fails with error -71 or -62. This change skips loading the register 0x48. Tested-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit b7a597d11073c4c3db79743d38cc942d324b2233 Author: Jean-Francois Moine Date: Sun Jan 10 16:36:53 2010 -0300 V4L/DVB (13925): gspca - main: Change the check of the USB video interface. Some webcams have many interfaces with the same interface class, so the previous interface check did not work. The new code checks if the interface number is zero or the only one. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 6f081264f835467a3b69edc71753dac9d3ff770a Author: Jean-Francois Moine Date: Sun Jan 10 14:39:24 2010 -0300 V4L/DVB (13924): gspca - sunplus: Optimize and remove unused sequences. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 509245171ae76e08f657fe825b739d99f5701f09 Author: Jean-Francois Moine Date: Fri Jan 8 08:08:12 2010 -0300 V4L/DVB (13923): gspca - zc3xx: Simplify code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 77880ba3335e60acd0d6a818a7cdddaf0a5d601f Author: Jean-Francois Moine Date: Fri Jan 8 08:04:21 2010 -0300 V4L/DVB (13922): gspca - zc3xx: Switch off the LED on resume. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit a20622f0f50be4afc217fba31b968f35fd5fea7b Author: Jean-Francois Moine Date: Fri Jan 8 08:03:23 2010 -0300 V4L/DVB (13921): gspca - zc3xx: Remove unuseful register write. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 56af5efca524cd4551ed4654a086742743cf18be Author: Jean-Francois Moine Date: Fri Jan 8 08:02:42 2010 -0300 V4L/DVB (13920): gspca - zc3xx: Let default sharpness for sensor pas202b. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1eed40aeb456957cdcf09407ead113c755f5c744 Author: Jean-Francois Moine Date: Fri Jan 8 08:01:43 2010 -0300 V4L/DVB (13919): gspca - zc3xx: Fix hdcs2020 probe. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 1cb6d7b15641e584243c186ba7e6e59d03065c98 Author: Jean-Francois Moine Date: Fri Jan 8 07:06:06 2010 -0300 V4L/DVB (13918): gspca - zc3xx: Rename the USB sequences. The new names tell the image resolution: 'Scale' is the smaller image. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 47c833923746decdef557d22e720ba14c81f375c Author: Jean-Francois Moine Date: Thu Jan 7 15:59:12 2010 -0300 V4L/DVB (13917): gspca - zc3xx: Cleanup code. - update copyright and module author - change __u8/16 to u8/16 - set unsigned the sd sensor - initialize the controls by macros Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 5599678c703e369fd50105aa60d112bcfd8f186f Author: Mauro Carvalho Chehab Date: Mon Jan 11 10:47:33 2010 -0300 V4L/DVB (13915): em28xx: fix a typo on RC6 modes Thanks to: Devin Heitmueller for double checking it. Signed-off-by: Mauro Carvalho Chehab commit f05b7f5ee19de6de972020ea18e6c30b672d401b Author: Andy Walls Date: Sun Jan 3 23:28:18 2010 -0300 V4L/DVB (13913): saa7127: Add support for generating SECAM output for the SAA712[89] chips This change fixes up saa7127_s_std() generate SECAM out, if the user has requested a 50 Hz video standard set that only contains a request for SECAM standards and not PAL. Only the SAA712[89] chips can generate SECAM, the SAA712[67] chips cannot. I was unclear on the burst start and end values - I couldn't figure out the units - so I left them the same as for the PAL systems. A the video decoders on both a PVR-350 (SAA7115) and an HVR-1600 (CX23418) identify the SECAM signal generated by a SAA7129 with this patch as SECAM. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit a8073119d69d0b4aa8f445ed4d7d56b89b602708 Author: Sergey Bolshakov Date: Sat Jan 2 21:56:42 2010 -0300 V4L/DVB (13912): cx18: Fix tuner reset pin in card entry for the Leadtek PVR2100 Fix the "xceive_pin" setting from "15" to "1" for the PVR2100 -- the same as the PVR3100H. This properly resets the XC2028 tuner on the PVR2100. Sergey's original email report: Hi. Seems cx18 module has incorrect .xceive_pin value for card, as i see lots of i2c errors in dmesg from xc2028. i'm using 2.6.32.2, my hardware is: 00:09.0 Multimedia video controller [0400]: Conexant Systems, Inc. CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder [14f1:5b7a] Subsystem: LeadTek Research Inc. Device [107d:6f27] Flags: bus master, medium devsel, latency 64, IRQ 17 Memory at f0000000 (32-bit, non-prefetchable) [size=64M] Capabilities: [44] Vital Product Data Capabilities: [4c] Power Management version 2 Kernel driver in use: cx18 Kernel modules: cx18 Following fixes this problem for me, the rest seems working: Reported-by: Sergey Bolshakov Tested-by: Sergey Bolshakov Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5ada57732a17521689d7d8eecf7c9b93b7484386 Author: Andy Walls Date: Fri Jan 1 13:25:41 2010 -0300 V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index entries The CX18_CPU_SET_INDEXTABLE command was being called with the wrong number of arguments causing the index table frame type selection mask to be set wrong. Now the IDX stream properly sends entries for I, P, and B frames. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 9bff2d61716bffe5e1d58de9eb940c62bb020fcf Author: Andy Walls Date: Thu Dec 31 22:27:28 2009 -0300 V4L/DVB (13909): cx18: Clean up dead code from ivtv once used for IDX processing Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 82acdc84cc4acc11389bdc648b23b15426d2038c Author: Andy Walls Date: Thu Dec 31 22:09:51 2009 -0300 V4L/DVB (13908): cx18: Add initial working VIDIOC_G_ENC_INDEX ioctl() support VIDIOC_G_ENC_INDEX support see the light of day. Some notes: 1. With default capture parameters, the CX23418 seems to transfer 192 index entries (4.5 kB worth) at 10 second intervals. 2. Index streams don't seem to be supported for MPEG 2 TS streams 3. The index entries seem to claim every frame is a B-Frame. Possible firmware bug. 4. The cx18 driver does not try to capture an index stream when inserting sliced VBI into the MPEg stream as the offsets would need fixup. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit ef99179710d6ec04d6783afdf8387523c7087920 Author: Andy Walls Date: Thu Dec 31 18:27:13 2009 -0300 V4L/DVB (13907): cx18: Perform automatic rotation of very old, unread IDX buffers According to the v4l2 spec, very old MPEG index entries needs to be discarded in favor of newer index entries. This change ensures the firmware always has buffers for index entries at the expense of the oldest unread buffers. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 79f3e96018dc55ff7819a6a1ac3740a1d7103589 Author: Andy Walls Date: Thu Dec 31 17:19:25 2009 -0300 V4L/DVB (13906): cx18: Start IDX streams automatically as an internal associated stream This change starts the IDX stream along with the MPG stream as an internal use (only) stream much like the VBI stream can be started as an internal use stream for inserting sliced VBI packets. The IDX stream is not started automatically with an MPEG strem if the IDX stream is disabled (no buffers allocated) or if sliced VBI insertion is being performed by the cx18 driver. The cx18 driver doing sliced VBI insertion makes the offsets in the IDX stream inaccurate for the final MPEG stream presented to user space. Since fixing the IDX offsets ourselves is not easy and we cannot easily do what ivtv does to fix the offsets, we'll make sliced VBI insertion and MPEG Index capture mutually exclusive for now. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit e46c54a87e4a6364b0e86b03cb3d00d09ef2f627 Author: Andy Walls Date: Thu Dec 31 02:14:51 2009 -0300 V4L/DVB (13905): cx18: Allow MPEG index streams to be started and stopped internally This change allows the IDX stream to be started and stopped as any other stream even though it has no associated device node. This is needed for cx18 driver internal use. Also always tell the CX23418 to generate index entries when an analog capture starts and the IDX stream has had buffers allocated (i.e. is enabled). Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7b1dde03314912cfa9a5fa34ea9423df0db13860 Author: Andy Walls Date: Thu Dec 31 01:35:08 2009 -0300 V4L/DVB (13904): cx18: Fix TS and IDX stream buffer memory leak on module unload Fix a long standing memory leak of stream buffers for streams that did not have a struct video_device allocated: namely the TS and IDX streams. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 540bab93b769c757e92f1bd5e980a2ef647d4e86 Author: Andy Walls Date: Thu Dec 31 00:26:49 2009 -0300 V4L/DVB (13903): cx18: Encapsulate check for a stream being enabled into an inline function Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit efc0b127b2e0135053680cd0118856b051450009 Author: Andy Walls Date: Wed Dec 30 22:54:53 2009 -0300 V4L/DVB (13902): cx18: Update MPEG Index stream buffers module option processing Update the module options related to INDEX stream buffer allocation. A single CX2341[5678] index entry is only 24 bytes. Large buffers for the IDX stream will prevent the CX23418 from transferring index data over at all. Buffers of around 1.5 kB or 64 index entries seem to be just fine. We'll default to 63 buffers/MDLs as that is the firmware limit per stream and IDX stream buffers are not high rate. There is no reason on earth to allocate the previous 1 MB default of buffer space for the IDX stream. This is in anticipation of implementing the G_ENC_INDEX ioctl() in the cx18 driver. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 7e64dc4c4d6f5c8935fac25c7fc7aa83f9880ed7 Author: Marton Nemeth Date: Wed Dec 30 09:12:41 2009 -0300 V4L/DVB (13899): gspca - all subdrivers: Make control descriptors constant. The ctrls field of struct sd_desc is declared as const in gspca.h. It is worth to initialize the content also with constant values. Signed-off-by: Marton Nemeth Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit aabcdfb65be31d7f9486d1400fa217c8827dddd3 Author: Márton Németh Date: Tue Jan 5 12:39:02 2010 -0300 V4L/DVB (13898): gspca - some subdrivers: Make sd_desc const. The function callbacks in sd_desc are defined at compile time and they do not change at runtime. Make the sd_desc initializations const. Signed-off-by: Márton Németh Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 52a9d3ef0034f29cef1c5616faa72aa394b01b65 Author: Jean-Francois Moine Date: Tue Jan 5 04:44:00 2010 -0300 V4L/DVB (13897): gspca - main: Check the interface class at probe time. The USB video interface was checked as having the number zero, but some webcams have other values. The test is now done on the interface class which may be either 255 (vendor spec) or 0 (class per interface). Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 38719d45f937178718d49516d1f72208d5d72d22 Author: Jean-Francois Moine Date: Mon Jan 4 16:09:47 2010 -0300 V4L/DVB (13896): gspca - zc3xx: Adjust the pas202b exchanges. - adapt the start sequences from the info file of the ms-win driver of the webcams 046d:08a2/046d:08aa (lvWIMv.inf) - disable the brightness for this sensor Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit fd18046fffc24b06c9820d9b540c518fc0e1b627 Author: Jean-Francois Moine Date: Mon Jan 4 15:54:59 2010 -0300 V4L/DVB (13895): gspca - zc3xx: Fix the contrast control. The previous calculation gave bad gamma tables. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 878b35aedb930a31a72298b717a22990b6773a03 Author: Jean-Francois Moine Date: Wed Dec 30 04:53:07 2009 -0300 V4L/DVB (13894): gspca - sonixj: Add more controls. - sharpness - brightness for adcm1700 - adjust brightness/exposure for adcm1700 - add some comments Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 83c94a186382307508cbe800588219607fb38148 Author: Jean-Francois Moine Date: Sat Dec 26 16:07:24 2009 -0300 V4L/DVB (13893): gspca - vc032x: Change the sensor of 046d:0892 and 046d:0896. - new sensor POxxxx (unknown ID) - no probe - new controls - table for the disabled controls Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 219f3027a8078148ddc2a75125afbb071a4d70c7 Author: Jean-Francois Moine Date: Sat Dec 26 15:21:57 2009 -0300 V4L/DVB (13892): gspca - vc032x: Add the H and V flip controls for sensor mi1320. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit ff1cf4081244be0c84e90ab55a299c00d5a4d854 Author: Jean-Francois Moine Date: Sat Dec 26 15:18:02 2009 -0300 V4L/DVB (13891): gspca - vc032x: Fix bad probe of the sensor mi1320. - have 2 tables for sensor probe - with the same ID, the sensor mi1320 is found with the bridge vc0321, the sensor mi1320_soc with the bridge vc0323 - add some comments Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 08135ba238ba7fe4e7af8cf11d026a7ed6b51f21 Author: Antoine Jacquet Date: Sun Dec 27 18:22:05 2009 -0300 V4L/DVB (13885): zr364xx: fix support for Aiptek DV T300 Added a new initialization method for Aiptek DV T300. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13708 Tested-by: Hámorszky Balázs Signed-off-by: Antoine Jacquet Signed-off-by: Mauro Carvalho Chehab commit 969cc9264bf2bd94d51748bacdafa90352ab71fa Author: Erik Andrén Date: Sun Dec 27 05:53:28 2009 -0300 V4L/DVB (13883): gspca - m5602: Be less verbose during sensor probe Currently all probed sensor types are emitted in the kernel log, generating unnecessary noise. Be less verbose and only report what sensor is found (if any) Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit 6a1b262fac3b013b0b8afaf1fb23e6020e58fe02 Author: Erik Andrén Date: Sat Dec 26 18:00:02 2009 -0300 V4L/DVB (13881): gspca - stv06xx: Clean up the dump bridge function Signed-off-by: Erik Andrén Signed-off-by: Mauro Carvalho Chehab commit fb8253baa0852bb628b6f4fed1ed0b8ae20e4e3c Author: Mauro Carvalho Chehab Date: Thu Dec 31 18:14:54 2009 -0300 V4L/DVB (13879): dvb_frontend: report what ioctl were called on debug mode When printing that an iocl were called, report the ioctl number. Signed-off-by: Mauro Carvalho Chehab commit 639544d78c430fef875f3bb31083a60f3e2e0344 Author: Mauro Carvalho Chehab Date: Thu Dec 31 17:49:32 2009 -0300 V4L/DVB (13878): dvb_frontend: Print dump on get after filling the data Signed-off-by: Mauro Carvalho Chehab commit 64677573a28c354828343741bc177e5543f5077e Author: Jean-Francois Moine Date: Sun Dec 20 12:31:28 2009 -0300 V4L/DVB (13872): gspca - sonixj: Add sensor adcm1700 and webcam 0c45:614a. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 0a71d9cec238dd953e1e31df6ad28f69dee16fcc Author: Jean-Francois Moine Date: Sun Dec 20 09:09:22 2009 -0300 V4L/DVB (13871): gspca - benq: New subdriver for camera 04a5:3035. Tested-by: Francesco Lavra Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d754a6ca9af4ef3eedf9768446689731af09664a Author: Jean-Francois Moine Date: Sun Dec 20 05:07:10 2009 -0300 V4L/DVB (13870): gspca - zc3xx: Bad detection of sensor HV7131R(c). The webcam 0ac8:303b may have the sensors HV7131B or HV7131R(c). This changeset checks the HV7131 type. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 658604ec9caa9c8a998e296f689bd85ca1f95d6a Author: Luis Maia Date: Tue Dec 15 13:40:44 2009 -0300 V4L/DVB (13867): gspca - zc3xx: Add one more chipset ID of tas5130K. This ID was found in a webcam 0ac8:301b. Signed-off-by: Luis Maia Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 47aaca961ffbe6196dd09d6b447d90d9d4598255 Author: Jean-Francois Moine Date: Tue Dec 15 05:23:04 2009 -0300 V4L/DVB (13866): gspca - main: Add the cam flag 'no_urb_create'. This flag permits subdrivers to create specific transfer URBs. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit db870875c0e29ba051e58c848e1877df8e85b49f Author: Jean-Francois Moine Date: Tue Dec 15 05:16:04 2009 -0300 V4L/DVB (13865): gspca - main: Optimize code. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 3205e4fe0d831c0457e9139794437e9999559150 Author: Mauro Carvalho Chehab Date: Tue Dec 29 08:25:13 2009 -0300 V4L/DVB (13856): ir-keytable: simplify and avoid a warning /home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c: In function 'ir_setkeycode': /home/v4l/buildtest/v4l-dvb-master/v4l/ir-keytable.c:190: warning: 'newkeymap' may be used uninitialized in this function Signed-off-by: Mauro Carvalho Chehab commit b4622c14a1450fa40dd89dc134ec008fd1c2d38c Author: Mauro Carvalho Chehab Date: Fri Dec 25 18:04:17 2009 -0300 V4L/DVB (13848): smsdvb: Add the proper status for IsRfLocked Now, if RF is locked but demod is not locked, it will report: >>> tuning status == 0x03 This happens, for example, if the device is on DVB-T, and the video standard is ISDB-T. Signed-off-by: Mauro Carvalho Chehab commit 25f9461a03f5f5a577a626df3ae5bcf09542d96a Author: Mauro Carvalho Chehab Date: Fri Dec 25 11:47:33 2009 -0300 V4L/DVB (13847): smsdvb: Remove a wrong debug message Signed-off-by: Mauro Carvalho Chehab commit 5eb23975b441cb8814eab82f5768e09106d50578 Author: Mauro Carvalho Chehab Date: Fri Dec 25 11:29:42 2009 -0300 V4L/DVB (13846): smsdvb: Properly implement stats for both DVB and ISDB-T After taking a look at the driver's history and doing some tests with DVB and ISDB-T, it was noticed that the stats were incomplete, for ISDB-T, and weren't working for DVB. Fixed the code and added a debug code to print the complete stats at dmesg. This debug is useful to improve the stats of this driver. Signed-off-by: Mauro Carvalho Chehab commit 643e15a0f44156fa05d163f202a9dffb264d2078 Author: Mauro Carvalho Chehab Date: Fri Dec 25 07:29:06 2009 -0300 V4L/DVB (13845): smsdvb: Fix the frequency switch that broke with v5 API conversion Bandwidth is in Hz, not in kHz. Signed-off-by: Mauro Carvalho Chehab commit e85c97a050f07bc5d2fe1382b994f063614af75b Author: Mauro Carvalho Chehab Date: Fri Dec 25 07:17:03 2009 -0300 V4L/DVB (13844): smsdvb: Properly report the Delivery System Signed-off-by: Mauro Carvalho Chehab commit 910ef763c1c3a6761aaa75bc5d086b45d4022e64 Author: Mauro Carvalho Chehab Date: Fri Dec 25 06:59:21 2009 -0300 V4L/DVB (13843): dib8000: Properly report Delivery System as SYS_ISDBT Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit cf4fab720c66b15a6cf3abeb5a38acb841efedf4 Author: Mauro Carvalho Chehab Date: Wed Dec 23 11:28:46 2009 -0300 V4L/DVB (13842): smsdvb: Convert it to use DVB API v5 (S2API) Based on a patch originally written by Michael Krufky for a preliminar S2API spec. The patch were ported to the S2API and had the ISDB-T API additions to honor the auto mode, while keep allowing manual tuning. Tested with both the original dvb-apps and the new dvb-apps-isdbt scan, that uses a different channel.conf and uses S2API with ISDB-T extensions. Thanks-to: Michael Krufky for his first version Signed-off-by: Mauro Carvalho Chehab commit 67ae1d26bd9291280874b49b9f388722682fe58f Author: Mauro Carvalho Chehab Date: Wed Dec 23 10:07:16 2009 -0300 V4L/DVB (13841): smsdvb: Make stats to work Siano series of patches seemed to cause a regression on reporting DTV statistics. Due to that, signal indication weren't received, preventing applications like scan to work. Tested with ISDB-T signals and got the same scan result as with a dib0700/dib8000 device. Signed-off-by: Mauro Carvalho Chehab commit dcb0c53331c0cfcac52d0921d3e3d06fdb2c417a Author: Michael Krufky Date: Tue Dec 22 21:09:52 2009 -0300 V4L/DVB (13840): smsusb: Add ISDB-T firmware for Hauppauge WinTV-Nova-T-MiniStick Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 6b26fcea513095cd8a86cb376ad5a9df2fa8fe14 Author: Michael Krufky Date: Tue Dec 22 21:08:49 2009 -0300 V4L/DVB (13839): smsdvb: add ISDB-T as DVB-T tuning support hack Activate ISDB-T mode using module option default_mode=6. hack: use 4 lower bits in frequency for segment number [mchehab@redhat.com: fix merge conflicts and CodingStyle] Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit c245c75c41b9693bcbd6c95e25af324188b4dce1 Author: David Wong Date: Sat Nov 28 08:36:31 2009 -0300 V4L/DVB (13838): atbm8830: use AGC setting from config Improves ATBM8830 reception by using per card AGC configuration rather than register default. Signed-off-by: David T. L. Wong Signed-off-by: Mauro Carvalho Chehab commit 8719cfdb4aa5bc7402bef873f607ed406960019f Author: Mauro Carvalho Chehab Date: Thu Dec 17 09:24:37 2009 -0300 V4L/DVB (13833): ir-core: some functions can be static Signed-off-by: Mauro Carvalho Chehab commit 68f194e027ecfbbc8d5515bc40787e542eed59e9 Author: Daniel Ritz Date: Sat Dec 12 14:57:17 2009 -0300 V4L/DVB (13830): uvcvideo: add another YUYV format GUID for iSight cameras For some unknown reason, on a MacBookPro5,3 the iSight sometimes report a different video format GUID. This patch add the other (wrong) GUID to the format table, making the iSight work always w/o other problems. What it should report: 32595559-0000-0010-8000-00aa00389b71 What it often reports: 32595559-0000-0010-8000-000000389b71 Signed-off-by: Daniel Ritz Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 73de3592c0da2313b25bac7789e9ea02c4b9f082 Author: Laurent Pinchart Date: Thu Dec 10 10:00:39 2009 -0300 V4L/DVB (13828): uvcvideo: Make the quirks module parameter override the built-in quirks The quirks module parameter is or'ed with the built-in quirks for the device being probed. This make it impossible to disable a built-in quirk without recompiling the driver. Replace the built-in quirks with the quirks module parameter instead of or'ing the values. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 310fe52461e6244b01a04b011c2e886d6b69de16 Author: Laurent Pinchart Date: Wed Dec 9 22:57:48 2009 -0300 V4L/DVB (13827): uvcvideo: Switch to a monotonic clock for V4L2 buffers timestamps The realtime clock provided by do_gettimeofday() is affected by time jumps caused by NTP or DST. Furthermore, preliminary investigation showed that SMP systems the realtime clock is based on the CPU TSC, and those could get slightly out of sync, resulting in jitter in the timestamps depending on which processor handles the USB interrupts. Instead of the realtime clock, use a monotonic high resolution clock to timestamp the buffer. As this could in theory introduce a regression with some userspace applications expecting a realtime clock timestamp, add a module parameter to switch back to the realtime clock. Thanks to Paulo Assis for pointing out and investigating the issue. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab commit 0f7ff39532f1d2328e54b65ce5022c71f06e44d6 Author: Mauro Carvalho Chehab Date: Wed Dec 16 23:46:48 2009 -0300 V4L/DVB (13825): ir-core: Don't OOPS if IR device props is not defined As currently most drivers don't define ir_dev->props, we shouldn't assume that this field is defined. Signed-off-by: Mauro Carvalho Chehab commit cd79d33e168dba0d7de32c5bf010e20cff184b2a Author: Igor M. Liplianin Date: Mon Dec 14 20:24:56 2009 -0300 V4L/DVB (13818): Add Prof 7500 DVB-S2 USB card The card based on stv0903 demod, stb6100 tuner. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit d41592a2a2b9a27425ade3fc2c8526e9e997acd6 Author: Jean-Francois Moine Date: Sun Dec 13 14:11:07 2009 -0300 V4L/DVB (13815): gspca - sunplus: Add webcam 052b:1507. Signed-off-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 971e8298dee4835fc2dfbd207a9786702aa01666 Author: Mauro Carvalho Chehab Date: Mon Dec 14 13:53:37 2009 -0300 V4L/DVB (13680): ir: use unsigned long instead of enum When preparing the linux-next patches, I got those errors: include/media/ir-core.h:29: warning: left shift count >= width of type In file included from include/media/ir-common.h:29, from drivers/media/video/ir-kbd-i2c.c:50: drivers/media/video/ir-kbd-i2c.c: In function ‘ir_probe’: drivers/media/video/ir-kbd-i2c.c:324: warning: left shift count >= width of type Unfortunately, enum is 32 bits on i386. As we define IR_TYPE_OTHER as 1<<63, it won't work on non 64 bits arch. Signed-off-by: Mauro Carvalho Chehab commit 3f831107ed8efc32960e0cd172799bb82f6c81c9 Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:59:19 2009 -0300 V4L/DVB (13641): Properly update the driver representation for the protocol Signed-off-by: Mauro Carvalho Chehab commit eecee32ac2c4b00b76cc8d99fd8d2b9fd54a283d Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:56:15 2009 -0300 V4L/DVB (13639): ir-sysfs: Properly protect rc_tab changes with a lock Signed-off-by: Mauro Carvalho Chehab commit d4b778d36889b4d51d79a99f8a96e110def8541c Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:55:03 2009 -0300 V4L/DVB (13638): ir-core: documment missed functions While here, change ir_core_dev_number to be static Signed-off-by: Mauro Carvalho Chehab commit 950b0f5a0bf764663a6aa4397d105ad571c64a83 Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:54:22 2009 -0300 V4L/DVB (13637): em28xx: allow changing keycode table protocol Experimental patch to allow changing the IR protocol. Currently, it support changing between RC-5 and NEC protocols. Signed-off-by: Mauro Carvalho Chehab commit 09b01b90eb08769a64159ff4f81efe4badf6a49b Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:46:42 2009 -0300 V4L/DVB (13636): ir-core: add method to change IR protocol Signed-off-by: Mauro Carvalho Chehab commit 53f870228db0855f2031270ba5774dab0f33facd Author: Mauro Carvalho Chehab Date: Mon Dec 14 02:16:36 2009 -0300 V4L/DVB (13635): ir-core: Implement protocol table type reading Signed-off-by: Mauro Carvalho Chehab commit e93854da880d6dc357c00625d8371b6a926fd19b Author: Mauro Carvalho Chehab Date: Mon Dec 14 00:16:55 2009 -0300 V4L/DVB (13634): ir-core: allow passing IR device parameters to ir-core Adds an structure to ir_input_register to contain IR device characteristics, like supported protocols and a callback to handle protocol event changes. Signed-off-by: Mauro Carvalho Chehab commit 4714eda87748f226833c32400ab60dd6a3b80766 Author: Mauro Carvalho Chehab Date: Sun Dec 13 16:00:08 2009 -0300 V4L/DVB (13633): ir-core: create a new class for remote controllers Add sysfs skeleton to export remote controller information via /sys/class/irrcv. For now, the code doesn't do much. It just exports an attribute that is meant to report and control the IR protocol used by the keytable. However, the callbacks for this new attribute weren't set yet. Also, it lacks symlinks to the used event interface. Signed-off-by: Mauro Carvalho Chehab commit a4a47bc03fe520e95e0c4212bf97c86545fb14f9 Author: Linus Torvalds Date: Fri Feb 26 10:03:22 2010 -0800 Lower USB storage settling delay to something more reasonable The five-second delay can be rather annoying, and makes the system appear much less responsive when you connect a USB drive. It's also not entirely clear that it is needed - the settling delay has at least historically been an issue on some Apple iPods, for example, and some devices have been reported to need even more than the old 5s delay. But before we penalize them all, let's see how bad it really is. Some of the reasons for long delays seem to be actual historical kernel bugs that should probably never have been papered over with a delay in the first place (there's a Ubuntu bug report for 2.6.20 about a NULL pointer dereference unless 'delay_use' is 8 or more, for example). It also looks like some distros have already shipped with delay_use=0, so the five second default may well be totally historical. In other words: "Let's see if anybody screams". Signed-off-by: Linus Torvalds commit cf6620acc0f6fac57968aafef79ab372bdcf6157 Author: David Teigland Date: Wed Feb 24 11:59:23 2010 -0600 dlm: send reply before bast When the lock master processes a successful operation (request, convert, cancel, or unlock), it will process the effects of the change before sending the reply for the operation. The "effects" of the operation are: - blocking callbacks (basts) for any newly granted locks - waiting or converting locks that can now be granted The cast is queued on the local node when the reply from the lock master is received. This means that a lock holder can receive a bast for a lock mode that is doesn't yet know has been granted. Signed-off-by: David Teigland commit 6adad2d5430ee6b15b5f97475d50750f4d19577c Merge: 60b341b 81fc039 Author: Pekka Enberg Date: Fri Feb 26 19:25:30 2010 +0200 Merge branch 'kmemcheck/fixes' into kmemcheck-for-linus commit b5f5fe80fa98a60daa0fa94512d1599b1e26674c Author: Magnus Damm Date: Thu Feb 25 11:14:28 2010 +0000 sh: remove dead LED code for migo-r and ms7724se CONFIG_PM is always set on SH-Mobile these days so get rid of the unused LED setup code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6b3b55750b0de4a4ff2742efd34ff74665fa4e2f Author: Magnus Damm Date: Thu Feb 25 11:10:54 2010 +0000 sh: ecovec build fix for CONFIG_I2C=n Allow building the ecovec board support code even though I2C support is disabled. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2839bd61f671d3debf9ef0893a0470fd97b2e2ce Author: Magnus Damm Date: Thu Feb 25 11:07:52 2010 +0000 sh: ecovec r-standby support This patch adds board specific r-standby resume code for ecovec. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b67cf2848af1cf4a4c9c277429092ae59adf859b Author: Magnus Damm Date: Thu Feb 25 11:06:02 2010 +0000 sh: ms7724se r-standby support This patch adds board specific r-standby resume code for ms7724se. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 41bfb7d7a6ce3d8dd83112e65f5d97feefde818a Author: Magnus Damm Date: Thu Feb 25 11:03:24 2010 +0000 sh: SH-Mobile R-standby register save/restore Add code to save/restore registers during R-standby sleep on SH-Mobile processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6ebdc661b608671e9ca572af8bb42d58108cc008 Merge: d7930c9 df0edeb Author: Linus Torvalds Date: Thu Feb 25 15:38:37 2010 -0800 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (41 commits) of: remove undefined request_OF_resource & release_OF_resource of/sparc: Remove sparc-local declaration of allnodes and devtree_lock of: move definition of of_chosen into common code. of: remove unused extern reference to devtree_lock of: put default string compare and #a/s-cell values into common header of/flattree: Don't assume HAVE_LMB of: protect linux/of.h with CONFIG_OF proc_devtree: fix THIS_MODULE without module.h of: Remove old and misplaced function declarations of/flattree: Make the kernel accept ePAPR style phandle information of/flattree: endian-convert members of boot_param_header of: assume big-endian properties, adding conversions where necessary of: use __be32 for cell value accessors of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing of/flattree: use callback to setup initrd from /chosen proc_devtree: include linux/of.h of: make set_node_proc_entry private to proc_devtree.c of: include linux/proc_fs.h of/flattree: merge early_init_dt_scan_memory() common code of: add 'of_' prefix to machine_is_compatible() ... commit d7930c9ef9cc67044f5ddaac54d06ca22645a012 Merge: b6d9702 4f4517c Author: Linus Torvalds Date: Thu Feb 25 15:38:03 2010 -0800 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (31 commits) spi: Correct SPI clock frequency setting in spi_mpc8xxx spi/spi_s3c64xx.c: Fix continuation line formats spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK spi/dw_spi: Allow dw_spi.c to be a module spi/dw_spi: mmio code style fixups Memory-mapped dw_spi driver spi/dw_spi: fix missing export of dw_spi_remove_host spi/dw_spi: conditional transfer mode changes spi/dw_spi: remove conditional from 'poll_transfer'. spi/dw_spi: fixed a spelling typo in a warning message. spi/dw_spi: add return value to empty mrst_spi_debugfs_init() spi/dw_spi: enable platform specific chipselect. spi/dw_spi: add a FIFO depth detection spi/dw_spi: fix __init/__devinit section mismatch spi: xilinx_spi: Fix up I/O routine wrapping bogosity. spi/spi_imx: add device information by switching pr_debug() to dev_dbg() spi: update MSIOF includes spi/dw_spi: refine the IRQ mode working flow spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence spi/dw_spi: bug fix in wait_till_not_busy() ... commit b6d97026561a6ed6eed58428633a6bb4e1b78c57 Merge: 1954ee5 3cebbb8 Author: Linus Torvalds Date: Thu Feb 25 14:44:33 2010 -0800 Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig * 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig: kconfig: Simplify LSMOD= handling kconfig: Add LSMOD=file to override the lsmod for localmodconfig kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl kconfig: Check for if conditions in Kconfig for localmodconfig kconfig: Create include/generated for localmodconfig commit 1954ee55605a75c91924b63c2584f4d53f11afc7 Merge: a85821f 7b76bfc Author: Linus Torvalds Date: Thu Feb 25 14:43:57 2010 -0800 Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig * 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig: kconfig: simplification of scripts/extract-ikconfig commit a85821fce2c100a6680511f9693b76f9717fbdee Merge: 10df38c 14ef2b0 Author: Linus Torvalds Date: Thu Feb 25 14:42:39 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (41 commits) HID: usbhid: initialize interface pointers early enough HID: extend mask for BUTTON usage page HID: hid-ntrig: Single touch mode tap HID: hid-ntrig: multitouch cleanup and fix HID: n-trig: remove unnecessary tool switching HID: hid-ntrig add multi input quirk and clean up HID: usbhid: introduce timeout for stuck ctrl/out URBs HID: magicmouse: coding style and probe failure fixes HID: remove MODULE_VERSION from new drivers HID: fix up Kconfig entry for MagicMouse HID: add a device driver for the Apple Magic Mouse. HID: Export hid_register_report HID: Support for MosArt multitouch panel HID: add pressure support for the Stantum multitouch panel HID: fixed bug in single-touch emulation on the stantum panel HID: fix typo in error message HID: add mapping for "AL Network Chat" usage HID: use multi input quirk for TouchPack touchscreen HID: make full-fledged hid-bus drivers properly selectable HID: make Wacom modesetting failures non-fatal ... commit 6335e4d56681f6f08f24f4b812a72d402793d393 Author: Matthew Garrett Date: Thu Feb 25 15:20:54 2010 -0500 toshiba_acpi: Add full hotkey support Calling the ENAB method on Toshiba laptops results in notifications being sent when laptop hotkeys are pressed. This patch simply calls that method and sets up an input device if it's successful. Signed-off-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit caeacf59af3d114a3121bb04f8057109bbf289ea Author: Matthew Garrett Date: Wed Feb 17 10:29:39 2010 -0500 hp-wmi: Add support for tablet rotation key The HP touchsmart tablet has a key for rotating the UI from landscape to portrait. Add support for it. Signed-off-by: Matthew Garrett commit cb6a7937f4328a267e0806680ade500ed2c3c01a Author: Erik Andren Date: Sun Feb 14 11:53:23 2010 -0500 dell-laptop: Add another Dell laptop to the DMI whitelist The Latitude C640 has another variation of dell in its DMI vendor entry. Add it to the whitelist in order to enjoy the sweet fruits of software backlight toggling. Signed-off-by: Erik Andren commit 02e77a55f7b7e36888e39c62439fedb90ae4e808 Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 9 17:37:27 2010 -0500 classmate-laptop: use a single MODULE_DEVICE_TABLE to get correct aliases Instead of a MODULE_DEVICE_TABLE for every acpi_driver ids table, we create a table containing all ids to export to get a module alias for each one. This will fix automatic loading of the driver when one of the ACPI devices is not present (like the accelerometer, which is not present in some models). Signed-off-by: Thadeu Lima de Souza Cascardo commit c6760ac4268b6dbe03d74e5faef35bc862a82542 Author: Matthew Garrett Date: Wed Feb 10 14:44:03 2010 -0500 dell-laptop: Pay attention to which devices the hardware switch controls Right now, we assume that the hardware rfkill switch on Dells toggles all radio devices. In fact, this can be configured in the BIOS and so right now we may mark a device as hardware killed even when it isn't. Add code to query the devices controlled by the switch, and use this when determining the hardware kill state of a radio. Signed-off-by: Matthew Garrett commit 116ee77b2858d9c89c0327f3a47c8ba864bf4a96 Author: Stuart Hayes Date: Wed Feb 10 14:12:13 2010 -0500 dell-laptop: Use buffer with 32-bit physical address Calls to communicate with system firmware via a SMI (using dcdbas) need to use a buffer that has a physical address of 4GB or less. Currently the dell-laptop driver does not guarantee this, and when the buffer address is higher than 4GB, the address is truncated to 32 bits and the SMI handler writes to the wrong memory address. Signed-off-by: Stuart Hayes Acked-by: Matthew Garrett commit e5fefd0c8c4e6bd11742625230d1c5026e2afb35 Author: Mario Limonciello Date: Tue Feb 9 17:41:03 2010 -0500 dell-laptop: Blacklist machines not supporting dell-laptop The Mini family doesn't support smbios 17,11 although it reports it does. Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner commit ec1722a21491e4c354bc3bbc704fef9a8fa811fb Author: Mario Limonciello Date: Tue Feb 9 14:11:05 2010 -0500 dell-laptop: Block software state changes when rfkill hard blocked The "hardware" switch is tied directly to a BIOS interface that will connect and disconnect the hardware from the bus. If you use the software interface to request the BIOS to make these changes, the HW switch will be in an inconsistent state and LEDs may not reflect the state of the HW. Signed-off-by: Mario Limonciello commit e551260b233e8dcbdc9d5f238ad4aa1200dc2ea7 Author: Matthew Garrett Date: Tue Feb 9 14:05:01 2010 -0500 dell-laptop: Fix small memory leak da_tokens was not being freed by dell-laptop on unload. Fix that. Signed-off-by: Matthew Garrett commit facd61d7b70d9c061f08e0b76976f7f833888a70 Author: Matthew Garrett Date: Tue Feb 9 14:03:04 2010 -0500 dell-laptop: Fix platform device unregistration dell-laptop currently fails to clean up its platform device correctly. Make sure that it's unregistered. Signed-off-by: Matthew Garrett commit 814cb8adbe2fb49302ac65bc31fa749143823860 Author: Matthew Garrett Date: Wed Dec 9 18:23:36 2009 +0000 dell-laptop: Update rfkill state on kill switch The rfkill interface on Dells only sends a notification that the switch has been changed via the keyboard controller. Add a filter so we can pick these notifications up and update the rfkill state appropriately. Signed-off-by: Matthew Garrett commit 493e91433e966a50964e221db92756eeb90dd54e Author: Mario Limonciello Date: Tue Aug 25 10:30:13 2009 -0500 compal-laptop: Replace sysfs support with rfkill support This drops the support for manually groking the files in sysfs to turn on and off the WLAN and BT for Compal laptops in favor of platform rfkill support. It has been combined into a single patch to not introduce regressions in the process of simply adding rfkill support Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner Signed-off-by: Matthew Garrett Cc: Cezary Jackiewicz commit 34325b9d2a7d36e2ba74a6652f2e3e8d57dfb145 Author: Mario Limonciello Date: Mon Aug 24 16:00:47 2009 -0500 compal-laptop: Add support for known Compal made Dell laptops The following Dell laptops are known to have been manufacturer by Compal and are supported by the compal-laptop platform driver - Mini 9 - Mini 10 - Mini 12 - Mini 10v - Inspiron 11z Signed-off-by: Mario Limonciello Signed-off-by: Tim Gardner Signed-off-by: Matthew Garrett Cc: Cezary Jackiewicz commit d094485323a1f2abc7e4665700d6036de36fdaef Author: Matthew Garrett Date: Thu Feb 11 10:40:13 2010 -0500 MAINTAINERS: update drivers/platform/x86 information Many of the drivers/platform/x86 drivers have nothing to do with ACPI, so it's kind of inappropriate for them to be stuck under the ACPI mailing list. Add a new mailing list (platform-driver-x86@vger.kernel.org) and, with Len's blessing, add myself as subsystem maintainer. Signed-off-by: Matthew Garrett Cc: Anisse Astier Cc: Carlos Corbacho Cc: Cezary Jackiewicz Cc: Corentin Chary Cc: Daniel Oliveira Nascimento Cc: Harald Welte Cc: Henrique de Moraes Holschuh Cc: Herton Ronaldo Krzesinski Cc: Jonathan Woithe Cc: Karol Kozimor Cc: Len Brown Cc: Lennart Poettering Cc: Mattia Dongili Cc: Peter Feuerer Cc: Sujith Thomas Cc: Thadeu Lima de Souza Cascardo commit 14ef2b0c026558d37662e5e095d59c64597d5769 Merge: 57ab12e 71b38bd Author: Jiri Kosina Date: Thu Feb 25 17:39:16 2010 +0100 Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus Conflicts: drivers/hid/Kconfig commit bb8d41330ce27edb91adb6922d3f8e1a8923f727 Author: Thomas Gleixner Date: Thu Feb 25 16:42:11 2010 +0100 x86/PCI: Prevent mmconfig memory corruption commit ff097ddd4 (x86/PCI: MMCONFIG: manage pci_mmcfg_region as a list, not a table) introduced a nasty memory corruption when pci_mmcfg_list is empty. pci_mmcfg_check_end_bus_number() dereferences pci_mmcfg_list.prev even when the list is empty. The following write hits some variable near to pci_mmcfg_list. Further down a similar problem exists, where cfg->list.next is dereferenced unconditionally and a comparison with some variable near to pci_mmcfg_list happens. Add a check for the last element into the for_each_entry() loop and remove all the other crappy logic which is just a leftover of the old array based code which was replaced by the list conversion. Reported-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Bjorn Helgaas Cc: Yinghai Lu Cc: stable@kernel.org Signed-off-by: Jesse Barnes commit 10df38cafc87ef38870154d1b9b1ea2435e69287 Merge: dbd0042 c610028 Author: Linus Torvalds Date: Thu Feb 25 07:22:59 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: (44 commits) Add MAINTAINERS entry for virtio_console virtio: console: Fill ports' entire in_vq with buffers virtio: console: Error out if we can't allocate buffers for control queue virtio: console: Add ability to remove module virtio: console: Ensure no memleaks in case of unused buffers virtio: console: show error message if hvc_alloc fails for console ports virtio: console: Add debugfs files for each port to expose debug info virtio: console: Add ability to hot-unplug ports virtio: console: Handle port hot-plug virtio: console: Remove cached data on port close virtio: console: Register with sysfs and create a 'name' attribute for ports virtio: console: Ensure only one process can have a port open at a time virtio: console: Add file operations to ports for open/read/write/poll virtio: console: Associate each port with a char device virtio: console: Prepare for writing to userspace buffers virtio: console: Add a new MULTIPORT feature, support for generic ports virtio: console: Introduce a send_buf function for a common path for sending data to host virtio: console: Introduce function to hand off data from host to readers virtio: console: Separate out find_vqs operation into a different function virtio: console: Separate out console init into a new function ... commit dbd004291ed31db280a3f2d7a1113a04e5e85af4 Merge: 7491612 c36f74e Author: Linus Torvalds Date: Thu Feb 25 07:09:54 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: netlabel: fix export of SELinux categories > 127 commit da64c2a8dee66ca03f4f3e15d84be7bedf73db3d Author: Paul Mundt Date: Thu Feb 25 16:37:46 2010 +0900 clocksource: Fix up a registration/IRQ race in the sh drivers. All of the SH clocksource drivers follow the scheme that the IRQ is setup prior to registering the clockevent. The interrupt handler in the clockevent cases looks to the event handler function pointer being filled in by the registration code, permitting us to get in to situations where asserted IRQs step in to the handler before registration has had a chance to complete and hitting a NULL pointer deref. In practice this is not an issue for most platforms, but some of them with fairly special loaders (or that are chain-loading from another kernel) may enter in to this situation. This fixes up the oops reported by Rafael on hp6xx. Reported-and-tested-by: Rafael Ignacio Zurita Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 29463c28a553e1959ec45cc8ad9d2eb434663cdf Author: Kuninori Morimoto Date: Wed Feb 24 00:16:47 2010 +0000 sh: ms7724: modify scan_timing for KEYSC KEYSC::SCN register of SH7724 is 3bit. Thus, scan_timing should be 0 - 7 here. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit bbb892aac4724b7cc6e1626665310eddfd747235 Author: Kuninori Morimoto Date: Tue Feb 23 08:19:14 2010 +0000 sh: ms7724: Add sh_sir support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 263657168549075b57ecfbf730738105d1af8b65 Author: Kuninori Morimoto Date: Wed Feb 24 00:32:28 2010 +0000 sh: mach-ecovec24: Add sh_sir support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit c36f74e67fa12202dbcb4ad92c5ac844f9d36b98 Author: Joshua Roys Date: Wed Feb 24 18:52:44 2010 -0500 netlabel: fix export of SELinux categories > 127 This fixes corrupted CIPSO packets when SELinux categories greater than 127 are used. The bug occured on the second (and later) loops through the while; the inner for loop through the ebitmap->maps array used the same index as the NetLabel catmap->bitmap array, even though the NetLabel bitmap is twice as long as the SELinux bitmap. Signed-off-by: Joshua Roys Acked-by: Paul Moore Signed-off-by: James Morris commit 7491612c7d2cf560bb96dc02bb53d555b41adbb8 Merge: baac35c 453d313 Author: Linus Torvalds Date: Wed Feb 24 21:12:11 2010 -0800 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI commit 453d3131ec7aab82eaaa8401a50522a337092aa8 Author: Robert Hancock Date: Tue Jan 26 22:33:23 2010 -0600 ahci: disable FPDMA auto-activate optimization on NVIDIA AHCI Mike Cui reported that his system with an NVIDIA MCP79 (aka MCP7A) chipset stopped working with 2.6.32. The problem appears to be that 2.6.32 now enables the FPDMA auto-activate optimization in the ahci driver. The drive works fine with this enabled on an Intel AHCI so this appears to be a chipset bug. Since MCP79 is a fairly recent NVIDIA chipset and we don't have any info on whether any other NVIDIA chipsets have this issue, disable FPDMA AA optimization on all NVIDIA AHCI controllers for now. Should address http://bugzilla.kernel.org/show_bug.cgi?id=14922 Signed-off-by: Robert Hancock While-we-investigate-issue-this-patch-looks-good-to-me-by: Prajakta Gudadhe Signed-off-by: Jeff Garzik Cc: stable@kernel.org commit cbbc0de700e61d0cdc854d435dbc2ef148de0e00 Author: Rafael J. Wysocki Date: Wed Feb 24 00:52:08 2010 +0100 ACPI: Use GPE reference counting to support shared GPEs To fix a bug and address the reviewers' comments regarding the ACPI GPE refcounting patch, do the following additional changes: o Remove the second argument of acpi_ev_enable_gpe(), 'write_to_hardware', because it is not necessary any more. o Add the "bad parameter" test against 'type' in acpi_enable_gpe() and acpi_disable_gpe(). o Make acpi_enable_gpe() only check 'status' for runtime GPEs if acpi_ev_enable_gpe() was actually called. o Make acpi_disable_gpe() return 'status' returned by acpi_ev_disable_gpe() and fix a bug where ACPI_GPE_TYPE_WAKE and ACPI_GPE_TYPE_RUNTIME were exchanged by mistake. o Add comments explaining why acpi_set_gpe() is used by the ACPI EC driver. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit baac35c4155a8aa826c70acee6553368ca5243a2 Author: Xiaotian Feng Date: Wed Feb 24 18:39:02 2010 +0800 security: fix error return path in ima_inode_alloc If radix_tree_preload is failed in ima_inode_alloc, we don't need radix_tree_preload_end because kernel is alread preempt enabled Signed-off-by: Xiaotian Feng Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit 7fe2b3190b8b299409f13cf3a6f85c2bd371f8bb Author: David Teigland Date: Wed Feb 24 11:08:18 2010 -0600 dlm: fix ordering of bast and cast When both blocking and completion callbacks are queued for lock, the dlm would always deliver the completion callback (cast) first. In some cases the blocking callback (bast) is queued before the cast, though, and should be delivered first. This patch keeps track of the order in which they were queued and delivers them in that order. This patch also keeps track of the granted mode in the last cast and eliminates the following bast if the bast mode is compatible with the preceding cast mode. This happens when a remotely mastered lock is demoted, e.g. EX->NL, in which case the local node queues a cast immediately after sending the demote message. In this way a cast can be queued for a mode, e.g. NL, that makes an in-transit bast extraneous. Signed-off-by: David Teigland commit c610028611479e6b9d8b2f1a6628e9417ef4114f Author: Amit Shah Date: Fri Feb 12 10:32:19 2010 +0530 Add MAINTAINERS entry for virtio_console I'm taking ownership of the virtio_console module; but I'll continue feeding patches via Rusty. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d6933561924d8022f5d986ce7c511a2646eeadce Author: Amit Shah Date: Fri Feb 12 10:32:18 2010 +0530 virtio: console: Fill ports' entire in_vq with buffers Instead of allocating just one buffer for a port's in_vq, fill the entire in_vq with buffers so the host need not stall while an application consumes the data and makes the buffer available again for the host. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 22a29eacd2a17f22c8260a8106a4e36bae7fb6ea Author: Amit Shah Date: Fri Feb 12 10:32:17 2010 +0530 virtio: console: Error out if we can't allocate buffers for control queue With MULTIPORT support, the control queue is an integral part of the functioning of the device. If we can't get any buffers allocated, the host won't be able to relay important information and the device may not function as intended. Ensure 'probe' doesn't succeed until the control queue has at least one buffer allocated for its ivq. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 7177876fea8306a6f49400d11f5913bf9b3b5e5f Author: Amit Shah Date: Fri Feb 12 10:32:16 2010 +0530 virtio: console: Add ability to remove module Add the ability to remove the virtio_console module. This aids debugging. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a9cdd4855738906043b8131cfe8055d6cde88ffe Author: Amit Shah Date: Fri Feb 12 10:32:15 2010 +0530 virtio: console: Ensure no memleaks in case of unused buffers If unused data exists in in_vq, ensure we flush that first and then detach unused buffers, which will ensure all buffers from the in_vq are removed. Also ensure we free the buffers after detaching them. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 298add723aecd7af461319fe815d935ef2c40d78 Author: Amit Shah Date: Mon Jan 18 16:35:23 2010 +0530 virtio: console: show error message if hvc_alloc fails for console ports Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d99393effd76571cf2c4a07cbb6e86d41855a8fa Author: Amit Shah Date: Mon Dec 21 22:36:21 2009 +0530 virtio: console: Add debugfs files for each port to expose debug info This is helpful in examining ports' state. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1f7aa42d166cd104b0700d61efe2064178a3f6da Author: Amit Shah Date: Mon Dec 21 22:27:31 2009 +0530 virtio: console: Add ability to hot-unplug ports Remove port data; deregister from the hvc core if it's a console port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 7f5d810dac70214d00b2440787535b6c7a73b6b7 Author: Amit Shah Date: Mon Dec 21 22:22:08 2009 +0530 virtio: console: Handle port hot-plug If the 'nr_ports' variable in the config space is updated to a higher value, that means new ports have been hotplugged. Introduce a new workqueue to handle such updates and create new ports. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 88f251ac58b2460ed16ff619a020ad3ef365e607 Author: Amit Shah Date: Mon Dec 21 22:15:30 2009 +0530 virtio: console: Remove cached data on port close Remove any data that we might have in a port's inbuf when closing a port or when any data is received when a port is closed. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 431edb8a8bca71008fefceadf53b9315ef7196ec Author: Amit Shah Date: Mon Dec 21 21:57:40 2009 +0530 virtio: console: Register with sysfs and create a 'name' attribute for ports The host can set a name for ports so that they're easily discoverable instead of going by the /dev/vportNpn naming. This attribute will be placed in /sys/class/virtio-ports/vportNpn/name. udev scripts can then create symlinks to the port using the name. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 3c7969ccb569968a79fab3729075751bc8fc2f78 Author: Amit Shah Date: Thu Nov 26 11:25:38 2009 +0530 virtio: console: Ensure only one process can have a port open at a time Add a guest_connected field that ensures only one process can have a port open at a time. This also ensures we don't have a race when we later add support for dropping buffers when closing the char dev and buffer caching is turned off for the particular port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 2030fa496d74b49220308eaccf656e2338019cfd Author: Amit Shah Date: Mon Dec 21 21:49:30 2009 +0530 virtio: console: Add file operations to ports for open/read/write/poll Allow guest userspace applications to open, read from, write to, poll the ports via the char dev interface. When a port gets opened, a notification is sent to the host via a control message indicating a connection has been established. Similarly, on closing of the port, a notification is sent indicating disconnection. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit fb08bd274df61967f40d49c4625fe6ed75a69ab5 Author: Amit Shah Date: Mon Dec 21 21:36:04 2009 +0530 virtio: console: Associate each port with a char device The char device will be used as an interface by applications on the guest to communicate with apps on the host. The devices created are placed in /dev/vportNpn where N is the virtio-console device number and n is the port number for that device. One dynamic major device number is allocated for each device and minor numbers are allocated for the ports contained within that device. The file operation for the char devs will be added in the following commits. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit b766ceed5bbf04ae153389f5a15f53b9b6106a35 Author: Amit Shah Date: Mon Dec 21 21:26:45 2009 +0530 virtio: console: Prepare for writing to userspace buffers When ports get advertised as char devices, the buffers will come from userspace. Equip the fill_readbuf function with the ability to write to userspace buffers. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 17634ba25544d60af1968982929150efad755032 Author: Amit Shah Date: Mon Dec 21 21:03:25 2009 +0530 virtio: console: Add a new MULTIPORT feature, support for generic ports This commit adds a new feature, MULTIPORT. If the host supports this feature as well, the config space has the number of ports defined for that device. New ports are spawned according to this information. The config space also has the maximum number of ports that can be spawned for a particular device. This is useful in initializing the appropriate number of virtqueues in advance, as ports might be hot-plugged in later. Using this feature, generic ports can be created which are not tied to hvc consoles. We also open up a private channel between the host and the guest via which some "control" messages are exchanged for the ports, like whether the port being spawned is a console port, resizing the console window, etc. Next commits will add support for hotplugging and presenting char devices in /dev/ for bi-directional guest-host communication. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit f997f00bf8c3ddf748d757105afa1a7dd5297208 Author: Amit Shah Date: Mon Dec 21 17:28:51 2009 +0530 virtio: console: Introduce a send_buf function for a common path for sending data to host Adding support for generic ports that will write to userspace will need some code changes. Consolidate the write routine into send_buf() and put_chars() now just calls into the new function. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 203baab8ba3195dd929473ba95b91c2b838833e6 Author: Amit Shah Date: Mon Jan 18 19:15:12 2010 +0530 virtio: console: Introduce function to hand off data from host to readers In preparation for serving data to userspace (generic ports) as well as in-kernel users (hvc consoles), separate out the functionality common to both in a 'fill_readbuf()' function. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 2658a79acf014deb0eaff2063f8f7a2b59f41285 Author: Amit Shah Date: Mon Jan 18 19:15:11 2010 +0530 virtio: console: Separate out find_vqs operation into a different function With support for multiple ports, each port will have its own input and output vqs. Prepare the probe function for this change. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit cfa6d3792550c9eac51887181358954e6515da6b Author: Amit Shah Date: Mon Jan 18 19:15:10 2010 +0530 virtio: console: Separate out console init into a new function Console ports could be hot-added. Also, with the new multiport support, a port is identified as a console port only if the host sends a control message. Move the console port init into a separate function so it can be invoked from other places. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 4f23c573c0dbebfd193cfb90b003d67929c58b31 Author: Amit Shah Date: Mon Jan 18 19:15:09 2010 +0530 virtio: console: Separate out console-specific data into a separate struct Move out console-specific stuff into a separate struct from 'struct port' as we need to maintain two lists: one for all the ports (which includes consoles) and one only for consoles since the hvc callbacks only give us the vtermno. This makes console handling cleaner. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit cb06e3676b22013e9b759627e41656ddb07dee6d Author: Amit Shah Date: Mon Jan 18 19:15:08 2010 +0530 virtio: console: ensure console size is updated on hvc open When multiple console support is added, ensure each port's size gets updated when a new one is opened via hvc. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1c85bf35449196e74deb487961d2f90c98f7b7ff Author: Amit Shah Date: Mon Jan 18 19:15:07 2010 +0530 virtio: console: struct ports for multiple ports per device. Rather than assume a single port, add a 'struct ports_device' which stores data related to all the ports for that device. Currently, there's only one port and is hooked up with hvc, but that will change. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit d8a02bd58ab6da4495a2d1af74d980c217e9abcf Author: Rusty Russell Date: Mon Jan 18 19:15:06 2010 +0530 virtio: console: remove global var Now we can use an allocation function to remove our global console variable. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 38edf58d73c28b082ec808aecdeb0ef2b92af049 Author: Amit Shah Date: Mon Jan 18 19:15:05 2010 +0530 virtio: console: don't assume a single console port. Keep a list of all ports being used as a console, and provide a lock and a lookup function. The hvc callbacks only give us a vterm number, so we need to map this. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 73954488b1cc74cf46d6b94b8d3175f45496bd32 Author: Rusty Russell Date: Mon Jan 18 19:15:04 2010 +0530 virtio: console: use vdev->priv to avoid accessing global var. Part of removing our "one console" assumptions, use vdev->priv to point to the port (currently == the global console). Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a3cde44908429e52b2ec052ad5a70ef60e1f2d56 Author: Amit Shah Date: Mon Jan 18 19:15:03 2010 +0530 virtio: console: introduce a get_inbuf helper to fetch bufs from in_vq This makes taking locks around the get_buf vq operation easier, as well as complements the add_inbuf() operation. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit e27b519807e04d950802cb89f7b22933d8d2f837 Author: Amit Shah Date: Mon Jan 18 19:15:02 2010 +0530 virtio: console: ensure add_inbuf can work for multiple ports as well add_inbuf() assumed one port and one inbuf per port. Remove that assumption. Also move the function so that put_chars and get_chars are together. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit fdb9a054554e1e435e927c9a47a999f026abd408 Author: Amit Shah Date: Mon Jan 18 19:15:01 2010 +0530 virtio: console: encapsulate buffer information in a struct Collect port buffer, used_len, offset fields into a single structure. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 21206ede8826fd9d2eb72e05b429f3ccb1bdaff5 Author: Rusty Russell Date: Mon Jan 18 19:15:00 2010 +0530 virtio: console: port encapsulation We are heading towards a multiple-"port" system, so as part of weaning off globals we encapsulate the information into 'struct port'. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit f550804ab92e37a08d2622522a0f11252a2158ea Author: Amit Shah Date: Mon Jan 18 19:14:59 2010 +0530 virtio: console: We support only one device at a time We support only one virtio_console device at a time. If multiple are found, error out if one is already initialized. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 1dff399616a79b8ef5d61ad68f2ef1e1f590b465 Author: Rusty Russell Date: Sat Nov 28 12:20:26 2009 +0530 hvc_console: make the ops pointer const. This is nicer for modern R/O protection. And noone needs it non-const, so constify the callers as well. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah To: Christian Borntraeger Cc: linuxppc-dev@ozlabs.org commit 971f3390003619ea4ac0b20ee93dfd3209025790 Author: Rusty Russell Date: Mon Jan 18 19:14:56 2010 +0530 virtio: console: statically initialize virtio_cons That way, we can make it const as is good kernel style. We use a separate indirection for the early console, rather than mugging ops.put_chars. We rename it hv_ops, too. Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a23ea92474e558b071d3e43d961ec767c31faebd Author: Rusty Russell Date: Mon Jan 18 19:14:55 2010 +0530 virtio: console: comment cleanup Remove old lguest-style comments. [Amit: - wingify comments acc. to kernel style - indent comments ] Signed-off-by: Rusty Russell Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 3b8706240ee6084ccb46e53cd3a554356b7eeec8 Author: Amit Shah Date: Fri Feb 12 10:32:14 2010 +0530 virtio: Initialize vq->data entries to NULL vq operations depend on vq->data[i] being NULL to figure out if the vq entry is in use (since the previous patch). We have to initialize them to NULL to ensure we don't work with junk data and trigger false BUG_ONs. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell Cc: Shirley Ma commit c021eac4148c16bf53baa0dd14e8ebee6f39dab5 Author: Shirley Ma Date: Mon Jan 18 19:15:23 2010 +0530 virtio: Add ability to detach unused buffers from vrings There's currently no way for a virtio driver to ask for unused buffers, so it has to keep a list itself to reclaim them at shutdown. This is redundant, since virtio_ring stores that information. So add a new hook to do this. Signed-off-by: Shirley Ma Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 69740c8ba878f58bc3c71f74618fc2cd1da990da Author: Christoph Hellwig Date: Wed Feb 24 14:22:25 2010 -0600 virtio_blk: add block topology support Allow reading various alignment values from the config page. This allows the guest to much better align I/O requests depending on the storage topology. Note that the formats for the config values appear a bit messed up, but we follow the formats used by ATA and SCSI so they are expected in the storage world. Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell commit d57ed95da483418e8b0433da693c9168dd0a2df6 Author: Michael S. Tsirkin Date: Thu Jan 28 00:42:23 2010 +0200 virtio: use smp_XX barriers on SMP virtio is communicating with a virtual "device" that actually runs on another host processor. Thus SMP barriers can be used to control memory access ordering. Where possible, we should use SMP barriers which are more lightweight than mandatory barriers, because mandatory barriers also control MMIO effects on accesses through relaxed memory I/O windows (which virtio does not use) (compare specifically smp_rmb and rmb on x86_64). We can't just use smp_mb and friends though, because we must force memory ordering even if guest is UP since host could be running on another CPU, but SMP barriers are defined to barrier() in that configuration. So, for UP fall back to mandatory barriers instead. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell commit 97a545ab6ce922a0f868d192718a48a0091ebc5e Author: Rusty Russell Date: Wed Feb 24 14:22:22 2010 -0600 virtio: remove bogus barriers from DEBUG version of virtio_ring.c With DEBUG defined, we add an ->in_use flag to detect if the caller invokes two virtio methods in parallel. The barriers attempt to ensure timely update of the ->in_use flag. But they're voodoo: if we need these barriers it implies that the calling code doesn't have sufficient synchronization to ensure the code paths aren't invoked at the same time anyway, and we want to detect it. Also, adding barriers changes timing, so turning on debug has more chance of hiding real problems. Thanks to MST for drawing my attention to this code... CC: Michael S. Tsirkin Signed-off-by: Rusty Russell commit 28ff4ef71795fe6f6c0cc06a04911c9ca09c2c11 Author: Rusty Russell Date: Wed Feb 24 14:22:18 2010 -0600 lguest: remove unneeded zlib.h include in example launcher Two years ago 5bbf89fc2608 removed the horrible bzImage unpacking code. Now it's time to remove the unneeded zlib.h include, too. Signed-off-by: Rusty Russell commit 169c246a30808588436794e96a97c61a01af9bed Author: Rusty Russell Date: Wed Feb 24 14:22:14 2010 -0600 virtio: fix balloon without VIRTIO_BALLOON_F_STATS_VQ When running under qemu-kvm-0.11.0: BUG: unable to handle kernel paging request at 56e58955 ... Process vballoon (pid: 1297, ti=c7976000 task=c70a6ca0 task.ti=c7 ... Call Trace: [] ? balloon+0x1b3/0x440 [virtio_balloon] [] ? schedule+0x327/0x9d0 [] ? balloon+0x0/0x440 [virtio_balloon] [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x30 need_stats_update should be zero-initialized. Signed-off-by: Rusty Russell Acked-by: Adam Litke commit 1f34c71afe5115e77a49c4e67720a66e27053e54 Author: Adam Litke Date: Thu Dec 10 16:35:15 2009 -0600 virtio: Fix scheduling while atomic in virtio_balloon stats This is a fix for my earlier patch: "virtio: Add memory statistics reporting to the balloon driver (V4)". I discovered that all_vm_events() can sleep and therefore stats collection cannot be done in interrupt context. One solution is to handle the interrupt by noting that stats need to be collected and waking the existing vballoon kthread which will complete the work via stats_handle_request(). Rusty, is this a saner way of doing business? There is one issue that I would like a broader opinion on. In stats_request, I update vb->need_stats_update and then wake up the kthread. The kthread uses vb->need_stats_update as a condition variable. Do I need a memory barrier between the update and wake_up to ensure that my kthread sees the correct value? My testing suggests that it is not needed but I would like some confirmation from the experts. Signed-off-by: Adam Litke To: Rusty Russell Cc: Anthony Liguori Cc: linux-kernel@vger.kernel.org Signed-off-by: Rusty Russell commit 9564e138b1f6eb137f7149772438d3f3fb3277dd Author: Adam Litke Date: Mon Nov 30 10:14:15 2009 -0600 virtio: Add memory statistics reporting to the balloon driver (V4) Changes since V3: - Do not do endian conversions as they will be done in the host - Report stats that reference a quantity of memory in bytes - Minor coding style updates Changes since V2: - Increase stat field size to 64 bits - Report all sizes in kb (not pages) - Drop anon_pages stat and fix endianness conversion Changes since V1: - Use a virtqueue instead of the device config space When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests. The current method employs a daemon running in each guest that communicates memory statistics to a host daemon at a specified time interval. The host daemon aggregates this information and inflates and/or deflates balloons according to the level of host memory pressure. This approach is effective but overly complex since a daemon must be installed inside each guest and coordinated to communicate with the host. A simpler approach is to collect memory statistics in the virtio balloon driver and communicate them directly to the hypervisor. This patch enables the guest-side support by adding stats collection and reporting to the virtio balloon driver. Signed-off-by: Adam Litke Cc: Anthony Liguori Cc: virtualization@lists.linux-foundation.org Signed-off-by: Rusty Russell (minor fixes) commit 1f08b833ddbdb1c8e81c4b1053c2ebb7b89cb437 Author: Jamie Lokier Date: Fri Jan 8 22:01:43 2010 +0000 Add __devexit_p around reference to virtio_pci_remove This is needed to compile with CONFIG_VIRTIO_PCI=y, because virtio_pci_remove is marked __devexit. Signed-off-by: Jamie Lokier Signed-off-by: Rusty Russell commit 7bc5e3f2be32ae6fb0c74cd0f707f986b3a01a26 Author: Bjorn Helgaas Date: Tue Feb 23 10:24:41 2010 -0700 x86/PCI: use host bridge _CRS info by default on 2008 and newer machines The main benefit of using ACPI host bridge window information is that we can do better resource allocation in systems with multiple host bridges, e.g., http://bugzilla.kernel.org/show_bug.cgi?id=14183 Sometimes we need _CRS information even if we only have one host bridge, e.g., https://bugs.launchpad.net/ubuntu/+source/linux/+bug/341681 Most of these systems are relatively new, so this patch turns on "pci=use_crs" only on machines with a BIOS date of 2008 or newer. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2fe2abf896c1e7a0ee65faaf3ef0ce654848abbd Author: Bjorn Helgaas Date: Tue Feb 23 10:24:36 2010 -0700 PCI: augment bus resource table with a list Previously we used a table of size PCI_BUS_NUM_RESOURCES (16) for resources forwarded to a bus by its upstream bridge. We've increased this size several times when the table overflowed. But there's no good limit on the number of resources because host bridges and subtractive decode bridges can forward any number of ranges to their secondary buses. This patch reduces the table to only PCI_BRIDGE_RESOURCE_NUM (4) entries, which corresponds to the number of windows a PCI-to-PCI (3) or CardBus (4) bridge can positively decode. Any additional resources, e.g., PCI host bridge windows or subtractively-decoded regions, are kept in a list. I'd prefer a single list rather than this split table/list approach, but that requires simultaneous changes to every architecture. This approach only requires immediate changes where we set up (a) host bridges with more than four windows and (b) subtractive-decode P2P bridges, and we can incrementally change other architectures to use the list. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 89a74ecccd1f78e51faf6287e5c0e93a92ac096e Author: Bjorn Helgaas Date: Tue Feb 23 10:24:31 2010 -0700 PCI: add pci_bus_for_each_resource(), remove direct bus->resource[] refs No functional change; this converts loops that iterate from 0 to PCI_BUS_NUM_RESOURCES through pci_bus resource[] table to use the pci_bus_for_each_resource() iterator instead. This doesn't change the way resources are stored; it merely removes dependencies on the fact that they're in a table. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 2adf75160b10bf3f09ed7d3d04e937f923fc557e Author: Bjorn Helgaas Date: Tue Feb 23 10:24:26 2010 -0700 PCI: read bridge windows before filling in subtractive decode resources No functional change; this fills in the bus subtractive decode resources after reading the bridge window information rather than before. Also, print out the subtractive decode resources as we already do for the positive decode windows. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit fa27b2d108fa49685129867a8c5b968344d6e197 Author: Bjorn Helgaas Date: Tue Feb 23 10:24:21 2010 -0700 PCI: split up pci_read_bridge_bases() No functional change; this breaks up pci_read_bridge_bases() into separate pieces for the I/O, memory, and prefetchable memory windows, similar to how Yinghai recently split up pci_setup_bridge() in 68e84ff3bdc. Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 94ea5e449ae834af058ef005d16a8ad44fcf13d6 Author: Paul Mundt Date: Tue Feb 23 12:56:30 2010 +0900 sh: wire up SET/GET_UNALIGN_CTL. This hooks up the SET/GET_UNALIGN_CTL knobs cribbing the bulk of it from the PPC and ia64 implementations. The thread flags happen to be the logical inverse of what the global fault mode is set to, so this works out pretty cleanly. By default the global fault mode is used, with tasks now being able to override their own settings via prctl(). Signed-off-by: Paul Mundt commit 7c1b2c6890a1a033dde4f6991c0a1fcd69cf58ce Author: Paul Mundt Date: Tue Feb 23 11:48:50 2010 +0900 sh: allow alignment fault mode to be configured at kernel boot. Follow the ARM change, which is what our alignment helpers are based on in the first place. Signed-off-by: Paul Mundt commit b16694f70c40ea8d539cdc93a422039771e85870 Author: Kenji Kaneshige Date: Mon Feb 22 14:13:39 2010 +0900 PCIe PME: use pci_pcie_cap() Use pci_pcie_cap() instead of pci_find_capability() to get PCIe capability offset. This reduces redundant search in PCI configuration space. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 6cbf82148ff286ec22a55be6836c3a5bffc489c1 Author: Rafael J. Wysocki Date: Wed Feb 17 23:44:58 2010 +0100 PCI PM: Run-time callbacks for PCI bus type Introduce run-time PM callbacks for the PCI bus type. Make the new callbacks work in analogy with the existing system sleep PM callbacks, so that the drivers already converted to struct dev_pm_ops can use their suspend and resume routines for run-time PM without modifications. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 552be54cc4232dc5acc49ccb372129d6f1b6923f Author: Kenji Kaneshige Date: Mon Feb 22 14:12:24 2010 +0900 PCIe PME: use pci_is_pcie() Use pci_is_pcie() instead of looking at obsolete is_pcie field in struct pci_dev. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit b67ea76172d4b1922c4b3c46c8ea8e9fec1ff38c Author: Rafael J. Wysocki Date: Wed Feb 17 23:44:09 2010 +0100 PCI / ACPI / PM: Platform support for PCI PME wake-up Although the majority of PCI devices can generate PMEs that in principle may be used to wake up devices suspended at run time, platform support is generally necessary to convert PMEs into wake-up events that can be delivered to the kernel. If ACPI is used for this purpose, PME signals generated by a PCI device will trigger the ACPI GPE associated with the device to generate an ACPI wake-up event that we can set up a handler for, provided that everything is configured correctly. Unfortunately, the subset of PCI devices that have GPEs associated with them is quite limited. The devices without dedicated GPEs have to rely on the GPEs associated with other devices (in the majority of cases their upstream bridges and, possibly, the root bridge) to generate ACPI wake-up events in response to PME signals from them. Add ACPI platform support for PCI PME wake-up: o Add a framework making is possible to use ACPI system notify handlers for run-time PM. o Add new PCI platform callback ->run_wake() to struct pci_platform_pm_ops allowing us to enable/disable the platform to generate wake-up events for given device. Implemet this callback for the ACPI platform. o Define ACPI wake-up handlers for PCI devices and PCI root buses and make the PCI-ACPI binding code register wake-up notifiers for all PCI devices present in the ACPI tables. o Add function pci_dev_run_wake() which can be used by PCI drivers to check if given device is capable of generating wake-up events at run time. Developed in cooperation with Matthew Garrett . Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3f0be67188c60ebf1b5d00354b44b4b24f5af313 Author: Rafael J. Wysocki Date: Wed Feb 17 23:42:59 2010 +0100 ACPI / ACPICA: Multiple system notify handlers per device Currently it only is possible to install one system notify handler per namespace node, but this is not enough for PCI run-time power management, because we need to install power management notifiers for devices that already have hotplug notifiers installed. While in principle this could be handled at the PCI level, that would be suboptimal due to the way in which the ACPI-based PCI hotplug code is designed. For this reason, modify ACPICA so that it is possible to install more than one system notify handler per namespace node. Namely, make acpi_install_notify_handler(), acpi_remove_notify_handler() and acpi_ev_notify_dispatch() use a list of system notify handler objects associated with a namespace node. Make acpi_remove_notify_handler() call acpi_os_wait_events_complete() upfront to avoid a situation in which concurrent instance of acpi_remove_notify_handler() removes the handler from under us while we're waiting for the event queues to flush. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit f517709d65beed95f52f021b43e3035b52ef791a Author: Rafael J. Wysocki Date: Wed Feb 17 23:41:49 2010 +0100 ACPI / PM: Add more run-time wake-up fields Use the run_wake flag to mark all devices for which run-time wake-up events may be generated by the platform. Introduce a new wake-up flag, always_enabled, for marking devices that should be permanently enabled to generate run-time events. Also, introduce a reference counter for run-wake devices and a function that will initialize all of the run-time wake-up fields for given device. Signed-off-by: Rafael J. Wysocki Acked-by: Len Brown Signed-off-by: Jesse Barnes commit 9630bdd9b15d2f489c646d8bc04b60e53eb5ec78 Author: Rafael J. Wysocki Date: Wed Feb 17 23:41:07 2010 +0100 ACPI: Use GPE reference counting to support shared GPEs ACPI GPEs may map to multiple devices. The current GPE interface only provides a mechanism for enabling and disabling GPEs, making it difficult to change the state of GPEs at runtime without extensive cooperation between devices. Add an API to allow devices to indicate whether or not they want their device's GPE to be enabled for both runtime and wakeup events. Remove the old GPE type handling entirely, which gets rid of various quirks, like the implicit disabling with GPE type setting. This requires a small amount of rework in order to ensure that non-wake GPEs are enabled by default to preserve existing behaviour. Based on patches from Matthew Garrett . Signed-off-by: Matthew Garrett Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit c39fae1416d59fd565606793f090cebe3720d50d Author: Rafael J. Wysocki Date: Wed Feb 17 23:40:07 2010 +0100 PCI PM: Make it possible to force using INTx for PCIe PME signaling Apparently, some machines may have problems with PCI run-time power management if MSIs are used for the native PCIe PME signaling. In particular, on the MSI Wind U-100 PCIe PME interrupts are not generated by a PCIe root port after a resume from suspend to RAM, if the system wake-up was triggered by a PME from the device attached to this port. [It doesn't help to free the interrupt on suspend and request it back on resume, even if that is done along with disabling the MSI and re-enabling it, respectively.] However, if INTx interrupts are used for this purpose on the same machine, everything works just fine. For this reason, add a kernel command line switch allowing one to request that MSIs be not used for the native PCIe PME signaling, introduce a DMI table allowing us to blacklist machines that need this switch to be set by default and put the MSI Wind U-100 into this table. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit c7f486567c1d0acd2e4166c47069835b9f75e77b Author: Rafael J. Wysocki Date: Wed Feb 17 23:39:08 2010 +0100 PCI PM: PCIe PME root port service driver PCIe native PME detection mechanism is based on interrupts generated by root ports or event collectors every time a PCIe device sends a PME message upstream. Once a PME message has been sent by an endpoint device and received by its root port (or event collector in the case of root complex integrated endpoints), the Requester ID from the message header is registered in the root port's Root Status register. At the same time, the PME Status bit of the Root Status register is set to indicate that there's a PME to handle. If PCIe PME interrupt is enabled for the root port, it generates an interrupt once the PME Status has been set. After receiving the interrupt, the kernel can identify the PCIe device that generated the PME using the Requester ID from the root port's Root Status register. [For details, see PCI Express Base Specification, Rev. 2.0.] Implement a driver for the PCIe PME root port service working in accordance with the above description. Based on a patch from Shaohua Li . Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 58ff463396ad00828e922d50998787e97fd32512 Author: Rafael J. Wysocki Date: Wed Feb 17 23:36:58 2010 +0100 PCI PM: Add function for checking PME status of devices Add function pci_check_pme_status() that will check the PME status bit of given device and clear it along with the PME enable bit. It will be necessary for PCI run-time power management. Based on a patch from Shaohua Li Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 6d3be84aab461815978d970aa45f5bc9e52dd772 Author: Kenji Kaneshige Date: Tue Feb 9 12:21:27 2010 +0900 PCI: mark is_pcie obsolete The "is_pcie" field in struct pci_dev is no longer needed because struct pci_dev has PCIe capability offset in "pcie_cap" field and (pcie_cap != 0) means the device is PCIe capable. This patch marks "is_pcie" fields obsolete. Current users of "is_pcie" field are: - drivers/ssb/scan.c - drivers/net/wireless/ath/ath9k/pci.c - drivers/net/wireless/ath/ath5k/attach.c - drivers/net/wireless/ath/ath5k/reset.c - drivers/acpi/hest.c - drivers/pci/pcie/pme/pcie_pme.c Will post patches for each to use pci_is_pcie() as a follow-up. Signed-off-by: Kenji Kaneshige Signed-off-by: Jesse Barnes commit 9958610552c0bd7558b41cb8addbd865587f142a Author: Yinghai Lu Date: Fri Jan 22 01:02:28 2010 -0800 PCI: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges Make pci_bridge_check_ranges() store the PCI_PREF_RANGE_TYPE_64 in addition to IORESOURCE_MEM_64. Just like pci_read_bridge_bases(). Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 32180e402f9ff1f3389c99edf3f393425e706080 Author: Yinghai Lu Date: Fri Jan 22 01:02:27 2010 -0800 PCI: pciehp: second try to get big range for pcie devices Handle the case where the slot bridge that doesn't get a pre-allocated resource big enough to handle its child resources.. For example pcie devices need 256M, but the bridge only gets 2M preallocated. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 9789ac979b6b6ae6cc09f7b29c88e95ecb14ec39 Author: Yinghai Lu Date: Fri Jan 22 01:02:26 2010 -0800 PCI: pciehp: cleanup flow in pciehp_configure_device Move bus_size_bridges and assign resources out of pciehp_add_bridge() and do them all together, one time, including slot bridge, to avoid to calling assign resources several times when there are several bridges under the slot bridge. Using pci_assign_unassigned_bridge_resources. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 6841ec681a88b66651e4563040b9c7a7ad25d7b5 Author: Yinghai Lu Date: Fri Jan 22 01:02:25 2010 -0800 PCI: introduce pci_assign_unassigned_bridge_resources For use by pciehp. pci_setup_bridge() will not check enabled for the slot bridge, otherwise update res is not updated to bridge BAR. That is, bridge is already enabled for port service. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 977d17bb1749517b353874ccdc9b85abc7a58c2a Author: Yinghai Lu Date: Fri Jan 22 01:02:24 2010 -0800 PCI: update bridge resources to get more big ranges in PCI assign unssigned BIOS separates IO ranges between several IOHs, and on some slots, BIOS assigns resources to a bridge, but stops assigning resources to the device under that bridge, because the device needs a big resource. So: 1. allocate resources and record the failed device resources 2. clear the BIOS assigned resources of the parent bridge of failing device 3. go back and call pci assign unassigned 4. if it still fails, go up the tree, clear more bridges. and try again Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit d65245c3297ac63abc51a976d92f45f2195d2854 Author: Yinghai Lu Date: Fri Jan 22 01:02:23 2010 -0800 PCI: don't shrink bridge resources When clearing leaf bridge resources, trying to get a big enough one, we could shrink the bridge if there is no resource under it. Confirm against the old resource side to make sure we're increasing the allocation. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit cd81e1ea1a4cda94aa5f3e942301cf0da497c262 Author: Yinghai Lu Date: Fri Jan 22 01:02:22 2010 -0800 PCI: reject mmio ranges starting at 0 on pci_bridge read We already track unassigned resources in struct resource, and this prevents us from overwriting resource flags and info in the unassigned case. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 568ddef8735d4a51a521ba6af026ee0c32281566 Author: Yinghai Lu Date: Fri Jan 22 01:02:21 2010 -0800 PCI: add failed_list to pci_bus_assign_resources This allows us to track failed allocations for later re-trying with reallocation. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit 5009b46025acb2d3955d2c93574604fba667ef39 Author: Yinghai Lu Date: Fri Jan 22 01:02:20 2010 -0800 PCI: add pci_bridge_release_resources and pci_bus_release_bridge_resources We use this in later patches to free resrouce ranges for reassignment in an effort to support a wider variety of PCI topologies. Signed-off-by: Yinghai Lu Reviewed-by: Alex Chiang Signed-off-by: Jesse Barnes commit ba02b242bbf8e4e1bc63d62e8ccec33b4e5ea132 Author: Andrew Morton Date: Tue Feb 2 14:45:54 2010 -0800 PCI hotplug: check ioremap() return value in ibmphp_ebda.c check ioremap() return value. Cc: Signed-off-by: Andrew Morton Signed-off-by: Jesse Barnes commit 939fdc67350e15aeeea70457d5b4bc1116bb4fd5 Author: Randy Dunlap Date: Thu Feb 4 12:12:23 2010 -0800 PCI hotplug: fix ibmphp build error Add header file to fix build error: drivers/pci/hotplug/ibmphp_hpc.c:135: error: implicit declaration of function 'init_MUTEX' drivers/pci/hotplug/ibmphp_hpc.c:136: error: implicit declaration of function 'init_MUTEX_LOCKED' drivers/pci/hotplug/ibmphp_hpc.c:797: error: implicit declaration of function 'down' drivers/pci/hotplug/ibmphp_hpc.c:807: error: implicit declaration of function 'up' Signed-off-by: Randy Dunlap Signed-off-by: Jesse Barnes commit 4fb88c1a28a8dc302bdc09858e7cdafc97bef794 Author: Matthew Wilcox Date: Sun Jan 17 14:01:41 2010 -0700 PCI: Make pci_scan_slot more robust Yinghai pointed out that the new pci_scan_slot() crashes when called on an ARI-capable slot that is empty. Fix this by exiting early from pci_scan_slot if there is no device in the slot. Also make next_ari_func() robust against devices not existing in case the ARI capability is corrupt. ARI also requires that the devices be listed in order, so if we find a function listed that is out of order, stop scanning to prevent loops. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 0bf01c3c86d4b9ea279d6215420484db887f5db5 Author: Jiri Slaby Date: Wed Jan 20 14:15:54 2010 +0100 PCI: hotplug/cpcihp, fix pci device refcounting Stanse found an ommitted pci_dev_put on one error path in cpcihp_generic_init. The path is taken on !dev, but also when dev->hdr_type != PCI_HEADER_TYPE_BRIDGE. However it omits to pci_dev_put on the latter. As it is fine to pass NULL to pci_dev_put, put it in there uncoditionally. Signed-off-by: Jiri Slaby Cc: Scott Murray Signed-off-by: Jesse Barnes commit 41a68a748bbc61f5bcea999e33ba72926dfbe6f7 Author: Tilman Schmidt Date: Mon Jan 18 17:24:10 2010 +0100 PCI: push deprecated pci_find_device() function to last user The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Signed-off-by: Tilman Schmidt Signed-off-by: Jesse Barnes commit 7c9342b8dd1a32386fc32bffb9eedebbfe264763 Author: Yinghai Lu Date: Tue Dec 22 15:02:24 2009 -0800 PCI: don't dump resource when bus resource flags indicates unused Don't print out resources without flags to avoid cluttering up the debug output. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 5eeec0ec931a01e85b3701ce121b7d8a1800ec60 Author: Yinghai Lu Date: Tue Dec 22 15:02:22 2009 -0800 resource: add release_child_resources Useful for freeing a portion of the resource tree, e.g. when trying to reallocate resources more efficiently. Signed-off-by: Yinghai Lu Acked-by: Linus Torvalds Signed-off-by: Jesse Barnes commit 7cc5997d1dada3bdeed95a59c2f4f6c66cbb0767 Author: Yinghai Lu Date: Tue Dec 22 15:02:21 2009 -0800 PCI: separate pci_setup_bridge to small functions This is a good cleanup in itself, and makes it easier to modify specific resource types in later code. Signed-off-by: Yinghai Lu Acked-by: Linus Torvalds Signed-off-by: Jesse Barnes commit b0fc889c4311835ae7d02f433154bc20cad9ee11 Author: Chandru Date: Mon Jan 11 11:49:21 2010 +0530 PCI hotplug: ibmphp: read the length of ebda and map entire ebda region ibmphp driver currently maps only 1KB of ebda memory area into kernel address space during driver initialization. This causes kernel oops when the driver is modprobe'd and it accesses memory beyond 1KB within ebda segment. The first byte of ebda segment actually stores the length of the ebda region in Kilobytes. Hence make use of the length parameter and map the entire ebda region. Signed-off-by: Chandru Siddalingappa Signed-off-by: Jesse Barnes commit 6fcaf17ac7a512227112ac81c0e1a5862bab57a6 Author: Jiri Slaby Date: Wed Jan 6 17:47:56 2010 +0100 PCI hotplug: fix memory leaks Stanse found a cut&pasted memory leak in pciehp_queue_pushbutton_work and shpchp_queue_pushbutton_work. info is not freed/assigned on all paths. Fix that. Reviewed-by: Kenji Kaneshige Signed-off-by: Jiri Slaby Signed-off-by: Jesse Barnes commit 3b7a17fcdae532d29dffab9d564a28be08960988 Author: Dominik Brodowski Date: Fri Jan 1 17:40:50 2010 +0100 resource/PCI: mark struct resource as const Now that we return the new resource start position, there is no need to update "struct resource" inside the align function. Therefore, mark the struct resource as const. Cc: Bjorn Helgaas Cc: Yinghai Lu Signed-off-by: Dominik Brodowski Signed-off-by: Jesse Barnes commit b26b2d494b659f988b4d75eb394dfa0ddac415c9 Author: Dominik Brodowski Date: Fri Jan 1 17:40:49 2010 +0100 resource/PCI: align functions now return start of resource As suggested by Linus, align functions should return the start of a resource, not void. An update of "res->start" is no longer necessary. Cc: Bjorn Helgaas Cc: Yinghai Lu Signed-off-by: Dominik Brodowski Signed-off-by: Jesse Barnes commit 93da6202264ce1256b04db8008a43882ae62d060 Author: Seth Heasley Date: Tue Jan 12 16:56:37 2010 -0800 x86/PCI: irq and pci_ids patch for Intel Cougar Point DeviceIDs This patch adds the Intel Cougar Point (PCH) LPC and SMBus Controller DeviceIDs. Signed-off-by: Seth Heasley Signed-off-by: Jesse Barnes commit 93177a748ba0d4f3d3e51c8e6c785773bf6a70df Author: Rafael J. Wysocki Date: Sat Jan 2 22:57:24 2010 +0100 PCI: Clean up build for CONFIG_PCI_QUIRKS unset Currently, drivers/pci/quirks.c is built unconditionally, but if CONFIG_PCI_QUIRKS is unset, the only things actually built in this file are definitions of global variables and empty functions (due to the #ifdef CONFIG_PCI_QUIRKS embracing all of the code inside the file). This is not particularly nice and if someone overlooks the #ifdef CONFIG_PCI_QUIRKS, build errors are introduced. To clean that up, move the definitions of the global variables in quirks.c that are always built to pci.c, move the definitions of the empty functions (compiled when CONFIG_PCI_QUIRKS is unset) to headers (additionally make these functions static inline) and modify drivers/pci/Makefile so that quirks.c is only built if CONFIG_PCI_QUIRKS is set. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 3804259475314a50e4d7a8a974a22fddb6ac7dd7 Author: Jesse Barnes Date: Mon Jan 4 15:44:10 2010 -0800 PCI hotplug: remove obsolete usage of get_bus_speed from rpaphp hotplug ops No longer needed and causes build breakage. Reported-by: Stephen Rothwell Signed-off-by: Jesse Barnes commit 9dfd97fe12f79ec8b68feb63912a4ef2f31f571a Author: Matthew Wilcox Date: Sun Dec 13 08:11:35 2009 -0500 PCI: Add support for reporting PCIe 3.0 speeds Add the 8.0 GT/s speed. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 45b4cdd57ef0e57555b2ab61b584784819b39365 Author: Matthew Wilcox Date: Sun Dec 13 08:11:34 2009 -0500 PCI: Add support for AGP in cur/max bus speed Take advantage of some gaps in the table to fit in support for AGP speeds. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 9be60ca0497a2563662fde4c9007841c3b79a742 Author: Matthew Wilcox Date: Sun Dec 13 08:11:33 2009 -0500 PCI: Add support for detection of PCIe and PCI-X bus speeds Both PCIe and PCI-X bridges report their secondary bus speed in their respective capabilities. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 3749c51ac6c1560aa1cb1520066bed84c6f8152a Author: Matthew Wilcox Date: Sun Dec 13 08:11:32 2009 -0500 PCI: Make current and maximum bus speeds part of the PCI core Move the max_bus_speed and cur_bus_speed into the pci_bus. Expose the values through the PCI slot driver instead of the hotplug slot driver. Update all the hotplug drivers to use the pci_bus instead of their own data structures. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 536c8cb49eccd4f753b4782e7e975ef87359cb44 Author: Matthew Wilcox Date: Sun Dec 13 08:11:31 2009 -0500 PCI: Unify pcie_link_speed and pci_bus_speed These enums must not overlap anyway, since we only have a single pci_bus_speed_strings array. Use a single enum, and move it to pci.h. Add 'SPEED' to the pcie names to make it clear what they are. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit f07852d6442c46c50b59c7e2acc8a1b291f9ab6d Author: Matthew Wilcox Date: Sun Dec 13 08:10:02 2009 -0500 PCI: Rewrite pci_scan_slot The Alternate Routing-ID Interpretation capability allows a single device to have up to 256 functions. They can be populated sparsely, so the current technique of scanning every eighth function is not guaranteed to find them all. By introducing a 'next_fn' function pointer, we can use the linked list of functions in the ARI capability to scan all the functions which exist. We can then speed up the pci_scan_slot by skipping the scan of subsequent devfns for PCIe devices which are the direct children of Root Ports or Downstream Ports. These devices are only permitted to implement device 0, unless they are ARI devices, in which case they'll be scanned by the ARI code above. Signed-off-by: Matthew Wilcox Signed-off-by: Jesse Barnes commit 16afc9fb0298a66da25ee015eb3c8a8f55e3744a Author: Kuninori Morimoto Date: Mon Feb 22 05:18:10 2010 +0000 sh: sh7724: Update FSI/SPU2 clock When FSI and Network (= NFS file system) were used at the same time, the I/O of FSI was unstable. This patch updates the SPU2 clock (which is used for FSI) to solve this issue. Special thanks to Jeremy. Signed-off-by: Jeremy Baker Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6f26d19fce5907cdd0fd953ac1a1d0b1e6e5982c Author: Magnus Damm Date: Fri Feb 19 09:33:47 2010 +0000 sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec Update the sh7724 processor code to always enable vpu_clk. On the Ecovec board, set the vpu_clk to 166 Mhz. The 166MHz setting results in a divide-by-6 setup for vpu_clk and improves the VPU performance compared to the power-on-reset/bootloader configuration. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7be85c6eb4462cd973e680d9dcf897a7b5b26165 Author: Magnus Damm Date: Fri Feb 19 09:26:56 2010 +0000 sh: add sh7724 kick callback to clk_div4_table This patch adds a ->kick() callback to clk_div4_table and ties it into sh_clk_div4_set_rate(). A sh7724 specific kick function is also added that updates the KICK bit whenever div4 clocks in FRQCRA and FRQCRB have been set. Allows us to set the VPU clock. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 0a5f337ecd20e70e84a5cfc0f2c24d0366087026 Author: Magnus Damm Date: Fri Feb 19 09:22:25 2010 +0000 sh: introduce struct clk_div4_table This patch introduces struct clk_div4_table. The structure will be used to keep div4 specific data, and is with this patch replacing the struct clk_div_mult_table pointer arg used by the sh_clk_div4_register() functions. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit de7ca2144c36291a491bd39afad172f56432a4bb Author: Magnus Damm Date: Fri Feb 19 09:12:00 2010 +0000 sh: clock-cpg div4 set_rate() shift fix Make sure the div4 bitfield is shifted according to the enable_bit value in sh_clk_div4_set_rate(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 77c9cfc51b0d732b2524799810fb30018074fd60 Author: Martin K. Petersen Date: Wed Jan 20 02:20:43 2010 -0500 [SCSI] Fix printing of failed 32-byte commands Having the large CDB allocation logic in sd.c means that scsi_io_completion does not have access to the command buffer. That in turn causes garbage to be printed when a 32-byte command fails. Move the command printing to sd_done where the command buffer is intact. Clear the command buffer pointer after the extended CDB has been freed. Make scsi_print_command ignore commands with NULL CDB pointers to inhibit printing of garbled command strings. Signed-off-by: Martin K. Petersen Reviewed-by: Boaz Harrosh Signed-off-by: James Bottomley commit 8475f688d796b875bf98ed161acd53d00a1483ff Author: Martin K. Petersen Date: Wed Jan 20 02:17:40 2010 -0500 [SCSI] Fix printing of variable length commands We dereferenced the MAINTENANCE IN array when decoding variable length commands. Use the right array. Also consolidate identical if statements below. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit 78d85019ba8c13e1094cad0ea9bb4f61caad8320 Author: Bart Van Assche Date: Wed Dec 9 19:52:19 2009 +0100 [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation Fix a bug in the interpretation of the ADDITIONAL CDB LENGTH (add_cdb_len) field of SRP_CMD requests. According to the SRP specification, the layout of this single-byte field is as follows: * Bits 0 and 1 are reserved. * Bits 2 to 7 represent the ADDITIONAL CDB LENGTH field, symbolically represented as n. * Still according to the SRP specification, the ADDITIONAL CDB section takes 4*n bytes. Currently libsrp is only used by the ibmvscsi driver. Since the ibmvscsi driver doesn't support large CDB's, this bug hasn't caused any problems yet. [jejb: use & ~3 to mask the bits] Signed-off-by: Bart Van Assche Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit 22963a37b3437a25812cc856afa5a84ad4a3f541 Author: Brian King Date: Fri Feb 19 10:08:31 2010 -0600 [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list Adds IBM Power Virtual SCSI ALUA devices to the ALUA device handler. Signed-off-by: Brian King Signed-off-by: James Bottomley commit cd4a8814d44672bd2c8f04a472121bfbe193809c Author: Mike Christie Date: Thu Feb 18 17:32:03 2010 -0600 [SCSI] scsi_dh_alua: add netapp to dev list Newer Netapp target software supports ALUA, so this patch adds them to the scsi_dev_alua dev list. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 35b7f0a76bb4307db7bcf9b73c4accf793cd88fa Author: Giridhar Malavali Date: Thu Feb 18 10:07:30 2010 -0800 [SCSI] qla2xxx: Update version number to 8.03.02-k1. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 8c1496bda8aeeafd78ecf0c25c060b601e58dedf Author: Richard Lary Date: Thu Feb 18 10:07:29 2010 -0800 [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit ae97c91eb1f139b19c1e7cbc5c1380dae8ad874e Author: Andrew Vasquez Date: Thu Feb 18 10:07:28 2010 -0800 [SCSI] qla2xxx: Add firmware ETS burst support. Can be used to balance NIC/FCoE traffic distribution. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit bb2d52b2fd8b19355957e34271f79917f69e4059 Author: Andrew Vasquez Date: Thu Feb 18 10:07:27 2010 -0800 [SCSI] qla2xxx: Correct loop-resync issues during SNS scans. Original code could inadvertently skip the post processing of port information returned from the SNS scan, if any link-flopping asynchronous-events were received (noticed in FCAL topologies). Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 715848ca6fffeb6362a50887d9c26245bd5dfba9 Author: Andrew Vasquez Date: Thu Feb 18 10:07:26 2010 -0800 [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback. The explicit logout (LOGO) issued at the end of the callback will flush (via normal scsi_cmnd->done()) any outstanding commands (FCP2) the firmware is holding. While iterating through the outstanding_cmnd array in qla2x00_abort_fcport_cmds(), locking and unlocking of the hardware spinlock, opens-up the driver to cases where the processed SRB (sp) could be used after the command completed from interrupt context. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 55e5ed273d758c62d2f1fad47c73716039f7c01c Author: Andrew Vasquez Date: Thu Feb 18 10:07:25 2010 -0800 [SCSI] qla2xxx: Correct EH bus-reset handling. Target-level resets are unlikely to complete if done after the bus (LIP/OLS/NOS) has been reset. Perform target-level resets, if necessary, prior to hitting the bus. Cc: stable@kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit db3ad7f8852cfdfa03f72b27472e5a8bc9c1e1cf Author: Giridhar Malavali Date: Thu Feb 18 10:07:24 2010 -0800 [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out. Fix for BSG request cleanup when the request timesout. Proper release of driver resources used for BSG request during timeout cleanup. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 236b0249c2274cd24bc98a1fbbb5e78d861d4bd9 Author: Sarang Radke Date: Thu Feb 18 10:07:23 2010 -0800 [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands Since bsg_job->reply->reply_payload_rcv_len is uninitialized in case of failure, fc-transport triggers a warning for each command failed. Cc: stable@kernel.org Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit ee37e09d81a4acf328f68189af12f116401f8c0f Author: Alan Stern Date: Fri Feb 12 12:13:55 2010 -0500 [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev This patch (as1335) fixes a bug in scsi_sysfs_add_sdev(). Its callers always remove the device if anything goes wrong, so it should never remove the device. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit d5469119f0098881ab7f991990ef4f81ef13a194 Author: Alan Stern Date: Fri Feb 12 12:13:39 2010 -0500 [SCSI] fix refcounting bug in scsi_get_host_dev This patch (as1334) fixes a bug in scsi_get_host_dev(). It incorrectly calls get_device() on the new device's target. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 75f8ee8e01a6c96652f27da40d4bdac9e2e485f0 Author: Alan Stern Date: Fri Feb 12 12:13:31 2010 -0500 [SCSI] fix memory leak in scsi_report_lun_scan This patch (as1333) fixes a bug in scsi_report_lun_scan(). If a newly-allocated device can't be used, it should be deleted. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 277e76f1821ab131a409c6a2e04492ef5774fb3c Author: James Smart Date: Thu Feb 18 11:07:15 2010 -0500 [SCSI] lpfc: correct PPC build failure Reported-by: Stephen Rothwell Signed-off-by: James Smart Signed-off-by: James Bottomley commit 8c563a30cdfff2833c4c2078d25b5d1469706a6d Author: Matt Fleming Date: Thu Feb 4 23:46:13 2010 +0000 sh: Turn on speculative return for SH7785 and SH7786 Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 77f36fcc035a5af19e95f50a2e648cda2a6ef2b9 Merge: 838a4a9 d01447b Author: Paul Mundt Date: Thu Feb 18 18:35:20 2010 +0900 Merge branch 'sh/pmb-dynamic' commit d01447b3197c2c470a14666be2c640407bbbfec7 Author: Paul Mundt Date: Thu Feb 18 18:13:51 2010 +0900 sh: Merge legacy and dynamic PMB modes. This implements a bit of rework for the PMB code, which permits us to kill off the legacy PMB mode completely. Rather than trusting the boot loader to do the right thing, we do a quick verification of the PMB contents to determine whether to have the kernel setup the initial mappings or whether it needs to mangle them later on instead. If we're booting from legacy mappings, the kernel will now take control of them and make them match the kernel's initial mapping configuration. This is accomplished by breaking the initialization phase out in to multiple steps: synchronization, merging, and resizing. With the recent rework, the synchronization code establishes page links for compound mappings already, so we build on top of this for promoting mappings and reclaiming unused slots. At the same time, the changes introduced for the uncached helpers also permit us to dynamically resize the uncached mapping without any particular headaches. The smallest page size is more than sufficient for mapping all of kernel text, and as we're careful not to jump to any far off locations in the setup code the mapping can safely be resized regardless of whether we are executing from it or not. Signed-off-by: Paul Mundt commit 2e450643d70b62e0192577681b227d7d5d2efa45 Author: Paul Mundt Date: Thu Feb 18 13:26:05 2010 +0900 sh: Use uncached I/O helpers in PMB setup. The PMB code is an example of something that spends an absurd amount of time running uncached when only a couple of operations really need to be. This switches over to the shiny new uncached helpers, permitting us to spend far more time running cached. Additionally, MMUCR twiddling is perfectly safe from cached space given that it's paired with a control register barrier, so fix that up, too. Signed-off-by: Paul Mundt commit b8f7918f332873a79e4c820e90e7a245ce4d3042 Author: Paul Mundt Date: Thu Feb 18 13:23:30 2010 +0900 sh: Provide uncached I/O helpers. There are lots of registers that can only be updated from the uncached mapping, so we add some helpers for those cases in order to make it easier to ensure that we only make the jump when it's absolutely necessary. Signed-off-by: Paul Mundt commit 8e4a0cf79d4645b88dd18ff717ec579e1ac48c80 Author: Kashyap, Desai Date: Wed Feb 17 16:13:04 2010 +0530 [SCSI] raid_class: add raid1e Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 3ed215259f2d8cd937abc833dc76e309173aaa52 Author: Kashyap, Desai Date: Wed Feb 17 16:08:36 2010 +0530 [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes. For RAID volume sas_is_tlr_enabled call will hit BUG at scsi_transport_sas.c:163, since raid volume is not visible to sas transport layer. Now Added check to make sure arg pass in sas_is_tlr_enabled() is not a volume. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 34c2b712992540ca436e97432ffc57c84c8f8c18 Author: Christof Schmitt Date: Wed Feb 17 11:18:59 2010 +0100 [SCSI] zfcp: Introduce header file for qdio structs and inline functions Move the qdio related structs and some helper functions to a new zfcp_qdio.h header file. While doing this, rename the struct zfcp_queue_req to zfcp_qdio_req to adhere to the naming scheme used in zfcp. This allows a better seperation of the qdio code and inlining the helper functions will save some function calls. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 2d8e62bbf7e83facd5701c100f62fbf0df4ee486 Author: Christof Schmitt Date: Wed Feb 17 11:18:58 2010 +0100 [SCSI] zfcp: Replace FC4 constants with information from exchange port The FC4 types are already available from exchange port. Use this for reporting the FC4 types, instead of having the value hardcoded in zfcp. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ab72528a4498251a702fa7693b51b9311b2432f8 Author: Christof Schmitt Date: Wed Feb 17 11:18:57 2010 +0100 [SCSI] zfcp: Move scsi result tracing decision to zfcp_dbf.h Move the decision which trace tag and trace level to use for the scsi result trace to zfcp_dbf.h. zfcp_dbf_scsi_result is already an inline function, so move the trace code there, simplifying the response handling in zfcp_fsf.c. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 615f59e0daaf56e43dcaaf3ea228967d9bc21584 Author: Christof Schmitt Date: Wed Feb 17 11:18:56 2010 +0100 [SCSI] zfcp: Rename sysfs_device attribute to dev in zfcp_unit and zfcp_port Kernel code uses dev as short name for the struct device. Rename the sysfs_device in zfcp_unit and zfcp_port to match this convention. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 5bdecd2248d4af6f3b311b4d8ca7f3f5f83a7191 Author: Christof Schmitt Date: Wed Feb 17 11:18:55 2010 +0100 [SCSI] zfcp: Remove duplicate assignment of req_seq_no zfcp_fsf_req_create assigns the same value twice to req_seq_no. Remove one assignment and move the req_id and seq_no assignments to one place. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit d21e9daa63e009ce5b87bbcaa6d11ce48e07bbbe Author: Christof Schmitt Date: Wed Feb 17 11:18:54 2010 +0100 [SCSI] zfcp: Dont use 0 to indicate invalid LUN in rec trace 0 is a valid value for a LUN. It is slightly confusing to also see 0 in the trace entries relating to adapter and port. Change this to use 0xFFFFFFFFFFFFFFFF in the LUN field when the trace entry does not relate to a LUN or unit. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 22ed130719987d1081831dc1481160b216224ffd Author: Christof Schmitt Date: Wed Feb 17 11:18:53 2010 +0100 [SCSI] zfcp: Fix warnings from smatch The smatch tool from http://repo.or.cz/w/smatch.git warns about this: drivers/s390/scsi/zfcp_scsi.c +64 zfcp_scsi_command_fail(5) warn: variable dereferenced before check 'scpnt->device' drivers/s390/scsi/zfcp_scsi.c +64 zfcp_scsi_command_fail(5) warn: variable dereferenced before check 'scpnt->device->host' drivers/s390/scsi/zfcp_scsi.c +93 zfcp_scsi_queuecommand(23) warn: variable dereferenced before check 'unit' Fix the first two warnings by removing the checks for scpnt->device and -> host: As long as the SCSI command exists, there is also a scsi_device and a Scsi_Host. Fix the last warning by removing the BUG_ON checks in zfcp_scsi_queuecommand, they are leftovers from previous paranoia about wrong pointers between data structures. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 67feeebaa7038129ad58ae0dcece8142186b36a9 Author: Christof Schmitt Date: Wed Feb 17 11:18:52 2010 +0100 [SCSI] zfcp: Remove unused payload field from zfcp_dbf_san_record Remove the unused payload field from the struct zfcp_dbf_san_record, saving some space in the SAN trace. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 452b505c5ada345103bdfdb39dc550df3ffe9eea Author: Christof Schmitt Date: Wed Feb 17 11:18:51 2010 +0100 [SCSI] zfcp: Remove two FIXME comments On a link down, the adapter reopen is not strictly necessary, but it helps flushing pending requests as quickly as possible. Add a comment mentioning this. qdio returning a problem on the response queue is an unlikely event. The recovery mentioned in the comment might resolve it, so implement it. This also has the advantage that it creates an entry in the recovery trace to see if and when this is occurring. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit b6bd2fb92a7bb9f1f3feecd9945c21e6c227dd51 Author: Christof Schmitt Date: Wed Feb 17 11:18:50 2010 +0100 [SCSI] zfcp: Move FSF request tracking code to new file Move the code for tracking FSF requests to new file to have this code in one place. The functions for adding and removing requests on the I/O path are already inline. The alloc and free functions are only called once, so it does not hurt to inline them and add them to the same file. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit e60a6d69f1f84c2ef1cc63aefaadfe7ae9f12934 Author: Christof Schmitt Date: Wed Feb 17 11:18:49 2010 +0100 [SCSI] zfcp: Remove function zfcp_reqlist_find_safe Always use the FSF request id as a reference to the FSF request. With this change the function zfcp_reqlist_find_safe is no longer needed and can be removed. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit cae727db30e9bcbc0256ec3282edce98b4a85433 Author: Robert Love Date: Tue Feb 16 12:16:00 2010 -0800 [SCSI] MAINTAINERS: Adding FCoE information to the MAINTAINERS file. Signed-off-by: Robert Love Signed-off-by: James Bottomley commit f90f50d7c530793c9c705a8f7fa3deb01714f21a Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:55 2010 -0800 [SCSI] fnic: Set fnic driver version Update fnic driver version. Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit c693a71d2556128ef0b5b2440f0b579cd42c425d Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:50 2010 -0800 [SCSI] fnic: lport stats need to be initialized in fnic_probe() Incorrect initialization of lport stats in fnic_probe() causes fnic to crash at bootup and a node hang if fip is enabled and all links are brought up after fnic is loaded. Signed-off-by: Joe Eykholt Signed-off-by: Venkata Siva Vijayendra Bhamidipati Signed-off-by: Robert Love Signed-off-by: James Bottomley commit aaa5e569ca96f5cf70202679a5864e60798b8ef6 Author: Venkata Siva Vijayendra Bhamidipati Date: Tue Feb 16 12:15:44 2010 -0800 [SCSI] fnic: Allow multicast and unicast address registrations for fnic To enable FIP support in fnic, we have to register with hardware to receive FIP solication frames on a well-known multicast address. Before FIP support, the firmware interface allowed multicast address registrations only for enic devices. This is a minor change in fnic to allow the firmware interface to now register mcast addresses for fnic too. Signed-off-by: Brian Uchino Signed-off-by: Herman Lee Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e9ee2cf438066aa02df98db959733e1547432983 Author: Robert Love Date: Tue Feb 16 12:15:39 2010 -0800 [SCSI] fcoe: Only rmmod fcoe.ko if there are no active connections Currently we're gracefully tearing down each active connection when fcoe.ko is removed. We shouldn't allow the user to destroy connections by removing the module. We should force the user to destroy each connection and then the module can be removed. This patch makes it so a refrerence count on the module is taken each time a fcoe_interface is created. The reference count is dropped when the fcoe_interface is destroyed. This makes it so that module_exit() doesn't get called unless all fcoe_interfaces have been destroyed. This patch leaves the removal of interfaces in the module_exit routine so that if the user does a 'rmmod -f' we'll clean everything up before removing the module. The module_put line was put before the out_putdev goto line because we should only be decrementing the reference count if a fcoe_interface is actually destroyed. If we can't find the netdev or the fcoe_interface then it's assumed that something else has destroyed the fcoe_interface and it would have decremented the reference count at that time. Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 03bf7a5af58e07aa13ea61993f5892f733b6f46d Author: Bhanu Prakash Gollapudi Date: Tue Feb 16 12:15:34 2010 -0800 [SCSI] libfcoe: Send port LKA every FIP_VN_KA_PERIOD secs. libfcoe module doesnt send port keep alive every FIP_VN_KA_PERIOD due to improper assignment of timeout value. Update the port_ka_time appropriately by incrementing it by FIP_VN_KA_PERIOD in fcoe_ctlr_timeout(), so that the link_work is scheduled to send the port LKA. Signed-off-by: Bhanu Gollapudi Acked-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 696c1cff5254bb3ac280fbbb639c66e9ff20306e Author: Hugh Daschbach Date: Tue Feb 16 12:15:28 2010 -0800 [SCSI] libfc: Don't assume response request present. Fix NULL pointer dereference crash occurs in fc_lport_bsg_request() for bsg requests that do not contain a response request. Specifically, FC_BSG_HST_ADD_RPORT and FC_BSG_HST_DEL_RPORT bsg requests are not guaranteed to include a response request. Signed-off-by: Hugh Daschbach Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 5b7a381e55d187e50a148b750abf4525cadd3a4f Author: Hugh Daschbach Date: Tue Feb 16 12:15:23 2010 -0800 [SCSI] libfc: Fix e_d_tov ns -> ms scaling factor in PLOGI response. Both PLOGI and RTV response processing conditionally scale e_d_tov, but use different scaling factors. The scaling factor is correct in RTV response processing. Bring PLOGI e_d_tov scaling in line with RTV common service parameter inspection. Signed-off-by: Hugh Daschbach Acked-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit be88d3b26897e3e942f2f36ad3d0ffbe002c0088 Author: Vasu Dev Date: Tue Feb 16 12:15:18 2010 -0800 [SCSI] libfc: call ddp setup for only FCP reads to avoid accessing junk fsp pointer Adds check to call fc_fcp_ddp_setup for only FCP read cmds to avoid accessing junk fsp pointer at least in ESX since non FCP frame had junk fsp value, though fsp is implicitly initialized to null by __alloc_skb but with this patch no more relying on fsp initialized to null value and hitting junk fsp ptr access. Removes fsp pointer checking in fc_fcp_ddp_setup as this is not needed any more since its only caller for FCP read will always have a valid fsp. Reported by: Frank Zhang Reported by: Rob Love Signed-off-by: Vasu Dev Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 5fceef1f357e1b3485363e6e240369fc8cbee173 Author: James Smart Date: Fri Feb 12 14:43:34 2010 -0500 [SCSI] lpfc 8.3.9: Update Driver version to 8.3.9 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 72100cc43262fa39821b3debc04be1a7a17b3428 Author: James Smart Date: Fri Feb 12 14:43:01 2010 -0500 [SCSI] lpfc 8.3.9: Fix locking and memory issues - Use the hbalock when changing the fc_flag. - Use the host_lock when changeing the sli_flag. - Prevent NULL pointer dereference after dma_alloc_coherent failure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 84d1b006978e78e27f22beb5cfbc4d349bac6df7 Author: James Smart Date: Fri Feb 12 14:42:33 2010 -0500 [SCSI] lpfc 8.3.9: Changes to sysfs interface for the lpfc driver. - Convert all sysfs parameters to uint instead of int. - Add lpfc_supress_link_up parameter. - Change link_state to writable sysfs parameter. - Add support to be able to "up" or "down" link from link_state parameter. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 28baac7492fa084dbff6a1b9c4b42ed0d014b558 Author: James Smart Date: Fri Feb 12 14:42:03 2010 -0500 [SCSI] lpfc 8.3.9: SLI enhancments to support new hardware. - Add support for the INTF (Interface) PCI register. - Add support for greater than 2 page SGLs. - Add support for up to 32 bit BDE lengths. - Implement the Port Capabilities Mailbox command. - Stop checking the Minor Code in the EQE structure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit ecfd03c6a99ad98fea5cb75ec83cd9945adff8d9 Author: James Smart Date: Fri Feb 12 14:41:27 2010 -0500 [SCSI] lpfc 8.3.9: Discovery changes to the lpfc driver. - Add init_vpi mailbox command before re-registering VPI. - Add Fast FCF failover support. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 1dfb5a47bc76c700969e41cdc2df6d1bf0adeb62 Author: James Smart Date: Fri Feb 12 14:40:50 2010 -0500 [SCSI] lpfc 8.3.9: PCI Changes to lpfc driver - Call pci_save_state() after pci_restore_state() call to cope with kernel change. - Add support for PCI BAR region 0 if BAR0 is a 64 bit register. Signed-off-by: James Smart Signed-off-by: James Bottomley commit f98c96b0b6572b5491e954148509b20f08f31491 Author: Jayamohan Kallickal Date: Thu Feb 11 05:11:15 2010 +0530 [SCSI] be2iscsi: Adding support for BE3 This patch contains changes to support the BE3 chip Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit b3925514f6f6878e3f671fb6990874e731a26d02 Author: Mike Christie Date: Wed Feb 10 16:51:48 2010 -0600 [SCSI] qla4xxx: fix compile warning due to invalid extHwConfig If the nvram is invalid qla4xxx tries to set Asuint32_t based on the card type. If the card type is not listed then Asuint32_t is going to be gargabe. This just fixes that if/elseif by adding a else to catch the case for new hardware that might not be listed yet. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit b64e77f70b8c11766e967e3485331a9e6ef01390 Author: Mike Christie Date: Wed Feb 10 16:51:47 2010 -0600 [SCSI] iscsi_tcp: wake xmit thread when killing session If the connection is bad, then the xmit thread could end up waiting a long time (up to sendtmeo seconds) in tcp_sendpage. This patch has us set the sk_error and wake up the xmit thread so we can quickly fail. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 9f9127fd0cfac1ccbcf4a9456b3d36bc6971355e Author: Mike Christie Date: Wed Feb 10 16:51:46 2010 -0600 [SCSI] bnx2i: set change_queue_depth function No reason that we cannot set the change_queue_depth function for bnx2i. We just forgot to when the driver was created. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 92ed4d69934a1281abcc10c6a82274a04651a260 Author: Mike Christie Date: Wed Feb 10 16:51:45 2010 -0600 [SCSI] libiscsi: reset cmd timer if cmds are making progress This patch resets the cmd timer if cmds started before the timedout command are making progress. The idea is that the cmd probably timed out because we are trying to exeucte too many commands. If it turns out that the device the IO timedout on was bad or the cmd just got screwed up but other IO/devs were ok then we will will figure this out when the cmds ahead of the timed out one complete ok. This also fixes a bug where we were sort of detecting this by setting the last_timeout and last_xfer to the same value when the task was allocated. That caught the case where we never got to send any IO for it. However, if the problem had started right before we started the new task, then we were forced to wait an extra cmd timeout seconds to start the scsi eh. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 9010b94636312c7fb12b591ef09e915f8f80bbd5 Author: Mike Christie Date: Wed Feb 10 16:51:44 2010 -0600 [SCSI] cxgb3i: check for setup netdev If the netdev has not been setup when the host is, we will oops when the iscsi layer calls into the driver and a it tries to reference the netdev in hba->ndev. This can happen if the iscsi driver is loaded before ifup is done. This patch just adds a check, so we can gracefully fail the operation. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit d9573e7af16de0e3aa55db1703dbe544faf391de Author: Joe Perches Date: Wed Feb 10 16:51:43 2010 -0600 [SCSI] cxgb3i, bnx2i: remove uses of nipquad use %pi4 Remove uses of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 81fc03909a80bead8f553287a2b749a1d29dca64 Author: Catalin Marinas Date: Mon Feb 8 11:16:24 2010 +0000 kmemcheck: Test the full object in kmemcheck_is_obj_initialized() This is a fix for bug #14845 (bugzilla.kernel.org). The update_checksum() function in mm/kmemleak.c calls kmemcheck_is_obj_initialised() before scanning an object. When KMEMCHECK_PARTIAL_OK is enabled, this function returns true. However, the crc32_le() reads smaller intervals (32-bit) for which kmemleak_is_obj_initialised() may be false leading to a kmemcheck warning. Note that kmemcheck_is_obj_initialized() is currently only used by kmemleak before scanning a memory location. Signed-off-by: Catalin Marinas Cc: Andrew Morton Cc: Christian Casteyde Cc: Vegard Nossum Signed-off-by: Pekka Enberg commit 03cb3829e0e5650518ce37e2b4420a35e034dc9e Author: Michael Reed Date: Wed Feb 10 14:32:00 2010 -0600 [SCSI] fusion: hold off error recovery while alternate ioc is initializing After discussing this patch with LSI, I resubmitting with a recommended 40 second wait for the alternate ioc's initialization to complete. -- Fusion FC chips are two function with some shared resources. During initialization of one function its driver inhibits the ability of the other function's driver to allocate message frames by clearing its "active" flag. Should mid-layer error recovery be initiated for a scsi command during this initialization (which can take up to 40 seconds) error recovery will escalate to the level of host reset. This host reset might fail (as the other function is resetting) resulting in all connected targets being taken offline. This patch holds off mid-layer error recovery for up to 40 seconds to permit initialization of the other function to complete. Signed-off-by: Michael Reed Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley commit 4b5aa7cff0e2bd1a9c81b59553ba8ecfa3aa7e1b Author: Stephen M. Cameron Date: Thu Feb 4 08:43:57 2010 -0600 [SCSI] hpsa: update driver version to 2.0.1-3 Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 71fe75a705aa4eabda23334095c382ad8c48f2d1 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:51 2010 -0600 [SCSI] hpsa: Reorder compat ioctl functions to eliminate some forward declarations. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e39eeaed1f75fcd46783aad34cb9ab8a6046bb01 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:46 2010 -0600 [SCSI] hpsa: eliminate lock_kernel in compat_ioctl The use of the big kernel lock here appears to be ancient cruft that is no longer needed. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 2a8ccf3187aff6defed72f7d8fa562ff2f69ef2a Author: Stephen M. Cameron Date: Thu Feb 4 08:43:41 2010 -0600 [SCSI] hpsa: fix bug in adjust_hpsa_scsi_table fix bug in adjust_hpsa_scsi_table which caused devices which have changed size, etc. to do the wrong thing. The problem was as follows: The driver maintains its current idea of what devices are present in the h->dev[] array. When it updates this array, it scans the hardware, and produces a new list of devices, call it sd[], for scsi devices. Then, it compares each item in h->dev[] vs. sd[], and any items which are not present sd it removes from h->dev[], and any items present in sd[], but different, it modifies in h->dev[]. Then, it looks for items in sd[] which are not present in h->dev[], and adds those items into h->dev[]. All the while, it keeps track of what items were added and removed to/from h->dev[]. Finally, it updates the SCSI mid-layer by removing and adding the same devices it removed and added to/from h->dev[]. (modified devices count as a remove then add.) originally, when a "changed" device was discovered, it was removed then added to h->dev[]. The item was added to the *end* of h->dev[]. And, the item was removed from sd[] as well (nulled out). As it processed h->dev[], these newly added items at the end of the list were encountered, and sd[] was searched, but those items were nulled out. So they ended up getting removed immediately after they were added. The solution is to have a way to replace items in the h->dev[] array instead of doing a remove + add. Then the "changed" items. are not encountered a second time, and removed. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 23231048309ea8eed0189f1eb8f870f08703cac0 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:36 2010 -0600 [SCSI] hpsa: Fix hpsa_find_scsi_entry so that it doesn't try to dereference NULL pointers Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit c7f172dca210bbd105aee02353c6b385c774caac Author: Stephen M. Cameron Date: Thu Feb 4 08:43:31 2010 -0600 [SCSI] hpsa: clarify obscure comment in adjust_hpsa_scsi_table Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 807be732f928c75b3dfb4273fe5f61b34f05df86 Author: Mike Miller Date: Thu Feb 4 08:43:26 2010 -0600 [SCSI] hpsa: print all the bytes of the CDB, not just the first one. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit d416b0c75fc52e1ac840e6c8c1857ac52d1d7132 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:21 2010 -0600 [SCSI] hpsa: when resetting devices, print out which device Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a08a8471b7aed3d50df8e9c852dc2baa08ec8b01 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:16 2010 -0600 [SCSI] hpsa: use scan_start and scan_finished entry points for scanning use scan_start and scan_finished entry points for scanning and route the CCISS_REGNEWD ioctl and sysfs triggering of same functionality through hpsa_scan_start. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a23513e8413e02b7e34e96a03d6bfd1c1948ac00 Author: Stephen M. Cameron Date: Thu Feb 4 08:43:11 2010 -0600 [SCSI] hpsa: Add an shost_to_hba helper function. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 01fb21870d96c83ae01072674e380ac51ebc58c8 Author: Matt Gates Date: Thu Feb 4 08:43:05 2010 -0600 [SCSI] hpsa: Don't return DID_NO_CONNECT when a device is merely not ready Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 1d3b36090551a31b8b8c4ba972aac95eaa8f77dd Author: Matt Gates Date: Thu Feb 4 08:43:00 2010 -0600 [SCSI] hpsa: Retry commands completing with a sense key of ABORTED_COMMAND Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5f0325ab280e92c023a5610dae4a6afb6c1ef151 Author: Matt Gates Date: Thu Feb 4 08:42:55 2010 -0600 [SCSI] hpsa: Return DID_RESET for commands which complete with status of UNSOLICITED ABORT The commands should be retried, and this will make that happen, instead of resulting in an i/o error. Signed-off-by: Matt Gates Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 339b2b14c634da58626eb742370d915591c2fb6d Author: Stephen M. Cameron Date: Thu Feb 4 08:42:50 2010 -0600 [SCSI] hpsa: Fix p1210m LUN assignment. The p1210m responsds to SCSI report LUNs, unlike traditional Smart Array controllers. This means that the bus, target, and lun assignments done by the driver cannot be arbitrary, but must match what SCSI REPORT LUNS returns. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit f8b01eb9049113920f4eb2f944a0c713ce597673 Author: Mike Miller Date: Thu Feb 4 08:42:45 2010 -0600 [SCSI] hpsa: add pci ids for storageworks 1210m, remove p400, p800, p700m and update pci_ids.h to include new PCI ID for StorageWorks 1210m variant. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 303932fd4ff63e8650d5d5da6cc286a8b5f8318d Author: Don Brace Date: Thu Feb 4 08:42:40 2010 -0600 [SCSI] hpsa: Allow multiple command completions per interrupt. This is done by adding support for the so-called "performant mode" (that's really what they called it). Smart Array controllers have a mode which enables multiple command completions to be delivered with a single interrupt, "performant" mode. We want to use that mode, as some newer controllers will be requiring this mode. Signed-off-by: Don Brace Signed-off-by: Stephen M. Cameron Signed-off-by: Mike Miller Signed-off-by: James Bottomley commit 900c54404a9456b3ff10745e5e8f64b12c3a6ef7 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:35 2010 -0600 [SCSI] hpsa: interrupt pending function should return bool not unsigned long Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 84ca0be2a2cd9730683310b831db9d2fa60b3b0b Author: Stephen M. Cameron Date: Thu Feb 4 08:42:30 2010 -0600 [SCSI] hpsa: fix some debug printks to use dev_dbg instead Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a104c99f386191706a11d39be81b8f03cd4f2719 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:24 2010 -0600 [SCSI] hpsa: make tag macros into functions Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 6df1e95496f8dfe08a520756187be59f7896f589 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:19 2010 -0600 [SCSI] hpsa: eliminate unnecessary memcpys Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a9a44cbd4b41bf4b9535c1eb7f5e942d8b2e9d54 Author: Stephen M. Cameron Date: Thu Feb 4 08:42:14 2010 -0600 [SCSI] hpsa: remove unwanted debug code Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ea6d3bc3143a21ec5e1c9330555b36d67979431d Author: Stephen M. Cameron Date: Thu Feb 4 08:42:09 2010 -0600 [SCSI] hpsa: use kzalloc not kmalloc plus memset Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e89c0ae7babc3e702a9da128b3ac1eb04ed73c2c Author: Stephen M. Cameron Date: Thu Feb 4 08:42:04 2010 -0600 [SCSI] hpsa: use sizeof() not an inline constant in memset. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ecd9aad402765abce04a96b8d1ed15163ca6c8a1 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:59 2010 -0600 [SCSI] hpsa: return proper error codes not minus one. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit bcc4425548ada73475606c9c5d7cfce7eae0eb64 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:54 2010 -0600 [SCSI] hpsa: remove superfluous returns from void functions. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 4967bd3e5caa87da43c251ae32504230259b18c6 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:49 2010 -0600 [SCSI] hpsa: make adjust_hpsa_scsi_table return void. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit b2ed4f79194e06766327ae581b063f8747d94ea9 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:44 2010 -0600 [SCSI] hpsa: Use BUG_ON instead of an if statement. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 82a72c0a12326a56a323093297e2bad29fe6c29d Author: Stephen M. Cameron Date: Thu Feb 4 08:41:38 2010 -0600 [SCSI] hpsa: avoid unwanted promotion from unsigned to signed for raid level index Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 01a02ffcd55b74e3459bb7358140970e126d4731 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:33 2010 -0600 [SCSI] hpsa: Use kernel integer types, not userland ones That is, use u64, u32, u16 and u8 rather than __u64, __u32, __u16 and __u8. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 466dc22409b97343c6b2168094d5f867093a70c2 Author: Stephen M. Cameron Date: Thu Feb 4 08:41:28 2010 -0600 [SCSI] hpsa: fix typo in comments Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 08002af25a7a379780244b94c5d5eedb7c098629 Author: Roel Kluin Date: Fri Jan 29 11:25:19 2010 +0100 [SCSI] qla2xxx: negative error return in qla2x00_change_queue_depth() The *change_queue_depth functions usually return a negative error return. Signed-off-by: Roel Kluin Acked-by: Giridhar Malavali Signed-off-by: James Bottomley commit 63bad45db1d4e8aafe0633c5741c9720641f336a Author: Yang, Bo Date: Sun Dec 6 08:42:28 2009 -0700 [SCSI] megaraid_sas: version and documentation update Signed-off-by Bo Yang Signed-off-by: James Bottomley commit c978684254d11e3768c5a0b2780302fb0cada29c Author: Yang, Bo Date: Sun Dec 6 08:39:25 2009 -0700 [SCSI] megaraid_sas: driver fixed the device update issue driver fixed the device update issue after get the AEN PD delete/ADD and LD add/delete from FW. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit bdc6fb8d69fab7b4b7f70823e3932bd8e4cfd7db Author: Yang, Bo Date: Sun Dec 6 08:30:19 2009 -0700 [SCSI] megaraid_sas: add the logical drive list to driver Driver issue the get ld list to fw to get the logic drive list. Driver will keep the logic drive list for the internal use after driver load. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit 780a3762fb9208748baac5aa9c63a4d4c9287753 Author: Yang, Bo Date: Sun Dec 6 08:24:21 2009 -0700 [SCSI] megaraid_sas: Zero pad_0 in mfi structure Add the pad_0 in mfi frame structure to 0 to fix the context value larger than 32bit value issue. Signed-off-by Bo Yang Signed-off-by: James Bottomley commit 57ab12e418ec4fe24c11788bb1bbdabb29d05679 Author: Jiri Kosina Date: Wed Feb 17 14:25:01 2010 +0100 HID: usbhid: initialize interface pointers early enough Move the initialization of USB interface pointers from _start() over to _probe() callback, which is where it belongs. This fixes case where interface is NULL when parsing of report descriptor fails. LKML-Reference: <20100213135720.603e5f64@neptune.home> Reported-by: Alan Stern Tested-by: Bruno Prémont Signed-off-by: Jiri Kosina commit d53a0d33bc3a50ea0e8dd1680a2e8435770b162a Author: Paul Mundt Date: Wed Feb 17 21:17:02 2010 +0900 sh: PMB locking overhaul. This implements some locking for the PMB code. A high level rwlock is added for dealing with rw accesses on the entry map while a per-entry data structure spinlock is added to deal with the PMB entry changing out from underneath us. Signed-off-by: Paul Mundt commit 0065b96775f1eff167a2c3343a41582e8fab4c6c Author: Paul Mundt Date: Wed Feb 17 18:05:23 2010 +0900 sh: Fix up dynamically created write-through PMB mappings. Write-through PMB mappings still require the cache bit to be set, even if they're to be flagged with a different cache policy and bufferability bit. To reduce some of the confusion surrounding the flag encoding we centralize the cache mask based on the system cache policy while we're at it. Signed-off-by: Paul Mundt commit d7813bc9e8e384f5a293b05c095c799d41af3668 Author: Paul Mundt Date: Wed Feb 17 17:56:38 2010 +0900 sh: Build PMB entry links for existing contiguous multi-page mappings. This plugs in entry sizing support for existing mappings and then builds on top of that for linking together entries that are mapping contiguous areas. This will ultimately permit us to coalesce mappings and promote head pages while reclaiming PMB slots for dynamic remapping. Signed-off-by: Paul Mundt commit 7f978b9bf535cbbd1ae8d9fbdd7c4f60ab38f260 Author: Jiri Kosina Date: Wed Feb 17 09:36:35 2010 +0100 HID: extend mask for BUTTON usage page Now that joystick button usages can expand over 15 buttons, we have to properly mask out the code from hid usage to cover the whole 0xffff available space. Reported-by: Stefan Bader Signed-off-by: Jiri Kosina commit 9edef28653a519bf0a48250f36cce96b1736ec4e Author: Paul Mundt Date: Wed Feb 17 16:28:00 2010 +0900 sh: uncached mapping helpers. This adds some helper routines for uncached mapping support. This simplifies some of the cases where we need to check the uncached mapping boundaries in addition to giving us a centralized location for building more complex manipulation on top of. Signed-off-by: Paul Mundt commit 51becfd96287b3913b13075699433730984e2f4f Author: Paul Mundt Date: Wed Feb 17 15:33:30 2010 +0900 sh: PMB tidying. Some overdue cleanup of the PMB code, killing off unused functionality and duplication sprinkled about the tree. Signed-off-by: Paul Mundt commit 7bdda6209f224aa784a036df54b22cb338d2e859 Author: Paul Mundt Date: Wed Feb 17 13:23:00 2010 +0900 sh: Fix up more 64-bit pgprot truncation on SH-X2 TLB. Both the store queue API and the PMB remapping take unsigned long for their pgprot flags, which cuts off the extended protection bits. In the case of the PMB this isn't really a problem since the cache attribute bits that we care about are all in the lower 32-bits, but we do it just to be safe. The store queue remapping on the other hand depends on the extended prot bits for enabling userspace access to the mappings. Signed-off-by: Paul Mundt commit 838a4a9dcee0cbaeb0943531da00ac44d578f315 Author: Magnus Damm Date: Tue Feb 16 05:19:19 2010 +0000 sh: fix sh7723 SDHI support using INTC force_disable Update the sh7723 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e9125ac0bf78bc19181359a3411d2e2bb757942d Author: Magnus Damm Date: Tue Feb 16 05:17:52 2010 +0000 sh: fix sh7722 SDHI support using INTC force_disable Update the sh7722 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4d2185d93c670902b6e4716b360e2bcb7d2f7b2f Author: Paul Mundt Date: Wed Feb 17 12:37:42 2010 +0900 sh: Use dummy_irq_chip for INTC redirect vectors. Presently there's an ordering issue with the chained handler change which places the set_irq_chip() after set_irq_chained_handler(). This causes a warning to be emitted as the IRQ chip needs to be set first. However, there is the caveat that redirect IRQs can't use the parent IRQ's irq chip as they are just dummy redirects, resulting in intc_enable() blowing up when set_irq_chained_handler() attempts to start up the redirect IRQ. In these cases we can just use dummy_irq_chip directly, as we already extract the parent IRQ and chip from the redirect handler. Signed-off-by: Paul Mundt commit 49f3bfe9334a4cf86079d2ee1d08e674b58862a9 Author: Paul Mundt Date: Wed Feb 17 12:33:22 2010 +0900 sh: Setup boot CPU VBR early to enable early page faults. vmemmap and the vmsplit code amongst others need to be able to take page faults much earlier than trap_init() time, so move this in to the early CPU initialization. VBR setup for secondary CPUs is already handled through start_secondary(), so we only need to do this for the boot CPU. Signed-off-by: Paul Mundt commit 4f4517c45f325ba511458465430a52864a5d0d30 Author: Ernst Schwab Date: Tue Feb 16 21:02:57 2010 -0700 spi: Correct SPI clock frequency setting in spi_mpc8xxx Correct SPI clock frequency division factor rounding, preventing clock rates higher than the maximum specified clock frequency being used. When specifying spi-max-frequency = <10000000> in the device tree, the resulting frequency was 11.1 MHz, with spibrg being 133333332. According to the freescale data sheet [1], the spi clock rate is spiclk = spibrg / (4 * (pm+1)) The existing code calculated pm = mpc8xxx_spi->spibrg / (hz * 4); pm--; resulting in pm = (int) (3.3333) - 1 = 2, resulting in spiclk = 133333332/(4*(2+1)) = 11111111 With the fix, pm = (mpc8xxx_spi->spibrg - 1) / (hz * 4) + 1; pm--; resulting in pm = (int) (4.3333) - 1 = 3, resulting in spiclk = 133333332/(4*(3+1)) = 8333333 Without the fix, for every desired SPI frequency that is not exactly derivable from spibrg, pm will be too small due to rounding down, resulting in a too high SPI clock, so we need a pm which is one higher. For values that are exactly derivable, spibrg will be dividable by (hz*4) without remainder, and (int) ((spibrg-1)/(hz*4)) will be one lower than (int) (spibrg)/(hz*4), which is compensated by adding 1. For these values, the fixed version calculates the same pm as the unfixed version. For all values that are not exactly derivable, spibrg will be not dividable by (hz*4) without remainder, and (int) ((spibrg-1)/(hz*4)) will be the same as (int) (spibrg)/(hz*4), and the calculated pm will be one higher than calculated by the unfixed version. References: [1] http://www.freescale.com/files/32bit/doc/ref_manual/MPC8315ERM.pdf, page 22-10 -> 1398 Signed-off-by: Ernst Schwab Signed-off-by: Grant Likely commit ff5cf34c809cd5950579e46e7c10c29bc647aaf1 Author: Rafi Rubin Date: Tue Feb 16 10:22:11 2010 -0500 HID: hid-ntrig: Single touch mode tap Add DOUBLETAP to events emitted when in single touch only mode. Users with a single touch firmware report not seeing the DOUBLETAP events; this is a side effect of dropping old mapping for confidence. The confidence mapping may be fine for singletouch mode but causes problems in multitouch mode. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit dbf2b17de505d390b5ecf5b5944fc0c88f6d66fe Author: Rafi Rubin Date: Fri Feb 12 21:13:05 2010 -0500 HID: hid-ntrig: multitouch cleanup and fix This cleans up the identification of multitouch groups and enables the end of group sync. Taps are now explicitly handled to adjust for the changes in the event stream in multitouch mode. Added triple and quad tap for the benefit of tools that recognize different tap types but do not have full multi touch support. This cleans up the behavior particularly for the latest firmware, which didn't work particularly well with the older version of the driver. In this form, when multitouch is active, both mt and st events will come out of the "N-Trig MultiTouch" device. And when its not st events will come out of "N-Trig Touchscreen". Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit b0549cf1a35a92edf053d94066e60fb0ed02bb71 Author: Rafi Rubin Date: Thu Feb 11 22:14:06 2010 -0500 HID: n-trig: remove unnecessary tool switching With the pen and touch split apart, we no longer need to inject additional tool switching events. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 943ed464f3722de0569cf41ba6ec094768ac046d Author: Rafi Rubin Date: Thu Feb 11 22:14:05 2010 -0500 HID: hid-ntrig add multi input quirk and clean up Added a quirk to enable distinct input devices. The digitizer utilizes three inputs to represent pen, multitouch and a normal touch screen. With the Pen partitioned, it behaves well and does not need special handling. Also, I set names to the input devices to clarify the functions of the various inputs. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 1d5cfcdff793e2f34ec61d902fa5ee0c7e4a2208 Author: Paul Mundt Date: Tue Feb 16 21:43:38 2010 +0900 sh: Kill off some superfluous legacy PMB special casing. The __va()/__pa() offsets and the boot memory offsets are consistent for all PMB users, so there is no need to special case these for legacy PMB. Kill the special casing off and depend on CONFIG_PMB across the board. This also fixes up yet another addressing bug for sh64. Signed-off-by: Paul Mundt commit 8d0c123f8b710561cfd34f6e1a5bebc27988edbe Author: Richard Hartmann Date: Tue Feb 16 20:34:59 2010 +0800 crypto: aes_generic - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0047e81dc366a0690b4765250c3a1d8caf3797c4 Author: Richard Hartmann Date: Tue Feb 16 20:34:07 2010 +0800 crypto: fcrypt - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 5b37c19e36de46d2a96ce127addb4c4bbaa4619a Author: Richard Hartmann Date: Tue Feb 16 20:33:49 2010 +0800 crypto: ecb - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit a501121e30c4b41dbdae47302c1ebebc7821511a Author: Richard Hartmann Date: Tue Feb 16 20:32:31 2010 +0800 crypto: des_generic - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 9472d763b3087f2899379a77b39499fcd37d6d2b Author: Richard Hartmann Date: Tue Feb 16 20:32:13 2010 +0800 crypto: deflate - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit c9af70fb86bbede6197081ded69407a9192716c8 Author: Richard Hartmann Date: Tue Feb 16 20:31:54 2010 +0800 crypto: crypto_null - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit d150975bc759af51d655d109fd6633ad1bc67df8 Author: Richard Hartmann Date: Tue Feb 16 20:31:37 2010 +0800 crypto: cipher - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit db83aabfe115cb8a75f79ada5ce5fdc2d52f5a4d Author: Richard Hartmann Date: Tue Feb 16 20:31:19 2010 +0800 crypto: crc32 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0375d66dd04ba828066807edccf7ae8245f903d2 Author: Richard Hartmann Date: Tue Feb 16 20:31:04 2010 +0800 crypto: compress - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 87c3be87e9e1d8ec4ad57d0e505099529383dd4a Author: Richard Hartmann Date: Tue Feb 16 20:29:45 2010 +0800 crypto: cast6 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit a1f4c9222d5e71f9c2646f47beb4a0a42b42fdc4 Author: Richard Hartmann Date: Tue Feb 16 20:29:01 2010 +0800 crypto: cast5 - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 621dd3692978a7dd84df2d8ea822b805b40de498 Author: Richard Hartmann Date: Tue Feb 16 20:27:57 2010 +0800 crypto: camellia - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit f3542e6d7b246e88b038e608358606ddd1f09870 Author: Richard Hartmann Date: Tue Feb 16 20:27:20 2010 +0800 crypto: authenc - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 3d01a33b77b120f8b11d8757c346442ed7961b11 Author: Richard Hartmann Date: Tue Feb 16 20:26:46 2010 +0800 crypto: api - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 189bd4b056af76325e491baea4338a140d0e86d8 Author: Richard Hartmann Date: Tue Feb 16 20:25:39 2010 +0800 crypto: anubis - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 5357c6c43ec0f420c33da91019ae24e17a929ece Author: Richard Hartmann Date: Tue Feb 16 20:25:21 2010 +0800 crypto: algapi - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 0d8fb0a139093297851f56e2070bf580e9667dd7 Author: Richard Hartmann Date: Tue Feb 16 20:24:30 2010 +0800 crypto: blowfish - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit 3922538fe1625e6ddded56c08c290b3440846cfd Author: Richard Hartmann Date: Tue Feb 16 20:24:07 2010 +0800 crypto: aead - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit c4ede64a6e0220c9b30f07ab41080c8e90245116 Author: Richard Hartmann Date: Tue Feb 16 20:23:37 2010 +0800 crypto: ablkcipher - Fix checkpatch errors Signed-off-by: Richard Hartmann Signed-off-by: Herbert Xu commit efd54ea315f645ef318708aab5714a5f1f432d03 Author: Paul Mundt Date: Tue Feb 16 18:39:30 2010 +0900 sh: Merge the legacy PMB mapping and entry synchronization code. This merges the code for iterating over the legacy PMB mappings and the code for synchronizing software state with the hardware mappings. There's really no reason to do the same iteration twice, and this also buys us the legacy entry logging facility for the dynamic PMB case. Signed-off-by: Paul Mundt commit 55cef91a5d553265f03fe159f9fcdfac36902248 Author: Paul Mundt Date: Tue Feb 16 17:14:04 2010 +0900 sh: Prevent fixed slot PMB remapping from clobbering boot entries. The PMB initialization code walks the entries and synchronizes the software PMB state with the hardware mappings, preserving the slot index. Unfortunately pmb_alloc() only tested the bit position in the entry map and failed to set it, resulting in subsequent remaps being able to be dynamically assigned a slot that trampled an existing boot mapping with general badness ensuing. Signed-off-by: Paul Mundt commit 319c2cc761505ee54a9536c5d0b9c2ee3fb33866 Author: Nobuhiro Iwamatsu Date: Mon Feb 15 08:37:50 2010 +0000 sh: Fix zImage boot using fixed PMB. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit fb1e776050f0f6a7b90eba03a1d001756454f9dc Author: Magnus Damm Date: Mon Feb 15 11:53:43 2010 +0000 sh: fix sh7724 SDHI support using INTC force_disable Update the sh7724 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources. Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d85429a31790361b9e952be3817134c23b3b758a Author: Magnus Damm Date: Mon Feb 15 11:40:25 2010 +0000 sh: extend INTC with force_disable Extend the shared INTC code with force_disable support to allow keeping mask bits statically disabled. Needed for SDHI support to mask out unsupported interrupt sources. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 92e1f9a7ed613b36f3aaf8b04a79e2fd4fa37ec1 Author: Phil Edworthy Date: Thu Feb 11 10:24:25 2010 +0000 video: sh_mobile_lcdcfb: Fix panning. Fixed SH-Mobile panning. Previously the address of the frame to be displayed was updated in the VSync end interrupt. This meant there was a minimum of 1 frame bewteen calling FBIOPAN_DISPLAY ioctl and the pan occuring. This meant that apps were not able to use the FBIO_WAITFORVSYNC ioctl to wait for the pan to complete. This patch moves the write to LDSA1R mirror reg into the pan ioctl. Tested on MS7724 board against 2.6.33-rc7 Signed-off-by: Phil Edworthy Signed-off-by: Paul Mundt commit 40331b21f5fdb746e80fc609ef60ef71b5cd47d9 Author: Phil Edworthy Date: Mon Feb 15 13:57:49 2010 +0000 video: sh_mobile_lcdcfb: Add wait for vsync. Added FBIO_WAITFORVSYNC ioctl for SH-Mobile devices. Tested on MS7724 and MigoR boards against 2.6.33-rc7. Signed-off-by: Phil Edworthy Signed-off-by: Paul Mundt commit 04c869735541c27dd137c55f35f8a18bb372bbe1 Author: Paul Mundt Date: Mon Feb 15 16:10:57 2010 +0900 sh: Fix up legacy PMB mode offset calculation. The change for fixing up sh64 inadvertently inverted the logic for legacy PMB, fix that back up. Signed-off-by: Paul Mundt commit 028c5d5d596651bce13d06737eb3707a7e99a30c Merge: 19f6b8b 4b505db Author: Paul Mundt Date: Mon Feb 15 14:49:37 2010 +0900 Merge branch 'sh/stable-updates' commit df0edeb59eb559be0bee53452fda2f5cc0ae133f Author: Grant Likely Date: Sun Feb 14 14:14:00 2010 -0700 of: remove undefined request_OF_resource & release_OF_resource Neither request_OF_resource or release_OF_resource are defined anywhere. Remove the declarations. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 0d351c3e932c2e155ef5e4c3f5b87223abd4eea6 Author: Grant Likely Date: Sun Feb 14 14:13:57 2010 -0700 of/sparc: Remove sparc-local declaration of allnodes and devtree_lock Both allnodes and devtree_lock are defined in common code. The extern declaration should be in the common header too so that the compiler can type check. allnodes is already in of.h, but devtree_lock should be declared there too. This patch removes the SPARC declarations and uses decls in of.h instead. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek Acked-by: David S. Miller commit fc0bdae49d810e4cb32d7b547bc6d4dfb08f9e2e Author: Grant Likely Date: Sun Feb 14 07:13:55 2010 -0700 of: move definition of of_chosen into common code. Rather than defining of_chosen in each arch, it can be defined for all in driver/of/base.c Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 22d5579e66101162fd1119f2e7f4f999ca8b48c7 Author: Grant Likely Date: Sun Feb 14 07:13:52 2010 -0700 of: remove unused extern reference to devtree_lock Neither the powerpc nor the microblaze code use devtree_lock anymore. Remove the extern reference. Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 7c7b60cb87547b1664a4385c187f029bf514a737 Author: Grant Likely Date: Sun Feb 14 07:13:50 2010 -0700 of: put default string compare and #a/s-cell values into common header Most architectures don't need to change these. Put them into common code to eliminate some duplication Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 4ef7b373df330bc0ff037dc4792d373c9346375f Author: Jeremy Kerr Date: Sun Feb 14 07:13:47 2010 -0700 of/flattree: Don't assume HAVE_LMB We don't always have lmb available, so make arches provide an early_init_dt_alloc_memory_arch() to handle the allocation of memory in the fdt code. When we don't have lmb.h included, we need asm/page.h for __va. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 9dfbf207802c7e8cda9d081a8d750b50633c82d2 Author: Jeremy Kerr Date: Sun Feb 14 07:13:43 2010 -0700 of: protect linux/of.h with CONFIG_OF For platforms that have CONFIG_OF optional, we need to make the contents of linux/of.h conditional on CONFIG_OF. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 7c540d9e3da38c3d1c15fb8059e4577a84ac0066 Author: Jeremy Kerr Date: Sun Feb 14 07:13:41 2010 -0700 proc_devtree: fix THIS_MODULE without module.h Commit e22f628395432b967f2f505858c64450f7835365 introduced a build breakage for ARM devtree work: the THIS_MODULE macro was added, but we don't have module.h This change adds the necessary #include to get THIS_MODULE defined. While we could just replace it with NULL (PROC_FS is a bool, not a tristate), using THIS_MODULE will prevent unexpected breakage if we ever do compile this as a module. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit 21b082ecdd7e6b8a5eba2cc013cae41b24de7f51 Author: Grant Likely Date: Sun Feb 14 07:13:38 2010 -0700 of: Remove old and misplaced function declarations The following functions don't exist: finish_device_tree() print_properties() prom_n_intr_cells() prom_get_irq_senses() The following functions are in drivers/of/base.c, so the declaration belongs in of.h instead of of_fdt.h of_machine_is_compatible() prom_add_property() prom_remove_property() prom_update_property() Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Acked-by: Michal Simek commit d67b1b03254c501fef371b0e5916c94a52bfc2c5 Author: Julia Lawall Date: Sat Feb 6 08:45:15 2010 +0000 fs/xfs: Correct NULL test Test the value that was just allocated rather than the previously tested one. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ expression *x; expression e; identifier l; @@ if (x == NULL || ...) { ... when forall return ...; } ... when != goto l; when != x = e when != &x *x == NULL // Signed-off-by: Julia Lawall Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 180040b89ee2aed88c0a0b1fcf7ada9a512b12e3 Author: Christoph Hellwig Date: Fri Feb 5 09:57:55 2010 +0000 xfs: optimize log flushing in xfs_fsync If we have a pinned inode it must have a log item attached to it. Usually that log item will have ili_last_lsn already set, in which case we only need to flush the log up to that LSN instead of doing a full log force. This gives speedups of about 5% in some fsync heavy workloads. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 87185517de81101da5afbc82cefdeed6eeaa38fb Author: Christoph Hellwig Date: Wed Feb 3 19:43:31 2010 +0000 xfs: only clear the suid bit once in xfs_write file_remove_suid already calls into ->setattr to clear the suid and sgid bits if needed, no need to start a second transaction to do it ourselves. Note that xfs_write_clear_setuid issues a sync transaction while the path through ->setattr doesn't, but that is consistant with the other filesystems. Signed-off-by: Christoph Hellwig Reviewed-by: Alex Elder Signed-off-by: Alex Elder commit 858155fbcc0cd713f6382c527bb1c3abc0ed6d00 Author: Oliver Neukum Date: Fri Feb 12 13:02:28 2010 +0100 HID: usbhid: introduce timeout for stuck ctrl/out URBs Some devices do not react to a control request (seen on APC UPS's) resulting in a slow stream of messages, "generic-usb ... control queue full". Therefore request needs a timeout. Cc: stable@kernel.org Signed-off-by: Oliver Neukum Signed-off-by: David Fries Signed-off-by: Jiri Kosina commit 19f6b8b44e3f633d5d7d1ed68848b1eb89a1e800 Author: Paul Mundt Date: Fri Feb 12 15:41:45 2010 +0900 sh64: fix up memory offset calculation. The linker script offsets were broken by the recent 29/32-bit integration, so this fixes it up for sh64. Signed-off-by: Paul Mundt commit b0f3ae03aca0f331b851ae94bc066124e7f104df Author: Paul Mundt Date: Fri Feb 12 15:40:00 2010 +0900 sh: Isolate uncached mapping support. This splits out the uncached mapping support under its own config option, presently only used by 29-bit mode and 32-bit + PMB. This will make it possible to optionally add an uncached mapping on sh64 as well as booting without an uncached mapping for 32-bit. Signed-off-by: Paul Mundt commit 71b38bd4c1cc4f2b653064357e4efab77dfd711d Author: Michael Poole Date: Thu Feb 11 00:32:57 2010 -0500 HID: magicmouse: coding style and probe failure fixes Use proper values to initialize bool configuration variables, tabs rather than spaces, no braces for one-line else clause, __set_bit() when the operation doesn't have to be atomic, input_set_abs_params() rather than writing the fields directly, and call hid_hw_stop() when appropriate to handle failures in the probe. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit c8a8602b76b6703df1243e31be01cf0e4451e4a6 Author: Jiri Kosina Date: Wed Feb 10 15:29:02 2010 +0100 HID: remove MODULE_VERSION from new drivers MODULE_VERSION doesn't make too much sense for drivers merged into main tree, as git is much better tracking revisions than any developer might ever be. Signed-off-by: Jiri Kosina commit 9f5231472340ebcaf2dec75428b67d5d0d872857 Author: Jiri Kosina Date: Wed Feb 10 14:59:03 2010 +0100 HID: fix up Kconfig entry for MagicMouse Make Apple MagicMouse Kconfig entry consistent with other dirvers. Also expand the tristate text a little bit more, so that it doesn't clash with already existing HID_APPLE. Signed-off-by: Jiri Kosina commit 128537cea464d919febeaea2000e256749f317eb Author: Michael Poole Date: Sat Feb 6 12:24:36 2010 -0500 HID: add a device driver for the Apple Magic Mouse. The Magic Mouse requires that a driver send an unlock Report(Feature) command, similar to the Wacom wireless tablet and Sixaxis controller quirks. This turns on an Input Report that isn't published in the input Report descriptor that contains touch data (and usually overrides the normal motion and click Report). Because the mouse has only one switch and no scroll wheel, the driver (under control of parameters) emulates a middle button and scroll wheel. User space could also ignore and/or re-synthesize those events based on the reported events. Some user-space tools to talk to the mouse directly (that is, when it is not associated with the host's HIDP stack) are at http://github.com/entrope/linux-magicmouse Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit 90a006abf8015c8cab893555244d8fc673b24839 Author: Michael Poole Date: Sun Jan 24 22:32:29 2010 -0500 HID: Export hid_register_report The Apple Magic Mouse (and probably other devices) publish reports that are not called out in their HID report descriptors -- they only send them when enabled through other writes to the device. This allows a driver to handle these unlisted reports. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit 77f720b71d88a3cbf574c113566a31c93099f97d Author: Stephane Chatty Date: Sat Feb 6 15:17:13 2010 +0100 HID: Support for MosArt multitouch panel Added support for MosArt dual-touch panels, present in the Asus T91MT notebook. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit 580363db92572cccbe6226bf83321e50a9ea50ea Author: Stephane Chatty Date: Sat Feb 6 15:20:03 2010 +0100 HID: add pressure support for the Stantum multitouch panel Added pressure handling for Stantum multitouch panels Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit b32758c7216f337044ceb6dcaa754b8eda95a59f Author: Stephane Chatty Date: Wed Feb 10 12:09:17 2010 +0100 HID: fixed bug in single-touch emulation on the stantum panel Fixed stupid copy-paste bug in touchscreen emulation for the Stantum multitouch panel: a flag was reset just before being tested. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit a4dad4c75c4ae378c2a5d66938b8467802c2e98f Author: Paul Mundt Date: Wed Feb 10 16:06:42 2010 +0900 sh: update sdk7786 defconfig. This plugs in USB and PCI and other bits for SDK7786. Signed-off-by: Paul Mundt commit 7578a4c625a5cc32812946338a4549f3090be113 Author: Paul Mundt Date: Wed Feb 10 16:00:58 2010 +0900 sh: Fix up multi-resource mapping for SH7786 PCIe. This reworks some of the SH7786 PCIe initialization code to dynamically setup and size the various resource windows, as opposed to the original code that simply wired in a couple of them statically. At the same time, we tidy up the initialization code a bit, kill off some read-only register twiddling that was gleaned from the bus analyzer, and also propagate the physical slot/channel mapping. Signed-off-by: Paul Mundt commit 04b954a673dd02f585a2769c4945a43880faa989 Author: David Gibson Date: Mon Feb 1 21:34:15 2010 -0700 of/flattree: Make the kernel accept ePAPR style phandle information Currently when processing flattened device trees, the kernel expects the phandle in a property called "linux,phandle". The ePAPR spec - not being Linux specific - instead requires phandles to be encoded in a property named simply "phandle". This patch makes the kernel accept either form when unflattening the device tree. Signed-off-by: David Gibson Signed-off-by: Grant Likely commit 087f79c48c090a2c0cd9ee45231d63290d2036d2 Author: Jeremy Kerr Date: Sat Jan 30 04:14:19 2010 -0700 of/flattree: endian-convert members of boot_param_header The boot_param_header has big-endian fields, so change the types to __be32, and perform endian conversion when we access them. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 337148812f97368a8ec4a69f1691e4c5ce3af494 Author: Jeremy Kerr Date: Sat Jan 30 01:45:26 2010 -0700 of: assume big-endian properties, adding conversions where necessary Properties in the device tree are specified as big-endian. At present, the only platforms to support device trees are also big-endian, so we've been acessing the properties as raw values. We'd like to add device tree support to little-endian platforms too, so add endian conversion to the sites where we access property values in the common of code. Compiled on powerpc (ppc44x_defconfig & ppc64_defconfig) and arm (fdt support only for now). Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 2e89e685a8fd0e8334de967739d11e2e28c1a4dd Author: Jeremy Kerr Date: Sat Jan 30 01:41:49 2010 -0700 of: use __be32 for cell value accessors Currently, we're using u32 for cell values, and hence assuming host-endian device trees. As we'd like to support little-endian platforms, use a __be32 for cell values, and convert in the cell accessors. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 36b9d3070d653af5807cef74ff129721d9047107 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of/flattree: use OF_ROOT_NODE_{SIZE,ADDR}_CELLS DEFAULT for fdt parsing At present we're using hard-coded values for defaults when parsing the FDT. This change uses the #defines instead. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 1406bc2f57787797d1f6a3675c019a7093769275 Author: Jeremy Kerr Date: Sat Jan 30 01:31:21 2010 -0700 of/flattree: use callback to setup initrd from /chosen At present, the fdt code sets the kernel-wide initrd_start and initrd_end variables when parsing /chosen. On ARM, we only set these once the bootmem has been reserved. This change adds an arch hook to setup the initrd from the device tree: void early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end); The arch-specific code can then setup the initrd however it likes. Compiled on powerpc, with CONFIG_BLK_DEV_INITRD=y and =n. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 50ab2fe147e22c8786552cda1791a61ae81b84d2 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 proc_devtree: include linux/of.h Currenly, proc_devtree.c depends on asm/prom.h to include linux/of.h, to provide some device-tree definitions (eg, struct property). Instead, include linux/of.h directly. We still need asm/prom.h for HAVE_ARCH_DEVTREE_FIXUPS. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 8cfb3343f70bcf9403218df120ecf345f06dd585 Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of: make set_node_proc_entry private to proc_devtree.c We only need set_node_proc_entry in proc_devtree.c, so move it there. This fixes the !HAVE_ARCH_DEVTREE_FIXUPS build, as we can't make make the definition in linux/of.h conditional on this #define (definitions in asm/prom.h can't be exposed to linux/of.h, due to the enforced #include ordering). Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit a9f2f63a671d5e91ed89ade408d87f1692a373de Author: Jeremy Kerr Date: Mon Feb 1 21:34:14 2010 -0700 of: include linux/proc_fs.h We use a few procfs-specific functions (eg, proc_device_tree_*) which aren't covered by the current includes. This causes the following build error on arm: drivers/of/base.c: In function 'prom_add_property': drivers/of/base.c:861: error: implicit declaration of function 'proc_device_tree_add_prop' drivers/of/base.c: In function 'prom_remove_property': drivers/of/base.c:902: error: implicit declaration of function 'proc_device_tree_remove_prop' drivers/of/base.c: In function 'prom_update_property': drivers/of/base.c:946: error: implicit declaration of function 'proc_device_tree_update_prop' Add proc_fs.h for these prototypes. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit 51975db0b7333cf389b64b5040c2a910341d241a Author: Grant Likely Date: Mon Feb 1 21:34:14 2010 -0700 of/flattree: merge early_init_dt_scan_memory() common code Merge common code between PowerPC and Microblaze architectures. Signed-off-by: Grant Likely Acked-by: Michal Simek commit 71a157e8edca55198e808f8561dd49017a54ee34 Author: Grant Likely Date: Mon Feb 1 21:34:14 2010 -0700 of: add 'of_' prefix to machine_is_compatible() machine is compatible is an OF-specific call. It should have the of_ prefix to protect the global namespace. Signed-off-by: Grant Likely Acked-by: Michal Simek commit 89751a7cb70a20f0d604dd7c4be29dd7b0011718 Author: Jeremy Kerr Date: Mon Feb 1 21:34:11 2010 -0700 of: merge of_find_node_by_phandle Merge common function between powerpc, sparc and microblaze. Code is identical for powerpc and microblaze, but adds a lock (and release) of the devtree_lock on sparc. Signed-off-by: Jeremy Kerr Signed-off-by: Grant Likely commit fcdeb7fedf89f4bbc2e11959794968080cd8426e Author: Grant Likely Date: Fri Jan 29 05:04:33 2010 -0700 of: merge of_attach_node() & of_detach_node() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 580537140568caddbc8a727d4c2f238d38707f68 Author: Grant Likely Date: Thu Jan 28 22:18:56 2010 -0700 microblaze: remove early_init_dt_scan_cpus() and phyp_dump_*() Microblaze only has one CPU, it isn't SMP at all. early_init_dt_scan_cpus() is effectively just a no-op, so remove it. Microblaze doesn't support hypervisor assisted dump either, so the phyp stuff can also go. Signed-off-by: Grant Likely Acked-by: Michal Simek commit eabe5c90580a065aed8ce6a5ba53eb443d317fae Author: Bastien Nocera Date: Tue Feb 9 11:43:19 2010 +0100 HID: fix typo in error message Signed-off-by: Jiri Kosina commit 0690535d6bcec5eb28573824df5c8a49ec85b696 Author: Leo P White Date: Mon Feb 8 13:02:05 2010 +0000 HID: add mapping for "AL Network Chat" usage Adding a mapping for the 'AL Network Chat' usage from the 'Consumer' usage page (USB HID Usage Tables v1.11). This usage is used by some keyboards for a multimedia key. Signed-off-by: Leo P White Signed-off-by: Jiri Kosina commit 801cd56e3e2c2b727399d2c50c50139b2d7c98e8 Author: Magnus Damm Date: Tue Feb 9 08:22:30 2010 +0000 sh: break out enable/reparent div4 clocks on sh7723 Break out sh7723 div4 clocks for SIU and IRDA as reparent / enable clocks. Similar to the SIU clock patch for sh7722 by Guennadi. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e6f077592d1de2f6a4fc760e7b5d6f20b37d3a27 Author: Magnus Damm Date: Tue Feb 9 07:17:20 2010 +0000 sh: fix INTC to use set_irq_chained_handler() for redirects This patch updates the shared INTC code to use set_irq_chained_handler() for intc_redirect_irq(). With this in place request_irq() on a merged irq which has been redirected will now return -EINVAL instead of 0 together with a crash. This thanks to the protection of the IRQ_NOREQUEST flag set for chained interrupt handlers. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3844eadcfd2ba975110e3ca8479efa8c093129ce Author: Magnus Damm Date: Tue Feb 9 06:50:04 2010 +0000 sh: sh7724/Ecovec24/KFR2R09/MS7724SE SDHI vector merge Merge the SDHI vectors in the sh7724 INTC table and update the SDHI platform data for Ecovec24, KFR2R09 and MS7724SE. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e3e80046e0ce2a595e607a62b650a9b4efea6558 Author: Magnus Damm Date: Tue Feb 9 06:49:56 2010 +0000 sh: sh7723/AP325 SDHI vector merge Merge the SDHI vectors in the sh7723 INTC table and update the SDHI platform data for AP325. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8d9adabac3a3a3742c7a47da9e456108a0fd2efb Author: Magnus Damm Date: Tue Feb 9 06:49:48 2010 +0000 sh: sh7722/Migo-R SDHI vector merge Merge the SDHI vectors in the sh7722 INTC table and update the SDHI platform data for Migo-R. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7896cd0f5a4fa7eb833064e31d8970b95c9faac5 Merge: 7561f2d d519095 Author: Paul Mundt Date: Tue Feb 9 18:24:14 2010 +0900 Merge branch 'sh/intc-extension' commit d519095344fda705c9840a579acf6aa6205c37cc Author: Magnus Damm Date: Tue Feb 9 04:29:22 2010 +0000 sh: extend INTC with force_enable Extend the shared INTC code with force_enable support to allow keeping mask bits statically enabled. Needed by upcoming INTC SDHI patches that mux together a bunch of vectors to a single linux interrupt which is masked by a priority register, but needs individual mask bits constantly enabled. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 577cd7584cf5199f1ea22cca0ad1fa129a98effa Author: Magnus Damm Date: Tue Feb 9 04:24:46 2010 +0000 sh: extend INTC with struct intc_hw_desc This patch updates the INTC code by moving all vectors, groups and registers from struct intc_desc to struct intc_hw_desc. The idea is that INTC tables should go from using the macro(s) DECLARE_INTC_DESC..() only to using struct intc_desc with name and hw initialized using the macro INTC_HW_DESC(). This move makes it easy to initialize an extended struct intc_desc in the future. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7c0616b85ba23d0467bf0b5a6f288f5296eb05ff Author: James Smart Date: Tue Jan 26 23:10:40 2010 -0500 [SCSI] lpfc 8.3.8: Update Driver version to 8.3.8 Update Driver version to 8.3.8 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 3b5dd52aaffd291edea9f939ed46a960b240bb45 Author: James Smart Date: Tue Jan 26 23:10:15 2010 -0500 [SCSI] lpfc 8.3.8: (BSG4) Add new vendor specific BSG Commands Add the following new vendor specific BSG commands. - Add LPFC_BSG_VENDOR_GET_MGMT_REV command - Add LPFC_BSG_VENDOR_MBOX command - Add LPFC_BSG_VENDOR_DIAG_MODE command - Add LPFC_BSG_VENDOR_DIAG_TEST command Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4cc0e56e977f12e6f400cbab3df7cf1e11d6f58a Author: James Smart Date: Tue Jan 26 23:09:48 2010 -0500 [SCSI] lpfc 8.3.8: (BSG3) Modify BSG commands to operate asynchronously Modify the following BSG commands to operate asynchronously. - FC_BSG_RPT_ELS - FC_BSG_RPT_CT - LPFC_BSG_VENDOR_GET_CT_EVENT - LPFC_BSG_VENDOR_SET_CT_EVENT Signed-off-by: James Smart Signed-off-by: James Bottomley commit c79c1292df87fa9c63383ca551fa719c0c2fda7c Author: James Smart Date: Tue Jan 26 23:09:22 2010 -0500 [SCSI] lpfc 8.3.8: (BSG2) Create lpfc_bsg.h Create lpfc_bsg.h - structures, etc used by bsg-related routines. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4fede78f7552479c4bb3bab221133ec5244e4154 Author: James Smart Date: Tue Jan 26 23:08:55 2010 -0500 [SCSI] lpfc 8.3.8: (BSG1) Update BSG infrastructure Update BSG infrastructure to handle new vendor specific BSG commands. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 65467b6bdffd3efde111444663bc9de35b59b22a Author: James Smart Date: Tue Jan 26 23:08:29 2010 -0500 [SCSI] lpfc 8.3.8: Add code to display logical link speed Display Logical Link Speed when supported and is non-zero. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 695a814e18561c52456acf5051fac0ea4b8111da Author: James Smart Date: Tue Jan 26 23:08:03 2010 -0500 [SCSI] lpfc 8.3.8: BugFixes: Discovery relates changes Discovery relates changes: - Separated VPI_REGISTERED state of physical port into VFI_REGISTERED and VPI_REGISTERED state so that driver can unregister physical port VPI independent of VFI. - Add code to unregister, re-init and re-register physical port VPI when physical port NportID change. - Add code to unregister and re-register VPI of a vport when its Nport ID change. - Add code in FDISC completion path to re-start FLOGI discovery when a FDISC complete with LOGIN_REQUIRED reason code. - Fix a memory leak in lpfc_init_vpi_cmpl - Add code to start a timer for vport to retry FDISC when CVL is received by a vport or physical port. If all Nports receive CVLs, then all timers are cancelled and a logical link level discovery will be started after one second. - Flush ELS commands after killing all delayed ELS commands. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 341af10239c4c87192bf762f53c7bcb1f3a1e767 Author: James Smart Date: Tue Jan 26 23:07:37 2010 -0500 [SCSI] lpfc 8.3.8: BugFixes: SLI relates changes Fix hardware/SLI relates issues: - Handle XB bit so that ELS XRIs are not prematurely released. - Handle XB bit so that FCP XRIs are not prematurely released. - Define new security SLI Commands. - Remove unused security SLI commands - Skip receive data size parameter check on received FLOGI. - Added LPFC_USE_FCPWQIDX flag to iocb to force SLI layer to submit abort WQE on same WQ as the command WQE. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2cec802980727f1daa46d8c31b411e083d49d7a2 Author: Ben Hutchings Date: Sat Jan 23 18:40:29 2010 +0000 [SCSI] qla1280: Drop host_lock while requesting firmware request_firmware() may sleep and it appears to be safe to release the spinlock here. Signed-off-by: Ben Hutchings Cc: stable@kernel.org Signed-off-by: James Bottomley commit 7c56533cf4fb072abc39e850e7ef4fb6166cc83b Author: Jayamohan Kallickal Date: Sat Jan 23 05:39:37 2010 +0530 [SCSI] be2iscsi: correction in the claculation for num_cxn_wrb This patch correct the math done for num_cxn_wrb Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit b30c6dab1d87cc638a7413dd0e778d8c9a5232eb Author: Jayamohan Kallickal Date: Sat Jan 23 05:38:56 2010 +0530 [SCSI] be2iscsi: changing the chip opcode for TEXT This patch corrects the chipopcode for text and chooses correct paramters for that command Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit caf818f118b1ea60226a884072f1c3a9d5714766 Author: Jayamohan Kallickal Date: Sat Jan 23 05:38:18 2010 +0530 [SCSI] be2iscsi: Ensure clean reuse of wrb This patch ensures that wrb is cleanly resued for io path and is memset to zero for non io path Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit f55a24f2c24b63f8b4329eb28b4aec02a4bcf5d0 Author: Jayamohan Kallickal Date: Sat Jan 23 05:37:40 2010 +0530 [SCSI] be2iscsi: correcting the return This patch fixes an issue where return was not called properly. Thanks to Mike Christie for spotting this Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 5dc1c416b39531e3bcf0651ca4123e64228dd553 Author: Jayamohan Kallickal Date: Sat Jan 23 05:36:52 2010 +0530 [SCSI] be2iscsi: Proper checking of state This patch adds proper checking of value in for hba state. We would be adding more states later on Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 230dceb4316da9c8e05c82b64f2527aee95da2ff Author: Jayamohan Kallickal Date: Sat Jan 23 05:36:10 2010 +0530 [SCSI] be2iscsi: Fix for first_burst This patch fixes the first_burst being modified instead of max_burst Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d2eeb1ac35a7146cbd4b1f6bf09bb6384ccdfb0d Author: Jayamohan Kallickal Date: Sat Jan 23 05:35:15 2010 +0530 [SCSI] be2iscsi: changing copyright to 2010 This patch replaces 2009 with 2010 in copyright statement Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 32951dd8cd70e525eb523c9e2b62d79d9157fae9 Author: Jayamohan Kallickal Date: Sat Jan 23 05:34:24 2010 +0530 [SCSI] be2iscsi: Remove Ring mode from driver Ring mode is not used. This patch removes the code. Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d0e2ddff7c4b493acff50a9000564b67cbe7d676 Author: Dmitry Torokhov Date: Tue Jan 19 10:24:40 2010 -0800 [SCSI] vmw_pvscsi: fix signedness warning with newer compilers pvscsi_setup_msix() expects 'irq' argument to be an int but is being passed unsigned int. Unsigned int is more proper type for IRQ number so let's use it. This shuts off a compile warning with recent compilers. Signed-off-by: Dmitry Torokhov Acked-by: Alok Kataria Signed-off-by: James Bottomley commit fa4698fcf59c3bd01c171e5e558bae9e8eb396f1 Author: Martin K. Petersen Date: Mon Jan 18 18:43:18 2010 -0500 [SCSI] sd: Combine DIF/DIX error handling DIF and DIX errors are handled identically at this point. Collapse the switch cases into one and let scsi_io_completion print result and sense data. Signed-off-by: Martin K. Petersen Signed-off-by: James Bottomley commit d44a6d2bbffd9e5c87f0a78cbe9c089e21289162 Author: Roel Kluin Date: Sun Jan 17 16:15:57 2010 +0100 [SCSI] lpfc: unify two if branches with the same code in lpfc_decode_firmware_rev() Regardless of the flag state, the branches execute the same code Signed-off-by: Roel Kluin Acked-by: James Smart Signed-off-by: James Bottomley commit a3babda5b3b60b5d28dbab127b1ecc8ba707b6e7 Author: Jayamohan Kallickal Date: Thu Jan 7 01:51:44 2010 +0530 [SCSI] be2iscsi: Fix to allow driver to load when the FW allows more cids This fix allows the driver to load when the FW allows more cids than than the driver supports. The driver will limit the number of cid to what it can support. There was no reason to fail the driver load,so, correcting that Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit aa3590329fdf789902e3c1383589bad12a74fb09 Author: Jayamohan Kallickal Date: Thu Jan 7 01:51:04 2010 +0530 [SCSI] be2iscsi: Fixing the number of SGE's The number of SGE's supported is fixed to what the chip expects. Also, the max sectors set to tested values Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 48bd86cf213a5780346b603b703c4b83978611a8 Author: Jayamohan Kallickal Date: Thu Jan 7 01:50:19 2010 +0530 [SCSI] be2iscsi: Fixing Bug for multiple SGEs The patch fixes a but where the sg_next is not assigned and hence the first sge was being resused wrongly Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit e4b8972c6172950ce226afdf7a921098f7672d5c Author: Kashyap, Desai Date: Wed Dec 16 18:57:02 2009 +0530 [SCSI] mpt2sas: Bump version 04.100.01.00 Version upgraded to 04.100.01.00. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 84f0b04a0e3b279a0b0a851b93eb403a626ca4b8 Author: Kashyap, Desai Date: Wed Dec 16 18:56:28 2009 +0530 [SCSI] mpt2sas: Enable TLR for SSP TAPE drives (Added SAS Transport APIs) If TLR is supported for end device, MPT2SAS driver will enable the TLR bit in the SCSI_IO for every request. If there is a response with MPI2_SCSITASKMGMT_RSP_INVALID_FRAME, the driver will turn off the TLR logic. [jejb: updated to new transport class TLR API] Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit f4af3c14113d1b0d98d5a5e717b8aa1f484065b6 Author: Kashyap, Desai Date: Wed Dec 16 18:55:54 2009 +0530 [SCSI] mpt2sas: Update driver header to latest MPI Spec. Update header to latest MPI SPEC revision. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 50d5c60634673a79f8d88564e10345b50fca7378 Author: Kashyap, Desai Date: Wed Dec 16 18:55:26 2009 +0530 [SCSI] mpt2sas: Added phy_enable and set_phy_speed sysfs callback support. Added new callbacks phy_enable and set_phy_speed in the mpt2sas_transport_functions template. This will allow end user to enable/disable phys and change links rates using the SysFS interface. Current implementation only supports direct attached phys, but we could in the future add support for expander based phys. A new subroutine mpt2sas_config_set_sas_iounit_pg1 was added; this wrapper function used to send request to controller firmware to modify the phys and link rates. A new subroutine _transport_find_local_phy was added; a function for easly obtaining the local phy object for direct attached. Example to disable a phy echo 0 > /sys/class/phy3:0/enable Example to enable the same phy echo 1 > /sys/class/phy3:0/enable Example to change the link rate to 1.5 #echo "1.5 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 1.5 Gbit Example to change the link rate to 3.0 #echo "3.0 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 3.0 Gbit Example to change the link rate to 6.0 #echo "6.0 Gbit" > /sys/class/phy3:0/maximum_linkrate #cat /sys/class/phy3:0/negotiated_linkrate 6.0 Gbit Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit f7c95ef02b564d9984c0655c9659791b1dd5d7ad Author: Kashyap, Desai Date: Wed Dec 16 18:54:42 2009 +0530 [SCSI] mpt2sas: Added raid transport support Adding support for raid transport layer. This will provide sysfs attributes containing raid level, state, and resync rate. MPT2SAS module will select RAID_ATTRS. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 22c88425e03e8476176375ab0457c88ff3a5b68c Author: Kashyap, Desai Date: Wed Dec 16 18:53:04 2009 +0530 [SCSI] mpt2sas: Use compat_ptr to setup the pointer compatibility. On ppc64, an 32bit application was failing due to data buffers not being copied properly from user to kernel memory. The problem due to improper conversion of 32 to 64 bit pointers. The fix is to use compat_ptr to setup the pointer compatibility in the routine _ctl_compat_mpt_command. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit e75b9b6d9d81e35aed5ef2692285c4948e173c5c Author: Kashyap, Desai Date: Wed Dec 16 18:52:39 2009 +0530 [SCSI] mpt2sas: Set ioc->fwfault_debug to the cmd line option mpt2sas_fwfault_debug. (1) change the formentioned string from logging_level to fwfault_debug (2) set ioc->fwfault_debug to the command line option mpt2sas_fwfault_debug setting at driver load time. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 6846e75cdfa76c6609ac0381a6739c9f4af8fd3b Author: Kashyap, Desai Date: Wed Dec 16 18:51:45 2009 +0530 [SCSI] mpt2sas: User resource_size_t instead of unsigned long Use resource_size_t to define the type resource for the system interface register set. The existing implementation was using "unsigned long" which would be 32 bit in 32 bit OS. If 32 bit OS is using 64 bit physical address space for the system interface register set, we need to shift to using resource_size_t which takes care of physical address space. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit b2ff36ba19dec02b05d3e26e36923b71ab64f34a Author: Kashyap, Desai Date: Wed Dec 16 18:51:05 2009 +0530 [SCSI] mpt2sas: Return -ENODATA on IOCTL timeout The driver was modified to return -ENODATA when there is a timeout via ioctl path. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit d7384b28afb2bf2b7be835ddc8c852bdc5e0ce1c Author: Kashyap, Desai Date: Wed Dec 16 18:50:06 2009 +0530 [SCSI] mpt2sas: Delete volume before HBA detach. The driver hangs when doing `rmmod mpt2sas` if there are any IR volumes present.The hang is due the scsi midlayer trying to access the IR volumes after the driver releases controller resources. Perhaps when scsi_remove_host is called,the scsi mid layer is sending some request. This doesn't occur for bare drives becuase the driver is already reporting those drives deleted prior to calling mpt2sas_base_detach. To solve this issue, we need to delete the volumes as well. Signed-off-by: Kashyap Desai Reviewed-by: Eric Moore Signed-off-by: James Bottomley commit 0f88009d5cfae890bd3466126d1622ad4f16b798 Author: James Bottomley Date: Mon Jan 18 10:14:51 2010 -0600 [SCSI] scsi_transport_sas: add support for transport layer retries (TLR) The mpt2sas driver wants to use transport layer retries (TLR) so the simplest thing to do seems to be to add the enabling flags and checks to the SAS transport class, since they're a SAS specific protocol feature. Signed-off-by: James Bottomley commit 7561f2dd393bd0c6397e6b2a6b021cdb827a2eb1 Author: Paul Mundt Date: Mon Feb 8 16:36:56 2010 +0900 sh: Fix up SH7786 PCI resource definitions. This adds in some of the missing memory resources for channels 1/2 and gets the code building again for the recent changes. Signed-off-by: Paul Mundt commit 13fd7aeb9af0a106905757369362137996f3feb0 Merge: 2e18e04 858918b 9e9622d Author: Paul Mundt Date: Mon Feb 8 11:48:10 2010 +0900 Merge branches 'sh/dwarf-unwinder', 'sh/g3-prep' and 'sh/stable-updates' commit 9e9622d1a064705181bea0600ea9eacd95adab7f Author: Magnus Damm Date: Mon Feb 8 11:47:44 2010 +0900 serial: sh-sci: remove SCIF code in sci_rxd_in() Since sci_rxd_in() is used by SCI only, clean up the header file by killing off code dealing with SCIF ports and their register definitions. Also introduce a default sci_rxd_in() function which can be shared by all SCIF-only processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2e18e047981ae04be9bd0d9760057f7c1a7b3785 Merge: b06ede8 cfefe99 Author: Paul Mundt Date: Mon Feb 8 11:34:03 2010 +0900 Merge branch 'sh/dmaengine' Conflicts: arch/sh/drivers/dma/dma-sh.c commit 858918b77b29d0e9ce7f524d1b57d602d85f5d64 Author: Matt Fleming Date: Sun Feb 7 12:40:36 2010 +0000 sh: Optimise FDE/CIE lookup by using red-black trees Now that the DWARF unwinder is being used to provide perf callstacks unwinding speed is an issue. It is no longer being used in exceptional circumstances where we don't care about runtime performance, e.g. when panicing, so it makes sense improve performance is possible. With this patch I saw a 42% improvement in unwind time when calling return_address(1). Greater improvements will be seen as the number of levels unwound increases as each unwind is now cheaper. Note that insertion time has doubled but that's just the price we pay for keeping the trees balanced. However, this is a one-time cost for kernel boot/module load and so the improvements in lookup time dominate the extra time we spend keeping the trees balanced. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit cfefe99795251d76d92e8457f4152f532a961ec5 Author: Guennadi Liakhovetski Date: Wed Feb 3 14:46:41 2010 +0000 sh: implement DMA_SLAVE capability in SH dmaengine driver Tested to work with a SIU ASoC driver on sh7722 (migor). Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit 623b4ac4bf9e767991c66e29b47dd4b19458fb42 Author: Guennadi Liakhovetski Date: Wed Feb 3 14:44:12 2010 +0000 sh: fix Transfer Size calculation in both DMA drivers Both the original arch/sh/drivers/dma/dma-sh.c and the new SH dmaengine drivers do not take into account bits 3:2 of the Transfer Size field in the CHCR register, besides, bit-field defines set bit 2, but the mask only passes bits 1:0 through. TS_16BLK and TS_32BLK macros are bogus too. This patch fixes all these issues for sh7722 and sh7724, other CPUs stay unchanged and might need to be fixed too. Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit fc4618575f79eea062cdc51715040e40cd35b71c Author: Guennadi Liakhovetski Date: Tue Jan 19 07:24:55 2010 +0000 sh: prepare the DMA driver for slave functionality Slave DMA functionality uses scatter-gather arrays for data transfers, whereas memcpy just uses a single data buffer. This patch converts the current memcpy implementation in shdma.c to use scatter-gather, making it just a special case with one SG-element. This allows us to isolate descriptor list manipulations and locking into one function, thus reducing error chances. Signed-off-by: Guennadi Liakhovetski Acked-by: Dan Williams Signed-off-by: Paul Mundt commit 73c77e2ccc14413c232c3e0b3aa43a0c4b72ec70 Author: James Bottomley Date: Mon Jan 25 11:42:24 2010 -0600 xfs: fix xfs to work with Virtually Indexed architectures xfs_buf.c includes what is essentially a hand rolled version of blk_rq_map_kern(). In order to work properly with the vmalloc buffers that xfs uses, this hand rolled routine must also implement the flushing API for vmap/vmalloc areas. [style updates from hch@lst.de] Acked-by: Christoph Hellwig Signed-off-by: James Bottomley commit c9334f6067dbe0380141fc75b122e0a533878838 Author: James Bottomley Date: Mon Jan 25 11:42:23 2010 -0600 sh: add mm API for DMA to vmalloc/vmap areas Signed-off-by: James Bottomley commit 252a9afff76097667429b583e8b5b170b47665a4 Author: James Bottomley Date: Mon Jan 25 11:42:22 2010 -0600 arm: add mm API for DMA to vmalloc/vmap areas ARM cannot prevent cache movein, so this patch implements both the flush and invalidate pieces of the API. Signed-off-by: James Bottomley commit ef7cc35b0ee03431731186320b18e5da585341ff Author: James Bottomley Date: Mon Jan 25 11:42:21 2010 -0600 parisc: add mm API for DMA to vmalloc/vmap areas We already have an API to flush a kernel page along an alias address, so use it. The TLB purge prevents the CPU from doing speculative moveins on the flushed address, so we don't need to implement and invalidate. Acked-by: Kyle McMartin Signed-off-by: James Bottomley commit b06ede84dd1473dec7c6af03a41c8d04d2fee437 Author: Paul Mundt Date: Fri Feb 5 17:45:14 2010 +0900 sh: Fix up hp6xx build. With the sparseirq conversion there was a stray irq_desc reference left over, this tidies it up and brings the demuxer in line with what the solution engine boards are doing. Signed-off-by: Paul Mundt commit 3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7 Author: Paul Mundt Date: Fri Feb 5 16:11:25 2010 +0900 sh: Fix an off-by-1 in SH7780 PCIC memory resource mapping. Signed-off-by: Paul Mundt commit 8e04221029067cbaff3fc8f4daf991532afbcbaf Merge: 9ad62ec 2c940db Author: Paul Mundt Date: Fri Feb 5 12:16:39 2010 +0900 Merge branch 'sh/stable-updates' commit c2c3489c5b0fdb8fbf0f5e9424905c2994ab5660 Author: Thadeu Lima de Souza Cascardo Date: Thu Feb 4 13:36:24 2010 -0200 HID: use multi input quirk for TouchPack touchscreen This device generates ABS_Z and ABS_RX events, while it should be generating ABS_X and ABS_Y instead. Using the MULTI_INPUT quirk solves this issue. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Daniel Oliveira Nascimento [jkosina@suse.cz: fixed blacklist ordering while resolving conflict] [jkosina@suse.cz: fixed typo to make it compile] Signed-off-by: Jiri Kosina commit 5a1436beec5744029f3ac90b6fe71a698dcd6155 Author: Steffen Klassert Date: Thu Feb 4 11:40:17 2010 +1100 crypto: pcrypt - call the complete function on error This fixes three forgotten calls to the complete function in the error case. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit e054f1647162d7098a9ff619405a72bd7c417213 Author: Roel Kluin Date: Thu Feb 4 11:39:13 2010 +1100 crypto: geode-aes - Fix cip/blk confusion a crypto_cipher cip member was set where a crypto_cipher blk members should have been. Signed-off-by: Roel Kluin Signed-off-by: Herbert Xu commit 5322892d867e186c6b4c5fff5c99ea4863696a60 Author: Dave Chinner Date: Thu Feb 4 10:09:14 2010 +1100 xfs: kill xfs_bawrite There are no more users of this function left in the XFS code now that we've switched everything to delayed write flushing. Remove it. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 07fec73625dc0db6f9aed68019918208a2ca53f5 Author: Christoph Hellwig Date: Tue Feb 9 11:43:49 2010 +1100 xfs: log changed inodes instead of writing them synchronously When an inode has already be flushed delayed write, xfs_inode_clean() returns true and hence xfs_fs_write_inode() can return on a synchronous inode write without having written the inode. Currently these sycnhronous writes only come sync(1), unmount, a sycnhronous NFS export and cachefiles so should be relatively rare and out of common performance paths. Realistically, a synchronous inode write is not necessary here; we can avoid writing the inode by logging any non-transactional changes that are pending. This needs to be done with synchronous transactions, but it avoids seeking between the log and inode clusters as we do now. We don't force the log if the inode is pinned, though, so this differs from the fsync case. For normal sys_sync and unmount behaviour this is fine because we do a synchronous log force in xfs_sync_data which is called from the ->sync_fs code. It does however break the NFS synchronous export guarantees for now, but work is under way to fix this at a higher level or for the higher level to provide an additional flag in the writeback control to tell us that a log force is needed. Portions of this patch are based on work from Dave Chinner. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Reviewed-by: Alex Elder commit 3cebbb81c7e75321e25cc586d07a25a3d98278fc Author: Michal Marek Date: Wed Feb 3 17:20:14 2010 +0100 kconfig: Simplify LSMOD= handling Signed-off-by: Michal Marek LKML-Reference: <20100203162014.GA10956@sepie.suse.cz> Signed-off-by: Steven Rostedt commit 2dbf209d7a7ab94266b936bd2da6a4026c279992 Author: Jiri Kosina Date: Wed Feb 3 16:11:12 2010 +0100 HID: make full-fledged hid-bus drivers properly selectable For historical reasons, we don't have most of the in-tree drivers residing on hid-bus properly selectable in kernel configuration unless CONFIG_EMBEDDED is set. This has been introduced on Linus' request from 14 Oct === As to the Kconfig options - do they really add so much space that you need to ask for the quirks? You didn't use to. Can you make the questions depend on EMBEDDED, or at least on the HID_COMPAT thing or whatever? === This still makes perfect sense for small and tiny drivers, which just fix report descriptors, fix up HID->input mappings that slightly violates HUT standard, send one extra packet to the device that is needed before it becomes functional, etc. Since then, we have been gathering more and more HID-bus drivers, which are full-fledged drivers. For these, the size argument becomes more valid. Plus the devices are much more special than "just violates HID specification in this one or two tiny unimportant points". Therefore I am marking such drivers as properly selectable no matter the setting of CONFIG_EMBEDDED, while keeping all the small and tiny ones compiled by default. Signed-off-by: Jiri Kosina commit 342f31e84eec9002b75f6fcdec6bd932ac77a390 Author: Jiri Kosina Date: Wed Feb 3 15:52:31 2010 +0100 HID: make Wacom modesetting failures non-fatal With Wacom tablet mode-setting moved from userspace into kernel, we don't have to consider failures of device queries through the _raw callback as hard failure, as the driver can safely continue anyway. This is consistent with the current USB driver in wacom_sys.c Reported-by: Ping Cheng Signed-off-by: Jiri Kosina commit f9ce7c283c16538955d5d094101889792bcde109 Author: Bastien Nocera Date: Wed Jan 20 12:01:53 2010 +0000 HID: Enable Sixaxis controller over Bluetooth Now that hid_output_raw_report works, port the PS3 Sixaxis Bluetooth quirk from user-space, into kernel-space. Signed-off-by: Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit 46a709b900bfcf43244cd19cf3245c77484ec733 Author: Bastien Nocera Date: Wed Jan 20 12:00:53 2010 +0000 HID: Implement Wacom quirk in the kernel The hid-wacom driver required user-space to poke at the tablet to make it send data about the cursor location. This patch makes it do the same thing but in the kernel. Signed-off-by: Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit d4bfa033ed84e0ae446eff445d107ffd5ee78df3 Author: Jiri Kosina Date: Fri Jan 29 15:03:36 2010 +0100 HID: make raw reports possible for both feature and output reports In commit 2da31939a42 ("Bluetooth: Implement raw output support for HIDP layer"), support for Bluetooth hid_output_raw_report was added, but it pushes the data to the intr socket instead of the ctrl one. This has been fixed by 6bf8268f9a91f1 ("Bluetooth: Use the control channel for raw HID reports") Still, it is necessary to distinguish whether the report in question should be either FEATURE or OUTPUT. For this, we have to extend the generic HID API, so that hid_output_raw_report() callback provides means to specify this value so that it can be passed down to lower level hardware drivers (currently Bluetooth and USB). Based on original patch by Bastien Nocera Acked-by: Marcel Holtmann Signed-off-by: Jiri Kosina commit f54405db66fbec11679241daefd16fd8291a5762 Author: Alex Neblett Date: Tue Feb 2 21:16:03 2010 -0800 HID: add support for Pixart Imaging Optical Touch Screen Added support for the Pixart Imaging Inc. Optical Touch Screen found in the MSI AE2220 and other new all in one computers to the Quanta Optical Touch dual-touch panel driver found in the latest git clone git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git. Signed-off-by: Alex Neblett Signed-off-by: Jiri Kosina commit 9ad62ec4f752c82b39aa5927f23d894b46ae10b9 Author: Paul Mundt Date: Wed Feb 3 16:46:20 2010 +0900 sh: Fix up early PCI PERR/SERR IRQ handling. This adds support for handling early PERR/SERR triggering in between controller registration and the initial bus scan. Buggy cards end up asserting these as soon as the M66EN scan is undertaken, resulting in an early crash. Signed-off-by: Paul Mundt commit 615f0833aa4c4aa944ceb78895bbffa8bd1884df Author: Steven Rostedt Date: Tue Feb 2 21:51:27 2010 -0500 kconfig: Add LSMOD=file to override the lsmod for localmodconfig Doing the following: make LSMOD=file localmodconfig Will make the streamline-config code use the given file instead of lsmod. If the file is an executable, it will execute it, otherwise it will read it as text. make LSMOD=/my/local/path/lsmod localmodconfig The above will execute the lsmod in /my/local/path instead of the lsmods that may be located elsewhere. make LSMOD=embedded_board_lsmod localmodconfig The above will read the "embedded_board_lsmod" as a text file. This is useful if you are doing a cross compile and need to run the config against modules that exist on an embedded device. Note, if the LSMOD= file does is not a path, it will add the path to the object directory. That is, the above example will look for "embedded_board_lsmod" in the directory that the binary will be built in (the O=dir directory). Signed-off-by: Steven Rostedt On branch config/linus commit e1a0bdd8022317e98650e70850de73eccfcde5ad Merge: 8127f4e 1a45dcf Author: Jiri Kosina Date: Tue Feb 2 23:10:39 2010 +0100 Merge branch 'master' into upstream Conflicts: drivers/hid/hid-ids.h commit 8127f4e883666c9960cfa89cffd36313748f8bab Author: Thadeu Lima de Souza Cascardo Date: Tue Feb 2 18:09:06 2010 -0200 HID: use multi input quirk for eTurboTouch touchscreen This device generates ABS_Z and ABS_RX events, while it should be generating ABS_X and ABS_Y instead. Using the MULTI_INPUT quirk solves this issue. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Daniel Oliveira Nascimento Signed-off-by: Jiri Kosina commit 1c3a02c215a5b955b342f29dc1719e1a5771eaf1 Author: Alexander Shishkin Date: Tue Feb 2 18:43:32 2010 +0200 HID: add NOGET quirk for Prodige Cordless Combo I happen to own a keyboard identified as 05af:3062 which is labeled as "FlatX Coldless Combo" by "Prodige", which exhibits input problems without NOGET quirk. For some reason, lsusb reports this device as "Jing-Mold Enterprise Co., Ltd", which is not mentioned anywhere on the package. A quick search on the intenet shows that there a other people who have this in their lsusb output, but apparently they don't have the problem I am seeing (or they are not such furious typists as myself). Signed-off-by: Alexander Shishkin Signed-off-by: Jiri Kosina commit 7d39e849912f0c3c8c6fc94be7bf7d120b1ee0ba Author: Jiri Kosina Date: Tue Feb 2 20:46:34 2010 +0100 HID: update copyright Signed-off-by: Jiri Kosina commit 88f66ea98d7ae6a8b6a34e38b1b4fa51abc1c9ca Author: Steven Rostedt Date: Wed Jan 6 18:49:44 2010 -0500 kconfig: Look in both /bin and /sbin for lsmod in streamline_config.pl Distributions now have lsmod in /bin instead of /sbin. But to handle both cases, we look for it in /sbin /bin /usr/bin and /usr/sbin. If lsmod is not found in any of those paths, it defaults to use just lsmod and hopes that it lies in the path of the user. Tested-by: Xavier Chantry Signed-off-by: Steven Rostedt commit 37feecb0ae8c29b713b957c053b05ad10c42c73b Author: Paul Mundt Date: Tue Feb 2 19:17:42 2010 +0900 sh: Disable generic IRQ probing. IRQ autoprobing hasn't actually worked for us at all since very early in 2.6, but no one seems to have noticed given that none of the drivers that use it see much testing. yenta_socket is the odd one out, and that depends on PCI IRQs which are fixed on all SH platforms anyways. Consequently, turning off autoprobing fixes up crashes triggered by yenta_socket and at least gets it working again on r7785rp. Signed-off-by: Paul Mundt commit 4b842c8571240d1173eaf00e114cc5cc160f1722 Author: Paul Mundt Date: Tue Feb 2 19:15:17 2010 +0900 sh: enable sparseirq for highlander and r2d. highlander and r2d are the only remaining ones that were blocking sparseirq being turned on by default, but it turns out that they already work fine with it by virtue of register_intc_controller(). As such, we can kill off the dependencies and turn it on by default. Signed-off-by: Paul Mundt commit deb9b22b8968fa0166d89c8ad1346e816cf1aec4 Author: Paul Mundt Date: Tue Feb 2 18:01:55 2010 +0900 sh: mach-dreamcast: Convert to sparseirq. Signed-off-by: Paul Mundt commit 6eb6f98396f7bd653d8fb15b06364c8c7d70e22c Author: Paul Mundt Date: Tue Feb 2 17:48:17 2010 +0900 sh: hd6446x: Convert to sparseirq. Follows the se7724 change and converts the hd64461 IRQ handling to sparseirq. Signed-off-by: Paul Mundt commit c7a967273a539a9a38413753c58125e777e2d30d Author: Paul Mundt Date: Tue Feb 2 17:38:04 2010 +0900 sh: mach-se: Convert SH7724 solution engine FPGA to sparseirq. This uses the new create_irq_nr() to build up the FPGA's desired virtual IRQ mapping and permits us to finally flip on sparseirq for this board. Signed-off-by: Paul Mundt commit e9867c569970d8afb4b882bafbbe81426bd46333 Author: Paul Mundt Date: Tue Feb 2 17:35:13 2010 +0900 sh: Provide create_irq_nr() for dynamic IRQ creation by number. This just reworks the existing create_irq_on_node() in to the new create_irq_nr() which is generally exposed. This permits boards that haven't converted over to sparseirq to try and use their existing ranges, rather than having arbitrary vectors assigned to them. Signed-off-by: Paul Mundt commit 8a349d4b13c41c00564cd79f6fabdec347084758 Author: Joe Perches Date: Tue Feb 2 07:22:13 2010 +0000 spi/spi_s3c64xx.c: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Grant Likely commit fb7899b1f0b748ef966071f5dc23c59ebd57d08f Merge: 212b3c8 abe94c7 Author: Grant Likely Date: Tue Feb 2 01:05:22 2010 -0700 Merge commit 'v2.6.33-rc6' into secretlab/next-spi commit b4f74767a04e175c028336e06507fcc05f5a8618 Author: Guennadi Liakhovetski Date: Tue Jan 19 07:31:13 2010 +0000 sh: add high impedance mode management for SIUA pins on sh7722 This improves power management for the SIUA controller on sh7722. Similar patches might be desired for other SIU-enabled SH platforms. Signed-off-by: Guennadi Liakhovetski Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit 010ab820582d03bcd3648416b5837107e8a9c5f3 Author: Magnus Damm Date: Wed Jan 27 09:17:21 2010 +0000 mtd: sh_flctl SHBUSSEL and SEL_16BIT support This patch extends the sh_flctl driver with support for 16-bit bus configuration using SEL_16BIT and support for multiplexed pins using SHBUSSEL. Signed-off-by: Magnus Damm Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit b79c7adf82e8b8a6d6ad1dadf7e687a4a030cf8c Author: Magnus Damm Date: Tue Feb 2 13:01:25 2010 +0900 mtd: trivial sh_flctl changes This patch contains a few changes for the sh_flctl driver: - not sh7723-only driver - get rid of kconfig dependency - use dev_err() instead of printk() - use __devinit and __devexit for probe()/remove() - fix probe() return values Signed-off-by: Magnus Damm Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 9d3f1881abeae0494a27716b08fcf2d3264bb0fa Merge: b6c58b1 bc10e87 Author: Paul Mundt Date: Tue Feb 2 11:33:45 2010 +0900 Merge branch 'sh/stable-updates' commit e8b217e7530c6a073ac69f1c85b922d93fdf5647 Author: Christoph Hellwig Date: Tue Feb 2 10:16:26 2010 +1100 xfs: remove invalid barrier optimization from xfs_fsync We always need to flush the disk write cache and can't skip it just because the no inode attributes have changed. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner commit 20026d92013d7bb3abb295337191def6758fc086 Author: Dave Chinner Date: Thu Feb 4 09:48:58 2010 +1100 xfs: kill the unused XFS_QMOPT_* flush flags V2 dquots are never flushed asynchronously. Remove the flag and the async write support from the flush function. Make the default flush a delwri flush to make the inode flush code, which leaves the XFS_QMOPT_SYNC the only flag remaining. Convert that to use SYNC_WAIT instead, just like the inode flush code. V2: - just pass flush flags straight through Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit b6c58b1d987a5795086c5c2babd8c7367d2fdb8c Author: Paul Mundt Date: Mon Feb 1 20:01:50 2010 +0900 sh: Improved multi-resource handling for SH7780 PCI. The SH7780 PCI controller supports 3 different ranges of PCI memory in addition to its PCI I/O window. In the case of 29-bit mode, only 2 memory windows are supported, while in 32-bit mode all 3 are visible. This attempts to make the resource handling completely dynamic and to permit platforms to map in as many apertures as they can handle. Signed-off-by: Paul Mundt commit ef407beefbd9928792ccc93857e408e0057bc17b Author: Paul Mundt Date: Mon Feb 1 16:39:46 2010 +0900 sh: Hook up ERR/PERR/SERR detection for SH7780 PCI host controllers. These were never handled before, so implement some common infrastructure to support them, then make use of that in the SH7780-specific code. In practice there is little here that can not be generalized for SH4 parts, which will be an incremental change as the 7780/7751 code is gradually unified. Signed-off-by: Paul Mundt commit bcf39352eb9e9026f7a1028d4bce3707b65f104b Author: Paul Mundt Date: Mon Feb 1 13:11:25 2010 +0900 sh: Handle PCI controller resource conflicts. register_pci_controller() can fail, but presently is a void function. Change this over to an int so that we can bail early before continuing on with post-registration initialization (such as throwing the controller in to 66MHz mode in the case of the SH7780 host controller). Signed-off-by: Paul Mundt commit 85b59f5bb24aeca1a987cbb206e228bf630c8327 Author: Paul Mundt Date: Mon Feb 1 13:01:42 2010 +0900 sh: Enable PCI66 support for SH7780 host controller. This adds some helper glue for scanning the bus and determining if all of the devices are 66MHz capable or not before flipping on 66MHz mode. This isn't quite to spec, but it's fairly consistent with what other embedded controllers end up having to do. Scanning code cribbed from the MIPS txx9 PCI code. Signed-off-by: Paul Mundt commit aee4467b5ce5047401efb4175b1360ec1734affc Author: Paul Mundt Date: Mon Feb 1 11:33:22 2010 +0900 sh: Fix up large system memory handling for SH7780 PCI. For systems that have more than 512MB we need to set up an additional mapping, this fixes up the rounding to the next power of two and splits out the mapping accordingly between the two local bus mapping windows. Signed-off-by: Paul Mundt commit 31a090ae0693af189fc7a8ad16cece4878acad33 Author: Paul Mundt Date: Sat Jan 30 11:29:56 2010 +0900 sh: Fix up asm/hw_breakpoint.h header check. Presently headers_check complains about linux/kdebug.h being unexported, so just bump the __KERNEL__ ifdef up, as per the x86 change. Signed-off-by: Paul Mundt commit 97b19778ee5dd0484493f12f6a9cf9391cf0aefb Author: Paul Mundt Date: Sat Jan 30 11:04:38 2010 +0900 sh: mach-se: Fix up irq_desc reference. The irq_desc needs to be accessed with irq_to_desc(), this fixes up a build error with irq_desc being undefined. Signed-off-by: Paul Mundt commit 396c56a9c69ebb0baf9171a6365ac9fda322728d Author: Paul Mundt Date: Sat Jan 30 01:41:21 2010 +0900 sh: Kill off broken type 1 PCI config access checks. The host controllers only support type 1, so there's not much else to test for. Some of the older controllers also supported type 2 accesses, but we've never supported those, and likely never will. Beyond that, the P1SEG test is meaningless for 32-bit mode, so rather than refactoring it, just kill the type 1 test off completely. Signed-off-by: Paul Mundt commit 320e68da59353fe6ad51b81f6865c4b674ad66ea Author: Paul Mundt Date: Fri Jan 29 22:38:13 2010 +0900 sh: support PCI domains. Newer SH parts are now commonly shipping with multiple controllers, so we wire up PCI domain support to deal with them. Shamelessly cloned from the MIPS implementation. Signed-off-by: Paul Mundt commit ac8ab54a8e41a5ed0ee2161d45b6dc855490989f Author: Paul Mundt Date: Fri Jan 29 22:22:27 2010 +0900 sh: Bail out early on PCI resource conflicts. Presently we just call in to request_resource() for the ioport and iomem resources without checking for errors. This has already hidden a couple of bugs, so add some error handling in for good measure. Signed-off-by: Paul Mundt commit a45635dfb08a1fa2cf77bf1f2c4074961ce2e625 Author: Paul Mundt Date: Fri Jan 29 22:19:04 2010 +0900 sh: Reworked SH7780 PCI initialization. This consolidates the PCI initialization code for all of the pci-sh7780 users, and sets up the memory window dynamically as opposed to using hardcoded window positions. A number of bugs were fixed at the same time, including the PIO handling and master abort timeout settings being incorrect. Signed-off-by: Paul Mundt commit 9762528f37ddc7071509dddb10e7b4b3b957fd01 Author: Paul Mundt Date: Fri Jan 29 16:14:29 2010 +0900 sh: Kill off deprecated fixed PCI memory window accessors. This kills off the deprected fixed memory range accessors for the cases of non-translatable ioremapping. Signed-off-by: Paul Mundt commit 0ada0a73120c28cc432bcdbac061781465c2f48f Merge: 6016a36 92dcffb Author: Grant Likely Date: Thu Jan 28 14:38:25 2010 -0700 Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree commit 6016a363f6b56b46b24655bcfc0499b715851cf3 Author: Grant Likely Date: Thu Jan 28 14:06:53 2010 -0700 of: unify phandle name in struct device_node In struct device_node, the phandle is named 'linux_phandle' for PowerPC and MicroBlaze, and 'node' for SPARC. There is no good reason for the difference, it is just an artifact of the code diverging over a couple of years. This patch renames both to simply .phandle. Note: the .node also existed in PowerPC/MicroBlaze, but the only user seems to be arch/powerpc/platforms/powermac/pfunc_core.c. It doesn't look like the assignment between .linux_phandle and .node is significantly different enough to warrant the separate code paths unless ibm,phandle properties actually appear in Apple device trees. I think it is safe to eliminate the old .node property and use phandle everywhere. Signed-off-by: Grant Likely Acked-by: David S. Miller Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 923f7e30b480438f1e86e01e5cde814248b59a39 Author: Grant Likely Date: Thu Jan 28 13:52:53 2010 -0700 of: Merge of_node_get() and of_node_put() Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 1f43cfb9474d1c4f22598b6e3213ec035be6dd56 Author: Grant Likely Date: Thu Jan 28 13:47:25 2010 -0700 of: merge machine_is_compatible() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit abec86a80247ab3a40d2afc9c8e8c26efcab2391 Author: Paul Mundt Date: Thu Jan 28 18:26:37 2010 +0900 sh: Kill off superfluous sh_bios references from compressed loader. The VBR value needs to be initialized in order for any of the bios trapping to work, and as we don't do that until slightly later in the boot process, this has no real chance of working. The only reason for using this in the past was due to the fact that early serial initialization wasn't possible, but now that early sh-sci is supported by everyone, there's no longer any reason to support the sh_bios hacks in the first place. Given that, we just kill off the references completely. Signed-off-by: Paul Mundt commit d627a2ebd1a303aa4ac1962c553d1e8738735d01 Author: Paul Mundt Date: Thu Jan 28 18:17:29 2010 +0900 sh: Fix up the ioremap_fixed() build for nommu. arch/sh/kernel/setup.c:455: error: implicit declaration of function 'ioremap_fixed_init' Signed-off-by: Paul Mundt commit 849593591ce3b5f9352966c9d410284dc04d03b6 Author: Paul Mundt Date: Thu Jan 28 18:15:05 2010 +0900 sh: Fix up read-only variable assignment in pcibios_align_resource(). arch/sh/drivers/pci/pci.c:167: error: assignment of read-only location '*res' Signed-off-by: Paul Mundt commit 621266bdf4b78fa92f7eabd7688b86f0dbd61d64 Author: Paul Mundt Date: Thu Jan 28 15:55:37 2010 +0900 sh: Quiet noisy coherent DMA unmapping on R2D. IRQs are re-enabled at a later stage when doing the unmapping on R2D via the sm501 USB coherent DMA, resulting in the irqs_disabled() check producing considerable noise for this configuration. Just kill off the check, which was blindly copied from x86 anyways. Signed-off-by: Paul Mundt commit f655f5e956eaf4fcda983f3b3d37c76371556c27 Author: Paul Mundt Date: Thu Jan 28 15:08:21 2010 +0900 sh: mach-titan: Kill off unused PIO port mangling. Nothing is using this, kill it off. Fixing up access sizes can be done with trapped I/O for anyone wanting to make use of this for devices that need it, everything else is already pure MMIO. Signed-off-by: Paul Mundt commit 7013109f52ff38ad9ea38952cedc144c8e8b9636 Author: Giuseppe CAVALLARO Date: Mon Jan 25 16:12:07 2010 +0100 sh: fixed cmpxchg gRB version This patch fixes a bug within the cmpxchg GRB version. A problem was notices while running some tests to stress the priority inheritance, for example pi_stress (http://rt.wiki.kernel.org/index.php/PI_Mutex_Test). Also, without this patch, after applying the latest work to consolidate atomic_cmpxchg() definitions (commit: 8c0b8139c87cfe8b95c6e763b4ca3190aa9b1ad0) the Kernel doesn't boot at all. Signed-off-by: Giuseppe Cavallaro Signed-off-by: Stuart Menefy Signed-off-by: Paul Mundt commit 660e2acad81c19b404f7d7d06e57a6d5e6ce7426 Author: Chris Smith Date: Wed Jan 27 22:03:11 2010 +0900 sh: kmemleak support. Enables support for kmemleak on sh. Signed-off-by: Chris Smith Signed-off-by: Paul Mundt commit 08b36c4a02b5a9db609fc6d93b9c41d7fa75713c Author: Paul Mundt Date: Wed Jan 27 21:56:57 2010 +0900 sh: Optimize runtime disabling of trapped I/O. Presently trapped I/O is only registered if it's not explicitly disabled for the platforms that select it openly. From the fault path this runs through an address lookup before figuring out that nothing matches and falls back through the error path, but we can forego the lookup completely by testing if it's been explicitly disabled. This provides a measurable speedup for things like qemu that rely on runtime disabling. Signed-off-by: Paul Mundt commit 7d6a7bde52e449f21a0e86a7a4955b4e08a49d69 Author: Dave Chinner Date: Tue Jan 26 15:13:41 2010 +1100 xfs: Use delay write promotion for dquot flushing xfs_qm_dqflock_pushbuf_wait() does a very similar trick to item pushing used to do to flush out delayed write dquot buffers. Change it to use the new promotion method rather than an async flush. Also, xfs_qm_dqflock_pushbuf_wait() can return without the flush lock held, yet the callers make the assumption that after this call the flush lock is held. Always return with the flush lock held. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 089716aa1480b7197bcd678b8477774c379a2768 Author: Dave Chinner Date: Tue Jan 26 15:13:25 2010 +1100 xfs: Sort delayed write buffers before dispatch Currently when the xfsbufd writes delayed write buffers, it pushes them to disk in the order they come off the delayed write list. If there are lots of buffers ѕpread widely over the disk, this results in overwhelming the elevator sort queues in the block layer and we end up losing the posibility of merging adjacent buffers to minimise the number of IOs. Use the new generic list_sort function to sort the delwri dispatch queue before issue to ensure that the buffers are pushed in the most friendly order possible to the lower layers. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit d808f617ad00a413585b806de340feda5ad9a2da Author: Dave Chinner Date: Tue Feb 2 10:13:42 2010 +1100 xfs: Don't issue buffer IO direct from AIL push V2 All buffers logged into the AIL are marked as delayed write. When the AIL needs to push the buffer out, it issues an async write of the buffer. This means that IO patterns are dependent on the order of buffers in the AIL. Instead of flushing the buffer, promote the buffer in the delayed write list so that the next time the xfsbufd is run the buffer will be flushed by the xfsbufd. Return the state to the xfsaild that the buffer was promoted so that the xfsaild knows that it needs to cause the xfsbufd to run to flush the buffers that were promoted. Using the xfsbufd for issuing the IO allows us to dispatch all buffer IO from the one queue. This means that we can make much more enlightened decisions on what order to flush buffers to disk as we don't have multiple places issuing IO. Optimisations to xfsbufd will be in a future patch. Version 2 - kill XFS_ITEM_FLUSHING as it is now unused. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit c854363e80b49dd04a4de18ebc379eb8c8806674 Author: Dave Chinner Date: Sat Feb 6 12:39:36 2010 +1100 xfs: Use delayed write for inodes rather than async V2 We currently do background inode flush asynchronously, resulting in inodes being written in whatever order the background writeback issues them. Not only that, there are also blocking and non-blocking asynchronous inode flushes, depending on where the flush comes from. This patch completely removes asynchronous inode writeback. It removes all the strange writeback modes and replaces them with either a synchronous flush or a non-blocking delayed write flush. That is, inode flushes will only issue IO directly if they are synchronous, and background flushing may do nothing if the operation would block (e.g. on a pinned inode or buffer lock). Delayed write flushes will now result in the inode buffer sitting in the delwri queue of the buffer cache to be flushed by either an AIL push or by the xfsbufd timing out the buffer. This will allow accumulation of dirty inode buffers in memory and allow optimisation of inode cluster writeback at the xfsbufd level where we have much greater queue depths than the block layer elevators. We will also get adjacent inode cluster buffer IO merging for free when a later patch in the series allows sorting of the delayed write buffers before dispatch. This effectively means that any inode that is written back by background writeback will be seen as flush locked during AIL pushing, and will result in the buffers being pushed from there. This writeback path is currently non-optimal, but the next patch in the series will fix that problem. A side effect of this delayed write mechanism is that background inode reclaim will no longer directly flush inodes, nor can it wait on the flush lock. The result is that inode reclaim must leave the inode in the reclaimable state until it is clean. Hence attempts to reclaim a dirty inode in the background will simply skip the inode until it is clean and this allows other mechanisms (i.e. xfsbufd) to do more optimal writeback of the dirty buffers. As a result, the inode reclaim code has been rewritten so that it no longer relies on the ambiguous return values of xfs_iflush() to determine whether it is safe to reclaim an inode. Portions of this patch are derived from patches by Christoph Hellwig. Version 2: - cleanup reclaim code as suggested by Christoph - log background reclaim inode flush errors - just pass sync flags to xfs_iflush Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 777df5afdb26c71634edd60582be620ff94e87a0 Author: Dave Chinner Date: Sat Feb 6 12:37:26 2010 +1100 xfs: Make inode reclaim states explicit A.K.A.: don't rely on xfs_iflush() return value in reclaim We have gradually been moving checks out of the reclaim code because they are duplicated in xfs_iflush(). We've had a history of problems in this area, and many of them stem from the overloading of the return values from xfs_iflush() and interaction with inode flush locking to determine if the inode is safe to reclaim. With the desire to move to delayed write flushing of inodes and non-blocking inode tree reclaim walks, the overloading of the return value of xfs_iflush makes it very difficult to determine the correct thing to do next. This patch explicitly re-adds the checks to the inode reclaim code, removing the reliance on the return value of xfs_iflush() to determine what to do next. It also means that we can clearly document all the inode states that reclaim must handle and hence we can easily see that we handled all the necessary cases. This also removes the need for the xfs_inode_clean() check in xfs_iflush() as all callers now check this first (safely). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit d5db0f97fbbeff11c88dec1aaf1536a975afbaeb Author: Eric Sandeen Date: Fri Feb 5 22:59:53 2010 +0000 xfs: more reserved blocks fixups This mangles the reserved blocks counts a little more. 1) add a helper function for the default reserved count 2) add helper functions to save/restore counts on ro/rw 3) save/restore reserved blocks on freeze/thaw 4) disallow changing reserved count while readonly V2: changed field name to match Dave's changes Signed-off-by: Eric Sandeen Signed-off-by: Alex Elder commit 388f1f0c346b533b06d8bc792f7204ebc3e4b7da Author: Dave Chinner Date: Tue Jan 26 15:10:15 2010 +1100 xfs: turn off sign warnings Because they cause warnings in static inline functions conditionally compiled into XFS from the VFS (e.g. fsnotify). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit cbe132a8bdcff0f9afd9060948fb50597c7400b8 Author: Dave Chinner Date: Tue Jan 26 15:08:49 2010 +1100 xfs: don't hold onto reserved blocks on remount,ro If we hold onto reserved blocks when doing a remount,ro we end up writing the blocks used count to disk that includes the reserved blocks. Reserved blocks are not actually used, so this results in the values in the superblock being incorrect. Hence if we run xfs_check or xfs_repair -n while the filesystem is mounted remount,ro we end up with an inconsistent filesystem being reported. Also, running xfs_copy on the remount,ro filesystem will result in an inconsistent image being generated. To fix this, unreserve the blocks when doing the remount,ro, and reserved them again on remount,rw. This way a remount,ro filesystem will appear consistent on disk to all utilities. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 485773f3e401fca31c112c1ff24797e42ff87afd Author: Paul Mundt Date: Tue Jan 26 13:02:10 2010 +0900 sh: flag ctrl_in/outX as __deprecated. These routines are unsuitable for cross-platform use and no new code should be using them, flag them as deprecated in order to give drivers sufficient time to migrate over. Signed-off-by: Paul Mundt commit 9d56dd3b083a3bec56e9da35ce07baca81030b03 Author: Paul Mundt Date: Tue Jan 26 12:58:40 2010 +0900 sh: Mass ctrl_in/outX to __raw_read/writeX conversion. The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added. Signed-off-by: Paul Mundt commit cd9ec30da58bcd8ab154eba9eb54d16c67e7ef3b Author: Johnathon Harris Date: Thu Jan 21 14:36:52 2010 +0000 HID: add support for Ortek WKB-2000 This patch adds a new USB HID driver for the Ortek WKB-2000, working around an incorrect LogicalMaximum value in the USB resource descriptor. Tracked by http://bugzilla.kernel.org/show_bug.cgi?id=14787 Bug originally reported by Ubuntu users: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/405390 Signed-off-by: Johnathon Harris Tested-by: Daniel J Blueman Signed-off-by: Jiri Kosina commit 9df5f74194871ebd0e51ef5ad2eca5084acaaaba Author: James Bottomley Date: Mon Jan 25 11:42:20 2010 -0600 mm: add coherence API for DMA to vmalloc/vmap areas On Virtually Indexed architectures (which don't do automatic alias resolution in their caches), we have to flush via the correct virtual address to prepare pages for DMA. On some architectures (like arm) we cannot prevent the CPU from doing data movein along the alias (and thus giving stale read data), so we not only have to introduce a flush API to push dirty cache lines out, but also an invalidate API to kill inconsistent cache lines that may have moved in before DMA changed the data Signed-off-by: James Bottomley commit 212b3c8b8ab94d983c2e0ee1821f17dd5b4e0859 Author: Jean-Hugues Deschenes Date: Fri Jan 22 10:08:31 2010 -0700 spi/dw_spi: Fix dw_spi_mmio to depend on HAVE_CLK dw_spi_mmio is dependent on the clock framework. This marks it as such in Kconfig. Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 9b00f30762fe9f914eb6e03057a616ed63a4e8ca Author: Christoph Hellwig Date: Thu Jan 21 11:17:20 2010 +0000 xfs: quota limit statvfs available blocks A "df" run on an NFS client of an exported XFS file system reports the wrong information for "available" blocks. When a block quota is enforced, the amount reported as free is limited by the quota, but the amount reported available is not (and should be). Reported-by: Guk-Bong, Kwon Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit bdfb04301fa5fdd95f219539a9a5b9663b1e5fc2 Author: Christoph Hellwig Date: Wed Jan 20 21:55:30 2010 +0000 xfs: replace KM_LARGE with explicit vmalloc use We use the KM_LARGE flag to make kmem_alloc and friends use vmalloc if necessary. As we only need this for a few boot/mount time allocations just switch to explicit vmalloc calls there. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit a14a348bff2f99471a28e5928eb6801224c053d8 Author: Christoph Hellwig Date: Tue Jan 19 09:56:46 2010 +0000 xfs: cleanup up xfs_log_force calling conventions Remove the XFS_LOG_FORCE argument which was always set, and the XFS_LOG_URGE define, which was never used. Split xfs_log_force into a two helpers - xfs_log_force which forces the whole log, and xfs_log_force_lsn which forces up to the specified LSN. The underlying implementations already were entirely separate, as were the users. Also re-indent the new _xfs_log_force/_xfs_log_force which previously had a weird coding style. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 4139b3b337cffd106744386c842b89dc86e31d4b Author: Christoph Hellwig Date: Tue Jan 19 09:56:45 2010 +0000 xfs: kill XLOG_VEC_SET_TYPE This macro only obsfucates the log item type assignments, so kill it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 0cadda1c5f194f98a05d252ff4385d86d2ed0862 Author: Christoph Hellwig Date: Tue Jan 19 09:56:44 2010 +0000 xfs: remove duplicate buffer flags Currently we define aliases for the buffer flags in various namespaces, which only adds confusion. Remove all but the XBF_ flags to clean this up a bit. Note that we still abuse XFS_B_ASYNC/XBF_ASYNC for some non-buffer uses, but I'll clean that up later. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit a210c1aa7f6c90b729cc3a72d03e789b13cb6c47 Author: Christoph Hellwig Date: Sun Jan 17 22:36:19 2010 +0000 xfs: implement quota warnings via netlink Wire up quota_send_warning to send quota warnings over netlink. This is used by various desktops to show user quota warnings. Tested by running the quota_nld daemon while running the xfstest quota tests and observing the warnings. I'll see how I can get a more formal testcase for it written. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 4d1f88d75b00c4d23f4c51305ab5b779a86ef74e Author: Christoph Hellwig Date: Wed Jan 13 22:05:49 2010 +0000 xfs: clean up error handling in xfs_trans_dqresv Move the error code selection after the goto label and fold the xfs_quota_error helper into it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 512dd1abd9539a474f2792eeaf6783c59ad7778a Author: Christoph Hellwig Date: Wed Jan 13 22:05:48 2010 +0000 xfs: kill XFS_QMOPT_ASYNC The option is unused and one of the few remaining users of xfs_bawrite, so let's get rid of it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 8ca8d15ade201b7723fa386eadcce2044463ff56 Author: Jean-Hugues Deschenes Date: Thu Jan 21 09:55:54 2010 -0700 spi/dw_spi: Allow dw_spi.c to be a module Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 0a4c1d7d446d3ed6179f907541d180e49b56d4f4 Author: Jean-Hugues Deschenes Date: Thu Jan 21 09:55:42 2010 -0700 spi/dw_spi: mmio code style fixups Minor code style cleanups following comments by Wolfram Sang Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit f7b6fd6d1d3833529f1626c761ba7e338586d35e Author: Jean-Hugues Deschenes Date: Thu Jan 21 07:46:42 2010 -0700 Memory-mapped dw_spi driver Adds a memory-mapped I/O dw_spi platform device. Signed-off-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit 8bcb4a88c5834c6a0fc7140edea32186664fe360 Author: Feng Tang Date: Thu Jan 21 07:25:38 2010 -0700 spi/dw_spi: fix missing export of dw_spi_remove_host So that interface drivers could be built as modules Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 052dc7c45d8f685fb3720a08331ba3e91e87937e Author: George Shore Date: Thu Jan 21 11:40:52 2010 +0000 spi/dw_spi: conditional transfer mode changes This allows the switching between transfer modes between 'transmit only', 'receive only' and 'transmit and receive' modes. Due to the design of the SPI block, changing transfer modes requires that the block be disabled; in doing so the chipselect line is inherently deasserted and (usually) the attached device discards its state. Consequentially, switching modes requires that a platform-specific chipselect function has been defined so that the chipselect is not dropped during the change. Signed-off-by: George Shore Signed-off-by: Grant Likely commit f4aec798ae5a837a1f062e295f9a5f1b00962589 Author: George Shore Date: Thu Jan 21 11:40:51 2010 +0000 spi/dw_spi: remove conditional from 'poll_transfer'. The 'poll_transfer' function employs a conditional to test whether the transmit buffer is valid; in doing so, on a receive operation no data is clocked out, thus no data is clocked in and ultimately errors appear. This removes the conditional as the transmit function will be set to a null writer when the transmit buffer is invalid, allowing the driver to clock 0x00 out to the device to receive data from the device. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 426c0093d8da4d7b6b0e62cda917b1bae26db4c2 Author: George Shore Date: Thu Jan 21 11:40:50 2010 +0000 spi/dw_spi: fixed a spelling typo in a warning message. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 20a588fcc862df79d8fcafbc41950e3ae93dea09 Author: George Shore Date: Thu Jan 21 11:40:49 2010 +0000 spi/dw_spi: add return value to empty mrst_spi_debugfs_init() As per the function signature. Signed-off-by: George Shore Signed-off-by: Grant Likely commit 83fe518a839e317480e50a138ef4acd73510d7ce Author: George Shore Date: Thu Jan 21 11:40:48 2010 +0000 spi/dw_spi: enable platform specific chipselect. The driver core allows for a platform-specific chipselect assert/deassert function, however the chipselect function in the core doesn't take advantage of this fact. This enables the use of a custom function, should it be defined. Signed-off-by: George Shore Signed-off-by: Grant Likely commit c587b6fa05106606053fc5e8e344f07cd34ace23 Author: Feng Tang Date: Thu Jan 21 10:41:10 2010 +0800 spi/dw_spi: add a FIFO depth detection FIFO depth is configurable for each implementation of DW core, so add a depth detection for those interface drivers who don't set the fifo_len explicitly Signed-off-by: Feng Tang Acked-by: Jean-Hugues Deschenes Signed-off-by: Grant Likely commit a077e91690fb32a1453423b2cf1df3492fd30c3a Author: Paul Mundt Date: Thu Jan 21 16:16:36 2010 +0900 sh: Conserve fixmap slots when IOREMAP_FIXED=n. Presently the IOREMAP_FIXED fixmaps are always defined, even if the platform isn't capable of supporting it. Since we already have an ifdef for it, ifdef the entries, too. Signed-off-by: Paul Mundt commit 2dc2f8e0c46864e2a3722c84eaa96513d4cf8b2f Author: Paul Mundt Date: Thu Jan 21 16:05:25 2010 +0900 sh: Kill off the special uncached section and fixmap. Now that cached_to_uncached works as advertized in 32-bit mode and we're never going to be able to map < 16MB anyways, there's no need for the special uncached section. Kill it off. Signed-off-by: Paul Mundt commit 3125ee72dca25fc2157dcddd07e2d740db921fc4 Author: Paul Mundt Date: Thu Jan 21 15:54:31 2010 +0900 sh: Track the uncached mapping size. This provides a variable for tracking the uncached mapping size, and uses it for pretty printing the uncached lowmem range. Beyond this, we'll also be building on top of this for figuring out from where the remainder of P2 becomes usable when constructing unrelated mappings. Signed-off-by: Paul Mundt commit 2023b843d7b62d99e7356b872e99abc7d6667e49 Author: Paul Mundt Date: Thu Jan 21 15:42:58 2010 +0900 sh: Rework P2 to only include kernel text. This effectively neutralizes P2 by getting rid of P1 identity mapping for all available memory and instead only establishes a single unbuffered PMB entry (16MB -- the smallest available) that covers the kernel. As using segmentation for abusing caching attributes in drivers is no longer supported (and there are no drivers that can be enabled in 32-bit mode that do this), this provides us with all of the uncached access needs by the kernel itself. Drivers and their ilk need to specify their caching attributes when remapping through page tables, as usual. Signed-off-by: Paul Mundt commit 77c2019fc1b4495ce483ef2af9cb12bae23e353b Author: Paul Mundt Date: Thu Jan 21 14:19:41 2010 +0900 sh: initial PMB mapping iteration by helper macro. All of the cached/uncached mapping setup is duplicated for each size, and also misses out on the 16MB case. Rather than duplicating the same iter code for that we just consolidate it in to a helper macro that builds an iter for each size. The 16MB case is then trivially bolted on at the end. Signed-off-by: Paul Mundt commit 99147b5c4167612a987860b661b9f8b79e66b81f Author: Grant Likely Date: Wed Jan 20 14:03:39 2010 -0700 spi/dw_spi: fix __init/__devinit section mismatch Section mismatch in reference from the function dw_spi_add_host() to the function init_queue() Signed-off-by: Grant Likely commit 9778214990af88ec6720bd771d7fc0fa1b140b02 Author: Paul Mundt Date: Wed Jan 20 13:49:45 2010 -0700 spi: xilinx_spi: Fix up I/O routine wrapping bogosity. xilinx_spi presently makes some fairly questionable assumptions about I/O routines, and attempts to assign ioread32/iowrite32 and friends directly to its own internal function pointers. On many platforms these I/O routines are macros or wrappers and not actual functions on their own, resulting in things like: ERROR: "ioread32be" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "iowrite32be" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "iowrite32" [drivers/spi/xilinx_spi.ko] undefined! ERROR: "ioread32" [drivers/spi/xilinx_spi.ko] undefined! If xilinx_spi wants to do this sort of casting, it needs to provide its own wrappers for these, or change how it does accesses completely. I've opted for the first approach, and the attached silly patch does that. If someone with the hardware available wants to give the second option a try that's ok too. In any event, the current code is broken for at least: arm, avr32, blackfin, microblaze, mn10300, and sh. Signed-off-by: Paul Mundt Acked-by: Richard Röjfors Signed-off-by: Grant Likely commit f4d4ecfe788b4141d8c90cfc3ac2831f620f5c1b Author: Alberto Panizzo Date: Wed Jan 20 13:49:45 2010 -0700 spi/spi_imx: add device information by switching pr_debug() to dev_dbg() Useful when debugging multiple spi channels. Signed-off-by: Alberto Panizzo Acked-by: Uwe Kleine-König Signed-off-by: Grant Likely commit ac48eee064f743a198cb38e5a6a62c3f1082ebc1 Author: Magnus Damm Date: Wed Jan 20 13:49:45 2010 -0700 spi: update MSIOF includes Update the MSIOF driver to remove the architecture speficic spi header file and add err.h. This makes the driver compile on non-SH architectures. Signed-off-by: Magnus Damm Signed-off-by: Grant Likely commit 552e450929a7298cc8834fd2824a60b2e914f70e Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: refine the IRQ mode working flow Now dw_spi core fully supports 3 transfer modes: pure polling, DMA and IRQ mode. IRQ mode will use the FIFO half empty as the IRQ trigger, so each interface driver need set the fifo_len, so that core driver can handle it properly Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 51f921c1eb1124fb99ab0728c19e8e14c82c81be Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: add a missed dw_spi_remove_host() in exit sequence Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit b490e3704ccee12deb295f96029d68e0daf02feb Author: Feng Tang Date: Wed Jan 20 13:49:45 2010 -0700 spi/dw_spi: bug fix in wait_till_not_busy() Make the driver wait at least for 1 jiffie before issuing the warning, no matter what HZ is set to Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit fa0fcde66ac3360678360104b24492015e7b852b Author: Jassi Brar Date: Wed Jan 20 13:49:45 2010 -0700 spi/s3c64xx: Add new parameter to cs callback Since most of the chip-selects are simply going to be like gpio_set_value, it would do good to have the same callback type so that it could simply be made to point at gpio_set_value. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit e6b873c9666015484a01373a4eebc6cfa82e670d Author: Jassi Brar Date: Wed Jan 20 13:49:45 2010 -0700 spi/s3c64xx: Include moved header Header for platform specific stuff has been rename to include the SoC type. Include the new header instead. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ef6c680dc5a182a79b09567168d6713f46c85784 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Check before mem-region release Add precautionary check before releasing memory region. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit b0d5d6e55340348b0de75eb691b93d7e60dba879 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Move src_clk to local driver data The pointer to SPI rate source clock had better be the member of driver local data structure rather than platform specific. Also, remove definitions of variable 'sci' that are rendered useless as a consequence. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ee64a37732c23ab2bcef5fe7785fd237a7e38951 Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Differentiate ip and rate clock The instance of SPI clock for controller and that used for generating signals ought to be independently handled. Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit ad7de729c60380a48844f885f37451158169c50d Author: Jassi Brar Date: Wed Jan 20 13:49:44 2010 -0700 spi/s3c64xx: Rename s3c64xx_spi_cntrlr_info Rename 'struct s3c64xx_spi_cntrlr_info' to lesser wordy 'struct s3c64xx_spi_info' Signed-off-by: Jassi Brar Signed-off-by: Grant Likely commit e9a172f074ba85de144e63b0786c7c5c5ba93c3a Author: Uwe Kleine-König Date: Wed Jan 20 13:49:44 2010 -0700 spi/mpc8xxx: don't check platform_get_irq's return value against zero platform_get_irq returns -ENXIO on failure, so !irq was probably always true. Make irq a signed variable and compare irq <= 0. Note that a return value of zero is still handled as error even though this could mean irq0. This is a followup to 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0 that changed the return value of platform_get_irq from 0 to -ENXIO on error. Signed-off-by: Uwe Kleine-König Acked-by: Anton Vorontsov Signed-off-by: Grant Likely commit 34b8c66173666025020e3a6f8d4a5c238b19cde5 Author: Steven King Date: Wed Jan 20 13:49:44 2010 -0700 spi: Add Freescale/Motorola Coldfire QSPI driver Add support for the QSPI controller found some on Freescale/Motorola Coldfire MCUs. Full duplex, active high cs, spi modes 0-3 and word sizes 8-16 bits are supported. The hardware drives the MISO, MOSI and SCLK lines, but the chip selects are managed via GPIO and must be configured by the board code. The QSPI controller has an 80 byte buffer which allows us to transfer up to 16 words at a time. For transfers longer than 16 words, we split the buffer in half so we can update in one half while the controller is operating on the other half. Interrupt latencies then ultimately limits our sustained thru-put to something less than half the maximum speed supported by the part. Signed-off-by: Steven King Signed-off-by: Grant Likely commit 631e61b7ca12ef14c834f99f8948e410c539f585 Author: Márton Németh Date: Wed Jan 20 13:49:44 2010 -0700 spi: make Open Firmware device id constant The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Grant Likely commit 68ea2d82c3671d2eccb600e6871fcbec1cac7fca Author: Robert P. J. Day Date: Wed Jan 20 13:49:44 2010 -0700 spi: Fix reversed args to time_before() in Freescale stmp driver. Signed-off-by: Robert P. J. Day Signed-off-by: Grant Likely commit 358934a60d2180dcd1ed20691dbb66d4fb977ab2 Author: Sandeep Paulraj Date: Wed Dec 16 22:02:18 2009 +0000 spi: Add SPI master driver for DaVinci/DA8xx This patch adds support for a SPI master driver for the DaVinci series of SOCs Signed-off-by: Sandeep Paulraj Signed-off-by: Mark A. Greer Signed-off-by: Philby John Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman Signed-off-by: Grant Likely commit 35f99c0da17beb5004f06ba86a87d82c1a6467be Author: Paul Mundt Date: Wed Jan 20 18:48:17 2010 +0900 sh: pretty print virtual memory map on boot. This cribs the pretty printing from arch/x86/mm/init_32.c to dump the virtual memory layout on boot. This is primarily intended as a debugging aid, given that the newer CPUs have full control over their address space and as such have little to nothing in common with the legacy layout. Signed-off-by: Paul Mundt commit d9116d07f60383cef134c43a0ba15ec4375310fc Author: Paul Mundt Date: Wed Jan 20 18:25:19 2010 +0900 sh: mach-sdk7786: Probe system FPGA area mapping. This implements dynamic probing for the system FPGA. The system reset controller contains a fixed magic read word in order to identify the FPGA. This just utilizes a simple loop that scans across all of the fixed physical areas (area 0 through area 6) to locate the FPGA. The FPGA also contains register information detailing the area mappings and chip select settings for all of the other blocks, so this needs to be done before we can set up anything else. Signed-off-by: Paul Mundt commit 920efaabcbd34e6b8dc05c5b777df3e936af5812 Author: Paul Mundt Date: Wed Jan 20 18:10:30 2010 +0900 sh: Correct iounmap fixmap teardown. iounmap_fixed() had a couple of bugs in it that caused it to effectively fail at life. The total number of pages to unmap factored in the mapping offset and aligned up to the next page boundary, which doesn't match the ioremap_fixed() behaviour. When ioremap_fixed() pegs a slot, the address in the mapping data already contains the offset displacement, and the size is recorded verbatim given that we're only interested in total number of pages required. As such, we need to calculate the total number from the original size in the unmap path as well. At the same time, there was also an off-by-1 problem in the fixmap index calculation which has also been corrected. Previously subsequent remaps of an identical fixmap index would trigger the pte_ERROR() in set_pte_phys(): arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). With this patch in place, the iounmap-driven fixmap teardown actually does what it's supposed to do. Signed-off-by: Paul Mundt commit b51989b8afe9409ee68c67ce2a5de4390693bd2b Author: Paul Mundt Date: Wed Jan 20 16:53:11 2010 +0900 sh: mach-sdk7786: reset controller reboot support. This wires up the machine_ops reboot call to use the system reset controller. Signed-off-by: Paul Mundt commit fbb82b03653cdb7fd1863b911e7540011259d2ce Author: Paul Mundt Date: Wed Jan 20 16:42:52 2010 +0900 sh: machine_ops based reboot support. This provides a machine_ops-based reboot interface loosely cloned from x86, and converts the native sh32 and sh64 cases over to it. Necessary both for tying in SMP support and also enabling platforms like SDK7786 to add support for their microcontroller-based power managers. Signed-off-by: Paul Mundt commit 2efa53b269ec1e9289a108e1506f53f6f1de440b Author: Paul Mundt Date: Wed Jan 20 16:40:48 2010 +0900 sh: Make 29/32-bit mode check helper generally available. Presently __in_29bit_mode() is only defined for the PMB case, but it's also easily derived from the CONFIG_29BIT and CONFIG_32BIT && CONFIG_PMB=n cases. Signed-off-by: Paul Mundt commit 5f240718b475dcddee86b138b624f24c681dbb29 Author: Paul Mundt Date: Wed Jan 20 15:23:54 2010 +0900 sh: mach-sdk7786: Split out FPGA IRQ controller setup. This moves out the FPGA IRQ controller setup code to its own file, in preparation for switching off of IRL mode and having it provide its own irq_chip. Signed-off-by: Paul Mundt commit efd590d57a5edddabaaf4cfaf532c0f674193b81 Author: Paul Mundt Date: Wed Jan 20 15:08:36 2010 +0900 sh: mach-sdk7786: FPGA updates. This does a bit of refactoring of the FPGA management code. The primary FPGA initialization is moved out to its own file in preparation for implementing some of the more complex capabilities, a complete set of register definitions is provided, and all of the existing users in the board code are moved over to use the new interface instead of setting up overlapping mappings. This also corrects the FPGA size, which previously was chomped off at the SDIF control register. Signed-off-by: Paul Mundt commit 587aa0feb74ffe3239b5e26ff5d017ba9f5daec9 Author: Dave Chinner Date: Wed Jan 20 12:04:53 2010 +1100 xfs: rearrange xfs_mod_sb() to avoid array subscript warning gcc warns of an array subscript out of bounds in xfs_mod_sb(). The code is written in such a way that if the array subscript is out of bounds, then it will assert fail. Rearrange the code to avoid the bounds check warning. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit f0a0eaa8da08ebc6519cacd731df05bbb4ca47ce Author: Dave Chinner Date: Wed Jan 20 10:50:06 2010 +1100 xfs: suppress spurious uninitialised var warning in xfs_bmapi() Initialise the xfs_bmalloca_t structure to zero to avoid uninitialised variable warnings. This is done by zeroing the arg structure rather than using the uninitialised_var() trick so we know for certain that the structure is correctly initialised as xfs_bmapi is a very complex function and it is difficult to prove warnings are spurious. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 58c75cfb51393a52b45262394c1fa81514b4d9bd Author: Dave Chinner Date: Wed Jan 20 10:49:18 2010 +1100 xfs: make compile warn about char sign mismatches again The -fno-unsigned-char directive has no effect anymore as the XFs build is clean. However, the kernel build hides pointer sign differences so turn that back on so that we can clean up all the mismatches prior to a userspace code resync. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 4a24cb71407dc25035d75dd3d118e0e55679e217 Author: Dave Chinner Date: Wed Jan 20 10:48:05 2010 +1100 xfs: clean up sign warnings in dir2 code We are now consistently using unsigned char strings for names so fix up the remaining warnings in the dir2 code to complete the cleanup. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a9273ca5c6814f393e18ed66645f817b2b71e9ad Author: Dave Chinner Date: Wed Jan 20 10:47:48 2010 +1100 xfs: convert attr to use unsigned names To be consistent with the directory code, the attr code should use unsigned names. Convert the names from the vfs at the highest level to unsigned, and ænsure they are consistenly used as unsigned down to disk. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit b9c48649577dfc4a8c263c106d518effa24ea54b Author: Dave Chinner Date: Wed Jan 20 10:47:39 2010 +1100 xfs: xfs_buf_iomove() doesn't care about signedness xfs_buf_iomove() uses xfs_caddr_t as it's parameter types, but it doesn't care about the signedness of the variables as it is just copying the data. Change the prototype to use void * so that we don't get sign warnings at call sites. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a3380ae39fa321282c407ba5e1835e14b64853d9 Author: Dave Chinner Date: Wed Jan 20 10:47:25 2010 +1100 xfs: make xfs_dir_cilookup_result use unsigned char For consistency with the result of the code. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 2bc754213d40d67c39ddd58cf240f2b948e1951e Author: Dave Chinner Date: Wed Jan 20 10:47:17 2010 +1100 xfs: convert dirnameops to unsigned char names To be consistent across the codebase, convert the dirnameops to pass the directory names by unsigned char strings. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 046ea753130fc51d885835458bf8c1d84765b9ac Author: Dave Chinner Date: Wed Jan 20 10:47:08 2010 +1100 xfs: convert DM ops to use unsigned char names dmops uses a signed char for it's namespace event. To be consistent with the rest of the code, convert them to unsigned char for the namespace string. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e2bcd936eb95d0019ca5e05f9fdd27e770ddded1 Author: Dave Chinner Date: Wed Jan 20 10:44:58 2010 +1100 xfs: directory names are unsigned Convert the struct xfs_name to use unsigned chars for the name strings to match both what is stored on disk (__uint8_t) and what the VFS expects (unsigned char). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit bdc27300f5718626a3817e6478e339f6cca6b994 Author: Paul Mundt Date: Wed Jan 20 03:38:56 2010 +0900 sh: Handle SH-4 FPU variants with broken CVR values. Usually we can look to the CVR to work out whether we have an FPU or not. Unfortunately not all parts comply with this, so just set the flag manually for all SH-4 parts and clear it on the only SH-4 that doesn't have one (SH4-501). Signed-off-by: Paul Mundt commit 50dd3145a58b5cef03a95c1b98765bcc847a72d0 Author: Magnus Damm Date: Tue Jan 19 13:52:28 2010 +0000 sh: update PFC to allow any enum in MARK lists This patch updates the PFC code with some clarifying comments together with a functional change. The change allows function type of GPIO to select any type of enum in their MARK lists. Without this patch only function type of enums are allowed in MARK lists. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 70911b861bfbba1851cbb3497635030f34703c7a Author: Paul Mundt Date: Wed Jan 20 02:45:05 2010 +0900 sh: Shut up noisy IOREMAP_FIXED=n build. The ioremap_fixed() stub neglected to provide a return value, resulting in a fairly noisy build. Signed-off-by: Paul Mundt commit 31c3af503eb75488aafb7a3d292b9e00962f2cee Author: Guennadi Liakhovetski Date: Tue Jan 19 11:14:31 2010 +0000 sh: support SIU sourcing from external clock on sh7722 Implement .set_rate() for all SH "div4 clocks," .enable(), .disable(), and .set_parent() for those, that support them. This allows, among other uses, reparenting of SIU clocks to the external source, and enabling and disabling of the IrDA clock on sh7722. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 14965f16b4bb8f3e51b09c1d8f61b8e98f9d12db Author: Paul Mundt Date: Tue Jan 19 20:10:33 2010 +0900 sh: Fix up sdk7780 and urquell builds. These two got broken in the heartbeat private data conversion, fix them up. Signed-off-by: Paul Mundt commit dea3cf1c3935047a5b0d21b21d26718e09135f97 Author: Paul Mundt Date: Tue Jan 19 20:09:28 2010 +0900 sh: urquell: Handle EXTAL configuration here, too. urquell happens to use the same mode pins and EXTAL configuration as SDK7786, so just copy it over. Signed-off-by: Paul Mundt commit c8098218271d19e7123d8b9137b9a4b87e5ffec0 Author: Paul Mundt Date: Tue Jan 19 19:38:36 2010 +0900 sh: mach-sdk7786: Detect/configure/propagate EXTAL. This uses the mode pins exposed through the FPGA to work out whether we're driven from EXTAL or not and does the appropriate setup and propagation through the clock framework. This will also -EINVAL out for anyone adding in their own oscillators, forcing proper configuration with the clock framework instead of proceeding on with bogus clock values. Signed-off-by: Paul Mundt commit 43a1839cb1e0e0ed08b8ace0adb3716865fd0c4c Author: Paul Mundt Date: Tue Jan 19 19:37:14 2010 +0900 sh: SH7786 clock framework rewrite. This rewrites the SH7786 clock framework support completely. It's reworked to provide all of the DIV4 and MSTP function clocks. This brings it in line with the current clock framework code and lets us drop SH7786 from the list of CPUs that require legacy CPG handling. Signed-off-by: Paul Mundt commit a4ae2b2b18d1766768987dc5de42dfa3c2a6d9f7 Author: Paul Mundt Date: Tue Jan 19 15:58:27 2010 +0900 sh64: Fixup build breakage from breakpoint handler rename. The breakpoint handler was renamed on sh32, but sh64 was overlooked in the conversion. Fix it up now. Signed-off-by: Paul Mundt commit d6db8888c8957fbdcd611e1321a6f6a0d6fb7e15 Author: Paul Mundt Date: Tue Jan 19 15:55:27 2010 +0900 sh64: Use the shared FPU state restorer. This kills off the sh64-specific state restorer and switches over to the generic one. Signed-off-by: Paul Mundt commit 88ea1a445a84fcfbedb810c01e84d6711352bd82 Author: Paul Mundt Date: Tue Jan 19 15:41:50 2010 +0900 sh64: Fix up PC casting in unaligned fixup notifier with 32bit ABI. Presently the build bails with the following: CC arch/sh/mm/alignment.o cc1: warnings being treated as errors arch/sh/mm/alignment.c: In function 'unaligned_fixups_notify': arch/sh/mm/alignment.c:69: warning: cast to pointer from integer of different size arch/sh/mm/alignment.c:74: warning: cast to pointer from integer of different size make[2]: *** [arch/sh/mm/alignment.o] Error 1 This is due to the fact that regs->pc is always 64-bit, while the pointer size depends on the ABI. Wrapping through instruction_pointer() takes care of the appropriate casting for both configurations. Signed-off-by: Paul Mundt commit 3ef2932b8c1fc89408ef1fd4b1e1c2caabc7f07d Author: Paul Mundt Date: Tue Jan 19 15:40:03 2010 +0900 sh64: Fix up the build for the thread_xstate changes. This updates the sh64 processor info with the sh32 changes in order to tie in to the generic task_xstate management code. Signed-off-by: Paul Mundt commit cb6d04468d16de5a6161167ec7e76a43be540a80 Author: Paul Mundt Date: Tue Jan 19 15:22:52 2010 +0900 sh: Kill off now bogus fixmap/page wiring documentation. The plans for _PAGE_WIRED were detailed in a comment with the fixmap code, but as it's now all taken care of, we no longer have any reason for keeping it around, particularly since it's no longer accurate. Kill it off. Signed-off-by: Paul Mundt commit bb29c677b366fdf4f6522cd82228a32567aa98c7 Author: Paul Mundt Date: Tue Jan 19 15:20:35 2010 +0900 sh: Split out MMUCR.URB based entry wiring in to shared helper. Presently this is duplicated between tlb-sh4 and tlb-pteaex. Split the helpers out in to a generic tlb-urb that can be used by any parts equipped with MMUCR.URB. At the same time, move the SH-5 code out-of-line, as we require single global state for DTLB entry wiring. Signed-off-by: Paul Mundt commit 046581f9623b53f551a93864bb74e15ad2514f0c Author: Paul Mundt Date: Tue Jan 19 14:23:39 2010 +0900 sh: Provide a dummy _PAGE_WIRED flag for non-X2TLB parts. This provides a dummy value for legacy parts which permits the entry wiring to be open-coded. The compiler takes care of optimizing the entry wiring away in these cases. Signed-off-by: Paul Mundt commit 6d63e73d520b690e4378cef3003eb5f01f7d128c Author: Paul Mundt Date: Tue Jan 19 14:00:14 2010 +0900 sh: Limit ioremap_prot() to 32bit pgprot parts. Presently ioremap_prot() uses an unsigned long to pass the pgprot value around. This results in the upper half of the pgprot being chomped when using 64-bit pgprots on a 32-bit ABI (X2TLB and SH-5). As the only users of ioremap_prot() are presently legacy parts, this doesn't cause too much of an issue. In the future when the interface is converted to use pgprot_t directly this can be re-enabled for the other parts, too. Signed-off-by: Paul Mundt commit f33609344acfdde1c1acedf6de3efe6b80af93a6 Author: Paul Mundt Date: Tue Jan 19 13:55:41 2010 +0900 sh: Convert p3_ioremap() users to ioremap_prot(). This kills off the ancient p3_ioremap(), converting over to the more generic ioremap_prot() instead. Signed-off-by: Paul Mundt commit acf2c9685fb8295cb62a623d7358a1cfde8b07ea Author: Paul Mundt Date: Tue Jan 19 13:49:19 2010 +0900 sh: Kill off duplicate address alignment in ioremap_fixed(). This is already taken care of in the top-level ioremap, and now that no one should be calling ioremap_fixed() directly we can simply throw the mapping displacement in as an additional argument. Signed-off-by: Paul Mundt commit d57d64080ddc0ff13fcffc898b6251074a482ba1 Author: Paul Mundt Date: Tue Jan 19 13:34:38 2010 +0900 sh: Prevent 64-bit pgprot clobbering across ioremap implementations. Presently 'flags' gets passed around a lot between the various ioremap helpers and implementations, which is only 32-bits. In the X2TLB case we use 64-bit pgprots which presently results in the upper 32bits being chopped off (which handily include our read/write/exec permissions). As such, we convert everything internally to using pgprot_t directly and simply convert over with pgprot_val() where needed. With this in place, transparent fixmap utilization for early ioremap works as expected. Signed-off-by: Paul Mundt commit 8605c46c171f02859fb3a32655fa226ce446c6ec Author: George Kadianakis Date: Sun Jan 17 21:19:31 2010 +0200 [SCSI] lpfc: restore MSI-X/MSI support A Gentoo bug report [1] showed that as of 2.6.31 lpfc only uses INTx interrupts. This patch restores lpfc's ability to support MSI-X/MSI interrupts that the "Addition of SLI4 Interface - Base Support" patch [2] broke. It reestablishes MSI-X as the default interrupt method and in case MSI-X is not supported lpfc_sli{4,}_enable_intr fallbacks to MSI and then to INTx. [1]: http://bugs.gentoo.org/show_bug.cgi?id=296319 [2]: commit da0436e915a5c17ee79e72c1bf978a4ebb1cbf4d [James Smart: Background: Nothing Broke. This was intended. We had originally enabled MSI-X by default, but in qualification within the last 12 months, we encountered a major catch-22: There were at least 4 platforms, from 2 major OEMs, that : - Say they support MSI-X - platform routines work and act as if they do. - We enable it, generate a test interrupt to check they really do deliver it, and it works. - But shortly after attachment, the system hangs or loses interrupts, resulting in a bad system behavior. Given the distro's picking up the 2.6.32 kernel, we had to stick with a default of MSI-X off, with user-enabled MSI-X as these platforms couldn't get fixed. However, we're also now encountering platforms that require MSI-X and never INTx, so we must change. It's desired also for also for performance reasons. So - now (2.6.33) is the right time to re-enable MSI-X by default. ] [jejb: fix up comment on default values] Signed-off-by: George Kadianakis Acked-by: James Smart Signed-off-by: James Bottomley commit e8a392444d338d3ce77d157bcbe4975828536efa Author: Giridhar Malavali Date: Tue Jan 12 13:02:49 2010 -0800 [SCSI] qla2xxx: Update version number to 8.03.02-k0. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit f8ac60855ebfa239319a4a9945799995feda3b06 Author: Giridhar Malavali Date: Tue Jan 12 13:02:48 2010 -0800 [SCSI] qla2xxx: Remove firmware hint for 81xx parts. Firmware is loaded from flash for these ISP types. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 9a069e196767d7b87184fd8d8211d22bb5b9c0b8 Author: Giridhar Malavali Date: Tue Jan 12 13:02:47 2010 -0800 [SCSI] qla2xxx: Add BSG support for FC ELS/CT passthrough and vendor commands. [jejb: fixed printk casting issues] Signed-off-by: Sarang Radke Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 90a86fc05ffefe48581c88106d0b9cc37f6e060c Author: Joe Carnuccio Date: Tue Jan 12 13:02:46 2010 -0800 [SCSI] qla2xxx: Enhance EEH support and enable AER support. qla2xxx: EEH added call to pci_restore_state. qla2xxx: EEH added delay in slot reset routine. qla2xxx: EEH moved call to pci_save_state(), see (1). qla2xxx: EEH additional changes for RHEL5.5. qla2xxx: EEH added function call, removed function call, see (2). (1) In qla2xxx_probe_one the call to pci_save_state() has been moved to after the call to qla2xxx_request_irqs(). (2) Add call to pci_disable_pcie_error_reporting() in remove_one. Delete call to pci_cleanup_aer_uncorrect_error_status() in pci_resume. Signed-off-by: Giridhar Malavali Signed-off-by: James Bottomley commit 9db0fb3aa4cc4e42241e194ef64931321fa72196 Author: Jayamohan Kallickal Date: Tue Jan 5 05:12:43 2010 +0530 [SCSI] be2iscsi: Enable TEXT req resp This patch enables TEXT Request / Response for the driver Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit aa874f0738ecac7e5ac13b4d808a1026dcb5367d Author: Jayamohan Kallickal Date: Tue Jan 5 05:12:03 2010 +0530 [SCSI] be2iscsi: Fixing initialization of can_queue This patch fixes can_queue being uninitiallized since it was done before beiscsi_get_params was called. Thanks to Mike Christie for identifying this Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit da7408c800e3ae293275f52497d0ef7a9b09c9e4 Author: Jayamohan Kallickal Date: Tue Jan 5 05:11:23 2010 +0530 [SCSI] be2iscsi: The session failure only when Link Goes down This fixes a situation where the sessions were being killed whenever LinkUP is notified rather than LinkDown Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 756d29c8c7ed8887ed7d752371ce2f6d12399267 Author: Jayamohan Kallickal Date: Tue Jan 5 05:10:46 2010 +0530 [SCSI] be2iscsi: Enable async mode for mcc rings This patches enables async mode for mcc rings so that multiple requests can be queued. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 51a462500fbed4a1e8110dc60a421a3f12b9580b Author: Jayamohan Kallickal Date: Tue Jan 5 05:10:01 2010 +0530 [SCSI] be2iscsi: No requirement for endianess change for data_count This patch removes the endianess change that was wrongly added for data_count Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 0ecb0b45f22df911c564070b64af21db36934f0f Author: Jayamohan Kallickal Date: Tue Jan 5 05:09:19 2010 +0530 [SCSI] be2iscsi: decide which requests need completion This patch decides whether ack based completion is required or not Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d7aea67b8a7665fe5e53cdf59ba76c9b8d67b751 Author: Jayamohan Kallickal Date: Tue Jan 5 05:08:39 2010 +0530 [SCSI] be2iscsi: Use of opcode in beiscsi_alloc_pdu This patch enables use of opcode that is passed in Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 2807afb7411b97834fc7338f3735f3d152443551 Author: Jayamohan Kallickal Date: Tue Jan 5 05:07:49 2010 +0530 [SCSI] be2iscsi:moved pci_set_drvdata to inside beiscsi_hba_alloc This patch moves pci_set_drvdata to inside beiscsi_hba_alloc Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 7bd6e25cdbee7d4f6bc4946dc914310220e637b8 Author: Jayamohan Kallickal Date: Tue Jan 5 05:07:02 2010 +0530 [SCSI] be2iscsi: Added opcode for LOGOUT_RSP, TEXT_RESP, TMFUNC_RSP This patch adds opcodes in thecompletion path that were missed out earlier Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d543148883f65c34e6cd54c5e9ed0592dfbb6acb Author: Jayamohan Kallickal Date: Tue Jan 5 05:06:21 2010 +0530 [SCSI] be2iscsi: Link Wrb with next Wrb This patch will link the current allocated wrb with the next wrb that will be allocated. This is a requirement from the chip. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit c24622886fb934313a2a43ea1f516cbf1ddd947b Author: Jayamohan Kallickal Date: Tue Jan 5 05:05:34 2010 +0530 [SCSI] be2iscsi: Move freeing of resources to stop_conn We need to hold on to ep resources untill invalidate and close connection are completed Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 7da5087971b1a187f92be4efb74a991ac9ccb0a3 Author: Jayamohan Kallickal Date: Tue Jan 5 05:04:12 2010 +0530 [SCSI] be2iscsi: Use start cid and number of cid and icd from FW This patch enablesi be2iscsi to use the start number and number of cids/icd provided by FW rather than hard coded values. Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 1fe6dbf4d0afba52ad0249f398e6296a1433a004 Author: Dave Jones Date: Mon Jan 4 10:19:34 2010 -0500 [SCSI] gdth: Convert to use regular kernel types. converted using this script.. perl -p -i -e 's|ulong32|u32|g' drivers/scsi/gdth* perl -p -i -e 's|ulong64|u64|g' drivers/scsi/gdth* perl -p -i -e 's|ushort|u16|g' drivers/scsi/gdth* perl -p -i -e 's|unchar|u8|g' drivers/scsi/gdth* perl -p -i -e 's|ulong|unsigned long|g' drivers/scsi/gdth* perl -p -i -e 's|PACKED|__attribute__((packed))|g' drivers/scsi/gdth* sha1sum of the generated code was identical before and after. Signed-off-by: Dave Jones Signed-off-by: James Bottomley commit e7efe5932b1d3916c79326a4221693ea90a900e2 Author: Douglas Gilbert Date: Sun Jan 3 13:51:15 2010 -0500 [SCSI] skip sense logging for some ATA PASS-THROUGH cdbs Further to the lsml thread titled: "does scsi_io_completion need to dump sense data for ata pass through (ck_cond = 1) ?" This is a patch to skip logging when the sense data is associated with a SENSE_KEY of "RECOVERED_ERROR" and the additional sense code is "ATA PASS-THROUGH INFORMATION AVAILABLE". This only occurs with the SAT ATA PASS-THROUGH commands when CK_COND=1 (in the cdb). It indicates that the sense data contains ATA registers. Smartmontools uses such commands on ATA disks connected via SAT. Periodic checks such as those done by smartd cause nuisance entries into logs that are: - neither errors nor warnings - pointless unless the cdb that caused them are also logged Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit 5d7ebb9c7a04d29efce1099024944dfd94d9f63c Author: Dan Carpenter Date: Mon Dec 28 20:08:39 2009 +0200 [SCSI] FlashPoint: fix off by one tests The check on MAX_SCSI_TAR should be >= instead of > or we could go past the end of the array. Joe Eykholt aslo correctly points out that the check on MAX_LUN should be >= as well. That matches with how it is used in the rest of the file. Signed-off-by: Dan Carpenter Signed-off-by: James Bottomley commit 0ed8570ef4d51bb46e2028b2e3c3ddd1f860e193 Author: Jiri Slaby Date: Mon Dec 21 16:27:55 2009 -0800 [SCSI] cxgbi3: remove unnecessary NULL test Stanse found that c3cn is poked many times around in cxgb3i_conn_pdu_ready, there is no need to check if it is NULL. Remove the test. Signed-off-by: Jiri Slaby Reviewed-by: Mike Christie Acked-by: Karen Xie Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 3dbf6c0012d12473461b7485006db373e8192fa5 Author: Julia Lawall Date: Sat Dec 19 08:17:27 2009 +0100 [SCSI] pm8001: Use kzalloc for allocating only one thing Use kzalloc rather than kcalloc(1,...) The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ @@ - kcalloc(1, + kzalloc( ...) // Signed-off-by: Julia Lawall Acked-by:Jack Wang Signed-off-by: James Bottomley commit 4ffd005a4dedf536330756742595ec904f740f48 Author: Kashyap, Desai Date: Wed Dec 16 19:04:49 2009 +0530 [SCSI] mptfusion: Bump version 03.04.14 Version upgrade to 3.04.14. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit de81562f2f9852a1f2c609ede1e26c07ed457c60 Author: Kashyap, Desai Date: Wed Dec 16 19:02:59 2009 +0530 [SCSI] mptfusion: corrected if condition check for SCSIIO and PASSTHROUGH commands Modified the function type check to verify it is not MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH or MPI_FUNCTION_SCSI_IO_REQUEST. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 64e155adc250ab68255b761c1faa77799aa1e41a Author: Kashyap, Desai Date: Wed Dec 16 19:02:29 2009 +0530 [SCSI] mptfusion: block device when target is being removed by FW Add support to set the sdev state to SDEV_BLOCK during device removal to stop IOs comming to the deleting driver immediately. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit e0f553ab58f478321717100e44b28f765bd2a045 Author: Kashyap, Desai Date: Wed Dec 16 19:01:58 2009 +0530 [SCSI] mptfusion: Added sysfs expander manufacture information at the time of expander add. Added new function mptsas_exp_manufacture_info, which will obtain the REPORT_MANUFACTURING, and fill the details into the sas_expander_device object when the expander port is created. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 65f89c2396aa113a06fe7e2f6ba46f0712cb4806 Author: Kashyap, Desai Date: Wed Dec 16 19:01:13 2009 +0530 [SCSI] mptfusion: Added MPI_SCSIIO_CONTROL_HEADOFQ priority There is a 'ioprio' field in the BIO and the Request structure. check this priority field and set MPI_SCSIIO_CONTROL_HEADOFQ to pass down I/O priority. An enhancement to the LSI Disk Array Controller firmware is being developed to look at the Head Of Queue bit to allow I/Os with the HOQ bit set to be processed before I/Os which do not have the HOQ bit set. In order to set the HOQ bit, the mpt fusion driver needs to look at the 'ioprio' field in the request structure associated with the scsi command. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 02507a80b35edd720480540d917e9f92cc371009 Author: Finn Thain Date: Sat Dec 5 12:30:42 2009 +1100 [SCSI] mac_esp: fix PIO mode, take 2 The mac_esp PIO algorithm no longer works in 2.6.31 and crashes my Centris 660av. So here's a better one. Also, force async with esp_set_offset() rather than esp_slave_configure(). One of the SCSI drives I tested still doesn't like the PIO mode and fails with "esp: esp0: Reconnect IRQ2 timeout" (the same drive works fine in PDMA mode). This failure happens when esp_reconnect_with_tag() tries to read in two tag bytes but the chip only provides one (0x20). I don't know what causes this. I decided not to waste any more time trying to fix it because the best solution is to rip out the PIO mode altogether and use the DMA engine. Signed-off-by: Finn Thain Signed-off-by: James Bottomley commit f2818663c82b7297ff4aa38cbddb870dc02f7104 Author: Hannes Reinecke Date: Tue Dec 15 09:26:06 2009 +0100 [SCSI] scsi_transport_fc: Remove capping from dev_loss_tmo Currently dev_loss_tmo is capped by SCSI_DEVICE_BLOCK_MAX_TIMEOUT. This causes problem with multipathing when the 'no_path_retry' setting exceeds the dev_loss_tmo setting, as then the system might run into a deadlock when all paths have been removed temporarily for longer than dev_loss_tmo. The principal reasons for the capping has been that we should not allow a remote port to remain in status 'blocked' indefinitely, so the capping is there to ensure that the port status is being reset eventually. However, the fast_io_fail_tmo will also move the remote port out of the 'blocked' state, so for any HBA driver implementing both the capping should really be on the fast_io_fail_tmo, and not on the dev_loss_tmo. This patch implements just that, ie the fast_io_fail_tmo is capped to SCSI_DEVICE_BLOCK_TIMEOUT and the capping is removed from dev_loss_tmo when fast_io_fail_tmo is set. This allows us to synchronize the dev_loss_tmo setting to the 'no_path_retry' setting from multipathing thus avoiding the deadlock. Signed-off-by: Hannes Reinecke Acked-by: James Smart Signed-off-by: James Bottomley commit e47c11c7a402a054a85cb917a6ed020f6b5fae04 Author: Erik Ekman Date: Mon Dec 14 21:21:56 2009 +0100 [SCSI] fusion: fix warning when not using procfs Fixes the following warning: drivers/message/fusion/mptbase.c:129: warning: 'mpt_proc_root_dir' defined but not used also moves it from public data section since it is static. Signed-off-by: Erik Ekman Acked-by: "Desai, Kashyap" Signed-off-by: James Bottomley commit 340f052001d46aff9e7e853c492e0d3f5554d42f Author: Roel Kluin Date: Tue Dec 8 14:08:56 2009 -0800 [SCSI] ibmmca: fix buffer overflow Allows i == IM_MAX_HOSTS, which is out of range. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 4a02462af1f4c3498e6a330ffd5c063118309b31 Author: Roel Kluin Date: Tue Dec 8 14:08:59 2009 -0800 [SCSI] u14-34f: fix buffer overflow This allows i == MAX_INT_PARAM, which is out of range for ints[] Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 8fe79162a6807bf120140d64e96da54fc273b88b Author: Roel Kluin Date: Tue Dec 8 14:08:57 2009 -0800 [SCSI] eata: fix buffer overflow Allows i == MAX_INT_PARAM, which is out of range. Signed-off-by: Roel Kluin Signed-off-by: Andrew Morton Signed-off-by: James Bottomley commit 9b7dac086bec7c71722d6e79464609e17f0996e7 Author: Bart Van Assche Date: Fri Dec 4 20:43:37 2009 +0100 [SCSI] ibmvscsi: fix a typo in a source code comment Signed-off-by: Bart Van Assche Acked-by: Brian King Signed-off-by: James Bottomley commit 40c4f3e4eaa7eda2b0a00abd4d69778808d26f77 Author: Bart Van Assche Date: Fri Dec 4 20:38:49 2009 +0100 [SCSI] libsrp: fix typo -- replace RDAM by RDMA Fixed a typo in libsrp.c: replaced two occurrences of 'RDAM' by 'RDMA'. Signed-off-by: Bart Van Assche Acked-by: FUJITA Tomonori Signed-off-by: James Bottomley commit e3deec090558d5cb5ffdc574e5560f3ed9723394 Author: James Bottomley Date: Tue Nov 3 12:33:07 2009 -0600 [SCSI] eliminate potential kmalloc failure in scsi_get_vpd_page() The best way to fix this is to eliminate the intenal kmalloc() and make the caller allocate the required amount of storage. Signed-off-by: James Bottomley commit af1415314a4190b8ea06e53808d392fcf91555af Author: Paul Mundt Date: Mon Jan 18 21:45:00 2010 +0900 sh: Flag __ioremap_caller() __init_refok. The mem_init_done test makes sure that this path is only entered in __init cases, so leaving ioremap_fixed() as __init and flagging the caller __init_refok is sufficient. Signed-off-by: Paul Mundt commit 12b6b01cb47dc3eefbef866592193661dad7afb9 Author: Paul Mundt Date: Mon Jan 18 21:33:08 2010 +0900 sh: Handle unmapping of fixed slots transparently in iounmap(). iounmap() should balance whatever is done by ioremap(). Presently ioremap() can do any of fixed mappings, PMB mappings, or page table mappings. Presently only the latter two are handled through the standard unmap path, so tie in the fixed unmapping, too. Signed-off-by: Paul Mundt commit 4f744affc345f8b158615e0cdd01d1f4985837c3 Author: Paul Mundt Date: Mon Jan 18 21:30:29 2010 +0900 sh: Make iounmap_fixed() return success/failure for iounmap() path. This converts iounmap_fixed() to return success/error if it handled the unmap request or not. At the same time, drop the __init label, as this can be called in to later. Signed-off-by: Paul Mundt commit 0b59e38ffaf7b201ff6afe5b736365d16848c7e3 Author: Paul Mundt Date: Mon Jan 18 21:21:32 2010 +0900 sh: Merge _32/_64 ioremap implementations. There is nothing of interest in the _64 version anymore, so the _32 one can be renamed and used unconditionally. Signed-off-by: Paul Mundt commit edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5 Author: Paul Mundt Date: Mon Jan 18 21:20:13 2010 +0900 sh: Fixup the IOREMAP_FIXED=n build. Presently the fixed ioremap API is only defined when CONFIG_IOREMAP_FIXED is set. As we want to call in to it unconditionally, provide a stubbed out interface. Signed-off-by: Paul Mundt commit d9b9487af79955a8e8fcddc963f56697e020cfed Author: Paul Mundt Date: Mon Jan 18 21:08:32 2010 +0900 sh: Handle early ioremaps through fixed mappings. This adds in a mem_init_done to work out when a standard ioremap() is possible, falling back to the fixmap based ioremap otherwise. Signed-off-by: Paul Mundt commit 0c54de146ef4303ed3c5879b043894c8db637507 Merge: 8faba61 7dc9c48 Author: Paul Mundt Date: Mon Jan 18 20:47:37 2010 +0900 Merge branch 'sh/stable-updates' commit 8faba6121566248330e738d25a2c43d7500fb9f0 Merge: 4291b73 78bf04f Author: Paul Mundt Date: Mon Jan 18 20:42:39 2010 +0900 Merge branch 'sh/ioremap-fixed' commit 4291b730cd0f0cf98a90d946b6cabbd804397350 Author: Paul Mundt Date: Mon Jan 18 20:39:49 2010 +0900 sh: Need IRQs enabled for init_fpu(). This tosses in a local_irq_enable()/disable() pair around the init_fpu() callsite in the FPU state restore exception handler. Fixes up a slab BUG triggered by making a slab cache allocation that can sleep whilst irqs_disabled(). This follows the behaviour undertaken by the x86 implementation. Signed-off-by: Paul Mundt commit 3d467676abf5f01f5ee99056273a58486968e252 Author: Matt Fleming Date: Mon Jan 18 19:33:10 2010 +0900 sh: Setup early PMB mappings. More and more boards are going to start shipping that boot with the MMU in 32BIT mode by default. Previously we relied on the bootloader to setup PMB mappings for use by the kernel but we also need to cater for boards whose bootloaders don't set them up. If CONFIG_PMB_LEGACY is not enabled we have full control over our PMB mappings and can compress our address space. Usually, the distance between the the cached and uncached mappings of RAM is always 512MB, however we can compress the distance to be the amount of RAM on the board. pmb_init() now becomes much simpler. It no longer has to calculate any mappings, it just has to synchronise the software PMB table with the hardware. Tested on SDK7786 and SH7785LCR. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 8b0e58a70a7a41443c779de074288035b014cb94 Author: Stephane Chatty Date: Wed Jan 13 21:52:34 2010 +0100 HID: let hid-input accept digitizers Extended IS_INPUT_APPLICATION to accept digitzers that are actual input devices (touchscreens, light pens, touch pads, white boards) Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit 7d6f75eb21b84cdc5dfb09789974f02b42a89058 Author: Max Vozeler Date: Sun Jan 17 21:55:31 2010 +1100 crypto: md5 - Add export support This patch adds export/import support to md5. The exported type is defined by struct md5_state. This is modeled after the equivalent change to sha1_generic. Signed-off-by: Max Vozeler Signed-off-by: Herbert Xu commit 6c3f975a4cafaf4dcc9795385da6d42caa37ddeb Author: Márton Németh Date: Sun Jan 17 21:54:01 2010 +1100 crypto: Make Open Firmware device id constant From: Márton Németh The match_table field of the struct of_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Herbert Xu commit 73c89c15b959adf06366722c4be8d2eddec0a529 Author: Tobias Brunner Date: Sun Jan 17 21:52:11 2010 +1100 crypto: gcm - Add RFC4543 wrapper for GCM This patch adds the RFC4543 (GMAC) wrapper for GCM similar to the existing RFC4106 wrapper. The main differences between GCM and GMAC are the contents of the AAD and that the plaintext is empty for the latter. Signed-off-by: Tobias Brunner Signed-off-by: Herbert Xu commit 78bf04fc96f509474c6b443b515d6b79bb7bf584 Author: Paul Mundt Date: Sun Jan 17 01:45:26 2010 +0900 sh: Tidy up non-translatable checks in iounmap path. This tidies up the iounmap path with consolidated checks for nontranslatable mappings. This is in preparation of unifying the implementations. Signed-off-by: Paul Mundt commit 597fe76ec36e782aa45b8dac5e12e4dbb0588967 Author: Matt Fleming Date: Thu Nov 5 20:49:05 2009 +0000 sh: Use ioremap_fixed() to implement SH-5 ioremap() Use the fixmap-based memory mapping implementation for SH-5's ioremap() functions and delete the old static allocator that was borrowed from sparc. Signed-off-by: Matt Fleming commit 6f82b6ebb1dcc0c3c23820a70a5d79a60c4f5e84 Author: Matt Fleming Date: Thu Nov 5 08:01:10 2009 +0000 sh: Use ioremap_fixmed to map the SM501 DRAM config register We need to write to the DRAM config register very early and at such an early stage ioremap() is not available. So use ioremap_fixed() to map the register. The reason that we are avoiding using the legacy P2 mapping is that there will come a day when the legacy P2 mappings no longer exist. Signed-off-by: Matt Fleming commit 4d35b93a66e9b87df20784fcf130d2e8760be53f Author: Matt Fleming Date: Thu Nov 5 07:54:17 2009 +0000 sh: Add fixed ioremap support Some devices need to be ioremap'd and accessed very early in the boot process. It is not possible to use the standard ioremap() function in this case because that requires kmalloc()'ing some virtual address space and kmalloc() may not be available so early in boot. This patch provides fixmap mappings that allow physical address ranges to be remapped into the kernel address space during the early boot stages. Signed-off-by: Matt Fleming commit 07cad4dc1bfdaefd20c6329e9d8179ad1c600e92 Author: Matt Fleming Date: Tue Nov 17 22:03:41 2009 +0000 sh: Generalise the pte handling code for the fixmap path Generalise the code for setting and clearing pte's and allow TLB entries to be pinned and unpinned if the _PAGE_WIRED flag is present. Signed-off-by: Matt Fleming commit 24ef7fc4dcc57afa0c33166c25bfe7676ffd4296 Author: Matt Fleming Date: Thu Nov 19 21:11:05 2009 +0000 sh: Acquire some more page flags for SH-5. We need some more page flags to hook up _PAGE_WIRED (and eventually other things). So use the unused PTE bits above the PPN field as no implementations use these for anything currently. Now that we have _PAGE_WIRED let's provide the SH-5 functions for wiring up TLB entries. Signed-off-by: Matt Fleming commit 8eda55142080f0373b1f0268fe6d6807f193e713 Author: Matt Fleming Date: Tue Nov 17 21:05:31 2009 +0000 sh: New extended page flag to wire/unwire TLB entries Provide a new extended page flag, _PAGE_WIRED and an SH4 implementation for wiring TLB entries and use it in the fixmap code path so that we can wire the fixmap TLB entry. Signed-off-by: Matt Fleming commit 4e23471a3f3aba885ea70100db47ccacb5f069f6 Author: Christoph Hellwig Date: Wed Jan 13 22:17:56 2010 +0000 xfs: move more buffer helpers into xfs_buf.c Move xfsbdstrat and xfs_bdstrat_cb from xfs_lrw.c and xfs_bioerror and xfs_bioerror_relse from xfs_rw.c into xfs_buf.c. This also means xfs_bioerror and xfs_bioerror_relse can be marked static now. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 64e0bc7d2a6609ad265757a600e2a0d93c8adb47 Author: Christoph Hellwig Date: Wed Jan 13 22:17:58 2010 +0000 xfs: clean up xfs_bwrite Fold XFS_bwrite into it's only caller, xfs_bwrite and move it into xfs_buf.c instead of leaving it as a fairly large inline function. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 873ff5501d8cd1a21045d6c1da34f0c3876bc235 Author: Christoph Hellwig Date: Wed Jan 13 22:17:57 2010 +0000 xfs: clean up log buffer writes Don't bother using XFS_bwrite as it doesn't provide much code for our use case. Instead opencode it and fold xlog_bdstrat_cb into the new xlog_bdstrat helper. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit e57336ff7fc7520bec7b3a7741043bdebaf622ea Author: Dave Chinner Date: Mon Jan 11 11:47:49 2010 +0000 xfs: embed the pagb_list array in the perag structure Now that the perag structure is allocated memory rather than held in an array, we don't need to have the busy extent array external to the structure. Embed it into the perag structure to avoid needing an extra allocation when setting up. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8b26c5825e023b1bccac7afd174ebe55b8905cb1 Author: Dave Chinner Date: Mon Jan 11 11:47:48 2010 +0000 xfs: handle ENOMEM correctly during initialisation of perag structures Add proper error handling in case an error occurs while initializing new perag structures for a mount point. The mount structure is restored to its previous state by deleting and freeing any perag structures added during the call. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit b657fc82a3ca6d7ad16a59e81765f0fb0e86cdbb Author: Dave Chinner Date: Mon Jan 11 11:47:47 2010 +0000 xfs: Kill filestreams cache flush The filestreams cache flush is not needed in the sync code as it does not affect data writeback, and it is now not used by the growfs code, either, so kill it. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 0fa800fbd549736dfdc1d7761f87e33dc8cd973b Author: Dave Chinner Date: Mon Jan 11 11:47:46 2010 +0000 xfs: Add trace points for per-ag refcount debugging. Uninline xfs_perag_{get,put} so that tracepoints can be inserted into them to speed debugging of reference count problems. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit aed3bb90abaf0b42e8c8747e192f7bb97f445279 Author: Dave Chinner Date: Mon Jan 11 11:47:45 2010 +0000 xfs: Reference count per-ag structures Reference count the per-ag structures to ensure that we keep get/put pairs balanced. Assert that the reference counts are zero at unmount time to catch leaks. In future, reference counts will enable us to safely remove perag structures by allowing us to detect when they are no longer in use. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 1c1c6ebcf5284aee4910f3b906ac90c20e510c82 Author: Dave Chinner Date: Mon Jan 11 11:47:44 2010 +0000 xfs: Replace per-ag array with a radix tree The use of an array for the per-ag structures requires reallocation of the array when growing the filesystem. This requires locking access to the array to avoid use after free situations, and the locking is difficult to get right. To avoid needing to reallocate an array, change the per-ag structures to an allocated object per ag and index them using a tree structure. The AGs are always densely indexed (hence the use of an array), but the number supported is 2^32 and lookups tend to be random and hence indexing needs to scale. A simple choice is a radix tree - it works well with this sort of index. This change also removes another large contiguous allocation from the mount/growfs path in XFS. The growing process now needs to change to only initialise the new AGs required for the extra space, and as such only needs to exclusively lock the tree for inserts. The rest of the code only needs to lock the tree while doing lookups, and hence this will remove all the deadlocks that currently occur on the m_perag_lock as it is now an innermost lock. The lock is also changed to a spinlock from a read/write lock as the hold time is now extremely short. To complete the picture, the per-ag structures will need to be reference counted to ensure that we don't free/modify them while they are still in use. This will be done in subsequent patch. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 44b56e0a1aed522a10051645e85d300e10926fd3 Author: Dave Chinner Date: Mon Jan 11 11:47:43 2010 +0000 xfs: convert remaining direct references to m_perag Convert the remaining direct lookups of the per ag structures to use get/put accesses. Ensure that the loops across AGs and prior users of the interface balance gets and puts correctly. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 4196ac08c023c6dab90c3fa460d9c06deaa304c4 Author: Dave Chinner Date: Mon Jan 11 11:47:42 2010 +0000 xfs: Convert filestreams code to use per-ag get/put routines Use xfs_perag_get() and xfs_perag_put() in the filestreams code. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit a862e0fdcb8862aab2538ec2fc2f0dc07a625c59 Author: Dave Chinner Date: Mon Jan 11 11:47:41 2010 +0000 xfs: Don't directly reference m_perag in allocation code Start abstracting the perag references so that the indexing of the structures is not directly coded into all the places that uses the perag structures. This will allow us to separate the use of the perag structure and the way it is indexed and hence avoid the known deadlocks related to growing a busy filesystem. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 5017e97d52628fb8ae56e434e86ac2e72ddaac2b Author: Dave Chinner Date: Mon Jan 11 11:47:40 2010 +0000 xfs: rename xfs_get_perag xfs_get_perag is really getting the perag that an inode belongs to based on it's inode number. Convert the use of this function to just get the perag from a provided ag number. Use this new function to obtain the per-ag structure when traversing the per AG inode trees for sync and reclaim. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit c9c129714e71c890bed1bd5b61697a896c3c2d54 Author: Dave Chinner Date: Mon Jan 11 11:49:59 2010 +0000 xfs: Don't wake xfsbufd when idle The xfsbufd wakes every xfsbufd_centisecs (once per second by default) for each filesystem even when the filesystem is idle. If the xfsbufd has nothing to do, put it into a long term sleep and only wake it up when there is work pending (i.e. dirty buffers to flush soon). This will make laptop power misers happy. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 453eac8a9aa417878a38bdfbccafd5f7ce4e8e4e Author: Dave Chinner Date: Mon Jan 11 11:49:58 2010 +0000 xfs: Don't wake the aild once per second Now that the AIL push algorithm is traversal safe, we don't need a watchdog function in the xfsaild to catch pushes that fail to make progress. Remove the watchdog timeout and make pushes purely driven by demand. This will remove the once-per-second wakeup that is seen when the filesystem is idle and make laptop power misers happy. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit f0a7695380efa31cd281730917f7e907a724d5cb Author: Dave Chinner Date: Mon Jan 11 11:49:57 2010 +0000 xfs: Use list_heads for log recovery item lists Remove the roll-your-own linked list operations. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 5d77c0dc0c05c2c65aee16149fae06831a118730 Author: Eric Sandeen Date: Thu Nov 19 15:52:00 2009 +0000 xfs: make several more functions static Just minor housekeeping, a lot more functions can be trivially made static; others could if we reordered things a bit... Signed-off-by: Eric Sandeen Signed-off-by: Alex Elder commit 6bded0f383fd7971b76ad6c194dda7d5b814b871 Author: Dave Chinner Date: Thu Jan 14 01:33:56 2010 +0000 xfs: clean up inconsistent variable naming in xfs_swap_extent The swap extent ioctl passes in a target inode and a temporary inode which are clearly named in the ioctl structure. The code then assigns temp to target and vice versa, making it extremely difficult to work out which inode is which later in the code. Make this consistent throughout the code. Also make xfs_swap_extent static as there are no external users of the function. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 3a85cd96d3ab3c6dcf88b81fc6eaddb84e565a43 Author: Dave Chinner Date: Thu Jan 14 01:33:55 2010 +0000 xfs: add tracing to xfs_swap_extents To be able to diagnose whether the swap extents function is detecting compatible inode data fork configurations for swapping extents, add tracing points to the code to allow us to see the format of the inode forks before and after the swap. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 62e62da856dba2edb897b672cbd05a69edd4485c Author: H Hartley Sweeten Date: Thu Jan 14 19:10:07 2010 -0700 HID: hid-debug.c: make local symbols static hid-debug.c: make local symbols static The symbols hid_resolv_event and hid_dump_input_mapping are only used locally in this file. Make them static to prevent the following sparse warnings: warning: symbol 'hid_resolv_event' was not declared. Should it be static? warning: symbol 'hid_dump_input_mapping' was not declared. Should it be static? Signed-off-by: H Hartley Sweeten Signed-off-by: Jiri Kosina commit 7dcaa8e8e67b2cfbe0097c9bb52e23aed5443b8b Author: Paul Mundt Date: Fri Jan 15 19:13:56 2010 +0900 sh: Generalize SH7786 PCIe support. Previously this was only built in for Urquell boards, but the same approach can be used on SDK7786 now that the mode pin reading is supported, so make it generic to SH7786. Signed-off-by: Paul Mundt commit 6f832e8aab8c4c6d28629e970e4a85e74a8d0be6 Author: Paul Mundt Date: Fri Jan 15 16:31:04 2010 +0900 sh: mach-sdk7786: mode pins support. This wires up the mode pins support on the SDK7786. The pins are standard SH7786 pins, and all are fixed in software. Needed for the clock framework, PCIe, and so forth. Signed-off-by: Paul Mundt commit f0cb77372c3cf8c0cb17bbfb30a62506ea119286 Author: Paul Mundt Date: Fri Jan 15 15:13:48 2010 +0900 sh: Fix up the secondary CPU entry point for 32bit mode. Presently the secondary CPU entry point is only aimed at 29bit phys mode, causing it to point to a stray virtual address in 32bit mode. Fix it up after consulting with our shiny new __in_29bit_mode(). Signed-off-by: Paul Mundt commit a6198a238baceae9d4e0ce3915f6d239c89b5c08 Author: Paul Mundt Date: Fri Jan 15 14:21:37 2010 +0900 sh: Guard against early IPIs in flush_cache_all(). flush_cache_all() gets called in to when we do some early ioremapping. Unfortunately on SDK7786 the interrupt controller itself requires ioremapping, leading to a bit of a chicken and egg scenario. For now, don't bother with IPI crosscalls if there aren't any other CPUs online. Signed-off-by: Paul Mundt commit a09d2831b3457a92a58d67bddfed370516acfe28 Author: Paul Mundt Date: Fri Jan 15 12:24:34 2010 +0900 sh: heartbeat: Update boards for access size hinting. This updates the existing boards that specify the register width through platform data to use the resource flags instead. This eliminates platform data completely in most cases, and permits further improvement in the heartbeat driver as well as shrinking the overall private data size. Signed-off-by: Paul Mundt commit 2267c7875b3a3a41b7a8cc9659d75ec934c98ffd Author: Paul Mundt Date: Fri Jan 15 12:11:30 2010 +0900 sh: mach-sdk7786: heartbeat support. Hand off the user LEDs to the heartbeat driver. Signed-off-by: Paul Mundt commit 10ab92d8c336c25af1fce46113ed85856e02e95d Author: Paul Mundt Date: Fri Jan 15 12:08:31 2010 +0900 sh: heartbeat: Support access size specification via resource flags. This permits the resource access size to be handed off through the resource flags, which saves platforms from having to establish platform data only to specify the register width. Signed-off-by: Paul Mundt commit 46c4e5daea3d5df06e27bf5a49a0c42274db6725 Author: Matt Fleming Date: Fri Jan 15 08:00:45 2010 +0900 sh: Fix CONFIG_PMB=n build. The last commit introduced the following breakage arch/sh/include/asm/mmu.h: In function 'pmb_remap': arch/sh/include/asm/mmu.h:79: error: expected ';' before '}' token and... arch/sh/include/asm/mmu.h:78: error: 'EINVAL' undeclared (first use in this function) arch/sh/include/asm/mmu.h:78: error: (Each undeclared identifier is reported only once arch/sh/include/asm/mmu.h:78: error: for each function it appears in.) arch/sh/include/asm/mmu.h: In function 'pmb_init': arch/sh/include/asm/mmu.h:87: error: 'ENODEV' undeclared (first use in this function) Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 02bf6cc72cc2a6258411ddf1649f33a65fc9a06e Author: Paul Mundt Date: Thu Jan 14 20:58:58 2010 +0900 sh: Preliminary SDK7786 board support. This stubs in some preliminary board support for the RTE SDK7786. This is quite stunted at the moment, and primarily builds on top of the system FPGA. FPGA IRQs are handled via CPU IRL masking for simplicity, with initial peripheral support restricted to the debug ethernet. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 4bb9508bbbb06f10bc3e249dd34375b4a4d6bfc0 Author: Jiri Kosina Date: Wed Dec 23 14:13:46 2009 +0100 HID: remove TENX iBuddy from blacklist There were multiple reports which indicate that vendor messed up horribly and the same VID/PID combination is used for completely different devices, some of them requiring the blacklist entry and other not. Remove the blacklist entry for this combination of VID/PID completely, and let the user decide and unbind the driver via sysfs eventually, if needed. Proper fix would be fixing the vendor. References: http://lkml.org/lkml/2009/2/10/434 http://bugzilla.kernel.org/show_bug.cgi?id=13411 Signed-off-by: Jiri Kosina commit e44d6c4010a4c84369013932eea4721d16cbc08d Author: Paul Mundt Date: Wed Jan 13 19:18:39 2010 +0900 sh: Rename split-level pgtable headers. These were originally named _nopmd and _pmd to follow their asm-generic counterparts, but we rename them to -2level and -3level for general consistency. Signed-off-by: Paul Mundt commit 782bb5a532f883540bf403afb19f735a4eefd95b Author: Paul Mundt Date: Wed Jan 13 19:11:14 2010 +0900 sh: default to extended TLB support. All SH-X2 and SH-X3 parts support an extended TLB mode, which has been left as experimental since support was originally merged. Now that it's had some time to stabilize and get some exposure to various platforms, we can drop it as an option and default enable it across the board. This is also good future proofing for newer parts that will drop support for the legacy TLB mode completely. This will also force 3-level page tables for all newer parts, which is necessary both for the varying page sizes and larger memories. Signed-off-by: Paul Mundt commit 206582c3161f165f5bf49ececa962c5f95fdf0a3 Author: Paul Mundt Date: Wed Jan 13 18:45:12 2010 +0900 sh: Make all PxSEGADDR() calls fatal for non-legacy configs. This stubs out all of the PxSEGADDR() wrappers for non-legacy code. 29-bit will continue to work with these, while 32-bit code will now blow up on compile rather than at runtime. The vast majority of the in-tree offenders are gone, with the only remaining culprits being unable to support 32-bit mode. Hopefully this will prevent anyone from ever using these again. Signed-off-by: Paul Mundt commit 88f73d22853cb080432e91d68759323477a8b835 Author: Paul Mundt Date: Wed Jan 13 18:37:19 2010 +0900 sh: Fix up L2 cache comment typo. Valid sizes include 256kB, not 258kB. Signed-off-by: Paul Mundt commit a0ab36689a36e583b6e736f1c99ac8c9aebdad59 Author: Paul Mundt Date: Wed Jan 13 18:31:48 2010 +0900 sh: fixed PMB mode refactoring. This introduces some much overdue chainsawing of the fixed PMB support. fixed PMB was introduced initially to work around the fact that dynamic PMB mode was relatively broken, though they were never intended to converge. The main areas where there are differences are whether the system is booted in 29-bit mode or 32-bit mode, and whether legacy mappings are to be preserved. Any system booting in true 32-bit mode will not care about legacy mappings, so these are roughly decoupled. Regardless of the entry point, PMB and 32BIT are directly related as far as the kernel is concerned, so we also switch back to having one select the other. With legacy mappings iterated through and applied in the initialization path it's now possible to finally merge the two implementations and permit dynamic remapping overtop of remaining entries regardless of whether boot mappings are crafted by hand or inherited from the boot loader. Signed-off-by: Paul Mundt commit 7f33306ee57bce9c79825e89c457a91025aa5aad Author: Matt Fleming Date: Wed Jan 13 16:35:58 2010 +0900 sh: PVR detection for 2nd cut SH7786. The mass produced cuts use an updated PVR value, add them to the list. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit eca50f14b88315bd31183a17c89e53534f2ed2fa Author: Paul Mundt Date: Wed Jan 13 16:28:47 2010 +0900 sh: Add a vmlinux.bin target. This makes vmlinux.bin generation an explicit make target, as opposed to just a dependency for some of the other targets. Signed-off-by: Paul Mundt commit c7b16efb7d0c7fce218b2cdafa2432c5fbf57314 Author: Paul Mundt Date: Wed Jan 13 13:29:19 2010 +0900 sh: Add support for LZO-compressed kernels. Plugs in LZO along with the others. Signed-off-by: Paul Mundt commit 644755e7867710a23e6243dcc69cfc071985f560 Merge: 6430a59 0ea820c fa94dde 066000d Author: Paul Mundt Date: Wed Jan 13 13:02:55 2010 +0900 Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates' commit 6430a5987f8bb9a7c5187b343956aa8ef404d571 Author: Matt Fleming Date: Wed Jan 13 12:59:24 2010 +0900 sh: Don't perform an icbi on a P2 address The legacy P2 area may not always be mapped (for example when using PMB). So perform an icbi on an address that we know will always be mapped. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 0ea820cf9bf58f735ed40ec67947159c4f170012 Author: Paul Mundt Date: Wed Jan 13 12:51:40 2010 +0900 sh: Move over to dynamically allocated FPU context. This follows the x86 xstate changes and implements a task_xstate slab cache that is dynamically sized to match one of hard FP/soft FP/FPU-less. This also tidies up and consolidates some of the SH-2A/SH-4 FPU fragmentation. Now fpu state restorers are commonly defined, with the init_fpu()/fpu_init() mess reworked to follow the x86 convention. The fpu_init() register initialization has been replaced by xstate setup followed by writing out to hardware via the standard restore path. As init_fpu() now performs a slab allocation a secondary lighterweight restorer is also introduced for the context switch. In the future the DSP state will be rolled in here, too. More work remains for math emulation and the SH-5 FPU, which presently uses its own special (UP-only) interfaces. Signed-off-by: Paul Mundt commit 49e4739a0cf681cbfe08c72232c1dcc130b66dde Author: Stephane Chatty Date: Wed Jan 13 00:29:16 2010 +0100 HID: add support for Acer T230H multitouch Add support for the Quanta Optical Touch dual-touch panel, present in the Acer T230H monitor, HP L2105tm, and Packard-Bell Video 200t. Signed-off-by: Stephane Chatty Tested-by: Jerome Vidal Tested-by: Cedric Berthier Acked-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 74f292ca8c7a2b9370f80d97a49e48174f4c7635 Author: Gary Stein Date: Wed Jan 13 00:25:58 2010 +0100 HID: add driver for the Logitech Flight System G940 Implements a new USB-HID for Force Feedback based on the normal Logitech Force Feedback code and FF-Memless. Currently only supports the FF_CONSTANT effect although the joystick appears to support additional non-standard ones. Signed-off-by: Gary Stein Signed-off-by: Jiri Kosina commit d67dec5b2cc208215de21dc7806945bf6a6e85d0 Author: Márton Németh Date: Sun Jan 10 17:59:22 2010 +0100 HID: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Jiri Kosina commit a3705799e2cc5fb69d88ad6a7f317a8f5597f18d Author: Paul Mundt Date: Tue Jan 12 19:10:06 2010 +0900 sh: Use SLAB_PANIC for thread_info slab cache. Presently this has a BUG_ON() for failure cases, as powerpc does. Switch this over to a SLAB_PANIC instead. Signed-off-by: Paul Mundt commit cbf6b1ba7ae12b3f7cb6b0d060b88d44649f9eda Author: Paul Mundt Date: Tue Jan 12 19:01:11 2010 +0900 sh: Always provide thread_info allocators. Presently the thread_info allocators are special cased, depending on THREAD_SHIFT < PAGE_SHIFT. This provides a sensible definition for them regardless of configuration, in preparation for extended CPU state. Signed-off-by: Paul Mundt commit 70e068eef97d05c97c3512f82352f39fdadfa8cb Author: Paul Mundt Date: Tue Jan 12 18:52:00 2010 +0900 sh: Move start_thread() out of line. start_thread() will become a bit heavier with the xstate freeing to be added in, so move it out-of-line in preparation. Signed-off-by: Paul Mundt commit 94cd049522136c2f3bbe063d2e98b2b8d4286fd3 Author: Paul Mundt Date: Tue Jan 12 18:42:52 2010 +0900 sh: sh_bios detection. This adds some VBR sanity checks in the sh_bios code to ensure that the BIOS VBR is in range before blindly trapping in to it. This permits boards with varying boot loader configurations to always leave support for sh-bios enabled and it will just be disabled at run-time if not found. Signed-off-by: Paul Mundt commit a99eae5417a09e0be66bf574a9a79a2a7388c967 Author: Paul Mundt Date: Tue Jan 12 16:12:25 2010 +0900 sh: Split out the unaligned counters and user bits. This splits out the unaligned access counters and userspace bits in to their own generic interface, which will allow them to be wired up on sh64 too. Signed-off-by: Paul Mundt commit 776258df925acd0563f471ee4b3f19bbffb3c04f Author: Paul Mundt Date: Tue Jan 12 15:31:20 2010 +0900 sh: Consolidate the sh_bios earlyprintk code. Now that the sh-sci earlyprintk is taken care of by the sh-sci driver directly, there's no longer any reason for having a split-out early_printk framework. sh_bios is the only other thing that uses it, so we just migrate the leftovers in to there. As it's possible to have multiple early_param()'s for the same string, there's not much point in having this split out anymore anyways, particularly since the sh_bios dependencies are still special-cased within sh-sci itself. Signed-off-by: Paul Mundt commit b9303a79567d4a45b015dff7e71dd24923332d8d Author: Paul Mundt Date: Tue Jan 12 15:26:11 2010 +0900 sh: Kill off more unused sh_bios callbacks. sh_bios_char_out() is not used by anything in-tree these days, so just get rid of it. Signed-off-by: Paul Mundt commit 65fedbbef8404be5e1dbd18bdad252616b49a24b Author: Paul Mundt Date: Tue Jan 12 15:22:26 2010 +0900 sh64: Fix up early serial fixmap. This was conditionalized on CONFIG_EARLY_PRINTK, which has subsequently gone away. Now that the serial driver always supports the early console, make sure we always establish the mapping. Signed-off-by: Paul Mundt commit 191d0d24b632eb69767705acded5cbf7449ad457 Author: Paul Mundt Date: Tue Jan 12 14:50:43 2010 +0900 sh: Tidy up the sh bios VBR handling. This moves the VBR handling out of the main trap handling code and in to the sh-bios helper code. A couple of accessors are added in order to permit other kernel code to get at the VBR value for state save/restore paths. Signed-off-by: Paul Mundt commit ee2760ea58d81fc00bcc2137232ed9bc28202aec Author: Paul Mundt Date: Tue Jan 12 13:48:27 2010 +0900 sh: default to sparseirq. As SH has a very sparse IRQ map by default, all new CPUs and boards benefit from using sparseirq by default. Despite this, there are still a few stragglers (mostly due to using a fixed IRQ range for their FPGA IRQ mappings), and these still need to be converted over one by one. As these are now in the minority, and we do not want to encourage this sort of brain-damage in newer board ports, we force sparseirq on. Signed-off-by: Paul Mundt commit 53e6d8e0060fe2bb9b11238f8250fdfbb0589425 Author: Paul Mundt Date: Tue Jan 12 13:37:04 2010 +0900 sh: mach-se: Convert SE7343 FPGA to dynamic IRQ allocation. This gets rid of the arbitrary set of vectors used by the SE7722 FPGA interrupt controller and switches over to a completely dynamic set. No assumptions regarding a contiguous range are made, and the platform resources themselves need to be filled in lazily. Signed-off-by: Paul Mundt commit 8c0b8139c87cfe8b95c6e763b4ca3190aa9b1ad0 Author: Paul Mundt Date: Fri Jan 8 17:02:17 2010 +0900 sh: consolidate atomic_cmpxchg()/atomic_add_unless() definitions. The LL/SC and IRQ versions were using generic stubs while the GRB version was just reimplementing what it already had for the standard cmpxchg() code. As we have optimized cmpxchg() implementations that are decoupled from the atomic code, simply falling back on the generic wrapper does the right thing. With this in place the GRB case is unaffected while the LL/SC case gets to use its optimized cmpxchg(). Signed-off-by: Paul Mundt commit faad98f29606d9d3c6bddae7c88693be37d2fb43 Author: Roel Kluin Date: Fri Jan 8 14:19:21 2010 +1100 crypto: geode-aes - access .cip instead of .blk in cipher mode The fallback code in cipher mode touch the union fallback.blk instead of fallback.cip. This is wrong because we use the cipher and not the blockcipher. This did not show any side effects yet because both types / structs contain the same element right now. Signed-off-by: Roel Kluin Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Herbert Xu commit d7ac769068df87ca8c7f72d99cf67ead16739f18 Author: Roel Kluin Date: Fri Jan 8 14:18:34 2010 +1100 crypto: aes_s390 - access .cip instead of .blk in cipher mode The fallback code in cipher mode touch the union fallback.blk instead of fallback.cip. This is wrong because we use the cipher and not the blockcipher. This did not show any side effects yet because both types / structs contain the same element right now. Signed-off-by: Roel Kluin Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Herbert Xu commit 5068c7a883d1694f0fb3631b664827644153cd08 Author: Steffen Klassert Date: Thu Jan 7 15:57:19 2010 +1100 crypto: pcrypt - Add pcrypt crypto parallelization wrapper This patch adds a parallel crypto template that takes a crypto algorithm and converts it to process the crypto transforms in parallel. For the moment only aead algorithms are supported. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 13d7e9385644d376a0816ad663ba3dfc45359f2f Author: Steven Rostedt Date: Wed Jan 6 17:56:12 2010 -0500 kconfig: Check for if conditions in Kconfig for localmodconfig The streamline_config.pl misses the if conditions for checking dependencies. For Kconfigs with the following construct: if MEDIA_SUPPORT config VIDEO_DEV [...] If VIDEO_DEV was enabled, the script will miss the fact that MEDIA_SUPPORT is also needed. This patch changes streamline_config.pl to include if conditions into the dependencies of configs. Reported-by: Anton Blanchard Tested-by: Anton Blanchard Signed-off-by: Steven Rostedt commit 17263baf958b7ab1d8c60445f412a1080362c88c Author: Steven Rostedt Date: Wed Jan 6 16:43:08 2010 -0500 kconfig: Create include/generated for localmodconfig If someone downloads a brand new kernel and runs localmodconfig or localyesconfig, the ending result will report: *** Error during update of the kernel configuration. This is because localmodconfig and localyesconfig must create the include/generated directory to place the autoconf.h file. Signed-off-by: Steven Rostedt commit 54a6593d65e638ad7e1e8cc986159d76054dab4b Author: Stefan Glasenhardt Date: Tue Jan 5 23:30:30 2010 +0100 HID: allow disabling hard-coded ISO-layout for Apple keyboards This patch adds a new option named "iso_layout" to the driver "hid-apple.ko", to allow disabling of the hard-coded ISO-layout. Disabling the hard-coded layout solves the problem that the kernel-module only works perfectly for the english/american version of the Apple aluminum keyboard. Other versions have swapped keys, e.g. the "<"-key is swapped with "^"-key on the german keyboard. There is a very long bug-entry on Launchpad to this problem: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/214786 Signed-off-by: Stefan Glasenhardt Signed-off-by: Jiri Kosina commit 16295bec6398a3eedc9377e1af6ff4c71b98c300 Author: Steffen Klassert Date: Wed Jan 6 19:47:10 2010 +1100 padata: Generic parallelization/serialization interface This patch introduces an interface to process data objects in parallel. The parallelized objects return after serialization in the same order as they were before the parallelization. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit fa94ddea2b29fdda7640672c8a933dbd901f0278 Merge: 6fbfe8d 56d45b6 Author: Paul Mundt Date: Wed Jan 6 15:49:08 2010 +0900 Merge branch 'master' into sh/hw-breakpoints commit 6fbfe8d7cd7e71ceb281c5a1b9de6e5e0dfbf1c8 Author: Paul Mundt Date: Wed Jan 6 15:46:53 2010 +0900 sh: select HAVE_HW_BREAKPOINT for all SUPERH32 CPUs. All SH CPUs (with the exception of sh64) support the UBC, so select HW_BREAKPOINT support by default. This fixes up the build for non-SH4A targets. Signed-off-by: Paul Mundt commit 56d45b62ce622a003da972428fdbba2b42102efb Author: Paul Mundt Date: Wed Jan 6 14:45:14 2010 +0900 sh: Fix up nommu build for out-of-line pgtable changes. pgtable_cache_init() has been moved out-of-line, so we also need a dummy definition for it on nommu to fix up the build. Signed-off-by: Paul Mundt commit 722612cd51cf1b574c89dff57cc5dbedf1f645bb Author: Jiri Kosina Date: Tue Jan 5 11:45:52 2010 +0100 HID: fix parsing of local delimiter with size 0 Acording to HID standard 1.11, value 0 allows for size being 0. Local delimiter tag has has 0 one of the possible values. Therefore we need to handle this case properly, to be fully compliant with the specification. Reported-by: Marcin Tolysz Signed-off-by: Jiri Kosina commit 9fae4fb3ce38cc657ff0aba570ae875aae2806d4 Author: Paul Mundt Date: Tue Jan 5 19:30:18 2010 +0900 sh: Reclaim TIF_DEBUG. This was used by the old hw-breakpoints API, but now there is nothing is using it anymore, so just kill it off. Signed-off-by: Paul Mundt commit 7025bec9125b0a02edcaf22c2dce753bf2c95480 Author: Paul Mundt Date: Tue Jan 5 19:16:35 2010 +0900 sh: Kill off dead UBC headers. Nothing is using these now, so kill them all off. Signed-off-by: Paul Mundt commit 4352fc1b12fae4c753a063a2f162ddf9277af774 Author: Paul Mundt Date: Tue Jan 5 19:06:45 2010 +0900 sh: Abstracted SH-4A UBC support on hw-breakpoint core. This is the next big chunk of hw_breakpoint support. This decouples the SH-4A support from the core and moves it out in to its own stub, following many of the conventions established with the perf events layering. In addition to extending SH-4A support to encapsulate the remainder of the UBC channels, clock framework support for handling the UBC interface clock is added as well, allowing for dynamic clock gating. This also fixes up a regression introduced by the SIGTRAP handling that broke the ksym_tracer, to the extent that the current support works well with all of the ksym_tracer/ptrace/kgdb. The kprobes singlestep code will follow in turn. With this in place, the remaining UBC variants (SH-2A and SH-4) can now be trivially plugged in. Signed-off-by: Paul Mundt commit c4761815ab49feca904776dec464046bc7138d3a Author: Paul Mundt Date: Tue Jan 5 12:44:02 2010 +0900 sh: Fix up breakpoint trap handler patching on SH-2A. SH-2A was referencing the old handler that no longer exists, fix it up. Signed-off-by: Paul Mundt commit 0176bd3dab4fe522bfb6ceab9e3c441fe0305738 Author: Paul Mundt Date: Tue Jan 5 12:35:00 2010 +0900 sh: Drop down to a single quicklist. We previously had 2 quicklists, one for the PGD case and one for PTEs. Now that the PGD/PMD cases are handled through slab caches due to the multi-level configurability, only the PTE quicklist remains. As such, reduce NR_QUICK to its appropriate size and bump down the PTE quicklist index. Signed-off-by: Paul Mundt commit a7595fe7e8a93a73ce6199dace75a0caca7024c1 Merge: 921a220 2a5eacc Author: Paul Mundt Date: Tue Jan 5 12:27:46 2010 +0900 Merge branch 'sh/pgtable' of git://github.com/mfleming/linux-2.6 commit cf2f765f1896064e34c6f0f2ef896ff058dd5c06 Author: Jiri Kosina Date: Mon Jan 4 12:20:56 2010 +0100 HID: handle joysticks with large number of buttons Current HID code doesn't properly handle HID joysticks which have larger number of buttons than what fits into current range reserved for BTN_JOYSTICK. One such joystick reported to not work properly is Saitek X52 Pro Flight System. We can't extend the range to fit more buttons in, because of backwards compatibility reasons. Therefore this patch introduces a new BTN_TRIGGER_HAPPY range, and uses these to map the buttons which are over BTN_JOYSTICK limit. Acked-by: Dmitry Torokhov [for the input.h part] Signed-off-by: Jiri Kosina commit 92688c0c3c1c9e2daf705d307e8fda1b5a180d26 Author: Jiri Kosina Date: Mon Jan 4 12:04:59 2010 +0100 HID: make Stantum driver standalone config option Analogically to commit "HID: make 3M PCT touchscreen driver standalone config option", remove the dependency of Stantum driver on CONFIG_EMBEDDED, as it is a standalone driver rather than device quirk. Signed-off-by: Jiri Kosina commit d3fb5454a8474d5d22c8f8fe4d043b05732d91d5 Author: Stephane Chatty Date: Mon Jan 4 12:04:08 2010 +0100 HID: add support for Stantum multitouch panel Added support for the Stantum multitouch panel. Signed-off-by: Stephane Chatty Signed-off-by: Jiri Kosina commit 921a220857cdd3c553cde7c114f9f6757ac80cd5 Merge: 17eb9d6 2f48912 Author: Paul Mundt Date: Mon Jan 4 16:45:56 2010 +0900 Merge branch 'sh/stable-updates' commit 2a5eacca85d39d8b6dffae821d7d260f05584dc7 Author: Matt Fleming Date: Thu Dec 31 12:19:24 2009 +0000 sh: Move page table allocation out of line We also switched away from quicklists and instead moved to slab caches. After benchmarking both implementations the difference is negligible. The slab caches suit us better though because the size of a pgd table is just 4 entries when we're using a 3-level page table layout and quicklists always deal with pages. Signed-off-by: Matt Fleming commit b4c892762373c5e59c7e8db35f5f9a7658602bda Author: Matt Fleming Date: Thu Dec 24 22:17:35 2009 +0000 sh: Optimise flush_dcache_page() on SH4 If the page is not mapped into any process's address space then aliases cannot exist in the cache. So reduce the amount of flushing we perform. Signed-off-by: Matt Fleming commit 3f5ab768164df9a44721660b96e0accb92eb2c24 Author: Matt Fleming Date: Thu Dec 24 20:38:45 2009 +0000 sh: Correct the PTRS_PER_PMD and PMD_SHIFT values The previous expressions were wrong which made free_pmd_range() explode when using anything other than 4KB pages (which is why 8KB and 64KB pages were disabled with the 3-level page table layout). The problem was that pmd_offset() was returning an index of non-zero when it should have been returning 0. This non-zero offset was used to calculate the address of the pmd table to free in free_pmd_range(), which ended up trying to free an object that was not aligned on a page boundary. Now 3-level page tables should work with 4KB, 8KB and 64KB pages. Signed-off-by: Matt Fleming commit e591a517230a97e93f5edd19e7bef7ec8d22ac2b Author: Matt Fleming Date: Sun Dec 13 22:18:09 2009 +0000 sh: Remove unused functions Apply some TLC to the SH64 header files and remove some functions that are not used anymore. Signed-off-by: Matt Fleming commit 34d0b5af50a063cded842716633501b38ff815fb Author: Paul Mundt Date: Mon Dec 28 17:53:47 2009 +0900 sh: Convert ptrace to hw_breakpoint API. This is the initial step for converting singlestep handling via ptrace over to hw_breakpoints. Signed-off-by: Paul Mundt commit 17eb9d62828c3688f41f31ac00d7fee6da9675bf Merge: 76e7461 f34548c Author: Paul Mundt Date: Thu Dec 24 15:16:41 2009 +0900 Merge branches 'sh/g3-prep' and 'sh/stable-updates' commit 4b186f72033611c2b526c7341534e71ee4afd222 Author: Jiri Kosina Date: Wed Dec 23 13:12:32 2009 +0100 HID: make 3M PCT touchscreen driver standalone config option The point behind 'default !EMBEDDED' for certain HID drivers that simple and straightforward quirks for HID devices (which are implemented as drivers on HID bus) wouldn't have to be enabled separately, if the device is otherwise more-or-less HID standard compliant. But this driver is rather standalone driver, so we'd want to have it normally selectable. Signed-off-by: Jiri Kosina commit 863b557a88f8c033f7419fabafef4712a5055f85 Author: Youquan, Song Date: Wed Dec 23 19:45:20 2009 +0800 crypto: testmgr - Fix complain about lack test for internal used algorithm When load aesni-intel and ghash_clmulni-intel driver,kernel will complain no test for some internal used algorithm. The strange information as following: alg: No test for __aes-aesni (__driver-aes-aesni) alg: No test for __ecb-aes-aesni (__driver-ecb-aes-aesni) alg: No test for __cbc-aes-aesni (__driver-cbc-aes-aesni) alg: No test for __ecb-aes-aesni (cryptd(__driver-ecb-aes-aesni) alg: No test for __ghash (__ghash-pclmulqdqni) alg: No test for __ghash (cryptd(__ghash-pclmulqdqni)) This patch add NULL test entries for these algorithm and driver. Signed-off-by: Youquan, Song Signed-off-by: Ying, Huang Signed-off-by: Herbert Xu commit b6353f4f36f03a12edaf3fa5365b475a28106035 Author: Stephane Chatty Date: Tue Dec 22 23:04:17 2009 +0100 HID: Support for 3M multitouch panel Add support for 3M multitouch panels. Signed-off-by: Stephane Chatty [jkosina@suse.cz: fix build failure because of inconsistent 3M/MMM defines] Signed-off-by: Jiri Kosina commit 22648735405f73299b717bb5933767e9a9c335ca Author: Paul Mundt Date: Tue Dec 22 12:44:14 2009 +0900 sh: kgdb: Rework breakpoint handling on top of notifier chain. This kills off kgdb's breakpoint handler and ties in to the notifier chain instead. Signed-off-by: Paul Mundt commit b74ab703b1326aafadb5604ff6200da62c61df49 Author: Paul Mundt Date: Tue Dec 22 12:40:38 2009 +0900 sh: Don't NOTIFY_STOP for non-UBC breakpoint traps. Presently the hw_breakpoint code is the primary notifier dispatch for breakpoint traps, although it's only UBC traps that are of particular interest there. This patches in a check to allow non-UBC generated breakpoints to pass through down the remainder of the notifier chain, giving things like kgdb a chance at getting notified. Signed-off-by: Paul Mundt commit 6c0ee6a4bba0e21eb0fb4de5bdac03c11b74242d Author: Paul Mundt Date: Mon Dec 21 17:35:00 2009 +0900 sh: hw-breakpoint support requires perf events. This follows the x86 change to select perf events when hw_breakpoint support is enabled. This fixes up build issues where perf events can otherwise be disabled on their own. Signed-off-by: Paul Mundt commit a28b460ec7968f430a2d6ea2809b249ee9fe1d28 Author: Paul Mundt Date: Mon Dec 21 15:56:24 2009 +0900 sh: Fix up hw-breakpoints build for API changes. The event callback handling has been removed in favour of going through a generic event handler to handle overflows. Follows the x86 change. Signed-off-by: Paul Mundt commit 4b4f887fb2780e39383c1f202b72f5a2780b2d4c Merge: 6424db5 76e7461 Author: Paul Mundt Date: Mon Dec 21 15:44:34 2009 +0900 Merge branch 'master' into sh/hw-breakpoints commit 76e7461a21dfe13565b2a323b53c8cc963541126 Merge: d0b873f dd59f6c Author: Paul Mundt Date: Mon Dec 21 11:59:55 2009 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit d0b873fc73b793277c8a0824ce986b5bfeaef157 Merge: 5d9b4b1 73a38b8 Author: Paul Mundt Date: Mon Dec 21 11:58:17 2009 +0900 Merge branch 'sh/stable-updates' commit d2392ba06a477cf1876ce3d505b7cd77e295cfd4 Author: Alessandro Rubini Date: Sat Dec 19 19:46:33 2009 +0800 hwrng: nomadik - Add platform device for rng in cpu-8815 Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit bc85b25e5de17d714e8001cb3dc0feb66eac2750 Author: Alessandro Rubini Date: Sat Dec 19 19:45:43 2009 +0800 hwrng: nomadik - Add hardware RNG driver The hardware random number generator by ST is used in both the Nomadik 8815 SoC and the U8500. It returns 16 bits every 400ns with automatic delay if a read is issued too early. It depends on PLAT_NOMADIK. Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo Acked-by: Matt Mackall Signed-off-by: Herbert Xu commit 5d9b4b19f118abfb75e352841f7bf74580d7e427 Author: Matt Fleming Date: Sun Dec 13 14:38:50 2009 +0000 sh: Definitions for 3-level page table layout If using 64-bit PTEs and 4K pages then each page table has 512 entries (as opposed to 1024 entries with 32-bit PTEs). Unlike MIPS, SH follows the convention that all structures in the page table (pgd_t, pmd_t, pgprot_t, etc) must be the same size. Therefore, 64-bit PTEs require 64-bit PGD entries, etc. Using 2-levels of page tables and 64-bit PTEs it is only possible to map 1GB of virtual address space. In order to map all 4GB of virtual address space we need to adopt a 3-level page table layout. This actually works out better for CONFIG_SUPERH32 because we only waste 2 PGD entries on the P1 and P2 areas (which are untranslated) instead of 256. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit b73c806341cfc7492ede6a2ce713cb579547d0ab Author: Matt Fleming Date: Wed Nov 25 22:00:08 2009 +0000 sh: Abstract the number of page table levels Keep the dimensions of the page tables in a separate header file in preparation for allowing a three level page table structure. Signed-off-by: Matt Fleming Signed-off-by: Paul Mundt commit 86e032213424958b45564d0cc96b3316641a49d3 Author: Grant Likely Date: Thu Dec 10 23:42:21 2009 -0700 of/flattree: merge early_init_dt_scan_chosen() Merge common code between PowerPC and Microblaze. This patch splits the arch-specific stuff out into a new function, early_init_dt_scan_chosen_arch(). Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 0f0b56c3f2df4a083fc9e934266e5bab1710e286 Author: Grant Likely Date: Thu Dec 10 23:42:17 2009 -0700 of/flattree: eliminate cell_t typedef A cell is firmly established as a u32. No need to do an ugly typedef to redefine it to cell_t. Eliminate the unnecessary typedef so that it doesn't have to be added to the of_fdt header file Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 83f7a06eb479e2aeb83536e77a2cb14cc2285e32 Author: Grant Likely Date: Tue Nov 24 03:37:56 2009 -0700 of/flattree: merge dt_mem_next_cell Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Tested-by: Wolfram Sang commit f00abd94918c9780f9d2d961fc0e419c11457922 Author: Grant Likely Date: Tue Nov 24 03:27:10 2009 -0700 of/flattree: Merge earlyinit_dt_scan_root() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Acked-by: Benjamin Herrenschmidt Tested-by: Wolfram Sang commit f7b3a8355ba6cad251297844a0bdd08898ea36e0 Author: Grant Likely Date: Tue Nov 24 03:26:58 2009 -0700 of/flattree: Merge early_init_dt_check_for_initrd() Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Tested-by: Wolfram Sang Acked-by: Benjamin Herrenschmidt commit 6424db52e24e8cdf89917fa3c10395116440160e Merge: 09a0729 6a5a0b9 Author: Paul Mundt Date: Tue Dec 8 15:47:12 2009 +0900 Merge branch 'master' into sh/hw-breakpoints Conflict between FPU thread flag migration and debug thread flag addition. Conflicts: arch/sh/include/asm/thread_info.h arch/sh/include/asm/ubc.h arch/sh/kernel/process_32.c commit 09a072947791088b88ae15111cf68fc5aaaf758d Author: Paul Mundt Date: Mon Nov 9 16:27:40 2009 +0900 sh: hw-breakpoints: Add preliminary support for SH-4A UBC. This adds preliminary support for the SH-4A UBC to the hw-breakpoints API. Presently only a single channel is implemented, and the ptrace interface still needs to be converted. This is the first step to cleaning up the long-standing UBC mess, making the UBC more generally accessible, and finally making it SMP safe. An additional abstraction will be layered on top of this as with the perf events code to permit the various CPU families to wire up support for their own specific UBCs, as many variations exist. Signed-off-by: Paul Mundt commit 2be09cb993826b52c9fc1d44747c20dd43a50038 Author: Grant Likely Date: Mon Nov 23 20:16:46 2009 -0700 of: remove special case definition of of_read_ulong() Special case of of_read_ulong() was defined for PPC32 to toss away all but the last 32 bits when a large number value was read, and the 'normal' version for ppc64 just #defined of_read_ulong to of_read_number which causes compiler warnings on MicroBlaze and other 32 bit architectures because it returns a u64 instead of a ulong. This patch fixes the problem by defining a common implementation of of_read_ulong() that works everywhere. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 02af11b03fce3ddb264d7873d7a2e295e697938c Author: Grant Likely Date: Mon Nov 23 20:16:45 2009 -0700 of: merge prom_{add,remove,modify}_property Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 41f880091c15b039ffcc8b3d831656b81517a6d3 Author: Grant Likely Date: Mon Nov 23 20:07:01 2009 -0700 of/flattree: Merge unflatten_device_tree Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit bbd33931a08362f78266a4016211a35947b91041 Author: Grant Likely Date: Mon Nov 23 20:07:00 2009 -0700 of/flattree: Merge unflatten_dt_node Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 00e38efd90f27518ec96b37b1c7773e3ac529966 Author: Grant Likely Date: Mon Nov 23 20:07:00 2009 -0700 of/flattree: Merge of_flat_dt_is_compatible Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit ca900cfa2944448bdb76e1246f282e59bc65f472 Author: Grant Likely Date: Mon Nov 23 20:06:59 2009 -0700 of/flattree: merge of_get_flat_dt_prop Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 31a6a87dfc34fbf02aef9a160adf558ec56d3ccd Author: Grant Likely Date: Mon Nov 23 19:49:38 2009 -0700 of/flattree: remove __init annotations from the header file __init annotation belongs in the .c file, not the header. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 819d2819303654c6829d572e698e2d0021c08599 Author: Grant Likely Date: Mon Nov 23 19:44:23 2009 -0700 of/flattree: merge of_get_flat_dt_root Merge common code between PowerPC and MicroBlaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit c8cb7a59842c0b512b44f6f818cdb0b5a3ddc89e Author: Grant Likely Date: Mon Nov 23 18:54:23 2009 -0700 of/flattree: merge of_scan_flat_dt Merge common code between PowerPC and Microblaze Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit e169cfbef46d62e042614ffafa8880eed1d894bb Author: Grant Likely Date: Mon Nov 23 14:53:09 2009 -0700 of/flattree: merge find_flat_dt_string and initial_boot_params Merge common code between Microblaze and PowerPC. Signed-off-by: Grant Likely Reviewed-by: Wolfram Sang Tested-by: Michal Simek commit 2cfcadde83b308240690ff1c18f117d8bc7a08b0 Merge: e91edcf 648f4e3 Author: Grant Likely Date: Mon Nov 23 14:49:36 2009 -0700 Merge commit 'v2.6.32-rc8' commit 7b76bfc86757ca5e7b0a62f50003752da77c115b Author: Dick Streefland Date: Tue Oct 6 22:35:40 2009 +0200 kconfig: simplification of scripts/extract-ikconfig I've rewritten the extract-ikconfig script to extract the kernel configuration from a kernel compiled with CONFIG_IKCONFIG. The main motivation for the rewrite was to remove the dependency on the external C program binoffset.c, which is compiled on the initial run. The binoffset executable is invoked with a relative path, which means that the old script can only be run from the top of the kernel tree, and only when you have write permission in the scripts directory. The new script uses tr/grep/tail/zcat only, and can be invoked from anywhere. The binoffset.c program has been removed. This script requires GNU grep 2.5 (released 2002-03-13) or higher, because the -o option was introduced in that version. Signed-off-by: Dick Streefland LKML-Reference: <20091006203540.GA14634@streefland.net> Tested-by: Steven Rostedt Cc: Sam Ravnborg Signed-off-by: Steven Rostedt