commit e0e736fc0d33861335e2a132e4f688f7fd380c61 Merge: a089488 aeda4ac Author: Linus Torvalds Date: Mon Jan 10 11:18:59 2011 -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: (30 commits) MAINTAINERS: Add tomoyo-dev-en ML. SELinux: define permissions for DCB netlink messages encrypted-keys: style and other cleanup encrypted-keys: verify datablob size before converting to binary trusted-keys: kzalloc and other cleanup trusted-keys: additional TSS return code and other error handling syslog: check cap_syslog when dmesg_restrict Smack: Transmute labels on specified directories selinux: cache sidtab_context_to_sid results SELinux: do not compute transition labels on mountpoint labeled filesystems This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running. SELinux: merge policydb_index_classes and policydb_index_others selinux: convert part of the sym_val_to_name array to use flex_array selinux: convert type_val_to_struct to flex_array flex_array: fix flex_array_put_ptr macro to be valid C SELinux: do not set automatic i_ino in selinuxfs selinux: rework security_netlbl_secattr_to_sid SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in policydb.c ... commit a08948812b30653eb2c536ae613b635a989feb6f Merge: 0bd2cbc 6099469 Author: Linus Torvalds Date: Mon Jan 10 08:57:46 2011 -0800 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits) hwmon: Support for Dallas Semiconductor DS620 hwmon: driver for Sensirion SHT21 humidity and temperature sensor hwmon: Add humidity attribute to sysfs ABI hwmon: sysfs ABI updates hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp hwmon: (lm95241) Rewrite to avoid using macros hwmon: (applesmc) Fix checkpatch errors and fix value range checks hwmon: (applesmc) Update copyright information hwmon: (applesmc) Silence driver hwmon: (applesmc) Simplify feature sysfs handling hwmon: (applesmc) Dynamic creation of fan files hwmon: (applesmc) Extract all features generically hwmon: (applesmc) Handle new temperature format hwmon: (applesmc) Dynamic creation of temperature files hwmon: (applesmc) Introduce a register lookup table hwmon: (applesmc) Use pr_fmt and pr_ hwmon: (applesmc) Relax the severity of device init failure hwmon: (applesmc) Add MacBookAir3,1(3,2) support hwmon: (w83627hf) Use pr_fmt and pr_ hwmon: (w83627ehf) Use pr_fmt and pr_ ... commit 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281 Merge: 57cc721 a081748 Author: Linus Torvalds Date: Mon Jan 10 08:57:03 2011 -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: (29 commits) of/flattree: forward declare struct device_node in of_fdt.h ipmi: explicitly include of_address.h and of_irq.h sparc: explicitly cast negative phandle checks to s32 powerpc/405: Fix missing #{address,size}-cells in i2c node powerpc/5200: dts: refactor dts files powerpc/5200: dts: Change combatible strings on localbus powerpc/5200: dts: remove unused properties powerpc/5200: dts: rename nodes to prepare for refactoring dts files of/flattree: Update dtc to current mainline. of/device: Don't register disabled devices powerpc/dts: fix syntax bugs in bluestone.dts of: Fixes for OF probing on little endian systems of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF of/flattree: Add of_flat_dt_match() helper function of_serial: explicitly include of_irq.h of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree of/flattree: Reorder unflatten_dt_node of/flattree: Refactor unflatten_dt_node of/flattree: Add non-boottime device tree functions of/flattree: Add Kconfig for EARLY_FLATTREE ... Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant. commit 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1 Author: Alexey Dobriyan Date: Mon Jan 10 08:18:25 2011 +0200 headers: kobject.h redux Remove kobject.h from files which don't need it, notably, sched.h and fs.h. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 37721e1b0cf98cb65895f234d8c500d270546529 Author: Alexey Dobriyan Date: Mon Jan 10 08:17:10 2011 +0200 headers: path.h redux Remove path.h from sched.h and other files. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 9f99a2f0e44663517b99b69a3e4a499d0ba877df Merge: 8c8ae4e 110e7c7 Author: Linus Torvalds Date: Mon Jan 10 08:48:46 2011 -0800 Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/event: validate irq before get evtchn by irq xen/fb: fix potential memory leak xen/fb: fix xenfb suspend/resume race. xen: disable ACPI NUMA for PV guests xen/irq: Cleanup the find_unbound_irq commit 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 Merge: a1e8fad d9b8ca8 Author: Linus Torvalds Date: Mon Jan 10 08:48:29 2011 -0800 Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: HVM X2APIC support apic: Move hypervisor detection of x2apic to hypervisor.h commit a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 Merge: e316633 a45b061 Author: Linus Torvalds Date: Mon Jan 10 08:38:01 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: slub: Fix a crash during slabinfo -v tracing/slab: Move kmalloc tracepoint out of inline code slub: Fix slub_lock down/up imbalance slub: Fix build breakage in Documentation/vm slub tracing: move trace calls out of always inlined functions to reduce kernel code size slub: move slabinfo.c to tools/slub/slabinfo.c commit e3166331a3288dd7184548896a1c7ab682f0dbe8 Merge: 1693ed2 0719e1d Author: Linus Torvalds Date: Mon Jan 10 08:29:25 2011 -0800 Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: Documentation/kbuild: add info that 'choice' can have a symbol name kbuild: add numeric --set-val option to scripts/config headers_check: Fix warning text headers_check: better search for functions in headers scripts/coccinelle: update for compatability with Coccinelle 0.2.4 tags: put function prototypes back! Kconfig: fix single letter command in scripts/config gitignore: add scripts/recordmcount commit 1693ed284f14a288c29f7265f9d71103e4c10821 Merge: f28b1c8 ee81b78 Author: Linus Torvalds Date: Mon Jan 10 08:28:38 2011 -0800 Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/ deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb kbuild: create linux-headers package in deb-pkg kbuild, deb-pkg: support overriding userland architecture kbuild, deb-pkg: select userland architecture based on UTS_MACHINE kbuild, deb-pkg: Fix build with paranoid umask commit f28b1c8aaa97a68028bb894bffb1690185c62b01 Merge: 0c05384 39177ec Author: Linus Torvalds Date: Mon Jan 10 08:28:17 2011 -0800 Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: nconf: handle comment entries within choice/endchoice kconfig: fix warning kconfig: Make expr_copy() take a const argument kconfig: simplify select-with-unmet-direct-dependency warning kconfig: add more S_INT and S_HEX consistency checks kconfig: fix `zconfdebug' extern declaration kconfig/conf: merge duplicate switch's case kconfig: fix typos kbuild/gconf: add dummy inline for bind_textdomain_codeset() kbuild/nconf: fix spaces damage kconfig: nuke second argument of conf_write_symbol() kconfig: do not define AUTOCONF_INCLUDED kconfig: the day kconfig warns about "select"-abuse has come commit 0c05384a5a1af2352b8c244cf32f480ba6cbf024 Merge: 1542dec bc91c9f Author: Linus Torvalds Date: Mon Jan 10 08:27:52 2011 -0800 Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: mkuboot.sh: Fail if mkimage is missing gen_init_cpio: checkpatch fixes gen_init_cpio: Avoid race between call to stat() and call to open() modpost: Fix address calculation in reloc_location() Make fixdep error handling more explicit checksyscalls: Fix stand-alone usage modpost: Put .zdebug* section on white list kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all kbuild: introduce HDR_ARCH_LIST for headers_install_all headers_install: check exit status of unifdef gen_init_cpio: remove leading `/' from file names scripts/genksyms: fix header usage fixdep: use hash table instead of a single array commit 1542dec1c9109fdcd1c53460f064096f24fc49d2 Merge: facc7a9 2ad2c32 Author: Linus Torvalds Date: Mon Jan 10 08:22:33 2011 -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: pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies. pata_hpt37x: actually limit HPT370 to UltraDMA/66 pata_hpt3x2n: coding style cleanup pata_hpt37x: coding style cleanup pata_hpt366: coding style cleanup pata_hpt3x2n: calculate average f_CNT pata_hpt3x2n: clarify about HPT371N support pata_hpt{37x|3x2n}: SATA mode filtering [libata] avoid needlessly passing around ptr to SCSI completion func [libata] new driver acard_ahci, for ATP8620 host controller commit facc7a96d443d84060a8679c3fcc51d20d4981c3 Merge: c8940ec 4ead364 Author: Linus Torvalds Date: Mon Jan 10 08:15:37 2011 -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: (34 commits) HID: roccat: Update sysfs attribute doc HID: roccat: don't use #pragma pack HID: roccat: Add support for Roccat Kone[+] v2 HID: roccat: reduce number of functions in kone and pyra drivers HID: roccat: declare meaning of pack pragma usage in driver headers HID: roccat: use class for char device for sysfs attribute creation sysfs: Introducing binary attributes for struct class HID: hidraw: add compatibility ioctl() for 32-bit applications. HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report() HID: picolcd: fix misuse of logical operation in place of bitop HID: usbhid: base runtime PM on modern API HID: replace offsets values with their corresponding BTN_* defines HID: hid-mosart: support suspend/resume HID: hid-mosart: ignore buttons report HID: hid-picolcd: don't use flush_scheduled_work() HID: simplify an index check in hid_lookup_collection HID: Hoist assigns from ifs HID: Remove superfluous __inline__ HID: Use vzalloc for vmalloc/memset(,0...) HID: Add and use hid_: dev_ equivalents ... commit c8940eca75e6d1ea57f6c491a30bd1023c64c9ad Merge: 78c92a9 3ae22e8 Author: Linus Torvalds Date: Mon Jan 10 08:14:53 2011 -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: spi / PM: Support dev_pm_ops PM: Prototype the pm_generic_ operations PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally PM: Use dev_name() in core device suspend and resume routines PM: Permit registration of parentless devices during system suspend PM: Replace the device power.status field with a bit field PM: Remove redundant checks from core device resume routines PM: Use a different list of devices for each stage of device suspend PM: Avoid compiler warning in pm_noirq_op() PM: Use pm_wakeup_pending() in __device_suspend() PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending() PM: Prevent dpm_prepare() from returning errors unnecessarily PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3) PM / Hibernate: When failed, in_suspend should be reset PM / Hibernate: hibernation_ops->leave should be checked too Freezer: Fix a race during freezing of TASK_STOPPED tasks PM: Use proper ccflag flag in kernel/power/Makefile PM / Runtime: Fix comments to match runtime callback code commit 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 Merge: b65f0d6 410cf2b Author: Linus Torvalds Date: Mon Jan 10 08:14:02 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: firewire: use split transaction timeout only for split transactions firewire: ohci: consolidate context status flags firewire: ohci: cache the context run bit firewire: ohci: flush AT contexts after bus reset - addendum firewire: ohci: flush AT contexts after bus reset for OHCI 1.2 firewire: net: set carrier state at ifup firewire: net: add carrier detection firewire: net: ratelimit error messages firewire: ohci: restart iso DMA contexts on resume from low power mode firewire: ohci: restore GUID on resume. firewire: ohci: use common buffer for self IDs and AR descriptors firewire: ohci: optimize iso context checks in the interrupt handler firewire: make PHY packet header format consistent firewire: ohci: properly clear posted write errors firewire: ohci: flush MMIO writes in the interrupt handler firewire: ohci: fix AT context initialization error handling firewire: ohci: Asynchronous Reception rewrite firewire: core: Update WARN uses firewire: nosy: char device is not seekable commit b65f0d673a0280a49b80f44c9a62e5dfc1ec203f Merge: f3ea597 365e215 Author: Linus Torvalds Date: Mon Jan 10 07:50:40 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: unfold nilfs_dat_inode function nilfs2: do not pass sbi to functions which can get it from inode nilfs2: get rid of nilfs_mount_options structure nilfs2: simplify nilfs_mdt_freeze_buffer nilfs2: get rid of loaded flag from nilfs object nilfs2: fix a checkpatch error in page.c nilfs2: fiemap support nilfs2: mark buffer heads as delayed until the data is written to disk nilfs2: call nilfs_error inside bmap routines fs/nilfs2/super.c: Use printf extension %pV MAINTAINERS: add nilfs2 git tree entry commit f3ea597251ac859a1c0e7b9e266877f1ac828009 Merge: f9f265f 20054bd Author: Linus Torvalds Date: Mon Jan 10 07:47:11 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: use CreationTime like an i_generation field cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo cifs: show "acl" in DebugData Features when it's compiled in cifs: move "ntlmssp" and "local_leases" options out of experimental code cifs: replace some hardcoded values with preprocessor constants cifs: remove unnecessary locking around sequence_number [CIFS] Fix minor merge conflict in fs/cifs/dir.c CIFS: Simplify cifs_open code CIFS: Simplify non-posix open stuff (try #2) CIFS: Add match_port check during looking for an existing connection (try #4) CIFS: Simplify ipv*_connect functions into one (try #4) cifs: Support NTLM2 session security during NTLMSSP authentication [try #5] cifs: don't overwrite dentry name in d_revalidate commit 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2 Author: Joe Jin Date: Fri Jan 7 14:50:12 2011 +0800 xen/event: validate irq before get evtchn by irq When retrieving the event channel number from irq, the irq number may not be valid under some conditions. So far that can be when we suspend/resume and irq ends with -1. Validate and return sanitized irq and provide diagnostics information. [v3: added unlikely on the WARN path] [v2: reworded the commit message] Signed-off-by: Joe Jin Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Gurudas Pai Cc: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit fc550e95921e109f3778a6b2dc560d63388810ab Author: Joe Jin Date: Fri Jan 7 18:20:54 2011 +0800 xen/fb: fix potential memory leak This patch fixes a potential memory leak when xenfb connect to the backend fails. Thanks for Ian's review and comments. [v2: reworded the commit message a bit] Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Joe Jin Tested-by: Gurudas Pai Acked-by: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit 731f3ab66a23dab28a359e87364f53d221b3d366 Author: Joe Jin Date: Fri Jan 7 18:17:17 2011 +0800 xen/fb: fix xenfb suspend/resume race. When migrating guests over a long period we hit this: <1>BUG: unable to handle kernel paging request at 0000000b819fdb98 <1>IP: [] notify_remote_via_irq+0x13/0x34 <4>PGD 94b10067 PUD 0 <0>Oops: 0000 [#1] SMP .. snip.. Call Trace: [] xenfb_send_event+0x5c/0x5e [] ? xen_restore_fl_direct_end+0x0/0x1 [] ? _spin_unlock_irqrestore+0x16/0x18 [] xenfb_refresh+0x1b1/0x1d7 [] ? sys_imageblit+0x1ac/0x458 [] xenfb_imageblit+0x2f/0x34 [] soft_cursor+0x1b5/0x1c8 [] bit_cursor+0x4b6/0x4d7 [] ? xen_restore_fl_direct_end+0x0/0x1 [] ? _spin_unlock_irqrestore+0x16/0x18 [] ? bit_cursor+0x0/0x4d7 [] fb_flashcursor+0xff/0x111 [] ? fb_flashcursor+0x0/0x111 [] worker_thread+0x14d/0x1ed [] ? autoremove_wake_function+0x0/0x3d [] ? _spin_unlock_irqrestore+0x16/0x18 [] ? worker_thread+0x0/0x1ed [] kthread+0x6e/0x76 [] child_rip+0xa/0x20 [] ? int_ret_from_sys_call+0x7/0x1b [] ? retint_restore_args+0x5/0x6 [] ? child_rip+0x0/0x20 Code: 6b ff 0c 8b 87 a4 db 9f 81 66 85 c0 74 08 0f b7 f8 e8 3b ff ff ff c9 c3 55 48 89 e5 48 83 ec 10 0f 1f 44 00 00 89 ff 48 6b ff 0c <8b> 87 a4 db 9f 81 66 85 c0 74 14 48 8d 75 f0 0f b7 c0 bf 04 00 RIP [] notify_remote_via_irq+0x13/0x34 RSP CR2: 0000000b819fdb98 ---[ end trace 098b4b74827595d0 ]--- The root cause of the panic is the race between the resume and reconnect to the backend. Clearing the 'update_wanted' flag of xenfb before disconnecting from the backend fixes this issue. Signed-off-by: Joe Jin Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Gurudas Pai Acked-by: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit c1f5db1a53a7286f6c818f71016ae6aced814d27 Author: Ian Campbell Date: Fri Dec 3 09:54:03 2010 +0000 xen: disable ACPI NUMA for PV guests Xen does not currently expose PV-NUMA information to PV guests. Therefore disable NUMA for the time being to prevent the kernel picking up on an host-level NUMA information which it might come across in the firmware. [ Added comment - Jeremy ] Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a Merge: 7d44b04 b9d4105 Author: Linus Torvalds Date: Mon Jan 10 07:46:26 2011 -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: sanitize work_start() in lowcomms.c dlm: reduce cond_resched during send dlm: use TCP_NODELAY dlm: Use cmwq for send and receive workqueues dlm: Handle application limited situations properly. commit 7d44b0440147d83a65270205b22e7d365de28948 Merge: 0dc1488 1baa26b Author: Linus Torvalds Date: Mon Jan 10 07:43:54 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix ioctl ABI fuse: allow batching of FORGET requests fuse: separate queue for FORGET requests fuse: ioctl cleanup Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done the RCU-freeing of the inode in fuse_destroy_inode(). commit 0dc1488527a3c01383a50e5df7187219567586a3 Author: Randy Dunlap Date: Sat Jan 8 19:40:33 2011 -0800 pipe_fs_i.h: fix kernel-doc warning Fix kernel-doc notation warnings in pipe_fs_i.h: Warning(include/linux/pipe_fs_i.h:58): No description found for parameter 'buffers' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 175881db8916a5f5cdf920d32214caef588870fd Author: Randy Dunlap Date: Sat Jan 8 19:38:02 2011 -0800 hrtimer.h: fix kernel-doc warning Fix new kernel-doc notation warning in hrtimer.h: Warning(include/linux/hrtimer.h:150): Excess struct/union/enum/typedef member 'first' description in 'hrtimer_clock_base' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 2a8c0c68487a68441e701f493f43fd547d87c8df Author: Randy Dunlap Date: Sat Jan 8 19:37:20 2011 -0800 fs: fix dcache.h kernel-doc notation Fix new kernel-doc notation warning in dcache.h: Warning(include/linux/dcache.h:316): Excess function parameter 'Returns' description in '__d_rcu_to_refcount' Signed-off-by: Randy Dunlap Cc: Nick Piggin Signed-off-by: Linus Torvalds commit 39191628ed169510db2f3f472e1ec14e08f9690f Author: Randy Dunlap Date: Sat Jan 8 19:36:21 2011 -0800 fs: fix namei.c kernel-doc notation Fix new kernel-doc notation warnings in fs/namei.c and spell ECHILD correctly. Warning(fs/namei.c:218): No description found for parameter 'flags' Warning(fs/namei.c:425): Excess function parameter 'Returns' description in 'nameidata_drop_rcu' Warning(fs/namei.c:478): Excess function parameter 'Returns' description in 'nameidata_dentry_drop_rcu' Warning(fs/namei.c:540): Excess function parameter 'Returns' description in 'nameidata_drop_rcu_last' Signed-off-by: Randy Dunlap Cc: Nick Piggin Signed-off-by: Linus Torvalds commit 365e215ce1f154e288ff0f7c9acbdf5421f57949 Author: Ryusuke Konishi Date: Mon Dec 27 00:07:30 2010 +0900 nilfs2: unfold nilfs_dat_inode function nilfs_dat_inode function was a wrapper to switch between normal dat inode and gcdat, a clone of the dat inode for garbage collection. This function got obsolete when the gcdat inode was removed, and now we can access the dat inode directly from a nilfs object. So, we will unfold the wrapper and remove it. Signed-off-by: Ryusuke Konishi commit bcbc8c648d6cc88f771435d8031c1a13e00945ed Author: Ryusuke Konishi Date: Mon Dec 27 00:05:49 2010 +0900 nilfs2: do not pass sbi to functions which can get it from inode This removes argument for passing nilfs_sb_info structure from nilfs_set_file_dirty and nilfs_load_inode_block functions. We can get a pointer to the structure from inodes. [Stephen Rothwell : fix conflict with commit b74c79e99389cd79b31fcc08f82c24e492e63c7e] Signed-off-by: Ryusuke Konishi commit 06df0f999247a3153c3ec284c7ada36ef785eb97 Author: Ryusuke Konishi Date: Mon Dec 27 00:04:06 2010 +0900 nilfs2: get rid of nilfs_mount_options structure Only mount_opt member is used in the nilfs_mount_options structure, and we can simplify it. Signed-off-by: Ryusuke Konishi commit a7a8447edef2cfa9b28cc3892993d9fafb362671 Author: Ryusuke Konishi Date: Mon Dec 27 00:03:02 2010 +0900 nilfs2: simplify nilfs_mdt_freeze_buffer nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer() always returns a valid buffer head, so its validity check can be removed. Signed-off-by: Ryusuke Konishi commit 888da23c2f70ca2e9897b725322a6456285ee9c4 Author: Ryusuke Konishi Date: Mon Dec 27 00:01:28 2010 +0900 nilfs2: get rid of loaded flag from nilfs object NILFS_LOADED flag of the nilfs object is not used now, so this will remove it. Signed-off-by: Ryusuke Konishi commit ae53a0a2ce2a89f1aa824a5fc6d2099907cfb409 Author: Ryusuke Konishi Date: Sun Dec 26 23:30:02 2010 +0900 nilfs2: fix a checkpatch error in page.c Will correct the following checkpatch error: ERROR: trailing whitespace #494: FILE: page.c:494: + $ Signed-off-by: Ryusuke Konishi commit 622daaff0a8975fb5c5b95f24f3234550ba32e92 Author: Ryusuke Konishi Date: Sun Dec 26 16:38:43 2010 +0900 nilfs2: fiemap support This adds fiemap to nilfs. Two new functions, nilfs_fiemap and nilfs_find_uncommitted_extent are added. nilfs_fiemap() implements the fiemap inode operation, and nilfs_find_uncommitted_extent() helps to get a range of data blocks whose physical location has not been determined. nilfs_fiemap() collects extent information by looping through nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines. Signed-off-by: Ryusuke Konishi commit 27e6c7a3ce29ae5fa5bec4ed5917f8508bfac120 Author: Ryusuke Konishi Date: Sun Dec 26 16:28:28 2010 +0900 nilfs2: mark buffer heads as delayed until the data is written to disk Nilfs does not allocate new blocks on disk until they are actually written to. To implement fiemap, we need to deal with such blocks. To allow successive fiemap patch to distinguish mapped but unallocated regions, this marks buffer heads of those new blocks as delayed and clears the flag after the blocks are written to disk. Signed-off-by: Ryusuke Konishi commit e828949e5b42bfd234ee537cdb7c5e3a577958a3 Author: Ryusuke Konishi Date: Fri Nov 19 15:26:20 2010 +0900 nilfs2: call nilfs_error inside bmap routines Some functions using nilfs bmap routines can wrongly return invalid argument error (i.e. -EINVAL) that bmap returns as an internal code for btree corruption. This fixes the issue by catching and converting the internal EINVAL to EIO and calling nilfs_error function inside bmap routines. Signed-off-by: Ryusuke Konishi commit b004a5eb0babec7ef91558f73315ef49e5a1f285 Author: Joe Perches Date: Tue Nov 9 16:35:21 2010 -0800 fs/nilfs2/super.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Ryusuke Konishi commit af1761f268ff2a58f2ea22e9b9de6359f7b2048e Author: Ryusuke Konishi Date: Tue Nov 23 23:37:23 2010 +0900 MAINTAINERS: add nilfs2 git tree entry NILFS2 filesystem section of the MAINTAINERS file lacks an entry of scm tree. This adds it. Signed-off-by: Ryusuke Konishi commit 20054bd65703f7504a9daceabc2a060828fde36c Author: Jeff Layton Date: Fri Jan 7 11:30:27 2011 -0500 cifs: use CreationTime like an i_generation field Reduce false inode collisions by using the CreationTime like an i_generation field. This way, even if the server ends up reusing a uniqueid after a delete/create cycle, we can avoid matching the inode incorrectly. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit aeda4ac3efc29e4d55989abd0a73530453aa69ba Merge: d2e7ad1 350e4f3 Author: James Morris Date: Mon Jan 10 10:40:42 2011 +1100 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next commit d44a9fe2c8af3fee8edb203e9b11e507851c50fa Author: Jeff Layton Date: Fri Jan 7 11:30:29 2011 -0500 cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo We call CIFSSMBUnixSetPathInfo in these functions, but we have a filehandle since an open was just done. Switch these functions to use CIFSSMBUnixSetFileInfo instead. In practice, these codepaths are only used if posix opens are broken. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ca40b714b8f9f20118b7071cb7cf49954166dbdf Author: Jeff Layton Date: Fri Jan 7 11:30:29 2011 -0500 cifs: show "acl" in DebugData Features when it's compiled in ...and while we're at it, reduce the number of calls into the seq_* functions by prepending spaces to strings. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit b4d6fcf13f417464c13c6fde46e87c495ba6b6ee Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: move "ntlmssp" and "local_leases" options out of experimental code I see no real need to leave these sorts of options under an EXPERIMENTAL ifdef. Since you need a mount option to turn this code on, that only blows out the testing matrix. local_leases has been under the EXPERIMENTAL tag for some time, but it's only the mount option that's under this label. Move it out from under this tag. The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount option to turn it on, and in the future any distro will reasonably want this enabled. Go ahead and move it out from under the EXPERIMENTAL tag. Signed-off-by: Jeff Layton Acked-by: Suresh Jayaraman Signed-off-by: Steve French commit 1397f2ee4be65542fdc3460c7e8b6317779ea680 Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: replace some hardcoded values with preprocessor constants A number of places that deal with RFC1001/1002 negotiations have bare "15" or "16" values. Replace them with RFC_1001_NAME_LEN and RFC_1001_NAME_LEN_WITH_NULL. The patch also cleans up some checkpatch warnings for code surrounding the changes. This should apply cleanly on top of the patch to remove Local_System_Name. Reported-and-Reviwed-by: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French commit a0f8b4fb4cab4bc32caaf34fc0a0c9d5dd369186 Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: remove unnecessary locking around sequence_number The server->sequence_number is already protected by the srv_mutex. The GlobalMid_lock is unneeded here. Reviewed-by: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 197a1eeb7f89c1d2ba93713398e9655899aa973e Author: Steve French Date: Sun Jan 9 23:26:56 2011 +0000 [CIFS] Fix minor merge conflict in fs/cifs/dir.c Signed-off-by: Steve French commit acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 Merge: 7e12edd 0c21e3a Author: Steve French Date: Sun Jan 9 23:18:16 2011 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: fs/cifs/dir.c commit d2e7ad19229f982fc1eb731827d82ceac90abfb3 Merge: d03a5d8 0c21e3a Author: James Morris Date: Mon Jan 10 09:46:24 2011 +1100 Merge branch 'master' into next Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell Ok'd by Casey Schaufler Signed-off-by: James Morris commit 6099469805c24af14250e182bb9ca082b8a6b716 Author: Roland Stigge Date: Sun Jan 9 09:31:39 2011 -0500 hwmon: Support for Dallas Semiconductor DS620 Driver for Dallas Semiconductor DS620 temperature sensor and thermostat Signed-off-by: Roland Stigge Signed-off-by: Guenter Roeck commit a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 Merge: 3c0eee3 8165984 Author: Pekka Enberg Date: Sun Jan 9 11:05:53 2011 +0200 Merge branch 'slab/next' into for-linus commit a081748735c5feb96b1365e78a5ff0fb6ca7e3a4 Author: Grant Likely Date: Sat Jan 8 21:42:42 2011 -0700 of/flattree: forward declare struct device_node in of_fdt.h This patch forward declares struct device_node to fix a compile error when of_fdt.h is included, but of.h is not. Alternately, including linux/of.h could have been added to of_fdt.h, but that pulls in a lot of unnecessary declarations when only working with the flattened form. Signed-off-by: Grant Likely commit 430400b86304ea729ba10f2966a8af67da60a37f Author: Urs Fleisch Date: Fri Jan 7 07:15:39 2011 +0000 hwmon: driver for Sensirion SHT21 humidity and temperature sensor Signed-off-by: Urs Fleisch Acked-by: Jonathan Cameron Signed-off-by: Guenter Roeck commit c6c2c1636e30bcd26c6b0d208324055a03c5ab9c Author: Guenter Roeck Date: Thu Jan 6 07:52:03 2011 -0800 hwmon: Add humidity attribute to sysfs ABI The humidity attribute is already supported by the sht15 driver, and another driver supporting it is about to be added. Make it official. Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron Acked-by: Jean Delvare commit 581693b51e44bb2c0cca16ab0c8d3cb535fd2ac8 Author: Guenter Roeck Date: Mon Jun 28 13:22:27 2010 -0700 hwmon: sysfs ABI updates Add attributes supported by various PMBus devices to hwmon sysfs ABI. Signed-off-by: Guenter Roeck commit ae9e0ce73e9fc55a620e0b3bd4a154330a7e64cc Author: Jan Beulich Date: Mon Dec 6 11:48:35 2010 -0500 hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp Signed-off-by: Jan Beulich Signed-off-by: Guenter Roeck commit 0f1deb4b820cfacf22492abd7b17e891dafc51ae Author: Davide Rizzo Date: Thu Nov 18 07:23:00 2010 -0800 hwmon: (lm95241) Rewrite to avoid using macros Signed-off-by: Davide Rizzo [guenter.roeck@ericsson.com: Formatting changes] Signed-off-by: Guenter Roeck commit 2bfe814826b7266a489895f731a777f8cbe37963 Author: Guenter Roeck Date: Wed Nov 10 10:42:21 2010 -0800 hwmon: (applesmc) Fix checkpatch errors and fix value range checks This patch fixes all checkpatch errors and most of the checkpatch warnings. It also fixes the range check in applesmc_store_fan_speed(). Signed-off-by: Guenter Roeck Acked-by: Henrik Rydberg commit 41e71f97174ba08fcca7f31bf448de92abc8862e Author: Henrik Rydberg Date: Tue Nov 9 15:15:11 2010 +0000 hwmon: (applesmc) Update copyright information With the preceding patches, git blame assigns about half of the file to the present author. Add a line to the copyright to reflect this. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 0b8ad5a57b75322e4b671ef420b5fe90e5154912 Author: Henrik Rydberg Date: Tue Nov 9 15:15:10 2010 +0000 hwmon: (applesmc) Silence driver Make the driver report a single line on success. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 0b0b5dff8967a4468f05174d0d74e1ed6e369776 Author: Henrik Rydberg Date: Tue Nov 9 15:15:09 2010 +0000 hwmon: (applesmc) Simplify feature sysfs handling Given the dynamic node construction method, the setup of the accelerometer, light sensor and keyboard backlight sysfs nodes can be simplified. This patch does not contain any logic changes. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 3eba2bf7c5fb7863412554cd73646cb80ac293ff Author: Henrik Rydberg Date: Tue Nov 9 15:15:08 2010 +0000 hwmon: (applesmc) Dynamic creation of fan files With the dynamic temperature group in place, the setup of fans can be simplified. This patch sets up the fans dynamically, removing a hundred lines of code. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 40ef06f1120bcc0a2ad483b5cd42f58c4df78a5b Author: Henrik Rydberg Date: Wed Nov 10 10:58:05 2010 +0000 hwmon: (applesmc) Extract all features generically With temperature keys being determined automatically, the dmi match data is only used to assign features that can easily be detected from the smc. This patch removes the dmi match data altogether, and reduces the match table to the main machine models. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit dcdea2614ab9b7864a3ae620419d04e0cc4a65cc Author: Henrik Rydberg Date: Tue Nov 9 15:15:06 2010 +0000 hwmon: (applesmc) Handle new temperature format The recent Macbooks have temperature registers of a new type. This patch adds the logic to handle them. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 9792dadfce22ae1518c88577ac743a3077a85084 Author: Henrik Rydberg Date: Wed Nov 10 10:58:04 2010 +0000 hwmon: (applesmc) Dynamic creation of temperature files The current driver creates temperature files based on a list of temperature keys given per device. Apart from slow adaption to new machine models, the number of sensors also depends on the number of processors. This patch looks up the temperature keys dynamically, thereby supporting all models. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 5874583d5662de5550b0ed1c54a9dea70bcdcba4 Author: Henrik Rydberg Date: Wed Nov 10 10:58:03 2010 +0000 hwmon: (applesmc) Introduce a register lookup table One main problem with the current driver is the inability to quickly search for supported keys, resulting in detailed feature maps per machine model which are cumbersome to maintain. This patch adds a register lookup table, which enables binary search for supported keys. The lookup also reduces the io frequency, so the original mutex is replaced by locks around the actual io. Signed-off-by: Henrik Rydberg [guenter.roeck@ericsson.com: Added value range check to key_at_index_store()] Signed-off-by: Guenter Roeck commit 1ee7c71bd1aa9758f14e1be92310215a5bd0abe7 Author: Joe Perches Date: Tue Nov 9 15:15:03 2010 +0000 hwmon: (applesmc) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 2344cd0c2e9ea8f3037be11fb997ddbeda0237ca Author: Henrik Rydberg Date: Tue Nov 9 15:15:02 2010 +0000 hwmon: (applesmc) Relax the severity of device init failure The device init is used to reset the accelerometer. Failure to reset is not severe enough to stop loading the module or to resume from hibernation. This patch relaxes failure to a warning and drops output in case of success. Cc: stable@kernel.org Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 132af03233b493101a53010383b5abb5b9ff1e51 Author: Edgar Hucek Date: Tue Nov 9 15:15:01 2010 +0000 hwmon: (applesmc) Add MacBookAir3,1(3,2) support This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the applesmc driver. [rydberg@euromail.se: minor cleanup] Cc: stable@kernel.org Signed-off-by: Edgar Hucek Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 18de030f1dbaef0c13cf393899a298d978aa200f Author: Joe Perches Date: Wed Oct 20 06:51:55 2010 +0000 hwmon: (w83627hf) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit abdc6fd189405a83ebd20aa9facfbdf3c179d48a Author: Joe Perches Date: Wed Oct 20 06:51:54 2010 +0000 hwmon: (w83627ehf) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 9d72be0da16da10e27f6a8c01f877db6c513413d Author: Joe Perches Date: Wed Oct 20 06:51:53 2010 +0000 hwmon: (vt8231) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 5ed9ba6b87545d21b48e50a028bfb79f9812f89f Author: Joe Perches Date: Wed Oct 20 06:51:52 2010 +0000 hwmon: (vt1211) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 774f7827e13cfae720306ca44b83b93ab2a6b9be Author: Joe Perches Date: Wed Oct 20 06:51:51 2010 +0000 hwmon: (via686a) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit edb8d53c684da4062ac8c461727ddc1839336aa5 Author: Joe Perches Date: Wed Oct 20 06:51:50 2010 +0000 hwmon: (via-cputemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 512504e9f5489dbe85c80fd2c1b44ab5a8e0d5fa Author: Joe Perches Date: Wed Oct 20 06:51:49 2010 +0000 hwmon: (smsc47m1) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit bf1a85eff87eeb0651b1c5b348d51206ec7c0ef5 Author: Joe Perches Date: Wed Oct 20 06:51:48 2010 +0000 hwmon: (smsc47b397) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 4b2515dbb94341db01db3208f9f40658c5e2a251 Author: Joe Perches Date: Wed Oct 20 06:51:47 2010 +0000 hwmon: (sis5595) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 14a613cc23869d0ca69154bbc5816004fe201b17 Author: Joe Perches Date: Wed Oct 20 06:51:46 2010 +0000 hwmon: (pkgtemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 2caec1343e0cfe59bacf3d4f67d69ab6283cc75b Author: Joe Perches Date: Wed Oct 20 06:51:45 2010 +0000 hwmon: (pcf8591) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 5713017ec5e1a437ae4d0d196bce46d572eb7e1a Author: Joe Perches Date: Wed Oct 20 06:51:41 2010 +0000 hwmon: (lm70) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 63366d37ad5dbb4f208b517c88ea4bd41738dbf7 Author: Joe Perches Date: Wed Oct 20 06:51:40 2010 +0000 hwmon: (lis3lv02d) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 55d705cce829c37999f26a8d4f1dd701013e7920 Author: Joe Perches Date: Wed Oct 20 06:51:38 2010 +0000 hwmon: (ibmaem) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit c95df1ae69b85d5f306d86164e245aae614b852a Author: Joe Perches Date: Wed Oct 20 06:51:37 2010 +0000 hwmon: (core) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 1f923c7a6726b224b6b1b059da5a7f8e3dff1196 Author: Joe Perches Date: Wed Oct 20 06:51:36 2010 +0000 hwmon: (hwmon-vid) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 53ab0e6888925ae3ebe931c060120b0f11c1923c Author: Joe Perches Date: Wed Oct 20 06:51:35 2010 +0000 hwmon: (hp_accel) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 22d3b41281b4c1a55086fa4dff7abb4f0c36403e Author: Joe Perches Date: Wed Oct 20 06:51:34 2010 +0000 hwmon: (f71882fg) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit e54c5ad61f4e2c4fdfbdb8dff31fc604073d3550 Author: Joe Perches Date: Wed Oct 20 06:51:33 2010 +0000 hwmon: (f71805f) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb Author: Joe Perches Date: Wed Oct 20 06:51:32 2010 +0000 hwmon: (dme1737) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit f8bb8925682f355dc20f721bda7021ef13e5869f Author: Joe Perches Date: Wed Oct 20 06:51:31 2010 +0000 hwmon: (coretemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit ac561494d48b92a41424cc87e2a02b545424643c Author: Joe Perches Date: Wed Oct 20 06:51:30 2010 +0000 hwmon: (asus_atk0110) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 4d630e2ba59a231c8e5031cc55e16737aa59af97 Author: Joe Perches Date: Wed Oct 20 06:51:29 2010 +0000 hwmon: (asb1000) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 2e991201e4ebffb1fb32873d72e2ee4b499269c3 Author: Joe Perches Date: Wed Oct 20 06:51:27 2010 +0000 hwmon: (adt7470) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit fe826749aec090c6f9ab48502bb9a7777572b85b Author: Joe Perches Date: Wed Oct 20 06:51:26 2010 +0000 hwmon: (abituguru3) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 28ebfa13f97265e415fbe19795500a6d922a6c86 Author: Joe Perches Date: Wed Oct 20 06:51:25 2010 +0000 hwmon: (abituguru) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 2ad2c320a107aceeba984f97ab2a60064101f5d5 Author: Nick Bowler Date: Fri Jan 7 21:32:02 2011 -0500 pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies. CONFIG_HAVE_PATA_PLATFORM, by virtue of where its defined, has a dependency on CONFG_ATA and CONFIG_ATA_SFF. This causes Kconfig warnings when it is selected by various architectures, such as warning: (ARCH_VEXPRESS && || ARCH_RPC && || MACH_VPAC270 && ARCH_PXA || MACH_REALVIEW_PB11MP && ARCH_REALVIEW || MACH_REALVIEW_PBA8 && ARCH_REALVIEW || MACH_REALVIEW_PBX && ARCH_REALVIEW || MACH_BAST_IDE && ARCH_S3C2410 || MACH_ANUBIS && ARCH_S3C2410) selects HAVE_PATA_PLATFORM which has unmet direct dependencies (ATA && ATA_SFF) Since this option is only used to control visibility of the CONFIG_PATA_PLATFORM option and isn't itself visible in the menu, it is straightforward to simply remove these dependencies rather than adjust all the architectures. Signed-off-by: Nick Bowler Signed-off-by: Jeff Garzik commit fc2698d5ec7e96ba2c94a942329cfa4c5d6085f7 Author: Sergei Shtylyov Date: Wed Jan 5 21:59:49 2011 +0300 pata_hpt37x: actually limit HPT370 to UltraDMA/66 The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock is less than 50 MHz but due to cut&paste type mistake this code has no effect... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit b197f13b53681c606e59d7d9a8a1d2d54fd363fe Author: Sergei Shtylyov Date: Tue Dec 28 23:11:36 2010 +0300 pata_hpt3x2n: coding style cleanup Fix 8 errors and 3 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 49bfbd38bfc997e9081beabd758b2bd655d26a9c Author: Sergei Shtylyov Date: Tue Dec 28 23:09:27 2010 +0300 pata_hpt37x: coding style cleanup Fix 12 errors and 15 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 28cd4b6b4850d7588f1033c3808314b6bc2150d5 Author: Sergei Shtylyov Date: Tue Dec 28 23:06:38 2010 +0300 pata_hpt366: coding style cleanup Fix 2 errors and 11 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *switch* and open parenthesis; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also add new line after variable definition in hpt36x_init_chipset()... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit dfc7e3e37d4a22ed5fd3f6e8c9842cb1246fee4f Author: Sergei Shtylyov Date: Tue Dec 28 22:54:54 2010 +0300 pata_hpt3x2n: calculate average f_CNT Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading the full 16-bit register, unlike what that driver does), so that this driver would work correctly on e.g. non-x86 machine with 66 MHz PCI. I'm not sure why Alan has only done this in one driver and not the other... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 0ca646db68d1bd7184dfc41362d0dd9d56c0e57e Author: Sergei Shtylyov Date: Tue Dec 28 21:46:40 2010 +0300 pata_hpt3x2n: clarify about HPT371N support Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N support and other bits) forgot to update the driver's Kconfig entry, heading comment, and module description (that also wrongly claims support of HPT302) which may confuse users... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 8e834c2e6d51e053c6bd23fec1d95529f618f760 Author: Sergei Shtylyov Date: Sat Dec 25 22:44:01 2010 +0300 pata_hpt{37x|3x2n}: SATA mode filtering The Marvell bridge chips used on HighPoint SATA cards do not seem to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes; these cards are based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so the Linux drivers need to have a mode_filter() method for these chips... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 0c21e3aaf6ae85bee804a325aa29c325209180fd Merge: 021db8e b2837fc Author: Linus Torvalds Date: Fri Jan 7 17:16:27 2011 -0800 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus: hfsplus: %L-to-%ll, macro correction, and remove unneeded braces hfsplus: spaces/indentation clean-up hfsplus: C99 comments clean-up hfsplus: over 80 character lines clean-up hfsplus: fix an artifact in ioctl flag checking hfsplus: flush disk caches in sync and fsync hfsplus: optimize fsync hfsplus: split up inode flags hfsplus: write up fsync for directories hfsplus: simplify fsync hfsplus: avoid useless work in hfsplus_sync_fs hfsplus: make sure sync writes out all metadata hfsplus: use raw bio access for partition tables hfsplus: use raw bio access for the volume headers hfsplus: always use hfsplus_sync_fs to write the volume header hfsplus: silence a few debug printks hfsplus: fix option parsing during remount Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c} commit 021db8e2bde53024a163fb4417a185de46fe77aa Merge: 72eb6a7 07fe035 Author: Linus Torvalds Date: Fri Jan 7 17:08:46 2011 -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: (77 commits) spi/omap: Fix DMA API usage in OMAP MCSPI driver spi/imx: correct the test on platform_get_irq() return value spi/topcliff: Typo fix threhold to threshold spi/dw_spi Typo change diable to disable. spi/fsl_espi: change the read behaviour of the SPIRF spi/mpc52xx-psc-spi: move probe/remove to proper sections spi/dw_spi: add DMA support spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs spi/dw_spi: Fix too short timeout in spi polling loop spi/pl022: convert running variable spi/pl022: convert busy flag to a bool spi/pl022: pass the returned sglen to the DMA engine spi/pl022: map the buffers on the DMA engine spi/topcliff_pch: Fix data transfer issue spi/imx: remove autodetection spi/pxa2xx: pass of_node to spi device and set a parent device spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add CE4100 support ... commit 72eb6a791459c87a0340318840bb3bd9252b627b Merge: 23d69b0 55ee4ef Author: Linus Torvalds Date: Fri Jan 7 17:02:58 2011 -0800 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits) gameport: use this_cpu_read instead of lookup x86: udelay: Use this_cpu_read to avoid address calculation x86: Use this_cpu_inc_return for nmi counter x86: Replace uses of current_cpu_data with this_cpu ops x86: Use this_cpu_ops to optimize code vmstat: User per cpu atomics to avoid interrupt disable / enable irq_work: Use per cpu atomics instead of regular atomics cpuops: Use cmpxchg for xchg to avoid lock semantics x86: this_cpu_cmpxchg and this_cpu_xchg operations percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support percpu,x86: relocate this_cpu_add_return() and friends connector: Use this_cpu operations xen: Use this_cpu_inc_return taskstats: Use this_cpu_ops random: Use this_cpu_inc_return fs: Use this_cpu_inc_return in buffer.c highmem: Use this_cpu_xx_return() operations vmstat: Use this_cpu_inc_return for vm statistics x86: Support for this_cpu_add, sub, dec, inc_return percpu: Generic support for this_cpu_add, sub, dec, inc_return ... Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c} as per Tejun. commit 23d69b09b78c4876e134f104a3814c30747c53f1 Merge: e744070 569ff2d Author: Linus Torvalds Date: Fri Jan 7 16:58:04 2011 -0800 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits) usb: don't use flush_scheduled_work() speedtch: don't abuse struct delayed_work media/video: don't use flush_scheduled_work() media/video: explicitly flush request_module work ioc4: use static work_struct for ioc4_load_modules() init: don't call flush_scheduled_work() from do_initcalls() s390: don't use flush_scheduled_work() rtc: don't use flush_scheduled_work() mmc: update workqueue usages mfd: update workqueue usages dvb: don't use flush_scheduled_work() leds-wm8350: don't use flush_scheduled_work() mISDN: don't use flush_scheduled_work() macintosh/ams: don't use flush_scheduled_work() vmwgfx: don't use flush_scheduled_work() tpm: don't use flush_scheduled_work() sonypi: don't use flush_scheduled_work() hvsi: don't use flush_scheduled_work() xen: don't use flush_scheduled_work() gdrom: don't use flush_scheduled_work() ... Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c as per Tejun. commit 4ead36407b41eae942c8c9f70ef963cd369c90e2 Author: Stefan Achatz Date: Fri Dec 10 19:43:34 2010 +0100 HID: roccat: Update sysfs attribute doc Updated sysfs attribute documentation to reflect recent changes in driver design. The device specific attributes moved from the driver to the respective roccat char device. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 4d043101897768dfde30a6f2674fc7cec403d6b0 Author: Jiri Kosina Date: Thu Dec 9 14:29:34 2010 +0100 HID: roccat: don't use #pragma pack Replace #pragma pack ocurences with __atribute__((__packed__)); Signed-off-by: Jiri Kosina commit 47dbdbffe15b9582a41727766d43f1d4208e977e Author: Stefan Achatz Date: Fri Nov 26 19:57:42 2010 +0000 HID: roccat: Add support for Roccat Kone[+] v2 This patch adds support for Roccat Kone[+] gaming mouse. Kone[+] is an enhanced version of the old Kone with more memory for macros, a better sensor and more functionality. This driver is conceptual similar to the existing Kone and Pyra drivers. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 14a057f80f0c4d45a9e68009f8bcb6b246e87ca0 Author: Stefan Achatz Date: Fri Nov 26 19:57:38 2010 +0000 HID: roccat: reduce number of functions in kone and pyra drivers The profile number is now passed via bin_attribute->private instead of function parameter to reduce number of functions. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit bd3a2b96631dd86b06dca96aef00790084a11e15 Author: Stefan Achatz Date: Fri Nov 26 19:57:36 2010 +0000 HID: roccat: declare meaning of pack pragma usage in driver headers Using pack pragma to prevent padding bytes in binary data structures used for hardware communication. Explanation of these pragmas was requested. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 5012aada506cb8b570e46579077c0ec5b82ebd5d Author: Stefan Achatz Date: Fri Nov 26 19:57:33 2010 +0000 HID: roccat: use class for char device for sysfs attribute creation Adding sysfs attributes to an already created device raises no userland notification. Now the device drivers associate the devices attributes with a class and use this for roccat event char device creation. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit c97415a72521071c235e0879f9a600014afd87b1 Author: Stefan Achatz Date: Fri Nov 26 19:57:29 2010 +0000 sysfs: Introducing binary attributes for struct class Added dev_bin_attrs to struct class similar to existing dev_attrs. Signed-off-by: Stefan Achatz Acked-by: Greg Kroah-Hartman Signed-off-by: Jiri Kosina commit a7153258b70ccbe3922fcee9ca4271d4f4c2bc55 Merge: ae5e49c 0fbf8ed Author: Jiri Kosina Date: Sat Jan 8 01:08:19 2011 +0100 Merge branches 'upstream' and 'upstream-fixes' into for-linus commit e744070fd4ff9d3114277e52d77afa21579adce2 Merge: d004e4d c9b5f50 Author: Linus Torvalds Date: Fri Jan 7 14:55:48 2011 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Constify function scope static struct sched_param usage sched: Fix strncmp operation sched: Move sched_autogroup_exit() to free_signal_struct() sched: Fix struct autogroup memory leak sched: Mark autogroup_init() __init sched: Consolidate the name of root_task_group and init_task_group commit d004e4d3322340b6433caaef4a47ab8c933afb70 Merge: 128283a 1c2a48c Author: Linus Torvalds Date: Fri Jan 7 14:55:31 2011 -0800 Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: apic: Cleanup and simplify setup_local_APIC() x86: Further simplify mp_irq info handling x86: Unify 3 similar ways of saving mp_irqs info x86, ioapic: Avoid writing io_apic id if already correct x86, x2apic: Don't map lapic addr for preenabled x2apic systems x86, sfi: Use register_lapic_address() x86, apic: Use register_lapic_address() in init_apic_mapping() x86, apic: Remove early_init_lapic_mapping() x86, apic: Unify identical register_lapic_address() functions commit 128283a47e7cc6754db3d2704004c1ed728d26db Merge: 442d1ba 6d5db46 Author: Linus Torvalds Date: Fri Jan 7 14:54:03 2011 -0800 Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, MCE: Fix NB error formatting EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit EDAC, MCE: Enable MCE decoding on F15h EDAC, MCE: Allow F15h bank 6 MCE injection EDAC, MCE: Shorten error report formatting EDAC, MCE: Overhaul error fields extraction macros EDAC, MCE: Add F15h FP MCE decoder EDAC, MCE: Add F15 EX MCE decoder EDAC, MCE: Add an F15h NB MCE decoder EDAC, MCE: No F15h LS MCE decoder EDAC, MCE: Add F15h CU MCE decoder EDAC, MCE: Add F15h IC MCE decoder EDAC, MCE: Add F15h DC MCE decoder EDAC, MCE: Select extended error code mask commit 442d1ba237c81304ccfa33887094e843183645f7 Merge: fb5131e a135cef Author: Linus Torvalds Date: Fri Jan 7 14:53:42 2011 -0800 Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Disable DRAM ECC injection on K8 EDAC: Fixup scrubrate manipulation amd64_edac: Remove two-stage initialization amd64_edac: Check ECC capabilities initially amd64_edac: Carve out ECC-related hw settings amd64_edac: Remove PCI ECS enabling functions amd64_edac: Remove explicit Kconfig PCI dependency amd64_edac: Allocate driver instances dynamically amd64_edac: Rework printk macros amd64_edac: Rename CPU PCI devices amd64_edac: Concentrate per-family init even more amd64_edac: Cleanup the CPU PCI device reservation amd64_edac: Simplify CPU family detection amd64_edac: Add per-family init function amd64_edac: Use cached extended CPU model amd64_edac: Remove F11h support commit fb5131e1880ea1ba3ba7197cd5cc66c9c288f715 Merge: d074b10 8e10230 Author: Linus Torvalds Date: Fri Jan 7 14:50:50 2011 -0800 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits) [S390] prevent unneccesary loops_per_jiffy recalculation [S390] cpuinfo: use get_online_cpus() instead of preempt_disable() [S390] smp: remove cpu hotplug messages [S390] mutex: enable spinning mutex on s390 [S390] mutex: Introduce arch_mutex_cpu_relax() [S390] cio: fix ccwgroup unregistration race condition [S390] perf: add DWARF register lookup for s390 [S390] cleanup ftrace backend functions [S390] ptrace cleanup [S390] smp/idle: call init_idle() before starting a new cpu [S390] smp: delay idle task creation [S390] dasd: Correct retry counter for terminated I/O. [S390] dasd: Add support for raw ECKD access. [S390] dasd: Prevent deadlock during suspend/resume. [S390] dasd: Improve handling of stolen DASD reservation [S390] dasd: do path verification for paths added at runtime [S390] dasd: add High Performance FICON multitrack support [S390] cio: reduce memory consumption of itcw structures [S390] nmi: enable machine checks early [S390] qeth: buffer count imbalance ... commit d074b104cefcb6e8ded55a53e62fed59a246f55d Merge: 31b6ca0 c413521 Author: Linus Torvalds Date: Fri Jan 7 14:50:14 2011 -0800 Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits) ARM: mach-shmobile: update for SMP changes. ARM: mach-shmobile: update for GIC changes. ARM: mach-shmobile: Fix up clkdev fallout for SH73A0. dma: shdma: don't register the global die notifier multiple times ARM: mach-shmobile: Rely on run-time IRQ handlers ARM: mach-shmobile: Run-time IRQ handler for GIC ARM: mach-shmobile: Run-time IRQ handler for INTCA ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER ARM: mach-shmobile: Use shared GIC entry macros ARM: mach-shmobile: mackerel: Add zboot support ARM: mach-shmobile: mackerel: Add HDMI sound support ARM: mach-shmobile: mackerel: add HDMI video support ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk ARM: mach-shmobile: sh73a0: fix div4 table ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB ARM: mach-shmobile: Mackerel VGA camera support mmc: sh_mmcif: make DMA support by the driver unconditional ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins ARM: mach-shmobile: sh73a0 GPIO pullup improvement ... commit 31b6ca0af758a88e5e769b48cc6dde037ee37b96 Merge: 56b85f3 554738d Author: Linus Torvalds Date: Fri Jan 7 14:45:47 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig commit 56b85f32d530d09d6805488ad00775d4e0e3baab Merge: 3e5b08c 568389c Author: Linus Torvalds Date: Fri Jan 7 14:39:20 2011 -0800 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (36 commits) serial: apbuart: Fixup apbuart_console_init() TTY: Add tty ioctl to figure device node of the system console. tty: add 'active' sysfs attribute to tty0 and console device drivers: serial: apbuart: Handle OF failures gracefully Serial: Avoid unbalanced IRQ wake disable during resume tty: fix typos/errors in tty_driver.h comments pch_uart : fix warnings for 64bit compile 8250: fix uninitialized FIFOs ip2: fix compiler warning on ip2main_pci_tbl specialix: fix compiler warning on specialix_pci_tbl rocket: fix compiler warning on rocket_pci_ids 8250: add a UPIO_DWAPB32 for 32 bit accesses 8250: use container_of() instead of casting serial: omap-serial: Add support for kernel debugger serial: fix pch_uart kconfig & build drivers: char: hvc: add arm JTAG DCC console support RS485 documentation: add 16C950 UART description serial: ifx6x60: fix memory leak serial: ifx6x60: free IRQ on error Serial: EG20T: add PCH_UART driver ... Fixed up conflicts in drivers/serial/apbuart.c with evil merge that makes the code look fairly sane (unlike either side). commit ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b Author: maximilian attems Date: Fri Jan 7 16:13:06 2011 +0100 deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/ hdrpackage and headerpackage are not intuitive names, use proposed alternatives by Michel Marek. While touching them move the mkdir of the kernel_headers dir up and fix it for paranoid umask. CC: Theodore Ts'o Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 Merge: da40d03 2af1084 Author: Linus Torvalds Date: Fri Jan 7 13:16:28 2011 -0800 Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits) USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) USB: serial: ftdi_sio: add support for TIOCSERGETLSR USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport USB: atmel_usba_udc: fix freeing irq in usba_udc_remove() usb: ehci-omap: fix tll channel enable mask usb: ohci-omap3: fix trivial typo USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096 USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's USB: gadget: update ci13xxx to work with g_ether USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers Revert "USB: musb: pm: don't rely fully on clock support" Revert "USB: musb: blackfin: pm: make it work" USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added ... Manually fix up trivial conflicts in USB Kconfig changes in: arch/arm/mach-omap2/Kconfig arch/sh/Kconfig drivers/usb/Kconfig drivers/usb/host/ehci-hcd.c and annoying chip clock data conflicts in: arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/clock44xx_data.c commit da40d036fd716f0efb2917076220814b1e927ae1 Merge: aa58abc c32e061 Author: Linus Torvalds Date: Fri Jan 7 12:47:02 2011 -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: (147 commits) [SCSI] arcmsr: fix write to device check [SCSI] lpfc: lower stack use in lpfc_fc_frame_check [SCSI] eliminate an unnecessary local variable from scsi_remove_target() [SCSI] libiscsi: use bh locking instead of irq with session lock [SCSI] libiscsi: do not take host lock in queuecommand [SCSI] be2iscsi: fix null ptr when accessing task hdr [SCSI] be2iscsi: fix gfp use in alloc_pdu [SCSI] libiscsi: add more informative failure message during iscsi scsi eh [SCSI] gdth: Add missing call to gdth_ioctl_free [SCSI] bfa: remove unused defintions and misc cleanups [SCSI] bfa: remove inactive functions [SCSI] bfa: replace bfa_assert with WARN_ON [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list. [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout. [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure. [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts. [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs. [SCSI] qla2xxx: Remove redundant module parameter permission bits [SCSI] qla2xxx: Add sysfs node for displaying board temperature. [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code. ... commit aa58abc20fa85328a9f048e2626c0893691ff284 Author: Dan Carpenter Date: Fri Jan 7 20:47:37 2011 +0100 input/tc3589x: fix compile error There was a semi-colon missing and it broke the compile. Signed-off-by: Dan Carpenter Cc: Dmitry Torokhov Signed-off-by: Linus Walleij Signed-off-by: Linus Torvalds commit 07fe0351702b6f0c9749e80cdbcb758686b0fe9b Author: Russell King - ARM Linux Date: Fri Jan 7 15:49:20 2011 +0000 spi/omap: Fix DMA API usage in OMAP MCSPI driver Running the latest kernel on the 4430SDP board with DMA API debugging enabled results in this: WARNING: at lib/dma-debug.c:803 check_unmap+0x19c/0x6f0() NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000008129901a] [size=260 bytes] Modules linked in: Backtrace: [] (dump_backtrace+0x0/0x10c) from [] (dump_stack+0x18/0x1c) r7:c1839dc0 r6:c0198578 r5:c0304b17 r4:00000323 [] (dump_stack+0x0/0x1c) from [] (warn_slowpath_common+0x58/0x70) [] (warn_slowpath_common+0x0/0x70) from [] (warn_slowpath_fmt+0x38/0x40) r8:c1839e40 r7:00000000 r6:00000104 r5:00000000 r4:8129901a [] (warn_slowpath_fmt+0x0/0x40) from [] (check_unmap+0x19c/0x6f0) r3:c03110de r2:c0304e6b [] (check_unmap+0x0/0x6f0) from [] (debug_dma_unmap_page+0x74/0x80) [] (debug_dma_unmap_page+0x0/0x80) from [] (omap2_mcspi_work+0x514/0xbf0) [] (omap2_mcspi_work+0x0/0xbf0) from [] (process_one_work+0x294/0x400) [] (process_one_work+0x0/0x400) from [] (worker_thread+0x220/0x3f8) [] (worker_thread+0x0/0x3f8) from [] (kthread+0x88/0x90) [] (kthread+0x0/0x90) from [] (do_exit+0x0/0x5fc) r7:00000013 r6:c005e924 r5:c0073848 r4:c1829ee0 ---[ end trace 1b75b31a2719ed20 ]--- I've no idea why this driver uses NULL for dma_unmap_single instead of the &spi->dev that is laying around just waiting to be used in that function - but it's an easy fix. Also replace this comment with a FIXME comment: /* Do DMA mapping "early" for better error reporting and * dcache use. Note that if dma_unmap_single() ever starts * to do real work on ARM, we'd need to clean up mappings * for previous transfers on *ALL* exits of this loop... */ as the comment is not true - we do work in dma_unmap() functions, particularly on ARMv6 and above. I've corrected the existing unmap functions but if any others are required they must be added ASAP. Signed-off-by: Russell King Acked-by: Tony Lindgren Signed-off-by: Grant Likely commit 735759389b7143f95ae7badc97511e7e4729e873 Author: Richard Genoud Date: Fri Jan 7 15:26:01 2011 +0100 spi/imx: correct the test on platform_get_irq() return value The test "if (spi_imx->irq <= 0)" is not testing the IRQ value, but the return value of platform_get_irq(). As platform_get_irq() can return an error (-ENXIO) or the IRQ value it found, the test should be "if (spi_imx->irq < 0)" [grant.likely: Note: In general, Linux irq number 0 should also mean no irq, but arm still allows devices to be assigned 0, and the imx platform uses 0 for one of the spi devices, so this patch is needed for the device to work] Signed-off-by: Richard Genoud Signed-off-by: Grant Likely commit b4a45f5fe8078bfc10837dbd5b98735058bc4698 Merge: 01539ba b3e19d9 Author: Linus Torvalds Date: Fri Jan 7 08:56:33 2011 -0800 Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin * 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits) fs: scale mntget/mntput fs: rename vfsmount counter helpers fs: implement faster dentry memcmp fs: prefetch inode data in dcache lookup fs: improve scalability of pseudo filesystems fs: dcache per-inode inode alias locking fs: dcache per-bucket dcache hash locking bit_spinlock: add required includes kernel: add bl_list xfs: provide simple rcu-walk ACL implementation btrfs: provide simple rcu-walk ACL implementation ext2,3,4: provide simple rcu-walk ACL implementation fs: provide simple rcu-walk generic_check_acl implementation fs: provide rcu-walk aware permission i_ops fs: rcu-walk aware d_revalidate method fs: cache optimise dentry and inode for rcu-walk fs: dcache reduce branches in lookup path fs: dcache remove d_mounted fs: fs_struct use seqlock fs: rcu-walk for path lookup ... commit e68077856e599cd33d8cd5db15762df60c29d361 Author: maximilian attems Date: Sat Jan 1 16:44:13 2011 +0100 deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb userland dev likes latest incarnation of that userland API. make it easy to also build it on make deb-pkg invocation: dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'. Last year patch rebased on top of latest deb-pkg changes. Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 Author: Sheng Yang Date: Tue Dec 21 14:18:49 2010 +0800 xen: HVM X2APIC support This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster. [v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion] Acked-by: Jeremy Fitzhardinge Signed-off-by: Sheng Yang Signed-off-by: Konrad Rzeszutek Wilk commit 2904ed8dd5a748c52caf4d8b09d3d9834b5932fa Author: Sheng Yang Date: Tue Dec 21 14:18:48 2010 +0800 apic: Move hypervisor detection of x2apic to hypervisor.h Then we can reuse it for Xen later. Acked-by: Jeremy Fitzhardinge Acked-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Sheng Yang Signed-off-by: Konrad Rzeszutek Wilk commit c9b5f501ef1580faa30c40c644b7691870462201 Author: Peter Zijlstra Date: Fri Jan 7 13:41:40 2011 +0100 sched: Constify function scope static struct sched_param usage Function-scope statics are discouraged because they are easily overlooked and can cause subtle bugs/races due to their global (non-SMP safe) nature. Linus noticed that we did this for sched_param - at minimum make the const. Suggested-by: Linus Torvalds Signed-off-by: Peter Zijlstra LKML-Reference: Message-ID: Signed-off-by: Ingo Molnar commit 524429c31b486c05449666b94613f59f729c0a84 Author: Hillf Danton Date: Thu Jan 6 20:58:12 2011 +0800 sched: Fix strncmp operation One of the operands, buf, is incorrect, since it is stripped and the correct address for subsequent string comparing could change if leading white spaces, if any, are removed from buf. It is fixed by replacing buf with cmp. Signed-off-by: Hillf Danton Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 1c5354de90c900b369e2ebd36c3a065ede29eb93 Author: Mike Galbraith Date: Wed Jan 5 11:16:04 2011 +0100 sched: Move sched_autogroup_exit() to free_signal_struct() Per Oleg's suggestion, undo fork failure free/put_signal_struct change, and move sched_autogroup_exit() to free_signal_struct() instead. Signed-off-by: Mike Galbraith Reviewed-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <1294222564.8369.6.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit e9aa1dd19fe49b5aed3ca94aab87576e534d2a39 Author: Mike Galbraith Date: Wed Jan 5 11:11:25 2011 +0100 sched: Fix struct autogroup memory leak Seems I lost a change somewhere, leaking memory. sched: fix struct autogroup memory leak Add missing change to actually use autogroup_free(). Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1294222285.8369.2.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 0ca0873555c0abe17b28c25b19f82857c0ddd2bc Author: Yong Zhang Date: Fri Jan 7 12:43:45 2011 +0800 sched: Mark autogroup_init() __init autogroup_init() is only called at boot time. Signed-off-by: Yong Zhang Cc: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1294375425-31065-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 07e06b011db2b3300f6c975ebf293fc4c8c59942 Author: Yong Zhang Date: Fri Jan 7 15:17:36 2011 +0800 sched: Consolidate the name of root_task_group and init_task_group root_task_group is the leftover of USER_SCHED, now it's always same to init_task_group. But as Mike suggested, root_task_group is maybe the suitable name to keep for a tree. So in this patch: init_task_group --> root_task_group init_task_group_load --> root_task_group_load INIT_TASK_GROUP_LOAD --> ROOT_TASK_GROUP_LOAD Suggested-by: Mike Galbraith Signed-off-by: Yong Zhang Signed-off-by: Peter Zijlstra LKML-Reference: <20110107071736.GA32635@windriver.com> Signed-off-by: Ingo Molnar commit 39177ec36236fb71257e51d0d198437b84170911 Author: Peter Korsgaard Date: Thu Jan 6 16:42:45 2011 +0100 nconf: handle comment entries within choice/endchoice Equivalent to af6c1598 (kconfig: handle comment entries within choice/endchoice), but for nconfig instead. Implement support for comment entries within choice groups. Comment entries are displayed visually distinct from normal configs, and selecting them is a no-op. Signed-off-by: Peter Korsgaard Signed-off-by: Michal Marek commit bc91c9f313309915f6ec767f56f78dcd0305b20f Author: Roland Stigge Date: Fri Dec 17 17:19:17 2010 +0100 mkuboot.sh: Fail if mkimage is missing on building an uImage, I get: $ make uImage CHK include/linux/version.h CHK include/generated/utsrelease.h make[1]: `include/generated/mach-types.h' is up to date. CALL scripts/checksyscalls.sh CHK include/generated/compile.h Kernel: arch/arm/boot/Image is ready SHIPPED arch/arm/boot/compressed/lib1funcs.S AS arch/arm/boot/compressed/lib1funcs.o LD arch/arm/boot/compressed/vmlinux OBJCOPY arch/arm/boot/zImage Kernel: arch/arm/boot/zImage is ready UIMAGE arch/arm/boot/uImage "mkimage" command not found - U-Boot images will not be built Image arch/arm/boot/uImage is ready $ I.e. it says: "uImage is ready" even though the uImage file doesn't exist because mkimage is missing. I propose the attached patch. Signed-off-by: Roland Stigge Signed-off-by: Michal Marek commit 1c2a48cf65580a276552151eb8f78d78c55b828e Merge: 0aa002f cb600d2 Author: Ingo Molnar Date: Fri Jan 7 14:14:15 2011 +0100 Merge branch 'linus' into x86/apic-cleanups Conflicts: arch/x86/include/asm/io_apic.h Merge reason: Resolve the conflict, update to a more recent -rc base Signed-off-by: Ingo Molnar commit 6d5db4668796d903dc3bad2852c82073509c37d2 Author: Borislav Petkov Date: Thu Nov 25 15:40:27 2010 +0100 EDAC, MCE: Fix NB error formatting Minor formatting fixup since the information which core was associated with the MCE is not always valid. Signed-off-by: Borislav Petkov commit 50adbbd8a8e572ad2533eace228c841ec84028a3 Author: Randy Dunlap Date: Sat Nov 13 11:44:26 2010 -0500 EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit Building for X86_32 produces shift count warnings, so use BIT_64() to eliminate the warnings. drivers/edac/mce_amd.c:778: warning: left shift count >= width of type drivers/edac/mce_amd.c:778: warning: left shift count >= width of type Signed-off-by: Randy Dunlap Cc: Doug Thompson Cc: bluesmoke-devel@lists.sourceforge.net Signed-off-by: Borislav Petkov commit bad11e031862294265145d87dd4be1ae4af0d57f Author: Borislav Petkov Date: Wed Sep 22 17:44:51 2010 +0200 EDAC, MCE: Enable MCE decoding on F15h Now that everything is inplace, enable MCE decoding on F15h. Make initcall routine a bit more readable. Signed-off-by: Borislav Petkov commit 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae Author: Borislav Petkov Date: Tue Nov 9 19:41:49 2010 +0100 EDAC, MCE: Allow F15h bank 6 MCE injection F15h adds a sixth MCE bank: adjust bank number check in the injection code. Signed-off-by: Borislav Petkov commit fa7ae8cc8c88c0679eab24c5a1b5d3b134a5f542 Author: Borislav Petkov Date: Wed Sep 22 17:42:27 2010 +0200 EDAC, MCE: Shorten error report formatting Shorten up MCi_STATUS flags and add BD's new deferred and poison types. Also, simplify formatting. Signed-off-by: Borislav Petkov commit 6245288232516aadf293f575d1812dafb4696aee Author: Borislav Petkov Date: Wed Sep 22 16:08:37 2010 +0200 EDAC, MCE: Overhaul error fields extraction macros Make macro names shorter thus making code shorter and more clear. Signed-off-by: Borislav Petkov commit b8f85c477bdf1fec98ea7cbe952fdb5f40eb0aa7 Author: Borislav Petkov Date: Wed Sep 22 15:37:58 2010 +0200 EDAC, MCE: Add F15h FP MCE decoder Add decoder for FP MCEs. Signed-off-by: Borislav Petkov commit 8259a7e5724c42c89d927b92cda3e0ab15b9ade9 Author: Borislav Petkov Date: Wed Sep 22 15:28:59 2010 +0200 EDAC, MCE: Add F15 EX MCE decoder Integrate the single FIROB signature into an expanded table along with the new BD MCE types. Signed-off-by: Borislav Petkov commit 05cd667d668eb08845dd49c02130e5223121b715 Author: Borislav Petkov Date: Wed Sep 22 15:06:24 2010 +0200 EDAC, MCE: Add an F15h NB MCE decoder by (almost) reusing the F10h one since the signatures are the same. Signed-off-by: Borislav Petkov commit b18434cad1740466f7a1c304ea4af0f4d3c874f1 Author: Borislav Petkov Date: Wed Sep 22 11:53:32 2010 +0200 EDAC, MCE: No F15h LS MCE decoder F15h BD doesn't generate LS MCEs so warn about it. Signed-off-by: Borislav Petkov commit 70fdb494aa8c82f76745d5a32b8abc505813557c Author: Borislav Petkov Date: Tue Sep 21 20:45:10 2010 +0200 EDAC, MCE: Add F15h CU MCE decoder MCE bank 2 is redefined from a BU to a CU (Combined Unit) bank on F15h. Add a decoder function for CU MCEs. Signed-off-by: Borislav Petkov commit 86039cd401e1780573733870f9c0bd458fc96ea2 Author: Borislav Petkov Date: Mon Nov 8 15:03:35 2010 +0100 EDAC, MCE: Add F15h IC MCE decoder Add support for decoding F15h IC MCEs. Signed-off-by: Borislav Petkov commit 25a4f8b05917f8137bfff8a3f8c6c8c1ac561208 Author: Borislav Petkov Date: Fri Sep 17 19:22:34 2010 +0200 EDAC, MCE: Add F15h DC MCE decoder Add a decoder for F15h DC MCEs to support the new types of DC MCEs introduced by the BD microarchitecture. Signed-off-by: Borislav Petkov commit 2be64bfac71378e1aa8c20031a499bd55e391244 Author: Borislav Petkov Date: Fri Sep 17 19:11:47 2010 +0200 EDAC, MCE: Select extended error code mask F15h enlarges the extended error code of an MCE to a 5-bit field (MCi_STATUS[20:16]). Add a mask variable which default 0xf is overridden on F15h. Signed-off-by: Borislav Petkov commit a135cef79a2927ecff800492a26cd314e9cba996 Author: Borislav Petkov Date: Fri Nov 26 19:24:44 2010 +0100 amd64_edac: Disable DRAM ECC injection on K8 K8 does not allow for an atomic RMW to a cacheline as F10h does so disable the error injection interface for it. Signed-off-by: Borislav Petkov commit 390944439f746824faec51b576f50cb5ef18745b Author: Borislav Petkov Date: Wed Nov 24 19:52:09 2010 +0100 EDAC: Fixup scrubrate manipulation Make the ->{get|set}_sdram_scrub_rate return the actual scrub rate bandwidth it succeeded setting and remove superfluous arg pointer used for that. A negative value returned still means that an error occurred while setting the scrubrate. Document this for future reference. Signed-off-by: Borislav Petkov commit 360b7f3c602ed80ce8c6b2585dcb76883a440c17 Author: Borislav Petkov Date: Fri Oct 15 19:25:38 2010 +0200 amd64_edac: Remove two-stage initialization Now that all prerequisites are in place, drop the two-stage driver instances initialization in favor of the following simple init sequence: 1. Probe PCI device: we only test ECC capabilities here and if none exit early. 2. If the hw supports ECC and it is/can be enabled, we init the per-node instance. Remove "amd64_" prefix from static functions touched, while at it. There actually should be no visible functional change resulting from this patch. Signed-off-by: Borislav Petkov commit 2299ef7114000f8e403797b7f9a972f54bc05fad Author: Borislav Petkov Date: Fri Oct 15 17:44:04 2010 +0200 amd64_edac: Check ECC capabilities initially Rework the code to check the hardware ECC capabilities at PCI probing time. We do all further initialization only if we actually can/have ECC enabled. While at it: 0. Fix function naming. 1. Simplify/clarify debug output. 2. Remove amd64_ prefix from the static functions 3. Reorganize code. Signed-off-by: Borislav Petkov commit ae7bb7c679e7ddba6c52d1a78a30f9bc868d9738 Author: Borislav Petkov Date: Thu Oct 14 16:01:30 2010 +0200 amd64_edac: Carve out ECC-related hw settings This is in preparation for the init path reorganization where we want only to 1) test whether a particular node supports ECC 2) can it be enabled and only then do the necessary allocation/initialization. For that, we need to decouple the ECC settings of the node from the instance's descriptor. The should be no functional change introduced by this patch. Signed-off-by: Borislav Petkov commit f1db274e1ba7004909de4a9cee62f631c030ba3e Author: Borislav Petkov Date: Thu Oct 14 14:37:13 2010 +0200 amd64_edac: Remove PCI ECS enabling functions PCI ECS is being enabled by default since 2.6.26 on AMD so this code is just superfluous now, remove it. Signed-off-by: Borislav Petkov commit 027dbd6f5d419c25750d6a26c5c46f46f2093a11 Author: Borislav Petkov Date: Wed Oct 13 22:12:15 2010 +0200 amd64_edac: Remove explicit Kconfig PCI dependency AMD_NB pulls in the dependency on PCI. Clarify/fix help text while at it. Signed-off-by: Borislav Petkov commit cc4d8860fc37dd315b16a43202400d822ab63221 Author: Borislav Petkov Date: Wed Oct 13 16:11:59 2010 +0200 amd64_edac: Allocate driver instances dynamically Remove static allocation in favor of dynamically allocating space for as many driver instances as northbridges present on the system. There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov commit 24f9a7fe3f19f3fd310f556364d01a22911724b3 Author: Borislav Petkov Date: Thu Oct 7 18:29:15 2010 +0200 amd64_edac: Rework printk macros Add a macro per printk level, shorten up error messages. Add relevant information to KERN_INFO level. No functional change. Signed-off-by: Borislav Petkov commit 8d5b5d9c7b86e44fda29a367db3ccd2815a52f7c Author: Borislav Petkov Date: Fri Oct 1 20:11:07 2010 +0200 amd64_edac: Rename CPU PCI devices Rename variables representing PCI devices to their BKDG names for faster search and shorter, clearer code. Signed-off-by: Borislav Petkov commit b8cfa02f833a614e80f851747c4ce14989a4cfd0 Author: Borislav Petkov Date: Fri Oct 1 19:35:38 2010 +0200 amd64_edac: Concentrate per-family init even more Move the remaining per-family init code into the proper place and simplify the rest of the initialization. Reorganize error handling in amd64_init_one_instance(). Signed-off-by: Borislav Petkov commit bbd0c1f675d7d64fc02393d4985a069be5037b54 Author: Borislav Petkov Date: Fri Oct 1 19:27:58 2010 +0200 amd64_edac: Cleanup the CPU PCI device reservation Shorten code and clarify comments, return proper -E* values on error. Signed-off-by: Borislav Petkov commit 0092b20d4cf3de243b5c82b410ee02644cec2707 Author: Borislav Petkov Date: Fri Oct 1 19:20:05 2010 +0200 amd64_edac: Simplify CPU family detection Concentrate CPU family detection in the per-family init function. Signed-off-by: Borislav Petkov commit 395ae783b384e5243804b07fba3e3f8379ddf1d6 Author: Borislav Petkov Date: Fri Oct 1 18:38:19 2010 +0200 amd64_edac: Add per-family init function Run a per-family init function which does all the settings based on the family this driver instance is running on. Move the scrubrate calculation in it and simplify code. Signed-off-by: Borislav Petkov commit 9f56da0e3c3269abe0b2745a54f1b082c3c14433 Author: Borislav Petkov Date: Fri Oct 1 19:44:53 2010 +0200 amd64_edac: Use cached extended CPU model ... instead of computing it needlessly again. Signed-off-by: Borislav Petkov commit 3ab0e7dc2e1d5598da609ec9a9bcd3b69b8fa654 Author: Borislav Petkov Date: Fri Oct 1 18:19:06 2010 +0200 amd64_edac: Remove F11h support F11h doesn't support DRAM ECC so whack it away. Signed-off-by: Borislav Petkov commit b3e19d924b6eaf2ca7d22cba99a517c5171007b6 Author: Nick Piggin Date: Fri Jan 7 17:50:11 2011 +1100 fs: scale mntget/mntput The problem that this patch aims to fix is vfsmount refcounting scalability. We need to take a reference on the vfsmount for every successful path lookup, which often go to the same mount point. The fundamental difficulty is that a "simple" reference count can never be made scalable, because any time a reference is dropped, we must check whether that was the last reference. To do that requires communication with all other CPUs that may have taken a reference count. We can make refcounts more scalable in a couple of ways, involving keeping distributed counters, and checking for the global-zero condition less frequently. - check the global sum once every interval (this will delay zero detection for some interval, so it's probably a showstopper for vfsmounts). - keep a local count and only taking the global sum when local reaches 0 (this is difficult for vfsmounts, because we can't hold preempt off for the life of a reference, so a counter would need to be per-thread or tied strongly to a particular CPU which requires more locking). - keep a local difference of increments and decrements, which allows us to sum the total difference and hence find the refcount when summing all CPUs. Then, keep a single integer "long" refcount for slow and long lasting references, and only take the global sum of local counters when the long refcount is 0. This last scheme is what I implemented here. Attached mounts and process root and working directory references are "long" references, and everything else is a short reference. This allows scalable vfsmount references during path walking over mounted subtrees and unattached (lazy umounted) mounts with processes still running in them. This results in one fewer atomic op in the fastpath: mntget is now just a per-CPU inc, rather than an atomic inc; and mntput just requires a spinlock and non-atomic decrement in the common case. However code is otherwise bigger and heavier, so single threaded performance is basically a wash. Signed-off-by: Nick Piggin commit c6653a838b1b2738561aff0b8c0f62a9b714bdd9 Author: Nick Piggin Date: Fri Jan 7 17:50:10 2011 +1100 fs: rename vfsmount counter helpers Suggested by Andreas, mnt_ prefix is clearer namespace, follows kernel conventions better, and is easier for tab complete. I introduced these names so I'll admit they were not good choices. Signed-off-by: Nick Piggin commit 9d55c369bb5e695e629bc35cba2ef607755b3bee Author: Nick Piggin Date: Fri Jan 7 17:50:09 2011 +1100 fs: implement faster dentry memcmp The standard memcmp function on a Westmere system shows up hot in profiles in the `git diff` workload (both parallel and single threaded), and it is likely due to the costs associated with trapping into microcode, and little opportunity to improve memory access (dentry name is not likely to take up more than a cacheline). So replace it with an open-coded byte comparison. This increases code size by 8 bytes in the critical __d_lookup_rcu function, but the speedup is huge, averaging 10 runs of each: git diff st user sys elapsed CPU before 1.15 2.57 3.82 97.1 after 1.14 2.35 3.61 96.8 git diff mt user sys elapsed CPU before 1.27 3.85 1.46 349 after 1.26 3.54 1.43 333 Elapsed time for single threaded git diff at 95.0% confidence: -0.21 +/- 0.01 -5.45% +/- 0.24% It's -0.66% +/- 0.06% elapsed time on my Opteron, so rep cmp costs on the fam10h seem to be relatively smaller, but there is still a win. Signed-off-by: Nick Piggin commit e1bb57826381199cc79fbf44e9dfeee58fc7b339 Author: Nick Piggin Date: Fri Jan 7 17:50:08 2011 +1100 fs: prefetch inode data in dcache lookup This makes single threaded git diff -1.25% +/- 0.05% elapsed time on my 2s12c24t Westmere system, and -0.86% +/- 0.05% on my 2s8c Barcelona, by prefetching the important first cacheline of the inode in while we do the actual name compare and other operations on the dentry. There was no measurable slowdown in the single file stat case, or the creat case (where negative dentries would be common). Signed-off-by: Nick Piggin commit 4b936885ab04dc6e0bb0ef35e0e23c1a7364d9e5 Author: Nick Piggin Date: Fri Jan 7 17:50:07 2011 +1100 fs: improve scalability of pseudo filesystems Regardless of how much we possibly try to scale dcache, there is likely always going to be some fundamental contention when adding or removing children under the same parent. Pseudo filesystems do not seem need to have connected dentries because by definition they are disconnected. Signed-off-by: Nick Piggin commit 873feea09ebc980cbd3631b767356ce1eee65ec1 Author: Nick Piggin Date: Fri Jan 7 17:50:06 2011 +1100 fs: dcache per-inode inode alias locking dcache_inode_lock can be replaced with per-inode locking. Use existing inode->i_lock for this. This is slightly non-trivial because we sometimes need to find the inode from the dentry, which requires d_inode to be stabilised (either with refcount or d_lock). Signed-off-by: Nick Piggin commit ceb5bdc2d246f6d81cf61ed70f325308a11821d2 Author: Nick Piggin Date: Fri Jan 7 17:50:05 2011 +1100 fs: dcache per-bucket dcache hash locking We can turn the dcache hash locking from a global dcache_hash_lock into per-bucket locking. Signed-off-by: Nick Piggin commit 626d607435617cc0f033522083e2bb195b81813c Author: Nick Piggin Date: Fri Jan 7 17:50:04 2011 +1100 bit_spinlock: add required includes Signed-off-by: Nick Piggin commit 4e35e6070b1ceed89c3bba2af4216c286fb1dafd Author: Nick Piggin Date: Fri Jan 7 17:50:03 2011 +1100 kernel: add bl_list Introduce a type of hlist that can support the use of the lowest bit in the hlist_head. This will be subsequently used to implement per-bucket bit spinlock for inode and dentry hashes, and may be useful in other cases such as network hashes. Reviewed-by: Paul E. McKenney Signed-off-by: Nick Piggin commit 880566e17c4fce0d998d92610d32fcb9506aa6dd Author: Nick Piggin Date: Fri Jan 7 17:50:02 2011 +1100 xfs: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 258a5aa8dfc6294f5f7df892023ee4d3e57c9841 Author: Nick Piggin Date: Fri Jan 7 17:50:01 2011 +1100 btrfs: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 73598611ade7c85f0c3d52ba5130103f6709c6d3 Author: Nick Piggin Date: Fri Jan 7 17:50:00 2011 +1100 ext2,3,4: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5 Author: Nick Piggin Date: Fri Jan 7 17:49:59 2011 +1100 fs: provide simple rcu-walk generic_check_acl implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. This could easily be extended to put acls under RCU and check them under seqlock, if need be. But this implementation is enough to show the rcu-walk aware permissions code for path lookups is working, and will handle cases where there are no ACLs or ACLs in just the final element. This patch implicity converts tmpfs to rcu-aware permission check. Subsequent patches onvert ext*, xfs, and, btrfs. Each of these uses acl/permission code in a different way, so convert them all to provide templates and proof of concept. Signed-off-by: Nick Piggin commit b74c79e99389cd79b31fcc08f82c24e492e63c7e Author: Nick Piggin Date: Fri Jan 7 17:49:58 2011 +1100 fs: provide rcu-walk aware permission i_ops Signed-off-by: Nick Piggin commit 34286d6662308d82aed891852d04c7c3a2649b16 Author: Nick Piggin Date: Fri Jan 7 17:49:57 2011 +1100 fs: rcu-walk aware d_revalidate method Require filesystems be aware of .d_revalidate being called in rcu-walk mode (nd->flags & LOOKUP_RCU). For now do a simple push down, returning -ECHILD from all implementations. Signed-off-by: Nick Piggin commit 44a7d7a878c9cbb74f236ea755b25b6b2e26a9a9 Author: Nick Piggin Date: Fri Jan 7 17:49:56 2011 +1100 fs: cache optimise dentry and inode for rcu-walk Put dentry and inode fields into top of data structure. This allows RCU path traversal to perform an RCU dentry lookup in a path walk by touching only the first 56 bytes of the dentry. We also fit in 8 bytes of inline name in the first 64 bytes, so for short names, only 64 bytes needs to be touched to perform the lookup. We should get rid of the hash->prev pointer from the first 64 bytes, and fit 16 bytes of name in there, which will take care of 81% rather than 32% of the kernel tree. inode is also rearranged so that RCU lookup will only touch a single cacheline in the inode, plus one in the i_ops structure. This is important for directory component lookups in RCU path walking. In the kernel source, directory names average is around 6 chars, so this works. When we reach the last element of the lookup, we need to lock it and take its refcount which requires another cacheline access. Align dentry and inode operations structs, so members will be at predictable offsets and we can group common operations into head of structure. Signed-off-by: Nick Piggin commit fb045adb99d9b7c562dc7fef834857f78249daa1 Author: Nick Piggin Date: Fri Jan 7 17:49:55 2011 +1100 fs: dcache reduce branches in lookup path Reduce some branches and memory accesses in dcache lookup by adding dentry flags to indicate common d_ops are set, rather than having to check them. This saves a pointer memory access (dentry->d_op) in common path lookup situations, and saves another pointer load and branch in cases where we have d_op but not the particular operation. Patched with: git grep -E '[.>]([[:space:]])*d_op([[:space:]])*=' | xargs sed -e 's/\([^\t ]*\)->d_op = \(.*\);/d_set_d_op(\1, \2);/' -e 's/\([^\t ]*\)\.d_op = \(.*\);/d_set_d_op(\&\1, \2);/' -i Signed-off-by: Nick Piggin commit 5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff Author: Nick Piggin Date: Fri Jan 7 17:49:54 2011 +1100 fs: dcache remove d_mounted Rather than keep a d_mounted count in the dentry, set a dentry flag instead. The flag can be cleared by checking the hash table to see if there are any mounts left, which is not time critical because it is performed at detach time. The mounted state of a dentry is only used to speculatively take a look in the mount hash table if it is set -- before following the mount, vfsmount lock is taken and mount re-checked without races. This saves 4 bytes on 32-bit, nothing on 64-bit but it does provide a hole I might use later (and some configs have larger than 32-bit spinlocks which might make use of the hole). Autofs4 conversion and changelog by Ian Kent : In autofs4, when expring direct (or offset) mounts we need to ensure that we block user path walks into the autofs mount, which is covered by another mount. To do this we clear the mounted status so that follows stop before walking into the mount and are essentially blocked until the expire is completed. The automount daemon still finds the correct dentry for the umount due to the follow mount logic in fs/autofs4/root.c:autofs4_follow_link(), which is set as an inode operation for direct and offset mounts only and is called following the lookup that stopped at the covered mount. At the end of the expire the covering mount probably has gone away so the mounted status need not be restored. But we need to check this and only restore the mounted status if the expire failed. XXX: autofs may not work right if we have other mounts go over the top of it? Signed-off-by: Nick Piggin commit c28cc36469554dc55540f059fbdc7fa22a2c31fc Author: Nick Piggin Date: Fri Jan 7 17:49:53 2011 +1100 fs: fs_struct use seqlock Use a seqlock in the fs_struct to enable us to take an atomic copy of the complete cwd and root paths. Use this in the RCU lookup path to avoid a thread-shared spinlock in RCU lookup operations. Multi-threaded apps may now perform path lookups with scalability matching multi-process apps. Operations such as stat(2) become very scalable for multi-threaded workload. Signed-off-by: Nick Piggin commit 31e6b01f4183ff419a6d1f86177cbf4662347cec Author: Nick Piggin Date: Fri Jan 7 17:49:52 2011 +1100 fs: rcu-walk for path lookup Perform common cases of path lookups without any stores or locking in the ancestor dentry elements. This is called rcu-walk, as opposed to the current algorithm which is a refcount based walk, or ref-walk. This results in far fewer atomic operations on every path element, significantly improving path lookup performance. It also avoids cacheline bouncing on common dentries, significantly improving scalability. The overall design is like this: * LOOKUP_RCU is set in nd->flags, which distinguishes rcu-walk from ref-walk. * Take the RCU lock for the entire path walk, starting with the acquiring of the starting path (eg. root/cwd/fd-path). So now dentry refcounts are not required for dentry persistence. * synchronize_rcu is called when unregistering a filesystem, so we can access d_ops and i_ops during rcu-walk. * Similarly take the vfsmount lock for the entire path walk. So now mnt refcounts are not required for persistence. Also we are free to perform mount lookups, and to assume dentry mount points and mount roots are stable up and down the path. * Have a per-dentry seqlock to protect the dentry name, parent, and inode, so we can load this tuple atomically, and also check whether any of its members have changed. * Dentry lookups (based on parent, candidate string tuple) recheck the parent sequence after the child is found in case anything changed in the parent during the path walk. * inode is also RCU protected so we can load d_inode and use the inode for limited things. * i_mode, i_uid, i_gid can be tested for exec permissions during path walk. * i_op can be loaded. When we reach the destination dentry, we lock it, recheck lookup sequence, and increment its refcount and mountpoint refcount. RCU and vfsmount locks are dropped. This is termed "dropping rcu-walk". If the dentry refcount does not match, we can not drop rcu-walk gracefully at the current point in the lokup, so instead return -ECHILD (for want of a better errno). This signals the path walking code to re-do the entire lookup with a ref-walk. Aside from the final dentry, there are other situations that may be encounted where we cannot continue rcu-walk. In that case, we drop rcu-walk (ie. take a reference on the last good dentry) and continue with a ref-walk. Again, if we can drop rcu-walk gracefully, we return -ECHILD and do the whole lookup using ref-walk. But it is very important that we can continue with ref-walk for most cases, particularly to avoid the overhead of double lookups, and to gain the scalability advantages on common path elements (like cwd and root). The cases where rcu-walk cannot continue are: * NULL dentry (ie. any uncached path element) * parent with d_inode->i_op->permission or ACLs * dentries with d_revalidate * Following links In future patches, permission checks and d_revalidate become rcu-walk aware. It may be possible eventually to make following links rcu-walk aware. Uncached path elements will always require dropping to ref-walk mode, at the very least because i_mutex needs to be grabbed, and objects allocated. Signed-off-by: Nick Piggin commit 3c22cd5709e8143444a6d08682a87f4c57902df3 Author: Nick Piggin Date: Fri Jan 7 17:49:51 2011 +1100 kernel: optimise seqlock Add branch annotations for seqlock read fastpath, and introduce __read_seqcount_begin and __read_seqcount_end functions, that can avoid the smp_rmb() if used carefully. These will be used by store-free path walking algorithm performance is critical and seqlocks are in use. Signed-off-by: Nick Piggin commit ff0c7d15f9787b7e8c601533c015295cc68329f8 Author: Nick Piggin Date: Fri Jan 7 17:49:50 2011 +1100 fs: avoid inode RCU freeing for pseudo fs Pseudo filesystems that don't put inode on RCU list or reachable by rcu-walk dentries do not need to RCU free their inodes. Signed-off-by: Nick Piggin commit fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9 Author: Nick Piggin Date: Fri Jan 7 17:49:49 2011 +1100 fs: icache RCU free inodes RCU free the struct inode. This will allow: - Subsequent store-free path walking patch. The inode must be consulted for permissions when walking, so an RCU inode reference is a must. - sb_inode_list_lock to be moved inside i_lock because sb list walkers who want to take i_lock no longer need to take sb_inode_list_lock to walk the list in the first place. This will simplify and optimize locking. - Could remove some nested trylock loops in dcache code - Could potentially simplify things a bit in VM land. Do not need to take the page lock to follow page->mapping. The downsides of this is the performance cost of using RCU. In a simple creat/unlink microbenchmark, performance drops by about 10% due to inability to reuse cache-hot slab objects. As iterations increase and RCU freeing starts kicking over, this increases to about 20%. In cases where inode lifetimes are longer (ie. many inodes may be allocated during the average life span of a single inode), a lot of this cache reuse is not applicable, so the regression caused by this patch is smaller. The cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU, however this adds some complexity to list walking and store-free path walking, so I prefer to implement this at a later date, if it is shown to be a win in real situations. I haven't found a regression in any non-micro benchmark so I doubt it will be a problem. Signed-off-by: Nick Piggin commit 77812a1ef139d84270d27faacc0630c887411013 Author: Nick Piggin Date: Fri Jan 7 17:49:48 2011 +1100 fs: consolidate dentry kill sequence The tricky locking for disposing of a dentry is duplicated 3 times in the dcache (dput, pruning a dentry from the LRU, and pruning its ancestors). Consolidate them all into a single function dentry_kill. Signed-off-by: Nick Piggin commit ec33679d78f9d653a44ddba10b5fb824c06330a1 Author: Nick Piggin Date: Fri Jan 7 17:49:47 2011 +1100 fs: use RCU in shrink_dentry_list to reduce lock nesting Signed-off-by: Nick Piggin commit be182bff72fae6a3eb25624b39170c40b72f0909 Author: Nick Piggin Date: Fri Jan 7 17:49:46 2011 +1100 fs: reduce dcache_inode_lock width in lru scanning Signed-off-by: Nick Piggin commit 89e6054836a7b1e7500cd70a14b5579e752c9250 Author: Nick Piggin Date: Fri Jan 7 17:49:45 2011 +1100 fs: dcache reduce prune_one_dentry locking prune_one_dentry can avoid quite a bit of locking in the common case where ancestors have an elevated refcount. Alternatively, we could have gone the other way and made fewer trylocks in the case where d_count goes to zero, but is probably less common. Signed-off-by: Nick Piggin commit a734eb458ab2bd11479a27dd54f48e1b26a55845 Author: Nick Piggin Date: Fri Jan 7 17:49:44 2011 +1100 fs: dcache reduce d_parent locking Use RCU to simplify locking in dget_parent. Signed-off-by: Nick Piggin commit dc0474be3e27463d4d4a2793f82366eed906f223 Author: Nick Piggin Date: Fri Jan 7 17:49:43 2011 +1100 fs: dcache rationalise dget variants dget_locked was a shortcut to avoid the lazy lru manipulation when we already held dcache_lock (lru manipulation was relatively cheap at that point). However, how that the lru lock is an innermost one, we never hold it at any caller, so the lock cost can now be avoided. We already have well working lazy dcache LRU, so it should be fine to defer LRU manipulations to scan time. Signed-off-by: Nick Piggin commit 357f8e658bba8a085c4a5d4331e30894be8096b8 Author: Nick Piggin Date: Fri Jan 7 17:49:42 2011 +1100 fs: dcache reduce dcache_inode_lock dcache_inode_lock can be avoided in d_delete() and d_materialise_unique() in cases where it is not required. Signed-off-by: Nick Piggin commit 89ad485f01fd83c47f17a128db3bd7b89c0f244f Author: Nick Piggin Date: Fri Jan 7 17:49:41 2011 +1100 fs: dcache reduce locking in d_alloc Signed-off-by: Nick Piggin commit 61f3dee4af09528997a970280da240577bf60721 Author: Nick Piggin Date: Fri Jan 7 17:49:40 2011 +1100 fs: dcache reduce dput locking It is possible to run dput without taking data structure locks up-front. In many cases where we don't kill the dentry anyway, these locks are not required. Signed-off-by: Nick Piggin commit 58db63d086790eec2ed433f9d8c4962239809cf8 Author: Nick Piggin Date: Fri Jan 7 17:49:39 2011 +1100 fs: dcache avoid starvation in dcache multi-step operations Long lived dcache "multi-step" operations which retry on rename seq can be starved with a lot of rename activity. If they fail after the 1st pass, take the rename_lock for writing to avoid further starvation. Signed-off-by: Nick Piggin commit b5c84bf6f6fa3a7dfdcb556023a62953574b60ee Author: Nick Piggin Date: Fri Jan 7 17:49:38 2011 +1100 fs: dcache remove dcache_lock dcache_lock no longer protects anything. remove it. Signed-off-by: Nick Piggin commit 949854d02455080d20cd3e1db28a3a18daf7599d Author: Nick Piggin Date: Fri Jan 7 17:49:37 2011 +1100 fs: Use rename lock and RCU for multi-step operations The remaining usages for dcache_lock is to allow atomic, multi-step read-side operations over the directory tree by excluding modifications to the tree. Also, to walk in the leaf->root direction in the tree where we don't have a natural d_lock ordering. This could be accomplished by taking every d_lock, but this would mean a huge number of locks and actually gets very tricky. Solve this instead by using the rename seqlock for multi-step read-side operations, retry in case of a rename so we don't walk up the wrong parent. Concurrent dentry insertions are not serialised against. Concurrent deletes are tricky when walking up the directory: our parent might have been deleted when dropping locks so also need to check and retry for that. We can also use the rename lock in cases where livelock is a worry (and it is introduced in subsequent patch). Signed-off-by: Nick Piggin commit 9abca36087288fe28de4749c71ca003d4b9e3ed0 Author: Nick Piggin Date: Fri Jan 7 17:49:36 2011 +1100 fs: increase d_name lock coverage Cover d_name with d_lock in more cases, where there may be concurrent modification to it. Signed-off-by: Nick Piggin commit b23fb0a60379a95e10c671f646b259ea2558421e Author: Nick Piggin Date: Fri Jan 7 17:49:35 2011 +1100 fs: scale inode alias list Add a new lock, dcache_inode_lock, to protect the inode's i_dentry list from concurrent modification. d_alias is also protected by d_lock. Signed-off-by: Nick Piggin commit 2fd6b7f50797f2e993eea59e0a0b8c6399c811dc Author: Nick Piggin Date: Fri Jan 7 17:49:34 2011 +1100 fs: dcache scale subdirs Protect d_subdirs and d_child with d_lock, except in filesystems that aren't using dcache_lock for these anyway (eg. using i_mutex). Note: if we change the locking rule in future so that ->d_child protection is provided only with ->d_parent->d_lock, it may allow us to reduce some locking. But it would be an exception to an otherwise regular locking scheme, so we'd have to see some good results. Probably not worthwhile. Signed-off-by: Nick Piggin commit da5029563a0a026c64821b09e8e7b4fd81d3fe1b Author: Nick Piggin Date: Fri Jan 7 17:49:33 2011 +1100 fs: dcache scale d_unhashed Protect d_unhashed(dentry) condition with d_lock. This means keeping DCACHE_UNHASHED bit in synch with hash manipulations. Signed-off-by: Nick Piggin commit b7ab39f631f505edc2bbdb86620d5493f995c9da Author: Nick Piggin Date: Fri Jan 7 17:49:32 2011 +1100 fs: dcache scale dentry refcount Make d_count non-atomic and protect it with d_lock. This allows us to ensure a 0 refcount dentry remains 0 without dcache_lock. It is also fairly natural when we start protecting many other dentry members with d_lock. Signed-off-by: Nick Piggin commit 2304450783dfde7b0b94ae234edd0dbffa865073 Author: Nick Piggin Date: Fri Jan 7 17:49:31 2011 +1100 fs: dcache scale lru Add a new lock, dcache_lru_lock, to protect the dcache LRU list from concurrent modification. d_lru is also protected by d_lock, which allows LRU lists to be accessed without the lru lock, using RCU in future patches. Signed-off-by: Nick Piggin commit 789680d1ee9311cdf095241dc02bd9784d799cd1 Author: Nick Piggin Date: Fri Jan 7 17:49:30 2011 +1100 fs: dcache scale hash Add a new lock, dcache_hash_lock, to protect the dcache hash table from concurrent modification. d_hash is also protected by d_lock. Signed-off-by: Nick Piggin commit ec2447c278ee973d35f38e53ca16ba7f965ae33d Author: Nick Piggin Date: Fri Jan 7 17:49:29 2011 +1100 hostfs: simplify locking Remove dcache_lock locking from hostfs filesystem, and move it into dcache helpers. All that is required is a coherent path name. Protection from concurrent modification of the namespace after path name generation is not provided in current code, because dcache_lock is dropped before the path is used. Signed-off-by: Nick Piggin commit b1e6a015a580ad145689ad1d6b4aa0e03e6c868b Author: Nick Piggin Date: Fri Jan 7 17:49:28 2011 +1100 fs: change d_hash for rcu-walk Change d_hash so it may be called from lock-free RCU lookups. See similar patch for d_compare for details. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin commit 621e155a3591962420eacdd39f6f0aa29ceb221e Author: Nick Piggin Date: Fri Jan 7 17:49:27 2011 +1100 fs: change d_compare for rcu-walk Change d_compare so it may be called from lock-free RCU lookups. This does put significant restrictions on what may be done from the callback, however there don't seem to have been any problems with in-tree fses. If some strange use case pops up that _really_ cannot cope with the rcu-walk rules, we can just add new rcu-unaware callbacks, which would cause name lookup to drop out of rcu-walk mode. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin commit fb2d5b86aff355a27ebfc132d3c99f4a940cc3fe Author: Nick Piggin Date: Fri Jan 7 17:49:26 2011 +1100 fs: name case update method smpfs and ncpfs want to update a live dentry name in-place. Rather than have them open code the locking, provide a documented dcache API. Signed-off-by: Nick Piggin commit 2bc334dcc7c77be3700dd443d92a78603f76976b Author: Nick Piggin Date: Fri Jan 7 17:49:25 2011 +1100 jfs: dont overwrite dentry name in d_revalidate Use vfat's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin commit 79eb4dde742fe2e9c9e301432b894a7410261ce7 Author: Nick Piggin Date: Fri Jan 7 17:49:24 2011 +1100 cifs: dont overwrite dentry name in d_revalidate Use vfat's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin commit fe15ce446beb3a33583af81ffe6c9d01a75314ed Author: Nick Piggin Date: Fri Jan 7 17:49:23 2011 +1100 fs: change d_delete semantics Change d_delete from a dentry deletion notification to a dentry caching advise, more like ->drop_inode. Require it to be constant and idempotent, and not take d_lock. This is how all existing filesystems use the callback anyway. This makes fine grained dentry locking of dput and dentry lru scanning much simpler. Signed-off-by: Nick Piggin commit 5eef7fa905c814826f518aca2d414ca77508ce30 Author: Nick Piggin Date: Fri Jan 7 17:49:22 2011 +1100 fs: dcache documentation cleanup Remove redundant (and incorrect, since dcache RCU lookup) dentry locking documentation and point to the canonical document. Signed-off-by: Nick Piggin commit fbc8d4c04626e015b18cc61199f505920abb48f0 Author: Nick Piggin Date: Fri Jan 7 17:49:21 2011 +1100 config fs: avoid switching ->d_op on live dentry Switching d_op on a live dentry is racy in general, so avoid it. In this case it is a negative dentry, which is safer, but there are still concurrent ops which may be called on d_op in that case (eg. d_revalidate). So in general a filesystem may not do this. Fix configfs so as not to do this. Signed-off-by: Nick Piggin commit 5adcee1d8d32d7f305f6f5aaefdbf8f35adca177 Author: Nick Piggin Date: Fri Jan 7 17:49:20 2011 +1100 cgroup fs: avoid switching ->d_op on live dentry Switching d_op on a live dentry is racy in general, so avoid it. In this case it is a negative dentry, which is safer, but there are still concurrent ops which may be called on d_op in that case (eg. d_revalidate). So in general a filesystem may not do this. Fix cgroupfs so as not to do this. Signed-off-by: Nick Piggin commit 3e880fb5e4bb6a012035e3edd0586ee2817c2e24 Author: Nick Piggin Date: Fri Jan 7 17:49:19 2011 +1100 fs: use fast counters for vfs caches percpu_counter library generates quite nasty code, so unless you need to dynamically allocate counters or take fast approximate value, a simple per cpu set of counters is much better. The percpu_counter can never be made to work as well, because it has an indirection from pointer to percpu memory, and it can't use direct this_cpu_inc interfaces because it doesn't use static PER_CPU data, so code will always be worse. In the fastpath, it is the difference between this: incl %gs:nr_dentry # nr_dentry and this: movl percpu_counter_batch(%rip), %edx # percpu_counter_batch, movl $1, %esi #, movq $nr_dentry, %rdi #, call __percpu_counter_add # (plus I clobber registers) __percpu_counter_add: pushq %rbp # movq %rsp, %rbp #, subq $32, %rsp #, movq %rbx, -24(%rbp) #, movq %r12, -16(%rbp) #, movq %r13, -8(%rbp) #, movq %rdi, %rbx # fbc, fbc #APP # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1 movq %gs:kernel_stack,%rax #, pfo_ret__ # 0 "" 2 #NO_APP incl -8124(%rax) # .preempt_count movq 32(%rdi), %r12 # .counters, tcp_ptr__ #APP # 78 "lib/percpu_counter.c" 1 add %gs:this_cpu_off, %r12 # this_cpu_off, tcp_ptr__ # 0 "" 2 #NO_APP movslq (%r12),%r13 #* tcp_ptr__, tmp73 movslq %edx,%rax # batch, batch addq %rsi, %r13 # amount, count cmpq %rax, %r13 # batch, count jge .L27 #, negl %edx # tmp76 movslq %edx,%rdx # tmp76, tmp77 cmpq %rdx, %r13 # tmp77, count jg .L28 #, .L27: movq %rbx, %rdi # fbc, call _raw_spin_lock # addq %r13, 8(%rbx) # count, .count movq %rbx, %rdi # fbc, movl $0, (%r12) #,* tcp_ptr__ call _raw_spin_unlock # .L29: #APP # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1 movq %gs:kernel_stack,%rax #, pfo_ret__ # 0 "" 2 #NO_APP decl -8124(%rax) # .preempt_count movq -8136(%rax), %rax #, D.14625 testb $8, %al #, D.14625 jne .L32 #, .L31: movq -24(%rbp), %rbx #, movq -16(%rbp), %r12 #, movq -8(%rbp), %r13 #, leave ret .p2align 4,,10 .p2align 3 .L28: movl %r13d, (%r12) # count,* jmp .L29 # .L32: call preempt_schedule # .p2align 4,,6 jmp .L31 # .size __percpu_counter_add, .-__percpu_counter_add .p2align 4,,15 Signed-off-by: Nick Piggin commit 86c8749ede0c59e590de9267066932a26f1ce796 Author: Nick Piggin Date: Fri Jan 7 17:49:18 2011 +1100 vfs: revert per-cpu nr_unused counters for dentry and inodes The nr_unused counters count the number of objects on an LRU, and as such they are synchronized with LRU object insertion and removal and scanning, and protected under the LRU lock. Making it per-cpu does not actually get any concurrency improvements because of this lock, and summing the counter is much slower, and incrementing/decrementing it costs more code size and is slower too. These counters should stay per-LRU, which currently means global. Signed-off-by: Nick Piggin commit ccd35fb9f4da856b105ea0f1e0cab3702e8ae6ba Author: Nick Piggin Date: Fri Jan 7 17:49:17 2011 +1100 kernel: kmem_ptr_validate considered harmful This is a nasty and error prone API. It is no longer used, remove it. Signed-off-by: Nick Piggin commit 786a5e15b613a9cee4fc9139fc3113a5ab0fde79 Author: Nick Piggin Date: Fri Jan 7 17:49:16 2011 +1100 fs: d_validate fixes d_validate has been broken for a long time. kmem_ptr_validate does not guarantee that a pointer can be dereferenced if it can go away at any time. Even rcu_read_lock doesn't help, because the pointer might be queued in RCU callbacks but not executed yet. So the parent cannot be checked, nor the name hashed. The dentry pointer can not be touched until it can be verified under lock. Hashing simply cannot be used. Instead, verify the parent/child relationship by traversing parent's d_child list. It's slow, but only ncpfs and the destaged smbfs care about it, at this point. Signed-off-by: Nick Piggin commit 554738da71004d96e06fb75f4772dfc3b0f47810 Merge: 7b4b306 a6d38f8 Author: Dmitry Torokhov Date: Thu Jan 6 22:34:59 2011 -0800 Merge branch 'next' into for-linus Conflicts: include/linux/input.h commit 01539ba2a706ab7d35fc0667dff919ade7f87d63 Merge: 9e9bc97 dc69d1a Author: Linus Torvalds Date: Thu Jan 6 19:13:58 2011 -0800 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits) omap2: Make OMAP2PLUS select OMAP_DM_TIMER OMAP4: hwmod data: Fix alignment and end of line in structurefields OMAP4: hwmod data: Move the DMA structures OMAP4: hwmod data: Move the smartreflex structures OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc arm: omap: tusb6010: add name for MUSB IRQ arm: omap: craneboard: Add USB EHCI support omap2+: Initialize serial port for dynamic remuxing for n8x0 omap2+: Add struct omap_board_data and use it for platform level serial init omap2+: Allow hwmod state changes to mux pads based on the state changes omap2+: Add support for hwmod specific muxing of devices omap2+: Add omap_mux_get_by_name OMAP2: PM: fix compile error when !CONFIG_SUSPEND MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership OMAP4: Smartreflex framework extensions OMAP4: hwmod: Add inital data for smartreflex modules. OMAP4: PM: Program correct init voltages for scalable VDDs OMAP4: Adding voltage driver support OMAP4: Register voltage PMIC parameters with the voltage layer OMAP3: PM: Program correct init voltages for VDD1 and VDD2 ... Fix up trivial conflict in arch/arm/plat-omap/Kconfig commit c413521eb4e2d7ffd5ce432a144708d479054bd3 Author: Paul Mundt Date: Fri Jan 7 12:03:22 2011 +0900 ARM: mach-shmobile: update for SMP changes. There have likewise been some API updates, so we refactor to use the consolidated smp_prepare_cpus(). Signed-off-by: Paul Mundt commit c0312b33daa721a92633181fd4fe508484c81a2d Author: Paul Mundt Date: Fri Jan 7 12:02:11 2011 +0900 ARM: mach-shmobile: update for GIC changes. This fixes up the SMP support to use the refactored GIC APIs. Signed-off-by: Paul Mundt commit 6ef9f6fd8eb22f4838e9b0006d16936511e3f7f8 Author: Paul Mundt Date: Fri Jan 7 11:49:49 2011 +0900 ARM: mach-shmobile: Fix up clkdev fallout for SH73A0. Use the new linux/clkdev.h to get it building again. Signed-off-by: Paul Mundt commit 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153 Merge: 3c0cb7c e3c9221 Author: Linus Torvalds Date: Thu Jan 6 18:32:12 2011 -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: (255 commits) [media] radio-aimslab.c: Fix gcc 4.5+ bug [media] cx25821: Fix compilation breakage due to BKL dependency [media] v4l2-compat-ioctl32: fix compile warning [media] zoran: fix compiler warning [media] tda18218: fix compile warning [media] ngene: fix compile warning [media] DVB: IR support for TechnoTrend CT-3650 [media] cx23885, cimax2.c: Fix case of two CAM insertion irq [media] ir-nec-decoder: fix repeat key issue [media] staging: se401 depends on USB [media] staging: usbvideo/vicam depends on USB [media] soc_camera: Add the ability to bind regulators to soc_camedra devices [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor [media] v4l: soc-camera: switch to .unlocked_ioctl [media] v4l: ov772x: simplify pointer dereference [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving [media] ov9640: use macro to request OmniVision OV9640 sensor private data [media] ivtv-i2c: Fix two warnings [media] staging/lirc: Update lirc TODO files [media] cx88: Remove the obsolete i2c_adapter.id field ... commit 04a186bd2c4d3fd7efdeb91d2e92f4624be3a764 Merge: e9d728f 661382f Author: Paul Mundt Date: Fri Jan 7 11:03:37 2011 +0900 Merge branch 'common/dma' into rmobile-latest commit 661382fe190475c17d0b3a6b5f0350b4f82f5939 Author: Guennadi Liakhovetski Date: Thu Jan 6 17:04:50 2011 +0000 dma: shdma: don't register the global die notifier multiple times A recent patch has added a die notifier to the shdma driver, however, it registers a static die-notifier object in the probe routine, i.e., for each device instance. This is wrong and leads to a system lockup. This patch moves the die notifier registration to module init and exit routines respectively. Reported-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e9d728f528f9548c8dd013899b23e662fa7b6bca Merge: 018a3fc 6155f77 Author: Paul Mundt Date: Fri Jan 7 10:51:35 2011 +0900 Merge branch 'rmobile/smp' into rmobile-latest Conflicts: arch/arm/Kconfig arch/arm/mach-shmobile/include/mach/entry-macro-intc.S Signed-off-by: Paul Mundt commit 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 Author: Magnus Damm Date: Tue Dec 28 08:27:19 2010 +0000 ARM: mach-shmobile: Rely on run-time IRQ handlers Remove now unused IRQ demux code. All R-Mobile and SH-Mobile processors should register IRQ demux handlers during run-time. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e74a9625f8dcf1a924345b24cec8476c52593df8 Author: Magnus Damm Date: Tue Dec 28 08:27:10 2010 +0000 ARM: mach-shmobile: Run-time IRQ handler for GIC Break-out GIC specific IRQ demux code from the file entry-macro-intc.S and register during run-time. Covers sh73a0. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 863b171952dba1a3ce9d345cfe4e93c9fdd42f49 Author: Magnus Damm Date: Tue Dec 28 08:27:01 2010 +0000 ARM: mach-shmobile: Run-time IRQ handler for INTCA Break-out INTC specific IRQ demux code from the file entry-macro-intc.S and register during run-time. Covers sh7367, sh7377 and sh7372. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 60f1435c3bab8b88712a4f96806e5ac9396aa49c Author: Magnus Damm Date: Tue Dec 28 08:26:52 2010 +0000 ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER Always enable MULTI_IRQ_HANDLER on SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3dff8804fc087d55c593dda0ff78f475088ec57d Author: Magnus Damm Date: Wed Dec 22 12:17:09 2010 +0000 ARM: mach-shmobile: Use shared GIC entry macros Use the GIC demux code in asm/hardware/entry-macro-gic.S on the R-Mobile / SH-Mobile processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eb6908a279dfbe2e1c1714c185e0f523a9749607 Author: Simon Horman Date: Thu Dec 9 00:47:15 2010 +0000 ARM: mach-shmobile: mackerel: Add zboot support When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. Cc: Magnus Damm Cc: Kuninori Morimoto Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee Merge: 98d27b8 3c0cb7c Author: Paul Mundt Date: Fri Jan 7 10:29:26 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt commit 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 Merge: f70f5b9 404a02c Author: Linus Torvalds Date: Thu Jan 6 16:50:35 2011 -0800 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits) ARM: DMA: add support for DMA debugging ARM: PL011: add DMA burst threshold support for ST variants ARM: PL011: Add support for transmit DMA ARM: PL011: Ensure IRQs are disabled in UART interrupt handler ARM: PL011: Separate hardware FIFO size from TTY FIFO size ARM: PL011: Allow better handling of vendor data ARM: PL011: Ensure error flags are clear at startup ARM: PL011: include revision number in boot-time port printk ARM: vexpress: add sched_clock() for Versatile Express ARM i.MX53: Make MX53 EVK bootable ARM i.MX53: Some bug fix about MX53 MSL code ARM: 6607/1: sa1100: Update platform device registration ARM: 6606/1: sa1100: Fix platform device registration ARM i.MX51: rename IPU irqs ARM i.MX51: Add ipu clock support ARM: imx/mx27_3ds: Add PMIC support ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() mx51: fix usb clock support MX51: Add support for usb host 2 arch/arm/plat-mxc/ehci.c: fix errors/typos ... commit f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234 Merge: b69fc2e 09798eb Author: Linus Torvalds Date: Thu Jan 6 15:30:54 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (25 commits) atyfb: Fix bootup hangs on sparc64. sparc: update copyright in piggyback.c sparc: unify strip command in boot/Makefile sparc: rename piggyback_32 to piggyback sparc: fix tftpboot.img for sparc64 on little-endian host sparc: add $BITS to piggyback arguments sparc: remove obsolete ELF support in piggyback_32.c sparc: additional comments to piggyback_32.c sparc: use _start for the start entry (like 64 bit does) sparc: use trapbase in setup_arch sparc: refactor piggy_32.c Added support for ampopts in APBUART driver. Used in AMP systems. APBUART: added raw AMBA vendor/device number to match against. SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing SPARC/LEON: added support for selecting Timer Core and Timer within core LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL SPARC/LEON: added support for IRQAMP IRQ Controller SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded. sparc: fix sparse warnings in arch/sparc/prom for 32 bit build sparc: remove unused prom tree functions ... commit 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 Merge: 28cdac6 1051b9f Author: Russell King Date: Thu Jan 6 22:33:32 2011 +0000 Merge branch 'devel-stable' into devel Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h commit 28cdac6690cb113856293bf79b40de33dbd8f974 Merge: 4073723 36bb94b Author: Russell King Date: Thu Jan 6 22:33:19 2011 +0000 Merge branch 'pgt' (early part) into devel commit 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 Merge: 58daf18 4ec3eb1 Author: Russell King Date: Thu Jan 6 22:32:52 2011 +0000 Merge branch 'misc' into devel Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c commit 4ec3eb13634529c0bc7466658d84d0bbe3244aea Merge: 24056f5 15095bb Author: Russell King Date: Thu Jan 6 22:31:35 2011 +0000 Merge branch 'smp' into misc Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c commit 24056f525051a9e186af28904b396320e18bf9a0 Author: Russell King Date: Mon Jan 3 11:29:28 2011 +0000 ARM: DMA: add support for DMA debugging Add ARM support for the DMA debug infrastructure, which allows the DMA API usage to be debugged. Signed-off-by: Russell King commit b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d Merge: 84b7290 c6d92e9 Author: Linus Torvalds Date: Thu Jan 6 13:36:30 2011 -0800 Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 commits) mmc: msm_sdcc: Check for only DATA_END interrupt to end a request mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned mmc: msm_sdcc: Reset SDCC in case of data transfer errors mmc: msm_sdcc: Add prog done interrupt support mmc: msm_sdcc: Fix possible circular locking dependency warning MSM: Add USB support for MSM7x30 MSM: Add USB suport for QSD8x50 msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables ... commit 84b7290cca16c61a167c7e1912cd84a479852165 Merge: 9858a38 1928e87 Author: Linus Torvalds Date: Thu Jan 6 13:35:12 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (55 commits) video: udlfb: Kill off special printk wrappers, use pr_fmt(). video: udlfb: Kill off some magic constants for EDID sizing. video: udlfb: deifdefify (yes, that's a word). fbdev: modedb: Add a new mode for 864x480 TAAL panels. drivers/video/i810/i810-i2c.c: fix i2c bus handling video: Fix the HGA framebuffer driver drivers/video/carminefb.c: improve error handling video: imxfb: Fix the maximum value for yres fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support fbdev: sh_mipi_dsi: use platform provided register layout and values ARM: mach-shmobile: specify sh7372 MIPI DSI register layout fbdev: sh_mipi_dsi: support different register layouts ARM: mach-shmobile: improve MIPI DSI clock configuration fbdev: sh-mobile: implement MIPI DSI runtime PM support sisfb: eliminate compiler warnings sisfb: delete unused register I/O macros sisfb: replace setSISIDXREG with SiS_SetRegANDOR sisfb: replace andSISIDXREG with SiS_SetRegAND sisfb: replace orSISIDXREG with SiS_SetRegOR sisfb: replace outSISIDXREG with SiS_SetReg ... commit 9858a38ea3a940762ae3028cce88f686d0e0c28b Merge: abb3594 f862f90 Author: Linus Torvalds Date: Thu Jan 6 13:34:45 2011 -0800 Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: include Migo-R TS driver in Migo-R defconfig sh: correct definitions to access stack pointers sh: Tidy up SH-4A unaligned load support. dma: shdma: NMI support. sh: mach-sdk7786: Handle baseboard NMI source selection. sh: mach-rsk: Add polled GPIO buttons support for RSK+7203. sh: Break out cpuinfo_op procfs bits. sh: Enable optional gpiolib for all CPUs with pinmux tables. sh: migrate SH_CLK_MD to mode pin API. sh: machvec IO death. commit abb359450f20c32ae03039d8736f12b1d561caf5 Merge: cb600d2 4e3dbdb Author: Linus Torvalds Date: Thu Jan 6 12:30:19 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1436 commits) cassini: Use local-mac-address prom property for Cassini MAC address net: remove the duplicate #ifdef __KERNEL__ net: bridge: check the length of skb after nf_bridge_maybe_copy_header() netconsole: clarify stopping message netconsole: don't announce stopping if nothing happened cnic: Fix the type field in SPQ messages netfilter: fix export secctx error handling netfilter: fix the race when initializing nf_ct_expect_hash_rnd ipv4: IP defragmentation must be ECN aware net: r6040: Return proper error for r6040_init_one dcb: use after free in dcb_flushapp() dcb: unlock on error in dcbnl_ieee_get() net: ixp4xx_eth: Return proper error for eth_init_one include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel net: add POLLPRI to sock_def_readable() af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks. net_sched: pfifo_head_drop problem mac80211: remove stray extern mac80211: implement off-channel TX using hw r-o-c offload mac80211: implement hardware offload for remain-on-channel ... commit 4e3dbdb1392a83bd21a6ff8f6bc785495058d37c Author: Richard Mortimer Date: Thu Jan 6 11:50:30 2011 -0800 cassini: Use local-mac-address prom property for Cassini MAC address Fallback on the local-mac-address prom property if the Cassini device does not have an address programmed in the VPD ROM. This uses the same technique as implemented by the sungem driver. The problem was reported by Frans van Berckel using Debian kernel 2.6.34-7 on Sun Fire V440. udev was assigning a new eth device name on each reboot because the cassini driver was using a random MAC address. Fix tested on 2.6.34-7 and 2.6.37 Sun Fire V440. Compile tested against 2.6.36 davem/sparc-2.6.git Reported-by: Frans van Berckel Tested-by: Frans van Berckel Reviewed-by: Julian Calaby Reviewed-by: Sam Ravnborg Signed-off-by: Richard Mortimer Signed-off-by: David S. Miller commit 2ad0d9d413abc3380fc1d89a9da7f8db59d9746b Author: Changli Gao Date: Thu Jan 6 11:41:42 2011 -0800 net: remove the duplicate #ifdef __KERNEL__ Since we are already in #ifdef __KERNEL__, we don't need to check it again. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 09798eb9479da3413bdf96e7d22a84d8b21e05e1 Author: David S. Miller Date: Wed Jan 5 13:08:06 2011 -0800 atyfb: Fix bootup hangs on sparc64. After commit 25edd6946a1d74e5e77813c2324a0908c68bcf9e ("sparc64: Get rid of indirect p1275 PROM call buffer.") we can't pass virtual addresses >4GB to PROM calls. Largely this is never necessary in drivers because we have a copy of the entire PROM device tree in the kernel and a set of of_*() interfaces to access it. Unfortunately there were some lingering prom calls in the atyfb driver, in particular prom_finddevice() was being called with an on-stack address which could be anywhere. This code is actually probing for information we already have, the PROM choosen console output device is stored in of_console_device so all of this nasty code consolidates into a one-line comparison. Next we have some prom_getintdefault() calls which are trivially transformed into the equivalent of_getintprop_default(). Special thanks to Fabio, who figured out exactly where the bootup was hanging. That made this bug trivial to fix. Reported-by: Fabio M. Di NItto Reported-by: Sam Ravnborg Reported-by: Frans van Berckel Signed-off-by: David S. Miller Signed-off-by: Fabio M. Di NItto commit f88de8de5a8c8a8a73960d4432ceef2d38b7f86f Author: Changli Gao Date: Sat Dec 25 03:41:30 2010 +0000 net: bridge: check the length of skb after nf_bridge_maybe_copy_header() Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 38cfb907a55f3223445151b517b6e4678b8c9d66 Author: Ferenc Wagner Date: Thu Jan 6 05:11:20 2011 +0000 netconsole: clarify stopping message Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller commit 141dfba342b672588799432d74a3b6be88b5d713 Author: Ferenc Wagner Date: Thu Jan 6 05:11:19 2011 +0000 netconsole: don't announce stopping if nothing happened Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller commit 68d7c1aa2fee6acb11fcb826a207e4b81d8a1f57 Author: Michael Chan Date: Wed Jan 5 15:14:13 2011 +0000 cnic: Fix the type field in SPQ messages The new firmware interface requires each Slow Path Queue (SPQ) message's type field to include the function number. The existing code does not do this consistently. We fix this by OR'ing in the function number into the type field centrally in cnic_submit_kwqe_16(). Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cba85b532e4aabdb97f44c18987d45141fd93faa Author: Pablo Neira Ayuso Date: Thu Jan 6 11:25:00 2011 -0800 netfilter: fix export secctx error handling In 1ae4de0cdf855305765592647025bde55e85e451, the secctx was exported via the /proc/net/netfilter/nf_conntrack and ctnetlink interfaces instead of the secmark. That patch introduced the use of security_secid_to_secctx() which may return a non-zero value on error. In one of my setups, I have NF_CONNTRACK_SECMARK enabled but no security modules. Thus, security_secid_to_secctx() returns a negative value that results in the breakage of the /proc and `conntrack -L' outputs. To fix this, we skip the inclusion of secctx if the aforementioned function fails. This patch also fixes the dynamic netlink message size calculation if security_secid_to_secctx() returns an error, since its logic is also wrong. This problem exists in Linux kernel >= 2.6.37. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit f682cefa5ad204d3bfaa54a58046c66d2d035ac1 Author: Changli Gao Date: Wed Jan 5 04:23:23 2011 +0000 netfilter: fix the race when initializing nf_ct_expect_hash_rnd Since nf_ct_expect_dst_hash() may be called without nf_conntrack_lock locked, nf_ct_expect_hash_rnd should be initialized in the atomic way. In this patch, we use nf_conntrack_hash_rnd instead of nf_ct_expect_hash_rnd. Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 6623e3b24a5ebb07e81648c478d286a1329ab891 Author: Eric Dumazet Date: Wed Jan 5 07:52:55 2011 +0000 ipv4: IP defragmentation must be ECN aware RFC3168 (The Addition of Explicit Congestion Notification to IP) states : 5.3. Fragmentation ECN-capable packets MAY have the DF (Don't Fragment) bit set. Reassembly of a fragmented packet MUST NOT lose indications of congestion. In other words, if any fragment of an IP packet to be reassembled has the CE codepoint set, then one of two actions MUST be taken: * Set the CE codepoint on the reassembled packet. However, this MUST NOT occur if any of the other fragments contributing to this reassembly carries the Not-ECT codepoint. * The packet is dropped, instead of being reassembled, for any other reason. This patch implements this requirement for IPv4, choosing the first action : If one fragment had NO-ECT codepoint reassembled frame has NO-ECT ElIf one fragment had CE codepoint reassembled frame has CE Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9c86c0f4ba49b39f909d7f18731b91e563e07065 Author: Axel Lin Date: Tue Jan 4 22:40:04 2011 +0000 net: r6040: Return proper error for r6040_init_one Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure. Signed-off-by: Axel Lin Acked-by: Florian Fainelli Signed-off-by: David S. Miller commit 2a8fe003741aa90b6b9453e90af4bbb7bc42918c Author: Dan Carpenter Date: Tue Jan 4 21:03:44 2011 +0000 dcb: use after free in dcb_flushapp() The original code has a use after free bug because it's not using the _safe() version of the list_for_each_entry() macro. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 70bfa2d2e1bfd90ef26758b5e2749f043a940037 Author: Dan Carpenter Date: Tue Jan 4 21:03:12 2011 +0000 dcb: unlock on error in dcbnl_ieee_get() There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but we're holding the dcb_lock so we need to unlock first. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit cb600d2f83c854ec3d6660063e4466431999489b Merge: 47935a7 d50d8fe Author: Linus Torvalds Date: Thu Jan 6 11:12:17 2011 -0800 Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, mm: Initialize initial_page_table before paravirt jumps commit 0c6610017459ed9642548694fe88971d3f4206aa Author: Axel Lin Date: Tue Jan 4 19:24:06 2011 +0000 net: ixp4xx_eth: Return proper error for eth_init_one Return PTR_ERR(port->phydev) instead of 1 if phy_connect failed. Signed-off-by: Axel Lin Acked-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 47935a731b7b850a4c6c0e55ed0741e3dd25d889 Merge: 77a0dd5 3fb82d5 fd35fbc 9e76a97 c8217b8 3cf9b85 f6cd247 Author: Linus Torvalds Date: Thu Jan 6 11:11:50 2011 -0800 Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64, asm: Use fxsaveq/fxrestorq in more places * 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hwmon: Add core threshold notification to therm_throt.c * 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, paravirt: Use native_halt on a halt, not native_safe_halt * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking, lockdep: Convert sprintf_symbol to %pS * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: Better struct irqaction layout commit 238c855805c853eaec95b0bc3065effb64f955a0 Author: Henry Ptasinski Date: Tue Jan 4 16:07:14 2011 +0000 include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel Ethertype used by HPNA control protocols (LARQ, rate, link, etc) and by Broadcom wlan drivers for local signalling. Signed-off-by: Henry Ptasinski Signed-off-by: David S. Miller commit 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 Merge: d7a5a18 cfa6091 Author: Linus Torvalds Date: Thu Jan 6 11:09:57 2011 -0800 Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV, BAU: Extend for more than 16 cpus per socket x86, UV: Fix the effect of extra bits in the hub nodeid register x86, UV: Add common uv_early_read_mmr() function for reading MMRs commit d7a5a18190d6f523b5d795bfd73f83cf13a3a383 Merge: 4f00b90 a8760ec Author: Linus Torvalds Date: Thu Jan 6 11:08:14 2011 -0800 Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check tsc available/disabled in the delayed init function x86: Improve TSC calibration using a delayed workqueue x86: Make tsc=reliable override boot time stability checks commit 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 Author: Pavel Shilovsky Date: Thu Nov 25 17:20:20 2010 +0300 CIFS: Simplify cifs_open code Make the code more general for use in posix and non-posix open. Reviewed-by: Jeff Layton Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French commit eeb910a6d46103594eb63e6eba1aeb02022368a4 Author: Pavel Shilovsky Date: Thu Nov 25 15:12:39 2010 +0300 CIFS: Simplify non-posix open stuff (try #2) Delete cifs_open_inode_helper and move non-posix open related things to cifs_nt_open function. Reviewed-by: Jeff Layton Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French commit 4b886136df2b923b6fc6b2d83faa9554e84e05ab Author: Pavel Shilovsky Date: Mon Dec 13 22:18:07 2010 +0300 CIFS: Add match_port check during looking for an existing connection (try #4) If we have a share mounted by non-standard port and try to mount another share on the same host with standard port, we connect to the first share again - that's wrong. This patch fixes this bug. Signed-off-by: Pavel Shilovsky Reviewed-by: Jeff Layton Signed-off-by: Steve French commit a9f1b85e5ba80519dea6974e3574fa7a30cc5e29 Author: Pavel Shilovsky Date: Mon Dec 13 19:08:35 2010 +0300 CIFS: Simplify ipv*_connect functions into one (try #4) Make connect logic more ip-protocol independent and move RFC1001 stuff into a separate function. Also replace union addr in TCP_Server_Info structure with sockaddr_storage. Signed-off-by: Pavel Shilovsky Reviewed-and-Tested-by: Jeff Layton Signed-off-by: Steve French commit df8fbc241aa3c451248b1f19fff3a3f604b107f9 Author: Shirish Pargaonkar Date: Sat Dec 11 14:19:22 2010 -0600 cifs: Support NTLM2 session security during NTLMSSP authentication [try #5] Indicate to the server a capability of NTLM2 session security (NTLM2 Key) during ntlmssp protocol exchange in one of the bits of the flags field. If server supports this capability, send NTLM2 key even if signing is not required on the server. If the server requires signing, the session keys exchanged for NTLMv2 and NTLM2 session security in auth packet of the nlmssp exchange are same. Send the same flags in authenticate message (type 3) that client sent in negotiate message (type 1). Remove function setup_ntlmssp_neg_req Make sure ntlmssp negotiate and authenticate messages are zero'ed before they are built. Reported-and-Tested-by: Robbert Kouprie Signed-off-by: Shirish Pargaonkar Acked-by: Jeff Layton Signed-off-by: Steve French commit 262f86adcc0665872812a7458a5d03e19e0efe33 Author: Nick Piggin Date: Thu Nov 11 18:42:16 2010 +1100 cifs: don't overwrite dentry name in d_revalidate Instead, use fatfs's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin Signed-off-by: Steve French commit 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e Merge: b4c6e2e 94462ad Author: Linus Torvalds Date: Thu Jan 6 11:07:33 2011 -0800 Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: module: Move RO/NX module protection to after ftrace module update x86: Resume trampoline must be executable x86: Add RO/NX protection for loadable kernel modules x86: Add NX protection for kernel data x86: Fix improper large page preservation commit b4c6e2ea5e46b03c764a918f4999a77a3149979f Merge: 6f46b12 991cfff Author: Linus Torvalds Date: Thu Jan 6 11:06:31 2011 -0800 Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, earlyprintk: Move mrst early console to platform/ and fix a typo x86, apbt: Setup affinity for apb timers acting as per-cpu timer ce4100: Add errata fixes for UART on CE4100 x86: platform: Move iris to x86/platform where it belongs x86, mrst: Check platform_device_register() return code x86/platform: Add Eurobraille/Iris power off support x86, mrst: Add explanation for using 1960 as the year offset for vrtc x86, mrst: Fix dependencies of "select INTEL_SCU_IPC" x86, mrst: The shutdown for MRST requires the SCU IPC mechanism x86: Ce4100: Add reboot_fixup() for CE4100 ce4100: Add PCI register emulation for CE4100 x86: Add CE4100 platform support x86: mrst: Set vRTC's IRQ to level trigger type x86: mrst: Add audio driver bindings rtc: Add drivers/rtc/rtc-mrst.c x86: mrst: Add vrtc driver which serves as a wall clock device x86: mrst: Add Moorestown specific reboot/shutdown support x86: mrst: Parse SFI timer table for all timer configs x86/mrst: Add SFI platform device parsing code commit 6f46b120a96212b85cbdcb84a64c854dfd791ede Merge: 4e1db5e c7657ac Author: Linus Torvalds Date: Thu Jan 6 11:06:09 2011 -0800 Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, microcode, AMD: Cleanup code a bit x86, microcode, AMD: Replace vmalloc+memset with vzalloc commit 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 Merge: 37d9a8c eb48c9c Author: Linus Torvalds Date: Thu Jan 6 11:05:21 2011 -0800 Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: apic, amd: Make firmware bug messages more meaningful mce, amd: Remove goto in threshold_create_device() mce, amd: Add helper functions to setup APIC mce, amd: Shorten local variables mci_misc_{hi,lo} mce, amd: Implement mce_threshold_block_init() helper function commit 37d9a8c5ea8fc063841c133fc53cc168ee620762 Merge: 017892c 79250af Author: Linus Torvalds Date: Thu Jan 6 10:56:02 2011 -0800 Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix included-by file reference comments x86, cpu: Only CPU features determine NX capabilities x86, cpu: Call verify_cpu during 32bit CPU startup x86, cpu: Clear XD_DISABLED flag on Intel to regain NX x86, cpu: Rename verify_cpu_64.S to verify_cpu.S commit 5f9251cb93237c9578160df9acc6ce9948ad8c52 Merge: 2c6607c 06778b1 Author: David S. Miller Date: Thu Jan 6 10:55:42 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 2c6607c611cb7bf0a6750bcea34a258144e302c5 Author: Eric Dumazet Date: Thu Jan 6 10:54:29 2011 -0800 net: add POLLPRI to sock_def_readable() Leonardo Chiquitto found poll() could block forever on tcp sockets and Urgent data was received, if the event flag only contains POLLPRI. He did a bisection and found commit 4938d7e0233 (poll: avoid extra wakeups in select/poll) was the source of the problem. Problem is TCP sockets use standard sock_def_readable() function for their sk_data_ready() handler, and sock_def_readable() doesnt signal POLLPRI. Only TCP is affected by the problem. Adding POLLPRI to the list of flags might trigger unnecessary schedules, but URGENT handling is such a seldom used feature this seems a good compromise. Thanks a lot to Leonardo for providing the bisection result and a test program as well. Reference : http://www.spinics.net/lists/netdev/msg151793.html Reported-and-bisected-by: Leonardo Chiquitto Signed-off-by: Eric Dumazet Tested-by: Eric Dumazet Signed-off-by: David S. Miller commit 017892c341033b3e961e695bc0bf1a815efcf92e Merge: 42cbd8e cb2ded3 Author: Linus Torvalds Date: Thu Jan 6 10:51:36 2011 -0800 Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation x86, acpi: Add MAX_LOCAL_APIC for 32bit x86: io_apic: Split setup_ioapic_ids_from_mpc() x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings() x86: Allow platforms to force enable apic commit 42cbd8efb0746b55112de45173219f76c54390da Merge: dda5f0a f658bcf Author: Linus Torvalds Date: Thu Jan 6 10:50:28 2011 -0800 Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, cacheinfo: Cleanup L3 cache index disable support x86, amd-nb: Cleanup AMD northbridge caching code x86, amd-nb: Complete the rename of AMD NB and related code commit 568389c257fa7d74ce36c2f78bad31965fded4cf Author: Thomas Gleixner Date: Fri Dec 17 11:16:17 2010 +0100 serial: apbuart: Fixup apbuart_console_init() commit 35c64e5d (drivers: serial: apbuart: Handle OF failures gracefully) missed that the modified grlib_apbuart_configure() function is called from apbuart_console_init() as well. Fix the fallout. Reported-by: Stephen Rothwell Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit dda5f0a372873bca5f0b1d1866d7784dffd8b675 Merge: 65b2074 88606e8 Author: Linus Torvalds Date: Thu Jan 6 10:42:43 2011 -0800 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: MAINTAINERS: Update timer related entries timers: Use this_cpu_read timerqueue: Make timerqueue_getnext() static inline hrtimer: fix timerqueue conversion flub hrtimers: Convert hrtimers to use timerlist infrastructure timers: Fixup allmodconfig build issue timers: Rename timerlist infrastructure to timerqueue timers: Introduce timerlist infrastructure. hrtimer: Remove stale comment on curr_timer timer: Warn when del_timer_sync() is called in hardirq context timer: Del_timer_sync() can be used in softirq context timer: Make try_to_del_timer_sync() the same on SMP and UP posix-timers: Annotate lock_timer() timer: Permit statically-declared work with deferrable timers time: Use ARRAY_SIZE macro in timecompare.c timer: Initialize the field slack of timer_list timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS time: Compensate for rounding on odd-frequency clocksources Fix up trivial conflict in MAINTAINERS commit 65b2074f84be2287e020839e93b4cdaaf60eb37c Merge: 28d9bfc 6bf4123 Author: Linus Torvalds Date: Thu Jan 6 10:23:33 2011 -0800 Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) sched: Change wait_for_completion_*_timeout() to return a signed long sched, autogroup: Fix reference leak sched, autogroup: Fix potential access to freed memory sched: Remove redundant CONFIG_CGROUP_SCHED ifdef sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight sched: Move periodic share updates to entity_tick() printk: Use this_cpu_{read|write} api on printk_pending sched: Make pushable_tasks CONFIG_SMP dependant sched: Add 'autogroup' scheduling feature: automated per session task groups sched: Fix unregister_fair_sched_group() sched: Remove unused argument dest_cpu to migrate_task() mutexes, sched: Introduce arch_mutex_cpu_relax() sched: Add some clock info to sched_debug cpu: Remove incorrect BUG_ON cpu: Remove unused variable sched: Fix UP build breakage sched: Make task dump print all 15 chars of proc comm sched: Update tg->shares after cpu.shares write sched: Allow update_cfs_load() to update global load sched: Implement demand based update_cfs_load() ... commit 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162 Merge: f3b0cfa 4b95f13 Author: Linus Torvalds Date: Thu Jan 6 10:17:26 2011 -0800 Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (146 commits) tools, perf: Documentation for the power events API perf: Add calls to suspend trace point perf script: Make some lists static perf script: Use the default lost event handler perf session: Warn about errors when processing pipe events too perf tools: Fix perf_event.h header usage perf test: Clarify some error reports in the open syscall test x86, NMI: Add touch_nmi_watchdog to io_check_error delay x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time x86: Only call smp_processor_id in non-preempt cases perf timechart: Adjust perf timechart to the new power events perf: Clean up power events by introducing new, more generic ones perf: Do not export power_frequency, but power_start event perf test: Add test for counting open syscalls perf evsel: Auto allocate resources needed for some methods perf evsel: Use {cpu,thread}_map to shorten list of parameters perf tools: Refactor all_tids to hold nr and the map perf tools: Refactor cpumap to hold nr and the map perf evsel: Introduce per cpu and per thread open helpers perf evsel: Steal the counter reading routines from stat ... commit f3b0cfa9b017a9d4686c9b14b908a1685f97a077 Merge: 2af49b6 5bdb05f Author: Linus Torvalds Date: Thu Jan 6 10:07:05 2011 -0800 Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: Add futex_q static initializer futex: Replace fshared and clockrt with combined flags futex: Cleanup stale fshared flag interfaces commit 2af49b6058d857fa5b476db642d4452bf5833ecd Merge: b08b272 394f452 Author: Linus Torvalds Date: Thu Jan 6 10:06:26 2011 -0800 Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rcu: remove unused __list_for_each_rcu() macro rculist: fix borked __list_for_each_rcu() macro rcu: reduce __call_rcu()-induced contention on rcu_node structures rcu: limit rcu_node leaf-level fanout rcu: fine-tune grace-period begin/end checks rcu: Keep gpnum and completed fields synchronized rcu: Stop chasing QS if another CPU did it for us rcu: increase synchronize_sched_expedited() batching rcu: Make synchronize_srcu_expedited() fast if running readers rcu: fix race condition in synchronize_sched_expedited() rcu: update documentation/comments for Lai's adoption patch rcu,cleanup: simplify the code when cpu is dying rcu,cleanup: move synchronize_sched_expedited() out of sched.c rcu: get rid of obsolete "classic" names in TREE_RCU tracing rcu: Distinguish between boosting and boosted rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing. rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU rcu: priority boosting for TINY_PREEMPT_RCU rcu: move TINY_RCU from softirq to kthread rcu: add priority-inversion testing to rcutorture commit b08b27213384d1bd6eda04a2b6f788b4cdee0f34 Merge: 8484baa 846f404 Author: Linus Torvalds Date: Thu Jan 6 10:01:23 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: Don't flush delete workqueue when releasing the transaction lock GFS2: fsck.gfs2 reported statfs error after gfs2_grow GFS2: Merge glock state fields into a bitfield GFS2: Fix uninitialised error value in previous patch GFS2: fix recursive locking during rindex truncates GFS2: reread rindex when necessary to grow rindex GFS2: Remove duplicate #defines from glock.h GFS2: Clean up of gdlm_lock function GFS2: Allow gfs2 to update quota usage values through the quotactl interface GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg GFS2: fs/gfs2/glock.c: Use printf extension %pV GFS2: Clean up duplicated setattr code GFS2: Remove unreachable calls to vmtruncate GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM commit 8484baaa5065b460e5eb18ee721d8417251f7897 Author: Randy Dunlap Date: Wed Jan 5 16:28:43 2011 -0800 kernel-doc: code reorganization Move 'main' code vs. subroutines around so that they are not so intermixed, for better readability/understanding (relative to Perl). It was messy to follow the primary flow of code execution with the code being mixed. Now the code begins with data initialization, followed by all subroutines, then ends with the main code execution. This is almost totally source code movement, with a few changes as needed for forward declarations. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit d5ba92b7958e3ff2f0878e45b9b42cb6976853dd Author: Nicolas Kaiser Date: Wed Jan 5 16:27:53 2011 -0800 Documentation: update kernel-docs.txt Fixed typos, and removed duplicated entries. Signed-off-by: Nicolas Kaiser Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a40649781b9c10e192fad9f00a60c6d946da553f Author: Michael Prokop Date: Wed Jan 5 16:27:15 2011 -0800 Documentation/dontdiff: add further autogenerated files to ignore list Mainly resulting from (but not limited to) autogenerated files of lib/raid6 and drivers/gpu/drm/radeon. List generated as result of a diff of a clean 2.6.36 tree against a built one. Signed-off-by: Michael Prokop Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f Author: Mauro Carvalho Chehab Date: Thu Jan 6 08:16:04 2011 -0200 [media] radio-aimslab.c: Fix gcc 4.5+ bug gcc 4.5+ doesn't properly evaluate some inlined expressions. A previous patch were proposed by Andrew Morton using noinline. However, the entire inlined function is bogus, so let's just remove it and be happy. Reported-by: Andrew Morton Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 1928e87bcf185f56008d0746f887b691c1cb8c4a Merge: ca9c20c 3c0eee3 Author: Paul Mundt Date: Thu Jan 6 18:27:34 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/video/sh_mobile_lcdcfb.c Signed-off-by: Paul Mundt commit f862f904d357dc0d3612347a8dbabe6fae037fbb Merge: 6f09e41 3c0eee3 Author: Paul Mundt Date: Thu Jan 6 18:24:07 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest Conflicts: arch/sh/kernel/cpu/sh2a/clock-sh7201.c Signed-off-by: Paul Mundt commit ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 Merge: 17ca20c 81f6f3c Author: Paul Mundt Date: Thu Jan 6 18:10:09 2011 +0900 Merge branch 'fbdev/udlfb' commit 81f6f3c1047392a22b9a20bbecf98c7f2d6f922a Author: Paul Mundt Date: Thu Jan 6 18:07:54 2011 +0900 video: udlfb: Kill off special printk wrappers, use pr_fmt(). This kills off all of the dl_xxx() printk wrappers and simply stubs in a pr_fmt() definition to accomplish the same thing. Signed-off-by: Paul Mundt commit b9f03a3cd06c6f8bbecfe08eae2a69cc0a13c690 Author: Paul Mundt Date: Thu Jan 6 18:04:02 2011 +0900 video: udlfb: Kill off some magic constants for EDID sizing. The edid length is fixed, so use the standard definition consistently. Signed-off-by: Paul Mundt commit 1a3e528cfc00a9d08114c5fa9e486a77633a425d Author: Paul Mundt Date: Thu Jan 6 17:29:24 2011 +0900 video: udlfb: deifdefify (yes, that's a word). udlfb selects all of the options it presently ifdef conditionalizes, so none of the statements have any effect outside of aggravating eye strain. Signed-off-by: Paul Mundt commit 6f09e41d704fe0bc9157a5357480751d39361d01 Author: Magnus Damm Date: Thu Jan 6 05:33:15 2011 +0000 sh: include Migo-R TS driver in Migo-R defconfig This patch enables the Migo-R specific touch screen driver in the Migo-R defconfig. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 17ca20cb7d04a259c9194879f77466bde606dda5 Author: Mayuresh Janorkar Date: Thu Jan 6 16:02:42 2011 +0900 fbdev: modedb: Add a new mode for 864x480 TAAL panels. This adds a new entry to the modedb for 864x480 TAAL panels, the default configuration for many OMAP boards. This enables omapfb to make use of the standard mode parsing. Signed-off-by: Mayuresh Janorkar Signed-off-by: Paul Mundt commit 748103e7235892bf9a3ee568d7d4dd7e5a3beece Author: Stefani Seibold Date: Mon Jan 3 09:28:59 2011 +0000 drivers/video/i810/i810-i2c.c: fix i2c bus handling These patch fix a longstanding bug in the i810 frame buffer driver. The handling of the i2c bus is wrong: A 1 bit should not written to the i2c, these will be done by switch the i2c to input. Driving an 1 bit active is against the i2c spec. An active driven of a 1 bit will result in very strange error, depending which side is the more powerful one. In my case it depends on the temperature of the Display-Controller-EEprom: With an cold eprom a got the correct EDID datas, with a warm one some of the 1 bits was 0 :-( The same bug is also in the intelfb driver in the file drivers/video/intelfb/intelfb_i2c.c. The functions intelfb_gpio_setscl() and intelfb_gpio_setsda() do drive the 1 bit active to the i2c bus. But since i have no card which is used by the intelfb driver i cannot fix it. Signed-off-by: Stefani Seibold Cc: Paul Mundt Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 529ed806d4540d23ca2f68b28c3715d1566fc3ac Author: Brent Cook Date: Fri Dec 31 05:56:50 2010 +0000 video: Fix the HGA framebuffer driver Resurrected some old hardware and fixed up the hgafb driver to work again. Only tested with fbcon, since most fbdev-based software appears to only support 12bpp and up. It does not appear that this driver has worked for at least the entire 2.6.x series, perhaps since 2002. Hercules graphics hardware uses packed pixels horizontally, but rows are not linear. In other words, the pixels are not packed vertically. This means that custom imageblit, fillrect and copyarea need to be written specific to the hardware. * Removed the experimental acceleration option, since it is required for the hardware to work. * Fixed imageblit to work with fb_image's wider than 8 pixels. * Updated configuration text (HGA hardware is from 1984) Signed-off-by: Brent Cook Signed-off-by: Paul Mundt commit e045da7d835a28950543f5f10f0cb1905ca9bbaf Author: Julia Lawall Date: Sun Jan 2 14:27:42 2011 +0000 drivers/video/carminefb.c: improve error handling This code had an error handling goto to the wrong place, a misplaced release_mem_region, and a duplicated release_mem_region. The semantic match that finds the double release_mem_region is as follows: (http://coccinelle.lip6.fr/) // @r@ expression e1,e2,e3; position p1,p2,p3; @@ release_mem_region@p1(e1, e2)@p3; ... when != request_mem_region(e1,e2,e3) release_mem_region(e1, e2)@p2; @@ expression e <= r.e1,e3; expression r.e1,e2; position r.p1,r.p2,r.p3,p!=r.p1; @@ *release_mem_region(e1, e2)@p3; ... when != e = e3 *release_mem_region@p(e1, e2)@p2;// Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 7ee04fd5d5ff74f81d8eee128bc9346ab87c56b8 Author: Fabio Estevam Date: Fri Dec 24 12:28:24 2010 +0000 video: imxfb: Fix the maximum value for yres MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register. Fix the maximum value for yres. Signed-off-by: Fabio Estevam Signed-off-by: Paul Mundt commit 417d48274e755e537bae60461558c1f63a4e14de Author: Magnus Damm Date: Wed Jan 5 10:21:00 2011 +0000 fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support This patch extends the LCDC driver with 24 bpp and 32 bpp support. These modes have been kept disabled earlier due to dependencies between the potential two LCDC channels that are exported as two separate framebuffer devices. The dependency boils down to a byte swap register that is shared between multiple channels. With this patch applied all single channel LCDC hardware can chose freely from 16, 24 and 32 bpp. Dual channel LCDC must stick to the same setup for both channels. Without this patch only 16 bpp is fully supported. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 98d27b8abf413a310df6676f7d2128ada1cccc08 Author: Kuninori Morimoto Date: Thu Jan 6 02:44:15 2011 +0000 ARM: mach-shmobile: mackerel: Add HDMI sound support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 12c4309b78854ba117ea38a9178018591abd16ab Author: Kuninori Morimoto Date: Thu Jan 6 02:44:09 2011 +0000 ARM: mach-shmobile: mackerel: add HDMI video support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 73674648e9bf3b0a75000b7e97edaac255cd73f7 Author: Kuninori Morimoto Date: Thu Jan 6 02:43:00 2011 +0000 ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk fsib_clk will be used when fdiv_clk failed on fsi_hdmi_set_rate. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b27dcfb0670ea7352a67137f4ff7947c2a9f6892 Author: Jeff Garzik Date: Wed Nov 17 22:56:48 2010 -0500 [libata] avoid needlessly passing around ptr to SCSI completion func It's stored in struct scsi_cmnd->scsi_done, making several 'done' parameters to functions redundant. Signed-off-by: Jeff Garzik commit 02cdfcf043c5c6ebcbbaba1c35130b5fbcb10867 Author: David Milburn Date: Fri Nov 12 15:38:21 2010 -0600 [libata] new driver acard_ahci, for ATP8620 host controller Add support for Acard ATP8620 host controller. Based upon initial version by Jeff Garzik. Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit 3610cda53f247e176bcbb7a7cca64bc53b12acdb Author: David S. Miller Date: Wed Jan 5 15:38:53 2011 -0800 af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks. unix_release() can asynchornously set socket->sk to NULL, and it does so without holding the unix_state_lock() on "other" during stream connects. However, the reverse mapping, sk->sk_socket, is only transitioned to NULL under the unix_state_lock(). Therefore make the security hooks follow the reverse mapping instead of the forward mapping. Reported-by: Jeremy Fitzhardinge Reported-by: Linus Torvalds Signed-off-by: David S. Miller commit a3c888fcda911fcb6e3c071aecf49ccb6effe79d Author: Andrew Morton Date: Wed Jan 5 23:49:53 2011 +0100 gen_init_cpio: checkpatch fixes Cc: Jesper Juhl Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 44b8288308ac9da27eab7d7bdbf1375a568805c3 Author: Eric Dumazet Date: Wed Jan 5 10:35:02 2011 +0000 net_sched: pfifo_head_drop problem commit 57dbb2d83d100ea (sched: add head drop fifo queue) introduced pfifo_head_drop, and broke the invariant that sch->bstats.bytes and sch->bstats.packets are COUNTER (increasing counters only) This can break estimators because est_timer() handles unsigned deltas only. A decreasing counter can then give a huge unsigned delta. My mid term suggestion would be to change things so that sch->bstats.bytes and sch->bstats.packets are incremented in dequeue() only, not at enqueue() time. We also could add drop_bytes/drop_packets and provide estimations of drop rates. It would be more sensible anyway for very low speeds, and big bursts. Right now, if we drop packets, they still are accounted in byte/packets abolute counters and rate estimators. Before this mid term change, this patch makes pfifo_head_drop behavior similar to other qdiscs in case of drops : Dont decrement sch->bstats.bytes and sch->bstats.packets Signed-off-by: Eric Dumazet Acked-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 06778b1c383afbdb88ffd837e117bec06a76f450 Author: Johannes Berg Date: Wed Dec 22 10:15:52 2010 +0100 mac80211: remove stray extern Somehow this snuck into my earlier patch, and only now did I see a compiler warning: net/mac80211/led.c:218:13: warning: function '__ieee80211_create_tpt_led_trigger' with external linkage has definition Remove the stray extern. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 90fc4b3a5ba24f09af2a8c4a723651a328949460 Author: Johannes Berg Date: Sat Dec 18 17:20:48 2010 +0100 mac80211: implement off-channel TX using hw r-o-c offload When the driver has remain-on-channel offload, implement off-channel transmission using that primitive. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 21f83589644bb2ed98079bf1e2154c8e70ca6a6c Author: Johannes Berg Date: Sat Dec 18 17:20:47 2010 +0100 mac80211: implement hardware offload for remain-on-channel This allows drivers to support remain-on-channel offload if they implement smarter timing or need to use a device implementation like iwlwifi. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c96e96354a6c9456cdf1f150eca504e2ea35301e Merge: dbbe68b 33af881 Author: John W. Linville Date: Wed Jan 5 16:06:25 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: net/bluetooth/Makefile commit 4b95f135f606c87e4056b6d7fd3c5781c818858b Author: Jean Pihet Date: Wed Jan 5 19:49:02 2011 +0100 tools, perf: Documentation for the power events API Provides documentation for the following: - the new power trace API, - the old (legacy) power trace API, - the DEPRECATED Kconfig option usage. Signed-off-by: Jean Pihet Cc: Arjan van de Ven Cc: trenn@suse.de Cc: Len Brown Cc: Pavel Machek Cc: Rafael J. Wysocki Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: linux-pm@lists.linux-foundation.org LKML-Reference: <1294253342-29056-3-git-send-email-j-pihet@ti.com> Signed-off-by: Ingo Molnar commit 938cfed18bec2c7361f37efc954712a7cc42c353 Author: Jean Pihet Date: Wed Jan 5 19:49:01 2011 +0100 perf: Add calls to suspend trace point Uses the machine_suspend trace point, called from the generic kernel suspend_devices_and_enter function. Signed-off-by: Jean Pihet Acked-by: Rafael J. Wysocki Cc: Arjan van de Ven CC: Thomas Renninger Cc: Len Brown Cc: Pavel Machek Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: linux-pm@lists.linux-foundation.org LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@ti.com> Signed-off-by: Ingo Molnar commit 33af88138b859f515b365a074e0a014d7cdbf846 Author: John W. Linville Date: Wed Jan 5 14:05:00 2011 -0500 ath9k: correct MODULE_PARM_DESC parameters for force_new_ani Signed-off-by: John W. Linville commit 18cb6e32e7aeea9c92af5793bee2b32536615502 Author: John W. Linville Date: Wed Jan 5 09:39:59 2011 -0500 ath5k: qualify global modparam_nohwcrypt variable Signed-off-by: John W. Linville commit 3e6109c57468ed320beefd2861fe2cc418cccfc2 Author: John W. Linville Date: Wed Jan 5 09:39:17 2011 -0500 ath9k: qualify global modparam_nohwcrypt variable Signed-off-by: John W. Linville commit 6303710d7aa62bfb154cd13ab5ab12cfa8baaf91 Merge: db98a6c d2460f4 Author: John W. Linville Date: Wed Jan 5 14:35:41 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 58daf18cdcab550262a5f4681e1f1e073e21965a Merge: aa312be 0af85dd Author: Russell King Date: Wed Jan 5 18:09:03 2011 +0000 Merge branch 'clksrc' into devel Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile commit aa312be1987d43216e72ffce42bccf6bf81f62ed Merge: 31edf27 8c11a94 38d6243 Author: Russell King Date: Wed Jan 5 18:08:31 2011 +0000 Merge branches 'mmci' and 'pl011-dma' into devel commit 31edf274f9aff1ccd39934a0b2fce38f4405c656 Merge: 3c0eee3 ed60453 ac61d14 28257f7 b230653 50005a8 cf562b4 3d09fbc 8a9618f Author: Russell King Date: Wed Jan 5 18:08:10 2011 +0000 Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel commit 38d624361b2a82d6317c379aebf81b1b28210bb0 Author: Russell King Date: Wed Dec 22 17:59:16 2010 +0000 ARM: PL011: add DMA burst threshold support for ST variants ST Micro variants has some specific dma burst threshold compensation, which allows them to make better use of a DMA controller. Add support to set this up. Based on a patch from Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Russell King commit 68b65f7305e54b822b2483c60de7d7b017526a92 Author: Russell King Date: Wed Dec 22 17:24:39 2010 +0000 ARM: PL011: Add support for transmit DMA Add DMA engine support for transmit to the PL011 driver. Based on a patch from Linus Walliej, with the following changes: - remove RX DMA support. As PL011 doesn't give us receive timeout interrupts, we only get notified of received data when the RX DMA has completed. This rather sucks for interactive use of the TTY. - remove abuse of completions. Completions are supposed to be for events, not to tell what condition buffers are in. Replace it with a simple 'queued' bool. - fix locking - it is only safe to access the circular buffer with the port lock held. - only map the DMA buffer when required - if we're ever behind an IOMMU this helps keep IOMMU usage down, and also ensures that we're legal when we change the scatterlist entry length. - fix XON/XOFF sending - we must send XON/XOFF characters out as soon as possible - waiting for up to 4095 characters in the DMA buffer to be sent first is not acceptable. - fix XON/XOFF receive handling - we need to stop DMA when instructed to by the TTY layer, and restart it again when instructed to. There is a subtle problem here: we must not completely empty the circular buffer with DMA, otherwise we will not be notified of XON. - change the 'enable_dma' flag into a 'using DMA' flag, and track whether we can use TX DMA by whether the channel pointer is non-NULL. This gives us more control over whether we use DMA in the driver. - we don't need to have the TX DMA buffer continually allocated for each port - instead, allocate it when the port starts up, and free it when it's shut down. Update the 'using DMA' flag if we get the buffer, and adjust the TTY FIFO size appropriately. - if we're going to use PIO to send characters, use the existing IRQ based functionality rather than reimplementing it. This also ensures we call uart_write_wakeup() at the appropriate time, otherwise we'll stall. - use DMA engine helper functions for type safety. - fix init when built as a module - we can't have to initcall functions, so we must settle on one. This means we can eliminate the deferred DMA initialization. - there is no need to terminate transfers on a failed prep_slave_sg() call - nothing has been setup, so nothing needs to be terminated. This avoids a potential deadlock in the DMA engine code (tasklet->callback->failed prepare->terminate->tasklet_disable which then ends up waiting for the tasklet to finish running.) - Dan says that the submission callback should not return an error: | dma_submit_error() is something I should have removed after commit | a0587bcf "ioat1: move descriptor allocation from submit to prep" all | errors should be notified by prep failing to return a descriptor | handle. Negative dma_cookie_t values are only returned by the | dma_async_memcpy* calls which translate a prep failure into -ENOMEM. So remove the error handling at that point. This also solves the potential deadlock mentioned in the previous comment. Acked-by: Linus Walleij Signed-off-by: Russell King commit 963cc981af620c7c07b5f6d1ab998b639e90ecb1 Author: Russell King Date: Wed Dec 22 17:16:09 2010 +0000 ARM: PL011: Ensure IRQs are disabled in UART interrupt handler As the DMA support introduces a separate interrupt-time callback, our interrupt handler will not be the only handler which takes the port lock, so we need to ensure that IRQs are disabled. We must use the _irqsave variant so we don't inadvertently enable interrupts. Acked-by: Linus Walleij Signed-off-by: Russell King commit ffca2b114c6a804d1307781df687e877a373a1c2 Author: Russell King Date: Wed Dec 22 17:13:05 2010 +0000 ARM: PL011: Separate hardware FIFO size from TTY FIFO size With DMA support, we need to tell the TTY subsystem that the DMA buffer is the size of the FIFO, otherwise things like tty_wait_until_sent() will time out too early. Keep (and use) the hardware value separately from the port->fifosize. This was part of a larger patch from Linus Walleij, with a little modification. Acked-by: Linus Walleij Signed-off-by: Russell King commit c19f12b5ef3adf3c139eabbe3d3d0201838b77b1 Author: Russell King Date: Wed Dec 22 17:48:26 2010 +0000 ARM: PL011: Allow better handling of vendor data Rather than copying all vendor data into the port structure, copy just that which is frequently used, and keep a pointer to the remaining vendor data structure. This makes it easier to add vendor quirks in the future. Acked-by: Linus Walleij Signed-off-by: Russell King commit 5063e2c567ee569cccfc01ebf80c898cb4e6833a Author: Russell King Date: Wed Dec 22 17:09:08 2010 +0000 ARM: PL011: Ensure error flags are clear at startup The error flags weren't being cleared upon UART startup, which can cause problems when we add DMA support. It's good practice to ensure that these flags are cleared anyway, so let's do so. This was part of a larger patch from Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Russell King commit e8a7ba86ff993311f8712e5b3bb2e3892e82df5f Author: Russell King Date: Tue Dec 28 09:16:54 2010 +0000 ARM: PL011: include revision number in boot-time port printk Include the revision number of the PL011 primecell in the boot-time port printk to allow proper identification of the peripheral. Acked-by: Linus Walleij Signed-off-by: Russell King commit eccdfe2d245a882feacc4630c9bc29805e9929c8 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:32:52 2011 -0200 perf script: Make some lists static Not accessed outside builtin-script, so make them static. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6d8afb56300c53a250c6de0f973ef502e54aabf3 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:27:30 2011 -0200 perf script: Use the default lost event handler That already does what was being done here. The warning is now unconditionally given by __perf_session__process_pipe_events, just like for non pipe processing. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 1109599458c06256064213dc44ca5f5fa8ee3833 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:25:15 2011 -0200 perf session: Warn about errors when processing pipe events too Just like we do at __perf_session__process_events Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit d030260ad33b482a371f999c7e9db79ef7a2111f Author: Stephane Eranian Date: Tue Jan 4 16:30:01 2011 +0200 perf tools: Fix perf_event.h header usage This patch fixes the usage of the perf_event.h header file between command modules and the supporting code in util. It is necessary to ensure that ALL files use the SAME perf_event.h header from the kernel source tree. There were a couple of #include mixed with #include "../../perf_event.h". This caused issues on some distros because of mismatch in the layout of struct perf_event_attr. That eventually led perf stat to segfault. Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 454a3bbe9b75eb8cbddffcf383fbb8e97ea78f52 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 10:40:08 2011 -0200 perf test: Clarify some error reports in the open syscall test Rebooted my devel machine, first thing I ran was perf test, that expects debugfs to be mounted, test fails. Be more clear about it. Also add missing newlines and add more informative message when sys_perf_event_open fails. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a7862aa90ffd1113bc2898ae6be2e4861b1f76cc Author: Mauro Carvalho Chehab Date: Wed Jan 5 12:31:15 2011 -0300 [media] cx25821: Fix compilation breakage due to BKL dependency drivers/staging/cx25821/cx25821-video.c: In function ‘video_open’: drivers/staging/cx25821/cx25821-video.c:817:8: error: implicit declaration of function ‘lock_kernel’ drivers/staging/cx25821/cx25821-video.c:834:9: error: implicit declaration of function ‘unlock_kernel’ This patch just adds a header with BKL function. It should be enough to avoid compilation breakage, but, as BKL will be removed, we need to properly fix it on a latter patch. Reported-by: Randy Dunlap Reported-by: Anca Emanuel Cc: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6 Author: Huang Ying Date: Tue Jan 4 22:38:09 2011 -0500 x86, NMI: Add touch_nmi_watchdog to io_check_error delay Prevent the long delay in io_check_error making NMI watchdog timeout. Signed-off-by: Huang Ying Signed-off-by: Don Zickus LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 554ec063982752e9a569ab9189eeffa3d96731b2 Author: Dongdong Deng Date: Tue Jan 4 22:38:08 2011 -0500 x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time The spin_lock_debug/rcu_cpu_stall detector uses trigger_all_cpu_backtrace() to dump cpu backtrace. Therefore it is possible that trigger_all_cpu_backtrace() could be called at the same time on different CPUs, which triggers and 'unknown reason NMI' warning. The following case illustrates the problem: CPU1 CPU2 ... CPU N trigger_all_cpu_backtrace() set "backtrace_mask" to cpu mask | generate NMI interrupts generate NMI interrupts ... \ | / \ | / The "backtrace_mask" will be cleaned by the first NMI interrupt at nmi_watchdog_tick(), then the following NMI interrupts generated by other cpus's arch_trigger_all_cpu_backtrace() will be taken as unknown reason NMI interrupts. This patch uses a test_and_set to avoid the problem, and stop the arch_trigger_all_cpu_backtrace() from calling to avoid dumping a double cpu backtrace info when there is already a trigger_all_cpu_backtrace() in progress. Signed-off-by: Dongdong Deng Reviewed-by: Bruce Ashfield Cc: fweisbec@gmail.com LKML-Reference: <1294198689-15447-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar Signed-off-by: Don Zickus commit 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535 Author: Don Zickus Date: Tue Jan 4 22:38:07 2011 -0500 x86: Only call smp_processor_id in non-preempt cases There are some paths that walk the die_chain with preemption on. Make sure we are in an NMI call before we start doing anything. This was triggered by do_general_protection calling notify_die with DIE_GPF. Reported-by: Jan Kiszka Signed-off-by: Don Zickus LKML-Reference: <1294198689-15447-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit aef1b9cef78ae65c6501850851cc3f61f9be477b Merge: 20c457b 3c0eee3 Author: Ingo Molnar Date: Wed Jan 5 14:22:08 2011 +0100 Merge commit 'v2.6.37' into perf/core Merge reason: Add the final .37 tree. Signed-off-by: Ingo Molnar commit 6bf4123760a5aece6e4829ce90b70b6ffd751d65 Author: NeilBrown Date: Wed Jan 5 12:50:16 2011 +1100 sched: Change wait_for_completion_*_timeout() to return a signed long wait_for_completion_*_timeout() can return: 0: if the wait timed out -ve: if the wait was interrupted +ve: if the completion was completed. As they currently return an 'unsigned long', the last two cases are not easily distinguished which can easily result in buggy code, as is the case for the recently added wait_for_completion_interruptible_timeout() call in net/sunrpc/cache.c So change them both to return 'long'. As MAX_SCHEDULE_TIMEOUT is LONG_MAX, a large +ve return value should never overflow. Signed-off-by: NeilBrown Cc: Peter Zijlstra Cc: J. Bruce Fields Cc: Andrew Morton Cc: Linus Torvalds LKML-Reference: <20110105125016.64ccab0e@notabene.brown> Signed-off-by: Ingo Molnar commit 27066fd484a32c80630136aa2b91c980f3198f9d Merge: 101e5f7 3c0eee3 Author: Ingo Molnar Date: Wed Jan 5 14:14:42 2011 +0100 Merge commit 'v2.6.37' into sched/core Merge reason: Merge the final .37 tree. Signed-off-by: Ingo Molnar commit cb2ded37fd2e1039f96c8c892da024a8f033add5 Author: Yinghai Lu Date: Tue Jan 4 16:38:52 2011 -0800 x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion Found one x2apic pre-enabled system, x2apic_mode suddenly get corrupted after register some cpus, when compiled CONFIG_NR_CPUS=255 instead of 512. It turns out that generic_processor_info() ==> phyid_set(apicid, phys_cpu_present_map) causes the problem. phys_cpu_present_map is sized by MAX_APICS bits, and pre-enabled system some cpus have an apic id > 255. The variable after phys_cpu_present_map may get corrupted silently: ffffffff828e8420 B phys_cpu_present_map ffffffff828e8440 B apic_verbosity ffffffff828e8444 B local_apic_timer_c2_ok ffffffff828e8448 B disable_apic ffffffff828e844c B x2apic_mode ffffffff828e8450 B x2apic_disabled ffffffff828e8454 B num_processors ... Actually phys_cpu_present_map is referenced via apic id, instead index. We should use MAX_LOCAL_APIC instead MAX_APICS. For 64-bit it will be 32768 in all cases. BSS will increase by 4k bytes on 64-bit: text data bss dec filename 21696943 4193748 12787712 38678403 vmlinux.before 21696943 4193748 12791808 38682499 vmlinux.after No change on 32bit. Finally we can remove MAX_APCIS that was rather confusing. Signed-off-by: Yinghai Lu Cc: H. Peter Anvin Cc: "Eric W. Biederman" LKML-Reference: <4D23BD9C.3070102@kernel.org> Signed-off-by: Ingo Molnar commit 8e1023016cf17152972b98bce6c144834a4916d5 Author: Heiko Carstens Date: Wed Jan 5 12:48:18 2011 +0100 [S390] prevent unneccesary loops_per_jiffy recalculation When the seqfile /proc/cpuinfo gets accesses for each possible cpu loops_per_jiffy gets recalculated. However its value is only needed on first access. In addition loops_per_jiffy should be recalculated when the machine reports a capability change. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 19726cec63aeadad127f9e72ee69240336e37f15 Author: Heiko Carstens Date: Wed Jan 5 12:48:17 2011 +0100 [S390] cpuinfo: use get_online_cpus() instead of preempt_disable() Use get_online_cpus() instead of preempt_disable() to make sure cpus don't go offline while accessing their per cpu data. The preempt_disable() stuff is old code which was used before get_online_cpus() was available. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 974de4d7e70a6d759457722a6f322cc86b480eea Author: Heiko Carstens Date: Wed Jan 5 12:48:16 2011 +0100 [S390] smp: remove cpu hotplug messages Get rid of messages that indicate if a cpu went online or offline. There is nothing special about this anymore and these messages might flood the kernel log buffer which makes debugging harder since more important messages might be overwritten. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fa188ae1657d6edc7963d524ce9a0650fe725242 Author: Gerald Schaefer Date: Wed Jan 5 12:48:15 2011 +0100 [S390] mutex: enable spinning mutex on s390 This enables the spinning mutex feature on s390 by removing HAVE_DEFAULT_NO_SPIN_MUTEXES from arch/s390/Kconfig. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 34b133f8e94e39ff3cf4d1c1f67f2e07cdc3d54e Author: Gerald Schaefer Date: Wed Jan 5 12:48:14 2011 +0100 [S390] mutex: Introduce arch_mutex_cpu_relax() The spinning mutex implementation uses cpu_relax() in busy loops as a compiler barrier. Depending on the architecture, cpu_relax() may do more than needed in this specific mutex spin loops. On System z we also give up the time slice of the virtual cpu in cpu_relax(), which prevents effective spinning on the mutex. This patch replaces cpu_relax() in the spinning mutex code with arch_mutex_cpu_relax(), which can be defined by each architecture that selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so this patch should not affect other architectures than System z for now. Signed-off-by: Gerald Schaefer Signed-off-by: Peter Zijlstra LKML-Reference: <1290437256.7455.4.camel@thinkpad> Signed-off-by: Ingo Molnar commit c03017544e3b2e60aa3c8ae451fac01595f1bf11 Author: Peter Oberparleiter Date: Wed Jan 5 12:48:13 2011 +0100 [S390] cio: fix ccwgroup unregistration race condition A race condition exists in the ccwgroup device unregistration code which can cause a kernel panic due to a use-after-free bug. This race condition might be triggered when all ccw devices associated with a ccwgroup device are removed at the same time (e.g. because the corresponding channel path becomes no longer available). Fix this race condition by clearing the references from the associated ccw devices to the ccw group device during unregistration of the ccw group device. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit f602be639e97024a77062368e123008c94b3109a Author: Heiko Carstens Date: Wed Jan 5 12:48:12 2011 +0100 [S390] perf: add DWARF register lookup for s390 Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 4cc9bed034d1ae588e5b773ee0edeb74ef3c0ff4 Author: Martin Schwidefsky Date: Wed Jan 5 12:48:11 2011 +0100 [S390] cleanup ftrace backend functions Signed-off-by: Martin Schwidefsky commit 5e9a26928f550157563cfc06ce12c4ae121a02ec Author: Martin Schwidefsky Date: Wed Jan 5 12:48:10 2011 +0100 [S390] ptrace cleanup Overhaul program event recording and the code dealing with the ptrace user space interface. Signed-off-by: Martin Schwidefsky commit da7f51c11d5fedca9ba779ee220063ccb4f0a27e Author: Heiko Carstens Date: Wed Jan 5 12:48:09 2011 +0100 [S390] smp/idle: call init_idle() before starting a new cpu Call init_idle() which (re-)initializes the idle task structure before it gets used on a new cpu. That way we can also get rid of the odd preempt_enable_no_resched() call we have in the cpu offline path within cpu_idle(). That call prevented preempt count imbalances between cpu hotplug operations. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f230886b0b0f0ce604395481bea05f3c0ad8fc9e Author: Heiko Carstens Date: Wed Jan 5 12:48:08 2011 +0100 [S390] smp: delay idle task creation Delay idle task creation until a cpu gets set online instead of creating them for all possible cpus at system startup. For one cpu system this should safe more than 1 MB. On my debug system with lots of debug stuff enabled this saves 2 MB. Same as on x86. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 09a8e7adcf960bd6a7204f3f3b377a89ce22efbf Author: Stefan Haberland Date: Wed Jan 5 12:48:07 2011 +0100 [S390] dasd: Correct retry counter for terminated I/O. In case the DASD driver needs to term a running I/O the retry counter is decreased twice. Remove the unnecessary retry counter decrease in das_term_IO. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit e4dbb0f2b5dd6a836d0e5c60aa5f573e0bbcf76a Author: Stefan Haberland Date: Wed Jan 5 12:48:06 2011 +0100 [S390] dasd: Add support for raw ECKD access. Normal I/O operations through the DASD device driver give only access to the data fields of an ECKD device even for track based I/O. This patch extends the DASD device driver to give access to whole ECKD tracks including count, key and data fields. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 6f272b9cec285a9610a2acf101f694bc58bed37e Author: Stefan Haberland Date: Wed Jan 5 12:48:05 2011 +0100 [S390] dasd: Prevent deadlock during suspend/resume. The freeze callback may set a stop bit so that a worker thread could not start I/O. The discipline specific freeze function waits for the worker to be completed. Set the stop_bit after the discipline specific freeze function has returned and no worker is running. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 5a27e60dec59a95bd7f8ae9a19ae2ede4f76395b Author: Stefan Weinhuber Date: Wed Jan 5 12:48:04 2011 +0100 [S390] dasd: Improve handling of stolen DASD reservation If a DASD device has been reserved by a Linux system, and later this reservation is ‘stolen’ by a second system by means of an unconditional reserve, then the first system receives a notification about this fact. With this patch such an event can be either ignored, as before, or it can be used to let the device fail all I/O request, so that the device will not block anymore. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit a4d26c6aeceea330ee5e0fb6b017d57e3b252d29 Author: Stefan Weinhuber Date: Wed Jan 5 12:48:03 2011 +0100 [S390] dasd: do path verification for paths added at runtime When a new path is added at runtime, the CIO layer will call the drivers path_event callback. The DASD device driver uses this callback to trigger a path verification for the new path. The driver will use only those paths for I/O, which have been successfully verified. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit ef19298b406f93af4bb249f0776deb8366e97532 Author: Stefan Weinhuber Date: Wed Jan 5 12:48:02 2011 +0100 [S390] dasd: add High Performance FICON multitrack support Some storage systems support multitrack High Performance FICON requests, which read or write data to more than one track. This patch enables the DASD device driver to generate multitrack High Performance FICON requests. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 9062014cb60194630272709da82d5879d563865e Author: Stefan Weinhuber Date: Wed Jan 5 12:48:01 2011 +0100 [S390] cio: reduce memory consumption of itcw structures Any list of indirect data adresses (TIDAL) used by a TCW must not cross a page boundary. The original itcw implementation complies with this restriction by allocating allmost twice as much memory as actually needed, so that in any case there is enough room for the full TIDAL, either above or below the page boundary. This patch implements an alternative method, by using a TTIC TIDAW to connect TIDAL parts below and above a page boundary. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit f3e1a273594c7d82b07102bd03e8adfe681f2864 Author: Heiko Carstens Date: Wed Jan 5 12:48:00 2011 +0100 [S390] nmi: enable machine checks early Until now machine checks for the swapper process of the IPL cpu are just implicitly (and more or less accidently) enabled when the first time the idle process goes into idle state and loads an enabled wait psw. Before that machine checks are disabled. So let's enable them explicitly in trap_init() so we have a well defined time when machine checks are enabled. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit aa3a41d009d433dd9775b356b2d70551816f1f3c Author: Jan Glauber Date: Wed Jan 5 12:47:59 2011 +0100 [S390] qeth: buffer count imbalance The used buffers counter is not incremented in case of an error so the counter can become negative. Increment the used buffers counter before checking for errors. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 4bc4e965d3e86897e4c7c487a477ccdf13db5b82 Author: Sebastian Ott Date: Wed Jan 5 12:47:58 2011 +0100 [S390] css: update subchannel descriptor Update the subchannel descriptor if we receive a "Installed parameters modified" crw. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 1de3447a41ea72972966b4896a9f8d2b064bd23f Author: Martin Schwidefsky Date: Wed Jan 5 12:47:57 2011 +0100 [S390] 31 bit entry.S update. Make the code in the 31 bit entry.S code as similar as possible to the 64 bit version in entry64.S. That makes it easier to add new code to the first level interrupt handler that affects both 31 and 64 bit kernels. Signed-off-by: Martin Schwidefsky commit ce322ccd53f2505cf8b0ed204631d6ac054ac66a Author: Sebastian Ott Date: Wed Jan 5 12:47:56 2011 +0100 [S390] cio: obtain mdc value per channel path Add support to accumulate the number of 64K-bytes blocks all paths to a device at least support for a transport command. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 37e8952174c6c239d1c86125e032fd6ad107a3e6 Author: Heiko Carstens Date: Wed Jan 5 12:47:55 2011 +0100 [S390] nohz: optimize arch_needs_cpu() arch_needs_cpu() gets always executed on the current cpu. Therefore the cpu parameter can be ignored it is possible to use __get_cpu_var() instead of per_cpu() to access the per_cpu variable, which will generate better code. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 90adac58d1a4daf3560739ff5b76497d5ece16c4 Author: Jan Glauber Date: Wed Jan 5 12:47:54 2011 +0100 [S390] qdio: cleanup SIGA sync Simplify the SIGA sync code and add unlikely annotations. In polling mode SBALs may be accessed without interrupt, so call SIGA sync before every scan. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 110da31709023de61735f2d8a3e52c20c23bb570 Author: Jan Glauber Date: Wed Jan 5 12:47:53 2011 +0100 [S390] qdio: remove enhanced SIGA HiperSocket devices only use one SBAL per qdio call without the enhanced SIGA feature. Since that feature is currently not used remove it from the qdio code so the compiler can generate better code for the HiperSocket outbound path. While at it mark the SIGA error conditions as unlikely. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 958c0ba403cb6a693b54be2389f9ef53377fa259 Author: Jan Glauber Date: Wed Jan 5 12:47:52 2011 +0100 [S390] qdio: use proper QEBSM operand for SIGA-R and SIGA-S If QIOASSIST is enabled for a qdio device the SIGA instruction requires a modified function code. This function code modifier was missing for SIGA-R and SIGA-S which can lead to a kernel panic caused by an operand exception. Cc: stable@kernel.org Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 0195843bfda90a215f3b72c9aac2fd0bc9244b67 Author: Jan Glauber Date: Wed Jan 5 12:47:51 2011 +0100 [S390] qdio: outbound queue full counter Add a counter for outbound queue full events to the qdio statistics. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 3d6c76ff32bb9b2ebf6e859855d315eb42e3df50 Author: Jan Glauber Date: Wed Jan 5 12:47:50 2011 +0100 [S390] qdio: outbound tasklet scan threshold Introduce a scan treshold for the qdio outbound queues. By setting the threshold the driver can tell qdio after how much used SBALs qdio should schedule the outbound tasklet that scans the queue for finished SBALs. The threshold is specific by the drivers because a Hipersockets device is much faster in utilizing outbound buffers than a ZFCP or OSA device. The default values after how many used SBALs the tasklet should run are: OSA: > 31 SBALs Hipersockets: > 7 SBALs zfcp: > 55 SBALs Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 4f325184f2d4c1f2258873b2a333005dc4dfcbc0 Author: Jan Glauber Date: Wed Jan 5 12:47:49 2011 +0100 [S390] qdio: prevent race for shared indicators If the shared indicator is used the following race leads to an inbound stall: Device CPU0 CPU1 ======================================================== non-shared DSCI =>1 ALSI => 1 Thin INT ALSI => 0 non-shared DSCI tasklets scheduled shared DSCI => 1 ALSI => 1 shared DSCI => 0 ALSI ? -> set Thin INT ALSI => 0 ALSI was set, shared DSCI => 1 After that no more interrupts occur because the DSCI is still set. Fix that race by only resetting the shared DSCI if it was actually set so the tasklets for all shared devices are scheduled and will run after the interrupt. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 078f8ecaa30718694d1e13d9f415b7ce75b3c968 Author: Felix Beck Date: Wed Jan 5 12:47:48 2011 +0100 [S390] Handling of 4096 bit RSA keys in CRT format. Also process 4096 bit RSA keys in CRT format. Handle them like the smaller keys and take care of the zero padding. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit c2567f8ffa2704f6f2f81013e9a590deca5a865f Author: Felix Beck Date: Wed Jan 5 12:47:47 2011 +0100 [S390] zcrypt: cope with cca restriction of cex3 The cca on the crypto adapter has a restriction in the size of the exponent if a key with a modulus bigger than 2048 bit is used. Thus in that case we have to avoid that the crypto device driver thinks the adapter is defect and sets it offline. Therfore a new member for the zcrypt_device struct called max_exp_bit_length is introduced. This will be set the first time the cca returns the error code function not implemented. If this is done with an adapter twice it will return -EINVAL. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 2ade1fab026b4a103f0105ec4b47654fc2f729c7 Author: Felix Beck Date: Wed Jan 5 12:47:46 2011 +0100 [S390] zcrypt: support for 4096 bit keys for cex3c Definitions for CEX3 card types are changed to support 4096 bit RSA keys in the coprocessor. Signed-off-by: Felix Beck Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit 3e309a66f52e042881f76cbfb9b6c2aa70163e02 Author: Felix Beck Date: Wed Jan 5 12:47:45 2011 +0100 [S390] zcrypt: support for 4096 bit keys for cex3a Definitions for CEX3 card types are changed to support 4096 bit RSA keys. Also new structs for the accelerator mode are needed. Additionaly when checking the length of key parts, the case for bigger (4096 bit) keys is needed. Signed-off-by: Felix Beck Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit b1f933da570576d1f290ea4dc9b896404cbd285d Author: Felix Beck Date: Wed Jan 5 12:47:44 2011 +0100 [S390] zcrypt: Introduce check for 4096 bit support. Implemented an asm in the ap bus and made it accessible for the card specific parts of the zcrypt driver. Thus when a cex3a is recognized a check can be performed to dermine whether the card supports 4096 bit RSA keys. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 2fcb3686e1601cff992e026dceeab1b22dc81178 Author: Michael Holzheu Date: Wed Jan 5 12:47:43 2011 +0100 [S390] hypfs: Move buffer allocation from open to read Currently the buffer for diagnose data is allocated in the open function of the debugfs file and is released in the close function. This has the drawback that a user (root) can pin that memory by not closing the file. This patch moves the buffer allocation to the read function. The buffer is automatically released after the buffer is copied to userspace. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 6432c015b754fef910dd7468b16fffc2b975348a Author: Martin Schwidefsky Date: Wed Jan 5 12:47:42 2011 +0100 [S390] current_thread_info optimization Use thread_info lowcore field for current_thread_info(), saves an unnecessary calculation. Signed-off-by: Martin Schwidefsky commit b1b750918566c6c4e8ed6c9b3c0f05b4c0a8805c Author: Heiko Carstens Date: Wed Jan 5 12:47:41 2011 +0100 [S390] extint: get rid of early code plus cleanup Get rid of register/unregister_early_external_interrupt() and clean up the code while at it. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 98b799800c3e2f855ef2d2c6263e84fa5d1420a0 Author: Heiko Carstens Date: Wed Jan 5 12:47:40 2011 +0100 [S390] sclp: use register_external_interrupt() Use register_external_interrupt() instead of register_early_external_interrupt(). The early variant is not necessary since kmalloc works already. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fb0a9d7e865afdae70829a64bb004a74ff67d29f Author: Heiko Carstens Date: Wed Jan 5 12:47:39 2011 +0100 [S390] pfault: delay register of pfault interrupt Use an early init call to initialize pfault. That way it is possible to use the register_external_interrupt() instead of the early variant. No need to enable pfault any earlier since it has only effect if user space processes are running. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 62d146ffe3adfed2747fc36138476c8417ce73a7 Author: Holger Dengler Date: Wed Jan 5 12:47:38 2011 +0100 [S390] ap bus: add support for irq statistics Add support for AP Bus I/O interrupt statistics in /proc/interrupts. Signed-off-by: Holger Dengler Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 85b81cdd0b038d580dedf6289df7de65826967d6 Author: Heiko Carstens Date: Wed Jan 5 12:47:37 2011 +0100 [S390] ctc: add support for irq statistics Add support for CTC I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 355eb4022b92349f70cd69ce5b9572c71c0be226 Author: Heiko Carstens Date: Wed Jan 5 12:47:36 2011 +0100 [S390] claw: add support for irq statistics Add support for CLAW I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 096a61682e86090e4e74118ff6fa6858ca73aa58 Author: Heiko Carstens Date: Wed Jan 5 12:47:35 2011 +0100 [S390] lcs: add support for irq statistics Add support for LCS I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f48198d592b0d680b9677bd69edd2290cd0c1f4f Author: Heiko Carstens Date: Wed Jan 5 12:47:34 2011 +0100 [S390] vmur: add support for irq statistics Add support for VMUR I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b86651721f18f40319efe94ed3eac2d26682e5b9 Author: Heiko Carstens Date: Wed Jan 5 12:47:33 2011 +0100 [S390] tape: add support for irq statistics Add support for ccw based tape I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3fe22f6bfd6f81aafd140d69578d3a2c39674664 Author: Heiko Carstens Date: Wed Jan 5 12:47:32 2011 +0100 [S390] 3270: add support for irq statistics Add support for 3270 I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 12fae5858cd97181c92472c9bb5f098a7eca2ffe Author: Heiko Carstens Date: Wed Jan 5 12:47:31 2011 +0100 [S390] 3215: add support for irq statistics Add support for 3215 I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3283942b71eb5023184b378230f5f0e3fbb40991 Author: Heiko Carstens Date: Wed Jan 5 12:47:30 2011 +0100 [S390] dasd: add support for irq statistics Add support for DASD I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 30d77c3e1cbdff304b16ae02cb56baaa308e42fd Author: Jan Glauber Date: Wed Jan 5 12:47:29 2011 +0100 [S390] qdio: add qdio interrupts to interrupt statistics Count traditional qdio interrupts and adapter interrupts for qdio in the interrupt statistics. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 052ff461c8427629aee887ccc27478fc7373237c Author: Heiko Carstens Date: Wed Jan 5 12:47:28 2011 +0100 [S390] irq: have detailed statistics for interrupt types Up to now /proc/interrupts only has statistics for external and i/o interrupts but doesn't split up them any further. This patch adds a line for every single interrupt source so that it is possible to easier tell what the machine is/was doing. Part of the output now looks like this; CPU0 CPU2 CPU4 EXT: 3898 4232 2305 I/O: 782 315 245 CLK: 1029 1964 727 [EXT] Clock Comparator IPI: 2868 2267 1577 [EXT] Signal Processor TMR: 0 0 0 [EXT] CPU Timer TAL: 0 0 0 [EXT] Timing Alert PFL: 0 0 0 [EXT] Pseudo Page Fault [...] NMI: 0 1 1 [NMI] Machine Checks Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 545b288dcbdea58a2ce2afba5f6a8302d31ac459 Author: Heiko Carstens Date: Wed Jan 5 12:47:27 2011 +0100 [S390] time: let local_tick_enable/disable() reprogram the clock comparator Let local_tick_enable/disable() reprogram the clock comparator so the function names make semantically more sense. Also that way the functions are more symmetric since normally each local_tick_enable() call usually would have a subsequent call to set_clock_comparator() anyway. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 17eb7a5cfa98627e5b34e9a9a33b4f04f1c8832d Author: Heiko Carstens Date: Wed Jan 5 12:47:26 2011 +0100 [S390] time: move local_tick_enable()/disable() to timex.h Move the two functions to timex.h where they make more sense than in hardirq.h. No functional change. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 860dba45e81be2e1ba977617652ae36084daebaf Author: Martin Schwidefsky Date: Wed Jan 5 12:47:25 2011 +0100 [S390] add kprobes annotations Add kprobes annotations to get the massive 'probe kernel.function("*") {}' stress test working. Signed-off-by: Martin Schwidefsky commit 4a1886358b2d68f6f8745bfc10399c2376681acc Author: Martin Schwidefsky Date: Wed Jan 5 12:47:24 2011 +0100 [S390] kprobes: coding style Correct some minor coding style issues. Signed-off-by: Martin Schwidefsky commit 0e917cc3297f3274993d25b5972c2b1c6f763819 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:23 2011 +0100 [S390] kprobes: restructure handler function Restructure the kprobe breakpoint handler function. Add comments to make it more comprehensible and add a sanity check for re-entering kprobes. Signed-off-by: Martin Schwidefsky commit 92b8cbf17ae98a118d3e4a123246a05130114d06 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:22 2011 +0100 [S390] kprobes: jprobe save and restore Register %r14 and %r15 are already stored in jprobe_saved_regs, no need to store them a second time in jprobe_saved_r14 / jprobe_saved_r15. Signed-off-by: Martin Schwidefsky commit 371db06b017c518da2d69ae278c5978ebcd1041a Author: Martin Schwidefsky Date: Wed Jan 5 12:47:21 2011 +0100 [S390] kprobes: insn slots The s390 architecture can execute code on kmalloc/vmalloc memory. No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour. Signed-off-by: Martin Schwidefsky commit b9599798f953084774da926caa8bafd7e244948e Author: Martin Schwidefsky Date: Wed Jan 5 12:47:20 2011 +0100 [S390] kprobes: activation and deactivation Replace set_current_kprobe/reset_current_kprobe/save_previous_kprobe/ restore_previous_kprobe with a simpler scheme push_kprobe/pop_kprobe. The mini kprobes stack can store up to two active kprobes. Signed-off-by: Martin Schwidefsky commit ba640a591574036ab22cd32b47897340b0605342 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:19 2011 +0100 [S390] kprobes: instruction fixup Determine instruction fixup details in resume_execution, no need to do it beforehand. Remove fixup, ilen and reg from arch_specific_insn. Signed-off-by: Martin Schwidefsky commit 5a8b589f8a35b2c69d1819e3365825e4385a844c Author: Martin Schwidefsky Date: Wed Jan 5 12:47:18 2011 +0100 [S390] kprobes: instruction swap Move the definition of the helper structure ins_replace_args to the only place where it is used and drop the old member as it is not needed. Signed-off-by: Martin Schwidefsky commit fc0a1fea6b81095b6c0e01ec3407d04c8341974c Author: Martin Schwidefsky Date: Wed Jan 5 12:47:17 2011 +0100 [S390] kprobes: single step cleanup The saved interrupt mask and the saved control registers are only relevant while single stepping is set up. A secondary kprobe while kprobe single stepping is active may not occur. That makes is safe to remove the save and restore of kprobe_saved_imask / kprobe_save_ctl from save_previous_kprobe and restore_previous_kprobe. Move all single step related code to two functions, enable_singlestep and disable_singlestep. Signed-off-by: Martin Schwidefsky commit 35f2aaa79a2d484c8449f34461464a1e84e36e2b Author: Martin Schwidefsky Date: Wed Jan 5 12:47:16 2011 +0100 [S390] kprobes: single stepped breakpoint Remove special case of a kprobe on a breakpoint while a relocated instruction is single stepped. The only instruction that may cause a fault while kprobe single stepping is active is the relocated instruction. There is no kprobe on the instruction slot retrieved with get_insn_slot(). Signed-off-by: Martin Schwidefsky commit 6f9a3c330652b0fdb65d89e94977a8e79fe730e7 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:15 2011 +0100 [S390] cleanup s390 Kconfig Make use of def_bool and def_tristate where possible and add sensible defaults to the config symbols where applicable. This shortens the defconfig file by another ~40 lines. Signed-off-by: Martin Schwidefsky commit 53ec24b1e6c7118a127cf029a1519a2ce55268ec Author: Felix Beck Date: Wed Jan 5 12:46:44 2011 +0100 [S390] zcrypt: Fix check to look for facility bits 2 & 65 Fix the check for ap interupts to look for facility bits 2 and 65. Make sure that we only register interrupts for aps, if the machine has ap interrupt support. This patch is relevant only for the 2.6.37 stable series. Cc: stable@kernel.org Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 0af85dda39d9b673aca8c0ebae004ea70f3efc93 Author: Russell King Date: Wed Dec 15 21:58:50 2010 +0000 ARM: vexpress: add sched_clock() for Versatile Express Add a sched_clock() implementation to Versatile Express using the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Will Deacon Signed-off-by: Russell King commit 1051b9f0f9eab8091fe3bf98320741adf36b4cfa Merge: cde9efe a58154d Author: Russell King Date: Wed Jan 5 10:23:38 2011 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit d3a23e1678a5827c38ed8a465ad91d65e59fa911 Author: Nick Piggin Date: Wed Jan 5 20:01:21 2011 +1100 Revert "fs: use RCU read side protection in d_validate" This reverts commit 3825bdb7ed920845961f32f364454bee5f469abb. You cannot dget() a dentry without having a reference, or holding a lock that guarantees it remains valid. Signed-off-by: Nick Piggin commit 97cbc8fb1e35e328073e84c4031bd338306397d6 Merge: 17d6ce1 14bbb7c Author: Paul Mundt Date: Wed Jan 5 17:30:20 2011 +0900 Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 025a10a76808cfd9e55dbf965d0f1453e4f8ae84 Merge: 6bf45a1 f7dd361 c070c20 d0fb0c4 Author: Paul Mundt Date: Wed Jan 5 17:25:29 2011 +0900 Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt commit 14bbb7c61557172e4482d4d97a5f56042a12b969 Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:29 2010 +0000 fbdev: sh_mipi_dsi: use platform provided register layout and values Different sh-mobile SoCs have variations in their MIPI DSI register layouts, besides, different LCD panels require different configuration parameters. This patch switches the driver to use platform-provided MIPI DSI parameters. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 6fd465956e287f2bff8ff70ad4f27825dc3b468c Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:26 2010 +0000 ARM: mach-shmobile: specify sh7372 MIPI DSI register layout Prepare the ap4evb board for the MIPI DSI driver transition to support different register layouts. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 38f3a8794236af422312d280bbe3801130cfa63b Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:22 2010 +0000 fbdev: sh_mipi_dsi: support different register layouts The register layout of the MIPI DSI unit on sh-mobile SoCs differ. Add platform parameters to support such variations. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 0851d50dc12a844778a9b243e141f713cd8f074f Author: Guennadi Liakhovetski Date: Mon Dec 27 10:23:09 2010 +0000 ARM: mach-shmobile: improve MIPI DSI clock configuration Now, that the MIPI DSI driver implements runtime PM, we don't need anymore to configure clocks statically in the platform code. This patch also adds a DSITX1 clock definition for sh7372 and attaches PHY clocks to respective devices. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 236782a5f3674d06865d822092b8a1ea65a44f96 Author: Guennadi Liakhovetski Date: Mon Dec 27 10:23:05 2010 +0000 fbdev: sh-mobile: implement MIPI DSI runtime PM support On SH-Mobile platforms using runtime PM with the MIPI DSI driver switches the DSI Tx link clock on PM events. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c070c203cde0e019cd373d3247137be11961deb3 Author: Takashi YOSHII Date: Wed Dec 22 14:15:08 2010 +0000 ARM: mach-shmobile: sh73a0: fix div4 table sh73a0 has divisor[12] setting as 1/7 on FRQCRA. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db Author: Kuninori Morimoto Date: Tue Dec 28 05:54:53 2010 +0000 ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit ae37c8de74734f640f757be64ddb85f19f042626 Author: Magnus Damm Date: Wed Dec 22 14:47:40 2010 +0000 ARM: mach-shmobile: Mackerel VGA camera support Add VGA camera support to the Mackerel board using soc_camera_platform. The VGA camera module is hooked up using the 8-bit CEU bus, and it is constantly bursting out frames in fixed video mode setting. The camera module does not allow any I2C control. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eac676e531214f1e276645613acae7d7c4529035 Author: Roel Kluin Date: Sat Jan 1 18:36:36 2011 +0000 sh: correct definitions to access stack pointers A definition like: #define regs_return_value(regs) ((regs)->regs[0]) called with regs_return_value(foo) will be preprocessed to: ((foo)->foo[0]) ^^^ So to fix this to ensure the preprocessor compiles such calls correctly. Signed-off-by: Roel Kluin Signed-off-by: Paul Mundt commit f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b Author: Guennadi Liakhovetski Date: Wed Dec 29 07:59:25 2010 +0000 mmc: sh_mmcif: make DMA support by the driver unconditional Simplify the driver by removing the possibility to build it without the DMA support and remove the respective Kconfig parameter. Signed-off-by: Guennadi Liakhovetski Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit 050855887236701c5e7ff803b42265824ce99885 Author: Sam Ravnborg Date: Tue Jan 4 11:39:19 2011 +0000 sparc: update copyright in piggyback.c Update copyright info in piggyback.c to include info from piggyback_64.c. Include my own copyright too. Signed-off-by: Sam Ravnborg Cc: Josip Rodin Cc: Jakub Jelinek Signed-off-by: David S. Miller commit 9202db2202288f0013c3285b291d8281a8190962 Author: Sam Ravnborg Date: Tue Jan 4 11:39:18 2011 +0000 sparc: unify strip command in boot/Makefile Include an additional "Kernel is ready" print for zImage Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 56818a6f9105ac016ecf5907f7cb63bcdab639fe Author: Sam Ravnborg Date: Tue Jan 4 11:39:17 2011 +0000 sparc: rename piggyback_32 to piggyback Now that we use the same piggyback for 32 and 64 bit we can drop the _32 suffix. Include some trivial unification in the Makefile now that 32 and 64 bit can share the same piggyback command. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 1075c4ef707ca83afbeb0950094436eb0245ec86 Author: Sam Ravnborg Date: Tue Jan 4 11:39:16 2011 +0000 sparc: fix tftpboot.img for sparc64 on little-endian host piggyback_32 adapted to support sparc64: - locating "HdrS" differs for sparc and sparc64 - sparc64 updates a_text, a_data + a_bss in the final a.out header Updated Makefile to use piggyback_32 for sparc64. Deleted the now unused piggyback_64.c piggyback_32.c is host endian neutral and works on both little-endian and big-endian hosts. This fixes a long standing bug where sparc64 could not generate tftpboot.img on a x86 host. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit a020bb17b7046cd97ea6924ca99325b6e516bc2d Author: Sam Ravnborg Date: Tue Jan 4 11:39:15 2011 +0000 sparc: add $BITS to piggyback arguments Add new option to piggyback that identify if this is for 32 or 64 bit. Use this information to determine the alignment used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 571e08f6e2ddd6ec5d547358f55342726c063072 Author: Sam Ravnborg Date: Tue Jan 4 11:39:14 2011 +0000 sparc: remove obsolete ELF support in piggyback_32.c As we always convert to a.out there is no need to support ELF. Removing ELF support because: - it is not used - it simplifies code to support a.out only Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 9c239053045568abf960b01e4eb2c7205e3cd7d6 Author: Sam Ravnborg Date: Tue Jan 4 11:39:13 2011 +0000 sparc: additional comments to piggyback_32.c While reverse engineering the functionality of piggyback I missed that the code was actually commented. So I added a few comments. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b2a39b0d8ec2ce2bdcff4e01572b4e885220254d Author: Sam Ravnborg Date: Tue Jan 4 11:39:12 2011 +0000 sparc: use _start for the start entry (like 64 bit does) We use "_start" in 64 bit - do the same in 32 bit. It is always good to be consistent. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit e405ae76af19cd2c85335b842f880a2bc98ba785 Author: Sam Ravnborg Date: Tue Jan 4 11:39:11 2011 +0000 sparc: use trapbase in setup_arch start and trapbase point to the same address. But using start to assing to sparc_ttable looked confusing. Replace this with the use of trapbase. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 2fe74fa9662f8df51e6ef18227089f54cc07e16a Author: Sam Ravnborg Date: Tue Jan 4 11:39:10 2011 +0000 sparc: refactor piggy_32.c Refactoring to increase readability (a little). - sort includes - spaces around operators - small helpers introduced - added a few comments Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a Merge: 7b26e5e 9fc3bbb Author: David S. Miller Date: Tue Jan 4 11:57:25 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit db98a6cfcc9ac951067c9a2cb60459b618fd7b10 Author: roel kluin Date: Mon Jan 3 12:03:44 2011 -0800 libertas: down_interruptible() can return -EINTR, not EINTR Fix test in lbs_spi_thread(). down_interruptible() can return -EINTR, but not EINTR. Signed-off-by: Roel Kluin Cc: Dan Williams Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit b5c34f662a3519d34f9634a14d8de638fdbe0ca3 Author: Johannes Berg Date: Mon Jan 3 19:51:09 2011 +0100 mac80211: fix some key comments and code The key documentation is slightly out of date, fix that. Also, the list entry in the key struct is no longer used that way, so list_del_init() isn't necessary any more there. Finally, ieee80211_key_link() is no longer invoked under RCU read lock, but rather with an appropriate station lock held. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cc72128750700d01c31f583a355c5f8f809498bb Author: Sujith Manoharan Date: Mon Jan 3 21:22:18 2011 +0530 ath9k_htc: Fix packet injection To inject a packet in monitor mode, a dummy station has to be associated with the monitor interface in the target. Failing to do this would result in a firmware crash on the device. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit a8851d10aadb46b25db4459aa0d1150c957d2bc1 Author: Dan Carpenter Date: Mon Jan 3 08:46:29 2011 +0300 ath5k: ath5k_eeprom_mode_from_channel() returns signed ath5k_eeprom_mode_from_channel() returns -1 on error but we're storing the result in "ee_mode" which is an unsigned char. This breaks the error handling. This patch makes "ee_mode" an int. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 2ae79d52cdac733037490486792a53de9fb8d6b6 Author: Mohammed Shafi Shajakhan Date: Fri Dec 31 20:49:00 2010 +0530 ath9k : few rate control clean ups Remove some obvious looking dead code and rename few functions Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 707e634326448190bfe2d937c44ec05c8dea63c4 Author: Christian Lamparter Date: Thu Dec 30 17:29:53 2010 +0100 Revert "mac80211: temporarily disable reorder release timer" This reverts enables the reorder release timer once again. The issues laid out in: Have been addressed by: mac80211: serialize rx path workers mac80211: ignore PSM bit of reordered frames Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 24a8fdad35835e8d71f7c4b978a246fafed2e7b4 Author: Christian Lamparter Date: Thu Dec 30 17:25:29 2010 +0100 mac80211: serialize rx path workers This patch addresses the issue of serialization between the main rx path and various reorder release timers. It converts the previously local "frames" queue into a global rx queue [rx_skb_queue]. This way, everyone (be it the main rx-path or some reorder release timeout) can add frames to it. Only one active rx handler worker [ieee80211_rx_handlers] is needed. All other threads which have lost the race of "runnning_rx_handler" can now simply "return", knowing that the thread who had the "edge" will also take care of their workload. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 1186488b4a4d4871e40cb1604ba3ede3d4b7cc90 Author: Rajkumar Manoharan Date: Thu Dec 30 19:07:44 2010 +0530 ath9k: fix beacon restart on channel change Restart the beacon timers only if the beacon was already configured. Otherwise beacons timers are restarted unnecessarily in unassociated state too. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bd8027a72a1af95efd1dc8ea6df2fd9724c885b2 Author: Mohammed Shafi Shajakhan Date: Thu Dec 30 12:18:01 2010 +0530 Revert "ath9k: Parse DTIM period from mac80211" This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008. Event though with the above commit we obtain the configured DTIM period from the AP rather than always hardcoding it to '1', this seems to cause problems under the following scenarios: * Preventing association with broken AP's * Adds latency in roaming So its better to always use the safe value of '1' for dtim period Cc: Jouni Malinen Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ff039c6fb372c87a3cc4fd25bb846790cb35edb8 Author: Bob Copeland Date: Wed Dec 29 17:09:02 2010 -0500 cfg80211: fix transposition of words in printk Fixes the misplaced article in the following: "cfg80211: Updating information on frequency 5785 MHz for 20 a MHz width channel with regulatory rule:" Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit f76b57b47e5fd423f9827c7b0ba7bbd06cca6b9b Author: Joel A Fernandes Date: Tue Dec 28 19:28:11 2010 -0600 mac80211: Fix mesh portal communication with other mesh nodes. Fixed a bug where if a mesh interface has a different MAC address from its bridge interface, then it would not be able to send data traffic to any other mesh node. This also adds support for communication between mesh nodes and external bridged nodes by using a 6 address format if the source is a node within the mesh and the destination is an external node proxied by a mesh portal. Signed-off-by: Joel A Fernandes Signed-off-by: John W. Linville commit 1c30cc19081c16b1fe73ac13f2cb2abc009cdcc4 Author: Felix Fietkau Date: Tue Dec 28 15:46:16 2010 +0100 ath9k_hw: fix dma descriptor rx error bit parsing An Rx DMA descriptor can have multiple error bits set, and some error bits (e.g. MIC failure) are filtered by the driver based on other criteria. Remove the 'else' in various error bit checks so that all error information is properly passed to the driver. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1e1f4ad25fab29ca48b1166e74a81e9c89ddf0fb Author: Sujith Manoharan Date: Tue Dec 28 14:28:52 2010 +0530 ath9k_htc: Move LED/RFKILL code to htc_drv_gpio.c And add the copyright/license header. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 039a07215e0fca00c450f4bf1dc9b458bdfe8559 Author: Sujith Manoharan Date: Tue Dec 28 14:28:37 2010 +0530 ath9k_htc: Fix fast channel change When returning to the operating channel, a full HW reset has to be done instead of a fast channel change. Since sw_scan_complete() is called after the config() call for the home channel, we end up doing a FCC. Fix this issue by checking the OFFCHANNEL flag to determine FCC. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 73908674c6957082e8ab57daed57d2bb97a1ebba Author: Sujith Manoharan Date: Tue Dec 28 14:28:27 2010 +0530 ath9k_htc: Handle FATAL events The device has to be reset when a FATAL event is received. Not doing so would leave the card in a non-working state. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 66e3547431a8738416b508badfb9f326d11dabcc Author: Sujith Manoharan Date: Tue Dec 28 14:28:14 2010 +0530 ath9k_htc: Move work cancellation outside of mutex There is no need to lock the various work cancellation calls. This will be helpful when handling FATAL events. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ff8f59b5bbdf1527235b8c88d859c7d23691324f Author: Sujith Manoharan Date: Tue Dec 28 14:28:05 2010 +0530 ath9k_htc: Handle pending URBs properly When doing a channel change, the pending URBs have to be killed properly on calling htc_stop(). This fixes the probe response timeout seen when sending UDP traffic at a high rate and running background scan at the same time. Cc: stable Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ee832d3e9e72abf83931205a2f5379944be501c2 Author: Mohammed Shafi Shajakhan Date: Tue Dec 28 13:06:26 2010 +0530 ath9k: Few clean ups in beacon config parameters Some minor clean ups in assigning values to beacon config parameters Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 4cfda47b69d0a37e5fc0292addba6d0f5f671a14 Author: Christian Lamparter Date: Mon Dec 27 23:21:26 2010 +0100 mac80211: ignore PSM bit of reordered frames This patch tackles one of the problems of my reorder release timer patch from August. => What if the reorder release triggers and ap_sta_ps_end (called by ieee80211_rx_h_sta_process) accidentally clears the WLAN_STA_PS_STA flag, because 100ms ago - when the STA was still active - frames were put into the reorder buffer. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 5af3c1d195a6169a925a929e800dc4fce2a545ae Author: Helmut Schaa Date: Mon Dec 27 15:07:35 2010 +0100 rt2x00: Fix comment about removed spinlock The comment doesn't match the code anymore. Fix that. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 48103d25c4ca00a1d0692895f9aa68fcac6bc6af Author: Helmut Schaa Date: Mon Dec 27 15:07:16 2010 +0100 rt2x00: Remove unused interface spinlock Since the last user of intf->lock is gone we can safely remove it. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit bfe6a15d60671993eb3d4ac396b1f442ae08581c Author: Helmut Schaa Date: Mon Dec 27 15:06:57 2010 +0100 rt2x00: Simplify intf->delayed_flags locking Instead of protecting delayed_flags with a spinlock use atomic bitops to make the code more readable. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f833eea0a77b0910ea202468175bfc80470d44d0 Author: Helmut Schaa Date: Mon Dec 27 15:06:36 2010 +0100 rt2x00: Remove superfluous assignment of mpdu_density The tx desciptor already gets initialized to 0. Hence, there's no need to explicitly assign 0 to mpdu_density here. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 11f16aefcc07178972f149f1a1d53e6868481394 Author: Ismael Luceno Date: Mon Dec 27 15:06:17 2010 +0100 rt2x00: Fix panic on frame padding for rt2800 usb devices Backtrace: rt2800usb_write_tx_data rt2x00queue_write_tx_frame rt2x00mac_tx invoke_tx_handlers __ieee80211_tx ieee80211_tx virt_to_head_page ieee80211_xmit ieee80211_tx_skb ieee80211_scan_work schedule ieee80211_scan_work process_one_work ... It tried to expand the skb past it's end using skb_put. So I replaced it with a call to skb_padto, which takes the issue into account. Signed-off-by: Ismael Luceno Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 736e3acadce8438e610b897af2b1c472ed58444b Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:55 2010 +0100 rt2x00: Fix pointer errors. Fix some pointer errors in the various calls to memcpy, memset and memmove. Although none of these errors are fatal (the expression used now results in the same pointer value) it is better to use the proper expression. All errors are having to deal with arrays. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a39fd6be19bde021314262a6d2193b3792c808db Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:35 2010 +0100 rt2x00: remove intf->mac field. The mac field of the rt2x00_intf structure is written to once and used twice. In both these uses the mac address is available via other means. Remove this field as it does not appear to be necessary. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:14 2010 +0100 rt2x00: Remove intf->bssid field. The bssid field in struct rt2x00_intf is only written to once, and is never read from. Remove this field, as it appears to not be needed. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5235189c8edddf2eb32982f814bc858b55e6350a Author: Johannes Stezenbach Date: Mon Dec 27 15:04:54 2010 +0100 rt2x00: allow txstatus_fifo w/o txstatus_tasklet When DRIVER_REQUIRE_TXSTATUS_FIFO is set, intialize the txstatus_fifo, but initialize rt2x00dev->txstatus_tasklet only when both DRIVER_REQUIRE_TXSTATUS_FIFO and rt2x00dev->ops->lib->txstatus_tasklet are set. This allows the txstatus_fifo to be used by rt2800usb which does not use txstatus_tasklet. Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c4d63244218bf93d1f0cdf4389e0906df8f506c1 Author: Johannes Stezenbach Date: Mon Dec 27 15:04:29 2010 +0100 rt2x00: simplify txstatus_fifo handling Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 97e2c40269e168df986daf94af1c62e07d4fc599 Author: Christian Lamparter Date: Sun Dec 26 18:22:29 2010 +0100 carl9170: fix usb pm suspend->resume woes This patch revamps some common code-paths which are shared between (re-)initialization and suspend/resume subroutines. It also adds some helpful comments about quirks and associated difficulties. It's quite big, but it should fix #25382: And hopefully the code is robust enough to deal with all possible suspend/resume scenarios without requiring the user to do any sort of manual and possibly dangerous work. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f Author: Christian Lamparter Date: Sun Dec 26 18:22:16 2010 +0100 carl9170: reduce channel change delay By removing two "safety" msleeps (and an echo nop), the channel change delay is effectively halved. Previously, the delay could be as long as 260 ms and the device could not go off-channel without risking to miss the next DTIM beacon [interval ~307 ms]. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit c9e57f0fdccf74ef7884fed61d212e524b9c4bcd Author: Christian Lamparter Date: Sun Dec 26 18:21:53 2010 +0100 carl9170: add missing return-value check This patch adds a forgotten bail-out path. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit bb007554fe1f66c4796c7c7ae7bfc735fc8213f7 Author: Bob Copeland Date: Sun Dec 26 12:10:05 2010 -0500 ath5k: fix cycle counter inconsistent locking ath5k_reset is called from process context and takes the cc_lock with plain spin_lock(), but cc_lock can also be taken from tasklets in softirq context. Thus we need to at least use spin_lock_bh. This fixes the following lockdep warning: [ 19.967874] sky2 0000:01:00.0: eth0: enabling interface [ 19.982761] ieee80211 phy0: device now idle [ 20.904809] NET: Registered protocol family 17 [ 21.243857] ieee80211 phy0: device no longer idle - scanning [ 21.404343] [ 21.404346] ================================= [ 21.404450] [ INFO: inconsistent lock state ] [ 21.404518] 2.6.37-rc7-wl+ #242 [ 21.404582] --------------------------------- [ 21.404650] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 21.404721] kworker/u:4/982 [HC0[0]:SC1[3]:HE1:SE0] takes: [ 21.404792] (&(&common->cc_lock)->rlock){+.?...}, at: [] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] {SOFTIRQ-ON-W} state was registered at: [ 21.405011] [] __lock_acquire+0x62f/0x13c1 [ 21.405011] [] lock_acquire+0xd5/0xf1 [ 21.405011] [] _raw_spin_lock+0x45/0x72 [ 21.405011] [] ath5k_reset+0x2c0/0x349 [ath5k] [ 21.405011] [] ath5k_start+0xb8/0x139 [ath5k] [ 21.405011] [] ieee80211_do_open+0x13f/0x819 [mac80211] [ 21.405011] [] ieee80211_open+0x63/0x66 [mac80211] [ 21.405011] [] __dev_open+0x8d/0xb6 [ 21.405011] [] __dev_change_flags+0x9d/0x114 [ 21.405011] [] dev_change_flags+0x18/0x44 [ 21.405011] [] do_setlink+0x23f/0x521 [ 21.405011] [] rtnl_setlink+0xe6/0xea [ 21.405011] [] rtnetlink_rcv_msg+0x18a/0x1a0 [ 21.405011] [] netlink_rcv_skb+0x35/0x7b [ 21.405011] [] rtnetlink_rcv+0x20/0x27 [ 21.405011] [] netlink_unicast+0x1bb/0x21e [ 21.405011] [] netlink_sendmsg+0x23b/0x288 [ 21.405011] [] sock_sendmsg+0xac/0xc4 [ 21.405011] [] sys_sendmsg+0x152/0x1a2 [ 21.405011] [] sys_socketcall+0x214/0x275 [ 21.405011] [] sysenter_do_call+0x12/0x36 [ 21.405011] irq event stamp: 138032 [ 21.405011] hardirqs last enabled at (138032): [] _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] hardirqs last disabled at (138031): [] _raw_spin_lock_irqsave+0x18/0x7e [ 21.405011] softirqs last enabled at (138024): [] ieee80211_tx_skb+0x47/0x49 [mac80211] [ 21.405011] softirqs last disabled at (138027): [] do_softirq+0x63/0xb4 [ 21.405011] [ 21.405011] other info that might help us debug this: [ 21.405011] 3 locks held by kworker/u:4/982: [ 21.405011] #0: (name){+.+.+.}, at: [] process_one_work+0x1b8/0x41b [ 21.405011] #1: ((&(&local->scan_work)->work)){+.+.+.}, at: [] process_one_work+0x1b8/0x41b [ 21.405011] #2: (&local->mtx){+.+.+.}, at: [] ieee80211_scan_work+0x32/0x4a4 [mac80211] [ 21.405011] [ 21.405011] stack backtrace: [ 21.405011] Pid: 982, comm: kworker/u:4 Not tainted 2.6.37-rc7-wl+ #242 [ 21.405011] Call Trace: [ 21.405011] [] ? printk+0x1d/0x25 [ 21.405011] [] print_usage_bug+0x181/0x18b [ 21.405011] [] ? check_usage_forwards+0x0/0xb6 [ 21.405011] [] mark_lock+0x2a0/0x4aa [ 21.405011] [] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [] __lock_acquire+0x5ba/0x13c1 [ 21.405011] [] ? trace_hardirqs_off_caller+0x18/0x8d [ 21.405011] [] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [] ? local_clock+0x2c/0x4f [ 21.405011] [] ? save_trace+0x2/0xa0 [ 21.405011] [] ? mark_held_locks+0x43/0x5b [ 21.405011] [] ? _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] lock_acquire+0xd5/0xf1 [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] _raw_spin_lock_bh+0x4a/0x77 [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] ? mark_held_locks+0x43/0x5b [ 21.405011] [] ath5k_tasklet_ani+0x1d/0x27 [ath5k] [ 21.405011] [] tasklet_action+0x96/0x137 [ 21.405011] [] __do_softirq+0xde/0x1c3 [ 21.405011] [] ? arch_get_unmapped_area_topdown+0x3b/0x127 [ 21.405011] [] ? __do_softirq+0x0/0x1c3 [ 21.405011] [] ? irq_exit+0x3d/0x49 [ 21.405011] [] ? do_IRQ+0x98/0xac [ 21.405011] [] ? common_interrupt+0x2e/0x34 [ 21.405011] [] ? sys_unshare+0x57/0x226 [ 21.405011] [] ? queue_delayed_work+0x1/0x27 [ 21.405011] [] ? ieee80211_queue_delayed_work+0x2e/0x33 [mac80211] [ 21.405011] [] ? ieee80211_scan_work+0x45f/0x4a4 [mac80211] [ 21.405011] [] ? process_one_work+0x26e/0x41b [ 21.405011] [] ? process_one_work+0x1b8/0x41b [ 21.405011] [] ? ieee80211_scan_work+0x0/0x4a4 [mac80211] [ 21.405011] [] ? worker_thread+0x18a/0x2a5 [ 21.405011] [] ? _raw_spin_unlock_irqrestore+0x47/0x5e [ 21.405011] [] ? worker_thread+0x0/0x2a5 [ 21.405011] [] ? kthread+0x67/0x6c [ 21.405011] [] ? kthread+0x0/0x6c [ 21.405011] [] ? kernel_thread_helper+0x6/0x10 Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 44cefead807daf96d0f43eb494b1eb5edb5454bf Author: Brian Prodoehl Date: Sat Dec 25 14:34:43 2010 -0500 ath9k: fix spur mitigation no-spur case for AR9002 For the AR9002, the spur frequency read from the EEPROM is mangled before being compared against AR_NO_SPUR. This results in the driver trying to set up the spur mitigation for bogus spurs, rather than cleanly breaking out. Signed-off-by: Brian Prodoehl Signed-off-by: John W. Linville commit ad9082adfc0a6bdcef1bad2f22485575479d7a9d Author: Akinobu Mita Date: Sat Dec 25 15:03:58 2010 +0900 airo: use simple_write_to_buffer Simplify write file operation for /proc files by using simple_write_to_buffer(). Signed-off-by: Akinobu Mita Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: John W. Linville commit 52671e43dbfb0e0dfa5fab604cb3984bd1d777a6 Author: Senthil Balasubramanian Date: Thu Dec 23 21:06:57 2010 +0530 ath9k: spin_lock_bh is not required within tasklet context. Disabling BH is not required while running from a tasklet context and so replace spin_lock_bh with just spin_lock. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit cd017f25e391dfabaca185bb4a5aefd02fd6c0ca Author: Stanislaw Gruszka Date: Thu Dec 23 15:12:30 2010 +0100 iwlagn: fix scan tx antenna setting on 5Ghz band Looks that we do not set correctly antennas when scanning on 5Ghz band and when bluetooth is enabled, because priv->cfg->scan_tx_antennas[band] is only defined for IEEE80211_BAND_2GHZ. To fix we check band before limiting antennas to first one. This allow to remove hard coded cfg->scan_tx_antennas[band]. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit cd2c5486526b744fb505e18c9d981b35feaf283a Author: Bruno Randolf Date: Wed Dec 22 19:20:32 2010 +0900 ath5k: Move mac80211 functions into new file Move mac80211 functions into new file mac80211-ops.c to have a better separation and to make base.c smaller. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 Author: Francois-Xavier Le Bail Date: Tue Jan 4 09:10:20 2011 +0000 net: typos in comments in include/linux/igmp.h There are typos in comments in include/linux/igmp.h: 83 #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */ 84 #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */ [snip] 88 #define IGMPV2_HOST_MEMBERSHIP_REPORT 0x16 /* V2 version of 0x11 */ 89 #define IGMP_HOST_LEAVE_MESSAGE 0x17 90 #define IGMPV3_HOST_MEMBERSHIP_REPORT 0x22 /* V3 version of 0x11 */ The line 88 and 90 are about REPORT messages. The IGMP_HOST_MEMBERSHIP_REPORT (IGMP V1) value is 0x12. So the comment on line 88 must be /* V2 version of 0x12 */, and the comment on line 90 must be /* V3 version of 0x12 */. Signed-off-by: Francois-Xavier Le Bail Signed-off-by: David S. Miller commit 0511af9e9a43c64dd7e23e642c9087710688768c Merge: 782a9e3 003ea98 Author: John W. Linville Date: Tue Jan 4 14:26:34 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 782a9e31e81956a271375c0ba8d46fbb0480983e Merge: 5c4bc1c 17f9cc3 Author: John W. Linville Date: Tue Jan 4 14:25:28 2011 -0500 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197 Author: Johannes Berg Date: Mon Jan 3 19:42:24 2011 +0100 mac80211: add missing synchronize_rcu commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2 Author: Johannes Berg Date: Tue Jun 1 10:19:19 2010 +0200 mac80211: simplify key locking removed the synchronization against RCU and thus opened a race window where we can use a key for TX while it is already freed. Put a synchronisation into the right place to close that window. Reported-by: Jussi Kivilinna Cc: stable@kernel.org [2.6.36+] Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 919bbad580445801c22ef6ccbe624551fee652bd Author: Milton Miller Date: Thu Dec 30 02:01:03 2010 -0600 mac80211: fix mesh forwarding when ratelimited too Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said: Under memory pressure, the mac80211 mesh code may helpfully print a message that it failed to clone a mesh frame and then will proceed to crash trying to use it anyway. Fix that. Avoid the reference whenever the frame copy is unsuccessful regardless of the debug message being suppressed or printed. Cc: stable@kernel.org [2.6.27+] Signed-off-by: Milton Miller Signed-off-by: John W. Linville commit f28f3313aa97dcb46954f90f596d75f8faf4626e Author: Daniel Hellstrom Date: Tue Jan 4 01:41:35 2011 +0000 Added support for ampopts in APBUART driver. Used in AMP systems. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit d89ddf0da8f0a140d4dc2e2dbc594fb278e33db5 Author: Daniel Hellstrom Date: Tue Jan 4 01:41:34 2011 +0000 APBUART: added raw AMBA vendor/device number to match against. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 9663eb21fcfeb1ed9afd73d14bbc4198796cfc7b Author: Daniel Hellstrom Date: Tue Jan 4 01:41:33 2011 +0000 SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing When the REG property is not available the NODE-ID is used as an unique identifier in order to avoid filesystem name duplicates in /proc/openprom filesystem Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 2791c1a4390085789e37347fc49f7d189fedae88 Author: Daniel Hellstrom Date: Tue Jan 4 01:41:32 2011 +0000 SPARC/LEON: added support for selecting Timer Core and Timer within core The ability to select Timer Core and Timer instance for system clock makes it possible for multiple AMP systems to coexist. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f Author: Daniel Hellstrom Date: Tue Jan 4 01:41:31 2011 +0000 LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit e2305e37d4c82ef55be54e9edc8a7e2250739b4f Author: Daniel Hellstrom Date: Tue Jan 4 01:41:30 2011 +0000 SPARC/LEON: added support for IRQAMP IRQ Controller Needed for LEON AMP systems where different CPUs are routed to different IRQ controllers. This patch selects the IRQ Controller which has been routed to the boot CPU, it is up to the boot loader to configure the IRQ controller. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 53aea7caf2e27108912b9b9dbc5bfe18dbbaec9d Author: Daniel Hellstrom Date: Tue Jan 4 01:41:29 2011 +0000 SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 554d1d027b19265c4aa3f718b3126d2b86e09a08 Author: Stanislaw Gruszka Date: Thu Dec 23 12:38:21 2010 +0100 iwlagn: enable only rfkill interrupt when device is down Since commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd "iwlagn: fix hw-rfkill while the interface is down", we enable interrupts when device is not ready to receive them. However hardware, when it is in some inconsistent state, can generate other than rfkill interrupts and crash the system. I can reproduce crash with "kernel BUG at drivers/net/wireless/iwlwifi/iwl-agn.c:1010!" message, when forcing firmware restarts. To fix only enable rfkill interrupt when down device and after probe. I checked patch on laptop with 5100 device, rfkill change is still passed to user space when device is down. Signed-off-by: Stanislaw Gruszka Cc: stable@kernel.org Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da Author: Hans Verkuil Date: Fri Dec 31 12:34:32 2010 -0300 [media] v4l2-compat-ioctl32: fix compile warning drivers/media/video/v4l2-compat-ioctl32.c: In function 'get_v4l2_format32': drivers/media/video/v4l2-compat-ioctl32.c:169:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type' drivers/media/video/v4l2-compat-ioctl32.c: In function 'put_v4l2_format32': drivers/media/video/v4l2-compat-ioctl32.c:200:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type' Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2 Author: Hans Verkuil Date: Fri Dec 31 12:30:56 2010 -0300 [media] zoran: fix compiler warning drivers/media/video/zoran/zoran_driver.c: In function 'zoran_dqbuf': drivers/media/video/zoran/zoran_driver.c:2197:21: warning: 'bs.frame' may be used uninitialized in this function Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0c8fc77e481a3bfc243336085a3fe1fc71f9c1fb Author: Hans Verkuil Date: Fri Dec 31 12:26:53 2010 -0300 [media] tda18218: fix compile warning drivers/media/common/tuners/tda18218.c: In function 'tda18218_wr_regs': drivers/media/common/tuners/tda18218.c:58:5: warning: 'ret' may be used uninitialized in this function Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4f77b86c665ff6a167edfdf152ebfa997783fa17 Author: Hans Verkuil Date: Fri Dec 31 12:25:32 2010 -0300 [media] ngene: fix compile warning drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_start': drivers/media/dvb/ngene/ngene-core.c:1308:16: warning: unused variable 'flags' Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e6de30d63eb17c5cbb7affdfc71df95286bfa7d9 Author: françois romieu Date: Mon Jan 3 15:08:37 2011 +0000 r8169: more 8168dp support. Adapted from version 8.019.00 of Realtek's r8168 driver Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 650e8d5d1fdd5e55869136e2df54287a4432d87f Author: françois romieu Date: Mon Jan 3 15:08:29 2011 +0000 r8169: rtl_csi_access_enable rename. Newer 8168 needs a slightly different rtl_csi_access_enable. This patch separates some noise from the real thing. No functional change. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit b646d90053f887c1bc243191e693a9b02d09f2c2 Author: françois romieu Date: Mon Jan 3 15:08:21 2011 +0000 r8169: magic. Adapted from version 8.019.00 of Realtek's r8168 driver. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 065c27c184d64aeb9ae107c0ef7026ea3642b15b Author: françois romieu Date: Mon Jan 3 15:08:12 2011 +0000 r8169: phy power ops Bits from : - version 8.019.00 of Realtek's 8168 driver - version 1.019.00 of Realtek's 8101 driver Plain old 8169 (PCI) devices do not seem to need anything akin to it. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit c0e45c1ca3162acb2e77b3d9e152ce6e7b6fa3f5 Author: françois romieu Date: Mon Jan 3 15:08:04 2011 +0000 r8169: 8168DP specific MII registers access methods. Adapted from version 8.019.00 of Realtek's r8168 driver and amended per Hayes Wang's correction : - OCPDR_GPHY_REG_SHIFT must be 16, not 12 - the reg should be at bit 16 ~ 22, whence OCPDR_REG_MASK Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 4da19633429f67c794b013488348550f457298c4 Author: françois romieu Date: Mon Jan 3 15:07:55 2011 +0000 r8169: use device dependent methods to access the MII registers. Current mdio_{read/write} needs device specific information to work correctly with newer chipsets. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit f0298f8143e89ac4da306e14b9aa1927e93916d0 Author: françois romieu Date: Mon Jan 3 15:07:42 2011 +0000 r8169: identify different registers. Documentation (sort of). The location are the same, the values are the same but it is just accidental. Note that the 810x could cope with a smaller value as it does not support jumbo frames. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 Author: françois romieu Date: Mon Jan 3 15:07:31 2011 +0000 r8169: remove the firmware of RTL8111D. The binary file of the firmware is moved to linux-firmware repository. The firmwares are rtl_nic/rtl8168d-1.fw and rtl_nic/rtl8168d-2.fw. The driver goes along if the firmware couldn't be found. However, it is suggested to be done with the suitable firmware. Some wrong PHY parameters are directly corrected in the driver. Simple firmware checking added per Ben Hutchings suggestion. Signed-off-by: Hayes Wang Signed-off-by: Francois Romieu Cc: Ben Hutchings Signed-off-by: David S. Miller commit 101e5f77bf35679809586e250b6c62193d2ed179 Author: Mike Galbraith Date: Fri Dec 31 09:32:30 2010 +0100 sched, autogroup: Fix reference leak The cgroup exit mess also uncovered a struct autogroup reference leak. copy_process() was simply freeing vs putting the signal_struct, stranding a reference. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra Cc: Oleg Nesterov LKML-Reference: <1293784350.6839.2.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 4f8219875a0dad2cfad9e93a3fafcd9626db98d2 Author: Mike Galbraith Date: Thu Dec 16 15:09:52 2010 +0100 sched, autogroup: Fix potential access to freed memory Oleg pointed out that the /proc interface kref_get() useage may race with the final put during autogroup_move_group(). A signal->autogroup assignment may be in flight when the /proc interface dereference, leaving them taking a reference to an already dead group. Reported-by: Oleg Nesterov Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1292508592.5940.28.camel@maggy.simson.net> Signed-off-by: Ingo Molnar commit a58154d1c3535f451a409abbd0bda6770b2d9380 Author: Yong Shen Date: Tue Jan 4 14:22:56 2011 +0800 ARM i.MX53: Make MX53 EVK bootable 1. Add entries to Kconfig 2. Add machine definition 3. Add Uart platform data, pad setting and base address 4. Adjust GPIO irq number Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 644b1d586d6670262501057ae99d893fadb012de Author: Yong Shen Date: Tue Jan 4 14:22:55 2011 +0800 ARM i.MX53: Some bug fix about MX53 MSL code 1. pll_base address should return right value 2. uart parent clk is from pll3 Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 Author: Alan Ott Date: Tue Jan 4 00:37:22 2011 -0500 HID: hidraw: add compatibility ioctl() for 32-bit applications. Added the ioctl function to the compat_ioctl pointer in the file_operations struct. Before this, some ioctls would fail for 32-bit apps on 64-bit systems. Signed-off-by: Alan Ott Acked-by: Arnd Bergmann Signed-off-by: Jiri Kosina commit d50d8fe192428090790e7178e9507e981e0b005b Author: Rusty Russell Date: Tue Jan 4 17:20:54 2011 +1030 x86, mm: Initialize initial_page_table before paravirt jumps v2.6.36-rc8-54-gb40827f (x86-32, mm: Add an initial page table for core bootstrapping) made x86 boot using initial_page_table and broke lguest. For 2.6.37 we simply cut & paste the initialization code into lguest (da32dac10126 "lguest: populate initial_page_table"), now we fix it properly by doing that initialization before the paravirt jump. Signed-off-by: Rusty Russell Acked-by: Jeremy Fitzhardinge Cc: lguest Cc: Linus Torvalds Cc: Andrew Morton Cc: Peter Zijlstra LKML-Reference: <201101041720.54535.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar commit bc030d6cb9532877c1c5a3f5e7123344fa24a285 Merge: d3bd058 387c31c Author: Ingo Molnar Date: Tue Jan 4 09:43:42 2011 +0100 Merge commit 'v2.6.37-rc8' into x86/apic Conflicts: arch/x86/include/asm/io_apic.h Merge reason: move to a fresh -rc, resolve the conflict. Signed-off-by: Ingo Molnar commit 6706125e291bd3dddd269e043323a6ab93ccd5fb Author: Yong Zhang Date: Fri Dec 31 21:58:58 2010 +0800 sched: Remove redundant CONFIG_CGROUP_SCHED ifdef CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED Signed-off-by: Yong Zhang Cc: Peter Zijlstra LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e Author: Clemens Ladisch Date: Mon Dec 13 14:56:02 2010 +0100 firewire: use split transaction timeout only for split transactions Instead of starting the split transaction timeout timer when any request is submitted, start it only when the destination's ACK_PENDING has been received. This prevents us from using a timeout that is too short, and, if the controller's AT queue is emptying very slowly, from cancelling a packet that has not yet been sent. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 693a50b511818e07a131efc944cba1a504b63d3d Author: Stefan Richter Date: Sat Jan 1 15:17:05 2011 +0100 firewire: ohci: consolidate context status flags "firewire: ohci: restart iso DMA contexts on resume from low power mode" added the flag struct context.active and "firewire: ohci: cache the context run bit" added struct context.running. These flags contain the same information; combine them. Also, normalize whitespace in pci_resume(). Signed-off-by: Stefan Richter commit 386a4153a2c1455e424f280d636efa3c91864466 Author: Clemens Ladisch Date: Fri Dec 24 14:42:46 2010 +0100 firewire: ohci: cache the context run bit The DMA context run control bit is entirely controlled by software, so it is safe to cache it. This allows the driver to avoid doing an additional MMIO read when queueing an AT packet. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 78dec56d6a56322e1b728d51f3a7def416d36b34 Author: Stefan Richter Date: Sat Jan 1 15:15:40 2011 +0100 firewire: ohci: flush AT contexts after bus reset - addendum Add comments - on why bus_reset_tasklet flushes AT queues, - that commit 76f73ca1b291 can possibly be reverted now. Signed-off-by: Stefan Richter Acked-by: Jarod Wilson commit 672d8eafe38e9324055b8c0d0ad6e95c43b6d52a Author: Rob Herring Date: Tue Nov 16 14:33:51 2010 -0600 ipmi: explicitly include of_address.h and of_irq.h of_address.h and of_irq.h are implicitly included on powerpc. Adding them fixes builds on non-powerpc platforms. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 20c457b8587bee4644d998331d9e13be82e05b4c Author: Thomas Renninger Date: Mon Jan 3 17:50:45 2011 +0100 perf timechart: Adjust perf timechart to the new power events builtin-timechart must only pass -e power:xy events if they are supported by the running kernel, otherwise try to fetch the old power:power{start,end} events. For this I added the tiny helper function: int is_valid_tracepoint(const char *event_string) to parse-events.[hc], which could be more generic as an interface and support hardware/software/... events, not only tracepoints, but someone else could extend that if needed... Signed-off-by: Thomas Renninger Acked-by: Arjan van de Ven Acked-by: Jean Pihet LKML-Reference: <1294073445-14812-4-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar commit 25e41933b58777f2d020c3b0186b430ea004ec28 Author: Thomas Renninger Date: Mon Jan 3 17:50:44 2011 +0100 perf: Clean up power events by introducing new, more generic ones Add these new power trace events: power:cpu_idle power:cpu_frequency power:machine_suspend The old C-state/idle accounting events: power:power_start power:power_end Have now a replacement (but we are still keeping the old tracepoints for compatibility): power:cpu_idle and power:power_frequency is replaced with: power:cpu_frequency power:machine_suspend is newly introduced. Jean Pihet has a patch integrated into the generic layer (kernel/power/suspend.c) which will make use of it. the type= field got removed from both, it was never used and the type is differed by the event type itself. perf timechart userspace tool gets adjusted in a separate patch. Signed-off-by: Thomas Renninger Signed-off-by: Ingo Molnar Acked-by: Arjan van de Ven Acked-by: Jean Pihet Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Linus Torvalds Cc: rjw@sisk.pl LKML-Reference: <1294073445-14812-3-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de> commit 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f Author: Thomas Renninger Date: Mon Jan 3 17:50:43 2011 +0100 perf: Do not export power_frequency, but power_start event power_frequency moved to drivers/cpufreq/cpufreq.c which has to be compiled in, no need to export it. intel_idle can a be module though... Signed-off-by: Thomas Renninger Signed-off-by: Ingo Molnar Acked-by: Jean Pihet Cc: Jean Pihet Cc: Arjan van de Ven Cc: rjw@sisk.pl LKML-Reference: <1294073445-14812-2-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de> commit 928585536ff5a8f320e60efc60e2b7ef2a5f548d Merge: cc22219 d854861 Author: Ingo Molnar Date: Tue Jan 4 08:10:28 2011 +0100 Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit cc2221969906a166a638aecdbae84a3d0462719e Merge: 56f4c40 387c31c Author: Ingo Molnar Date: Tue Jan 4 08:08:51 2011 +0100 Merge commit 'v2.6.37-rc8' into perf/core Merge reason: pick up latest -rc. Signed-off-by: Ingo Molnar commit 55ee4ef30241a62b700f79517e6d5ef2ddbefa67 Author: Christoph Lameter Date: Thu Dec 16 12:15:15 2010 -0600 gameport: use this_cpu_read instead of lookup Signed-off-by: Christoph Lameter Acked-by: "H. Peter Anvin" Signed-off-by: Tejun Heo commit 357089fca91f639dd005ae0721f5f932b4f276ab Author: Christoph Lameter Date: Thu Dec 16 12:14:43 2010 -0600 x86: udelay: Use this_cpu_read to avoid address calculation The code will use a segment prefix instead of doing the lookup and calculation. Signed-off-by: Christoph Lameter Acked-by: "H. Peter Anvin" Signed-off-by: Tejun Heo commit 42bb8d56953a06de50941d6d3df89dc3023bb92d Author: Michael Chan Date: Mon Jan 3 15:21:46 2011 +0000 cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver() We should call bnx2i to send the iSCSI netlink message earlier in cnic_unregister_device(). By the time cnic_unregister_driver() is called, bnx2i may have freed data structures used by the upcalls. Update version to 2.2.12. Reviewed-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 57045c996fb4e035f1d152b7e04315fc223352e9 Author: Michael Chan Date: Mon Jan 3 15:21:45 2011 +0000 cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode Because the hardware does not yet support these in this mode. Reviewed-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4a3a255289e7e322b8044286cce85031990f888a Author: Andres Salomon Date: Thu Nov 11 22:42:06 2010 -0800 sparc: explicitly cast negative phandle checks to s32 When we switched sparc from using 'int's to 'phandle's (which is a u32), we neglected to do anything with the various checks for -1. For those tests, explicitly cast the phandles to s32. Signed-off-by: Andres Salomon Acked-by: David S. Miller Signed-off-by: Grant Likely commit d854861c4292a4e675a5d3bfd862c5f7421c81e8 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 00:16:20 2011 -0200 perf test: Add test for counting open syscalls To test the use of the perf_evsel class on something other than the tools from where we refactored code to create it. It calls open() N times and then checks if the event created to monitor it returns N events. [acme@felicio linux]$ perf test 1: vmlinux symtab matches kallsyms: Ok 2: detect open syscall event: Ok [acme@felicio linux]$ It does. Cc: Frederic Weisbecker Cc: Han Pingtian Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 4eed11d5e24540dc133003b6e8f904cb747ac4bb Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 00:13:17 2011 -0200 perf evsel: Auto allocate resources needed for some methods While writing the first user of the routines created from the ad-hoc routines in the existing builtins I noticed that the resulting set of calls was too long, reduce it by doing some best effort allocations. Tools that need to operate on multiple threads and cpus should pre-allocate enough resources by explicitely calling the perf_evsel__alloc_{fd,counters} methods. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 86bd5e8603b00b06189328c6d7034d2dc434d6bb Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 23:09:46 2011 -0200 perf evsel: Use {cpu,thread}_map to shorten list of parameters Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 5c98d466e49267a9221f30958d45cd06f794269a Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:53:33 2011 -0200 perf tools: Refactor all_tids to hold nr and the map So that later, we can pass the thread_map instance instead of (thread_num, thread_map) for things like perf_evsel__open and friends, just like was done with cpu_map. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 60d567e2d9187379d642f6aba7c8a52b3fd5d261 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:49:48 2011 -0200 perf tools: Refactor cpumap to hold nr and the map So that later, we can pass the cpu_map instance instead of (nr_cpus, cpu_map) for things like perf_evsel__open and friends. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 48290609c0d265f5dac0fca6fd4e3c5732542f67 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:48:12 2011 -0200 perf evsel: Introduce per cpu and per thread open helpers Abstracting away the loops needed to create the various event fd handlers. The users have to pass a confiruged perf->evsel.attr field, which is already usable after perf_evsel__new (constructor) time, using defaults. Comes out of the ad-hoc routines in builtin-stat, that now uses it. Fixed a small silly bug where we were die()ing before killing our children, dysfunctional family this one 8-) Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c52b12ed2511e6c031a0295fd903ea72b93701fb Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:45:52 2011 -0200 perf evsel: Steal the counter reading routines from stat Making them hopefully generic enough to be used in 'perf test', well see. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 301a3da358b4af84915f575479e4f0885be47b73 Author: Grant Likely Date: Mon Jan 3 15:02:47 2011 -0700 powerpc/405: Fix missing #{address,size}-cells in i2c node Signed-off-by: Grant Likely commit c8bf6b52af670496f1e8145600e74a3ef3942a4c Author: John Bonesio Date: Wed Nov 17 15:28:56 2010 -0800 powerpc/5200: dts: refactor dts files This patch creates mpc5200b.dtsi containing the information for the MPC5200b SoC then modifies all of the dts files for MPC5200b based systems to use mpc5200b.dtsi. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 11946c826d02a16521edc777d88470a6a0fe1441 Author: John Bonesio Date: Wed Nov 17 15:28:47 2010 -0800 powerpc/5200: dts: Change combatible strings on localbus This patch changes some incorrect compatible strings on the local plus bus node in dts files for MPC5200b based systems. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 6847317377c871c6e7a8d54e5849bcd0f9b11eb4 Author: John Bonesio Date: Wed Nov 17 15:28:39 2010 -0800 powerpc/5200: dts: remove unused properties This patch remove unused properties in dts files in preparation of refactoring the dts files for MPC5200b based boards. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit abf1e27fbb4200a010b8fcb1be8cc02485744862 Author: John Bonesio Date: Wed Nov 17 15:28:30 2010 -0800 powerpc/5200: dts: rename nodes to prepare for refactoring dts files This patch renames nodes in dts fils for MPC5200b files to prepare for refactoring of these files later. When refactoring it will be easier to verify the results if the node names aren't changing at the same time. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 658f29a51e9830e620bb9a1ce3534b318a38bfeb Author: John Bonesio Date: Wed Nov 17 15:28:20 2010 -0800 of/flattree: Update dtc to current mainline. Pull in recent changes from the main dtc repository. These changes primarily allow multiple device trees to be declared which are merged by dtc. This feature allows us to include a basic dts file and then provide more information for the specific system through the merging functionality. Changes pulled from git://git.jdl.com/software/dtc.git commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier" Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit cd1e65044d4473cca9a01bae7b7938f065044a4b Author: Grant Likely Date: Mon Jan 3 15:51:11 2011 -0700 of/device: Don't register disabled devices Device nodes with the property status="disabled" are not usable and so don't register them when parsing the device tree for devices. Signed-off-by: Grant Likely Cc: Hollis Blanchard Cc: Deepak Saxena Cc: Scott Wood , Cc: David Gibson Cc: Benjamin Herrenschmidt commit cf562b4a550b3cd9d602a05bc27aaaaa376947b4 Author: Jochen Friedrich Date: Mon Jan 3 12:19:00 2011 +0100 ARM: 6607/1: sa1100: Update platform device registration Replace some magic numbers with constants and add interrupt definitions. Signed-off-by: Jochen Friedrich Signed-off-by: Russell King commit 4f444e2b59dd4255d121b57ec41a4a8c5d6bce46 Author: Jochen Friedrich Date: Mon Jan 3 12:09:05 2011 +0100 ARM: 6606/1: sa1100: Fix platform device registration Since commit 7a5b4e16c880f8350d255dc188f81622905618c1, simpad devices don't boot anymore, since platform devices are registered too early. Fix by moving the registration from map_io to arch_initcall as done on other sa1100 boards. Signed-off-by: Jochen Friedrich Acked-by: Kristoffer Ericson Signed-off-by: Russell King commit 82b662dc41027527675740de15344d1b4e34958e Author: Clemens Ladisch Date: Fri Dec 24 14:40:15 2010 +0100 firewire: ohci: flush AT contexts after bus reset for OHCI 1.2 The OHCI 1.2 (draft) specification, clause 7.2.3.3, allows and recommends that, after a bus reset, the controller does not flush all the packets in the AT queues. Therefore, the driver has to do this itself. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 1a9180a20f3a314fda3e96b77570cad3864b2896 Author: Tomas Winkler Date: Mon Jan 3 11:08:58 2011 +0000 net/bridge: fix trivial sparse errors net/bridge//br_stp_if.c:148:66: warning: conversion of net/bridge//br_stp_if.c:148:66: int to net/bridge//br_stp_if.c:148:66: int enum umh_wait net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer Signed-off-by: Tomas Winkler Signed-off-by: David S. Miller commit ebd80880c55364d2850e1ff569869245142318e0 Author: Sedat Dilek Date: Mon Jan 3 11:22:15 2011 +0000 depca: Fix section mismatch derived from depca_isa_probe() This fixes the following warning: WARNING: drivers/net/depca.o(.data+0x0): Section mismatch in reference from the variable depca_isa_driver to the function .init.text:depca_isa_probe() The variable depca_isa_driver references the function __init depca_isa_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit 1170bed04e2acf720de9ccceabe40ff8c56c9c79 Author: Sedat Dilek Date: Mon Jan 3 11:15:58 2011 +0000 smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe() This fixes the following warning: drivers/net/irda/smsc-ircc2.o(.data+0x18): Section mismatch in reference from the variable smsc_ircc_pnp_driver to the function .init.text:smsc_ircc_pnp_probe() The variable smsc_ircc_pnp_driver references the function __init smsc_ircc_pnp_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit cbad832239e70b91502a5e6ce1fc53a464ad6345 Author: Sedat Dilek Date: Mon Jan 3 11:06:58 2011 +0000 ksz884x: Fix section mismatch derived from pcidev_init() This fixes the following warning: WARNING: drivers/net/ksz884x.o(.data+0x18): Section mismatch in reference from the variable pci_device_driver to the function .init.text:pcidev_init() The variable pci_device_driver references the function __init pcidev_init() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit 6bd121e2d4dcabb145d390a7131ec83102dfb838 Author: Grant Likely Date: Mon Jan 3 14:06:17 2011 -0700 powerpc/dts: fix syntax bugs in bluestone.dts Signed-off-by: Grant Likely commit da81c3b9825c826bfb06a4dcc0524c671985eb68 Author: Rob Herring Date: Tue Nov 16 14:33:50 2010 -0600 of: Fixes for OF probing on little endian systems Fixes for sdhci-of and ipmi drivers. Auditing all drivers using of_get_property did not find other occurrences likely to be used on LE platforms. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 236cdc7bc718566a7e7cb9f763b51a8dcad88cbe Author: Rob Herring Date: Mon Jan 3 11:56:38 2011 -0600 of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF Some OF drivers could likely be used on non-powerpc OF based platforms, so fix the kconfig depends to be CONFIG_OF instead of CONFIG_PPC_OF. Compile tested on ARM and sparc. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 39980292fda20b38baf95bfa577db8b678eecc86 Author: Eric Dumazet Date: Mon Jan 3 10:35:22 2011 +0000 ifb: add performance flags Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit : > From: Jarek Poplawski > Date: Mon, 3 Jan 2011 20:37:03 +0100 > > > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote: > >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit : > >> > >> > Ingress is before vlans handler so these features and the > >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering > >> > dev_hard_start_xmit() checks. > >> > >> OK, here is v2 of the patch then, thanks everybody. > >> > >> > >> [PATCH v2 net-next-2.6] ifb: add performance flags > >> > >> IFB can use the full set of features flags (NETIF_F_SG | > >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to > >> avoid unnecessary split of some packets (GRO for example) > >> > >> Changli suggested to also set vlan_features, > > > > He also suggested more GSO flags of which especially NETIF_F_TSO6 > > seems interesting (wrt GRO)? > > I think at least TSO6 would very much be appropriate here. Yes, why not, I am only wondering why loopback / dummy (and others ?) only set NETIF_F_TSO :) Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;) For other flags, I really doubt it can matter on ifb ? [PATCH v3 net-next-2.6] ifb: add performance flags IFB can use the full set of features flags (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to avoid unnecessary split of some packets (GRO for example) Changli suggested to also set vlan_features, NETIF_F_TSO6, NETIF_F_TSO_ECN. Jarek suggested to add NETIF_F_HW_VLAN_TX as well. Signed-off-by: Eric Dumazet Cc: Changli Gao Cc: Jarek Poplawski Cc: Pawel Staszewski Signed-off-by: David S. Miller commit 5f66dd35b49ea81a03e71bfd74c28364f4e32d21 Author: Sam Ravnborg Date: Mon Jan 3 08:27:55 2011 +0000 sparc: fix sparse warnings in arch/sparc/prom for 32 bit build Fix following sparse warnings: arch/sparc/prom/bootstr_32.c:32:35: warning: Using plain integer as NULL pointer arch/sparc/prom/memory.c:61:13: warning: symbol 'prom_meminit' was not declared. Should it be static? arch/sparc/prom/misc_32.c:74:1: error: symbol 'prom_halt' redeclared with different type (originally declared at arch/sparc/include/asm/oplib_32.h:67) - different modifiers arch/sparc/prom/ranges.c:16:26: warning: symbol 'promlib_obio_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:17:5: warning: symbol 'num_obio_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:39:1: warning: symbol 'prom_adjust_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:69:13: warning: symbol 'prom_ranges_init' was not declared. Should it be static? arch/sparc/prom/tree_32.c:286:22: warning: Using plain integer as NULL pointer arch/sparc/prom/tree_32.c:286:38: warning: Using plain integer as NULL pointer None of the warnings indicated any serious issues. We are now sparse clean for 32 bit build in arch/sparc/prom. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 0dfb33a0d7e2d9316eb4441a065ddd173f87223e Author: Eric Dumazet Date: Mon Jan 3 08:11:38 2011 +0000 sch_red: report backlog information Provide child qdisc backlog (byte count) information so that "tc -s qdisc" can report it to user. packet count is already correctly provided. qdisc red 11: parent 1:11 limit 60Kb min 15Kb max 45Kb ecn Sent 3116427684 bytes 1415782 pkt (dropped 8, overlimits 7866 requeues 0) rate 242385Kbit 13630pps backlog 13560b 8p requeues 0 marked 7865 early 1 pdrop 7 other 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7f891cf1fc0d5d5c5b359caec77e5383e1d55986 Author: Shmulik Ravid Date: Mon Jan 3 08:04:59 2011 +0000 dcbnl: more informed return values for new dcbnl routines More accurate return values for the following (new) dcbnl routines: dcbnl_getdcbx() dcbnl_setdcbx() dcbnl_getfeatcfg() dcbnl_setfeatcfg() Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 87e609760b5304ef0c0c53cf4d0b29fde9812e1b Author: Michal Simek Date: Mon Jan 3 00:32:36 2011 +0000 ll_temac: Fix section mismatch from the temac_of_probe Replace __init by __devinit. Warning message: WARNING: vmlinux.o(.data+0xbc14): Section mismatch in reference from the variable temac_of_driver to the function .init.text:temac_of_probe() The variable temac_of_driver references the function __init temac_of_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Michal Simek Acked-by: Grant Likely Signed-off-by: David S. Miller commit 68763c890eb2a60f9b50a061502f94e0cf20fdfe Author: Michal Simek Date: Sun Jan 2 22:54:09 2011 +0000 trivial: Fix typo fault in netdevice.h Signed-off-by: Michal Simek Signed-off-by: David S. Miller commit 9f84f8886b98a9411ee20a10ca390487507037b9 Author: amit salecha Date: Sun Jan 2 21:58:45 2011 +0000 netxen: update driver version 4.0.75 Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e4baaf719807ffc87c6321f3914b93dd512b64c4 Author: Sucheta Chakraborty Date: Sun Jan 2 21:58:44 2011 +0000 netxen: enable LRO based on NETIF_F_LRO o Enable/disable LRO in device based on NETIF_F_LRO flag, instead of using driver private flag. o Disable LRO, if rx csum offloading is off. David Miller, You should use netdev_info() instead of dev_info(). Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f Author: Cliff Wickman Date: Mon Jan 3 12:03:53 2011 -0600 x86, UV, BAU: Extend for more than 16 cpus per socket Fix a hard-coded limit of a maximum of 16 cpu's per socket. The UV Broadcast Assist Unit code initializes by scanning the cpu topology of the system and assigning a master cpu for each socket and UV hub. That scan had an assumption of a limit of 16 cpus per socket. With Westmere we are going over that limit. The UV hub hardware will allow up to 32. If the scan finds the system has gone over that limit it returns an error and we print a warning and fall back to doing TLB shootdowns without the BAU. Signed-off-by: Cliff Wickman Cc: # .37.x LKML-Reference: Signed-off-by: Ingo Molnar commit 0cf445ceaf43be31c5fc70b0e2d5fdccb291c925 Author: Paul Gortmaker Date: Sat Jan 1 13:28:30 2011 +0000 netdev: Update status of 8390 based drivers in MAINTAINERS With the original 8 bit ISA ne1000 card being over 20 years old, it only makes sense to consider ne.c and all the other toplevel 8390 based driver files as legacy for obsolete hardware. The most recent thing made in large quantities that was 8390 based were those crazy PCI ne2k clones - and even they are now 10+ years old. Also remove myself as maintainer, since the only changes to these drivers going forward will be the generic API type changes that touch all drivers. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit f08c3117c349ea56bd57be347b0b5f8be8c3143c Author: Paul Gortmaker Date: Sat Jan 1 13:15:01 2011 +0000 net/Space: delete orphaned externs from deleted drivers The drivers associated with the prototypes in this commit have been deleted some time ago, but the externs escaped detection. Using a simple "git grep" shows that these references are historical artefacts, only mentioned by the deleted lines. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 70d544d0576775a2b3923a7e68cb49b0313d80c9 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:51:39 2011 -0200 perf evsel: Delete the event selectors at exit Freeing all the possibly allocated resources, reducing complexity on each tool exit path. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 1e7972cc5c16e06f258b0278d8c9adfb5aa75c68 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:50:55 2011 -0200 perf util: Move do_read from session to util Not really something to be exported from session.c. Rename it to 'readn' as others did in the past. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit daec78a09de3df5fbfbbd167da0304d49d7fcfe5 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:49:44 2011 -0200 perf evsel: Adopt MATCH_EVENT macro from 'stat' Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 69aad6f1ee69546dea8535ab8f3da9f445d57328 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:39:04 2011 -0200 perf tools: Introduce event selectors Out of ad-hoc code and global arrays with hard coded sizes. This is the first step on having a library that will be first used on regression tests in the 'perf test' tool. [acme@felicio linux]$ size /tmp/perf.before text data bss dec hex filename 1273776 97384 5104416 6475576 62cf38 /tmp/perf.before [acme@felicio linux]$ size /tmp/perf.new text data bss dec hex filename 1275422 97416 1392416 2765254 2a31c6 /tmp/perf.new Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit c32e061fa19893ce4acf95d97d5613a161f0f1b7 Author: roel kluin Date: Sat Jan 1 19:40:23 2011 +0100 [SCSI] arcmsr: fix write to device check Use command->sc_data_direction instead of trying (incorrectly) to figure it out from the command itself [jejb: fix up compile failure] Signed-off-by: Roel Kluin Acked-by: NickCheng Signed-off-by: James Bottomley commit 474ffb74c75ea9845860ffb24cdc127eda0d5657 Author: Tomas Henzl Date: Wed Dec 22 16:52:40 2010 +0100 [SCSI] lpfc: lower stack use in lpfc_fc_frame_check according to checkstack the lpfc_fc_frame_check occupies the first place in stack usage: make checkstack objdump -d vmlinux $(find . -name '*.ko') | \ perl /root/rpmbuild/BUILD/kernel-2.6.32/linux-2.6.32.x86_64/scripts/checkstack.pl x86_64 0x000013f4 lpfc_fc_frame_check [lpfc]: 1936 ... This change makes the rctl_names static, thus not on stack. Signed-off-by: Tomas Henzl Acked-by: James Smart Signed-off-by: James Bottomley commit 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 Author: R, Durgadoss Date: Mon Jan 3 17:22:04 2011 +0530 x86, hwmon: Add core threshold notification to therm_throt.c This patch adds code to therm_throt.c to notify core thermal threshold events. These thresholds are supported by the IA32_THERM_INTERRUPT register. The status/log for the same is monitored using the IA32_THERM_STATUS register. The necessary #defines are in msr-index.h. A call back is added to mce.h, to further notify the thermal stack, about the threshold events. Signed-off-by: Durgadoss R LKML-Reference: Signed-off-by: H. Peter Anvin commit 41511704b678f7b101a76e58d6c6b7bbe2a9ad70 Author: Alan Stern Date: Mon Nov 15 16:04:56 2010 -0500 [SCSI] eliminate an unnecessary local variable from scsi_remove_target() Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 96de6d447f40612acb93f81a561a834177cca685 Author: Sascha Hauer Date: Mon Dec 6 11:37:30 2010 +0100 ARM i.MX51: rename IPU irqs Signed-off-by: Sascha Hauer commit b848169b37f71c494ea59b260ba665290c23c350 Author: Sascha Hauer Date: Mon Dec 6 09:13:21 2010 +0100 ARM i.MX51: Add ipu clock support Signed-off-by: Sascha Hauer commit c67a3e09a5316bb34a14e2751cee719339934235 Author: Fabio Estevam Date: Mon Jan 3 11:16:39 2011 -0200 ARM: imx/mx27_3ds: Add PMIC support MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port. Add support for the PMIC. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 9eedd96301cad8ab58ee8c1e579677d0a75c2ba1 Author: Russell King Date: Mon Jan 3 00:00:17 2011 +0000 ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() Replace the page_to_dma() and dma_to_page() macros with their PFN equivalents. This allows us to map parts of memory which do not have a struct page allocated to them to bus addresses. This will be used internally by dma_alloc_coherent()/dma_alloc_writecombine(). Build tested on Versatile, OMAP1, IOP13xx and KS8695. Tested-by: Janusz Krzysztofik Signed-off-by: Russell King commit cde9efef401563943d5a58eb9b7274bfdc08ca9b Merge: 50401d7 60ebe15 Author: Russell King Date: Mon Jan 3 10:31:54 2011 +0000 Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable commit 50401d77ee4904673042dd737eed436067cc23f5 Merge: 206323c 760efe6 Author: Russell King Date: Mon Jan 3 10:31:38 2011 +0000 Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable commit 711669e5b80b6f2d88f61ed8a9681f83d8cbd201 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:58 2010 +0100 mx51: fix usb clock support Current code doesn't really enable the usb clocks so if they're disabled when booting linux, the kernel/machine will hang as soon as someone is trying to read a usb register Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 8305ed75d1418f02933a48bcabdbb5032d885628 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:57 2010 +0100 MX51: Add support for usb host 2 Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 08406f540c7ce4cfed96fb240906eee04b9e3eb7 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:56 2010 +0100 arch/arm/plat-mxc/ehci.c: fix errors/typos This patch is fixing some issues : - MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register. - the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never allows to set them. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0d95b75e2dd736b23f7cc0971d2f2aacea7f3e49 Author: Fabio Estevam Date: Tue Dec 21 16:38:22 2010 -0200 ARM: mx3/mx31_3ds: Add support for USB Host2 port Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 1c50e67263a6ab8abb9234e2357bd02134fb4b99 Author: Fabio Estevam Date: Tue Dec 21 16:38:21 2010 -0200 ARM: mx3/mx31_3ds: Add support for OTG host mode Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 460d30a329a4186192598131505d9f75e6c5e2bc Author: Fabio Estevam Date: Wed Dec 22 12:25:32 2010 -0200 ARM: imx/mx25_3ds: Add USB support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 96cf4239c72af1fa099affc720731bad2f86927b Author: Fabio Estevam Date: Wed Dec 22 12:25:31 2010 -0200 ARM: imx/mx27_3ds: Add USB OTG support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 130a0ddad9e8f48250dd0e4a5f35aa8afa9d1c5f Author: Fabio Estevam Date: Wed Dec 22 12:25:30 2010 -0200 ARM: mx3/mx35_3ds: Add USB OTG Host mode Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 1fef891761ddcbd7e57ec3961a0fb748003222ac Merge: d3d4b60 1d3f33d Author: Sascha Hauer Date: Mon Jan 3 10:15:11 2011 +0100 Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new commit d3d4b60b12369eded0ea0c5dffee0888ec4d80cd Author: Richard Zhao Date: Thu Dec 30 19:25:06 2010 +0800 arm: mx50: add mx50 reference design board support Add basic function and uart device support. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 3d5a44be308203a9a192a77037fb613c2f82ed85 Author: Richard Zhao Date: Thu Dec 30 19:25:05 2010 +0800 arm: mx50: add core functions support except clock Add core definitions and memory map, gpio, irq, iomux, uart device support. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 02226a20bcfb01322d4a168f2ed6a6e4366796fd Author: Richard Zhao Date: Thu Dec 30 19:25:03 2010 +0800 arm: mx5: mx51/53 have different mxc_cpu_type definition Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit dca3abf8d071cb78bac8c8f50259e9fe3a81a4bd Author: Richard Zhao Date: Thu Dec 30 19:25:02 2010 +0800 arm: mx51: define mx51's own MXC_GPIO_IRQS mx5 SoCs have different GPIO port count. Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit b086e97b20f150e81609a04ed7da92e12d77f1b0 Author: Richard Zhao Date: Thu Dec 30 19:25:01 2010 +0800 arm: plat-mxc: add full parameter macro to define gpio port Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 626d90c884591005fdaa9464de81731aab23b864 Author: Richard Zhao Date: Thu Dec 30 19:25:00 2010 +0800 ARM: mx5: use config to define boot related addresses Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 1f42be484ffc5559a29466c82adac7dd472d4439 Author: Sam Ravnborg Date: Sat Jan 1 12:53:11 2011 +0000 sparc: remove unused prom tree functions Remove the following unused funtions: prom_nodematch() prom_firstprop() prom_node_has_property() Also declare a few local functions static. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit a7e4236511c678bf012901faf3c285d199a1adc8 Author: Sam Ravnborg Date: Sat Jan 1 12:53:10 2011 +0000 sparc: remove unused prom cpu functions Remove the following unused funtions: prom_stopcpu() prom_idlecpu() prom_restartcpu() Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit efef2e497717958d9c8bde24998c5a915dd04cd5 Author: Sam Ravnborg Date: Sat Jan 1 12:53:09 2011 +0000 sparc: drop prom/palloc.c None of the functions was used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 743ceeed277c77a7e6751649ad0c4fa42af8063b Author: Sam Ravnborg Date: Sat Jan 1 12:53:08 2011 +0000 sparc: drop prom/devmap.c None of the functions was used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c Author: Jesper Juhl Date: Sun Jan 2 22:17:00 2011 +0100 HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report() We have a memory leak in drivers/hid/hid-picolcd.c::picolcd_debug_out_report() in an error path.. We are not always freeing the memory allocated to 'buff' - this patch makes sure we always kfree() what we allocate with kmalloc() when it is no longer needed. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 15095bb0fe779c0403091bda7adce5fb3bb9ca35 Author: Russell King Date: Sun Jan 2 15:05:21 2011 +0000 ARM: TWD: enable one-shot mode Allow one shot timer mode to be used with the TWD. This allows NOHZ mode to be used on SMP systems using the TWD localtimer. Tested on Versatile Express and U8500. Tested-by: Linus Walleij Signed-off-by: Russell King commit 40cd201e37073b3e2281cf2c73fcf5674f22267f Author: Paul Gortmaker Date: Sat Jan 1 14:56:18 2011 -0800 tipc: update log.h re-include protection to reflect new name The tipc/dbg.h file was recently renamed to tipc/log.h, but the re-include define was not updated accordingly. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 0885a30b699a2c96d892b61cc48e8ba68fe87bfc Author: stephen hemminger Date: Fri Dec 31 15:34:27 2010 +0000 sky2: implement 64 bit stats This implements 64 bit statistics support and fixes races when reading counter values. The PHY counters can only be accessed 16 bits at a time, so they are subject to carry races. NB: * TX/RX counters are maintained in software because the the hardware packet count is only a 32 bit value. * Error counters are really only 32 bit. * Old 32 bit counter fields in dev->stats still used for some software counters Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a016892cd6eb8d3dd9769021b088917ac7371abd Author: Allan Stephens Date: Fri Dec 31 18:59:35 2010 +0000 tipc: remove extraneous braces from single statements Cleans up TIPC's source code to eliminate the presence of unnecessary use of {} around single statements. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit e3ec9c7d5eea9adf2c604c623c987360cc700b88 Author: Allan Stephens Date: Fri Dec 31 18:59:34 2010 +0000 tipc: remove zeroing assignments to static global variables Cleans up TIPC's source code to eliminate the needless initialization of static variables to zero. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 2db9983a4318818845193bd577879c0620705e82 Author: Allan Stephens Date: Fri Dec 31 18:59:33 2010 +0000 tipc: split variable assignments out of conditional expressions Cleans up TIPC's source code to eliminate assigning values to variables within conditional expressions, improving code readability and reducing warnings from various code checker tools. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 0e65967e33be61e5f67727edd4ea829b47676fc0 Author: Allan Stephens Date: Fri Dec 31 18:59:32 2010 +0000 tipc: cleanup various cosmetic whitespace issues Cleans up TIPC's source code to eliminate deviations from generally accepted coding conventions relating to leading/trailing white space and white space around commas, braces, cases, and sizeof. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 25860c3bd5bd1db236d4fd5826d76127d677dc28 Author: Paul Gortmaker Date: Fri Dec 31 18:59:31 2010 +0000 tipc: recode getsockopt error handling for better readability The existing code for the copy to user and error handling at the end of getsockopt isn't easy to follow, due to the excessive use of if/else. By simply using return where appropriate, it can be made smaller and easier to follow at the same time. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit e83504f72456809cdbdbc91700d3ba6370c9da1c Author: Allan Stephens Date: Fri Dec 31 18:59:30 2010 +0000 tipc: remove pointless check for NULL prior to kfree It is acceptable to call kfree() with NULL, so these checks are not serving any useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30 Author: Allan Stephens Date: Fri Dec 31 18:59:29 2010 +0000 tipc: remove redundant #includes Eliminates a number of #include statements that no longer serve any useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 6e7e309c62ab584348e0fef90c8e3e48f634dba1 Author: Allan Stephens Date: Fri Dec 31 18:59:28 2010 +0000 tipc: Finish streamlining of debugging code Completes the simplification of TIPC's debugging capabilities. By default TIPC includes no debugging code, and any debugging code added by developers that calls the dbg() and dbg_macros() is compiled out. If debugging support is enabled, TIPC prints out some additional data about its internal state when certain abnormal conditions occur, and any developer-added calls to the TIPC debug macros are compiled in. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8d64a5ba58157dedc61f3f1f51e1c5d66f32a484 Author: Allan Stephens Date: Fri Dec 31 18:59:27 2010 +0000 tipc: Prune down link-specific debugging code Eliminates most link-specific debugging code in TIPC, which is now largely unnecessary. All calls to the link-specific debugging macros have been removed, as are the macros themselves; in addition, the optional allocation of print buffers to hold debugging information for each link endpoint has been removed. The ability for TIPC to print out helpful diagnostic information when link retransmit failures occur has been retained for the time being, as an aid in tracking down the cause of such failures. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 7ced6890bf81d311ab2ea846f92d5f3d0951c08c Author: Allan Stephens Date: Fri Dec 31 18:59:26 2010 +0000 tipc: remove dump() and tipc_dump_dbg() Eliminates calls to two debugging macros that are being completely obsoleted, as well as any associated debugging routines that are no longer required. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b29f14284989b3d0b3a5ce268b5b1fc4df9c5795 Author: Allan Stephens Date: Fri Dec 31 18:59:25 2010 +0000 tipc: remove calls to dbg() and msg_dbg() Eliminates obsolete calls to two of TIPC's main debugging macros, as well as a pair of associated debugging routines that are no longer required. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit f5e75269f59f7c3816f23314b924895e4ecf8409 Author: Allan Stephens Date: Fri Dec 31 18:59:24 2010 +0000 tipc: rename dbg.[ch] to log.[ch] As the first step in removing obsolete debugging code from TIPC the files that implement TIPC's non-debug-related log buffer subsystem are renamed to better reflect their true nature. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 5af5479296fba0ace5d5cab84045de5b19bde3fe Author: Allan Stephens Date: Fri Dec 31 18:59:23 2010 +0000 tipc: Remove internal linked list of node objects Eliminates a sorted list TIPC uses to keep track of the neighboring nodes it has links to, since this duplicates information already present in the internal array of node object pointers. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b0c1e928c85023c73780b5d9873406ccf1cd8019 Author: Allan Stephens Date: Fri Dec 31 18:59:22 2010 +0000 tipc: Remove user registry subsystem Eliminates routines, data structures, and files that make up TIPC's user registry. The user registry is no longer needed since the native API routines that utilized it no longer exist and there are no longer any internal TIPC services that use it. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit aa70200e001fc4d76552c974c94f65ab26020203 Author: Allan Stephens Date: Fri Dec 31 18:59:21 2010 +0000 tipc: Eliminate use of user registry by topology service Simplifies TIPC's network topology service so that it no longer registers its ports with the user registry, since the service doesn't take advantage of any of the registry's capabilities. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 7a488fd3d40a127d0d6057ecd2696f39e11e63c3 Author: Allan Stephens Date: Fri Dec 31 18:59:20 2010 +0000 tipc: Eliminate use of user registry by configuration service Simplifies TIPC's configuration service so that it no longer registers its port with the user registry, since the service doesn't take advantage of any of the registry's capabilities. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8f92df6ad49da958d97e171762d0a97a3dc738f1 Author: Allan Stephens Date: Fri Dec 31 18:59:19 2010 +0000 tipc: Remove prototype code for supporting multiple clusters Eliminates routines, data structures, and files that were intended to allow TIPC to support a network containing multiple clusters. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 51a8e4dee7653698ba4c6e7de71053665f075273 Author: Allan Stephens Date: Fri Dec 31 18:59:18 2010 +0000 tipc: Remove prototype code for supporting inter-cluster routing Eliminates routines and data structures that were intended to allow TIPC to route messages to other clusters. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 08c80e9a031df0a8f0269477a32f5eae47d7a146 Author: Allan Stephens Date: Fri Dec 31 18:59:17 2010 +0000 tipc: Remove prototype code for supporting slave nodes Simplifies routines and data structures that were intended to allow TIPC to support slave nodes (i.e. nodes that did not have links to all of the other nodes in its cluster, forcing TIPC to route messages that it could not deliver directly through a non-slave node). Currently, TIPC supports only networks containing non-slave nodes, so this code is unnecessary. Note: The latest edition of the TIPC 2.0 Specification has eliminated the concept of slave nodes entirely. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 51f98a8d70583b18cb08b19353aeed5efb0244af Author: Allan Stephens Date: Fri Dec 31 18:59:16 2010 +0000 tipc: Remove prototype code for supporting multiple zones Eliminates routines, data structures, and files that were intended to allows TIPC to support a network containing multiple zones. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit aa6027cacdd912ce884953714fcc7392b6155bc6 Author: Eric Dumazet Date: Sat Jan 1 05:22:46 2011 +0000 tg3: fix warnings In case CONFIG_PM_SLEEP is disabled, we dont need tg3_suspend() and tg3_resume(). drivers/net/tg3.c:15056: warning: ‘tg3_suspend’ defined but not used drivers/net/tg3.c:15110: warning: ‘tg3_resume’ defined but not used Signed-off-by: Eric Dumazet Cc: Rafael J. Wysocki Cc: Michael Chan Cc: Matt Carlson Signed-off-by: David S. Miller commit a4f740cf33f7f6c164bbde3c0cdbcc77b0c4997c Author: Grant Likely Date: Sat Oct 30 11:49:09 2010 -0400 of/flattree: Add of_flat_dt_match() helper function This patch adds of_flat_dt_match() which tests a node for compatibility with a list of values and converts the relevant powerpc platform code to use it. This approach simplifies the board support code a bit. Signed-off-by: Grant Likely Reviewed-by: Stephen Neuendorffer commit 77e58efd134b553d723fd963f436920a6aaaa6df Author: Justin P. Mattock Date: Fri Dec 31 09:50:31 2010 -0800 spi/topcliff: Typo fix threhold to threshold Signed-off-by: Justin P. Mattock Signed-off-by: Grant Likely commit 7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2 Author: stephen hemminger Date: Thu Dec 30 08:52:29 2010 +0000 skge: Do not use legacy PCI power management The skge driver used the legacy PCI power management, and did its own PCI callbacks. Use the same code model as Rafael's changes to sky2. Let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Compile tested only (so far). Signed-off-by: Stephen Hemminger Acked-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit 18c8d82ae5b802c5d82e0dfbcc08b1b568955f46 Author: Eric Dumazet Date: Fri Dec 31 12:48:55 2010 -0800 sfq: fix slot_dequeue_head() slot_dequeue_head() should make sure slot skb chain is correct in both ways, or we can crash if all possible flows are in use. Jarek pointed out slot_queue_init() can now be done in sfq_init() once, instead each time a flow is setup. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit eeaeb068f1393b4db4861481bf594bcd1c3eda7a Author: Eric Dumazet Date: Tue Dec 28 21:53:33 2010 +0000 sch_sfq: allow big packets and be fair SFQ is currently 'limited' to small packets, because it uses a 15bit allotment number per flow. Introduce a scale by 8, so that we can handle full size TSO/GRO packets. Use appropriate handling to make sure allot is positive before a new packet is dequeued, so that fairness is respected. Signed-off-by: Eric Dumazet Acked-by: Jarek Poplawski Cc: Patrick McHardy Signed-off-by: David S. Miller commit 0f333d10e3f689640b229c8cf00b16ea51ce4951 Author: Rafael J. Wysocki Date: Sun Dec 26 08:44:32 2010 +0000 sky2: Do not use legacy PCI power management The sky2 driver uses the legacy PCI power management, so it has to do some PCI-specific things in its ->suspend() and ->resume() callbacks, which isn't necessary and should better be done by the PCI sybsystem-level power management code. Moreover, it uses device_set_wakeup_enable() incorrectly (that function should be used when the WoL setting is changed rather than during suspend). Convert sky2 to the new PCI power management framework and make it let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Tested on a desktop machine with a Marvell 88E8056 PCI-E adapter. Signed-off-by: Rafael J. Wysocki Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit c866b7eac073198cef03ea6bac2dc978635a9f5c Author: Rafael J. Wysocki Date: Sat Dec 25 12:56:23 2010 +0000 tg3: Do not use legacy PCI power management The tg3 driver uses the legacy PCI power management, so it has to do some PCI-specific things in its ->suspend() and ->resume() callbacks, which isn't necessary and should better be done by the PCI sybsystem-level power management code. Convert tg3 to the new PCI power management framework and make it let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Tested on HP nx6325 with a NetXtreme BCM5788 adapter. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit f5260f02e7903bb10e45b1bf3500eab6425edf5c Author: Dan Carpenter Date: Sat Dec 25 12:23:42 2010 +0000 USB: cdc_ether: remove unneeded check We already verified that "dev->udev->actconfig->extralen" was non-zero so "len" is non-zero here as well. Signed-off-by: Dan Carpenter Acked-by: Oliver Neukum Signed-off-by: David S. Miller commit 0268102d53c872b42e214f95492065c8058b042e Author: Michael Chan Date: Fri Dec 31 11:04:02 2010 -0800 bnx2: Update firmware and version Update MIPS firmware to 6.2.1, with improved small packet performance in RSS mode, and iSCSI CID allocation bug fix on 5708. Update driver version to 2.0.21. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a29ba9d2d84889686a3af1c5a6023f28be75ccba Author: Michael Chan Date: Fri Dec 31 11:03:14 2010 -0800 bnx2: Free IRQ before freeing status block memory When changing ring size, we free all memory including status block memory. If we're in INTA mode and sharing IRQ, the IRQ handler can be called and it will reference the NULL status block pointer. Because of the lockless design of the IRQ handler, there is no simple way to synchronize and prevent this. So we avoid this problem by freeing the IRQ handler before freeing the status block memory. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 0438a1b24437cf007ed0e0f5f6b414d5b49468dc Author: Amit Kumar Salecha Date: Fri Dec 31 10:55:38 2010 -0800 netxen: update module description This driver supports only Intelligent Ethernet Adapters. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7c14c3f10e6dcd7f70e49f77b6e1ae605c4861e6 Author: Shmulik Ravid Date: Thu Dec 30 06:27:10 2010 +0000 dcbnl: cleanup A couple of small cleanups for patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 785b9b1aebcb748fb7627ad4c12dffb7f4f91b55 Author: Shmulik Ravid Date: Thu Dec 30 06:27:03 2010 +0000 bnx2x: adding dcbnl support Adding dcbnl implementation to bnx2x allowing users to manage the embedded DCBX engine. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ea45fe4e176a42d2396878f530cfdc8265bef37b Author: Shmulik Ravid Date: Thu Dec 30 06:26:55 2010 +0000 dcbnl: adding DCBX feature flags get-set Adding a pair of set-get routines to dcbnl for setting the negotiation flags of the various DCB features. Conforms to the CEE flavor of DCBX The user sets these flags (enable, advertise, willing) for each feature to be used by the DCBX engine. The 'get' routine returns which of the features is enabled after the negotiation. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 6241b6259b16aa390ff4bf50f520685b3801200b Author: Shmulik Ravid Date: Thu Dec 30 06:26:48 2010 +0000 dcbnl: adding DCBX engine capability Adding an optional DCBX capability and a pair for get-set routines for setting the device DCBX mode. The DCBX capability is a bit field of supported attributes. The user is expected to set the DCBX mode with a subset of the advertised attributes. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Acked-by: John Fastabend Signed-off-by: David S. Miller commit 96b99684e365f28d49bdb1221ca022b75cb91a98 Author: John Fastabend Date: Thu Dec 30 09:26:37 2010 +0000 net_dcb: add application notifiers DCBx applications priorities can be changed dynamically. If application stacks are expected to keep the skb priority consistent with the dcbx priority the stack will need to be notified when these changes occur. This patch adds application notifiers for the stack to register with. Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 9ab933ab2cc80f04690d6aa385b1110075c5e507 Author: John Fastabend Date: Thu Dec 30 09:26:31 2010 +0000 dcbnl: add appliction tlv handlers This patch adds application tlv handlers. Networking stacks may use the application priority to set the skb priority of their stack using the negoatiated dcbx priority. This patch provides the dcb_{get|set}app() routines for the stack to query these parameters. Notice lower layer drivers can use the dcbnl_ops routines if additional handling is needed. Perhaps in the firmware case for example Signed-off-by: John Fastabend Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 3e29027af43728c2a91fe3f735ab2822edaf54a8 Author: John Fastabend Date: Thu Dec 30 09:25:46 2010 +0000 dcbnl: add support for ieee8021Qaz attributes The IEEE8021Qaz is the IEEE standard version of CEE. The standard has had enough significant changes from the CEE version that many of the CEE attributes have no meaning in the new spec or do not easily map to IEEE standards. Rather then attempt to create a complicated mapping between CEE and IEEE standards this patch adds a nested IEEE attribute to the list of DCB attributes. The policy is, [DCB_ATTR_IFNAME] [DCB_ATTR_STATE] ... [DCB_ATTR_IEEE] [DCB_ATTR_IEEE_ETS] [DCB_ATTR_IEEE_PFC] [DCB_ATTR_IEEE_APP_TABLE] [DCB_ATTR_IEEE_APP] ... The following dcbnl_rtnl_ops routines were added to handle the IEEE standard, int (*ieee_getets) (struct net_device *, struct ieee_ets *); int (*ieee_setets) (struct net_device *, struct ieee_ets *); int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *); int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *); int (*ieee_getapp) (struct net_device *, struct dcb_app *); int (*ieee_setapp) (struct net_device *, struct dcb_app *); Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit bfcf72e4426da2fd8f8081a641385ffc3ccc2282 Author: Mike Christie Date: Fri Dec 31 02:22:22 2010 -0600 [SCSI] libiscsi: use bh locking instead of irq with session lock The session lock is taken in threads, timers, and bottom halves like softirqs and tasklets. All the code but iscsi_conn/session_failure take the session lock with the spin_lock_bh call. This was done because I thought some offload drivers would be calling these functions from a irq. They never did, so this patch has iscsi_conn/session_failure use the bh locking. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f41d472179a0d7c8e8160c85180ab1124947068e Author: Mike Christie Date: Fri Dec 31 02:22:21 2010 -0600 [SCSI] libiscsi: do not take host lock in queuecommand iscsi_tcp, ib_iser, cxgb*, be2iscsi and bnx2i do not use the host lock and do not take the session lock against a irq, so this patch drops the DEF_SCSI_QCMD use. Instead we just take the session lock and disable bhs. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1227633a441363642cdbaf38c4241d071e917095 Author: Mike Christie Date: Fri Dec 31 02:22:20 2010 -0600 [SCSI] be2iscsi: fix null ptr when accessing task hdr If alloc_pdu fails then the task->hdr pointer may not be set. This adds a check for this case in the cleanup callback. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit bc7accec8788ada4f459461194c2b8fad94ed239 Author: Mike Christie Date: Fri Dec 31 02:22:19 2010 -0600 [SCSI] be2iscsi: fix gfp use in alloc_pdu The pdu allication callout is called from a spin lock and in the IO path so we cannot use GFP_KERNEL. This has the driver use GFP_ATOMIC. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit df4da5cdfca05b37b366b9c69925b68586969c1c Author: Mike Christie Date: Fri Dec 31 02:22:18 2010 -0600 [SCSI] libiscsi: add more informative failure message during iscsi scsi eh This adds a more informative error code and message for the iscsi scsi eh session drop paths. This allows you to distinguish if the session was dropped due to a connection failure vs the iscsi layer dropping the session due to scsi eh failure processing. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c10007560589a2335a77cbc92347b1474518296 Author: Julia Lawall Date: Wed Dec 29 15:57:54 2010 +0100 [SCSI] gdth: Add missing call to gdth_ioctl_free Add missing call to gdth_ioctl_free before aborting. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression buf,ha,len,addr,E; @@ buf = gdth_ioctl_alloc(ha, len, FALSE, &addr) ... when != false buf != NULL when != true buf == NULL when != \(E = buf\|buf = E\) when != gdth_ioctl_free(ha, len, buf, addr) *return ...; // Signed-off-by: Julia Lawall Signed-off-by: James Bottomley commit 9d1da730ee17e712c25c0b1e51653048f92d2385 Author: David Henningsson Date: Sun Dec 26 10:23:58 2010 -0300 [media] DVB: IR support for TechnoTrend CT-3650 Based on Waling Dijkstra's discovery that the IR works the same as on the TT-1500, this patch has been rewritten to fit with the rc_core infrastructure. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit ebce9a3331f4dd1f39856dc4b79f539eb25f7f64 Author: Igor M. Liplianin Date: Fri Dec 31 02:04:38 2010 -0300 [media] cx23885, cimax2.c: Fix case of two CAM insertion irq For example boot up with two CAM inserted. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 21d33014108671cc6b02feda088f32bf26ce532d Author: Mariusz Białończyk Date: Wed Dec 29 19:48:43 2010 -0300 [media] ir-nec-decoder: fix repeat key issue Fixing the problem with NEC protocol and repeating keys under the following circumstances. The problem occurs when there is a repeat code without properly decoded scancode. This leads to repeat the wrong (last decoded) scancode. An example from real life: I am pressing volume down, then several minutes later i am pressing volume up, but the real scancode is wrongly decoded and only a repeat event is emitted, so as a result volume is going down while i am holding volume up button. The patch fixes above problem using rc_keyup timeout (as pointed by Mauro). It just prevents key repeats if they appear after rc_keyup. Signed-off-by: Mariusz Białończyk Signed-off-by: Mauro Carvalho Chehab commit 8f4bfadd200477acb6dcf41a45919dd37d01a6db Author: Jing Huang Date: Sun Dec 26 21:50:10 2010 -0800 [SCSI] bfa: remove unused defintions and misc cleanups This patch removes unused functions, data strucutres, and definitions. It also includes misc comment and formatting cleanups. Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 2f2f40a45845e52fbbe07bcd3e09ccff44feb01b Author: Jing Huang Date: Sun Dec 26 21:48:53 2010 -0800 [SCSI] bfa: remove inactive functions This patch removes some inactive functions and macros. Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit d4b671c58ebeb56dfc8fe8bcca25e0a06bc9359a Author: Jing Huang Date: Sun Dec 26 21:46:35 2010 -0800 [SCSI] bfa: replace bfa_assert with WARN_ON Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 2f263d9d4f0432e4f7a708c95fab82f83ec14947 Author: Justin P. Mattock Date: Thu Dec 30 15:07:51 2010 -0800 spi/dw_spi Typo change diable to disable. Signed-off-by: Justin P. Mattock Signed-off-by: Grant Likely commit ef98a2c0f2856f6b2aa87fd32d5b192afaeae518 Author: Randy Dunlap Date: Thu Dec 30 15:23:41 2010 -0300 [media] staging: se401 depends on USB Fix build errors by adding "depends on USB": ERROR: "usb_register_driver" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_control_msg" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_kill_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_deregister" [drivers/staging/se401/se401.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 798cf3144f8b7466533cf738740478e472677a01 Author: Randy Dunlap Date: Thu Dec 30 15:23:38 2010 -0300 [media] staging: usbvideo/vicam depends on USB Fix build errors by adding "depends on USB": ERROR: "usb_register_driver" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_bulk_msg" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_control_msg" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_deregister" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_get_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_put_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_set_interface" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_kill_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_register_driver" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_deregister" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 96e442c1b2ef2ba9476e5da2607ba666ce09664d Author: Alberto Panizzo Date: Thu Dec 2 07:43:37 2010 -0300 [media] soc_camera: Add the ability to bind regulators to soc_camedra devices In certain machines, camera devices are supplied directly by a number of regulators. This patch add the ability to drive these regulators directly by the soc_camera driver. Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 3153ac9c6208892ee237caccdbe2290f8247e236 Author: Alberto Panizzo Date: Thu Dec 2 11:53:28 2010 -0300 [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b6a633c18ba83c0c8e96759a31d356bfb77e2b5f Author: Guennadi Liakhovetski Date: Sat Dec 25 17:40:26 2010 -0300 [media] v4l: soc-camera: switch to .unlocked_ioctl Use the V4L mutex infrastructure in soc-camera core and drivers and switch to .unlocked_ioctl. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c85bb69af09988f728aca825c11267c9d06ba32e Author: Guennadi Liakhovetski Date: Thu Dec 30 08:37:06 2010 -0300 [media] v4l: ov772x: simplify pointer dereference Use a more direct way to obtain a pointer to struct ov772x_priv, where the subdevice is available. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 63c9718c1a4595d51f5b70ed4aed6cee5aea875b Author: David Cohen Date: Wed Dec 8 09:13:59 2010 -0300 [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving OmniVision OV9640 driver wasn't requesting properly its private data on I2C remove and video_probe functions. It was retrieving the V4L2 subdev struct address instead of priv struct's one. This patch fixes such problem. Signed-off-by: David Cohen Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit f7b74f76a3a5bcad4d2e8db76834253a63977545 Author: David Cohen Date: Wed Dec 8 09:13:58 2010 -0300 [media] ov9640: use macro to request OmniVision OV9640 sensor private data This cleanup patch creates macro to request OmniVision OV9640 private data, which increases readability. Signed-off-by: David Cohen Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 9804ed9e840c461f88b290dea43173e3eed37102 Author: Mauro Carvalho Chehab Date: Thu Dec 30 11:58:37 2010 -0300 [media] ivtv-i2c: Fix two warnings Fix two gcc warnings: drivers/media/video/ivtv/ivtv-i2c.c:170: warning: cast from pointer to integer of different size drivers/media/video/ivtv/ivtv-i2c.c:171: warning: cast from pointer to integer of different size $ gcc --version gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-48) They seem bogus, but, as the original code also has problems with LE/BE, just change its implementation to be clear. Signed-off-by: Mauro Carvalho Chehab commit abfd013b665d21f57bc4b2e455b23c4cece0df9f Author: Mauro Carvalho Chehab Date: Thu Dec 30 09:51:19 2010 -0300 [media] staging/lirc: Update lirc TODO files Signed-off-by: Mauro Carvalho Chehab commit 6a23a520c07ba556ea2317b1f72f3d2eb002f991 Author: Mauro Carvalho Chehab Date: Thu Dec 30 09:05:12 2010 -0300 [media] cx88: Remove the obsolete i2c_adapter.id field Signed-off-by: Mauro Carvalho Chehab commit d7c7235695ef9cbbdc20bdeb8554dbf10f576ca1 Author: Andy Walls Date: Tue Dec 28 22:49:50 2010 -0300 [media] lirc_zilog: Remove use of deprecated struct i2c_adapter.id field Remove use of deprecated struct i2c_adapter.id field. In the process, perform different detection of the HD PVR's Z8 IR microcontroller versus the other Hauppauge cards with the Z8 IR microcontroller. Also added a comment about probe() function behavior that needs to be fixed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit a9cd591e29b6b50e1212de7b7a86ccd270f5c2a6 Author: Andy Walls Date: Tue Dec 28 22:47:46 2010 -0300 [media] ir-kbd-i2c: Add HD PVR IR Rx support to ir-kbd-i2c Add HD PVR IR Rx support to ir-kbd-i2c Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit ea6c06033f01216df504b0f337a350778a3bc80e Author: Andy Walls Date: Tue Dec 28 22:46:13 2010 -0300 [media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either lirc_zilog or ir-kbd-i2c to use. This is a required step in removing lirc_zilog's use of the deprecated struct i2c_adapter.id field. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 41ca2b1ac269e2ed64e2562b91fa61cab0b19e7a Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:37:33 2010 -0300 [media] Remove staging/lirc/lirc_i2c driver This driver duplicates the same functionality found at ir-kbd-i2c. There were a few missing key parsers that were added by the previous patches. The only thing left on lirc_i2c driver is the IR parsing for Asus TV-Box and Creative/VisionTek BreakOut-Box. Those devices use pcf8574 chip for IR. They are old video adapters with TV tuners. Their code were never merged upstream, and they are not chipped anymore. So, it is very unlikely that someone would have interests on porting them to the Linux Kernel. Due to that, let's remove lirc_i2c, as all the remaining functionality are already mapped via ir-kbd-i2c. Signed-off-by: Mauro Carvalho Chehab commit 8a6334fc91de3f58bbd3051d6f088e7f71a3becd Author: Mauro Carvalho Chehab Date: Thu Dec 30 10:25:12 2010 -0300 [media] ivtv-i2c: Don't use IR legacy mode for Zilog IR The Zilog IR entries are already handled by IR new code. So, remove its usage from the legacy IR support. Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit e1e2c57565635310209566a31a300e593f74cc22 Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:31:10 2010 -0300 [media] ivtv: Add Adaptec Remote Controller lirc-i2c implements a get key logic for the Adaptec Remote Controller, at address 0x6b. The only driver that seems to have an Adaptec device is ivtv: $ git grep -i adaptec drivers/media drivers/media/video/cs53l32a.c: * cs53l32a (Adaptec AVC-2010 and AVC-2410) i2c ivtv driver. drivers/media/video/cs53l32a.c: * Audio source switching for Adaptec AVC-2410 added by Trev Jackson drivers/media/video/cs53l32a.c: /* Set cs53l32a internal register for Adaptec 2010/2410 setup */ drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2410 card */ drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0093 }, drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2410", drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2010 card */ drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0092 }, drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2010", drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */ drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */ drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_PCI_ID_ADAPTEC 0x9005 drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 8 = Adaptec AVC-2410\n" drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 9 = Adaptec AVC-2010\n" drivers/media/video/ivtv/ivtv-i2c.c: 0x6b, /* Adaptec IR */ There are two Adaptec cards defined there, but AVC-2010 doesn't have a remote controller. So, the logic at lirc_i2c seems to be for Adaptec AVC-2410. As we'll remove lirc_i2c from kernel, move the getkey code to ivtv driver, and use it for AVC-2410. Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 1c0eb0ffb0d541bf05a4b422a629fa5986799313 Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:02:51 2010 -0300 [media] cx88: Add RC logic for Leadtek PVR 2000 Currently, lirc-i2c has a decoding logic for Leadtek Remote Control. Move it to cx88, as we intend to remove lirc-i2c. For now, initialize LIRC remote keytable with RC_MAP_EMPTY, as we don't know its keymap yet. It would be nice to later check if is there any file on LIRC userspace with that keytable. Signed-off-by: Mauro Carvalho Chehab commit b22374544b981b82f7319a02e6b718fc796e9cfa Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:01:01 2010 -0300 [media] bttv-input: Add a note about PV951 RC When comparing lirc-i2c and ir-kbd-i2c/bttv-input logic, a difference was noticed. As lirc-i2c will be removed soon, store the difference on a comment inside ir-kbd-i2c, in order to preserve the knowledge we have about that remote controller. Signed-off-by: Mauro Carvalho Chehab commit 8c11a94d86eb5489dc665bc566bf624e329d89fa Author: Russell King Date: Tue Dec 28 19:40:40 2010 +0000 ARM: mmci: Clean up MMCI announcement printk Make the MMCI announcement printk say which primecell part number has been found. Display the revision as an unsigned decimal, and display only the first 8 hex digits of the base address unless it's larger. Signed-off-by: Russell King commit c1955b5f3a95717ce1f5235f6e9968da068e3183 Author: Tejun Heo Date: Sat Dec 18 16:30:48 2010 +0100 x86: Use this_cpu_inc_return for nmi counter this_cpu_inc_return() saves us a memory access there. Reviewed-by: Pekka Enberg Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Acked-by: Tejun Heo Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 7b543a5334ff4ea2e3ad3b777fc23cdb8072a988 Author: Tejun Heo Date: Sat Dec 18 16:30:05 2010 +0100 x86: Replace uses of current_cpu_data with this_cpu ops Replace all uses of current_cpu_data with this_cpu operations on the per cpu structure cpu_info. The scala accesses are replaced with the matching this_cpu ops which results in smaller and more efficient code. In the long run, it might be a good idea to remove cpu_data() macro too and use per_cpu macro directly. tj: updated description Cc: Yinghai Lu Cc: Ingo Molnar Acked-by: H. Peter Anvin Acked-by: Tejun Heo Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 0a3aee0da4402aa19b66e458038533c896fb80c6 Author: Tejun Heo Date: Sat Dec 18 16:28:55 2010 +0100 x86: Use this_cpu_ops to optimize code Go through x86 code and replace __get_cpu_var and get_cpu_var instances that refer to a scalar and are not used for address determinations. Cc: Yinghai Lu Cc: Ingo Molnar Acked-by: Tejun Heo Acked-by: "H. Peter Anvin" Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 56f4c400349157289b474a3fd49ee96acab0a4d7 Merge: 32ae2ad da169f5 Author: Ingo Molnar Date: Thu Dec 30 11:26:45 2010 +0100 Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core commit 61ea3aa5bf309333c6655ccef825b4a765bff219 Author: Hans Verkuil Date: Wed Dec 29 14:38:44 2010 -0300 [media] timblogiw: fix compile warning Fix 64-bit compile warning: drivers/media/video/timblogiw.c: In function ‘timblogiw_dma_filter_fn’: drivers/media/video/timblogiw.c:151: warning: cast from pointer to integer of different size drivers/media/video/timblogiw.c: In function ‘timblogiw_open’: drivers/media/video/timblogiw.c:670: warning: cast to pointer from integer of different size Signed-off-by: Hans Verkuil Cc: Richard Rojförs Signed-off-by: Mauro Carvalho Chehab commit 657f2271050beabe725ba101c1d840f51a41f33d Author: Hans Verkuil Date: Wed Dec 29 14:29:55 2010 -0300 [media] v4l: fix handling of v4l2_input.capabilities The v4l core sets the v4l2_input.capabilities field based on the supplied v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the v4l2_input struct, thus overwriting that field incorrectly. Either remove the memset (which is already done by the v4l core), or add the proper capabilities field in case of a memcpy. The same is also true for v4l2_output, but that only affected the ivtv driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3ea2b673a55cee528f83653e711d09425ed4d8b6 Author: Hans Verkuil Date: Wed Dec 29 14:28:13 2010 -0300 [media] em28xx: fix incorrect s_ctrl error code and wrong call to res_free Calling subdevs to handle s_ctrl returned a non-zero return code even if everything went fine. Calling STREAMOFF if no STREAMON happened earlier would hit a BUG_ON in res_free. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 02ac04805e6a753610d7dd1716181ccbd8e366af Author: Hans Verkuil Date: Wed Dec 29 14:27:05 2010 -0300 [media] v4l2-ctrls: only check def for menu, integer and boolean controls The 'def' field is only valid for menus, integers and booleans. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 513521eaee4375a1a0da0b73c7131a165a9fe4d9 Author: Hans Verkuil Date: Wed Dec 29 14:25:52 2010 -0300 [media] v4l2-ctrls: use const char * const * for the menu arrays This prevents checkpatch warnings generated when defining 'static const char *foo[]' arrays. It makes sense to use const char * const * anyway since the pointers in the array are indeed const. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2 Author: Hans Verkuil Date: Wed Dec 29 13:53:21 2010 -0300 [media] usbvision: coding style Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 52cb0bf275debe4ec8950157f11b9d9f14447a88 Author: Hans Verkuil Date: Sun Dec 19 20:33:51 2010 -0300 [media] usbvision: convert // to /* */ Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5490a7cbe65d63c6ec45f1013287af1e390c95d7 Author: Hans Verkuil Date: Sun Dec 19 20:21:36 2010 -0300 [media] usbvision: get rid of camelCase Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c627b9d1f580f26fe99a8045d37a57f91e9aef66 Author: Hans Verkuil Date: Sat Dec 18 11:06:09 2010 -0300 [media] usbvision: convert to unlocked_ioctl Convert driver to use core-assisted locking. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a6d38f889750ed6290728a19d9dad577b147c6d0 Author: Ping Cheng Date: Fri Dec 24 13:16:53 2010 -0800 Input: wacom_w8001 - support pen or touch only devices Not all penabled devices support touch. The same holds true for touch devices, so we should be setting up devices according to the results returned when we query the hardware. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 477ca3ad6ac5cdbd5bd40941fc22c6eedc9aa90d Author: Mingkai Hu Date: Wed Dec 1 17:29:18 2010 +0800 spi/fsl_espi: change the read behaviour of the SPIRF The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the amount of data in the receive FIFO, so read the SPIRF byte by byte when the data in receive FIFO is less than 4 bytes. On Simics, when read N bytes that exceed the amout of data in receive FIFO, we can't read the data out, that is we can't clear the rx FIFO, then the CPU will loop on the espi rx interrupt. Signed-off-by: Mingkai Hu Signed-off-by: Grant Likely commit 73930a85cf38d72851305fcf640c07b4c13aa405 Author: Rob Herring Date: Wed Nov 17 17:50:23 2010 -0600 of_serial: explicitly include of_irq.h On PPC, of_irq.h gets implicitly included, but on other platforms it does not. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit fe14042358fac0673d4b6362a73796fd64379938 Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:02 2010 -0800 of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree unflatten_device_tree has two dependencies on things that happen during boot time. Firstly, it references the initial device tree directly. Secondly, it allocates memory using the early boot allocator. This patch factors out these dependencies and uses the new __unflatten_device_tree function to implement a driver-visible fdt_unflatten_tree function, which can be used to unflatten a blob after boot time. V2: - remove extra __va() call - make dt_alloc functions return void *. This doesn't fix the general strangeness in this code that constantly casts back and forth between unsigned long and __be32 * Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit 57d00ecf90cc9854973da2960012b734acc26e51 Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:01 2010 -0800 of/flattree: Reorder unflatten_dt_node Move unflatten_dt_node to be grouped with non-__init functions. Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit a40d6c4cf12d87980c10b230df435d0f56adc40b Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:00 2010 -0800 of/flattree: Refactor unflatten_dt_node unflatten_dt_node is a helper function that does most of the work to convert a device tree blob into tree of device nodes. This code now uses a passed-in blob instead of using the single boot-time blob, allowing it to be called in more contexts. Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit 9706a36e35c4ce04f28a62cfe1205b4e3b0dd13c Author: Stephen Neuendorffer Date: Thu Nov 18 15:54:59 2010 -0800 of/flattree: Add non-boottime device tree functions In preparation for providing run-time handling of device trees, factor out some of the basic functions so that they take an arbitrary blob, rather than relying on the single boot-time tree. V2: - functions have of_fdt_* names - removed find_flat_dt_string - blob argument is first Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit e6ce1324e4f08b0d984340201a125806dae0e9a6 Author: Stephen Neuendorffer Date: Thu Nov 18 15:54:56 2010 -0800 of/flattree: Add Kconfig for EARLY_FLATTREE The device tree code is now in two pieces: some which can be used generically on any platform which selects CONFIG_OF_FLATTREE, and some early which is used at boot time on only a few architectures. This patch segregates the early code so that only those architectures which care about it need compile it. This also means that some of the requirements in the early code (such as a cmd_line variable) that most architectures (e.g. X86) don't provide can be ignored. Signed-off-by: Stephen Neuendorffer [grant.likely@secretlab.ca: remove extra blank line addition] [grant.likely@secretlab.ca: fixed incorrect #ifdef CONFIG_EARLY_FLATTREE check] [grant.likely@secretlab.ca: Made OF_EARLY_FLATTREE select instead of depend on OF_FLATTREE] Signed-off-by: Grant Likely commit 60ebe1568fd15b7ffa101acc645069e27d546ed6 Author: Sundar Iyer Date: Fri Dec 3 20:35:50 2010 +0530 ux500: add TC35893 keypad platform data Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 09c730a488c32c2cadb31cdb8dcc4df528441197 Author: Sundar Iyer Date: Tue Dec 21 15:53:31 2010 +0530 input/tc3589x: add tc3589x keypad support Add support for the keypad controller module found on the TC3589X devices. This driver default adds the support for TC35893 device. Signed-off-by: Sundar Iyer Acked-by: Dmitry Torokhov [Some minor fixups for compilation] Signed-off-by: Linus Walleij commit 96aebafa63418f447ddc823e40da341cc40553dd Author: Jesper Juhl Date: Fri Dec 24 21:28:56 2010 +0100 gen_init_cpio: Avoid race between call to stat() and call to open() In usr/gen_init_cpio.c::cpio_mkfile() a call to stat() is made based on pathname, subsequently the file is open()'ed and then the value of the initial stat() call is used to allocate a buffer. This is not safe since the file may change between the call to stat() and the call to open(). Safer to just open() the file and then do fstat() using the filedescriptor returned by open. Signed-off-by: Jesper Juhl Acked-by: Jeff Garzik Signed-off-by: Michal Marek commit cd8d60a20a4516016c117ac0f1ac7b06ff606f7e Author: Theodore Ts'o Date: Fri Dec 24 09:42:10 2010 -0500 kbuild: create linux-headers package in deb-pkg Create a linux-headers-$KVER.deb package which can be used to build external modules without having the source tree around. Signed-off-by: "Theodore Ts'o" Signed-off-by: Michal Marek commit 427aacfe1d0c540bf80e5243d18ba1272f9b756f Author: Dmitri Belimov Date: Tue Dec 28 21:49:07 2010 -0300 [media] tm6000: Fix mutex unbalance Hi Fix never unlocked mutex. No more crash after removing USB stick. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit aa777a88b2d73f710b86b955e0c738af91e9e452 Author: Jean-François Moine Date: Tue Dec 28 07:39:13 2010 -0300 [media] gspca - sonixj: Bad clock for om6802 in 640x480 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 71e84ea7f082eb02df6ef40f55d2c4a998f6e1df Author: Jean-François Moine Date: Tue Dec 28 07:35:27 2010 -0300 [media] gspca - stv06xx/st6422: Use the new video control mechanism Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7e5f9059a807ce9b7a12b2402f5aeae9557c8049 Author: Jean-François Moine Date: Tue Dec 28 07:24:18 2010 -0300 [media] gspca - vc032x: Cleanup source Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7fbee99aa2c73bdf47add9de58f646fa7713e7e5 Author: Jean-François Moine Date: Tue Dec 28 07:17:40 2010 -0300 [media] gspca - zc3xx: The sensor of the VF0250 is a GC0303 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 49fb5e60f7e907126aac10af6577fac6fde684f6 Author: Jean-François Moine Date: Tue Dec 28 07:09:34 2010 -0300 [media] gspca - zc3xx: Use the new video control mechanism Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7d55a84b0af47b2ec55e16c6dbc8df62a72ac749 Author: Jean-François Moine Date: Tue Dec 28 07:02:32 2010 -0300 [media] gspca - zc3xx: Keep sorted the device table Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 2bbf53bd176e36d1574eeec53bf710d94703535e Author: Jean-François Moine Date: Tue Dec 28 07:01:04 2010 -0300 [media] gspca: Bad comment Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0aeb5ec74b0a95f1699040f0262a6fd5507d6e8f Author: Jean-François Moine Date: Tue Dec 28 06:59:04 2010 -0300 [media] gspca - pac7302/pac7311: Fix some warnings Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d85185902fb669a92d4934b926f8016368e1ad06 Author: Jean-François Moine Date: Tue Dec 28 06:55:01 2010 -0300 [media] gspca - main: Fix some warnings Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 66832aef0694807f487a8ccc8871cea4e80d78c5 Author: Hans Verkuil Date: Mon Dec 27 12:27:50 2010 -0300 [media] bt819: the ioctls in the header are internal to the kernel Remove bt819.h from ioctl-number.txt and make a note in the header that these ioctls are for internal use only. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b9218f2f15cdff8991ba041993bf40962c49fdd0 Author: Hans Verkuil Date: Mon Dec 27 12:22:46 2010 -0300 [media] saa6588: rename rds.h to saa6588.h The naming of the media/rds.h header suggested that it was a generic RDS header, when in fact it is just a saa6588 module API that is internal to the kernel. Rename the header and the struct and defines in it to make this clear. Also removed the header include in radio-si470x.h (not used anymore) and from ioctl-number.txt (it's internal to the kernel and never called from userspace). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a519d70e0cf346e946202ffcbeaf57a1748d0c03 Author: Vasiliy Kulikov Date: Fri Nov 19 15:41:49 2010 -0300 [media] media: video: pvrusb2: fix memory leak Use put_device() instead of kfree() because of device name leak. Signed-off-by: Vasiliy Kulikov Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 9028f58f5d7e810a0e88b508ebe6a69daf7e3273 Author: Alexey Chernov <4ernov@gmail.com> Date: Mon Dec 6 17:09:53 2010 -0300 [media] support of GoTView PCI-E X5 3D Hybrid in cx23885 Some comments: 1. Everything initialize properly except radio. 2. All analog inputs (TV, composite, S-Video) are tested by myself in several TV norms (SECAM-D, PAL, NTSC), everything work fine. So the patch adds general support/detection of the card with working analog part, DVB part is not supported for now. Signed-off-by: Alexey Chernov <4ernov@gmail.com> Reviewed-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 5f63306d82131371f464c0e5b7ebe6a23a84c768 Author: Dan Carpenter Date: Mon Dec 27 21:04:58 2010 -0300 [media] cx231xx: use bitwise negate instead of logical Bitwise negate was intended here. INPUT_SEL_MASK is 0x30. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 Author: Mauro Carvalho Chehab Date: Mon Oct 25 17:51:15 2010 -0300 [media] em28xx: Fix audio input for Terratec Grabby The audio input line was wrong. Fix it. Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit b5fff5445a077af897e670e98ea54b9b440f8b63 Author: Mauro Carvalho Chehab Date: Tue Dec 28 08:13:50 2010 -0300 [media] cardlist: Update lists for em28xx and saa7134 PS.: The cardlists are auto-generated via scripts. Signed-off-by: Mauro Carvalho Chehab commit b7a0f2e793a52b306e682a0e2e9a0b6f0f0a730e Author: Ramiro Morales Date: Sun Dec 26 18:13:30 2010 -0300 [media] saa7134: Add support for Compro VideoMate Vista M1F Signed-off-by: Pavel Osnova Signed-off-by: Ramiro Morales Signed-off-by: Mauro Carvalho Chehab commit 44c6e2a7c2ec76dd495a0f330f9beac572a2fdd7 Author: Ang Way Chuang Date: Fri Dec 24 02:40:46 2010 -0300 [media] cx88-dvb.c: DVB net latency using Hauppauge HVR4000 A Hauppauge HVR 4000 is used on a School On Internet Asia (SOI Asia) project in order to carry IP traffic over ULE. However, there is an issue with high latency jitter. My boss, Husni, identified the problem and provided a patch for it. The default buffer size of 32 TS frames on cx88 causes the high latency, so our deployment changes that to 6 TS frames. This patch made the buffer size tunable, while keeping the default buffer size of 32 TS frames unchanged. Signed-off-by: Achmad Husni Thamrin Signed-off-by: Mauro Carvalho Chehab commit fe04164647588ec55937e6d696da1ebeca04d000 Author: Dan Carpenter Date: Thu Dec 23 16:38:53 2010 -0300 [media] cx231xxx: fix typo in saddr_len check The original code compared "saddr_len" with zero twice in a nonsensical way. I asked the list, and Andy Walls and Sri Deevi say that the second check should be if "saddr_len == 1". Signed-off-by: Dan Carpenter Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 50155c25bf346b65fec8e215131df397b0a5ee6e Author: Anatolij Gustschin Date: Wed Dec 22 17:31:59 2010 -0300 [media] fsl_viu: add VIDIOC_QUERYSTD and VIDIOC_G_STD support VIDIOC_QUERYSTD and VIDIOC_G_STD ioctls are currently not supported in the FSL VIU driver. The decoder subdevice driver saa7115 extended by previous patch supports QUERYSTD for saa711x, so we add the appropriate ioctls to the VIU driver to be able to determine the video input's standard. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit f9d7d787842e92bc768d282f37fc3056c5441ddb Author: Anatolij Gustschin Date: Wed Dec 22 17:31:58 2010 -0300 [media] saa7115: allow input standard autodetection for more chips Autodetect input's standard using field frequency detection feature (FIDT in status byte at 0x1F) of the chips saa7111/ saa7111a/saa7113/saa7114/saa7118. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit 641d21167f66ef4c574ef4f586fec0ae32179acd Author: Dmitri Belimov Date: Wed Dec 22 05:57:46 2010 -0300 [media] tm6000: rework and fix IR Hi This patch didn't kill Stefan's remotes and just for upload my good part of code. 1. Add some code for show IR activity 2. Add filter for IR remotes 3. Split remotes to different types. 4. Fix stop interrupt pipe when isoc pipe started. When we decide general way of IR I'll add support our remotes. For our customers I'll made custom temporary patch without this part. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit db9285f79b12286a3b525b41ab275796679c1dfa Author: David Henningsson Date: Mon Dec 27 15:45:19 2010 -0300 [media] MEDIA: RC: Provide full scancodes for TT-1500 remote control Add 0x15 prefix to scancodes for TT-1500 remote control. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit 730726a6f90740a5954ca2fb1c74fad6f44a2c42 Author: David Henningsson Date: Mon Dec 27 15:41:58 2010 -0300 [media] DVB: Set scanmask for Budget/SAA7146 cards These devices do not return the full command+address, so set scanmask accordingly. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit 2d5ca76f2b39a31313d7e54224c78b7b311e7dce Author: Mauro Carvalho Chehab Date: Mon Dec 27 18:17:12 2010 -0300 [media] dabusb: Move it to staging to be deprecated dabusb driver were conceived as an experimental driver for a test device. The driver never supported any shipped product, and, while there were some updates on it in 2003, for an ancient product, those changes were never submitted upstream. Also, there's no DocBook for its API, nor any upstream discussion. So, better to remove it, on .39. If later needed, we may rescue it from git logs. For now, let's move it to staging. Acked-by: Deti Fliegl Cc: Deti Fliegl Signed-off-by: Mauro Carvalho Chehab commit 0170f6bcb243cb9e86c953652f8e62fccb8108f1 Author: Mauro Carvalho Chehab Date: Mon Dec 27 13:00:04 2010 -0300 [media] streamzap: Fix a compilation warning when compiled builtin drivers/media/rc/streamzap.c: In function ‘streamzap_probe’: drivers/media/rc/streamzap.c:460:2: warning: statement with no effect Cc: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 465a9e3a2f494b0887db63b7b10bb9370145d9bc Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:58:02 2010 -0300 [media] af9013: Fix a compilation warning drivers/media/dvb/frontends/af9013.c: In function ‘af9013_update_signal_strength.clone.0’: drivers/media/dvb/frontends/af9013.c:967:6: warning: ‘ret’ may be used uninitialized in this function Cc: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 187e7d3b9b4e0b6b1c171846592e679e58a84cd2 Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:16:47 2010 -0300 [media] stv090x: Fix some compilation warnings A few typos at the driver are causing the following warnings: drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_start_search’: drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’ drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’ drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_optimize_track’: drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value ‘4’ not in enumerated type ‘enum stv090x_delsys’ The first two are due to the lack of using the delsys types STV090x_DVBS1/STV090x_DSS instead of STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS The second one is due to the usage of STV090x_UNKNOWN (enum stv090x_modulation) instead of STV090x_ERROR (enum stv090x_delsys). Cc: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 95f18be2e4f74255b46fcc23a9718cca9c7375c9 Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:00:03 2010 -0300 [media] gspca: Fix a warning for using len before filling it The check for status errors is now before the check for len. That's ok. However, the error printk's for the status error prints the URB length. This generates this error: drivers/media/video/gspca/gspca.c: In function ‘fill_frame’: drivers/media/video/gspca/gspca.c:305:9: warning: ‘len’ may be used uninitialized in this function The fix is as simple as moving the len init to happen before the checks. Cc: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 2e94b53c55d00b4d4d4b9e65007566f7fbffab7a Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:55:07 2010 -0300 [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K Fixes several warnings: drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_set_channel’: drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_tune’: drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_set_channel’: drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_tune’: drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ The drivers were prepared to support 4K carriers, but as the define were added later, they were using a "magic" value of 255. Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit d78aa7292ad38b22ccb9cdba99293cedb52fb342 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:47:17 2010 -0300 [media] lirc_zilog: Fix a warning drivers/staging/lirc/lirc_zilog.c: In function ‘send_code’: drivers/staging/lirc/lirc_zilog.c:886:1: warning: label ‘done’ defined but not used Signed-off-by: Mauro Carvalho Chehab commit fce50ac80e38b1d205939ff7d4777536701263a6 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:44:50 2010 -0300 [media] radio-wl1273: Fix two warnings drivers/media/radio/radio-wl1273.c: In function ‘wl1273_fm_upload_firmware_patch’: drivers/media/radio/radio-wl1273.c:675:2: warning: ‘n’ may be used uninitialized in this function drivers/media/radio/radio-wl1273.c:675:2: warning: ‘i’ may be used uninitialized in this function Those vars are never initialized, and the debug message makes no sense, as it will show just two random values. Cc: Matti J. Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 9ae2ae35f8a8a13997b9ec719ae7c151a2182e80 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:41:14 2010 -0300 [media] dmxdev: Fix a compilation warning due to a bad type drivers/media/dvb/dvb-core/dmxdev.c: In function ‘dvb_dmxdev_start_feed’: drivers/media/dvb/dvb-core/dmxdev.c:583:13: warning: comparison between ‘enum dmx_ts_pes’ and ‘enum ’ Signed-off-by: Mauro Carvalho Chehab commit 1035758d5bdcd6c2f7308a35185f1d6f3b6b5443 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:14:52 2010 -0300 [media] feature_removal_schedule.txt: mark VIDIOC_*_OLD ioctls to die There are some old broken definitions of ioctl's, where the read/write arguments were marked wrong. The last one were added on 2.6.6 kernel. Remove them, in order to cleanup some copy_from_user/copy_to_user logic done inside V4L core. Signed-off-by: Mauro Carvalho Chehab commit 0334c8a52a8578f7aef501a14f78004f931efe20 Author: Mauro Carvalho Chehab Date: Mon Dec 27 09:41:05 2010 -0300 [media] staging/lirc: Fix compilation when LIRC=m drivers/staging/lirc/lirc_bt829.c:141: undefined reference to `lirc_register_driver' drivers/built-in.o:(.rodata+0x20f68): undefined reference to `lirc_dev_fop_read' drivers/built-in.o:(.rodata+0x20f7c): undefined reference to `lirc_dev_fop_poll' drivers/built-in.o:(.rodata+0x20f8c): undefined reference to `lirc_dev_fop_open' drivers/built-in.o:(.rodata+0x20f94): undefined reference to `lirc_dev_fop_close' drivers/built-in.o:(.rodata+0x21030): undefined reference to `lirc_dev_fop_open' drivers/built-in.o:(.rodata+0x21038): undefined reference to `lirc_dev_fop_close' This happens when .config is like: CONFIG_LIRC=m CONFIG_IR_LIRC_CODEC=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=y Don't allow that. Signed-off-by: Mauro Carvalho Chehab commit 22efe507705a8437255114f98d0d514524460be0 Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:30:34 2010 -0300 [media] omap_vout: Remove an obsolete comment This comment mentions a field that doesn't exist, and talks about videodev.h that got removed. So, it doesn't make any sense to keep it. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 55fe25b418640fad04190103274841b2c907bacd Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:27:05 2010 -0300 [media] Remove the old V4L1 v4lgrab.c file This example file uses the old V4L1 API. It also doesn't use libv4l. So, it is completely obsolete. A good example already exists at v4l-utils (v4l2grab.c): http://git.linuxtv.org/v4l-utils.git Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1fb03673b9eddb55a08174d0952c0a1c2438997e Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:24:58 2010 -0300 [media] Fix videodev.h references at the V4L DocBook Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 38af87869e7a255b6ba0f41bf53d2e7b0a54d13b Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:13:12 2010 -0300 [media] Documentation/ioctl/ioctl-number.txt: Remove some now freed ioctl ranges The V4L1 removal patches removed a few ioctls. Update it at the docspace. Signed-off-by: Mauro Carvalho Chehab commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:47:54 2010 -0300 [media] V4L1 removal: Remove linux/videodev.h There's no sense on keeping it on 2.6.38, as nobody is using it anymore, at the kernel tree, and installing it at the userspace API. As two deprecated drivers still need it, move it to their internal directories. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 58c66df3e38ffb1d59cc5162bb9e07c859288034 Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:38:48 2010 -0300 [media] Remove VIDEO_V4L1 Kconfig option There's no sense on keeping VIDEO_V4L1 Kconfig option just because of two deprecated drivers moved to staging scheduled to die on 2.6.39. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:33:41 2010 -0300 [media] staging: Add TODO files for se401 and usbvideo/vicam Signed-off-by: Mauro Carvalho Chehab commit ddda424999817fbc17adf9013feb066903382ede Author: Andy Walls Date: Sun Dec 19 21:59:56 2010 -0300 [media] ivtv: Return EFAULT when copy_from_user() fails in ivtv_write_vbi_from_user() If write() on a VBI device node fails due to a bad buffer pointer from userspace, we should notify the application properly with EFAULT, per the V4L2 API spec. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b0c45686c8e8aecc7b0cd04d9b6af48d74418d53 Author: Andy Walls Date: Sat Dec 18 10:48:17 2010 -0300 [media] ivtv: ivtv_write_vbi() should use copy_from_user() for user data buffers ivtv_write_vbi() is used for both VBI data that came from the driver internally and VBI data that came from the user. However, it did not use copy_from_user() for reading the VBI data from the user buffers. This change adds a new version of the function, ivtv_write_vbi_from_user(), that uses copy_from_user() to read the VBI data provided via user buffers. This should resolve a sparse build warning reported by Dave Gilbert. Reported-by: Dr. David Alan Gilbert Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 754f9969c323559a12bce1475f3c1e6574129856 Author: Andy Walls Date: Sat Dec 11 20:38:20 2010 -0300 [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream The cx18_stream struct contained a struct cx18_dvb for every stream object, most of which were for analog capture. Now we only allocate the cx18_dvb object for the DTV TS stream. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit fa98447f09641adeeaf02b94133649f03b74d159 Author: Andy Walls Date: Sat Dec 11 12:31:45 2010 -0300 [media] ivtv, cx18: Make ioremap failure messages more useful for users The error messages these drivers emitted for ioremap() failures were misleading and not helpful for users. Reworded those messages to help the user take action to resolve vmalloc address space exhaustion. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0a58d713062fb49952b9b082514a48a0c83b269d Author: Hans Verkuil Date: Sat Dec 25 08:01:38 2010 -0300 [media] stk-webcam: remove V4L1 compatibility code, replace with V4L2 controls Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 439105b122dfa21fbce7201d0f30b5eeac95c918 Author: Hans Verkuil Date: Sat Dec 25 07:46:56 2010 -0300 [media] feature-removal: update V4L1 removal status While the V4L1 compatibility module has been removed, we still have two V4L1 drivers that prevent full V4L1 removal. Those drivers have been moved to staging and will be removed in 2.6.39, together with the last V4L1 support. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 39c3d488452ae206cfc8afda0db041ee55d01c3c Author: Hans Verkuil Date: Sat Dec 25 07:44:33 2010 -0300 [media] cpia, stradis: remove deprecated V4L1 drivers Nobody stepped in to convert these drivers to V4L2, so they are now removed from the kernel. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809 Author: Hans Verkuil Date: Sat Dec 25 07:36:55 2010 -0300 [media] se401: deprecate driver, move to staging The se401 driver is deprecated and is moved to staging. If no one will convert this driver to V4L2, then it will be removed in 2.6.39. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 745da4280f272840976d47afba22ed853f07e1b2 Author: Hans Verkuil Date: Sat Dec 25 07:27:47 2010 -0300 [media] usbvideo: deprecate the vicam driver Move usbvideo to staging and mark it deprecated. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5772dcaa790851ec068afcd0d1f160d801b1126e Author: Hans Verkuil Date: Sat Dec 25 07:20:34 2010 -0300 [media] usbvideo: remove deprecated drivers Remove ibmcam, konicawc and ultracam drivers. There are replaced by gspca drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7 Author: Hans Verkuil Date: Sat Dec 25 07:15:22 2010 -0300 [media] documentation: update some files to reflect the V4L1 compat removal Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 41d9931c5ae014fbab8bf612c70b8e7ff16f4641 Author: Hans Verkuil Date: Sat Dec 25 07:04:16 2010 -0300 [media] videobuf-dma-sg: remove obsolete comments Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3 Author: Hans Verkuil Date: Sat Dec 25 06:58:01 2010 -0300 [media] zoran: remove V4L1 compat code and zoran custom ioctls All the functionality is now handled through V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 08af245de0cf6ab5f4ed008ee2bb99273774fce0 Author: Hans Verkuil Date: Fri Dec 24 10:33:19 2010 -0300 [media] V4L: remove V4L1 compatibility mode Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b69a219e0e97441dbeb0262cf85468b61a161399 Author: Jean-François Moine Date: Sat Dec 25 14:01:42 2010 -0300 [media] gspca - ov534_9: Remove an useless instruction Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7a5a414ccb5bfc0fe277ef1a0e9d1e492a6f083c Author: Jean-François Moine Date: Sat Dec 25 13:58:45 2010 -0300 [media] gspca - ov519: Bad detection of some ov7670 sensors Tested-by: jim smyth Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 668f44a603dd4b3468cecd7d8d6dc525207db94e Author: Jean-François Moine Date: Sat Dec 25 13:46:14 2010 -0300 [media] gspca: Use the global error status for get/set streamparm Also, in ov534, don't check the parm type. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 76ebc16b87592350e4ea70681855171adf73f055 Author: Jean-François Moine Date: Sat Dec 25 13:22:21 2010 -0300 [media] gspca - main: Check the isoc packet status before its length When an error is set for an isochronous packet, the length of the packet may be null. In this case, the error was not detected and the image was not discarded as it should be. Reported-by: Franck Bourdonnec Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f2c5d92ecd4c69a4f86e76d19cb7663f2ebf4781 Author: Jean-François Moine Date: Sat Dec 25 13:19:59 2010 -0300 [media] gspca - sq930x: Fix a bad comment Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit efd3769269f2ef9a0ad452ea8298b3edcb2f5a62 Author: Jean-François Moine Date: Sat Dec 25 13:11:54 2010 -0300 [media] gspca - sq930x: Some detected sensors are not handled yet These are OmniVision's OV7660 and OV9630. Don't register the webcam when they are found. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 3ebd17946448df50b9082412d09955c87a112721 Author: Jean-François Moine Date: Sat Dec 25 13:07:57 2010 -0300 [media] gspca - sq930x: Don't register a webcam when there are USB errors Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 634b4770539de63581ccdb554426547ced6ded01 Author: Theodore Kilgore Date: Fri Dec 24 17:06:04 2010 -0300 [media] gspca - sq905c: Adds the Lego Bionicle This patch adds the Vendor:Product number of the Lego Bionicle camera to the existing gspca/sq905c.c and also a line for the camera in gspca.txt. The camera works "out of the box" with these small changes. So this is just in time for Christmas. Think of the children. Signed-off-by: Theodore Kilgore Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a19a5cd7b328ae457f79092e711d4bd888e1ca50 Author: Pete Eberlein Date: Mon Dec 20 19:18:59 2010 -0300 [media] s2255drv: remove BKL Remove BKL ioctl and use unlocked_ioctl with core-assisted locking instead. Signed-off-by: Pete Eberlein Signed-off-by: Mauro Carvalho Chehab commit 07e80305babb27a332ce0f04a3c38ce495cbe711 Author: Marek Szyprowski Date: Mon Dec 20 14:39:25 2010 -0300 [media] v4l: mem2mem_testdev: remove BKL usage Remove usage of BKL by usign per-device mutex. Signed-off-by: Marek Szyprowski CC: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit dcd745b723efc875ec5a8f44be028bd0704b12d6 Author: Dan Carpenter Date: Mon Dec 20 09:53:16 2010 -0300 [media] timblogiw: too large value for strncpy() This is a copy and paste error. It should be using sizeof(cap->driver) instead of sizeof(cap->card). Signed-off-by: Dan Carpenter Cc: Richard Rojförs Signed-off-by: Mauro Carvalho Chehab commit ef330dc2e794c932fcbde3f8abd3f12780d78b47 Author: Jesper Juhl Date: Sat Dec 18 19:05:02 2010 -0300 [media] saa7164: Remove pointless conditional and save a few bytes in saa7164_downloadfirmware() Hi, release_firmware() just does nothing if passed a NULL pointer. So there's no reason to test before the call in saa7164-fw.c::saa7164_downloadfirmware(). Removing the pointless conditional also saves a few bytes. before: text data bss dec hex filename 7943 112 2144 10199 27d7 drivers/media/video/saa7164/saa7164-fw.o after: text data bss dec hex filename 7931 112 2136 10179 27c3 drivers/media/video/saa7164/saa7164-fw.o Signed-off-by: Jesper Juhl Cc: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 10304ca65f8871ad9f6725a7480522034184f55f Author: Sam Doshi Date: Sat Dec 18 12:58:54 2010 -0300 [media] drivers:media:dvb: add USB PIDs for Elgato EyeTV Sat Adds USB PIDs for the Elgato EyeTV Sat device. This device is a clone of the Terratec S7. Signed-off-by: Sam Doshi Signed-off-by: Mauro Carvalho Chehab commit c3353330508aee4390442df2d7f6ce0ef5006185 Author: Anatolij Gustschin Date: Fri Dec 17 06:40:50 2010 -0300 [media] media: fsl-viu: fix support for streaming with mmap method Streaming using mmap didn't work in the VIU driver. We need to start/stop DMA in streamon/streamoff and free the buffers on release. Add appropriate driver extension now. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit 2a72b39e516bf772e707d5a080d5d07b1c8ac0c0 Author: Dan Carpenter Date: Fri Dec 10 09:39:34 2010 -0300 [media] zoran: bit-wise vs logical and zr->frame_num is a counter and && was intended here instead of &. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 75aecc3af22ae9063c96457d530f281a1e2d3276 Author: Malcolm Priestley Date: Tue Dec 7 19:49:24 2010 -0300 [media] DM04/QQBOX Frontend attach change On Fri, 2010-12-03 at 09:32 -0200, Mauro Carvalho Chehab wrote: > Em 27-11-2010 11:13, Malcolm Priestley escreveu: > > Driver Version v1.73 - Frontend attach change. > > To stop double rc registration in multi tuner environment or firmware change. > > > > Signed-off-by: Malcolm Priestley > > > > > > +static int lme_name(struct dvb_usb_adapter *adap) > > +{ > > + struct lme2510_state *st = adap->dev->priv; > > + const char *desc = adap->dev->desc->name; > > + char *fe_name[] = {"", " LG TDQY-P001F", " SHARP:BS2F7HZ7395"}; > > + char *name = adap->fe->ops.info.name; > > + > > + strcpy(name, desc); > > + strcat(name, fe_name[st->tuner_config]); > > Please use, instead, strlcpy/strlcat, to avoid writing outside the buffer size. > Driver Version v1.74 Amended patch with change to strlcpy/strlcat. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit c59a9bfabfc2a6359f046652c6bfa0a82fb17a05 Author: Randy Dunlap Date: Tue Dec 7 15:50:09 2010 -0300 [media] media: fix em28xx build, needs hardirq.h Fix em28xx build by adding hardirq.h header file: drivers/media/video/em28xx/em28xx-vbi.c:49: error: implicit declaration of function 'in_interrupt' Reported-by: Zimny Lech Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 4c8b8698053c986f5f5249878eab70cb028a1023 Author: Vasiliy Kulikov Date: Fri Nov 26 14:06:35 2010 -0300 [media] rc: ir-lirc-codec: fix potential integer overflow 'n' may be bigger than MAX_INT*sizeof(int), if so checking of truncated (int)(n/sizeof(int)) for LIRCBUF_SIZE overflow and then using nontruncated 'count' doesn't make sense. Also n may be up to sizeof(int)-1 bytes bigger than expected, so check value of (n % sizeof(int)) too. Signed-off-by: Vasiliy Kulikov Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 87d1a50ce45168cbaec10397e876286a398052c1 Author: Matti Aaltonen Date: Fri Dec 10 11:41:34 2010 -0300 [media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver This module implements V4L2 controls for the Texas Instruments WL1273 FM Radio and handles the communication with the chip. Signed-off-by: Matti J. Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 383268a8e282fb549dabe3a33ccafc9434ab6006 Author: Matti Aaltonen Date: Fri Dec 10 11:41:33 2010 -0300 [media] MFD: WL1273 FM Radio: MFD driver for the FM radio This is the core of the WL1273 FM radio driver, it connects the two child modules. The two child drivers are drivers/media/radio/radio-wl1273.c and sound/soc/codecs/wl1273.c. The radio-wl1273 driver implements the V4L2 interface and communicates with the device. The ALSA codec offers digital audio, without it only analog audio is available. Signed-off-by: Matti J. Aaltonen Acked-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit 00765f16f116b45aa67de306ac923ed4ba262bf9 Author: Hans de Goede Date: Sun Dec 12 15:55:03 2010 -0300 [media] gspca_sonixb: Add support for 0c45:602a Add support for cameras with the HV7131D sensor, such as the 0c45:602a Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2b3e284a89dfa53eb42b6470e4c03e5ddfdb24c5 Author: Hans de Goede Date: Sun Dec 12 08:55:04 2010 -0300 [media] gspca_sonixb: Rewrite start of frame detection Our old start of frame detection code wrongly assumes that the sof marker always lives at the beginning of the frame. At least for the 0c45:602a camera this is not the case. This patch also improves the framerate from 28 fps to 30 fps with the 0c45:6005 and 0c45:6007 Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit d6746d55da0819edbe913a1447b1ab0e7b440241 Author: Hans de Goede Date: Fri Dec 10 12:28:15 2010 -0300 [media] gspca_sonixb: Make sonixb handle 0c45:6007 instead of sn9c102 I've a 0c45:6007 camera and it works fine with the gspca_sonixb driver, so make that handle it instead of the deprecated sn9c102 driver. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 788e5d4dc825ffc2eb863272d9a57fb93490dd92 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:47:27 2010 -0300 [media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybrid Signed-off-by: Mauro Carvalho Chehab commit 12007419b766b316998499bd07c6586928230729 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:39:29 2010 -0300 [media] Add a keymap for Pixelview 002-T remote Signed-off-by: Mauro Carvalho Chehab commit e330289ed40f76819d6a13e682203c6fc9a86304 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:22:09 2010 -0300 [media] cx231xx: Fix inverted bits for RC on PV Hybrid At Pixelview SBTVD Hybrid, the bits sent by the IR are inverted. Due to that, the existing keytables produce wrong codes. Signed-off-by: Mauro Carvalho Chehab commit 49aefd2bcda80d33497f0f26702c67e372cacef3 Author: Stephen Rothwell Date: Mon Nov 22 23:35:17 2010 -0300 [media] timblogiw: const and __devinitdata do not mix This fixes the following error in PowerPC builds: drivers/media/video/timblogiw.c: In function 'timblogiw_probe': drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict Signed-off-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab commit d162e7aac24bfd8b96881582368f976e7e464c25 Author: Mauro Carvalho Chehab Date: Tue Dec 7 19:39:33 2010 -0300 [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor Support for mt9m001 (mi1300) is broken: - Table is incomplete; - Only one resolution is currently supported by the driver; - Resolution is incomplete; - it complains about broken JPEG headers. Use the same init found on em28xx driver, and properly report the output format as 8-bits GRAY. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d4b416f26279bbbe07faaff1c9cd19d6b3709b2e Author: Mauro Carvalho Chehab Date: Tue Dec 7 17:19:09 2010 -0300 [media] gspca core: Fix regressions gspca breaking devices with audio Changeset 35680ba broke several devices: - Sony Playstation Eye (1415:2000); - Gigaware model 25-234 (0c45:628f); - Logitech Messenger Plus (046d:08f6). Probably more devices were broken by this change. What happens is that several devices don't need to save some bandwidth for audio. Also, as pointed by Hans de Goede , the logic that implements the bandwidth reservation for audio is broken, since it will reduce the alt number twice, on devices with audio. So, let's just revert the broken logic, and think on a better solution for usb 1.1 devices with audio that can't use the maximum packetsize. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 86701c1d6a3ecae2f0e6771c730364d334d5a142 Author: Mauro Carvalho Chehab Date: Tue Dec 7 14:47:10 2010 -0300 [media] gspca/sn9c20x: Get rid of scale "magic" numbers Use macros for the supported scales, instead of using magic numbers from 0 to 3. Code become cleaner by using macros for it. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit e78567d227ecd40543508342ba39a3dfba5af14f Author: Mauro Carvalho Chehab Date: Mon Dec 6 06:53:05 2010 -0300 [media] gspca/sn9c20x: Test if sensor is a OV sensor Instead of just assuming a ov9650 sensor based on USB ID, double-check it, by reading the sensor ID. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit dd89aec47325a251eeaf39ee4b84adb521270cba Author: Richard Zidlicky Date: Wed Dec 1 20:52:49 2010 -0300 [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick Add kycodes for DSR-0112 remote that comes together with Haupauge MiniStick http://lirc.sourceforge.net/remotes/hauppauge/DSR-0112.jpg [mchehab@redhat.com: Fix KEY_PREVIOUS to match the definition for the other model] Signed-off-by: Richard Zidlicky Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 8350e1551c27ee784ded579fd224846972d4b0d3 Author: Joe Perches Date: Tue Nov 30 18:42:07 2010 -0300 [media] media: Remove unnecessary casts of usb_get_intfdata Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 9124544320bd36d5aa21769d17a5781ba729aebf Author: Philippe Bourdin Date: Sun Oct 31 09:57:58 2010 -0300 [media] Terratec Cinergy Hybrid T USB XS I found that the problems people have reported with the USB-TV-stick "Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042) are coming from a wrong header file in the v4l-sources. Attached is a diff, which fixes the problem (tested successfully here). Obviously the USB-ID has been associated with a wrong chip: EM2880 instead of EM2882, which would be correct. Reported-by: Philippe Bourdin Signed-off-by: Mauro Carvalho Chehab commit b395cbac36e58a55729fe7e6262a3f0b1691bced Author: Vasiliy Kulikov Date: Fri Nov 26 14:06:41 2010 -0300 [media] media: rc: lirc_dev: check kobject_set_name() result kobject_set_name() may fail with -ENOMEM, check for it. Signed-off-by: Vasiliy Kulikov Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 801c73c04ad57689dc9b47baf62cbb23f954d987 Author: David Härdeman Date: Thu Nov 25 18:36:27 2010 -0300 [media] rc-core: add loopback driver This patch adds a loopback driver to rc-core which I've found useful for running scripted tests of different parts of rc-core without having to fiddle with real hardware. Basically it emulates hardware with a learning and a non-learning receiver and two transmitters (which correspond to the two receivers). TX data that is sent is fed back as input on the corresponding receiver, which allows for debugging of IR decoders, keymaps, etc. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit dea8a39fb569c23084c857ccdbf70a95ea3bf7dc Author: Mauro Carvalho Chehab Date: Mon Nov 29 07:46:13 2010 -0300 [media] rc-core: Initialize return value to zero At ir_setkeycode, if INPUT_KEYMAP_BY_INDEX is used, the routine may return an invalid value if not error. Signed-off-by: Mauro Carvalho Chehab commit b7c7a4bed8d695933ae172031556de9de30ae598 Author: Mauro Carvalho Chehab Date: Sun Nov 28 11:48:26 2010 -0300 [media] bttv: remove custom_irq and gpioq from bttv struct The RC5 old decoder used custom_irq to indicate the need of handling the IRQ on a different way. Instead of doing it, let the core just call the bttv input IRQ handler, and add the code there to call the legacy decoder. While here, remove the gpioq waitqueue, as this is not used anywhere, and add a debug msg to help removing the legacy RC5 code. Signed-off-by: Mauro Carvalho Chehab commit 5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7 Author: Dan Carpenter Date: Thu Nov 18 00:56:37 2010 -0300 [media] cx231xx: stray unlock on error path The lock isn't held here and doesn't need to be unlocked. The code has been like this since the driver was merged. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed Author: Paul Bender Date: Wed Nov 17 16:56:17 2010 -0300 [media] rc: fix sysfs entry for mceusb and streamzap When trying to create persistent device names for mceusb and streamzap devices, I noticed that their respective drivers are not creating the rc device as a child of the USB device. Rather it creates it as virtual device. As a result, udev cannot use the USB device information to create persistent device names for event and lirc devices associated with the rc device. Not having persistent device names makes it more difficult to make use of the devices in userspace as their names can change. Forward-ported to media_tree staging/for_v2.6.38 and tested with both streamzap and mceusb devices: $ ll /dev/input/by-id/ ... lrwxrwxrwx. 1 root root 9 Nov 17 17:06 usb-Streamzap__Inc._Streamzap_Remote_Control-event-if00 -> ../event6 lrwxrwxrwx. 1 root root 9 Nov 17 17:05 usb-Topseed_Technology_Corp._eHome_Infrared_Transceiver_TS000BzY-event-if00 -> ../event5 Previously, nada. Signed-off-by: Paul Bender Tested-by: Jarod Wilson Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 5df465df7bd9c352289ca63d4d9f78299be72c7d Author: Nicolas Kaiser Date: Fri Nov 19 17:42:40 2010 -0300 [media] drivers/media: nuvoton: fix chip id probe v2 Make sure we have a matching chip id high and one or the other of the chip id low values. Print the values if the probe fails. Signed-off-by: Nicolas Kaiser Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit ecfc95eb7410c04c23f59b02931e8f8b3aa4a5b3 Author: Joe Perches Date: Mon Nov 15 17:13:54 2010 -0300 [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit b1dc614a81258eb7ff482892e7bc894f1089c144 Author: Joe Perches Date: Mon Nov 15 00:04:28 2010 -0300 [media] drivers/media/video: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit a363436396ad68509db4513c886055cc067a184c Author: Alexey Chernov <4ernov@gmail.com> Date: Thu Oct 28 18:12:02 2010 -0300 [media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid tuner I've got code which adds support of GoTView PCI DVD3 Hybrid tuner in cx18 module and Andy Walls in ivtv mailing-list gave me some advice on making a patch and sending it here. So here's the patch against staging/2.6.37-rc1 branch (the tutorial recommends to include it as plain text but if it's the case I can surely send as an attachment): Several comments on the patch: 1. Both users on the official Gotview forum and support said that PCI DVD3 is very similar to Yuan MPC718 card so the main part of code is taken from Yuan configuration. Some users reported it to work properly. 2. Everything is being initialized correctly including analog, dvb, radio and alsa parts. Analogue part and alsa virtual card is tested by myself using original Gotview card. [mchehab@redhat.com: Whitespace cleanups] Signed-off-by: Alexey Chernov <4ernov@gmail.com> Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 97108cf682566a79ad49f165435bddbb91844d9a Author: Mauro Carvalho Chehab Date: Mon Nov 22 15:50:51 2010 -0300 [media] Fix parameter description for disable_ir It seems that a wrong cut-and-paste error were done here. Reported-by: Jeremy Kerr Signed-off-by: Mauro Carvalho Chehab commit eac8ae087ac66b21de94fee3e920210b43d43076 Author: Mariusz Białończyk Date: Mon Nov 15 15:50:13 2010 -0300 [media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core The patch fixes the rc-tbs-nec table after converting drivers/media/video/cx88 to ir-core (commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec). It is also adds two missing buttons (10- and 10+) with its definition (KEY_10CHANNELSUP and KEY_10CHANNELSDOWN). [mchehab@redhat.com: move keycode numbers to 0x1b8/0x1b9 as requested by the input Maintainer] Signed-off-by: Mariusz Białończyk Signed-off-by: Mauro Carvalho Chehab commit 0e835087dfe7db19f1f072046f5e116d4ec6662b Author: Dan Carpenter Date: Wed Nov 17 02:13:39 2010 -0300 [media] lirc_dev: add some __user annotations Sparse complains because there are no __user annotations. drivers/media/rc/lirc_dev.c:156:27: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/media/rc/lirc_dev.c:156:27: expected int ( *read )( ... ) drivers/media/rc/lirc_dev.c:156:27: got int ( extern [toplevel] * )( ... ) Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 829ba9fe34246f1f5e813b6bf84171d36e776734 Author: David Härdeman Date: Fri Nov 19 20:43:27 2010 -0300 [media] rc-core: fix some leftovers from the renaming patches Fix some minor comments etc which are leftover from the old naming scheme. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2 Author: David Härdeman Date: Fri Nov 19 20:43:17 2010 -0300 [media] bttv: merge ir decoding timers Similarly to saa7134, bttv_ir has two timers, only one of which is used at a time and which serve the same purpose. Merge them. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit edb4c25ca3a7997660500692eca3510eac9726e5 Author: David Härdeman Date: Fri Nov 19 20:43:12 2010 -0300 [media] bttv: rename struct card_ir to bttv_ir bttv_ir is more consistent with all other structs used in the same driver. Also, clean up the struct to remove commented out members and the work_struct which is unused. [mchehab@redhat.com: fix a warning at bttv_rc5_timer_end] Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 7c8352d18ddbe37cff8ad71175a11739662ef899 Author: David Härdeman Date: Fri Nov 19 20:42:57 2010 -0300 [media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end Both timers are used for a similar purpose. Merging them allows for some minor simplifications. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9 Author: David Härdeman Date: Fri Nov 19 20:42:51 2010 -0300 [media] saa7134: some minor cleanups Mostly using appropriate data types and constants (e.g. int -> bool). Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit b0ddb0f364f926785f50a8cea8a399ba63e3c227 Author: David Härdeman Date: Fri Nov 19 20:42:46 2010 -0300 [media] saa7134: use full keycode for BeholdTV Using the full keycode for BeholdTV hardware makes another module parameter unnecessary. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit a29df8579ab2779605b181a38ac7fb99796666df Author: David Härdeman Date: Fri Nov 19 20:42:41 2010 -0300 [media] saa7134: remove unused module parameter ir_rc5_remote_gap is a leftover from ir-common, remove it. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 622d9f5d302e99dc7a06cb442e9d9ff2bb0f59b5 Author: Hans de Goede Date: Tue Nov 16 12:32:09 2010 -0300 [media] pwc: failure to submit an urb is a fatal error Failure to submit an urb is a fatal error, make isoc_init return an error when this happens rather then only log it. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c7d18867c82657a97f0bdb90ba1151b251b6a29b Author: Hans de Goede Date: Tue Nov 16 12:26:00 2010 -0300 [media] pwc: Also set alt setting to alt0 when no error occured isoc_cleanup contains a check to not set the altsetting to alt0 when the device was unplugged, but the check currently is buggy, and causes the alt setting to only be set to 0 if an error occured while streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 3751e288bcf3d77652ef979edc0b3ea8b21d8b97 Author: Hans de Goede Date: Tue Nov 16 11:39:25 2010 -0300 [media] pwc: do not start isoc stream on /dev/video open pwc was starting streaming on /dev/video# open rather then on STREAM_ON. Now that the v4l1 compat code is removed from the pwc driver there is no reason left to do this. So this patch changes the pwc driver to delay starting the isoc stream (and thus using valuable usb bandwidth) until the application does a STREAM_ON Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit a931910d3be6f63464befb2dde94ec58a6eaf5c1 Author: Mauro Carvalho Chehab Date: Mon Nov 22 13:22:37 2010 -0300 [media] stb6100: warning cleanup drivers/media/dvb/frontends/stb6100.c:120: warning: ‘stb6100_normalise_regs’ defined but not used Signed-off-by: Mauro Carvalho Chehab commit 03c9a806e30c3904e5b5702874eebc1a4f2082bd Author: Mauro Carvalho Chehab Date: Wed Nov 17 16:05:05 2010 -0300 [media] rc: Rename IR raw interface to ir-raw.c Signed-off-by: Mauro Carvalho Chehab commit d100e659b61a735c3343b3d82c1c009b04072cdd Author: Mauro Carvalho Chehab Date: Wed Nov 17 15:56:53 2010 -0300 [media] rc: use rc_map_ prefix for all rc map tables Signed-off-by: Mauro Carvalho Chehab commit 2f4f58d689dd71dea67407b74405a3c43e797cb1 Author: Mauro Carvalho Chehab Date: Wed Nov 17 15:46:09 2010 -0300 [media] rc: Name RC keymap tables as rc_map_table Remote keytables had different names all over the place. Part of the fault is due to a bad naming when rc subsystem was created, but there were lots of old names that were still here. Use a common standard for everything. Patch generated by this script: for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode,rc_map_table,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_codes_,rc_map_,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_key_map,rc_map_table,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_map_table_size,rc_map_size,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab commit b088ba658b3438056dab4d744701364db3f08b9a Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:28:27 2010 -0300 [media] rc: Properly name the rc_map struct The struct that describes a rc mapping had an weird and long name. We should properly name it, to make easier for developers to work with it, and to avoid confusion. Basically, generated by this script: for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode_table,rc_map,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_tab,rc_map,g <$i >a && mv a $i; done (and manually fixed where needed) Signed-off-by: Mauro Carvalho Chehab commit 52b661449aecc47e652a164c0d8078b31e10aca0 Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:20:52 2010 -0300 [media] rc: Rename remote controller type to rc_type instead of ir_type for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab commit 29e3ec19d5c88d534ced219d3962d67243e4d310 Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:12:46 2010 -0300 [media] cx231xx: Properly name rc_map name rc_map is confusing, as it may be understood as another thing. Properly rename the field to indicate its usage. Signed-off-by: Mauro Carvalho Chehab commit ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841 Author: Mauro Carvalho Chehab Date: Wed Nov 17 13:53:11 2010 -0300 [media] Rename all public generic RC functions from ir_ to rc_ Those functions are not InfraRed specific. So, rename them to properly reflect it. Signed-off-by: Mauro Carvalho Chehab commit 6bda96447cef24fbf97a798b1ea664224d5fdc25 Author: Mauro Carvalho Chehab Date: Wed Nov 17 13:28:38 2010 -0300 [media] rc: rename the remaining things to rc_core The Remote Controller subsystem is meant to be used not only by Infra Red but also for similar types of Remote Controllers. The core is not specific to Infra Red. As such, rename: - ir-core.h to rc-core.h - IR_CORE to RC_CORE - namespace inside rc-core.c/rc-core.h To be consistent with the other changes. No functional change on this patch. Signed-off-by: Mauro Carvalho Chehab commit a6e3b81f6198654207c4e972e7ed91931e53e93c Author: Mauro Carvalho Chehab Date: Wed Nov 17 10:05:29 2010 -0300 [media] rc: Remove ir-common.h Signed-off-by: Mauro Carvalho Chehab commit bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22 Author: Mauro Carvalho Chehab Date: Wed Nov 17 09:58:09 2010 -0300 [media] rc: remove ir-common module Something weird happened with commit 740069e6e043403199dbe2b42256722fb814f6ae. Instead of dong the right thing, it got somehow corrupted and reverted the rc changes. Thanks to David Härdeman for pointing me about the problem. This patch should be merged with 740069e6e04 before sending upstream. Signed-off-by: Mauro Carvalho Chehab commit 1697c8dfba72fd182d670a68dca157f64dd3b1f2 Author: Manu Abraham Date: Sun Nov 14 16:01:47 2010 -0300 [media] stb0899: fix diseqc messages getting lost - Some badly written applications in conjuction with certain SEC devices do send too many messages causing the DiSEqC bus to get congested. As a result, the end devices do get confused and hence do not respond. The issue was found by Julian Scheel. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit f14bfe94e459cb070a489e1786f26d54e9e7b5de Author: Manu Abraham Date: Sun Nov 14 15:52:10 2010 -0300 [media] stb6100: Improve tuner performance - Reduce the amount of white noise present, which causes the demodulator a significant time to acquire a frontend lock on a whole. Frontend shows a large significant improvement in performance. Thanks to Peter Nayler for helping to identify the potential hotspots and fixing them. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3037fd14302d635426996fb7f6fcf7cb98dc15b9 Author: Ben Hutchings Date: Sun Nov 14 14:56:00 2010 -0300 [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits This function is declared extern and exported, and should not be given a generic name which may conflict with gpiolib in future. Signed-off-by: Ben Hutchings Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit a22407faba57c3624beea1a9fad7cbdcf5a19a1a Author: Bjørn Mork Date: Sun Nov 14 14:24:36 2010 -0300 [media] Mantis: use dvb_attach to avoid double dereferencing on module removal Convert the driver to use the dvb_attach macro to avoid the hard dependency on the frontend drivers. The hard dependecy will result in loading a number of unused frontends, and unwanted automatic dereferencing. This fixes a bug where unloading the mantis driver will derefence any attached frontend twice, which will cause an oops if the same frontend is used by another driver. Signed-off-by: Bjørn Mork Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9c81496a88b04206d0607b23b298b6529da1fcb0 Author: Marko Ristola Date: Sun Nov 14 14:09:04 2010 -0300 [media] Mantis: append tasklet maintenance for DVB stream delivery After dvb-core has called mantis-fe->stop_feed(dvbdmxfeed) the last time (count to zero), no data should ever be copied with dvb_dmx_swfilter() by a tasklet: the target structure might be in an unusable state. Caller of mantis_fe->stop_feed() assumes that feeding is stopped after stop_feed() has been called, ie. dvb_dmx_swfilter() isn't running, and won't be called. There is a risk that dvb_dmx_swfilter() references freed resources (memory or spinlocks or ???) causing instabilities. Thus tasklet_disable(&mantis->tasklet) must be called inside of mantis-fe->stop_feed(dvbdmxfeed) when necessary. Signed-off-by: Marko Ristola Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 116d588ea21cf0278a4de1e3272e9c3220a647e7 Author: Manu Abraham Date: Thu Feb 11 04:11:05 2010 -0300 [media] Mantis, hopper: use MODULE_DEVICE_TABLE use the macro to make modules auto-loadable Thanks to Ozan Çağlayan for pointing it out Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit e6f199f3e7e10112adfa80700ecc00b056b5a62e Author: Wolfram Sang Date: Wed Nov 10 09:28:19 2010 -0300 [media] i2c: Remove obsolete cleanup for clientdata A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit. This is obsolete meanwhile, so fix it and hope the word will spread. Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915 Author: Wolfram Sang Date: Wed Nov 10 11:14:13 2010 -0300 [media] media: video: do not clear 'driver' from an i2c_client The i2c-core does this already. Reported-by: Jean Delvare Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 9a9dcb4a19c29ec01e7d249e3dae2d589af86480 Author: Jesper Juhl Date: Mon Nov 8 20:08:41 2010 -0300 [media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc function return values Hi, The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from drivers/media/ Signed-off-by: Jesper Juhl Signed-off-by: Mauro Carvalho Chehab commit 9c0147b6941e082f52dcbb9688d0e6e5f359744f Author: Randy Dunlap Date: Wed Nov 24 16:41:09 2010 -0300 [media] timblogiw: fix kconfig & build error timblogiw uses dma() interfaces and it selects TIMB_DMA for that support. However, drivers/dma/ is not built unless CONFIG_DMA_ENGINE is enabled, so select/enable that symbol also. drivers/built-in.o: In function `timblogiw_close': timblogiw.c:(.text+0x4419fe): undefined reference to `dma_release_channel' drivers/built-in.o: In function `buffer_release': timblogiw.c:(.text+0x441a8d): undefined reference to `dma_sync_wait' drivers/built-in.o: In function `timblogiw_open': timblogiw.c:(.text+0x44212b): undefined reference to `__dma_request_channel' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c091575c8b35b39b8f271e0d4b692329a705240a Author: Richard Röjfors Date: Mon Nov 8 10:45:48 2010 -0300 [media] mfd: Add timberdale video-in driver to timberdale This patch defines platform data for the video-in driver and adds it to all configurations of timberdale. Signed-off-by: Richard Röjfors Acked-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit 9eae42e5a216059a146b3fbbe24b4fdc0b10c723 Author: Richard Röjfors Date: Mon Nov 8 10:45:44 2010 -0300 [media] media: Add timberdale video-in driver This patch adds the timberdale video-in driver. The video IP of timberdale delivers the video data via DMA. The driver uses the DMA api to handle DMA transfers, and make use of the V4L2 video buffers to handle buffers against user space. If available the driver uses an encoder to get/set the video standard Signed-off-by: Richard Röjfors Signed-off-by: Mauro Carvalho Chehab commit 36d89f7de4a4937848de86d9b35cb03a9f0357e1 Author: Joe Perches Date: Sun Nov 7 17:48:21 2010 -0300 [media] drivers/staging/cx25821: Use pr_fmt and pr_ Fix several defects with bad line continuation uses that introduce whitespace. Fix several defects with lines missing "\n". Standardize prefixes via pr_fmt. Remove internal cx25821 prefixes. Standardize :%s():" ... __func__ uses. Coalesce long formats. Add KERN_ prefixes via pr_ to printks. Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 13d28e4917fb6cf6898e8998f01ab83b3f468aeb Author: Matthias Schwarzott Date: Sun Nov 7 10:57:13 2010 -0300 [media] IX2505V: i2c transfer error code ignored It seems that ix2505v driver ignores a i2c error in ix2505v_read_status_reg. This looks like a typing error using (ret = 1) instead of correct (ret == 1). Acked-by: Malcolm Priestley Signed-off-by: Matthias Schwarzott Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 62c7cdd8a16025e4d5596b8e61352960745f3707 Author: Jean Delvare Date: Sun Nov 7 12:54:39 2010 -0300 [media] TM6000: Drop unused macro Signed-off-by: Jean Delvare Cc: Michel Ludwig Cc: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7bd444ede7285cad4ed5047ff954432325fe7f95 Author: Jean Delvare Date: Sun Nov 7 12:53:44 2010 -0300 [media] TM6000: Clean-up i2c initialization Usage of templates for large structures is a bad idea, as it wastes a lot of space. Manually initializing the few fields we need is way more efficient. Also set the algorithm data const, use strlcpy instead of strcpy, fix a small race (device data must always be set before registering said device) and properly return error on adapter registration failure. Signed-off-by: Jean Delvare Cc: Michel Ludwig Cc: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 8ea43d0a2f87b8460f46ddb7b42b5eb17c5385d2 Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:49:10 2010 -0300 [media] rc: Remove ir-common module Now, just one old bttv board uses the old RC5 raw decoding routines. Its conversion to rc-core requires the generation of IRQ data for both positive and negative transitions at the IRQ line. I'm not sure if bttv driver supports it or if the transitions will be reliable enough. So, due to the lack of hardware for testing, the better for now is to just move the legacy routines to bttv driver, and wait for someone with a Nebula Digi could help to port it to use also rc-core raw decoders. Acked-by: Hermann Pitton Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 6c7e653ff668d939174aa7023736f4a40fd2be08 Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:19:54 2010 -0300 [media] saa7134: Remove legacy IR decoding logic inside the module The only IR left still using the old raw decoders on saa7134 is ENCORE FM 5.3. As it is now using the standard rc-core raw decoders, lots of old code can be removed from saa7134. Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 70de39183a8b5ba0a0cd884ff46c1d81dbe939db Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:23:06 2010 -0300 [media] saa7134: use rc-core raw decoders for Encore FM 5.3 Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit c1937f8e3490fedec2c75383df07cd8a7154c545 Author: Stefan Ringel Date: Tue Nov 9 13:50:28 2010 -0300 [media] tm6000: add revision check adding chip revision check Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 101b25b55ec48354bc40b9102b4f7922c9ad9eae Author: Joe Perches Date: Fri Nov 5 00:07:39 2010 -0300 [media] drivers/media: Use vzalloc Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 42e142f6b72493b5daec9950c4c83d20ccf56a0d Author: Jean-François Moine Date: Sat Nov 13 05:10:27 2010 -0300 [media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519) [mchehab@redhat.com: Some CodingStyle fixes] Tested-by: Anca Emanuel Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7491f785dd02bc35551e0463d798959b15644c1d Author: Jean-François Moine Date: Sat Nov 13 03:56:41 2010 -0300 [media] gspca - ov519: Re-initialize the webcam at resume time Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit b4e96ea30a211c0979e9e0ea10f39dfa50afb8fa Author: Jean-François Moine Date: Fri Nov 12 16:13:17 2010 -0300 [media] gspca - ov519: Initialize the ov519 snapshot register Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 5927abcb21d0dd10c960517453e37302acf2269e Author: Jean-François Moine Date: Fri Nov 12 15:32:29 2010 -0300 [media] gspca - ov519: Change the ov519 start and stop sequences - start and stop streaming are done via the FRAR - streaming suspend (for control change) is done by video reset Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a23acec4bca79f2168a5aeacc8d85386b70ae522 Author: Jean-François Moine Date: Fri Nov 12 15:07:35 2010 -0300 [media] gspca - ov519: Simplify the LED control functions Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e2817029b3f139bd85360536153467bd8f7f863b Author: Jean-François Moine Date: Fri Nov 12 13:59:48 2010 -0300 [media] gspca - ov519: Check the disabled controls at start time only Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 858ea5e941fad6a2f38d0c9722bbb842d46662fb Author: Jean-François Moine Date: Fri Nov 12 13:53:10 2010 -0300 [media] gspca - ov519: Clearer debug and error messages Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f8f20188e863dfb43ac53364da0b8865d37c97e2 Author: Jean-François Moine Date: Fri Nov 12 07:54:02 2010 -0300 [media] gspca - ov519: Propagate errors to higher level Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 83db76886c0b0a32a0c8d35b4dc3dc1d8f1287d4 Author: Jean-François Moine Date: Fri Nov 12 07:14:08 2010 -0300 [media] gspca - ov519: Define the disabled controls in a table Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 218678032589895f29f4ee01b9c330caaab44274 Author: Jean-François Moine Date: Fri Nov 12 06:12:09 2010 -0300 [media] gspca - ov519: Set their numbers in the ov519 and ov7670 register names Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 87bae740fd50df49337017b3ccbed9dbaeaad610 Author: Jean-François Moine Date: Fri Nov 12 05:31:34 2010 -0300 [media] gspca - ov519: Cleanup source - move hexadecimal value to lowercase - remove/add empty lines and spaces - comment unused macros - change some comments Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9be1d6cde936dcf9a325eeee01ed64005c98d456 Author: Nicolas Kaiser Date: Fri Nov 12 04:32:35 2010 -0300 [media] gspca - cpia1: Fix error check It looks to me like it was intended to check the return value at this point. Signed-off-by: Nicolas Kaiser Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7bbe6b8d1f63c2f7482c93d8cd986b1774e6436d Author: Jean-François Moine Date: Thu Nov 11 08:27:24 2010 -0300 [media] gspca - ov519: Define the sensor types in an enum This patch also checks if the sensor is well detected at connection time. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d6fa66384b38165126ce2866b4bdff756c6fc761 Author: Jean-François Moine Date: Thu Nov 11 08:05:50 2010 -0300 [media] gspca - ov519: Reduce the size of some variables Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9d1593a84c09e57a9565baab931a6cf116120e05 Author: Jean-François Moine Date: Thu Nov 11 08:04:06 2010 -0300 [media] gspca - ov519: Change types '__xx' to 'xx' Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d65174c06f2bf4ff73d1c71960be317b89561c06 Author: Jean-François Moine Date: Thu Nov 11 06:20:42 2010 -0300 [media] gspca - ov519: Don't do USB exchanges after disconnection Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 14653e64e9db48e91cbd00fba335a6a459e66cc9 Author: Jean-François Moine Date: Thu Nov 11 06:17:01 2010 -0300 [media] gspca - ov519: Handle the snapshot on capture stop when CONFIG_INPUT=m Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c0b33bdc5b8d9c1120dece660480d4dd86b817ee Author: Hans de Goede Date: Wed Oct 27 09:12:30 2010 -0300 [media] gspca-stv06xx: support bandwidth changing stv06xx devices have only one altsetting, but the actual used bandwidth can be programmed through a register. We were already setting this register lower then the max packetsize of the altsetting indicates. This patch makes the gspca-stv06xx update the usb descriptor for the alt setting to reflect the actual packetsize in use, so that the usb subsystem uses the correct information for scheduling usb transfers. This patch also tries to fallback to lower speeds in case a ENOSPC error is received when submitting urbs, but currently this is only supported with stv06xx cams with the pb0100 sensor, as this is the only one for which we know how to change the framerate. This patch is based on an initial incomplete patch by Lee Jones Signed-off-by: Lee Jones Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit bc25068495b110fcdf35a22f43d32637e99fd018 Author: Steven Toth Date: Fri Nov 12 18:32:36 2010 -0300 [media] saa7164: Checkpatch compliance cleanup Checkpatch compliance cleanup across files in the saa7164 driver. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 0e72cc8b8d48ba05e705f432fb99aaa0ea6737c6 Author: Dan Carpenter Date: Tue Nov 2 00:22:23 2010 -0300 [media] saa7164: make buffer smaller This isn't a runtime bug, it's just to make static checkers happy. In vidioc_querycap() we copy a saa7164_dev ->name driver array into a v4l2_capability -> driver array. The ->driver array is only 16 chars long so ->name also can't be more than 16 characters. The ->name gets set in v4l2_capability() and it always is less than 16 characters so we can easily make the buffer smaller. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 76e4a9a7164263d8ffe816920f84a91e7dfee444 Author: Axel Lin Date: Mon Nov 1 06:25:39 2010 -0300 [media] tea6415c: return -EIO if i2c_check_functionality fails If the adapter does not support I2C_FUNC_SMBUS_WRITE_BYTE, return -EIO instead of 0. Signed-off-by: Axel Lin Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1ce6a1433572c650247480e1bbbca6bd61db7874 Author: Joe Perches Date: Sat Oct 30 18:08:31 2010 -0300 [media] drivers/media/video: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 9e21ccaa69674e1b0aa887722801258f7de842db Author: VDR User Date: Sat Oct 30 15:49:49 2010 -0300 [media] dvb-usb-gp8psk: get firmware and fpga versions This patch adds retrieval of firmware and FPGA versions of Genpix devices. That information is useful for users who experience performance differences with the various firmware versions, and may want to use a specific firmware that best suits their needs. Example dmesg output: gp8psk: FW Version = 2.09.4 (0x20904) Build 2009/04/02 gp8psk: FPGA Version = 1 Signed-off-by: Derek Kelly Signed-off-by: Mauro Carvalho Chehab commit 141bb0dc2d0ad03202aef7c070555cd970ca6bf9 Author: Mauro Carvalho Chehab Date: Thu Nov 11 08:14:16 2010 -0300 [media] cx231xx: Fix i2c support at cx231xx-input There was a bug at cx231xx-input, where it were registering the remote controls twice, one via ir-kbd-i2c and another directly. Also, the patch that added rc_register_device() broke compilation for it. This patch fixes cx231xx-input by fixing the depends on, to point to the new symbol, and initializing the scanmask via platform_data. While here, also fix Kconfig symbol change for IR core dependencies. Signed-off-by: Mauro Carvalho Chehab commit 2eb258327722de3ed4d84ce1b9add2bad21a0ec4 Author: Mauro Carvalho Chehab Date: Fri Nov 12 09:02:40 2010 -0300 [media] ir-kbd-i2c: add rc_dev as a parameter to the driver There are several fields on rc_dev that drivers can benefit. Allow drivers to pass it as a parameter to the driver. For now, the rc_dev parameter is optional. If drivers don't pass it, create them internally. However, the best is to create rc_dev inside the drivers, in order to fill other fields, like open(), close(), driver_name, etc. So, a latter patch making it mandatory and changing the caller drivers is welcome. Signed-off-by: Mauro Carvalho Chehab commit 5b2e303f6df1e0b1a903950c5d613a20c8c71a37 Author: David Härdeman Date: Fri Oct 29 16:08:28 2010 -0300 [media] rc-core: convert winbond-cir Move winbond-cir from drivers/input/misc/ into drivers/media/rc/ and convert it to use rc-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit d8b4b5822f51e2142b731b42c81e3f03eec475b2 Author: David Härdeman Date: Fri Oct 29 16:08:23 2010 -0300 [media] ir-core: make struct rc_dev the primary interface This patch merges the ir_input_dev and ir_dev_props structs into a single struct called rc_dev. The drivers and various functions in rc-core used by the drivers are also changed to use rc_dev as the primary interface when dealing with rc-core. This means that the input_dev is abstracted away from the drivers which is necessary if we ever want to support multiple input devs per rc device. The new API is similar to what the input subsystem uses, i.e: rc_device_alloc() rc_device_free() rc_device_register() rc_device_unregister() [mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts] Signed-off-by: David Härdeman Acked-by: Jarod Wilson Tested-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 4c7b355df6e7f05304e05f6b7a286e59a5f1cc54 Author: David Härdeman Date: Wed Nov 10 11:04:19 2010 -0300 [media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main [mchehab@redhat.com: this patch were originally bundled with some renaming stuff and with the file merges, as seen at: https://patchwork.kernel.org/patch/291092/. Instead of using the original approach, I wrote the rename patches and the code merge as separate changes, then applied the difference on this patch. This way, it is easier to see the real changes at the code, and will be easier to merge upstream, especially if some conflict rises on the renaming patches] Signed-off-by: David Härdeman Acked-by: Jarod Wilson Tested-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 631493ecacd81f1af74de459c1d16f7ffa6c82c0 Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:44:27 2010 -0300 [media] rc-core: merge rc-map.c into rc-main.c With this change, all rc-core functions are into just one file, except for the rc-raw specific functions. Signed-off-by: Mauro Carvalho Chehab commit bc2a6c5719efd74ce841ad0f0c9b6ea2590da6da Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:18:24 2010 -0300 [media] rc-core: Merge rc-sysfs.c into rc-main.c Signed-off-by: Mauro Carvalho Chehab commit f62de675f796a992011c598c405a3d6fada9aa20 Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:09:57 2010 -0300 [media] Rename rc-core files from ir- to rc- As protocol decoders are specific to InfraRed, keep their names as-is. Signed-off-by: Mauro Carvalho Chehab commit 32cf86f6d16367db5a10039c1dd938a2427d697c Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:00:14 2010 -0300 [media] rename drivers/media/IR to drives/media/rc Signed-off-by: Mauro Carvalho Chehab commit 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0 Author: David Härdeman Date: Fri Oct 29 16:08:12 2010 -0300 [media] ir-core: more cleanups of ir-functions.c cx88 only depends on VIDEO_IR because it needs ir_extract_bits(). Move that function to ir-core.h and make it inline. Lots of drivers had dependencies on VIDEO_IR when they really wanted IR_CORE. The only remaining drivers to depend on VIDEO_IR are bt8xx and saa7134 (ir_rc5_timer_end is the only function exported by ir-functions). Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or converting drivers to IR_CORE that they do not want a dependency on IR_LEGACY. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 62c6503125389763a74911408d984c5dd09eeb97 Author: David Härdeman Date: Fri Oct 29 16:08:07 2010 -0300 [media] ir-core: remove remaining users of the ir-functions keyhandlers This patch removes the remaining usages of the ir_input_nokey() and ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c by using the corresponding functionality in ir-core instead. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 2997137be8eba5bf9c07a24d5fda1f4225f9ca7d Author: David Härdeman Date: Fri Oct 29 16:08:02 2010 -0300 [media] ir-core: convert drivers/media/video/cx88 to ir-core This patch converts the cx88 driver (for sampling hw) to use the decoders provided by ir-core instead of the separate ones provided by ir-functions (and gets rid of those). The value for MO_DDS_IO had a comment saying it corresponded to a 4kHz samplerate. That comment was unfortunately misleading. The actual samplerate was something like 3250Hz. The current value has been derived by analyzing the elapsed time between interrupts for different values (knowing that each interrupt corresponds to 32 samples). Thanks to Mariusz Bialonczyk for testing my patches (about one a day for two weeks!) on actual hardware. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 00df055ae315c9c8792dc4d012e6ad9c4d527e87 Author: Jarkko Nikula Date: Fri Oct 29 11:31:39 2010 -0300 [media] radio-si4713: Add regulator framework support Convert the driver to use regulator framework instead of set_power callback. This with gpio_reset platform data provide cleaner way to manage chip VIO, VDD and reset signal inside the driver. Signed-off-by: Jarkko Nikula Cc: Eduardo Valentin Signed-off-by: Mauro Carvalho Chehab commit bf797165f099296b622bcdcea1126a113e0aaac4 Author: Devin Heitmueller Date: Sat Oct 9 15:09:17 2010 -0300 [media] au0828: enable VBI timeout when calling read() without streamon() Because some clients (e.g. tvtime) will just open the filehandle and call read() instead of explicitly calling streamon first, we need to make sure the VBI timeout routine gets enabled in this case. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 78ca500559b5a4f16a95c198b3e7bdfac8455bf8 Author: Devin Heitmueller Date: Sat Oct 9 14:43:53 2010 -0300 [media] au0828: fixes for timeout on no video The first pass of fixes to cause the driver to continue streaming even when there is no video arriving over the ITU656 bus were not adequate. Continue the work from the previous patch. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 6e04b7b95a5bd2da0aa5df05fc09a1f0d6615666 Author: Devin Heitmueller Date: Wed Sep 1 22:03:43 2010 -0300 [media] au0828: continue video streaming even when no ITU-656 coming in We need the au0828 to continue delivering frames even when the device is not delivering video, or else applications such as tvtime will block indefinitely. Unfortunately, the au8522 doesn't have any sort of free-running mode or "blue screen on no video" like some other decoders. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 301c9f26d7ded6e274a99c3a447a9a36790a3f3e Author: Devin Heitmueller Date: Sun Jun 27 18:12:42 2010 -0300 [media] au8522: Handle differences in comb filter config for s-video input Tweak the comb filter config when in s-video mode to match the Hauppauge Windows driver values (based on register dumps). This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit d2c194ce4781d62bf671aa6b65a2fccb39feb50e Author: Devin Heitmueller Date: Sun Jun 27 18:01:40 2010 -0300 [media] au8522: fix clamp control for different video modes Straighten out the clamp control configurations for the various video modes, based off of register diffs done against the Hauppauge Windows driver. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 2428a2ed6a7cbc7be6db5c70c3838a4bf0de9f48 Author: Devin Heitmueller Date: Sun Jun 27 17:40:42 2010 -0300 [media] au8522: cleanup code which disables audio decoder Cleanup the routine which disables the audio decoder. In particular, the i2s output was being shut off but the audio processor itself was not, resulting in more power being consumed than needed. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit bde3bb9a67d2cd260df6be9726c9c360a0e3cee9 Author: Devin Heitmueller Date: Mon Jul 5 13:05:16 2010 -0300 [media] au0828: Fix field alignment for video frames delivered by driver Fix the alignment of fields being delivered by the driver, which was resulting in jerky video when there was horizontal motion (since the bottom field of the frame was being sent with the top field of the previous frame) This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 83f859c5a6d6e01d671f002c0ade3498b4a4b245 Author: Devin Heitmueller Date: Fri Jun 25 01:33:39 2010 -0300 [media] au0828: set max packets per URB to match Windows driver We had the max packets per URB set to an incredibly low "10" as opposed to the Windows driver which has it as 128. Set the value to match the Windows driver, which will reduce interrupts considerably. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 88464106f97fe1c143bda2b4019b07c3069d454c Author: Devin Heitmueller Date: Sun Jun 13 17:31:22 2010 -0300 [media] au8522: Properly set default brightness The chip's default value for the brightness didn't match what we were sending back in the queryctrl ioctl(), so if the application actually set the brightness to the "default", it would actually end up being way too bright. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1d00d6c1ff13607974fcd9469aa9466fcd253c3a Author: Jean-François Moine Date: Fri Oct 29 13:58:22 2010 -0300 [media] gspca: Convert some uppercase hexadecimal values to lowercase Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a79cc7b9182abb2e3936a26064dec414b417f1d1 Author: Jean-François Moine Date: Fri Oct 29 08:10:37 2010 -0300 [media] gspca - sonixj: Simplify and clarify the hv7131r probe function Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d581bcd78be567af7026e3d13b54ec7df8db8b82 Author: Jean-François Moine Date: Fri Oct 29 08:01:01 2010 -0300 [media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 resolution The bad value prevented the autogain to work correctly and some images were truncated. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a23c1947f4da31d9aac9bfc05ef22d8148b2f106 Author: Jean-François Moine Date: Fri Oct 29 07:57:03 2010 -0300 [media] gspca - main: Fix a small code error Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0b8851b6c3934a56eb1a4ff284ab5133065e0cb8 Author: Jean-François Moine Date: Fri Oct 29 07:56:06 2010 -0300 [media] gspca - main: Version change Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 614d06917de2823d598a4b231256d08074044235 Author: Hans de Goede Date: Wed Oct 27 07:42:28 2010 -0300 [media] gspca_ov519: generate release button event on stream stop if needed Generate a release button event when the button is still pressed when the stream stops. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit e0657be5615f666f261206ed62c3f0dc2527956e Author: Hans de Goede Date: Wed Oct 27 06:38:07 2010 -0300 [media] gspca_xirlink_cit: Add support camera button gspca_xirlink_cit: Add support camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2c4e776aa370a7a1619c7ada0604e9003fe1d92a Author: Hans de Goede Date: Tue Oct 26 17:21:33 2010 -0300 [media] gspca_xirlink_cit: Frames have a 4 byte footer At least on the ibm netcam pro frames have a 4 byte footer, take this into account when calculating sizeimage. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit bc46bae6373c87897959c7aa8fb9f6c4218695b8 Author: Hans de Goede Date: Tue Oct 26 11:18:59 2010 -0300 [media] gspca_xirlink_cit: various usb bandwidth allocation improvements / fixes The following usb bandwidth allocation changes were made to the ibm netcam pro code: - Don't restart negotiation at max packet size on stop0, as that gets called by gspca_main during negotiation. Move this to sd_isoc_init. - Don't ask for full bandwidth when running at 160x120, that does not need full bandwidth - Make minimum acceptable bandwidth depend upon resolution [mchehab@redhat.com: Fix CodingStyle problems at switch statements] Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2661da47daefd4f22f9fdc7e9294a1cb9edf515b Author: Hans de Goede Date: Tue Oct 26 05:16:32 2010 -0300 [media] gspca: only set gspca->int_urb if submitting it succeeds Currently alloc_and_submit_int_urb() is setting gspca->int_urb as soon as the allocation has succeeded, but if the subsequent submit fails, the urb gets destroyed. And then later will get destroyed again in gspca_input_destroy_urb() because gspca->int_urb is set, leading to a double free. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 314b3e0881c6acb4f40e07565ac1a7798c7698a3 Author: Hans de Goede Date: Tue Oct 26 05:15:46 2010 -0300 [media] gspca: submit interrupt urbs *after* isoc urbs Currently gspca supported usb-1.1 webcams for which we support the input button through an interrupt endpoint won't stream (not enough bandwidth error) when used through an USB-2.0 hub. After much debugging I've found out that the cause for this is that the ehci-sched.c schedeling code does not like it when there are already urb's scheduled when (large) isoc urbs are queued. By moving the submission of the interrupt urbs to after submitting the isoc urbs the camera starts working again through usb-2.0 hubs. Note that this does not fix isoc. streaming through a usb-hub while another 1.1 usb device (like the microphone of the same cam) is also active at the same time :( I've spend a long time analyzing the linux kernel ehci scheduler code, resulting in this (long) mail: http://www.spinics.net/lists/linux-usb/msg37982.html The conclusion of the following mail thread is that yes there are several issues when using usb-1.1 devices through a usb-2.0 hub, but these are not easily fixable in the current code. Fixing this in ehci-sched.c requires an almost full rewrite, which is not bound to happen anytime soon. So with this patch gspca driven usb-1.1 webcams will atleast work when connected through an usb-2.0 hub when the microphone is not used. As an added bonus this patch avoids extra destroy/create input urb cycles when we end up falling back to a lower speed alt setting because of bandwidth limitations. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 25ad9847ca09f744b4cfea362d339c8b5b49765c Author: Malcolm Priestley Date: Thu Nov 4 17:17:51 2010 -0300 [media] lmedm04: change USB Timeouts to avoid troubles DM04/QQBOX USB Timing change. Improved timing to avoid USB corruptions on some systems. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit afcd0806094d9ae0d944f30776edc075e4584b96 Author: Malcolm Priestley Date: Tue Nov 2 18:02:08 2010 -0300 [media] Documentation/lmedm04: Fix firmware extract information Corrected Firmware Information for LG on LME2510. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit f23e6616ac2dc560db0ee8733024ebe90de9161a Author: Malcolm Priestley Date: Wed Oct 27 19:50:36 2010 -0300 [media] lmed04: Improve frontend handling Improved frontend handling. Frontend now remains open at all times, with signal lock, snr & signal level polled from Interupt. Updated driver for DM04/QQBOX USB DVB-S BOXES to version 1.70. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit ea7c681e899bda3fceb37815d63d201c3b4be920 Author: Daniel Drake Date: Wed Oct 27 10:55:00 2010 -0300 [media] cafe_ccic: fix colorspace corruption on resume If you suspend and resume during video capture, the video colours are corrupted on resume. This is because the sensor is being unconditionally powered off during the resume path. Only power down during resume if the camera is not in use, and correctly reconfigure the sensor during resume. Fixes http://dev.laptop.org/ticket/10190 Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c429e7b62a54bf34c1995b45faeaeb84104f1705 Author: Joe Perches Date: Mon Oct 25 23:44:25 2010 -0300 [media] drivers/media: Removed unnecessary KERN_s from dprintk uses Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...) Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8 Author: Mauro Carvalho Chehab Date: Sat Oct 23 13:35:58 2010 -0300 [media] cx231xx: Add IR support for Pixelview Hybrid SBTVD Signed-off-by: Mauro Carvalho Chehab commit 9ab66912e0cd671fbea1b99e8a37d11b14d50baf Author: Mauro Carvalho Chehab Date: Sat Oct 23 13:28:33 2010 -0300 [media] cx231xx: Add a driver for I2C-based IR Although cx231xx has a very good IR support, already supported by mceusb driver, some designs decided to add a separate I2C microcontroller chip in order to handle IR. Due to that, add a glue to ir-kbd-i2c is needed, in order to support those devices. Signed-off-by: Mauro Carvalho Chehab commit f0551efc77b0f34a93a14d2bf96051612e352a39 Author: Mauro Carvalho Chehab Date: Sun Oct 3 07:01:26 2010 -0300 [media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG Signed-off-by: Mauro Carvalho Chehab commit 68541cdaadecbc280cd50122f11fdbb249a2ae29 Author: Mauro Carvalho Chehab Date: Sun Oct 3 05:27:59 2010 -0300 [media] Add support for Kworld SBTVD board Signed-off-by: Mauro Carvalho Chehab commit 7572f9c5575c721f43b575a71fda1ecd896e0327 Author: Mauro Carvalho Chehab Date: Sun Oct 3 16:48:49 2010 -0300 [media] mb86a20s: add support for serial streams By comparing the traffic between Pixelview (cx23102-based and Kworld (saa7134-based), the only difference is at register 0xd5. After some tests, It seems that it is used to change mode between serial and parallel. Signed-off-by: Mauro Carvalho Chehab commit 55fa288deca4b17e539ba49a9b0d0ed474afa6f8 Author: Mauro Carvalho Chehab Date: Wed Sep 29 11:07:08 2010 -0300 [media] cx231xx: use callback to set agc on PixelView Signed-off-by: Mauro Carvalho Chehab commit ede676c72d0b18f1c15300f7874370e771489a1c Author: Mauro Carvalho Chehab Date: Mon Sep 27 23:44:27 2010 -0300 [media] add digital support for PV SBTVD hybrid Signed-off-by: Mauro Carvalho Chehab commit 9417bc6dd9de85944501f8f4ce8dd0e64135ca82 Author: Mauro Carvalho Chehab Date: Sun Sep 26 20:44:31 2010 -0300 [media] Add analog support for Pixelvied Hybrid SBTVD Signed-off-by: Mauro Carvalho Chehab commit b9ede79ada766eec535e1230970bd885489d5990 Author: Mauro Carvalho Chehab Date: Mon Sep 27 20:52:43 2010 -0300 [media] add a driver for mb86a20s This adds the trivial bits to mb86a20s. As the driver won't touch at the channel/layer parameters, this may not be enough for receiving all channels, especially ISDB-Tsb, but the driver worked properly for receiving video channels on my tests. Signed-off-by: Mauro Carvalho Chehab commit ca3dfd6a6f8364c1d51e548adb4564702f1141e9 Author: Mauro Carvalho Chehab Date: Fri Sep 10 17:29:14 2010 -0300 [media] em28xx: Add support for Leadership ISDB-T This device uses an em2874B + Sharp 921 One Seg frontend. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 3a509bb11acded0dfebbfcc740d85e0774b0769a Author: Mauro Carvalho Chehab Date: Fri Sep 10 16:49:47 2010 -0300 [media] Re-write the s921 frontend On our tests with Leadership ISDBT, the s921 frontend were not work. As its design contained some weird things, it ended to be easier to just re-write it, getting another frontend as an example (cx24123). As the old s921 driver weren't used, there's no regression. Some info from the old frontend were used as a way to double check the behavior that were noticed on the USB dumps retrieved from Leadership driver. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 94a544a4e8d05a027613443c529c399c39cc3371 Merge: 496a2e3 21486af Author: Grant Likely Date: Wed Dec 29 01:05:14 2010 -0700 Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next * 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next spi/pxa2xx: register driver properly spi/pxa2xx: add support for shared IRQ handler spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers arm/pxa2xx: reorgazine SSP and SPI header files spi/pxa2xx: Add CE4100 support spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: pass of_node to spi device and set a parent device commit 496a2e360a34e1f41c336d23947f800216cb9bdf Merge: 5aa68b8 23ce17a Author: Grant Likely Date: Wed Dec 29 00:47:29 2010 -0700 Merge branch 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next * 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next spi: davinci: fix checkpatch errors spi: davinci: whitespace cleanup spi: davinci: remove unused variable 'pdata' spi: davinci: set chip-select mode in SPIDEF only once spi: davinci: enable both activation and deactivation of chip-selects spi: davinci: remove unnecessary data transmit on CS disable spi: davinci: enable GPIO lines to be used as chip selects spi: davinci: simplify prescalar calculation spi: davinci: remove 'wait_enable' platform data member spi: davinci: make chip-slect specific parameters really chip-select specific spi: davinci: consolidate setup of SPIFMTn in one function spi: davinci: setup chip-select timers values only if timer enabled spi: davinci: add support for wait enable timeouts spi: davinci: remove unused members of davinci_spi_slave spi: davinci: eliminate the single member structure davinci_spi_slave spi: davinci: eliminate unnecessary update of davinci_spi->count spi: davinci: simplify calculation of edma acount value spi: davinci: check for NULL buffer pointer before using it spi: davinci: remove unnecessary disable of SPI spi: davinci: remove unnecessary 'count' variable in driver private data spi: davinci: remove unnecessary completion variable initialization spi: davinci: remove non-useful interrupt mode support spi: davinci: simplify poll mode transfers spi: davinci: add support for interrupt mode spi: davinci: configure the invariable bits in spipc0 only once spi: davinci: remove unnecessary function davinci_spi_bufs_prep() spi: davinci: remove unnecessary call to davinci_spi_setup_transfer() spi: davinci: do not store DMA channel information per chip select spi: davinci: always start transmit DMA spi: davinci: do not use temporary buffer if no transmit data provided spi: davinci: always start receive DMA spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot spi: davinci: fix DMA event generation stoppage spi: davinci: fix EDMA CC errors at end of transfers spi: davinci: handle DMA completion errors correctly spi: davinci: remove usage of additional completion variables for DMA spi: davinci: let DMA operation be specified on per-device basis spi: davinci: remove non-useful "clk_internal" platform data spi: davinci: enable and power-up SPI only when required spi: davinci: setup the driver owner spi: davinci: add additional comments spi: davinci: add EF Johnson Technologies copyright spi: davinci: removed unused #defines spi: davinci: remove unnecessary typecast spi: davinci: do not treat Tx interrupt being set as error spi: davinci: do not allocate DMA channels during SPI device setup spi: davinci: remove unnecessary private data member 'region_size' spi: davinci: shorten variable names spi: davinci: kconfig: add manufacturer name to prompt string commit a7dd6027e55992dd7c409a71a4a2b576fda2f7c2 Author: Dan Carpenter Date: Thu Dec 23 20:15:39 2010 +0000 vxge: remove duplicated part of check This is just a cleanup to make the static checkers happy. We don't need to check "own" twice. Signed-off-by: Dan Carpenter Acked-by: Ram Vepa Signed-off-by: David S. Miller commit 202b6ca149dc90d3d81772413e1e1c0b65e83012 Author: Ping Cheng Date: Fri Dec 24 13:13:25 2010 -0800 Input: wacom_w8001 - use __set_bit to set keybits This makes code safer and easier to read. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 5c461b913a16aed8afa285a1d00414791a9afe33 Merge: ef11e70 4f56ce9 Author: Dmitry Torokhov Date: Mon Dec 27 17:33:20 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next commit ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 Author: David Sterba Date: Mon Dec 27 17:20:01 2010 -0800 Input: bu21013_ts - fix misuse of logical operation in place of bitop Signed-off-by: David Sterba Acked-by: Linus Walleij Signed-off-by: Dmitry Torokhov commit a06a09c802c869426cfe8c405c381c985c3b25b2 Author: Pali Rohár Date: Mon Dec 27 17:21:45 2010 -0800 Input: i8042 - add Acer Aspire 5100 to the Dritek list This patch adds notebook Acer Aspire 5100 to the list of Dritek HW. Acer Aspire 5100 needs Dritek keyboard extension to support all Fn keys. Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Dmitry Torokhov commit 731ece41fb1047816303295a0cdfed90a528137e Author: Olof Johansson Date: Fri Dec 10 02:09:23 2010 -0600 modpost: Fix address calculation in reloc_location() This patch fixes a segfault in modpost that is observed when the gold linker is used to link the input objects. The problem is that reloc_location (modpost.c) is computing the address of the relocation target incorrectly. Here, elf->hdr points to the beginning of the ELF file in memory, sechdr points to the relocation section header, section is the index of the section being relocated, and sechdrs[section].sh_offset would be the offset of that section, relative to the beginning of the ELF file. Adding elf->hdr + sechdrs[section].sh_offset gives you the address of the beginning of the section, and adding r->r_offset to that gives you the address of the location to be relocated. You do not need to subtract sechdrs[section].sh_addr from that -- the result of this is an address outside the file, and causes the segfault when addend_386_rel tries to dereference it. This bug is not observed when GNU ld is used to link the inputs. The object file ubuntu/omnibook/omnibook.o is the result of an ld -r of several other files. When GNU ld does an ld -r, it sets the vaddr field for each section to 0, but gold lays out the section addresses sequentially instead: Section Headers: [Nr] Name Type Addr Off Size ES Flg Lk Inf Al [ 0] NULL 00000000 000000 000000 00 0 0 0 [ 1] .text PROGBITS 00000000 000034 004794 00 AX 0 0 4 [ 2] .data PROGBITS 0000b9d0 0047c8 0009c0 00 WA 0 0 4 [ 3] .bss NOBITS 000162f8 005188 00013c 00 WA 0 0 4 [ 4] .rodata.str1.1 PROGBITS 00004f2d 0052c4 001b1a 01 AMS 0 0 1 [ 5] .init.text PROGBITS 00004794 006dde 0005fa 00 AX 0 0 1 [ 6] .exit.text PROGBITS 00004d8e 0073d8 00018a 00 AX 0 0 1 ... So the bug in the tool remained undiscovered because the section's vaddr always happened to be 0. Signed-off-by: Raymes Khoury Signed-off-by: Olof Johansson Signed-off-by: Michal Marek commit c8217b8305e5e75c23617f2f4cd262527d952c0a Author: Cliff Wickman Date: Mon Dec 13 10:51:57 2010 -0600 x86, paravirt: Use native_halt on a halt, not native_safe_halt halt() should use native_halt() safe_halt() uses native_safe_halt() If CONFIG_PARAVIRT=y, halt() is defined in arch/x86/include/asm/paravirt.h as static inline void halt(void) { PVOP_VCALL0(pv_irq_ops.safe_halt); } Otherwise (no CONFIG_PARAVIRT) halt() in arch/x86/include/asm/irqflags.h is static inline void halt(void) { native_halt(); } So it looks to me like the CONFIG_PARAVIRT case of using native_safe_halt() for a halt() is an oversight. Am I missing something? It probably hasn't shown up as a problem because the local apic is disabled on a shutdown or restart. But if we disable interrupts and call halt() we shouldn't expect that the halt() will re-enable interrupts. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: H. Peter Anvin commit 32ae2ade462146729580117d9886cc9efd83dfbe Author: Franck Bui-Huu Date: Thu Dec 23 16:04:23 2010 +0100 perf probe: Fix short file name probe location reporting After adding probes, perf-probe(1) reports the probes locations which include filenames for certain cases. But for short file names (whose length < 32), perf-probe didn't display the name correctly. It actually skipped the first character. Here's an example where 'icmp.c' was screwed: $ perf probe -n -a "icmp.c;sk=*" Add new events: probe:icmp_push_reply (on @cmp.c) probe:icmp_reply (on @cmp.c) probe:icmp_reply_1 (on @cmp.c) probe:icmp_send (on @cmp.c) probe:icmp_send_1 (on @cmp.c) probe:icmp_error (on @cmp.c) probe:icmp_error_1 (on @cmp.c) probe:icmp_error_2 (on @cmp.c) probe:icmp_error_3 (on @cmp.c) This patch fixes this bug in synthesize_perf_probe_point(). Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 0597fcd08b858df83b9f20afd6035311d92c48f8 Author: Arnaud Lacombe Date: Thu Dec 23 03:25:16 2010 -0500 kconfig: fix warning In file included from scripts/kconfig/zconf.tab.c:2502: scripts/kconfig/expr.c:1033: warning: no previous prototype for 'expr_simplify_unmet_dep' Reported-by: Stephen Rothwell Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 86280a208825d55ba988420b6b0ed2d6b9ec80f8 Author: David Sterba Date: Mon Dec 27 16:27:43 2010 +0100 HID: picolcd: fix misuse of logical operation in place of bitop CC: Bruno Prémont CC: Jiri Kosina Signed-off-by: David Sterba Signed-off-by: Jiri Kosina commit 17f7f4d9fcce8f1b75b5f735569309dee7665968 Merge: 041110a d7c1255 Author: David S. Miller Date: Sun Dec 26 22:37:05 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/ipv4/fib_frontend.c commit 003ea98195eebdfcf476317b517e8c29a25b9d10 Author: Wey-Yi Guy Date: Wed Dec 15 08:06:23 2010 -0800 iwlwifi: remove reference to Gen2 The correct name should be used for the newer devices, remove reference to Gen2 Signed-off-by: Wey-Yi Guy commit bdb84fec61aab7047b1b108b6b6824c003bc4d11 Author: Johannes Berg Date: Wed Dec 15 06:07:56 2010 -0800 iwlagn: fix FH error # iw wlan0 interface add moni0 type monitor flags control # ip link set moni0 up causes a continuous spew of FH_ERROR from the device. Fix this by not setting the CTL2HOST filter by itself -- CTL + promisc works fine. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit e88735d711948a580741fd337afd4ec11c395174 Author: Wey-Yi Guy Date: Sat Dec 11 08:46:56 2010 -0800 iwlwifi: remove extra string For "led_mode" module parameters, string "led_mode" is duplicated twice, remove one. Signed-off-by: Wey-Yi Guy commit 041110a439e21cd40709ead4ffbfa8034619ad77 Merge: a1a5da5 2316aa2 Author: David S. Miller Date: Sat Dec 25 19:20:38 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f Author: Rasesh Mody Date: Thu Dec 23 21:45:10 2010 +0000 bna: Update the driver version to 2.3.2.3 Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 1d32f7696286eef9e5644eb57e79a36756274357 Author: Rasesh Mody Date: Thu Dec 23 21:45:09 2010 +0000 bna: IOC failure auto recovery fix Change Details: - Made IOC auto_recovery synchronized and not timer based. - Only one PCI function will attempt to recover and reinitialize the ASIC on a failure, that too after all the active PCI functions acknowledge the IOC failure. Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit aad75b66f1d3784514351f06bc589c55d5325bc8 Author: Rasesh Mody Date: Thu Dec 23 21:45:08 2010 +0000 bna: Restore VLAN filter table Change Details: - Retrieve the VLAN configuration from the networking stack and apply it to the base interface during ifconfig up Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit ce9b9f383775e6de74ca4c93d5c643dc3d76dd3c Author: Rasesh Mody Date: Thu Dec 23 21:45:07 2010 +0000 bna: Removed unused code Change Details: - Remove unused APIs and code cleanup Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 2c7d38210ff8e65f8961699bce92c273c77d113c Author: Rasesh Mody Date: Thu Dec 23 21:45:06 2010 +0000 bna: IOC uninit check and misc cleanup Change Details: - Added a check in ioc firmware lock function to see if IOC is in BFI_IOC_UNINIT state or not. If it is not in UNINIT state and the last IOC boot was not done by OS driver, force IOC state to BFI_IOC_UNINIT - Unused macro and API cleanup Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit f7c0fa4cd5dcf58dd95b216d2c33444a3b4a44e0 Author: Rasesh Mody Date: Thu Dec 23 21:45:05 2010 +0000 bna: Fix for TX queue Change Details: - Call netif_wake_queue() if we have freed up sufficient elements at the end of completion processing - Add netif_queue_stopped counter back to bnad_drv_stats {} - Get netif_queue_stopped value from stack - Remove BUG_ON() on value returned by pci_unmap_addr() Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 886f7fedb0cee56acca7620d89186669273d3d56 Author: Rasesh Mody Date: Thu Dec 23 21:45:04 2010 +0000 bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix Change Details: - Enable reception of pure priority tagged packets by default by turning on VLAN Id = 0 - Clear the promiscuous mode, all multicast mode flags when bna_rxf_uninit is called Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 815f41e74031d6dc6d6dd988f58c03a1d72d02b9 Author: Rasesh Mody Date: Thu Dec 23 21:45:03 2010 +0000 bna: Fix ethtool register dump and reordered an API Change Details: - Removed semaphore register dump from ethtool - Moved netif_carrier_off() call to before calling bna_init() Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 0613ecfc94b13e86c9ff1252fd63e35a94475cd6 Author: Rasesh Mody Date: Thu Dec 23 21:45:02 2010 +0000 bna: Port enable disable sync and txq priority fix Change Details: - Fixed port enable/disable sync through a change in LL port state machine - Change txq->priority masking to 0x7 (3 bits) from 0x3 (2 bits) Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit be7fa3263a15d3f278c3bfbf606ec169aaa3a920 Author: Rasesh Mody Date: Thu Dec 23 21:45:01 2010 +0000 bna: TxRx and datapath fix Change Details: - Check HW ready condition before accessing h/w register in data-path - Postpone clean-up of data buffers to the data-path restart path and wait in the cleanup routines for in-flight DMA to complete - Separate out Tx completion processing from Rx poll routine Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit ce0ac9e1851364fa67c991659ce1db05ab82c6ae Author: Arnaldo Carvalho de Melo Date: Sat Dec 25 18:33:12 2010 -0200 perf script: Fix event ordering settings to work with older kernels If we don't use .ordering_requires_timestamps we'll end up trying to order events with no timestamps when running on older kernels. Problem introduced in eac23d1c. After the last three fixes, perf scripting is back working, tested with new perf userspace on old and new (with sample_id_all) kernels. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3ae22e8c8ac39daf88ae32f047fb23825be7c646 Author: Mark Brown Date: Sat Dec 25 15:32:27 2010 +0100 spi / PM: Support dev_pm_ops Allow SPI drivers to use runtime PM and other dev_pm_ops features by implementing dev_pm_ops for the bus. The existing bus specific suspend and resume functions will be called if a driver does not provide dev_pm_ops allowing for transition to the new model. Signed-off-by: Mark Brown Acked-by: Grant Likely Signed-off-by: Rafael J. Wysocki commit a43d3f08c64125edbdfdc3d3aa512d3e37321f37 Author: Arnaldo Carvalho de Melo Date: Sat Dec 25 12:12:25 2010 -0200 perf record: Fix use of sample_id_all userspace with !sample_id_all kernels Check if parse_single_tracepoint_event has already asked for PERF_SAMPLE_TIME. This is kludgy but short term fix for problems introduced by eac23d1c that broke 'perf script' by having different sample_types when using multiple tracepoint events when we use a perf binary that tries to use sample_id_all on an older kernel. We need to move counter creation to perf_session, support different sample_types, etc. Ongoing work on the perf test infrastructure needs this so that we can create counters to monitor threads generating specific events, etc. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin Cc: Ian Munsie LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 765532c8aaac624b5f8687af6d319c6a1138a257 Author: Arnaldo Carvalho de Melo Date: Thu Dec 23 13:10:22 2010 -0200 perf script: Finish the rename from trace to script The scripts have calls to 'perf trace' that need to be converted to 'perf script', do it. This problem was introduced in 133dc4c. Reported-by: Torok Edwin Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 2316aa2aee254c126e688b53a3a105b82bc3f368 Author: Greg Rose Date: Thu Dec 2 07:12:26 2010 +0000 ixgbevf: Add X540 VF device support to the ixgbevf driver The X540 introduces a new Virtual Function device ID so that the X540 VF device can be distinguished from the 82599 VF device. The X540 VF device will have additional capability over the 82599 VF device so it is necessary to be able to discern the difference. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit a985b6c31ff230a1246d921afbfc0f6a1386be83 Author: Greg Rose Date: Thu Nov 18 03:02:52 2010 +0000 ixgbe: Add anti-spoofing feature support Add support for the anti-spoofing feature in the HW. Packets from VF devices with spoofed MAC addresses or VLAN tags will be blocked and a counter incremented. During the watchdog timer the spoofed packet dropped counter is read and if it is non-zero then a warning message is displayed on the host VMM's console. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 3377eba79e15671799876f82d30446e656aac5ad Author: Greg Rose Date: Tue Dec 7 08:16:45 2010 +0000 ixgbe: Add SR-IOV feature support to X540 Add X540 specific feature support to X540 Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit d3306c2974481ff9c539de22a37bb667e8694be2 Author: Greg Rose Date: Thu Nov 18 03:03:23 2010 +0000 ixgbe: Warn on VF attempt to override Administratively set MAC/VLAN Print warnings to the system log when the VF attempts to override MAC/VLAN settings that were configured by the VMM Host administrator using the ip link set commands. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 031d7952ee63e1aa679f7e87700e3281f4de4ba2 Author: Williams, Mitch A Date: Thu Dec 9 03:23:56 2010 +0000 igbvf: add support for i350 VF device Add support to igbvf for the new i350 virtual function device. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher commit 0e512bfc2c0cd6072387092f8d1ac8e1a758965b Author: Alexander Duyck Date: Thu Nov 18 03:12:30 2010 +0000 igbvf: force link checking when mailbox timeout has occurred This change forces the link down when a mailbox timeout has occurred. Previously it was possible for a mailbox timeout to occur but for the interface to stay up. The problem with this was that it became possible for an interface to stay up and miss multiple requests resulting in a possible issue since the interface will be running in an unknown state. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher commit 13800469d40bf4dc9fbed17f4692b2ebe94d4526 Author: Greg Rose Date: Sat Nov 6 02:08:26 2010 +0000 igb: Add Anti-spoofing feature support Add support for the anti-spoofing feature in the HW. Packets from VF devices with spoofed MAC addresses or VLAN tags will be blocked and an event generated. When the watchdog task runs it will call a function to check if any spoof events occurred. If an event was detected then a warning message is dumped to the system log. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 1b5dda331ff8646a70d247cace45a60035937a9b Author: Gasparakis, Joseph Date: Thu Dec 9 01:41:01 2010 +0000 igb: Some fine tuning This patch does the following: 1. Changes the existing supported device id's so now DH89xxCC is not supported when EEPROM is not read. 2. Adds two more device ids for DH89xxCC in backplane mode and SFP. 3. Driver now initializes previously possibly uninitialized value in igb_reset_mdicnfg_82580(). Signed-off-by: Joseph Gasparakis Signed-off-by: Jeff Kirsher commit a6b5ea353845b3f3d9ac4317c0b3be9cc37c259b Author: Greg Rose Date: Sat Nov 6 05:42:59 2010 +0000 igb: Warn on attempt to override administratively set MAC/VLAN Print a warning message to the system log when the VF attempts to override administratively set MAC/VLAN configuration. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 8fa7e0f739b70db14e788efba4960bfc1873d550 Author: Greg Rose Date: Sat Nov 6 05:43:21 2010 +0000 igb: Fix overwrite of the VF's flags The vf flags were being overwritten causing the flag that indicates that the PF has set the VF MAC address to get cleared. This would allow the VF to override the MAC address assigned by the Host VMM using the ip link set command. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit b1cdfead0e532d7614b5d5b97044df94cc8945ae Author: Bruce Allan Date: Sat Dec 11 05:53:47 2010 +0000 e1000e: checkpatch warnings - braces WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 6480641eb741cabbba8e196d4f17db7fb80d101c Author: Bruce Allan Date: Sat Dec 11 05:53:42 2010 +0000 e1000e: checkpatch error - open braces ERROR: that open brace { should be on the previous line Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 184125a389cf2c81980de5d5f365c786cc76d229 Author: Bruce Allan Date: Sat Dec 11 05:53:37 2010 +0000 e1000e: checkpatch error - trailing statements ERROR: trailing statements should be on next line Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit f0f1a172b2a9e26319b9aa95fa6c322ebb01089d Author: Bruce Allan Date: Sat Dec 11 05:53:32 2010 +0000 e1000e: checkpatch error - macro panethesis ERROR: Macros with complex values should be enclosed in parenthesis Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 68f20d948c86bd6bbc075052f6b6c45b8f56957e Author: Jeff Kirsher Date: Fri Dec 17 12:14:34 2010 +0000 Documentation/networking: Update Intel Wired LAN docs - Update the Intel Wired LAN documentation with the latest URL for ethtool. - replace "Ethtool" with "ethtool" Signed-off-by: Jeff Kirsher Tested-by: Emil Tantilov commit 5aa68b85951aec91d6a955d1de861325fc9a3ba1 Author: Wolfram Sang Date: Fri Dec 17 15:44:00 2010 +0100 spi/mpc52xx-psc-spi: move probe/remove to proper sections Probe/remove should be in __devinit/__devexit. Found by a section-mismatch warning. Also, copy do_remove() over to remove(). Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit dc69d1af9e8d9cbbabff88bb35a6782187a22229 Author: Ben Gamari Date: Fri Dec 24 02:48:09 2010 +0000 omap2: Make OMAP2PLUS select OMAP_DM_TIMER It appears that arch/arm/mach-omap2/timer-gp.o is needed by OMAP2PLUS. Since timer-gp.o has direct dependencies on omap_dm_timer_*, it seems correct for the architecture to depend upon OMAP_DM_TIMER, otherwise unsuspecting integrators will be faced with a whole bunch of linker errors at the end of their kernel build: arch/arm/mach-omap2/built-in.o: In function `omap2_gp_timer_set_mode': /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:84: undefined reference to `omap_dm_timer_stop' /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:88: undefined reference to `omap_dm_timer_get_fclk' /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:90: undefined reference to `omap_dm_timer_set_load_start' ... Signed-off-by: Ben Gamari Signed-off-by: Tony Lindgren commit fe13471c4b546e07ddbaf5fb2209b50c14b99b20 Author: Benoit Cousson Date: Thu Dec 23 22:30:32 2010 +0000 OMAP4: hwmod data: Fix alignment and end of line in structurefields In order to be fully aligned with the Python generator output, change a couple of fields. - Add tab in class structures to align attributes - Add a comma at the end of the following line to simplify the generation by having always the same eol: ".pre_shutdown = &omap2_wd_timer_disable," - Add a blank line before the first entry of the omap44xx_hwmods array. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit d7cf5f33fc68573d7bb9d4fc244ea1a3ed0b011b Author: Benoit Cousson Date: Thu Dec 23 22:30:31 2010 +0000 OMAP4: hwmod data: Move the DMA structures The merge of the DMA series on top of the already modified omap_hwmod_data_44xx.c put the dma_system structures at the wrong position in the file. Re-order it properly. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 1f6a717f1c000bb6184fe09c5ae99bad5965cadf Author: Benoit Cousson Date: Thu Dec 23 22:30:30 2010 +0000 OMAP4: hwmod data: Move the smartreflex structures The merge of the SR series on top of the already modified omap_hwmod_data_44xx.c moved the smartreflex structures at the wrong position in the file. - Re-order the structures properly. Signed-off-by: Benoit Cousson Cc: Thara Gopinath Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 4d218826ad9ba5ab0b2d7e0a2b14f2a1e48a5e0b Author: Benoit Cousson Date: Thu Dec 23 22:30:29 2010 +0000 OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc Add the missing SIDLE_SMART_WKUP flag in idlemodes field of the smartreflex sysconfig structure. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Cc: Thara Gopinath Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 usb: don't use flush_scheduled_work() flush_scheduled_work() is being deprecated. Directly flush or cancel work items instead. * u_ether, isp1301_omap, speedtch conversions are straight-forward. * ochi-hcd should only flush when quirk_nec() is true as otherwise the work wouldn't have been initialized. * In oti6858, cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). Signed-off-by: Tejun Heo Acked-by: Greg Kroah-Hartman Cc: David Brownell Cc: Duncan Sands Cc: linux-usb@vger.kernel.org commit 37c95bfe944babae817bfcf02c996729c9a3335d Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 speedtch: don't abuse struct delayed_work speedtch directly uses the internal timer and work members of a struct delayed_work. Use a separate work item and timer instead. * Nicolas Kaiser discovered that timer init was missing. Fixed. Signed-off-by: Tejun Heo Acked-by: Greg Kroah-Hartman Tested-by: Nicolas Kaiser Cc: Duncan Sands Cc: linux-usb@vger.kernel.org commit 8c71778cbf2c8beaefaa2dee5478aa0622d96682 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 media/video: don't use flush_scheduled_work() This patch converts the remaining users of flush_scheduled_work() in media/video. * bttv-input.c and cx23885-input.c don't use workqueue at all. No need to flush. * Make omap24xxcam.c and saa7134-empress.c flush the used work directly. * In fd_defio.c, replace cancel_delayed_work() + flush_scheduled_work() with cancel_delayed_work_sync(). While at it, replace the deprecated cancel_rearming_delayed_work() with cancel_delayed_work_sync(). Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab commit 707bcf326bd50c875d82bd2e7c31dcfb92b7e813 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 media/video: explicitly flush request_module work Video drivers request submodules using a work during probe and calls flush_scheduled_work() on exit to make sure the work is complete before being unloaded. This patch makes these drivers flush the work directly instead of using flush_scheduled_work(). While at it, relocate request_submodules() call in saa7134_initdev() right right before successful return as in other drivers to avoid failing after the work is scheduled and returning failure without the work still active. This is in preparation for the deprecation of flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab commit 883624a08cb4144343e7362d9fff0e2c69613ebf Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 ioc4: use static work_struct for ioc4_load_modules() There is no reason to dynamically allocate work_struct for ioc4_load_modules(). It makes the code more complex and makes it impossible to flush the work directly. Use static work ioc4_load_modules_work instead and flush it directly on exit. This removes the use of flush_scheduled_work() which is being deprecated. Signed-off-by: Tejun Heo Cc: Brent Casavant commit ee4569a3a75e1a5ed53b0c4ff4d9fc456aa98ef1 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 init: don't call flush_scheduled_work() from do_initcalls() The call to flush_scheduled_work() in do_initcalls() is there to make sure all works queued to system_wq by initcalls finish before the init sections are dropped. However, the call doesn't make much sense at this point - there already are multiple different workqueues and different subsystems are free to create and use their own. Ordering requirements are and should be expressed explicitly. Drop the call to prepare for the deprecation and removal of flush_scheduled_work(). Andrew suggested adding sanity check where the workqueue code checks whether any pending or running work has the work function in the init text section. However, checking this for running works requires the worker to keep track of the current function being executed, and checking only the pending works will miss most cases. As a violation will almost always be caught by the usual page fault mechanism, I don't think it would be worthwhile to make the workqueue code track extra state just for this. Signed-off-by: Tejun Heo Cc: Andrew Morton commit 6dca467a76bb0ed71d65143b235e0ef80e44436f Author: Tejun Heo Date: Fri Dec 24 16:00:18 2010 +0100 s390: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * tape_3590: Create and use tape_3590_wq instead of the system_wq. * tape_block: Directly flush requeue_task on cleanup instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org commit 9db8995be5e1869b5effa117909bc285e06fc09b Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 rtc: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. On removal, directly cancel the work, and flush the uie_task in rtc-dev.c::clear_uie(). Signed-off-by: Tejun Heo Cc: Alessandro Zummo Cc: rtc-linux@googlegroups.com commit 0d9ee5b2e9aac981fa063339daf04320eac610d1 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 mmc: update workqueue usages Workqueue creation API has been updated and flush_scheduled_work() is deprecated and scheduled to be removed. * core/core.c: Use alloc_ordered_workqueue() instead of create_singlethread_workqueue(). This removes an unnecessary rescuer. * host/omap.c: Create, use and flush mmc_omap_wq instead of the system_wq. * Flush host->mmc_carddetect_work directly on removal instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Chris Ball Cc: linux-mmc@vger.kernel.org commit afdb32f2e463a195c104555ac9a8cdd39a2b6561 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 mfd: update workqueue usages flush_scheduled_work() is deprecated and scheduled to be removed. * In menelaus, flush menelaus->work directly on probe failure. Also, make sure the work isn't running on removal. * In tps65010, cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). While at it, remove unnecessary (void) casts on return value, and use schedule_delayed_work() and to_delayed_work() instead of using delayed_work's internal work field. Signed-off-by: Tejun Heo Cc: Samuel Ortiz commit 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 dvb: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * Flush the used works directly. * Replace the deprecated cancel_rearming_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). * Make sure mantis->uart_work isn't running on exit. Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org commit 99ef21216b4f85c56392ed41500d2f07f58cc360 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 leds-wm8350: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush led->work on removal instead. Signed-off-by: Tejun Heo Cc: Richard Purdie commit 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 mISDN: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ch->workq when freeing channel and cancel it on release. Signed-off-by: Tejun Heo Cc: Karsten Keil Cc: netdev@vger.kernel.org commit d9c612eb6e9ccb8192e6c4d609dbbf178020c672 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 macintosh/ams: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ams_info.worker on detach instead. Signed-off-by: Tejun Heo commit a6665944ef83b6a2db8fc5b323c9fca92375a643 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 vmwgfx: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush info->deferred_work on removal instead. Signed-off-by: Tejun Heo Cc: Thomas Hellstrom commit 2e5c44c92046c41607794666ffc0d6945945acb0 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 tpm: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush chip->work instead. Signed-off-by: Tejun Heo Cc: Debora Velarde Cc: Rajiv Andrade commit 3514870f06a7907bc46361aebc3daf5ea4e97eeb Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 sonypi: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush sonypi_device.input_work on removal instead. Signed-off-by: Tejun Heo Cc: Mattia Dongili commit 42565999d1e0b8a0c5b4a0d475c26cf3d567e85e Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 hvsi: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly cancel hp->writer and flush hp->handshaker instead. Signed-off-by: Tejun Heo Cc: Benjamin Herrenschmidt Cc: Paul Mackerras commit 30d65030fd14fd3696d927c5e452bee84c589b09 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 xen: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush info->work instead. Signed-off-by: Tejun Heo Cc: Jeremy Fitzhardinge Cc: Konrad Rzeszutek Wilk commit 0ead5c86ac4c9903da93c76716135bc29d9cd83b Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 gdrom: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush work on removal instead. Signed-off-by: Tejun Heo Cc: Jens Axboe commit 8aa0f413848708bca329c52358ae7a1a0e395b4e Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 floppy: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush floppy_work instead. Signed-off-by: Tejun Heo Cc: Jens Axboe commit 539253f6e13feedfa7bb6a3112c6707ebdf11e74 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 sh: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush psw->work on removal instead. Signed-off-by: Tejun Heo Cc: Paul Mundt Cc: linux-sh@vger.kernel.org commit fe413ec322e26179c788c678f24434b94cca34f0 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 arm/sharpsl: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush toggle_charger and sharpsl_bat works on suspend instead. Signed-off-by: Tejun Heo Cc: Russell King commit 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 ncpfs: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush the used works on stop instead. Signed-off-by: Tejun Heo Cc: Petr Vandrovec commit f094cfc6c382cec7b2c77dd7798576684153acbb Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 drm/ttm: use cancel_delayed_work_sync() in ttm_bo Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync() instead of calling cancel_delayed_work() followed by flush_scheduled_work(). This is to prepare for the deprecation and removal of flush_scheduled_work(). Signed-off-by: Tejun Heo Cc:: Thomas Hellstrom Cc:: Dave Airlie commit 404437efc713b6c6fc8e2dc02978624bf4586e2d Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 pcmcia/ipwireless: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush the used works instead. Signed-off-by: Tejun Heo Acked-by: Jiri Kosina Acked-by: David Sterba commit 9b00a8182987e8b7028d97c2bee3319ef383b57a Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 ocfs2: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * cancel_delayed_work() + flush_schedule_work() -> cancel_delayed_work_sync(). * flush qs->qs_work directly on exit instead. Signed-off-by: Tejun Heo Acked-by: Joel Becker Cc: Mark Fasheh commit 7f6b0db9f63ba423d989e29f6318fe7e68760421 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 net/dsa: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush dst->link_poll_work on remove instead. Signed-off-by: Tejun Heo Acked-by: Lennert Buytenhek commit 158fa67753e1eb3edfa5a2d1868666d89d1cf09f Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 isdn/capi: make kcapi use a separate workqueue flush_scheduled_work() is deprecated and will be removed. Because kcapi uses fire-and-forget type works, it's impossible to flush each work explicitly. Create and use a dedicated workqueue instead. Please note that with recent workqueue changes, each workqueue doesn't reserve a lot of resources and using it as a flush domain is fine. Signed-off-by: Tejun Heo Acked-by: Jan Kiszka commit 7fa5e85a0ab9ed5d2d8b77eec7976c88a5911bda Author: Tejun Heo Date: Fri Dec 24 15:59:05 2010 +0100 isdn/capi: unregister capictr notifier after init failure capidrv_init() could leave capictr notifier dangling after init failure. Fix it. Signed-off-by: Tejun Heo Acked-by: Jan Kiszka commit 62bcb91573425975d6ad2389d7ab1d8feca88ab4 Author: Mark Brown Date: Fri Dec 24 15:04:41 2010 +0100 PM: Prototype the pm_generic_ operations The pm_generic_ operations are all exported but are not prototyped in any header file for direct use. Do so. [rjw: Added extern.] Signed-off-by: Mark Brown Signed-off-by: Rafael J. Wysocki commit 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641 Author: Rafael J. Wysocki Date: Fri Dec 24 15:04:06 2010 +0100 PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally The __pm_generic_resume() function changes the given device's runtime PM status to RPM_ACTIVE if its driver's callback returns 0, but it only should do that if the rumtime PM is enabled for the device. Signed-off-by: Rafael J. Wysocki commit 5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6 Author: Rafael J. Wysocki Date: Fri Dec 24 15:03:34 2010 +0100 PM: Use dev_name() in core device suspend and resume routines Use dev_name() wherever applicable in drivers/base/power/main.c. Signed-off-by: Rafael J. Wysocki commit b64959e6158d6dcb640fc22d7f43b94ad1c91135 Author: Rafael J. Wysocki Date: Thu Dec 16 17:11:45 2010 +0100 PM: Permit registration of parentless devices during system suspend The registration of a new parentless device during system suspend will not lead to any complications affecting the PM core (the device will be effectively seen after the subsequent resume has completed), so remove the code used for detection of such events. Signed-off-by: Rafael J. Wysocki commit b8c76f6aed0ab7df73a6410f3f82de2c831bb144 Author: Rafael J. Wysocki Date: Thu Dec 16 00:51:21 2010 +0100 PM: Replace the device power.status field with a bit field The device power.status field is too complicated for its purpose (storing the information about whether or not the device is in the "active" state from the PM core's point of view), so replace it with a bit field and modify all of its users accordingly. Signed-off-by: Rafael J. Wysocki commit 5b219a51fdceaf76e0e18da57c7efb9e5586e567 Author: Rafael J. Wysocki Date: Thu Dec 16 00:51:08 2010 +0100 PM: Remove redundant checks from core device resume routines Since a separate list of devices is used to link devices that have completed each stage of suspend (or resume), it is not necessary to check dev->power.status in the core device resume routines any more. Signed-off-by: Rafael J. Wysocki commit 8a43a9ab7b329aa8590f8a064df9bf8c80987507 Author: Rafael J. Wysocki Date: Thu Dec 16 00:50:30 2010 +0100 PM: Use a different list of devices for each stage of device suspend Instead of keeping all devices in the same list during system suspend and resume, regardless of what suspend-resume callbacks have been executed for them already, use separate lists of devices that have had their ->prepare(), ->suspend() and ->suspend_noirq() callbacks executed. This will allow us to simplify the core device suspend and resume routines. Signed-off-by: Rafael J. Wysocki commit 2cbb3ce1ad19e66858a4284dd6c4bb958162c483 Author: Rafael J. Wysocki Date: Wed Dec 15 00:17:29 2010 +0100 PM: Avoid compiler warning in pm_noirq_op() The compiler complains that calltime may be uninitialized in pm_noirq_op(), so add extra initialization for that variable to avoid the warning. Signed-off-by: Rafael J. Wysocki commit d83f905e126f8cbc5e4addc5d1a64aea785b732e Author: Rafael J. Wysocki Date: Fri Dec 3 23:14:26 2010 +0100 PM: Use pm_wakeup_pending() in __device_suspend() Before starting to suspend a device in __device_suspend() check if there's a request to abort the power transition and return -EBUSY in that case. Signed-off-by: Rafael J. Wysocki commit a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 Author: Rafael J. Wysocki Date: Fri Dec 3 22:58:31 2010 +0100 PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending() To avoid confusion with the meaning and return value of pm_check_wakeup_events() replace it with pm_wakeup_pending() that will work the other way around (ie. return true when system-wide power transition should be aborted). Signed-off-by: Rafael J. Wysocki commit 1e75227ef0571031cd18536ab768ee35667ec5b9 Author: Rafael J. Wysocki Date: Fri Dec 3 22:58:05 2010 +0100 PM: Prevent dpm_prepare() from returning errors unnecessarily Currently dpm_prepare() returns error code if it finds that a device being suspended has a pending runtime resume request. However, it should not do that if the checking for wakeup events is not enabled. On the other hand, if the checking for wakeup events is enabled, it can return error when a wakeup event is detected, regardless of its source. Signed-off-by: Rafael J. Wysocki commit 7ac4dcabdb482d4e74c9d36782d00bc6c4c01619 Author: Jon Mason Date: Wed Dec 1 00:14:55 2010 +0100 PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt basic-pm-debugging.txt is located in Documentation/power/ not Documents/power/. Change the references in Documentation/power/drivers-testing.txt to reflect the location. Signed-off-by: Jon Mason Signed-off-by: Rafael J. Wysocki commit c7b61de5b7b17f0df34dc7d2f8b9576f8bd36fce Author: Alan Stern Date: Wed Dec 1 00:14:42 2010 +0100 PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3) This patch (as1431c) makes the synchronous runtime-PM interface suitable for use in interrupt handlers. Subsystems can call the new pm_runtime_irq_safe() function to tell the PM core that a device's runtime_suspend and runtime_resume callbacks should be invoked with interrupts disabled and the spinlock held. This permits the pm_runtime_get_sync() and the new pm_runtime_put_sync_suspend() routines to be called from within interrupt handlers. When a device is declared irq-safe in this way, the PM core increments the parent's usage count, so the parent will never be runtime suspended. This prevents difficult situations in which an irq-safe device can't resume because it is forced to wait for its non-irq-safe parent. Signed-off-by: Alan Stern Signed-off-by: Rafael J. Wysocki commit 5262a47502adcfc3a64403120768f528418a3b79 Author: MyungJoo Ham Date: Fri Nov 26 23:07:56 2010 +0100 PM / Hibernate: When failed, in_suspend should be reset When hibernation failed due to an error in swsusp_write() called by hibernate(), it skips calling "power_down()" and returns. When hibernate() is called again (probably after fixing up so that swsusp_write() wouldn't fail again), before "in_suspend = 1" of create_image is called, in_suspend should be 0. However, because hibernate() did not reset "in_suspend" after a failure, it's already 1. This patch fixes such inconsistency of "in_suspend" value. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Signed-off-by: Rafael J. Wysocki commit 5729c63a51f0f8a351e0f1dc7b3250ebac12c309 Author: MyungJoo Ham Date: Fri Nov 26 23:07:48 2010 +0100 PM / Hibernate: hibernation_ops->leave should be checked too Because hibernate calls hibernation_ops->leave() without checking whether hibernation_ops->leave is NULL or not, hiberantion_set_ops should WARN_ON if hibernation_ops->leave is NULL. This patch added one more condition to check hibernation_ops->leave. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit 8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f Author: Tejun Heo Date: Fri Nov 26 23:07:27 2010 +0100 Freezer: Fix a race during freezing of TASK_STOPPED tasks After calling freeze_task(), try_to_freeze_tasks() see whether the task is stopped or traced and if so, considers it to be frozen; however, nothing guarantees that either the task being frozen sees TIF_FREEZE or the freezer sees TASK_STOPPED -> TASK_RUNNING transition. The task being frozen may wake up and not see TIF_FREEZE while the freezer fails to notice the transition and believes the task is still stopped. This patch fixes the race by making freeze_task() always go through fake_signal_wake_up() for applicable tasks. The function goes through the target task's scheduler lock and thus guarantees that either the target sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING. Signed-off-by: Tejun Heo Signed-off-by: Rafael J. Wysocki commit 133f1128b2bf178a1976b17c54bd14ce6feb90bf Author: Tracey Dent Date: Thu Nov 25 23:41:29 2010 +0100 PM: Use proper ccflag flag in kernel/power/Makefile Use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Rafael J. Wysocki commit 6675bc056790b403d198a173498d377187754142 Author: Aaro Koskinen Date: Thu Nov 25 23:41:19 2010 +0100 PM / Runtime: Fix comments to match runtime callback code Commit 05aa55dddb9ee4045c320661068bea78dad6a6e5 changed routines to succeed if the driver handler is not defined. Comments were not updated. Signed-off-by: Aaro Koskinen Signed-off-by: Rafael J. Wysocki commit 1dee92bba36b491dbcc15e2cba40501403237f96 Author: Paul Mundt Date: Fri Dec 24 19:19:23 2010 +0900 sh: Tidy up SH-4A unaligned load support. The current implementation was rather tied to the packed_struct.h definitions, which immediately began to clash when the packed_struct.h types changed and drivers began to include packed_struct.h directly. In order to support this sort of use it's necessary to get out of the way with regards to namespace collisions, and at the same time we can also kill off some duplicate code now that the unaligned headers are a bit more broken out. Signed-off-by: Paul Mundt commit 3d29005ab8d828e36108ecc2338612ce3acdd86f Author: Shiraz Hashim Date: Thu Dec 23 11:32:41 2010 +0100 ARM: 6541/1: move sev definition to common system.h include file sev is used to send wakeup event to other cores in ARMv6K and above. This has been moved from platform specific part to standard common ARM header file (asm/system.h). Also introduced wfi() and wfe(). Signed-off-by: Shiraz Hashim Signed-off-by: Russell King commit 78368c79944b12f91bcacb0b0b030c36016264e8 Author: Srinidhi Kasagar Date: Wed Dec 22 13:18:58 2010 +0100 ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup Signed-off-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Russell King commit 67cfa23ac9df810d1fbf3a06b7f408243350ecfe Author: Russell King Date: Tue Dec 21 10:42:20 2010 +0000 Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable" This reverts commit 06c1088, as promised in the warning message. commit dec12e62c03d26bbc7a142f067215a3a43cce7d0 Author: Russell King Date: Thu Dec 16 13:49:34 2010 +0000 ARM: provide an early platform initialization hook This allows platforms to hook into the initialization early to setup things like scheduler clocks, etc. Signed-off-by: Russell King commit 8ff1443c5439ecee7472b80cf12ecfc337e6ee98 Author: Russell King Date: Mon Dec 20 10:18:36 2010 +0000 ARM: simplify early machine init hooks Rather than storing each machine init hook separately, store a pointer to the machine description record and dereference this instead. This pointer is only available while the init sections are present, which is not a problem as we only use it from init code. Signed-off-by: Russell King commit cd544ce754ac2432ffcc0626ea802d2b30876b50 Author: Magnus Damm Date: Wed Dec 22 13:20:08 2010 +0100 ARM: 6538/1: Subarch IRQ handler macros V3 Per subarch interrupt handler macros V3. This patch breaks out code from the irq_handler macro into arch_irq_handler and arch_irq_handler_default. The macros are put in the header file "entry-macro-multi.S" The arch_irq_handler_default macro is designed to be used by irq_handler in entry-armv.S while arch_irq_handler is suitable for per-subarch use. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 521086412ee423fbdfc7da81f257239c43f707b4 Author: eric miao Date: Mon Dec 13 09:42:34 2010 +0100 ARM: 6532/1: Allow machine to specify it's own IRQ handlers at run-time Normally different ARM platform has different way to decode the IRQ hardware status and demultiplex to the corresponding IRQ handler. This is highly optimized by macro irq_handler in entry-armv.S, and each machine defines their own macro to decode the IRQ number. However, this prevents multiple machine classes to be built into a single kernel. By allowing each machine to specify thier own handler, and making function pointer 'handle_arch_irq' to point to it at run time, this can be solved. And introduce CONFIG_MULTI_IRQ_HANDLER to allow both solutions to work. Comparing with the highly optimized macro of irq_handler, the new function must be written with care not to lose too much performance. And the IPI stuff on SMP is expected to move to the provided arch IRQ handler as well. The assembly code to invoke handle_arch_irq is optimized by Russell King. Signed-off-by: Eric Miao Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 206323c181371f3d5fab36c6d33e1fac09b61082 Merge: 25cf039 28bd2c3 Author: Russell King Date: Fri Dec 24 09:36:37 2010 +0000 Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable commit 55271024a735d0c3234e6ca7e0914b05aab7fbac Author: Wolfram Sang Date: Wed Nov 17 13:00:50 2010 +0100 powerpc/pcm{030,032}: add pagesize to dts Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 45efe847971e6274a04eea75a0745d8015b54d37 Author: Wolfram Sang Date: Wed Nov 17 13:00:49 2010 +0100 misc/at24: add more sanity checks for parameters Side-effects happen when passing 0 to either io_limit or page_size. Give an error in case of this misconfiguration. Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 9ed030d728f3bd03b6e869357da02725afda19a7 Author: Wolfram Sang Date: Wed Nov 17 13:00:48 2010 +0100 misc/at24: parse device tree data Information about the pagesize and read-only-status may also come from the devicetree. Parse this data, too, and act accordingly. While we are here, change the initialization printout a bit. write_max is useful to know to detect performance bottlenecks, the rest is superfluous. Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 194588604765ac803f98fb9d19a36f6b835f4620 Author: David Daney Date: Wed Oct 27 18:03:47 2010 -0700 of/mdio: Fix some endianness problems. In of_mdiobus_register(), the __be32 *addr variable is dereferenced. This will not work on little-endian targets. Also since it is unsigned, checking for less than zero is redundant. Fix these two issues. Signed-off-by: David Daney [grant.likely@secretlab.ca: removed goto] Signed-off-by: Grant Likely commit 7063c0d942a1af2993531fbe52b4c74c1db818c4 Author: Feng Tang Date: Fri Dec 24 13:59:11 2010 +0800 spi/dw_spi: add DMA support dw_spi driver in upstream only supports PIO mode, and this patch will support it to cowork with the Designware dma controller used on Intel Moorestown platform, at the same time it provides a general framework to support dw_spi core to cowork with dma controllers on other platforms It has been tested with a Option GTM501L 3G modem and Infenion 60x60 modem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled Also change the dma interface suggested by Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Feng Tang [Typo fix and renames to match intel_mid_dma renaming] Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Grant Likely commit 79290a2aa2fd1c179a285218472092475630dc0e Author: Feng Tang Date: Fri Dec 24 13:59:10 2010 +0800 spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit ebf45b7d029eb065819bfede8b30455630d76c68 Author: Feng Tang Date: Fri Dec 24 13:59:09 2010 +0800 spi/dw_spi: Fix too short timeout in spi polling loop The SPI polling loop timeout only works with HZ=100 as the loop was actually too short. Also add appropriate cpu_relax() in the busy wait loops... Signed-off-by: Arjan van de Ven Signed-off-by: Alan Cox Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 5e8b821de333f472d33e3052a8dd1c43bf3ce433 Author: Linus Walleij Date: Wed Dec 22 23:13:59 2010 +0100 spi/pl022: convert running variable This variable is a bool but defined an int and defined completely backwards. This makes the code more readable. Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit dec5a581eb5b7d1abc90885d897d2468f1e60b21 Author: Linus Walleij Date: Wed Dec 22 23:13:48 2010 +0100 spi/pl022: convert busy flag to a bool Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 082086f2ce53c69260396e977d29972128def1d7 Author: Linus Walleij Date: Wed Dec 22 23:13:37 2010 +0100 spi/pl022: pass the returned sglen to the DMA engine The sglen return by the dma_map_sg() should be passed to the DMA engine, not the one passed in. If we one day have a DMA mapper that can coalesce entries, this will bug due to a too large number of entries being passed in. Reported-by: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit b729889686afb7d4366e07fe9c2f7a2737166462 Author: Linus Walleij Date: Wed Dec 22 23:13:07 2010 +0100 spi/pl022: map the buffers on the DMA engine The struct device for the DMA engine is the apropriate one to use when mapping/unmapping buffers. This is because the memory which is addressable by DMA is determined by the DMA engine rather than the device. Reported-by: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 9d32af66aa3a0e28d95fc607e208795ef6cc993a Author: Tomoya MORINAGA Date: Fri Dec 24 11:40:50 2010 +0900 spi/topcliff_pch: Fix data transfer issue It seems spi_topcliff_pch of linux-2.6.37-rc6 degraded by previous patch. In fact, data transfer fails on evaluation board testing. I found like the following register miss-setting line. Using this patch, I have confirmed data transfer can work well. Signed-off-by: Tomoya MORINAGA Signed-off-by: Grant Likely commit 893421745a052100b981401b7c5c6dc8708fb8a0 Author: Uwe Kleine-König Date: Wed Nov 24 10:05:46 2010 +0100 spi/imx: remove autodetection There are no machines in-tree that still use the driver name as device name. So save a few bytes and remove it. Signed-off-by: Uwe Kleine-König Acked-by: Jason Wang Signed-off-by: Grant Likely commit 0131d8973c8b9bd9d40fee8fae24eab24821efdb Author: Sebastian Andrzej Siewior Date: Wed Dec 1 10:54:46 2010 +0100 of/address: use proper endianess in get_flags This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and such. Those variables are pointing to the device tree which contains integers in big endian format. Most functions are doing it right because of_read_number() is doing the right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and of_bus_isa_map() were accessing the data directly and were doing it wrong. Signed-off-by: Sebastian Andrzej Siewior Acked-by: Benjamin Herrenschmidt Signed-off-by: Grant Likely commit aa5cbf8a70f57c5360ce1bfef692b357c866ae7f Author: Giridhar Malavali Date: Tue Dec 21 16:00:27 2010 -0800 [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 900a36e3277ac9109fe364a6a1420c71265f9377 Author: Giridhar Malavali Date: Tue Dec 21 16:00:26 2010 -0800 [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 0ce87911491d4167198b863c102c7e4d09202561 Author: Giridhar Malavali Date: Tue Dec 21 16:00:25 2010 -0800 [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit bc5c2aad17b045ea28ab69e6149c8130ab20731e Author: Andrew Vasquez Date: Tue Dec 21 16:00:24 2010 -0800 [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 7a44b86e777fc5d7a267df984d12b05fca59f487 Author: Andrew Vasquez Date: Tue Dec 21 16:00:23 2010 -0800 [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs. The semantics we employ now in the driver, performing a BIG_HAMMER in the event of Get-ID (0x20) mailbox command failing, should only be done for FC. On FC configurations, it makes sense since advertising is only really performed once, so a BIG_HAMMER to reinitiate the process is needed to restart. Under FCoE, this is not needed, as there's a continous stream of advertisements/ACks at the protocol layer to initiate a relogin/reinitialization process. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit f2019cb117f29ffaff961b5f6d5b3148d473de1d Author: Joe Carnuccio Date: Tue Dec 21 16:00:22 2010 -0800 [SCSI] qla2xxx: Remove redundant module parameter permission bits For driver module parameters that have permission bits set to (S_IRUGO|S_IRUSR), remove the second term since it is already included in the first term. S_IRUGO comes defined as (S_IRUSR|S_IRGRP|S_IROTH). Signed-off-by: Joe Carnuccio Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 794a5691147652387f4a2ffa890c5c1983e38849 Author: Andrew Vasquez Date: Tue Dec 21 16:00:21 2010 -0800 [SCSI] qla2xxx: Add sysfs node for displaying board temperature. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 10fbb7dd36eb3014fe4b928e596d89e036ee6210 Author: Giridhar Malavali Date: Tue Dec 21 16:00:20 2010 -0800 [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code. Signed-off-by: Giridhar Malavali Signed-off-by: Lalit Chandivade Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 710fc04da1abe48a33d54afb1ba33dbeceafb6e1 Author: Dirk Brandewie Date: Wed Dec 22 11:57:29 2010 -0800 microblaze/of: Use generic rule to build dtb's Modify arch/powerpc/boot/Makefile to use dtc command in scripts/Makefile.lib Signed-off-by: Dirk Brandewie Signed-off-by: Grant Likely commit 63849340621f7f5f963e4a9b9ba76add3ad54612 Author: Dirk Brandewie Date: Wed Dec 22 11:57:28 2010 -0800 of/powerpc: Use generic rule to build dtb's Modify arch/powerpc/boot/Makefile to use dtc command in scripts/Makefile.lib Signed-off-by: Dirk Brandewie Signed-off-by: Grant Likely commit c9e8fd5cfb7de50139a8aa0f70f9fe03311cdd01 Author: Madhuranath Iyengar Date: Tue Dec 21 16:00:19 2010 -0800 [SCSI] qla2xxx: Fix for memory wedge on fw halt for ISP82XX Signed-off-by: Swapnil Nagle Signed-off-by: Karen Higgins Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 21090cbe95189d4ce6135fc8fec2f416b3eb227f Author: Madhuranath Iyengar Date: Tue Dec 21 16:00:18 2010 -0800 [SCSI] qla2xxx: Update FCP priority information to firmware before sending IOs The FCP priority info was not being updated properly in certain situations. Here are the changes that needs to be done to take care of this issue: 1. No need to check fcport->state for FCS_UNCONFIGURED in qla24xx_update_fcport_fcp_prio(), since an invalid loop id check is already performed which is sufficient. 2. Add the missing qla24xx_update_fcport_fcp_prio() function call within qla2x00_update_fcport() function, so that the priority info is updated on every port addition or change. 3. Perform proper adapter types checking. 4. Other changes, associated with DEBUG/printk's and parameter passing. Signed-off-by: Saurav Kashyap Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 4052bd57234f119cef13b8997fcc852e2b2ce992 Author: Joe Carnuccio Date: Tue Dec 21 16:00:17 2010 -0800 [SCSI] qla2xxx: Fixed zero test on new_config in qla2x00_process_loopback(). Fixed the incorrect zero test on array new_config[]. Signed-off-by: Joe Carnuccio Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit ff8073fffc708a4959c2dd159c834f2516ce9703 Author: Andrew Vasquez Date: Tue Dec 21 16:00:16 2010 -0800 [SCSI] qla2xxx: Populate FCP_PRIO location for no *FLT* case Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 8ae598d02517af967685a671303c4ed10cded3c4 Author: Dan Carpenter Date: Tue Dec 21 16:00:15 2010 -0800 [SCSI] qla2xxx: list cursors are not null This is just a cleanup. The unneeded NULL check annoys static checkers because we already derefenced it and the we check it and then (if it's not the _safe() version) we dereference it again without checking. And the static checker is all, "Wah? Is it null or not?" Signed-off-by: Dan Carpenter Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit aab94339cd85d726abeae78fc02351fc1910e6a4 Author: Dirk Brandewie Date: Wed Dec 22 11:57:26 2010 -0800 of: Add support for linking device tree blobs into vmlinux This patch adds support for linking device tree blob(s) into vmlinux. Modifies asm-generic/vmlinux.lds.h to add linking .dtb sections into vmlinux. To maintain compatiblity with the of/fdt driver code platforms MUST copy the blob to a non-init memory location before the kernel frees the .init.* sections in the image. Modifies scripts/Makefile.lib to add a kbuild command to compile DTS files to device tree blobs and a rule to create objects to wrap the blobs for linking. STRUCT_ALIGNMENT is defined in vmlinux.lds.h for use in the rule to create wrapper objects for the dtb in Makefile.lib. The STRUCT_ALIGN() macro in vmlinux.lds.h is modified to use the STRUCT_ALIGNMENT definition. The DTB's are placed on 32 byte boundries to allow parsing the blob with driver/of/fdt.c during early boot without having to copy the blob to get the structure alignment GCC expects. A DTB is linked in by adding the DTB object to the list of objects to be linked into vmlinux in the archtecture specific Makefile using obj-y += foo.dtb.o Signed-off-by: Dirk Brandewie Acked-by: Michal Marek [grant.likely@secretlab.ca: cleaned up whitespace inconsistencies] Signed-off-by: Grant Likely commit 579d12b58abb4bd1161728f0a4a2524258ecf0a3 Author: Saurav Kashyap Date: Tue Dec 21 16:00:14 2010 -0800 [SCSI] qla2xxx: Added support for quiescence mode for ISP82xx. Support is added for quiescence mode. This feature is for P3P adapters. Any of the functions can put the firmware into quiescence state. All the others have to ack that request. During quiescence mode current commands are processed and all the new incoming I/Os are blocked. Loop resync is performed after firmware comes out of quiescence state. Signed-off-by: Saurav Kashyap Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit d3bd058826aa8b79590cca6c8e6d1557bf576ada Author: Yinghai Lu Date: Thu Dec 16 19:09:58 2010 -0800 x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation Recent Intel new system have different order in MADT, aka will list all thread0 at first, then all thread1. But SRAT table still old order, it will list cpus in one socket all together. If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed to put some cpus apic id to node mapping into apicid_to_node[]. for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash... [ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS). [ 9.235021] divide error: 0000 [#1] SMP [ 9.235315] last sysfs file: [ 9.235481] CPU 1 [ 9.235592] Modules linked in: [ 9.245398] [ 9.245478] Pid: 2, comm: kthreadd Not tainted 2.6.37-rc1-tip-yh-01782-ge92ef79-dirty #274 /Sun Fire x4800 [ 9.265415] RIP: 0010:[] [] select_task_rq_fair+0x4f0/0x623 ... [ 9.645938] RIP [] select_task_rq_fair+0x4f0/0x623 [ 9.665356] RSP [ 9.665568] ---[ end trace 2296156d35fdfc87 ]--- So let just parse all cpu entries in SRAT. Also add apicid checking with MAX_LOCAL_APIC, in case We could out of boundaries of apicid_to_node[]. it fixes following bug too. https://bugzilla.kernel.org/show_bug.cgi?id=22662 -v2: expand to 32bit according to hpa need to add MAX_LOCAL_APIC for 32bit Reported-and-Tested-by: Wu Fengguang Reported-by: Bjorn Helgaas Tested-by: Myron Stowe Signed-off-by: Yinghai Lu LKML-Reference: <4D0AD486.9020704@kernel.org> Signed-off-by: H. Peter Anvin commit 56d91f132c9be66e98cce1b1e77a28027048bb26 Author: Yinghai Lu Date: Thu Dec 16 19:09:24 2010 -0800 x86, acpi: Add MAX_LOCAL_APIC for 32bit We should use MAX_LOCAL_APIC for max apic ids and MAX_APICS as number of local apics. Also apic_version[] array should use MAX_LOCAL_APICs. Signed-off-by: Yinghai Lu LKML-Reference: <4D0AD464.2020408@kernel.org> Signed-off-by: H. Peter Anvin commit 6ec1e077e36c5469a6f901ca9abbd9bd5d23e6ae Author: Felipe Balbi Date: Thu Dec 23 12:17:49 2010 -0800 arm: omap: tusb6010: add name for MUSB IRQ commit fcf173e4511193b1efeccb0f22a8c641b464353b (add names for IRQs in structure resource) forgot to take care of tusb6010 making it fail to probe due to a missing resource. Fix it. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 840b929680c0d79f5248724d1b6b6d3f2ca3159e Author: Srinath Date: Thu Dec 23 12:17:48 2010 -0800 arm: omap: craneboard: Add USB EHCI support AM3517/05 Craneboard has one EHCI interface on board using port1. GPIO35 is used as power enable. GPIO38 is used as port1 PHY reset. History: http://marc.info/?l=linux-omap&w=2&r=1&s=Craneboard%253A%2BAdd%2BUSB%2BEHCI%2Bsupport&q=b Signed-off-by: Srinath Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit e1928c86c4829703b800c81cc9edc939b5634e6f Author: Michael Chan Date: Thu Dec 23 07:43:04 2010 +0000 cnic: Add FCoE support on 57712 - Connection ID (cid) management - Slow-path command and response support - Update version to 2.2.11. Reviewed-by: Bhanu Prakash Gollapudi Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e21ba414eed8a233eadb79bb6b158ac7ceb35025 Author: Michael Chan Date: Thu Dec 23 07:43:03 2010 +0000 cnic: Add kcq2 support on 57712 The kcq2 (2nd kernel work queue) is used by FCoE on 57712 devices. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 42ecbb8426aa229167d7f9d4b4e20f24bf42cb24 Author: Eddie Wai Date: Thu Dec 23 07:43:02 2010 +0000 cnic: Call cm_connect_complete() immediately on error If we get a path_resp error from userspace, call cm_connect_complete() immediately with error so that bnx2i can react to the error faster. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit eaaa6e9c222d5c398488ed4216f0fd94e4b81759 Author: Michael Chan Date: Thu Dec 23 08:38:30 2010 +0000 cnic: Check device state before reading the kcq pointer in IRQ If the device is down, the kcq pointer may be NULL. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4aacb7afb6afd78efe26427e74fa56a5fc72fad3 Author: Michael Chan Date: Thu Dec 23 07:43:01 2010 +0000 cnic: Support NIC Partition mode Add a common function cnic_read_bnx2x_iscsi_mac() to read the iSCSI MAC address at any specified shared memory location. In NIC Partition mode, we need to get the MAC address from the MF_CFG area of shared memory. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 5159fdc1e6cb4000f482faebeeba0be91611276d Author: Michael Chan Date: Thu Dec 23 07:42:59 2010 +0000 cnic: Use proper client and connection IDs on iSCSI ring Use the IDs specified by the bnx2x driver when initializing the ring. We don't have to make code changes when these IDs change in the future. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 939b82e5bde56a98c72eccde2e3a88d32bffad4a Author: Michael Chan Date: Thu Dec 23 07:42:58 2010 +0000 cnic: Improve ->iscsi_nl_msg_send() 1. Change first parameter from cnic_dev to ulp_handle which is the hba pointer. All other similar upcalls are using hba pointer. The callee can then directly reference the hba without conversion. 2. Change return value from void to int so that an error code can be passed back. This allows the operation to be retried. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8adc9240f98a816f7e9b3d93b9446a790110e062 Author: Michael Chan Date: Thu Dec 23 07:42:57 2010 +0000 cnic: Prevent "scheduling while atomic" when calling ->cnic_init() cnic_dev_list is protected by rtnl_lock and cnic_dev_lock spin_lock during modifications. When looping on cnic_dev_list and calling ->cnic_init(), we should just hold rtnl_lock since ->cnic_init() may sleep. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9b09336072796378dac46df63bcd43291b24fd12 Author: Michael Chan Date: Thu Dec 23 07:42:56 2010 +0000 cnic: Fix iSCSI TCP port endian order. Pass the TCP port parameter for iSCSI connections to the firmware in proper endian order. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a130883d9528eefb66285728ba6a232d8fff9465 Merge: d9f4fba 65a6538 Author: David S. Miller Date: Thu Dec 23 10:13:30 2010 -0800 Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit d9f4fbaf7053af43e6c72909c2aff18654717aed Author: Jiri Kosina Date: Wed Dec 22 23:23:38 2010 +0000 tcp: cleanup of cwnd initialization in tcp_init_metrics() Commit 86bcebafc5e7f5 ("tcp: fix >2 iw selection") fixed a case when congestion window initialization has been mistakenly omitted by introducing cwnd label and putting backwards goto from the end of the function. This makes the code unnecessarily tricky to read and understand on a first sight. Shuffle the code around a little bit to make it more obvious. Signed-off-by: Jiri Kosina Signed-off-by: David S. Miller commit 94462ad3b14739d158a1ab87bb30008c1e5a6bc1 Author: Steven Rostedt Date: Mon Nov 29 13:15:42 2010 -0500 module: Move RO/NX module protection to after ftrace module update The commit: 84e1c6bb38eb318e456558b610396d9f1afaabf0 x86: Add RO/NX protection for loadable kernel modules Broke the function tracer with this output: ------------[ cut here ]------------ WARNING: at kernel/trace/ftrace.c:1014 ftrace_bug+0x114/0x171() Hardware name: Precision WorkStation 470 Modules linked in: i2c_core(+) Pid: 86, comm: modprobe Not tainted 2.6.37-rc2+ #68 Call Trace: [] warn_slowpath_common+0x85/0x9d [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] warn_slowpath_null+0x1a/0x1c [] ftrace_bug+0x114/0x171 [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ftrace_process_locs+0x1ae/0x274 [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ftrace_module_notify+0x39/0x44 [] notifier_call_chain+0x37/0x63 [] __blocking_notifier_call_chain+0x46/0x5b [] blocking_notifier_call_chain+0x14/0x16 [] sys_init_module+0x73/0x1f3 [] system_call_fastpath+0x16/0x1b ---[ end trace 2aff4f4ca53ec746 ]--- ftrace faulted on writing [] __process_new_adapter+0x7/0x34 [i2c_core] The cause was that the module text was set to read only before ftrace could convert the calls to mcount to nops. Thus, the conversions failed due to not being able to write to the text locations. The simple fix is to move setting the module to read only after the module notifiers are called (where ftrace sets the module mcounts to nops). Reported-by: Peter Zijlstra Acked-by: Rusty Russell Signed-off-by: Steven Rostedt commit 104db7ff1d9d01a03a2568a156b19e1fd972e8bf Merge: 4a7863c 32b2b6e Author: Ingo Molnar Date: Thu Dec 23 14:19:45 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 394f4528c523d88daabd50f883a8d6b164075555 Merge: 90a8a73 3c2dcf2 Author: Ingo Molnar Date: Thu Dec 23 12:57:04 2010 +0100 Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu commit 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 Author: Ajay Ramaswamy Date: Thu Dec 23 01:19:39 2010 -0800 Input: wacom - add support for digitizer in Lenovo W700 Signed-off-by: Ajay Ramaswamy Reviewed-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit ef8313bb1a22e7d2125d9d758aa8a81f1de91d81 Author: Andres Salomon Date: Thu Dec 23 01:19:38 2010 -0800 Input: psmouse - disable the synaptics extension on OLPC machines OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode). Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 7ee99161a4febe53c906cb9becc596075fd6193e Author: Andres Salomon Date: Thu Dec 23 01:18:28 2010 -0800 Input: psmouse - fix up Synaptics comment Minor comment fixup for typos and grammar. Noticed while adding a separate workaround. Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 26e20a108caca6231c6a5ec659f815a866904751 Merge: 691513f 90a8a73 Author: Ingo Molnar Date: Thu Dec 23 09:48:41 2010 +0100 Merge commit 'v2.6.37-rc7' into x86/security commit cfb13c5db08c90311a5defdde9a0328ee788cca5 Merge: 4b6ba8a 90a8a73 Author: Grant Likely Date: Thu Dec 23 00:41:14 2010 -0700 Merge commit 'v2.6.37-rc7' into devicetree/next commit 5f7bb3a439ce51ae8b92ca1dc93b91712224b69a Author: adam radford Date: Tue Dec 14 19:11:56 2010 -0800 [SCSI] megaraid_sas: Documentation update The following patch updates the Documentation/scsi/ChangeLog.megaraid_sas file. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 9c915a8c99bce637226aa09cb05fc18486b229cb Author: adam radford Date: Tue Dec 21 13:34:31 2010 -0800 [SCSI] megaraid_sas: Add 9565/9285 specific code This patch adds MegaRAID 9265/9285 (Device id 0x5b) specific code Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit cd50ba8ede5cd3c4606a8e5d163913da5ff36ad7 Author: adam radford Date: Tue Dec 21 10:23:23 2010 -0800 [SCSI] megaraid_sas: Add struct megasas_instance_template changes The following patch adds struct megasas_instance_template changes to the megaraid_sas driver, and changes all code to use the new instance entries: irqreturn_t (*service_isr )(int irq, void *devp); void (*tasklet)(unsigned long); u32 (*init_adapter)(struct megasas_instance *); u32 (*build_and_issue_cmd) (struct megasas_instance *, struct scsi_cmnd *); void (*issue_dcmd) (struct megasas_instance *instance, struct megasas_cmd *cmd); Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit b6d5d8808b4c563a56414a4c4c6d652b5f87c088 Author: adam radford Date: Tue Dec 14 18:56:07 2010 -0800 [SCSI] megaraid_sas: Use lowest memory bar for SR-IOV VF support The following patch modifies the megaraid_sas driver to select the lowest memory bar available so the driver will work in SR-IOV VF environments where the memory bar mapping changes. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 80d9da98b4034edd31f6bacdb96c7489c4460173 Author: adam radford Date: Tue Dec 21 10:17:40 2010 -0800 [SCSI] megaraid_sas: Add MSI-X support and msix_disable module parameter This patch adds MSI-X support and 'msix_disable' module parameter to the megaraid_sas driver. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 46081b166415acb66d4b3150ecefcd9460bb48a1 Author: FUJITA Tomonori Date: Mon Dec 20 18:44:45 2010 +0200 [SCSI] st: Increase success probability in driver buffer allocation Modify allocation to try the minimum possible page order allowed by the HBA scatter/gather segment limit in allocation of the driver's internal buffer. This increases the probability of successful allocation. The allocation may still fail if this minimum order is > 0. Signed-off-by: FUJITA Tomonori Signed-off-by: Kai Makisara Reported-by: Lukas Kolbe Signed-off-by: James Bottomley commit 373daacfce9ea0091cb3027572354ddebefb8ebb Author: Kai Makisara Date: Mon Dec 20 18:43:39 2010 +0200 [SCSI] st: Store page order before driver buffer allocation The order of the pages allocated for the driver buffer must be stored before allocation because it is used in freeing already allocated pages if allocation fails. Signed-off-by: Kai Makisara Reported-by: Lukas Kolbe Signed-off-by: James Bottomley commit a87e3a67d57472f40da2218793ff6d25c4518498 Author: Douglas Gilbert Date: Fri Dec 17 19:16:06 2010 -0500 [SCSI] scsi_debug: set resid to indicate no data-in when medium error set resid to the requested data-in length when a MEDIUM ERROR is simulated. This implies no valid data is returned in the data-in buffer Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit a8733c7baf457b071528e385a0b7d4aaec79287c Author: James Bottomley Date: Fri Dec 17 15:36:34 2010 -0500 [SCSI] fix medium error problems with some arrays which can cause data corruption Our current handling of medium error assumes that data is returned up to the bad sector. This assumption holds good for all disk devices, all DIF arrays and most ordinary arrays. However, an LSI array engine was recently discovered which reports a medium error without returning any data. This means that when we report good data up to the medium error, we've reported junk originally in the buffer as good. Worse, if the read consists of requested data plus a readahead, and the error occurs in readahead, we'll just strip off the readahead and report junk up to userspace as good data with no error. The fix for this is to have the error position computation take into account the amount of data returned by the driver using the scsi residual data. Unfortunately, not every driver fills in this data, but for those who don't, it's set to zero, which means we'll think a full set of data was transferred and the behaviour will be identical to the prior behaviour of the code (believe the buffer up to the error sector). All modern drivers seem to set the residual, so that should fix up the LSI failure/corruption case. Reported-by: Douglas Gilbert Cc: Stable Tree Signed-off-by: James Bottomley commit 0b50c691f93a973136dc821ef11372ffdfae9646 Author: Tony Lindgren Date: Wed Dec 22 18:42:36 2010 -0800 omap2+: Initialize serial port for dynamic remuxing for n8x0 Use omap_serial_init_port so we can let the serial code handle the remuxing of the RX pads. Note that this patch alone is not enough and additional GPIO related patches are needed. Only initialize uart3_rx_irrx pin, the other uart pins can be stay static. Signed-off-by: Tony Lindgren commit 40e44399301b6dbd997408a184140b79b77f632d Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add struct omap_board_data and use it for platform level serial init This is needed to pass board specific data such as pads used to the platform level driver init code. Signed-off-by: Tony Lindgren commit 8d9af88f55be89fa4c897ded3204ef12c947731e Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Allow hwmod state changes to mux pads based on the state changes Allow hwmod state changes to mux pads based on the state changes. By default, only enable and disable the pads. In some rare cases dynamic remuxing for the idles states is needed, this can be done by passing the enable, idle, and off pads from board-*.c file along with OMAP_DEVICE_PAD_REMUX flag. Thanks to Paul Walmsley for the comments on the hwmod related changes. Signed-off-by: Tony Lindgren commit 9796b323b5a1940f9ec62c3a6cf7e442bf540d53 Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add support for hwmod specific muxing of devices This allows adding hwmod specific pads dynamically during the platform device init. Note that we don't currently have the hwmod specific signals listed in the hwmod data, but struct omap_hwmod_mux_info will make that possible if necessary. Signed-off-by: Tony Lindgren commit 8419fdbaf2118a0a169441be82f09f7be93a5ca1 Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add omap_mux_get_by_name Do this by splitting _omap_mux_init_signal as it already has most of the necessary features. Based on an earlier patch by Dan Murphy . Cc: Dan Murphy Signed-off-by: Tony Lindgren commit 17f9cc3124c97f50a19a7597e5f29f915b5b835c Author: Gustavo F. Padovan Date: Wed Dec 22 23:00:34 2010 -0200 Bluetooth: Improve handling of HCI control channel in bind Does not allow any channel different of HCI_CHANNEL_RAW and HCI_CHANNEL_CONTROL to bind. Signed-off-by: Gustavo F. Padovan commit 23bb57633df97ede067ea26f3cdc8a7ba2cd8109 Author: Johan Hedberg Date: Tue Dec 21 23:01:27 2010 +0200 Bluetooth: Fix __hci_request synchronization for hci_open_dev The initialization function used by hci_open_dev (hci_init_req) sends many different HCI commands. The __hci_request function should only return when all of these commands have completed (or a timeout occurs). Several of these commands cause hci_req_complete to be called which causes __hci_request to return prematurely. This patch fixes the issue by adding a new hdev->req_last_cmd variable which is set during the initialization procedure. The hci_req_complete function will no longer mark the request as complete until the command matching hdev->req_last_cmd completes. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit c71e97bfaadfa727669fcfcf12301744fd169091 Author: Johan Hedberg Date: Mon Dec 13 21:07:07 2010 +0200 Bluetooth: Add management events for controller addition & removal This patch adds Bluetooth Management interface events for controller addition and removal. The events correspond to the existing HCI_DEV_REG and HCI_DEV_UNREG stack internal events. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit f7b64e69c7c75c8e9f2d5e23edec8de1ce883bcc Author: Johan Hedberg Date: Mon Dec 13 21:07:06 2010 +0200 Bluetooth: Add read_info management command This patch implements the read_info command which is used to fetch basic info about an adapter. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit faba42eb2a8cf905ed26d540c3c93d429e327224 Author: Johan Hedberg Date: Mon Dec 13 21:07:05 2010 +0200 Bluetooth: Add read_index_list management command This patch implements the read_index_list command through which userspace can get a list of current adapter indices. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 02d981292ad3149e8e5f37cffbccedab1a8576d8 Author: Johan Hedberg Date: Mon Dec 13 21:07:04 2010 +0200 Bluetooth: Add read_version management command This patch implements the initial read_version command that userspace will use before any other management interface operations. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit e41d8b4e131a41f2a3b74aaa783b16aa46376d8e Author: Johan Hedberg Date: Mon Dec 13 21:07:03 2010 +0200 Bluetooth: Add error handling for managment command handlers The command handlers for bluetooth management messaging should be able to report errors (such as memory allocation failures) to the higher levels in the call stack. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit f622691c91cd1bb27d03a5caa8a43822572c62bc Author: Tomoya Date: Wed Dec 22 03:00:39 2010 +0000 pch_can: Fix array miss-pointing issue Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 05fad3e72e98e57274b8930a08f8b476048f5022 Author: Kevin Hilman Date: Wed Dec 22 23:04:17 2010 +0000 OMAP2: PM: fix compile error when !CONFIG_SUSPEND When CONFIG_SUSPEND is not enabled, none of the system PM methods are used, so do not compile them in. Thanks to Charles Manning for reporting the problem and proposing an initial patch. Reported-by: Charles Manning Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 1c4655651f1377297425525b250b2e4b5462015b Merge: f400c82 b35cecf Author: Tony Lindgren Date: Wed Dec 22 15:08:05 2010 -0800 Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit f400c82efb474b2ccf01c796b60b36408f7845a3 Author: Paul Walmsley Date: Mon Dec 6 19:08:54 2010 -0700 MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership Add myself and Benoît as co-maintainers of the OMAP hwmod core code. (The OMAP hwmod code manages the integration of IP blocks on the OMAP SoC family.) Add Benoît as the maintainer of OMAP4-based SoC hwmod mode. Signed-off-by: Paul Walmsley Signed-off-by: Benoît Cousson Signed-off-by: Tony Lindgren commit 25cf0398bdf365d027e171116aa4a281e9cd3c1c Merge: 9326845 59bdd13 Author: Russell King Date: Wed Dec 22 22:46:24 2010 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit 1da0c89c66753860ccfe81eb327c25db46c2a24a Author: Russell King Date: Wed Dec 15 21:56:47 2010 +0000 ARM: versatile: convert sched_clock() to use new infrastructure Convert versatile platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Will Deacon Signed-off-by: Russell King commit f06a1624621527ef597ae4b3b795553fc1b2eff2 Author: Russell King Date: Wed Dec 15 21:55:06 2010 +0000 ARM: orion: convert sched_clock() to use new infrastructure Convert orion platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Nicolas Pitre Signed-off-by: Russell King commit dc548fbbd2ecd0fc3b02301d551e5f8e19ae58fd Author: Russell King Date: Wed Dec 15 21:53:51 2010 +0000 ARM: omap: convert sched_clock() to use new infrastructure Convert omap to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Santosh Shilimkar Signed-off-by: Russell King commit ec05aa139939d9c7b790041a379f0e752b2f1a4d Author: Russell King Date: Wed Dec 15 21:53:02 2010 +0000 ARM: nomadik: convert sched_clock() to use new infrastructure Convert nomadik platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Linus Walleij Signed-off-by: Russell King commit 08f26b1ef25a2f7b52afcb805d260fd5a000a7f6 Author: Russell King Date: Wed Dec 15 21:52:10 2010 +0000 ARM: iop: convert sched_clock() to use new infrastructure Convert iop platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 5c21b7ca2c1cca3758a1d357dd57987c96ad1aa0 Author: Russell King Date: Wed Dec 15 21:50:14 2010 +0000 ARM: u300: convert sched_clock() to use new infrastructure Convert u300 to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Linus Walleij Signed-off-by: Russell King commit e3f4c0ab916334e861fc49eeb2673a8c13e978e7 Author: Russell King Date: Wed Dec 15 21:49:42 2010 +0000 ARM: tegra: convert sched_clock() to use new infrastructure Convert tegra to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Olof Johansson Signed-off-by: Russell King commit 5094b92f1c7d0f21c5d4411ba7415bac0684210f Author: Russell King Date: Wed Dec 15 21:49:06 2010 +0000 ARM: sa1100: convert sched_clock() to use new infrastructure Convert sa1100 to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 7ce830188199c23aaeaf0c5ccc28b73c32b6df02 Author: Russell King Date: Wed Dec 15 21:48:15 2010 +0000 ARM: pxa: convert sched_clock() to use new infrastructure Convert pxa to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Eric Miao Signed-off-by: Russell King commit 28bb7bc61a8cd48716d38d9c153fdc524f09870a Author: Russell King Date: Wed Dec 15 21:46:48 2010 +0000 ARM: mmp: convert sched_clock() to use new infrastructure Convert mmp to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 5b0d495c067d843c52fc1f9edbca29d5e9368b10 Author: Russell King Date: Wed Dec 15 21:23:13 2010 +0000 ARM: ixp4xx: convert sched_clock() to use new infrastructure Convert ixp4xx to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Mikael Pettersson Signed-off-by: Russell King commit 112f38a4a31668eb6a7d91d128296a26afdf7c4b Author: Russell King Date: Wed Dec 15 19:23:07 2010 +0000 ARM: sched_clock: provide common infrastructure for sched_clock() Provide common sched_clock() infrastructure for platforms to use to create a 64-bit ns based sched_clock() implementation from a counter running at a non-variable clock rate. This implementation is based upon maintaining an epoch for the counter and an epoch for the nanosecond time. When we desire a sched_clock() time, we calculate the number of counter ticks since the last epoch update, convert this to nanoseconds and add to the epoch nanoseconds. We regularly refresh these epochs within the counter wrap interval. We perform a similar calculation as above, and store the new epochs. We read and write the epochs in such a way that sched_clock() can easily (and locklessly) detect when an update is in progress, and repeat the loading of these constants when they're known not to be stable. The one caveat is that sched_clock() is not called in the middle of an update. We achieve that by disabling IRQs. Finally, if the clock rate is known at compile time, the counter to ns conversion factors can be specified, allowing sched_clock() to be tightly optimized. We ensure that these factors are correct by providing an initialization function which performs a run-time check. Acked-by: Peter Zijlstra Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Tested-by: Jamie Iles Reviewed-by: Nicolas Pitre Signed-off-by: Russell King commit b5776c4a6d0afc13697e8452b9ebe1cc4d961b74 Author: john stultz Date: Thu Dec 16 19:03:27 2010 +0000 Fix rounding in clocks_calc_mult_shift() Russell King reports: | On the ARM dev boards, we have a 32-bit counter running at 24MHz. Calling | clocks_calc_mult_shift(&mult, &shift, 24MHz, NSEC_PER_SEC, 60) gives | us a multiplier of 2796202666 and a shift of 26. | | Over a large counter delta, this produces an error - lets take a count | from 362976315 to 4280663372: | | (4280663372-362976315) * 2796202666 / 2^26 - (4280663372-362976315) * (1000/24) | => -38.91872422891230269990 | | Can we do better? | | (4280663372-362976315) * 2796202667 / 2^26 - (4280663372-362976315) * (1000/24) | 19.45936211449532822051 | | which is about twice as good as the 2796202666 multiplier. | | Looking at the equivalent divisions obtained, 2796202666 / 2^26 gives | 41.66666665673255920410ns per tick, whereas 2796202667 / 2^26 gives | 41.66666667163372039794ns. The actual value wanted is 1000/24 = | 41.66666666666666666666ns. Fix this by ensuring we round to nearest when calculating the multiplier. Signed-off-by: John Stultz Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Tested-by: Jamie Iles Signed-off-by: Russell King commit 5e06b6492e53ab2a4e467763a9ee9f70b032c301 Author: Russell King Date: Wed Dec 15 19:19:25 2010 +0000 ARM: ensure all sched_clock() implementations are notrace marked ftrace requires sched_clock() to be notrace. Ensure that all implementations are so marked. Also make sure that they include linux/sched.h Also ensure OMAP clocksource read functions are marked notrace as they're used for sched_clock() too. Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Signed-off-by: Russell King commit 684e94cbcb5add60356d124166e40feb2174f0f1 Author: Colin Cross Date: Wed Nov 17 16:20:15 2010 -0800 ARM: tegra: timer: Separate clocksource and sched_clock tegra_clocksource_read should not use cnt32_to_63, wrapping is already handled in the clocksource code. Move the cnt32_to_63 into the sched_clock function, and replace the use of clocksource mult and shift with a multiplication by 1000 to convert us to ns. Acked-by: John Stultz Acked-by: Linus Walleij Tested-by: Olof Johansson Signed-off-by: Colin Cross Signed-off-by: Russell King commit 11e718a6535c0c7a375b24c3ad60a98b988090c8 Author: Russell King Date: Mon Dec 13 13:21:52 2010 +0000 ARM: realview/versatile: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Will Deacon Signed-off-by: Russell King commit 2218543fe0c40ce36fa165c5003072cc8b236c34 Author: Russell King Date: Mon Dec 13 13:21:41 2010 +0000 ARM: stmp: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af Author: Russell King Date: Mon Dec 13 13:21:33 2010 +0000 ARM: orion: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Nicolas Pitre Signed-off-by: Russell King commit e0387320c32d4b9852e6436233274003e82318a6 Author: Russell King Date: Mon Dec 13 13:21:21 2010 +0000 ARM: spear: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Viresh Kumar Signed-off-by: Russell King commit 8492fd28987732e42f33a3711299927e8905d448 Author: Russell King Date: Mon Dec 13 13:20:49 2010 +0000 ARM: nomadik: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Linus Walleij Signed-off-by: Russell King commit 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 Author: Russell King Date: Mon Dec 13 13:20:35 2010 +0000 ARM: mxc: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Sascha Hauer Signed-off-by: Russell King commit d28b116b9239b603f790a5ed6f0c5fe329561b49 Author: Russell King Date: Mon Dec 13 13:20:23 2010 +0000 ARM: iop: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 894cf56b1a64b65360086c2c890c2ae7f257793f Author: Russell King Date: Mon Dec 13 13:20:06 2010 +0000 ARM: nuc: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Wan zongshun Signed-off-by: Russell King commit da797478c1ba05a858c7719a02ce0856a5bb69ce Author: Russell King Date: Mon Dec 13 13:19:55 2010 +0000 ARM: U300: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Linus Walleij Signed-off-by: Russell King commit 6b46340a18e7552656097119d121b4b42049dde1 Author: Russell King Date: Mon Dec 13 13:19:44 2010 +0000 ARM: tcc8k: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 2c760b5b52a56e8b92c384dc9611e23fd4980d03 Author: Russell King Date: Mon Dec 13 13:19:35 2010 +0000 ARM: SA11x0: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 71c874529904818a2888a650425369e0842ff28d Author: Russell King Date: Mon Dec 13 13:19:22 2010 +0000 ARM: s5pv310: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Kukjin Kim Signed-off-by: Russell King commit f62ae0ce4369effc432ea25df09c88d7aa08965e Author: Russell King Date: Mon Dec 13 13:19:11 2010 +0000 ARM: PXA: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Eric Miao Signed-off-by: Russell King commit 8437c25e78c3af2b31bf6c8942494e34e267f446 Author: Russell King Date: Mon Dec 13 13:18:44 2010 +0000 ARM: omap: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Santosh Shilimkar Signed-off-by: Russell King commit b460ddbbe29a45cc13e3f13314ec9aed7e9412f2 Author: Russell King Date: Mon Dec 13 13:18:32 2010 +0000 ARM: ns9xxx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e Author: Russell King Date: Mon Dec 13 13:18:21 2010 +0000 ARM: netx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit ff9c9772480f06bc7164217b93ebb99fc088539f Author: Russell King Date: Mon Dec 13 13:18:12 2010 +0000 ARM: MSM: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-By: Jeff Ohlstein Acked-by: David Brown Signed-off-by: Russell King commit 5975f496e07e0f1e396939308b815f99907440ea Author: Russell King Date: Mon Dec 13 13:18:04 2010 +0000 ARM: mmp: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 594cbf2f4ceaaacc706eb1302ff139a61092ec6f Author: Russell King Date: Mon Dec 13 13:17:52 2010 +0000 ARM: lpc32xx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit b7c7c50adcf0d9c901542c5db8d795fe226bb454 Author: Russell King Date: Mon Dec 13 13:17:40 2010 +0000 ARM: ixp4xx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Mikael Pettersson Signed-off-by: Russell King commit 08963dab7c6b0ba6a687cb008299eabbbeff7282 Author: Russell King Date: Mon Dec 13 13:17:24 2010 +0000 ARM: integrator: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 7c044be50d4bdc33e039a65956b8a927feecaaa3 Author: Russell King Date: Mon Dec 13 13:17:12 2010 +0000 ARM: davinci: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Russell King commit 6eda51192fb1c767f792e92c67b9a4fd73c1fcba Author: Russell King Date: Mon Dec 13 13:16:39 2010 +0000 ARM: bcmring: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-By: Scott Branden Acked-By: Jiandong Zheng Signed-off-by: Russell King commit 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Author: Franck Bui-Huu Date: Wed Dec 22 17:37:13 2010 +0100 perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850. Cc: H. Peter Anvin Cc: Masami Hiramatsu Cc: Ingo Molnar Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit d3678758048308049cdad31ec3eae063be17c0db Author: Arnaldo Carvalho de Melo Date: Tue Dec 21 23:38:37 2010 -0200 perf test: Look forward for symbol aliases Not just before, fixing these false positives: [acme@mica linux]$ perf test -v 1 1: vmlinux symtab matches kallsyms: --- start --- Looking at the vmlinux_path (6 entries long) Using //lib/modules/2.6.37-rc5-00180-ge06b6bf/build/vmlinux for symbols 0xffffffff81058dc0: diff name v: sys_vm86old k: sys_ni_syscall 0xffffffff81058dc0: diff name v: sys_vm86 k: sys_ni_syscall 0xffffffff81058dc0: diff name v: sys_subpage_prot k: sys_ni_syscall 0xffffffff810b5f7c: diff name v: probe_kernel_write k: __probe_kernel_write 0xffffffff810b5fe5: diff name v: probe_kernel_read k: __probe_kernel_read 0xffffffff811bc380: diff name v: __memset k: memset 0xffffffff81384a98: diff name v: __sched_text_start k: sleep_on_common 0xffffffff81386750: diff name v: __sched_text_end k: _raw_spin_trylock 0xffffffff8138cee8: diff name v: __irqentry_text_start k: do_IRQ 0xffffffff8138f079: diff name v: __start_notes k: _etext 0xffffffff8138f079: diff name v: __stop_notes k: _etext ---- end ---- vmlinux symtab matches kallsyms: FAILED! [acme@mica linux]$ Some are weak functions, others are just markers, etc. They get in the rb tree with the same addr, so we need to look around to find the symbol with the same name. We were looking just at the previous entries with the same addr, look forward too. Cc: Frederic Weisbecker Cc: Han Pingtian Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit b35cecf978e33bf8f4be0f36ffe00fe10f381c4a Author: Thara Gopinath Date: Wed Aug 18 12:23:12 2010 +0530 OMAP4: Smartreflex framework extensions This patch extends the smartreflex framework to support OMAP4. The changes are minor like compiling smartreflex Kconfig option for OMAP4 also, and a couple of OMAP4 checks in the smartreflex framework. The change in sr_device.c where new logic has to be introduced for reading the efuse registers is due to the fact that in OMAP4 the efuse registers are 24 bit aligned. A __raw_readl will fail for non-32 bit aligned address and hence the 8-bit read and shift. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fb200cfb2330b959eabc94e2f2c15717ce8466af Author: Benoit Cousson Date: Wed Aug 18 12:22:52 2010 +0530 OMAP4: hwmod: Add inital data for smartreflex modules. This patch adds the hwmod details for OMAP4 smartreflex modules. Signed-off-by: Benoit Cousson Signed-off-by: Kevin Hilman commit 1376ee1d191b32d0be6d2956f1a6f3dd63251e2e Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP4: PM: Program correct init voltages for scalable VDDs By default the system boots up at nominal voltage for every voltage domain in the system. This patch puts vdd_mpu, vdd_iva and vdd_core to the correct boot up voltage as per the opp tables specified. This patch implements this by matching the rate of the main clock of the voltage domain with the opp table and picking up the correct voltage. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit bd38107b565a41d994aa22db0962ffcc34ebef02 Author: Thara Gopinath Date: Fri Dec 10 23:15:23 2010 +0530 OMAP4: Adding voltage driver support OMAP4 has three scalable voltage domains vdd_mpu, vdd_iva and vdd_core. This patch adds the voltage tables and other configurable voltage processor and voltage controller settings to control these three scalable domains in OMAP4. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 3b01a413c196c91040d41c86e5b56f76bb369f74 Author: Arnaldo Carvalho de Melo Date: Wed Dec 22 01:08:36 2010 -0200 perf symbols: Improve kallsyms symbol end addr calculation For kallsyms we don't have the symbol address end, so we do an extra pass and set the symbol end addr as being the start of the next minus one. But this was being done just after we filtered the symbols of a particular type (functions, variables), so the symbol end was sometimes after what it really is. Fixing up symbol end also was falling apart when we have symbol aliases, then the end address of all but the last alias was being set to be before its start. Fix it up by checking for symbol aliases and making the kallsyms__parse routine use the next symbol, whatever its type, as the limit for the previous symbol, passing that end address to the callback. This was detected by the 'perf test' synthetic paranoid regression tests, fix it up so that even that case doesn't mislead us. Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 7bc3ed9ae632b9c94d3721d555d3452e24ca8ee3 Author: Thara Gopinath Date: Fri Dec 10 23:15:16 2010 +0530 OMAP4: Register voltage PMIC parameters with the voltage layer TWL6030 is the power IC used along with OMAP4 in OMAP4 SDPs, blaze boards and panda boards. This patch registers the OMAP4 PMIC specific information with the voltage layer. This also involves implementing a different formula for voltage to vsel and vsel to voltage calculations from TWL4030. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 1482d8be5525eccdec6286677d40af29da03a30c Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP3: PM: Program correct init voltages for VDD1 and VDD2 By default the system boots up at nominal voltage for every voltage domain in the system. This patch puts VDD1 and VDD2 to the correct boot up voltage as per the opp tables specified. This patch implements this by matching the rate of the main clock of the voltage domain with the opp table and picking up the correct voltage. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 077fceca3a5db69791d64723ffba1caad2f03a08 Author: Thara Gopinath Date: Wed Oct 27 20:29:37 2010 +0530 OMAP3: PM: Adding debug support to Voltage and Smartreflex drivers This patch adds debug support to the voltage and smartreflex drivers. This means a whole bunch of voltage processor and smartreflex parameters are now visible through the pm debugfs. The voltage parameters can be viewed at /debug/voltage/vdd_/ and the smartreflex parameters can be viewed at /debug/voltage/vdd_/smartreflex/ Also smartreflex n-target values are now exposed out at /debug/voltage/vdd_/smartreflex/nvalue/ This is a read-write interface which means user has the flexibility to change the n-target values for any opp. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fbc319f67660ede23cc22f3af5df559693f8062e Author: Thara Gopinath Date: Fri Dec 10 22:51:05 2010 +0530 OMAP3: PM: Register TWL4030 pmic info with the voltage driver. This patch registers the TWL4030 PMIC specific informtion with the voltage driver. Failing this patch the voltage driver is unware of the formula to use for vsel to voltage and vice versa conversion and lot of other PMIC dependent parameters. This file is based on the arch/arm/plat-omap opp_twl_tpl.c file by Paul Walmsley. The original file is replaced by this file. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fa765823a3cbb9ce1b13ce2832109a50d899c471 Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP3: PM: Adding smartreflex class3 driver Smartreflex Class3 implementation continuously monitors silicon performance and instructs the Voltage Processors to increase or decrease the voltage. This patch adds smartreflex class 3 driver. This driver hooks up with the generic smartreflex driver smartreflex.c to abstract out class specific implementations out of the generic driver. Class3 driver is chosen as the default class driver for smartreflex. If any other class driver needs to be implemented, the init of that driver should be called from the board file. That way the new class driver will over-ride the Class3 driver. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit d34427267186827dfd62bd8cf726601fffb22534 Author: Thara Gopinath Date: Sat May 29 22:02:24 2010 +0530 OMAP3: PM: Adding smartreflex hwmod data This patch adds the smartreflex hwmod data for OMAP3430 and OMAP3630. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 0c0a5d61ed9319e7e666990a7888f3b00868ac20 Author: Thara Gopinath Date: Sat May 29 22:02:23 2010 +0530 OMAP3: PM: Adding smartreflex device file. This patch adds support for device registration of various smartreflex module present in the system. This patch introduces the platform data for smartreflex devices which include the efused n-target vaules, a parameter to indicate whether smartreflex autocompensation needs to be enabled on init or not. An API omap_enable_smartreflex_on_init is provided for the board files to enable smartreflex autocompensation during system boot up. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 984aa6dbf4ca5be806fee217311c9cc68e8f2e88 Author: Thara Gopinath Date: Sat May 29 22:02:22 2010 +0530 OMAP3: PM: Adding smartreflex driver support. SmartReflex modules do adaptive voltage control for real-time voltage adjustments. With Smartreflex the power supply voltage can be adapted to the silicon performance(manufacturing process, temperature induced performance, age induced performance etc). There are differnet classes of smartreflex implementation. Class-0: Manufacturing Test Calibration Class-1: Boot-Time Software Calibration Class-2: Continuous Software Calibration Class-3: Continuous Hardware Calibration Class-4: Fully Integrated Power Management OMAP3 has two smartreflex modules one associated with VDD MPU and the other associated with VDD CORE. This patch adds support for smartreflex driver. The driver is designed for Class-1 , Class-2 and Class-3 support and is a platform driver. Smartreflex driver can be enabled through a Kconfig option "SmartReflex support" under "System type"->"TI OMAP implementations" menu. Smartreflex autocompensation feature can be enabled runtime through a debug fs option. To enable smartreflex autocompensation feature echo 1 > /debug/voltage/vdd_/smartreflex/autocomp To disable smartreflex autocompensation feature echo 0 > /debug/voltage/vdd_/smartreflex/autocomp where X can be mpu, core , iva etc. This patch contains code originally in linux omap pm branch. Major contributors to this driver are Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley, Nishant Menon, Kevin Hilman. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 3b92408c7dfeb918fdd2f9fadc73177a59ad621c Author: Thara Gopinath Date: Wed Aug 18 16:21:58 2010 +0530 OMAP: Introduce voltage domain information in the hwmod structures This patch extends the device hwmod structure to contain info about the voltage domain to which the device belongs to. This is needed to support a device based DVFS where the device knows which voltage domain it belongs to. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 2f34ce81b8c05c900e45bd88595cc154f7bb5957 Author: Thara Gopinath Date: Sat May 29 22:02:21 2010 +0530 OMAP3: PM: Adding voltage driver support. This patch adds voltage driver support for OMAP3. The driver allows configuring the voltage controller and voltage processors during init and exports APIs to enable/disable voltage processors, scale voltage and reset voltage. The driver maintains the global voltage table on a per VDD basis which contains the various voltages supported by the VDD along with per voltage dependent data like smartreflex efuse offset, errminlimit and voltage processor errorgain. The driver also allows the voltage parameters dependent on the PMIC to be passed from the PMIC file through an API. The driver allows scaling of VDD voltages either through "vc bypass method" or through "vp forceupdate method" the choice being configurable through the board file. This patch contains code originally in linux omap pm branch smartreflex driver. Major contributors to this driver are Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley, Nishant Menon, Kevin Hilman. The separation of PMIC parameters into a separate structure which can be populated from the PMIC file is based on the work of Lun Chang from Motorola in an internal tree. Signed-off-by: Thara Gopinath [khilman: fixed link error for OMAP2-only defconfig] Signed-off-by: Kevin Hilman commit a3ba81131aca243bfecfa78c42edec0cd69f72d6 Author: Ben Gamari Date: Wed Dec 22 13:30:14 2010 -0500 Make fixdep error handling more explicit Also add missing error handling to fstat call Signed-off-by: Ben Gamari Signed-off-by: Michal Marek commit 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f Author: Don Zickus Date: Wed Dec 22 14:00:03 2010 -0500 x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR The x86 arch has shifted its use of the nmi_watchdog from a local implementation to the global one provide by kernel/watchdog.c. This shift has caused a whole bunch of compile problems under different config options. I attempt to simplify things with the patch below. In order to simplify things, I had to come to terms with the meaning of two terms ARCH_HAS_NMI_WATCHDOG and CONFIG_HARDLOCKUP_DETECTOR. Basically they mean the same thing, the former on a local level and the latter on a global level. With the old x86 nmi watchdog gone, there is no need to rely on defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't make sense any more. x86 will now use the global implementation. The changes below do a few things. First it changes the few places that relied on ARCH_HAS_NMI_WATCHDOG to use CONFIG_X86_LOCAL_APIC (the former was an alias for the latter anyway, so nothing unusual here). Those pieces of code were relying more on local apic functionality the nmi watchdog functionality, so the change should make sense. Second, I removed the x86 implementation of touch_nmi_watchdog(). It isn't need now, instead x86 will rely on kernel/watchdog.c's implementation. Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from x86. And tweaked the include/linux/nmi.h file to tell users to look for an externally defined touch_nmi_watchdog in the case of ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This changes removes some of the ugliness in that file. Finally, I added a Kconfig dependency for CONFIG_HARDLOCKUP_DETECTOR that said you can't have ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR. You can only have one nmi_watchdog. Tested with ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig, (various broken configs) Hopefully, after this patch I won't get any more compile broken emails. :-) v3: changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct function prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set. Signed-off-by: Don Zickus Cc: Peter Zijlstra Cc: fweisbec@gmail.com LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a Author: Chaoming Li Date: Wed Dec 22 10:56:02 2010 -0600 rtlwifi: Fix large packet issue An RX buffer is set to 9100 bytes to receive 8K AMSDU; however, an skb of this size fails in the kernel. Signed-off-by: Chaoming Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 172128468f61e16e1427238278b9ad775584aa89 Author: Johannes Berg Date: Wed Dec 22 10:15:30 2010 +0100 mac80211: cleanup select_queue There's a redundant rcu_read_lock/unlock pair, a redundant variable, and a few redundant accesses to the 1d_to_ac array. Fix this to make the code neater and easier to follow. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit db7ec38d8e99f449856c11ffaef363a8eb5af90f Author: Mohammed Shafi Shajakhan Date: Wed Dec 22 12:20:12 2010 +0530 ath9k: Reset keycache on resume It looks like some hardware registers are left into undefined state after suspend/resume. At minimum, this can cause odd issues related to key cache and hardware trying to encrypt/decrypt frames unexpectedly. This seems to happen even when there is no keys configured, i.e., hardware can end up touching TX frames just based of invalid key cache context even if the driver is not asking a specific entry to be used. In addition, RX can likely be affected. This patch fixes this issue. Signed-off-by: Jouni Malinen Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit e6d8a817d00793eecd063b1548bbc954ab62b124 Author: Larry Finger Date: Tue Dec 21 19:40:40 2010 -0600 rtlwifi: rtl8192ce: Fix driver problem when radio switch off at module load If the radio enable switch is off when the driver is loaded, it is not possible to get radio output until the driver is unloaded and reloaded with the switch on. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 40d70dd12200ffeacfe9caaa8242e3ad2995bb5d Author: Jussi Kivilinna Date: Tue Dec 21 22:44:49 2010 +0200 rndis_wlan: add support for set_power_mgmt Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 49b35bd3f5bbc6997b24b04e9d4896f00cee3528 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:42 2010 +0200 rndis_wlan: add support for set_cqm_rssi_config Device poller already reads current RSSI, so add support for set_cqm_rssi_config there. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit a3463a1fdc9aa0881760e54efbd62742275601a5 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:34 2010 +0200 rndis_wlan: remove unused variable from priv structure Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit c2aa413279cde7c867fc90b07f83fff3c1e9e98d Author: Jussi Kivilinna Date: Tue Dec 21 22:44:27 2010 +0200 rndis_wlan: constify rndis_config_ops Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 21b27beca73ad7d2829fe9cc3e48054f69e3d9d3 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:20 2010 +0200 rndis_wlan: turn radio off before interface is bring up Radio should be off when interface is down. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 0b578021745b61b2ff89f6bacbac5db08a9a8089 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:12 2010 +0200 rndis_wlan: do not set default_key if not WEP key rndis_set_default_key did call add_wep_key to set default key on device, even if key is WPA. This caused rndis_wlan not work with wpa_supplicant in nl80211 mode (causing disconnect from AP). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit bfe3850b0cfca6ba64395e2705d9a51cd044f374 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:05 2010 +0200 rndis_wlan: scanning, workaround device returning incorrect bssid-list item count. Sometimes device returns wrong number of items in bssid-list. Appears that some specific beacons trigger this problem and leads to very poor scanning results. Workaround by ignoring num_items received from device and walkthrough full bssid-list buffer. v2: Fix buffer range checks and reading next item length. Old code read behind buffer on last item but didn't use those values as 'count' would also reach zero. Also fix resizing of buffer if device has larger buffer, old code assumed that BSSID-list OID would return same buffer size when it really can return yet another new larger length. Tested-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit ab72efdf107e5b0e0a05efb8f24cc6c598ae31ea Author: Rafał Miłecki Date: Tue Dec 21 21:29:44 2010 +0100 b43: N-PHY: enable support for PHYs rev 3 and higher Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d4814e69eec24f46a9f0a6d57b80e0a6add594c7 Author: Rafał Miłecki Date: Tue Dec 21 23:57:48 2010 +0100 b43: N-PHY: update 2056 radio on channel switch on rev3+ Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d41446467320b7cbe550a85c44fd9d3cb12c119d Author: Rafał Miłecki Date: Tue Dec 21 19:40:18 2010 +0100 b43: N-PHY: use correct channel tables for rev4+ Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aca434d36f38754392f53e7b16f90eab66ae95e0 Author: Rafał Miłecki Date: Tue Dec 21 11:50:22 2010 +0100 b43: N-PHY: avoid PHY hangs for rev 3 and 4 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 94a5b0452410f8bdff27aa13592bec046fb6095d Author: Rafał Miłecki Date: Tue Dec 21 11:50:21 2010 +0100 b43: N-PHY: add init tables for 2056 radio Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ea7ee14b8a6371f006d73333ef2b7fe929b6dab0 Author: Rafał Miłecki Date: Tue Dec 21 17:13:44 2010 +0100 b43: N-PHY: implement radio 2056 init steps Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e41596a118a5cb15a045ef773dc117b2596e6a86 Author: Rafał Miłecki Date: Tue Dec 21 11:50:19 2010 +0100 b43: use correct firmware for newer cores Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d0ce2d170585b7061a08af061d64ebb08c6782dd Author: Vasanthakumar Thiagarajan Date: Tue Dec 21 01:42:43 2010 -0800 ath9k_hw: Fix bug in eeprom data length validation for AR9485 The size of the eeprom data is 1088 bytes for AR9485. But a sanity check is done against 4K which would result in a 'potential read past the end of the buffer' smatch complaint. Reported-by: Dan Carpenter Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 0207c0c51a37659a92232e665f2a7fadec170556 Author: Bruno Randolf Date: Tue Dec 21 17:30:43 2010 +0900 ath5k: Use helper function to get eeprom mode from channel Introduce a helper function to get the EEPROM mode from channel and remove multiple similar switch statements. Also since it's now easy to get the EEPROM mode from the channel, use them inside the functions which need it, instead of passing a redundant ee_mode parameter. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 26a51ad7f285236ca593c57cffcaadd40514084a Author: Bruno Randolf Date: Tue Dec 21 17:30:37 2010 +0900 ath5k: Remove ATH5K_INI_RFGAIN defines, use band instead Remove redundant defines. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 51f00622e5664ae77fd6c8670ddd402d9b77ccc8 Author: Bruno Randolf Date: Tue Dec 21 17:30:32 2010 +0900 ath5k: Track current TX power separately from max TX power Add a new variable to keep track of the currently configured tx power. Before max_pwr was re-used for keeping the maximum allowed power as well as the current configuration. Doing a min() on it allows you to lower the txpower, but how would you be able to make it higher again? This patch fixes that by adding a new variable ah_cur_pwr which is used instead of txp_max_pwr to keep the current configuration. txp_max_pwr is used to check if we are within the limits. Another problem fixed by this patch is that it avoids setting a zero txpower when things are initialized first and the current power is not yet set. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 56bd29d361a53f3bf6b815b5bf570a23bdc55b35 Author: Bruno Randolf Date: Tue Dec 21 17:30:26 2010 +0900 ath5k: Separate powertable setup and writing And rename functions which write the powertable to make it clearer. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 26c7fc436422de5d6d2b491f777e965e96f5c3a2 Author: Bruno Randolf Date: Tue Dec 21 17:30:20 2010 +0900 ath5k: Simplify powertable recalculation Let ath5k_hw_txpower() decide if it can re-use the powertable or if it has to be recalculated instead of passing a 'fast' flag from the outside. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc Author: Dan Carpenter Date: Tue Dec 21 06:59:06 2010 +0300 ath9k: unlock on error path in ath9k_change_interface() There is a missing unlock when we hit the "No beacon slot available" error condition. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 8d6a686a0d20d39c202fdfc6fa7f1daf1d6e3b35 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:56 2010 +0100 rtlwifi: Use pci_pcie_cap() Use function pci_pcie_cap() instead of accessing struct member directly. Signed-off-by: Hauke Mehrtens Tested-by: Larry Finger Signed-off-by: John W. Linville commit e40b5faabc34f61fdf17b40d2e31837461ddc467 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:55 2010 +0100 ath9k: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Luis R. Rodriguez Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit e98b06b09be0fc459806aa4d2c301cfaf268c570 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:54 2010 +0100 ath5k: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Luis R. Rodriguez Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 2cdb9a42f3b4c97088ea0768dbee55ee8863f233 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:53 2010 +0100 rt2x00: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. Signed-off-by: Hauke Mehrtens Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6b740aaa005474a7b135d3c554b9295c73eaab95 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:52 2010 +0100 ssb: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Michael Buesch Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 750de29109770f6b50daecc4c44aaa50a9e0075b Author: Hauke Mehrtens Date: Tue Dec 21 02:01:51 2010 +0100 wl12xx: remove unnecessary import No function declared in gpio.h is used here. Signed-off-by: Hauke Mehrtens Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 63d9faf665ba27c65f0cf118df05a412d3dfd39d Author: Hauke Mehrtens Date: Tue Dec 21 02:01:50 2010 +0100 wl1251: remove unnecessary import No function declared in gpio.h is used here. Signed-off-by: Hauke Mehrtens Acked-by: Kalle Valo Signed-off-by: John W. Linville commit afe68d0a8f5961652e26cea39d74e2cc820de841 Author: Luis R. Rodriguez Date: Mon Dec 20 11:29:59 2010 -0500 ath9k: fix aphy / wiphy idle mismatch ath9k supports its own set of virtual wiphys, and it uses the mac80211 idle notifications to know when a device needs to be idle or not. We recently changed ath9k to force idle on driver stop() and on resume but forgot to take into account ath9k's own virtual wiphy idle states. These are used internally by ath9k to check if the device's radio should be powered down on each idle call. Without this change its possible that the device could have been forced off but the virtual wiphy idle was left on. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d584747be838775cebbf5937c20b24da6899e3e8 Author: Rajkumar Manoharan Date: Mon Dec 20 14:39:51 2010 +0530 ath9k: Fix warnings on card removal The recently added warning message on power change failure is not needed on device removal. ath: Failed to wakeup in 500us ------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/hw.c:1618 ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]() Hardware name: 64756D6 Pid: 540, comm: kworker/u:3 Not tainted 2.6.37-rc6-wl #37 Call Trace: [] warn_slowpath_common+0x7a/0xb0 [] ? ath9k_iowrite32+0x0/0x90 [ath9k] [] warn_slowpath_null+0x15/0x20 [] ath9k_hw_setpower+0x61f/0x630 [ath9k_hw] [] ath9k_ps_wakeup+0x85/0xd0 [ath9k] [] ath9k_configure_filter+0x25/0x80 [ath9k] [] ieee80211_configure_filter+0x133/0x190 [mac80211] [] ieee80211_do_stop+0x132/0x540 [mac80211] [] ? _raw_spin_unlock_bh+0x1f/0x30 [] ? dev_deactivate+0x1c3/0x1e0 [] ieee80211_stop+0x15/0x20 [mac80211] [] __dev_close+0x56/0x90 Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 97dcec5715a381362c88d1542e52c63147764d3c Author: Sujith Manoharan Date: Mon Dec 20 08:02:42 2010 +0530 ath9k_htc: Fix warning on device removal The commit "ath9k_hw: warn if we cannot change the power to the chip" introduced a new warning to indicate chip powerup failures, but this is not required for devices that have been removed. Handle USB device removal properly by checking for unplugged status. For PCI devices, this warning will still be seen when the card is pulled out, not sure how to check for card removal. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 2af10844eb6ed104f9505bf3a7ba3ceb02264f31 Merge: 73bc7d3 90a8a73 Author: Greg Kroah-Hartman Date: Wed Dec 22 12:25:34 2010 -0800 USB: Merge 2.6.37-rc5 into usb-next This is to resolve the conflict in the file, drivers/usb/gadget/composite.c that was due to a revert in Linus's tree needed for the 2.6.37 release. Reported-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 28bd2c341120db346f30b3ba11b4eac06b2cc981 Author: Sekhar Nori Date: Mon Dec 20 21:31:34 2010 +0530 davinci: am18x/da850/omap-l138 evm: add support for higher speed grades Apart from the regular AM18x/DA850/OMAP-L138 SoC operating at 300MHz, these SoCs have variants that can operate at a maximum of 456MHz. Variants at 408Mhz and 375 Mhz are available as well. Not all silicon is qualified to run at higher speeds and unfortunately the maximum speed the chip can support can only be determined from the label on the package (not software readable). The EVM hardware for all these variants is the same (except for the actual SoC populated). U-Boot on the EVM sets up ATAG_REVISION to inform the OS regarding the speed grade supported by the silicon. We use this information to pass on the speed grade information to the SoC code. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 39e145500458bd68d1d33adfa256886900b1597b Author: Sekhar Nori Date: Mon Dec 20 21:31:33 2010 +0530 davinci: am18x/da850/omap-l138: add support for higher speed grades AM18x/DA850/OMAP-L138 SoCs have variants that can operate at a maximum of 456 MHz at 1.3V operating point. Also the 1.2V operating point has a variant that can support a maximum of 375 MHz. This patch adds three new OPPs (456 MHz, 408 MHz and 372 MHz) to the list of DA850 OPPs. Not all silicon is qualified to run at higher speeds and unfortunately the maximum speed the chip can support can only be determined from the label on the package (not software readable). Because of this, we depend on the maximum speed grade information to be provided to us in some board specific way. The board informs the maximum speed grade information by setting the da850_max_speed variable. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 9cc3049911d0166d54247cf2471802eb5293c66c Author: Ben Gardiner Date: Thu Dec 9 16:51:07 2010 -0500 da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional Use the mach-davinci/Kconfig to enable gpio-keys-polled as default when da850-evm machine is enabled. Signed-off-by: Ben Gardiner CC: Kevin Hilman CC: "Nori, Sekhar" CC: Gabor Juhos Signed-off-by: Kevin Hilman commit 70b3093963feefbf122672f9fe5f916db5338ca0 Author: Ben Gardiner Date: Thu Dec 9 16:51:06 2010 -0500 da850-evm: add baseboard GPIO expander buttons, switches and LEDs This patch adds a pca953x platform device for the tca6416 found on the evm baseboard. The tca6416 is a GPIO expander, also found on the UI board at a separate I2C address. The pins of the baseboard IO expander are connected to software reset, deep sleep enable, test points, a push button, DIP switches and LEDs. Add support for the push button, DIP switches and LEDs and test points (as free GPIOs). The reset and deep sleep enable connections are reserved by the setup routine so that userspace can't toggle those lines. The existing tca6416-keypad driver was not employed because there was no apararent way to register the LEDs connected to gpio's on the tca6416 while simultaneously registering the tca6416-keypad instance. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi CC: Govindarajan, Sriramakrishnan Reviewed-by: Sekhar Nori Reviewed-by: Dmitry Torokhov CC: Gabor Juhos Signed-off-by: Kevin Hilman commit 53c2897d36153830d4d34324bedf23a641602cc9 Author: Ben Gardiner Date: Thu Dec 9 16:51:05 2010 -0500 da850-evm: extract defines for SEL{A,B,C} pins in UI expander The setup and teardown methods of the UI expander reference the SEL_{A,B,C} pins by 'magic number' in each function. This uses the common enum for their offsets in the expander setup and teardown functions. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi Reviewed-by: Sekhar Nori Signed-off-by: Sekhar Nori CC: Victor Rodriguez Signed-off-by: Kevin Hilman commit 75929f5e2bcba7cc328fcf9a3d7ba7076946ac3a Author: Ben Gardiner Date: Thu Dec 9 16:51:04 2010 -0500 da850-evm: add UI Expander pushbuttons This patch adds EV_KEYs for each of the 8 pushbuttons on the UI board via a gpio-key device. The expander is a tca6416; it controls the SEL_{A,B,C} lines which enable and disable the peripherals found on the UI board in addition to the 8 pushbuttons mentioned above. The reason the existing tca6416-keypad driver is not employed is because there was no aparent way to keep the gpio lines used as SEL_{A,B,C} registered while simultaneously registering the pushbuttons as a tca6416-keypad instance. Some experimentation with the polling interval was performed; we were searching for the largest polling interval that did not affect the feel of the responsiveness of the buttons. It is very subjective but 200ms seems to be a good value that accepts firm pushes but rejects very light ones. The key values assigned to the buttons were arbitrarily chosen to be F1-F8. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi CC: Govindarajan, Sriramakrishnan Reviewed-by: Sekhar Nori Signed-off-by: Sekhar Nori CC: Kevin Hilman CC: Gabor Juhos Signed-off-by: Kevin Hilman commit ee09b3c1cff0335137dc1b146488e4352f640f13 Author: Eric Dumazet Date: Wed Dec 22 11:39:59 2010 -0800 sfq: fix sfq class stats handling sfq_walk() runs without qdisc lock. By the time it selects a non empty hash slot and sfq_dump_class_stats() is run (with lock held), slot might have been freed : We then access q->slots[SFQ_EMPTY_SLOT], out of bounds, and crash in slot_queue_walk() On previous kernels, bug is here but out of bounds qs[SFQ_DEPTH] and allot[SFQ_DEPTH] are located in struct sfq_sched_data, so no illegal memory access happens, only possibly wrong data reported to user. Also, slot_dequeue_tail() should make sure slot skb chain is correctly terminated, or sfq_dump_class_stats() can access freed skbs. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 65a6538a56d4c7ae8465f2a8420ddc65877b6779 Author: Luciano Coelho Date: Tue Dec 21 16:02:17 2010 +0200 mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile, because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is set. This patch adds ifdefs around the tpt_led_trigger declaration in ieee80211_i.h to avoid the problem. Signed-off-by: Luciano Coelho Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 67408c8c7b9daf28b50e33be3541334c07d15789 Author: Johannes Berg Date: Tue Nov 30 08:59:23 2010 +0100 mac80211: selective throughput LED trigger active The throughput LED trigger was always active when the radio was enabled. In most cases that's likely the desired behaviour, but iwlwifi requires it to be only active when one of the virtual interfaces is actually "connected" in some way. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e1e5406854378dfada3f33c7192b012083a5b8e0 Author: Johannes Berg Date: Tue Nov 30 08:58:45 2010 +0100 mac80211: add throughput based LED blink trigger iwlwifi and other drivers like to blink their LED based on throughput. Implement this generically in mac80211, based on a throughput table the driver specifies. That way, drivers can set the blink frequencies depending on their desired behaviour and max throughput. All the drivers need to do is provide an LED class device, best with blink hardware offload. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit fe67c913f1ec2a01aaa9176c80ef36eaf87d705d Author: Johannes Berg Date: Sat Nov 27 20:02:59 2010 +0100 mac80211: make LED trigger names available early The throughput trigger will require doing LED classdev/trigger handling before register_hw(), so drivers should have access to the trigger names before it. If trigger registration fails, this will still make the trigger name available, but that's not a big problem since the default trigger will the simply not be found. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 808601b75804475c9022f6375e76b7c62c99a10a Merge: c10abbb f17f972 Author: Tony Lindgren Date: Wed Dec 22 11:32:24 2010 -0800 Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus commit c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 Merge: 4931445 da1f026 Author: Tony Lindgren Date: Wed Dec 22 11:30:12 2010 -0800 Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus commit 63e35cd9bd4c8ae085c8b9a70554595b529c4100 Merge: 503b1a5 3d986b2 Author: John W. Linville Date: Wed Dec 22 14:27:21 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h commit da1f026b532ce944d74461497dc6d8c16456466e Author: Janusz Krzysztofik Date: Mon Dec 20 21:09:22 2010 +0000 Keyboard: omap-keypad: use matrix_keypad.h Most keypad drivers make use of the defined macros, structures and inline functions. Convert omap-keypad driver to use those as well, as suggested by a compile time warning, hardcoded into the OMAP . Created against linux-2.6.37-rc5. Tested on Amstrad Delta. Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to board-h4. Signed-off-by: Janusz Krzysztofik Reviewed-by: Aaro Koskinen Acked-by: Dmitry Torokhov Signed-off-by: Tony Lindgren commit 4e012e5f246d4da924b14d453452fd0838d4e03b Author: Arno Steffen Date: Wed Dec 22 18:14:36 2010 +0000 OMAP3: fix typo in OMAP3_IVA_MASK OMAP3_IVA_MASK should use OMAP3_IVA_SHIFT instead of OMAP3_SGX_SHIFT Signed-off-by: Arno Steffen Signed-off-by: Tony Lindgren commit 6d38c4b4f1df70f953633c27ebcdc2712e9039bc Author: Jarkko Nikula Date: Tue Dec 21 17:46:01 2010 +0000 omap: rx51: Remove tvout code that plays with gpio 40 Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry. This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example: amixer -D hw:0 set 'Jack Function' 'TV-OUT' Signed-off-by: Jarkko Nikula Cc: Srikar Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit 31bbb4f035c13a73d1ebc2626663971723cbd28f Author: Jarkko Nikula Date: Tue Dec 21 17:25:35 2010 +0000 omap: rx51: Add vdda_dac supply for tvout Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS on RX51/N900 since it added DSS VENC support but a patch adding needed supply is missing from tree and no framebuffers are initialized. This patch is basically cleaned up version of original one: http://marc.info/?l=linux-omap&m=129070041402418&w=2 Signed-off-by: Jarkko Nikula Cc: Srikar Cc: Mark Brown Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit b5b9945b2b139ca922b49062053f34486ca64cca Author: Jarkko Nikula Date: Tue Dec 21 17:25:34 2010 +0000 omap: rx51: Cleanup vdds_sdi supply construction It is much more cleaner to use REGULATOR_SUPPLY macro and a device name instead of having a reference to rx51_display_device.dev with #if defined() guards. Signed-off-by: Jarkko Nikula Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit 3cfeb0c33f5cbcc6dde371392877ef3101b8f805 Author: John W. Linville Date: Mon Dec 20 15:16:53 2010 -0500 rtl818x: move rtl8180 and rtl8187 to separate subdirectories These drivers share one header file, but nothing else. Worse, both drivers use the rtl8225 part with different register settings. The results has been some ugly naming -- let's simplify that. Signed-off-by: John W. Linville Acked-by: Hin-Tak Leung Acked-by: Larry Finger Acked-by: Herton Ronaldo Krzesinski commit 68229689b6dc950bea4b81dd60563884f4a7e1c5 Author: Oliver Neukum Date: Wed Dec 22 15:33:40 2010 +0100 HID: usbhid: base runtime PM on modern API This patch doesn't alter functionality, but removes a dedicated kernel thread. Signed-off-by: Oliver Neukum Tested-by: Maulik Mankad Signed-off-by: Jiri Kosina commit f17f9726c27c3921e00a5750e85070e6dd7e1ff7 Author: Jon Hunter Date: Thu Dec 9 23:13:40 2010 +0100 OMAP4: clock data: Add missing fixed divisors The following OMAP4 clocks have the following fixed divisors that determine the frequency at which these clocks operate. These dividers are defined by the PRCM specification and without these dividers the rates of the below clocks are calculated incorrectly. This may cause internal peripherals using these clocks to operate at the wrong frequency. - abe_24m_fclk (freq = divided-by-8) - ddrphy_ck (freq = parent divided-by-2) - dll_clk_div_ck (freq = parent divided-by-2) - per_hs_clk_div_ck (freq = parent divided-by-2) - usb_hs_clk_div_ck (freq = parent divided-by-3) - func_12m_fclk (freq = parent divided-by-16) - func_24m_clk (freq = parent divided-by-4) - func_24mc_fclk (freq = parent divided-by-8) - func_48mc_fclk (freq = divided-by-4) - lp_clk_div_ck (freq = divided-by-16) - per_abe_24m_fclk (freq = divided-by-4) Signed-off-by: Jon Hunter Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit 9bf8391846db849509a6aa6f1f0659843ca30662 Author: Vishwanath BS Date: Tue Oct 5 19:35:34 2010 +0530 OMAP3: SDRC: Add comments on Errata i520 for Global SW reset This patch adds comments on precaution to be taken if Global Warm reset is used as the means to trigger system reset. Signed-off-by: Vishwanath BS [paul@pwsan.com: fixed typos, one mentioned by Sanjeev] Signed-off-by: Paul Walmsley Cc: Sanjeev Premi commit 9fb67204d7a00a6444bc121f221527034613d338 Merge: 8c1df40 287050d Author: Ingo Molnar Date: Wed Dec 22 12:46:12 2010 +0100 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core commit d8850ba425d9823d3184bd52f065899dac4689f9 Author: Jack Steiner Date: Tue Nov 30 13:55:40 2010 -0600 x86, UV: Fix the effect of extra bits in the hub nodeid register UV systems can be partitioned into multiple independent SSIs. Large partitioned systems may have extra bits in the node_id register. These bits are used when the total memory on all SSIs exceeds 16TB. These extra bits need to be ignored when calculating x2apic_extra_bits. Signed-off-by: Jack Steiner LKML-Reference: <20101130195926.972776133@sgi.com> Signed-off-by: Ingo Molnar commit e681041388e61ecd7f99dba66b3c1db11a564d92 Author: Jack Steiner Date: Tue Nov 30 13:55:39 2010 -0600 x86, UV: Add common uv_early_read_mmr() function for reading MMRs Early in boot, reading MMRs from the UV hub controller require calls to early_ioremap()/early_iounmap(). Rather than duplicating code, add a common function to do the map/read/unmap. Signed-off-by: Jack Steiner LKML-Reference: <20101130195926.834804371@sgi.com> Signed-off-by: Ingo Molnar commit 36bb94ba36f332de767cfaa3af6a5136435a3a9c Author: Russell King Date: Tue Nov 16 08:40:36 2010 +0000 ARM: pgtable: provide RDONLY page table bit rather than WRITE bit Signed-off-by: Russell King commit 9522d7e4cb5e0858122fc55d33a2c07728f0b10d Author: Russell King Date: Tue Nov 16 00:23:31 2010 +0000 ARM: pgtable: invert L_PTE_EXEC to L_PTE_XN The hardware page tables use an XN bit 'execute never'. Historically, we've had a Linux 'execute allow' bit, in the positive sense. Get rid of this artifact as future hardware will continue to have the XN sense. Signed-off-by: Russell King commit e926f4495e202500a6265987277fab217e235f08 Author: Russell King Date: Sun Nov 21 11:55:37 2010 +0000 ARM: pgtable: remove FIRST_USER_PGD_NR FIRST_USER_PGD_NR is now unnecessary, as this has been replaced by FIRST_USER_ADDRESS except in the architecture code. Fix up the last usage of FIRST_USER_PGD_NR, and remove the definition. Signed-off-by: Russell King commit af3813d6a5bf8d0f71b23d3ce458fa5f9916c6b7 Author: Russell King Date: Sun Nov 21 11:48:16 2010 +0000 ARM: pgtable: use conventional page table code for identity mappings Remove some knowledge of our 2-level page table layout from the identity mapping code - we assume that a step size of PGDIR_SIZE will allow us to step over all entries. While this is true today, it won't be true in the near future. Signed-off-by: Russell King commit 614dd0585f376a25c638abbed9c5fbd21d7baece Author: Russell King Date: Sun Nov 21 11:41:57 2010 +0000 ARM: pgtable: collect up identity mapping functions We have two places where we create identity mappings - one when we bring secondary CPUs online, and one where we setup some mappings for soft- reboot. Combine these two into a single implementation. Also collect the identity mapping deletion function. Signed-off-by: Russell King commit 26bbf0b57a0848932f725076bcb1245ca696e8d3 Author: Russell King Date: Sun Nov 21 11:30:36 2010 +0000 ARM: pgtable: remove L2 cache flushes for SMP page table bring-up The MMU is always configured to read page tables from the L2 cache so there's little point flushing them out of the L2 cache back to RAM. Remove these flushes. Signed-off-by: Russell King commit d30e45eeabefadc6039d7f876a59e5f5f6cb11c6 Author: Russell King Date: Tue Nov 16 00:16:01 2010 +0000 ARM: pgtable: switch order of Linux vs hardware page tables This switches the ordering of the Linux vs hardware page tables in each page, thereby eliminating some of the arithmetic in the page table walks. As we now place the Linux page table at the beginning of the page, we can deal with the offset in the pgt by simply masking it away, along with the other control bits. This also makes the arithmetic all be positive, rather than a mixture. Signed-off-by: Russell King commit 8c1df4002aa425973d7d25ffa56c042acd953bed Merge: 6c529a2 21dd9ae Author: Ingo Molnar Date: Wed Dec 22 11:54:50 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 6c529a266bdc590a870ee2d2092ff6527eff427b Merge: 7639dae 90a8a73 Author: Ingo Molnar Date: Wed Dec 22 11:53:20 2010 +0100 Merge commit 'v2.6.37-rc7' into perf/core Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar commit 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f Author: Henrik Rydberg Date: Sat Dec 18 15:42:30 2010 +0100 Input: synaptics - ignore bogus mt packet In multitouch mode, at least one device (fw: 7.4 id: 0x1c0b1) sometimes sends a final main packet with x == 1. Since the normal values are above 1472, this is clearly bogus. At the same time, a two-finger touch is signaled, even though only one finger was on the pad to begin with. This patch ignores the packet altogether, removing the problem. Acked-by: Chris Bagwell Acked-by: Chase Douglas Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 11c8ea81cc639c2ea56f94a9cdaa6242ff13a3af Author: Linus Walleij Date: Fri Dec 17 21:16:23 2010 +0100 ux500: rename modem IRQ and MBOX files Suffix the U5500 modem IRQ and MBOX files with *-db5500* so that we clearly know the SoC they belong to, in line with the rest of the files in mach-ux500. Cc: Stefan Nilsson Cc: Martin Persson Signed-off-by: Linus Walleij commit 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8 Author: Takashi YOSHII Date: Wed Dec 22 06:35:30 2010 +0000 ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM Adding platform resources, PFC setting and release reset pin for eMMC on ag5evm. [damm@opensource.se: Add MSTP code for MMCIF] Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5d7814728d80ee56d02e99cc2ab0850c8625a047 Author: Takashi YOSHII Date: Wed Dec 22 06:30:19 2010 +0000 ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins Follow up to pfc-sh73a0.c's pull-up support. Change GPIO_FN_KEYINx to GPIO_FN_KEYINx_PU. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit a0794fd019820d3d5e9d73ffd61b5bbcac818f18 Author: Takashi YOSHII Date: Wed Dec 22 06:26:06 2010 +0000 ARM: mach-shmobile: sh73a0 GPIO pullup improvement On SH-Mobile, Pull UP/Downs can be controlled independently from Function selectors (by lower nibble of PFCR). It means people may want to use GPIO_FN_xxx_PU/PD in addition to GPIO_IN_PU/PD which is currently supported. This patch adds pull-up version for some input signals on KEYSC, MMC, FSIA as well as SDHI1. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 019c4ae313ccf5d253be32197e002c626d8bd678 Author: Magnus Damm Date: Wed Dec 22 06:14:05 2010 +0000 ARM: mach-shmobile: sh73a0 CPGA fix for KEYSC Fix the sh73a0 KEYSC clock control by adding MSTP403 to mstp_clks[]. Use KEYSC instead of KEYSC0 in comments. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 752a4a95e3c96a8e8d3405b16d292f13e8c7856b Merge: bc3f67a 90a8a73 Author: Grant Likely Date: Wed Dec 22 00:10:01 2010 -0700 Merge commit 'v2.6.37-rc7' into spi/next commit 60a0e5d972bad6927b63aede7a1cfe758b8251ad Author: Santosh Shilimkar Date: Tue Dec 21 22:37:29 2010 -0700 OMAP4: clock data: Keep L3INSTR clock domain modulemode under HW control L3INSTR clock domain is read only register and its reset value is HW_AUTO. The modules withing this clock domain needs to be kept under hardware control. MODULEMODE: - 0x0: Module is disable by software. Any INTRCONN access to module results in an error, except if resulting from a module wakeup (asynchronous wakeup). - 0x1: Module is managed automatically by hardware according to clock domain transition. A clock domain sleep transition put module into idle. A wakeup domain transition put it back into function. If CLKTRCTRL=3, any INTRCONN access to module is always granted. Module clocks may be gated according to the clock domain state. This patch keeps CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL and CM_L3INSTR_INTRCONN_WP1_CLKCTRL module mode under hardware control by using ENABLE_ON_INIT flag. Without this the OMAP4 device OFF mode SAR restore phase aborts during interconnect register restore phase. This can be also handled by doing explicit a clock enable and disable in the low power code since there is no direct module associated with it. But that seems not necessary since the clock domain is under HW control. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 80f093657371b3ebb1d05354a698088bf7b21c15 Author: Santosh Shilimkar Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: powerdomain: Remove L3INIT_PD OFF state On OMAP4, there is an issue when L3INIT transitions to OFF mode without device OFF. The SAR restore mechanism will not get triggered without wakeup from device OFF and hence the USB host and USB TLL context will not be restored. Hardware team recommended to remove the OFF state support for L3INIT_PD since there is no power impact. It will be removed on next OMAP revision (OMAP4440 and beyond). Hence this patch removed the OFF state from L3INIT_PD. The deepest state supported on L3INIT_PD is OSWR just like CORE_PD and PER_PD Signed-off-by: Santosh Shilimkar [b-cousson@ti.com: update the changelog with next OMAP info] Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 474e7aeb6a5ac78071cc9b841889fcf026524e97 Author: Rajendra Nayak Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: powerdomain: l4per pwrdm does not support OFF The l4per power domain in ES2.0 does support only RET and ON states. The previous ES1.0 HW database was wrong and thus fixed on ES2. Change the pwrsts field to reflect that. Signed-off-by: Rajendra Nayak Acked-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 33de32b3ebcb4f7f77f10a1b42493352f00c6a30 Author: Rajendra Nayak Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: PM: Do not assume clkdm supports hw transitions omap_set_pwrdm_state today assumes a clkdm supports hw_auto transitions and hence leaves some which do not support this in sw wkup state preventing low power transitions. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 71a488dbcc4acbc9b845491a368b30ecd7484089 Author: Rajendra Nayak Date: Tue Dec 21 22:37:27 2010 -0700 OMAP4: PM: Use the low-power state change feature on OMAP4 For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking up the domain to put it back to deeper sleep state. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Cc: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 73bc7d315f56e260071bdb5f15e25b53bddc1402 Author: Melchior FRANZ Date: Wed Dec 22 02:04:33 2010 +0100 USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) So far the USBLED driver only supports Delcom's "USB Visual Signal Indicator" (http://www.delcomproducts.com/products_USBLMP.asp). The driver generates virtual files "red", "green", and "blue" under the device's /sys/ directory, where color values can be read from and written to. This patch adds support for Dream Cheeky's "DL100B Webmail Notifier" (http://www.dreamcheeky.com/webmail-notifier -- available from several shops, such as http://www.conrad.at/ce/de/product/777048/USB-WEBMAIL). This device isn't as pretty as Delcom's, but it's *far* cheaper, and its 3 LEDs can be set in 32 brightness steps each. The grey envelope contour can easily be removed, leaving a rather neutral white box (with a few small holes), which is useful for generic signalling purposes. Of course, the small circuit board can easily be put into a prettier case. The DL100B device pretends to be a HID, but the HID descriptor shows that it's not overly useful as such (see below). The patch therefore removes the "HID-ness" (hid-core.c, hid-ids.h), and adds the necessary commands to usbled.c. The protocol info comes from the developer's manual that Dream Cheeky kindly provided (815DeveloperManual.pdf). HID descriptor: 0: 05 01 Usage Page 'Generic Desktop Controls' 2: 09 10 Usage 'Reserved' 4: a1 01 Collection 'Application (mouse, keyboard)' 6: 05 00 Usage Page 'Undefined' 8: 19 10 Usage Minimum = 16 10: 29 11 Usage Maximum = 17 12: 15 00 Logical Minimum = 0 14: 25 0f Logical Maximum = 15 16: 75 08 Report Size = 8 18: 95 08 Report Count = 8 20: 91 02 Output data *var abs lin pref-state null-pos non-vol bit-field 22: 19 10 Usage Minimum = 16 24: 29 11 Usage Maximum = 17 26: 15 00 Logical Minimum = 0 28: 25 0f Logical Maximum = 15 30: 75 08 Report Size = 8 32: 95 08 Report Count = 8 34: 81 00 Input data array abs lin pref-state null-pos non-vol bit-field 36: c0 End Collection Signed-off-by: Melchior FRANZ Signed-off-by: Greg Kroah-Hartman commit 5010f3db952b19cd353d1e90838818922d995697 Author: Magnus Damm Date: Tue Dec 21 08:40:59 2010 +0000 ARM: mach-shmobile: sh73a0 TMU support Add support for 2 TMU timer channels on sh73a0. One timer channel is used for clocksource and the other is used for clockevents. All channels in the same TMU block share MSTP bit as usual. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5f53a56af50c002cdb091914aa98df80b1b28ec8 Author: Magnus Damm Date: Tue Dec 21 08:37:32 2010 +0000 ARM: mach-shmobile: sh73a0 INTCS support Add INTCS support for the sh73a0 processor. The interrupts on the sh73a0 processor are managed through controllers such as GIC, INTCS and INTCA. The ARM cores use the GIC as primary interrupt controller and the INTCS and INTCA are hanging off the GIC as cascaded interrupt controllers. Peripherals connected both to the GIC and the INTC controllers should if possible only use the GIC. If no GIC connection is available then INTCS and INTCA may be used instead. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 354e4157d9e1529cf71c7041a22fde2fd113642b Author: Kuninori Morimoto Date: Tue Dec 21 11:20:45 2010 +0000 ARM: mach-shmobile: mackerel: fixup default memory size Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6081dc348f122cdb76093b2fc6cf5742c968cb69 Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP: PM noop: implement context loss count for non-omap_devices For devices which have not (yet) been converted to use omap_device, implement the context loss counter using the "brutal method" as originally proposed by Paul Walmsley[1]. The dummy context loss counter is incremented every time it is checked, but only when off-mode is enabled. When off-mode is disabled, the dummy counter stops incrementing. Tested on 36xx/Zoom3 using MMC driver, which is currently the only in-tree user of this API. This patch should be reverted after all devices are converted to using omap_device. [1] http://marc.info/?l=linux-omap&m=129176260000626&w=2 Signed-off-by: Kevin Hilman [paul@pwsan.com: fixed compile warning; fixed to compile on OMAP1] Signed-off-by: Paul Walmsley commit c80705aa7074045e7431ed2ebeb0f7d5773615ab Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP: PM: implement context loss count APIs Implement OMAP PM layer omap_pm_get_dev_context_loss_count() API by creating similar APIs at the omap_device and omap_hwmod levels. The omap_hwmod level call is the layer with access to the powerdomain core, so it is the place where the powerdomain is queried to get the context loss count. The new APIs return an unsigned value that can wrap as the context-loss count grows. However, the wrapping is not important as the role of this function is to determine context loss by checking for any difference in subsequent calls to this function. Note that these APIs at each level can return zero when no context loss is detected, or on errors. This is to avoid returning error codes which could potentially be mistaken for large context loss counters. NOTE: only works for devices which have been converted to use omap_device/omap_hwmod. Longer term, we could possibly remove this API from the OMAP PM layer, and instead directly use the omap_device level API. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 7f595674e08b8b4d3faf64a19bccc95445d7ed35 Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP2+: powerdomain: add API to get context loss count Add new powerdomain API u32 pwrdm_get_context_loss_count(struct powerdomain *pwrdm) for checking how many times the powerdomain has lost context. The loss count is the sum of the powerdomain off-mode counter, the logic off counter and the per-bank memory off counter. Signed-off-by: Kevin Hilman [paul@pwsan.com: removed bogus return value on error; improved kerneldoc; tweaked commit message] Signed-off-by: Paul Walmsley commit 0a01aa211da8530dc6a3ff3a725f2edd3464c46f Author: Hari Kanigeri Date: Tue Dec 21 21:18:56 2010 -0700 OMAP4: clocks: add dummy clock for mailbox In omap4, there is no explicit configuration register to enable mailbox clocks. Defining dummy clock for mailbox clock module to keep the mailbox driver backward compatible with previous omaps. Signed-off-by: Hari Kanigeri Acked-by: Benoît Cousson Signed-off-by: Paul Walmsley commit a36795c1278112af2a78f93c99b7586cb7e2a0a2 Author: Jon Hunter Date: Tue Dec 21 21:31:43 2010 -0700 OMAP: clock: fix configuration of J-Type DPLLs to work for OMAP3 and OMAP4 J-Type DPLLs have additional configuration parameters that need to be programmed when setting the multipler and divider for the DPLL. These parameters being the sigma delta divider (SD_DIV) for the DPLL and the digital controlled oscillator (DCO) to be used by the DPLL. The current code is implemented specifically to configure the OMAP3630 PER J-Type DPLL. The OMAP4430 USB DPLL is also a J-Type DPLL and so this code needs to be updated to work for both OMAP3 and OMAP4 devices and any other future devices that have J-TYPE DPLLs. For the OMAP3630 PER DPLL both the SD_DIV and DCO paramenters are used but for the OMAP4430 USB DPLL only the SD_DIV field is used. The current implementation will only program the SD_DIV and DCO fields if the DPLL has both and hence this does not work for OMAP4430. In order to make the code more generic add two new fields to the dpll_data structure for the SD_DIV field and DCO field bit-masks and only program these fields if the masks are defined for a specific DPLL. This simplifies the code and allows us to remove the flag DPLL_NO_DCO_SEL. Tested on OMAP36xx Zoom3 and OMAP4 Blaze. Signed-off-by: Jon Hunter [paul@pwsan.com: removed explicit inlining and added '_' prefix on lookup_*() functions; added testing info to commit message; added 35xx comments back in] Signed-off-by: Paul Walmsley commit b183aaf7274245bb0241d81176cb6b06a3b01ca6 Author: Charulatha V Date: Tue Dec 21 21:31:43 2010 -0700 OMAP3: clock: Update clock domain name for mcspi fck Update clock3xxx_data for mcspi1-4 with appropriate clock domain name. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Signed-off-by: Paul Walmsley commit 7cffa6b888c77e9386a6b886ef10bc57aac464ec Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP4: hwmod data: Add SIDLE_SMART_WKUP modes to several IPs uart, gpio, wd_timer and i2c does support the new smart-idle with wakeup added in OMAP4. Add the flag to allow the hwmod core to enable this mode when applicable. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit 86009eb326afde34ffdc5648cd344aa86b8d58d4 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Add wakeup support for new OMAP4 IPs The new OMAP4 IPs introduced a new idle mode named smart-idle with wakeup. This new idlemode replaces the enawakeup for the new IPs but seems to coexist as well for some legacy IPs (UART, GPIO, MCSPI...) Add the new SIDLE_SMART_WKUP flag to mark the IPs that support this capability. The omap_hwmod_44xx_data.c will have to be updated to add this new flag. Enable this new mode when applicable in _enable_wakeup, _enable_sysc and _idle_sysc. Signed-off-by: Benoit Cousson Tested-by: Sebastien Guiriec Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit f2dd7e09db3e18e4c053810b72fe026685d9bf0c Author: Rajendra Nayak Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Disable clocks when hwmod enable fails In cases where a module (hwmod) does not become accesible on enabling the main clocks (can happen if there are external clocks needed for the module to become accesible), make sure the clocks are not left enabled. This ensures that when the requisite external dependencies are met a omap_hwmod_enable and omap_hwmod_idle/shutdown would rightly enable and disable clocks using clk framework. Leaving the clocks enabled in the error case causes additional usecounting at the clock framework level leaving the clock enabled forever. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit ce35b2446945c506cb02960eab2072f56efdf1c0 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Remove omap_hwmod_mutex The hwmod list will be built are init time and never be modified at runtime. There is no need anymore to protect the list from concurrent accesses using a mutex. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 01592df95049a6f3d4abb0571ae1c7cb6e9d1cd7 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Mark functions used only during initialization with __init _register, _find_mpu_port_index and _find_mpu_rt_base are static APIs that will be used only during the omap_hwmod initialization phase. There is no need to keep them for runtime. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 0102b62789af5aed92cea4cf7f36afaa1ab12c72 Author: Benoit Cousson Date: Tue Dec 21 21:31:27 2010 -0700 OMAP2+: hwmod: Make omap_hwmod_register private and remove omap_hwmod_unregister Do not allow omap_hwmod_register to be used outside the core hwmod code. An omap_hwmod should be registered only at init time. Remove the omap_hwmod_unregister that is not used today since the hwmod list will be built once at init time and never be modified at runtime. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 50ebb7772c8975086dbfc3d21be74dd806650df4 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP2430: hwmod data: Use common dev_attr for i2c1 and i2c2 Since i2c1 and i2c2 are using the same data, remove the two previous instances and use a common i2c_dev_attr one. Moreover, that will fix the following warning: arch/arm/mach-omap2/omap_hwmod_2430_data.c:485: warning: 'i2c_dev_attr' defined but not used Signed-off-by: Benoit Cousson Acked-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Charulatha V commit 5a7ddcbdaf1bb7603422fb6188156ccc39711b0f Author: Kevin Hilman Date: Tue Dec 21 21:08:34 2010 -0700 OMAP2+: omap_hwmod: fix wakeup enable/disable for consistency In the omap_hwmod core, most of the SYSCONFIG register helper functions do not directly write the register, but instead just modify a value passed in. This patch converts the _enable_wakeup() and _disable_wakeup() helper functions to take a value argument and only modify it instead of actually writing the register. This makes the wakeup helpers consistent with the other helper functions and avoids unintentional problems like the following. This problem was found after discovering that GPIO wakeups were no longer functional. The root cause was that the ENAWAKEUP bit of the SYSCONFIG register was being unintentionaly overwritten, leaving wakeups disabled after the following two commits were combined: commit: 9980ce53c97392a3dbdc9d1ac3e455d79b4167ed OMAP: hwmod: Enable module wakeup if in smartidle commit: 78f26e872f77b6312273216de1a8f836c6f2e143 OMAP: hwmod: Set autoidle after smartidle during _sysc_enable There resulting in code in _enable_sysc() was this: /* * XXX The clock framework should handle this, by * calling into this code. But this must wait until the * clock structures are tagged with omap_hwmod entries */ if ((oh->flags & HWMOD_SET_DEFAULT_CLOCKACT) && (sf & SYSC_HAS_CLOCKACTIVITY)) _set_clockactivity(oh, oh->class->sysc->clockact, &v); _write_sysconfig(v, oh); so here, 'v' has wakeups disabled. /* If slave is in SMARTIDLE, also enable wakeup */ if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE)) _enable_wakeup(oh); Here wakeup is enabled in the SYSCONFIG register (but 'v' is not updated) /* * Set the autoidle bit only after setting the smartidle bit * Setting this will not have any impact on the other modules. */ if (sf & SYSC_HAS_AUTOIDLE) { idlemode = (oh->flags & HWMOD_NO_OCP_AUTOIDLE) ? 0 : 1; _set_module_autoidle(oh, idlemode, &v); _write_sysconfig(v, oh); } And here, SYSCONFIG is updated again using 'v', which does not have wakeups enabled, resulting in ENAWAKEUP being cleared. Special thanks to Benoit Cousson for pointing out that wakeups were supposed to be automatically enabled when a hwmod is enabled, and thus helping target the root cause of this problem. Signed-off-by: Paul Walmsley Cc: Benoit Cousson Signed-off-by: Benoit Cousson Signed-off-by: Kevin Hilman commit b399bca897802db3f342b6f3032a19ab8f2af99b Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod & clock data: Fix GPIO opt_clks and ocp_if iclk Fix opt clocks name in clock framework and hwmod. Add the missing iclk in the ocp_if structure. Add the HWMOD_CONTROL_OPT_CLKS_IN_RESET flag to ensure the the GPIO optional clock is enable during reset. Signed-off-by: Benoit Cousson Tested-by: Charulatha V Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 8f25bdc55d619bdd469a90b82743248680422507 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod data: Add IVA and DSP Add IVA and DSP hwmods in order to allow the pm code to initialize properly the processors devices during omap2_init_processor_devices. It will avoid the following warnings. _init_omap_device: could not find omap_hwmod for iva _init_omap_device: could not find omap_hwmod for dsp Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 659fa8222c0ca1061d74cb3282614c017f415fe5 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW The DMM is a piece of interconnect that need to be configured properly for the tiler functionnality. It thus exposes some configuration registers that were missing previously. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 0cfe8751bbb8703bc77beb031eb6f4edf3d601d3 Author: Benoit Cousson Date: Tue Dec 21 21:08:33 2010 -0700 OMAP4: hwmod data: Add SYSS_HAS_RESET_STATUS flag Update the data for GPIO, UART, WD_TIMER and I2C in order to support the new reset status flag introduce in the following commit: commit 2cb068149c365f1c2b10f2ece6786139527dcc16 OMAP: hwmod: Fix softreset status check for some new OMAP4 IPs Without this flag properly set, the reset is done, but the hwmod core code will not wait for the reset completion to continue its excecution. Signed-off-by: Benoit Cousson Tested-by: Charulatha V Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Govindraj.R Cc: Kevin Hilman commit 3b54baad8a79cc252e9d6a5ccc796b4c8b2b7173 Author: Benoit Cousson Date: Tue Dec 21 21:08:33 2010 -0700 OMAP4: hwmod data: Fix hwmod entries order The original OMAP4 hwmod data files is fully generated from HW database. But since the file is introduced incrementaly along with driver that uses the data, it has to be splitted by the driver owner and then re-merged by the maintainer. Because of the similarity of the data, git is completely lost during such merge and thus the data does not look like the original one at the end. Re-order properly the structures to stay in sync with original data set. This makes it much easier to diff the autogenerated script output with what's in mainline, see differences, and generate patches for those diffs. The goal is to stay in sync with the autogenerated data from now on. Add a comment that does contain all the IPs that can have a hwmod, but do not have it in the file for the moment. It gives a good indication of the progress. Signed-off-by: Benoit Cousson [paul@pwsan.com: updated to apply against current core integration branch, commit message slightly amplified; fixed opt_clks_cnt whitespace] Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Govindraj.R Cc: Charulatha V Cc: Kevin Hilman commit 65ae65c9058eb41e9566ffd12699607c68b23e5f Author: Janusz Krzysztofik Date: Tue Dec 21 21:08:15 2010 -0700 OMAP1: clock_data: use runtime cpu / machine checks Otherwise multi-omap1 configurations may set wrong clock speed. Created and tested against l-o master on Amstrad Delta. Signed-off-by: Janusz Krzysztofik Signed-off-by: Paul Walmsley commit 1124d2f9186ec9e42e1c3f78c20199ba2cb597e2 Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP2/3: SRAM: add comment about crashes during a TLB miss Some users were observing crashes during the execution of CORE DVFS code from OCM RAM -- a locally-modified copy of the linux-omap code. Richard Woodruff tracked this down to a DTLB miss which had been inadvertently and intermittently caused by the local modifications. (The TLB miss caused the ARM MMU to attempt to walk the page tables stored in SDRAM, which was not possible since SDRAM is off-line for a portion of the CORE DVFS OCM RAM code.) Add a note to the OMAP2 & OMAP3 CORE DVFS SRAM code to warn others that changes may result in crashes here if they are not carefully tested. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Jon Hunter Cc: Nishanth Menon commit f1f4b7703f8fd165ece458ae97ebddb2b62b2ce3 Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP3: clock: fix incorrect rate display when switching MPU rate at boot The OMAP3 clock code contains some legacy code to allow the MPU rate to be specified as a kernel command line parameter. If the 'mpurate' parameter is specified, the kernel will attempt to switch the MPU rate to this rate during boot. As part of this process, a short message "Switched to new clocking rate" is generated -- and in this message, the "Core" clock rate and "MPU" clock rate are transposed. This patch ensures that the clock rates are displayed in the correct order. Thanks to Bruno Guerin for reporting this bug and proposing a fix. Thanks to Richard Woodruff for reviewing the problem and passing the report on. Signed-off-by: Paul Walmsley Cc: Bruno Guerin Cc: Richard Woodruff commit 553d239aadc75bee70c7858ac4548d073cb3daff Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP3: clock: clarify usage of struct clksel_rate.flags and struct omap_clk.cpu Clarify the usage of the struct omap_clk.cpu flags (e.g., CK_*) to use bits only for individual SoC variants (e.g., CK_3430ES1, CK_3505, etc.). Superset flags, such as CK_3XXX or CK_AM35XX, are now defined as disjunctions of individual SoC variant flags. This simplifies the definition and use of these flags. struct omap_clk record definitions can now simply specify the bitmask of actual SoCs that the records are valid for. The clock init code can simply set a single CPU type mask bit for the SoC that is currently in use, and test against that, rather than needing to set some combination of flags. Similarly, clarify the use of struct clksel_rate.flags. The bit allocated for RATE_IN_3XXX has been reassigned, and RATE_IN_3XXX has been defined as a disjunction of the 34xx and 36xx rate flags. The advantages are the same as the above. Clarify the usage of struct omap_clk.cpu flags such as CK_34XX to only apply to the SoCs that they name, e.g., OMAP34xx chips. The previous practice caused significantly different SoCs, such as OMAP36xx, to be included in CK_34XX. In my opinion, this is much more intuitive. Similarly, clarify the use of struct clksel_rate.flags, such that RATE_IN_3430ES2PLUS now only applies to 34xx chips with ES level >= 2 - it does not apply to OMAP36xx. ... At some point, it probably makes sense to collapse the CK_* and RATE_IN_* flags together into a single bitfield, and possibly use the existing CHIP_IS_OMAP* flags for platform detection. ... This all seems to work fine on OMAP34xx and OMAP36xx Beagle. Not sure if it works on Sitara or the TI816X, unfortunately I don't have any here to test with. Signed-off-by: Paul Walmsley commit d4521f6731756c82a76d3e791c3ec2d28b38f97e Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP2xxx clock: fix dss2_fck recalc to use clksel dss2_fck is a clksel clock, and therefore its rate should be recalculated with the clksel mechanism. This was working in early 2009, but was one of the casualties of the big OMAP clock merge between 2.6.29 and 2.6.30. Signed-off-by: Paul Walmsley commit cb13459b38c8f2e99df4923d2a71ce6db99f2436 Author: Rajendra Nayak Date: Tue Dec 21 21:08:14 2010 -0700 OMAP4: clock data: Export control to enable/disable CORE/PER M3 clocks The CORE and PER M3 post dividers are different from the rest of the DPLL post dividers as in they go to SCRM, and are used there to export clocks for instance used by external sensor. There is no automatic HW dependency in PRCM to manage them. Hence these two clocks (dpll post dividers) should be managed by SW and explicitly enabled/disabled. Add control in clock framework to handle that. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit e0cb70c565acffb210ffa2a4590637d1844d13c5 Author: Rajendra Nayak Date: Tue Dec 21 21:08:14 2010 -0700 OMAP4: clock data: Add SCRM auxiliary clock nodes Add support for auxiliary clocks nodes which are part of SCRM. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 768ab94f8b2b16a23fa10900430c10ec44f2643e Author: Jonathan Bergsagel Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add missing fields in iva_hsd_byp_clk_mux_ck Add register address, mask and link to the clksel structure that were missing in the IVA DPLL mux clock node. Signed-off-by: Jonathan Bergsagel Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 032b5a7e3aa7dca8a13a79ff6a59232d307552a3 Author: Thara Gopinath Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add missing DPLL x2 clock nodes This patch extends the OMAP4 clock data to include various x2 clock nodes between DPLL and HS dividers as the clock framework skips a x2 while calculating the dpll locked frequency. The clock database extensions are autogenerated using the scripts maintained by Benoit Cousson. Signed-off-by: Benoit Cousson Signed-off-by: Thara Gopinath [paul@pwsan.com: fixed merge conflicts against v2.6.37-rc5; dropped dpll_mpu_x2_ck on advice from Benoît] Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit ae4b4fc1bb59ad8802800a8103a6519acadcc9cf Author: Benoit Cousson Date: Tue Dec 21 21:08:13 2010 -0700 OMAP3: clock data: Add "wkup_clkdm" in sr1_fck and sr2_fck The smartreflex modules belong to an ALWON_FCLK clock domain that does not have any SW control. The gating of that interface clock is triggered by a transition of the WKUP clock domain to idle. Attach both smartreflex instances on OMAP3 to the WKUP clock domain. The missing clock domain field in srX_fck clock nodes was reported by Kevin during the discussion about smartreflex on OMAP3: https://patchwork.kernel.org/patch/199342/ Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit d9b98f5f9e20389c43370539ef3de4aba7cf1d79 Author: Benoit Cousson Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add control for pad_clks_ck and slimbus_clk The gating of pad_clks and slimbus_ck is controlled by the PRCM, but since the clock source is external, this is the SW responsability to gate / un-gate it when the mcpdm or slimbus module need to be used. There is no autogating possible with such external clock. Add SW control to enable / disable this SW gating in the pad_clks_ck and slimbus_clk clock node. Signed-off-by: Benoit Cousson Signed-off-by: Sebastien Guiriec Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 596efe4792c50163578578bd4fe470f97652aad7 Author: Paul Walmsley Date: Tue Dec 21 21:05:16 2010 -0700 OMAP3: control/PM: move padconf save code to mach-omap2/control.c Move the padconf save code from pm34xx.c to the System Control Module code in mach-omap2/control.c. This is part of the general push to move direct register access from middle-layer core code to low-level core code, so the middle-layer code can be abstracted to work on multiple platforms and cleaned up. In the medium-to-long term, this code should be called by the mux layer code, not the PM idle code. This is because, according to the TRM, saving the padconf only needs to be done when the padconf changes[1]. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Tony Lindgren Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar 1. OMAP34xx Multimedia Device Silicon Revision 3.1.x [Rev. ZH] [SWPU222H] Section 4.11.4 "Device Off-Mode Sequences" commit 72e06d087204f3bc9acf281717b90ebf0b9731f7 Author: Paul Walmsley Date: Tue Dec 21 21:05:16 2010 -0700 OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 The OMAP powerdomain code and data is all OMAP2+-specific. This seems unlikely to change any time soon. Move plat-omap/include/plat/powerdomain.h to mach-omap2/powerdomain.h. The primary point of doing this is to remove the temptation for unrelated upper-layer code to access powerdomain code and data directly. As part of this process, remove the references to powerdomain data from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap. Change the DSPBridge code to point to the new location for the powerdomain headers. The DSPBridge code should not be including the powerdomain headers; these should be removed. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Omar Ramirez Luna Cc: Felipe Contreras Cc: Greg Kroah-Hartman commit 1540f214065982e6cbc6b8da1fe65a15e358f7c5 Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2+: clockdomain: move header file from plat-omap to mach-omap2 The OMAP clockdomain code and data is all OMAP2+-specific. This seems unlikely to change any time soon. Move plat-omap/include/plat/clockdomain.h to mach-omap2/clockdomain.h. The primary point of doing this is to remove the temptation for unrelated upper-layer code to access clockdomain code and data directly. DSPBridge also uses the clockdomain headers for some reason, so, modify it also. The DSPBridge code should not be including the clockdomain headers; these should be removed. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Omar Ramirez Luna Cc: Felipe Contreras Cc: Greg Kroah-Hartman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit 55ae35073b1c76f24c3736cf797c40d9932b19aa Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2/3: clockdomain: remove unneeded .clkstctrl_reg, remove some direct CM register accesses Reverse some of the effects of commit 84c0c39aec31a09571fc08a752a2f4da0fe9fcf2 ("ARM: OMAP4: PM: Make OMAP3 Clock-domain framework compatible for OMAP4"). On OMAP2/3, the CM_CLKSTCTRL register is at a constant offset from the powerdomain's CM instance. Also, remove some of the direct CM register access from the clockdomain code, moving it to the OMAP2/3 CM code instead. The intention here is to simplify the clockdomain code. (The long-term goal is to move all direct CM register access across the OMAP core code to the appropriate cm*.c file.) Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit bd2122ca358fbd5c8e94869ae731a0951b36c757 Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP4: clockdomains: add OMAP4 PRCM data and OMAP4 support Add PRCM partition, CM instance register address offset, and clockdomain register address offset to each OMAP4 struct clockdomain record. Add OMAP4 clockdomain code to use this new data to access registers properly. While here, clean up some nearby clockdomain code to allocate auto variables in my recollection of Linus's preferred style. The autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Cc: Benoît Cousson Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit e4156ee52fe617c2c2d80b5db993ff4bf07d7c3c Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP4: CM instances: add clockdomain register offsets In OMAP4 CM instances, some registers (CM_CLKSTCTRL, CM_STATICDEP, CM_DYNAMICDEP, and the module-specific registers underneath) are organized by clockdomain. Add the clockdomain offset macros to the appropriate PRCM module header files. This data was almost completely autogenerated from the TI hardware database; the autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit b170fbe1f9f1aa38773b1bcf064ab65951ce739d Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2+: clockdomains: split the clkdm hwsup enable/disable function Split _omap2_clkdm_set_hwsup() into _disable_hwsup() and _enable_hwsup(). While here, also document that the autodeps are deprecated and that they should be removed at the earliest opportunity. The documentation has been fixed for _{enable,disable}_hwsup(), thanks to Kevin Hilman for pointing out that those functions still had placeholder documentation in an earlier patch revision. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit a64bb9cda8b12f599766c7dfe81770d2082a133a Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: powerdomains: add PRCM partition data; use OMAP4 PRM functions OMAP4 powerdomain control registers are split between the PRM hardware module and the PRCM_MPU local PRCM. Add this PRCM partition information to each OMAP4 powerdomain record, and convert the OMAP4 powerdomain function implementations to use the OMAP4 PRM instance functions. Also fixes a potential null pointer dereference of pwrdm->name. The autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Cc: Benoît Cousson Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit c4d7e58fb52c632d8e33cd23a4917d7a7f8302ac Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_" Now that OMAP4-specific PRCM functions have been added, distinguish the existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_". This patch should not result in any functional change. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Jarkko Nikula Cc: Peter Ujfalusi Cc: Liam Girdwood Cc: Mark Brown Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit dac9a77120e2724e22696f06f3ecb4838da1e3e4 Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file Move the OMAP4 global software reset function to the OMAP4-specific prm44xx.c file, where it belongs. Part of the long-term process of moving all of the direct PRCM register writes into lower-layer code. Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU will continue executing while the system is supposed to be resetting itself. Signed-off-by: Paul Walmsley Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 2ace831ffc8feaffb8bc03da89ff43d948efdc97 Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: PRCM: add OMAP4-specific accessor/mutator functions In some ways, the OMAP4 PRCM register layout is quite different than the OMAP2/3 PRCM register layout. For example, on OMAP2/3, from a register layout point of view, all CM instances were located in the CM subsystem, and all PRM instances were located in the PRM subsystem. OMAP4 changes this. Now, for example, some CM instances, such as WKUP_CM and EMU_CM, are located in the system PRM subsystem. And a "local PRCM" exists for the MPU - this PRCM combines registers that would normally appear in both CM and PRM instances, but uses its own register layout which matches neither the OMAP2/3 PRCM layout nor the OMAP4 PRCM layout. To try to deal with this, introduce some new functions, omap4_cminst* and omap4_prminst*. The former is to be used when writing to a CM instance register (no matter what subsystem or hardware module it exists in), and the latter, similarly, with PRM instance registers. To determine which "PRCM partition" to write to, the functions take a PRCM instance ID argument. Subsequent patches add these partition IDs to the OMAP4 powerdomain and clockdomain definitions. As far as I can see, there's really no good way to handle these types of register access inconsistencies. This patch seemed like the least bad approach. Moving forward, the long-term goal is to remove all direct PRCM register access from the PM code. PRCM register access should go through layers such as the powerdomain and clockdomain code that can hide the details of how to interact with the specific hardware variant. While here, rename cm4xxx.c to cm44xx.c to match the naming convention of the other OMAP4 PRCM files. Thanks to Santosh Shilimkar , Rajendra Nayak , and Benoît Cousson for some comments. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Santosh Shilimkar commit 17d6ce11195fceda62af00beefde37e37a01337c Author: Aaro Koskinen Date: Mon Dec 20 23:50:22 2010 +0200 sisfb: eliminate compiler warnings Convert some bit masks to 8-bit values to avoid the following compiler warnings: drivers/video/sis/sis_main.c:3858: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5855: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5869: warning: large integer implicitly truncated to unsigned type Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 114776776a8e38fff5772efeef68fc3fdde76a82 Author: Aaro Koskinen Date: Mon Dec 20 23:50:21 2010 +0200 sisfb: delete unused register I/O macros Delete unused register I/O macros. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit ad78adb4e814104510da421a38cfe89ab018a8b1 Author: Aaro Koskinen Date: Mon Dec 20 23:50:20 2010 +0200 sisfb: replace setSISIDXREG with SiS_SetRegANDOR Replace setSISIDXREG() with SiS_SetRegANDOR(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 667a8b4114641895c90f8c98db1678c0bfa056df Author: Aaro Koskinen Date: Mon Dec 20 23:50:19 2010 +0200 sisfb: replace andSISIDXREG with SiS_SetRegAND Replace andSISIDXREG() with SiS_SetRegAND(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 27799d6c40828d5983fb1778ad3089740b946af8 Author: Aaro Koskinen Date: Mon Dec 20 23:50:18 2010 +0200 sisfb: replace orSISIDXREG with SiS_SetRegOR Replace orSISIDXREG() with SiS_SetRegOR(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 44b751bbe1fb6e7a75bbdee2d0c5f3ee133d6b0f Author: Aaro Koskinen Date: Mon Dec 20 23:50:17 2010 +0200 sisfb: replace outSISIDXREG with SiS_SetReg Replace outSISIDXREG() with SiS_SetReg(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit e57d413681b6d9c3d256eeac1e34f0d1b8b81e26 Author: Aaro Koskinen Date: Mon Dec 20 23:50:16 2010 +0200 sisfb: replace inSISIDXREG with SiS_GetReg Replace inSISIDXREG() with SiS_GetReg(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 63e13f8e2b4873b97d78567de8ad4dbcc63740db Author: Aaro Koskinen Date: Mon Dec 20 23:50:15 2010 +0200 sisfb: replace outSISREG with SiS_SetRegByte Replace outSISREG() with SiS_SetRegByte(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 1e1687d78bcaba01c7a22ef8564af2029e8e9919 Author: Aaro Koskinen Date: Mon Dec 20 23:50:14 2010 +0200 sisfb: replace inSISREG with SiS_GetRegByte Replace inSISREG() with SiS_GetRegByte(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit f0611a5c220e50dec65041b10bd2fe9484f061a6 Author: Paul Walmsley Date: Tue Dec 21 15:30:56 2010 -0700 OMAP3: PRM/CM: separate CM context save/restore; remove PRM context save/restore The OMAP3 PRM module is in the WKUP powerdomain, which is always powered when the chip is powered, so it shouldn't be necessary to save and restore those PRM registers. Remove the PRM register save/restore code, which should save several microseconds during off-mode entry/exit, since PRM register accesses are relatively slow. While doing so, move the CM register save/restore code into CM-specific code. The CM module has been distinct from the PRM module since 2430. This patch includes some minor changes to pm34xx.c. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak Cc: Tero Kristo Cc: Kalle Jokiniemi Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit f48b9644ef330a13c6bb16ca85c2efdbe7e25558 Author: Aaro Koskinen Date: Mon Dec 20 23:50:13 2010 +0200 sisfb: change register I/O functions to use fixed size types Use fixed-sized types (u8, u16, u32) instead of plain C types. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit e68046b72e9b35d054e3d98d71dc2c69d7e88e1e Author: Aaro Koskinen Date: Mon Dec 20 23:50:12 2010 +0200 sisfb: remove duplicate function declarations Remove duplicate register I/O function declarations by moving them into a common header file. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit b5b7dda7b5d9126d531ffa212b6a89d72aeac90a Author: Aaro Koskinen Date: Mon Dec 20 23:50:11 2010 +0200 sisfb: delete HAVE_CONFIG_H checks Delete unneeded HAVE_CONFIG_H checks. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 679c489fffe1ca426de1faa1ba51f0413149d139 Author: Aaro Koskinen Date: Mon Dec 20 23:50:10 2010 +0200 sisfb: eliminate unused variable compiler warning Eliminate the following compiler warning on non-x86 platforms by limiting the variable scope: drivers/video/sis/sis_main.c:4108: warning: unused variable 'temp' Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd Merge: 623eb15 90a8a73 Author: Paul Mundt Date: Wed Dec 22 12:56:10 2010 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 59fb659b065f52fcc2deed293cfbfc58f890376c Author: Paul Walmsley Date: Tue Dec 21 15:30:55 2010 -0700 OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files In preparation for adding OMAP4-specific PRCM accessor/mutator functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific files. Most of what was in mach-omap2/{cm,prm}.{c,h} has now been moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was OMAP2xxx/3xxx-specific. This process also requires the #includes in each of these files to be changed to reference the new file name. As part of doing so, add some comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use "sideways includes", to indicate that these users of the PRM/CM includes should not be doing so. Thanks to Felipe Contreras for comments on this patch. Signed-off-by: Paul Walmsley Cc: Jarkko Nikula Cc: Peter Ujfalusi Cc: Liam Girdwood Cc: Omar Ramirez Luna Acked-by: Omar Ramirez Luna Cc: Felipe Contreras Acked-by: Felipe Contreras Cc: Greg Kroah-Hartman Acked-by: Mark Brown Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit cdb54c4457d68994da7c2e16907adfbfc130060d Author: Paul Walmsley Date: Tue Dec 21 15:30:55 2010 -0700 OMAP4: PRCM: rename _MOD macros to _INST Back in the OMAP2/3 PRCM interface days, the macros that referred to the offsets of individual PRM/CM instances from the top of the PRM/CM hardware modules were incorrectly suffixed with "_MOD". (They should have been suffixed with something like "_INST" or "_INSTANCE".) These days, now that we have better contact with the OMAP hardware people, we know that this naming is wrong. And in fact in OMAP4, there are actual hardware module offsets inside the instances, so the incorrect naming gets confusing very quickly for anyone who knows the hardware. Fix this naming for OMAP4, before things get too far along, by changing "_MOD" to "_INST" on the end of these macros. So, for example, OMAP4430_CM2_INSTR_MOD becomes OMAP4430_CM2_INSTR_INST. This unfortunately creates quite a large diff, but it is a straightforward rename. This patch should not result in any functional changes. The autogeneration scripts have been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Santosh Shilimkar Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 0f318fd52d7e251c5f48416c3e7156acc680d81c Author: Benoit Cousson Date: Tue Dec 21 15:30:54 2010 -0700 OMAP4: PRCM: Add SCRM header file Add the header file with scrm registers absolute address, offset and bitfields. Signed-off-by: Benoit Cousson Signed-off-by: Rajendra Nayak [paul@pwsan.com: renamed OMAP4_SCRM to OMAP4_SCRM_BASE] Signed-off-by: Paul Walmsley commit d198b514bd9e94930ee0b9ca1cad0a51f5e29608 Author: Paul Walmsley Date: Tue Dec 21 15:30:54 2010 -0700 OMAP4: PRCM: reorganize existing OMAP4 PRCM header files Split the existing cm44xx.h file into cm1_44xx.h and cm2_44xx.h files so they match their underlying OMAP hardware modules. Add clockdomain offset information. Add header files for the MPU local PRCM, prcm_mpu44xx.h, and for the SCRM, scrm44xx.h. SCRM register offsets still need to be added; TI should do this. Move the "_MOD" macros out of the prcm-common.h header file, into the header file of the hardware module that they belong to. For example, OMAP4430_PRM_*_MOD macros have been moved into the prm44xx.h header. Adjust #includes of all files that used the old PRCM header file names to point to the new filenames. The autogeneration scripts have been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit f5f9d132d1c212bf3828c7926d95f79e0c20d243 Author: Paul Walmsley Date: Tue Dec 21 15:30:53 2010 -0700 OMAP3: control/PRCM: move CONTROL_PADCONF_SYS_NIRQ save/restore to SCM code For some reason, the PRCM context save/restore code also saves and restores a single System Control Module register, CONTROL_PADCONF_SYS_NIRQ. This is probably just an error -- the register should be handled by SCM code -- so this patch moves it there. If this register really does need to be saved and restored before the rest of the PRCM registers, the code to do so should live in the SCM code, and the PM code should call this separate function. This register pertains to devices with a stacked modem, so this patch is unlikely to affect most OMAP devices out there. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 166353bd75587a2158d713af1b9489a79e0ce297 Author: Paul Walmsley Date: Tue Dec 21 20:01:21 2010 -0700 OMAP3: control/PRCM: add omap3_ctrl_write_boot_mode() Get rid of the open-coded scratchpad write in mach-omap2/prcm.c and replace it with an actual API, omap3_ctrl_write_boot_mode(). While there, get rid of the gratuitous omap_writel(). There's not much documentation available for what should wind up in the scratchpad here, so more documentation would be appreciated. Also, at some point, we should formalize our treatment of the scratchpad; right now, accesses to the scratchpad are not well-documented. Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar commit dc0b3a701499bb7727314d7a9c764f7486db4802 Author: Paul Walmsley Date: Tue Dec 21 20:01:20 2010 -0700 OMAP2+: clockdomains: move clockdomain static data to .c files Static data should be declared in .c files, not .h files. It should be possible to #include .h files at any point without creating multiple copies of the same data. We converted the clock data to .c files some time ago. This patch does the same for the clockdomain data. Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 6e01478ae8a4322c9a2b2d6efed50196265ed5f2 Author: Paul Walmsley Date: Tue Dec 21 20:01:20 2010 -0700 OMAP2+: powerdomains: move powerdomain static data to .c files Static data should be declared in .c files, not .h files. It should be possible to #include .h files at any point without creating multiple copies of the same data. We converted the clock data to .c files some time ago. This patch does the same for the powerdomain data. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 4b4f62c4672805466652a785070cc2ac8a398e16 Author: Santosh Shilimkar Date: Tue Dec 21 20:01:19 2010 -0700 OMAP4: powerdomain: Add pwrdm_clear_all_prev_pwrst Like OMAP3, OMAP4430 ES2 has additional bitfields in PWRSTST register which help identify the previous power state entered by the powerdomain. Add pwrdm_clear_all_prev_pwrst to the OMAP4 powerdomains implementation to support this. Signed-off-by: Santosh Shilimkar Signed-off-by: Rajendra Nayak [paul@pwsan.com: clarified commit message] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 9b7fc907d9378f86eb6b823bbe84ec9ed584b091 Author: Rajendra Nayak Date: Tue Dec 21 20:01:19 2010 -0700 OMAP: powerdomain: Arch specific funcs for mem control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_mem_onst .pwrdm_set_mem_retst .pwrdm_read_mem_pwrst .pwrdm_read_prev_mem_pwrst .pwrdm_read_mem_retst .pwrdm_clear_all_prev_pwrst .pwrdm_enable_hdwr_sar .pwrdm_disable_hdwr_sar .pwrdm_wait_transition .pwrdm_set_lowpwrstchange Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak [paul@pwsan.com: rearranged Makefile changes] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar commit 12627578523d2d9396cae76b1dad0ed3dccf1730 Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: Arch specific funcs for logic control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_logic_retst .pwrdm_read_logic_pwrst .pwrdm_read_prev_logic_pwrst .pwrdm_read_logic_retst Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit f327e07b0ef9c60a6018799c9f04de10101d8e5a Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: Arch specific funcs for state control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_next_pwrst .pwrdm_read_next_pwrst .pwrdm_read_pwrst .pwrdm_read_prev_pwrst Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak [paul@pwsan.com: remove remaining static allocations in powerdomains.h file; remove path in file header comments, rearranged Makefile changes] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 3b1e8b21fcbd686445f0bb42f84701b4621cdec6 Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: Infrastructure to put arch specific code Put infrastructure in place, so arch specific func pointers can be hooked up to the platform-independent part of the framework. This is in preparation of splitting the powerdomain framework into platform-independent part (for all omaps) and platform-specific parts. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 74bea6b9881f4b32f6c0379e46d2f5e16fd34a07 Author: Rajendra Nayak Date: Tue Dec 21 20:01:17 2010 -0700 OMAP: powerdomain: Move static allocations from powerdomains.h to a .c file powerdomains.h header today has only static definitions. Adding any function declarations into it and including it in multiple source file is expected to cause issues. Hence move all the static definitions from powerdomains.h file into powerdomains_data.c file. Also, create a new powerdomain section of the mach-omap2/Makefile, and rearrange the prcm-common part of the Makefile, now that the powerdomain code is in its own Makefile section. Signed-off-by: Rajendra Nayak [paul@pwsan.com: rearrange Makefile changes, tweaked commit message] Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit ff2516fbef20ed9edd9cc2fc8b8b48d5cb5a932f Author: Paul Walmsley Date: Tue Dec 21 15:39:15 2010 -0700 OMAP2+: wd_timer: disable on boot via hwmod postsetup mechanism The OMAP watchdog timer IP blocks require a specific set of register writes to occur before they will be disabled[1], even if the device clocks appear to be disabled in the CM_*CLKEN registers. In the MPU watchdog case, failure to execute this reset sequence will eventually cause the watchdog to reset the OMAP unexpectedly. Previously, the code to disable this watchdog was manually called from mach-omap2/devices.c during device initialization. This causes the watchdog to be unconditionally disabled for a portion of kernel initialization. This should be controllable by the board-*.c files, since some system integrators will want full watchdog coverage of kernel initialization. Also, the watchdog disable code was not connected to the hwmod shutdown code. This means that calling omap_hwmod_shutdown() will not, in fact, disable the watchdog, and the goal of omap_hwmod_shutdown() is to be able to shutdown any on-chip OMAP device. To resolve the latter problem, populate the pre_shutdown pointer in the watchdog timer hwmod classes with a function that executes the watchdog shutdown sequence. This allows the hwmod code to fully disable the watchdog. Then, to allow some board files to support watchdog coverage throughout kernel initialization, add common code to mach-omap2/io.c to cause the MPU watchdog to be disabled on boot unless a board file specifically requests it to remain enabled. Board files can do this by changing the watchdog timer hwmod's postsetup state between the omap2_init_common_infrastructure() and omap2_init_common_devices() function calls. 1. OMAP34xx Multimedia Device Silicon Revision 3.1.x Rev. ZH [SWPU222H], Section 16.4.3.6, "Start/Stop Sequence for WDTs (Using WDTi.WSPR Register)" Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Charulatha Varadarajan commit 81fbc5ef9b22df2e2198dd0c530719a263a8d1c5 Author: Paul Walmsley Date: Tue Dec 21 19:56:17 2010 -0700 OMAP2+: wd_timer: separate watchdog disable code from the rest of mach-omap2/devices.c Split the wd_timer disable code out into its own file, mach-omap2/wd_timer.c; it belongs in its own file rather than cluttering up devices.c. Signed-off-by: Paul Walmsley Cc: Charulatha Varadarajan commit 233cbe5b94096f95ba7bca2162d63275b0b90b5b Author: Rajendra Nayak Date: Tue Dec 14 12:42:36 2010 -0700 OMAP2+: hwmod: Update the sysc_cache in case module context is lost Do not skip the sysc programming in the hmwod framework based on the cached value alone, since at times the module might have lost context (due to the Powerdomain in which the module belongs transitions to either Open Switch RET or OFF). Identifying if a module has lost context requires atleast one register read, and since a register read has more latency than a write, it makes sense to do a blind write always. Signed-off-by: Rajendra Nayak Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Santosh Shilimkar commit b56b7bc8d9293b64e7a459527ae78078902751ff Author: Paul Walmsley Date: Tue Dec 14 12:42:36 2010 -0700 OMAP2+: hwmod: fix a warning, add some docs, remove unused fields Trivial cleanup and documentation changes on the hwmod code and data: - add some hwmod documentation to indicate flags that should be moved outside the static hwmod data in a future patch - remove some unused fields in the struct omap_hwmod_ocp_if and struct omap_hwmod structures Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit dc6d1cda044b24c3d9f8e4af0431887ebe3488ef Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: upgrade per-hwmod mutex to a spinlock Change the per-hwmod mutex to a spinlock. (The per-hwmod lock serializes most post-initialization hwmod operations such as enable, idle, and shutdown.) Spinlocks are needed, because in some cases, hwmods must be enabled from timer interrupt disabled-context, such as an ISR. The current use-case that is driving this is the OMAP GPIO block ISR: it can trigger interrupts even with its clocks disabled, but these clocks are needed for register accesses in the ISR to succeed. This patch also effectively reverts commit 848240223c35fcc71c424ad51a8e8aef42d3879c - this patch makes _omap_hwmod_enable() and _omap_hwmod_init() static, renames them back to _enable() and _idle(), and changes their callers to call the spinlocking versions. Previously, since omap_hwmod_{enable,init}() attempted to take mutexes, these functions could not be called while the timer interrupt was disabled; but now that the functions use spinlocks and save and restore the IRQ state, it is appropriate to call them directly. Kevin Hilman originally proposed this patch - thanks Kevin. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Benoît Cousson commit bd36179eec2827cd60b4a8c6e180cc030c74a4ec Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: add support for per-class custom device reset functions The standard omap_hwmod.c _reset() code relies on an IP block's OCP_SYSCONFIG.SOFTRESET register bit to reset the IP block. This works for most IP blocks on the chip, but unfortunately not all. For example, initiator-only IP blocks often don't have any MPU-accessible OCP-header registers, and therefore the MPU can't write to any OCP_SYSCONFIG registers in that block. Other IP blocks, such as the IVA and I2C, require a specialized reset sequence. Since we need to be able to reset these IP blocks as well, allow custom IP block reset functions to be passed into the hwmod code via a per-hwmod-class reset function pointer, struct omap_hwmod_class.reset. If .reset is non-null, then the hwmod _reset() code will call the custom function instead of the standard OCP SOFTRESET-based code. As part of this change, rename most of the existing _reset() function code to _ocp_softreset(), to indicate more clearly that it does not work for all cases. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Paul Hunt Cc: Stanley Liu commit 2092e5ccf89db09ebde94e9aabd3c86d5fa05c6c Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: add postsetup state Allow board files and OMAP core code to control the state that some or all of the hwmods end up in at the end of _setup() (called by omap_hwmod_late_init() ). Reimplement the old skip_setup_idle code in terms of this new postsetup state code. There are two use-cases for this patch: the !CONFIG_PM_RUNTIME case, in which all IP blocks should stay enabled after _setup() finishes; and the MPU watchdog case, in which the watchdog IP block should enter idle if watchdog coverage of kernel initialization is desired, and should be disabled otherwise. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Charulatha Varadarajan commit e4dc8f507c3066d6fcece988d99b6d766c46af85 Author: Paul Walmsley Date: Tue Dec 14 12:42:34 2010 -0700 OMAP2+: hwmod: allow custom pre-shutdown functions Some OMAP IP blocks, such as the watchdog timers, cannot be completely shut down via the standard hwmod shutdown mechanism. This patch enables the hwmod data files to supply a pointer to a custom pre-shutdown function via the struct omap_hwmod_class.pre_shutdown function pointer. If the struct omap_hwmod_class.pre_shutdown function pointer is non-null, the function will be executed before the existing hwmod shutdown code runs. Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit 4805734bcc5a6b28b527a13a5c1603a2912c9f48 Author: Paul Walmsley Date: Tue Dec 21 15:25:10 2010 -0700 OMAP2+: io: split omap2_init_common_hw() Split omap2_init_common_hw() into two functions. The first, omap2_init_common_infrastructure(), initializes the hwmod code and data, the OMAP PM code, and the clock code and data. The second, omap2_init_common_devices(), handles any other early device initialization that, for whatever reason, has not been or cannot be moved to initcalls or early platform devices. This patch is required for the hwmod postsetup patch, which allows board files to change the state that hwmods should be placed into at the conclusion of the hwmod _setup() function. For example, for a board whose creators wish to ensure watchdog coverage across the entire kernel boot process, code to change the watchdog's postsetup state will be added in the board-*.c file between the omap2_init_common_infrastructure() and omap2_init_common_devices() function calls. Signed-off-by: Paul Walmsley Cc: Tony Lindgren commit 5b59cc2fc2ff90369d6aa7862caaba3cf45b5075 Author: Raghuveer Murthy Date: Tue Dec 21 14:14:34 2010 +0000 OMAP4: Pandaboard: Fix MMC card detect gpio line commit bf56f0a6668cd (2.6.37-rc1), from Nishanth Menon attempted to fix card detection for PandaBoard, unfortunately, the fix missed to initialize .gpio_cd member of omap2_hsmmc_info. This results in a default value of '0', which is a valid GPIO line. On PandaBoard, the side effect of this is that GPIO line 0 controls the powering TFP410 DVI chip, and without the fix DVI chip is inadvertently powered. Tested-by: David Anders Acked-by: Nishanth Menon Signed-off-by: Kishore Kadiyala Signed-off-by: Raghuveer Murthy Signed-off-by: Tony Lindgren commit 79c5f68dc221df729417823d4981373f4762d8eb Author: Thomas Weber Date: Tue Dec 21 11:07:09 2010 +0000 OMAP3: Devkit8000: Add DEBUG_LL support Add support for DEBUG_LL for Devkit8000. Devkit8000 uses uart 3 for debug output. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit d858addf10a00e663e438d7607f18496d30f1d1b Author: Daniel Morsing Date: Tue Dec 21 10:23:13 2010 +0000 OMAP2: Devkit8000: Use _cansleep GPIO functions for displayreset lines The display reset lines are connected to a TPS65930 which may sleep when changing GPIO values. Use the appropriate function to silence a nasty warning from gpiolib. Signed-off-by: Daniel Morsing Acked-by: Thomas Weber Signed-off-by: Tony Lindgren commit b9e7683bbca638967a56e5d7fd4035a947109621 Merge: bb3613a 53da4ce Author: Tony Lindgren Date: Tue Dec 21 17:05:57 2010 -0800 Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit bb3613aa34a81a5e2f1227ccdb801fde04a7da10 Merge: 6971071 bb1c903 Author: Tony Lindgren Date: Tue Dec 21 16:53:00 2010 -0800 Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 6971071cdda79cad5f53ba390e466d696e7e9006 Merge: 4584acc f31cc96 Author: Tony Lindgren Date: Tue Dec 21 16:48:20 2010 -0800 Merge branch 'devel-dma' into omap-for-linus commit bb1c9034b3ce7f29d3d178a87b42b767611d6574 Author: Jean Pihet Date: Sat Dec 18 16:49:57 2010 +0100 OMAP3: ASM sleep code format rework Cosmetic fixes to the code: - white spaces and tabs, - alignement, - comments rephrase and typos, - multi-line comments Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 8352129166b8270253a746f336a4429b349b023d Author: Jean Pihet Date: Sat Dec 18 16:44:46 2010 +0100 OMAP3: add comments for low power code errata Errata covered: - 1.157 & 1.185 - i443 - i581 Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit f7dfe3d8a98b7c4869c09826e3a65663cb9c71be Author: Jean Pihet Date: Sat Dec 18 16:44:45 2010 +0100 OMAP3: rework of the ASM sleep code execution paths - Reworked and simplified the execution paths for better readability and to avoid duplication of code, - Added comments on the entry and exit points and the interaction with the ROM code for OFF mode restore, - Reworked the existing comments for better readability. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 1e81bc015a444e0f908451642b0197199d0c6fa4 Author: Jean Pihet Date: Sat Dec 18 16:44:44 2010 +0100 OMAP3: re-organize the ASM sleep code Organize the code in the following sections: - register access macros, - API functions, - internal functions. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit fe360e1c8693bca175338da4c53078b0be807c52 Author: Jean Pihet Date: Sat Dec 18 16:44:43 2010 +0100 OMAP3: remove hardcoded values from the ASM sleep code Using macros from existing include files for registers addresses. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Based on original patch from Vishwa. Signed-off-by: Jean Pihet Cc: Vishwanath BS Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit b4b36fd94e4ca99b3258ff24c2c58cdde67085e0 Author: Jean Pihet Date: Sat Dec 18 16:44:42 2010 +0100 OMAP2+: use global values for the SRAM PA addresses The SRAM PA addresses are locally defined and used at different places, i.e. SRAM management code and idle sleep code. The macros are now defined at a centralized place, for easier maintenance. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit d3cdfd2a15d87d040a5f553231b979fbc28b98e7 Author: Jean Pihet Date: Sat Dec 18 16:44:41 2010 +0100 OMAP3: remove unused code from the ASM sleep code Remove unused code: - macros, - variables, - unused semaphore locking API. This API shall be added back when needed, - infinite loops for debug. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Reviewed-by: Nishanth Menon Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit cc1b6028878646a2419b27e5f590b5e9fe01dc3d Author: Eduardo Valentin Date: Mon Dec 20 14:05:09 2010 -0600 OMAP3630: PM: Erratum i583: disable coreoff if < ES1.2 Limitation i583: Self_Refresh Exit issue after OFF mode Issue: When device is waking up from OFF mode, then SDRC state machine sends inappropriate sequence violating JEDEC standards. Impact: OMAP3630 < ES1.2 is impacted as follows depending on the platform: CS0: for 38.4MHz as internal sysclk, DDR content seen to be stable, while for all other sysclk frequencies, varied levels of instability seen based on varied parameters. CS1: impacted This patch takes option #3 as recommended by the Silicon erratum: Avoid core power domain transitioning to OFF mode. Power consumption impact is expected in this case. To do this, we route core OFF requests to RET request on the impacted revisions of silicon. Acked-by: Jean Pihet [nm@ti.com: rebased the code to 2.6.37-rc2- short circuit code changed a bit] Signed-off-by: Nishanth Menon Signed-off-by: Eduardo Valentin Signed-off-by: Kevin Hilman commit 80723c3fe457a5d29c178da4ac72983f47b37ed7 Author: Nishanth Menon Date: Mon Dec 20 14:05:08 2010 -0600 OMAP3: PM: make omap3_cpuidle_update_states independent of enable_off_mode Currently omap3_cpuidle_update_states makes whole sale decision on which C states to update based on enable_off_mode variable Instead, achieve the same functionality by independently providing mpu and core deepest states the system is allowed to achieve and update the idle states accordingly. Acked-by: Santosh Shilimkar Acked-by: Jean Pihet Signed-off-by: Nishanth Menon [khilman: fixed additional user of this API in OMAP CPUidle driver] Signed-off-by: Kevin Hilman commit c4236d2e7913d18d058a018f0d19473eb6a11a3c Author: Peter 'p2' De Schrijver Date: Mon Dec 20 14:05:07 2010 -0600 OMAP3630: PM: Disable L2 cache while invalidating L2 cache While coming out of MPU OSWR/OFF states, L2 controller is reseted. The reset behavior is implementation specific as per ARMv7 TRM and hence $L2 needs to be invalidated before it's use. Since the AUXCTRL register is also reconfigured, disable L2 cache before invalidating it and re-enables it afterwards. This is as per Cortex-A8 ARM documentation. Currently this is identified as being needed on OMAP3630 as the disable/enable is done from "public side" while, on OMAP3430, this is done in the "secure side". Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Jean Pihet Acked-by: Santosh Shilimkar [nm@ti.com: ported to 2.6.37-rc2, added hooks to enable the logic only on 3630] Signed-off-by: Nishanth Menon Signed-off-by: Eduardo Valentin Signed-off-by: Peter 'p2' De Schrijver Signed-off-by: Kevin Hilman commit 458e999eb14a301d4176783c8fcb277f5d009b4e Author: Nishanth Menon Date: Mon Dec 20 14:05:06 2010 -0600 OMAP3630: PM: Erratum i608: disable RTA Erratum id: i608 RTA (Retention Till Access) feature is not supported and leads to device stability issues when enabled. This impacts modules with embedded memories on OMAP3630 Workaround is to disable RTA on boot and coming out of core off. For disabling RTA coming out of off mode, we do this by overriding the restore pointer for 3630 as the first point of entry before caches are touched and is common for GP and HS devices. To disable earlier than this could be possible by modifying the PPA for HS devices, but not for GP devices. Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Jean Pihet Acked-by: Santosh Shilimkar [ambresh@ti.com: co-developer] Signed-off-by: Ambresh K Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 8cdfd83473d9b408b924b5d32777ac3fddd251ff Author: Nishanth Menon Date: Mon Dec 20 14:05:05 2010 -0600 OMAP3: pm: introduce errata handling Introduce errata handling for OMAP3. This patch introduces errata variable and stub for initialization which will be filled up by follow-on patches. Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 9d93b8a2c8c78972f0a3d15a820288dbb3968bf2 Author: Peter 'p2' De Schrijver Date: Mon Dec 20 14:05:04 2010 -0600 OMAP3: PM: Erratum i581 support: dll kick strategy Erratum i581 impacts OMAP3 platforms. PRCM DPLL control FSM removes SDRC_IDLEREQ before DPLL3 locks causing the DPLL not to be locked at times. IMPORTANT: *) This is not a complete workaround implementation as recommended by the silicon erratum. This is a support logic for detecting lockups and attempting to recover where possible and is known to provide stability in multiple platforms. *) This code is mostly important for inactive and retention. The ROM code waits for the maximum DLL lock time when resuming from off mode. So for off mode this code isn't really needed. *) counters are introduced here for eventual export to userspace once the cleanups are completed. This should eventually get refactored as part of cleanups to sleep34xx.S Cc: Kevin Hilman Cc: Tony Lindgren Signed-off-by: Peter 'p2' De Schrijver Signed-off-by: Kevin Hilman commit 0bd40535365c318e331f5e872030a710d5746167 Author: Richard Woodruff Date: Mon Dec 20 14:05:03 2010 -0600 OMAP3: PM: Update clean_l2 to use v7_flush_dcache_all Analysis in TI kernel with ETM showed that using cache mapped flush in kernel instead of SO mapped flush cost drops by 65% (3.39mS down to 1.17mS) for clean_l2 which is used during sleep sequences. Overall: - speed up - unfortunately there isn't a good alternative flush method today - code reduction and less maintenance and potential bug in unmaintained code This also fixes the bug with the clean_l2 function usage. Reported-by: Tony Lindgren Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Santosh Shilimkar Acked-by: Jean Pihet [nm@ti.com: ported rkw's proposal to 2.6.37-rc2] Signed-off-by: Nishanth Menon Signed-off-by: Richard Woodruff Signed-off-by: Kevin Hilman commit 53da4ce23809ca33405001b0ae117e60b7feced1 Author: Kevin Hilman Date: Thu Dec 9 09:13:48 2010 -0600 OMAP3: remove OPP interfaces from OMAP PM layer With new OPP layer, OPP users will access OPP API directly instead of using OMAP PM layer, so remove all notions of OPPs from the OMAP PM layer. Acked-by: Paul Walmsley Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit f5a6422d4e0e85a9c7f5522d3321254bfdfa7f04 Author: Nishanth Menon Date: Thu Dec 9 09:13:47 2010 -0600 omap4: opp: add OPP table data This patch adds OPP tables for OMAP4. New file has been added to keep the OMAP4 opp tables and the registration of these tables with the generic opp framework by OMAP SoC OPP interface. Based on: http://dev.omapzoom.org/?p=santosh/kernel-omap4-base.git;a=blob;f=arch/arm/mach-omap2/opp44xx_data.c;h=252e3d0cb6050a64f390b9311c1c4977d74f762a;hb=refs/heads/omap4_next Signed-off-by: Thara Gopinath Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit fd1478cd61624479c89e35602925459d74505ff3 Author: Nishanth Menon Date: Thu Dec 9 09:13:46 2010 -0600 omap: opp: add OMAP3 OPP table data and common init Add OPP data for OMAP34xx and OMAP36xx and initialization functions to populate OPP tables based on current SoC. introduce an OMAP generic opp initialization routine which OMAP3 and OMAP4+ SoCs can use to register their OPP definitions. Cc: Thomas Petazzoni Signed-off-by: Kevin Hilman Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 1cbbe37ac5c78fb59ce02f639d6c4f69b610cf5e Author: Thara Gopinath Date: Mon Dec 20 21:17:21 2010 +0530 OMAP: pm.c correct the initcall for an early init. omap2_common_pm_init is the API where generic system devices like mpu, l3 etc get initialized. This has to happen really early on during the boot and not at a later time. This is especially important with the new opp changes as these devices need to be built before the opp tables init happen. Today both are device initcalls and it works just because of the order of compilation. Making this postcore_initcall is ideal because the omap device layer init happens as a core_initcall and typically rest of the driver/device inits are arch_initcall or something lower. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit c166381d4013fd32512f124c237f4213ae9888e9 Author: Jean Pihet Date: Thu Dec 9 18:39:58 2010 +0100 OMAP2+: disable idle early in the suspend sequence Some bad interaction between the idle and the suspend paths has been identified: the idle code is called during the suspend enter and exit sequences. This could cause corruption or lock-up of resources. The solution is to move the calls to disable_hlt at the very beginning of the suspend sequence (ex. in omap3_pm_begin instead of omap3_pm_prepare), and the call to enable_hlt at the very end of the suspend sequence (ex. in omap3_pm_end instead of omap3_pm_finish). Tested with RET and OFF on Beagle and OMAP3EVM. Signed-off-by: Jean Pihet Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit 503b1a529a6b62b31904bab4699752c523cf76b2 Merge: 4b4f546 215faf9 Author: David S. Miller Date: Tue Dec 21 13:26:15 2010 -0800 Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods commit 4b4f54670859074cf7670cc6fa96fe34a65846d9 Author: Denis Kirjanov Date: Tue Dec 21 02:02:26 2010 +0000 sundance: Program station address into HW Program adapter's StationAddress register when changing device MAC address Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 24de5285dce378e4170e068f2662236d2b46c033 Author: Denis Kirjanov Date: Tue Dec 21 02:01:36 2010 +0000 sundance: Wrap up acceess to ASICCtrl high word with a macro Wrap up acceess to ASICCtrl high word with a macro Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 12b16dadbc2406144d408754f96d0f44aa016239 Author: Eric Dumazet Date: Wed Dec 15 19:45:28 2010 +0000 filter: optimize accesses to ancillary data We can translate pseudo load instructions at filter check time to dedicated instructions to speed up filtering and avoid one switch(). libpcap currently uses SKF_AD_PROTOCOL, but custom filters probably use other ancillary accesses. Note : I made the assertion that ancillary data was always accessed with BPF_LD|BPF_?|BPF_ABS instructions, not with BPF_LD|BPF_?|BPF_IND ones (offset given by K constant, not by K + X register) On x86_64, this saves a few bytes of text : # size net/core/filter.o.* text data bss dec hex filename 4864 0 0 4864 1300 net/core/filter.o.new 4944 0 0 4944 1350 net/core/filter.o.old Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cb8f404893bab40431f7eeb2511454031b07e7df Author: Tejun Heo Date: Tue Dec 14 06:09:59 2010 +0000 bnx2: remove cancel_work_sync() from remove_one Michael pointed out that bnx2_close() already cancels bp->reset_task and thus it is guaranteed to be idle when bnx2_remove_one() is called. Remove the unnecessary cancel_work_sync() in remove_one. Signed-off-by: Tejun Heo Acked-by: Michael Chan Signed-off-by: David S. Miller commit a13c13273a206e0c4b9a814277fb50529457abe7 Merge: 34a52f3 c04bfc6 Author: David S. Miller Date: Tue Dec 21 12:17:29 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 4931445b94f49672028b81ace9d4eee8ddf19ab2 Author: Adrian Hunter Date: Thu Dec 9 11:22:50 2010 +0200 OMAP2/3: OneNAND: add 104MHz support Add GPMC timings for 104MHz OneNAND. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit a3551f5b0c3ca7aaa053e554e3ee766983b5d713 Author: Adrian Hunter Date: Thu Dec 9 10:48:27 2010 +0200 OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds The calculations done with sync_clk are anyway in picoseconds and switching to picoseconds allows sync_clk values that are not a whole number of nanoseconds - which is sometimes the case. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 21dd9ae5a4e9f717f3957ec934dd3158129436b8 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:05 2010 +0100 perf probe: Handle gracefully some stupid and buggy line syntaxes Currently perf probe doesn't handle those incorrect syntaxes: $ perf probe -L sched.c:++13 $ perf probe -L sched.c:-+13 $ perf probe -L sched.c:10000000000000000000000000000+13 This patches rewrites parse_line_range_desc() to handle them. As a bonus, it reports more useful error messages instead of: "Tailing with invalid character...". Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-7-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit c6d92e9b84da2002ee7a75b784834970ddfd3bfd Merge: ba11920 5155e2c Author: David Brown Date: Tue Dec 21 10:53:43 2010 -0800 Merge branch 'msm-usb' into for-next * msm-usb: MSM: Add USB support for MSM7x30 MSM: Add USB suport for QSD8x50 commit 34a52f363ab6bcf6d50a65c153dec03f3fb32653 Author: Dan Carpenter Date: Mon Dec 20 21:34:56 2010 +0000 stmmac: unwind properly in stmmac_dvr_probe() The original code had a several problems: *) It had potential null dereferences of "priv" and "res". *) It released the memory region before it was aquired. *) It didn't free "ndev" after it was allocated. *) It didn't call unregister_netdev() after calling stmmac_probe(). Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 4b97f8e10893e2c8f64a2795901bdb447a3308f4 Author: Dan Carpenter Date: Mon Dec 20 21:04:02 2010 +0000 bnx2x: remove bogus check We dereferenced params on the line before so it's too late to check if params is NULL. In fact, params can never be NULL and strict_cos is either 0 or 1 so that part of the check is bogus too. Let's remove it. Signed-off-by: Dan Carpenter Acked-by: Eilon Greenstein Signed-off-by: David S. Miller commit 70978182d431e0348e6ef711d0f962d12c03bc46 Author: Eric Dumazet Date: Mon Dec 20 21:22:51 2010 +0000 net: timestamp cloned packet in dev_queue_xmit_nit Le vendredi 17 décembre 2010 à 10:26 +0100, Eric Dumazet a écrit : > > I think we can add this after latest Changli patch : > > He does one skb_clone() before calling the sniffers. > We could set timestamp on this clone, instead of original skb. > > Problem solved. > [PATCH net-next-2.6] net: timestamp cloned packet in dev_queue_xmit_nit Now we do one clone of skb if at least one sniffer might take packet, we also can do the skb timestamping on the clone and let original packet unchanged. This is a generalization of commit 8caf153974f2 (net: sch_netem: Fix an inconsistency in ingress netem timestamps.) This way, we can have a good idea when packets are delivered to our stack (tcpdump -i ifb0), while a tcpdump on original device gives timestamps right before ingressing. This also speedup our stack, avoiding taking timestamps if not needed. Signed-off-by: Eric Dumazet Cc: Changli Gao Cc: Patrick McHardy Cc: Jarek Poplawski Acked-by: Changli Gao Signed-off-by: David S. Miller commit e9ccc998b70fbe59626f393bb0328402159c6b5c Author: Nicholas Bellinger Date: Fri Dec 17 13:11:16 2010 -0800 [SCSI] Add missing SPC-4 CDB and MAINTENANCE_[IN,OUT] service action definitions This patch adds a handful of missing CDBs defs that are used by TCM persistent reservation logic in the SPC-4 defined CDB exclusion table for registrations and reservations. This includes a number of missing MI_* and MO_* prefixed service actions defs for MAINTENANCE_IN and MAINTENANCE_OUT that are mentioned wrt to persistent registration and reservation status for the SCSI Initiator Port. Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 3f1530c1e1f7fc570672f4a54565949070fad05f Author: adam radford Date: Tue Dec 14 18:51:48 2010 -0800 [SCSI] megaraid_sas: Update GPL headers. This patch updates the GPL headers in megaraid_sas_base.c and megaraid_sas.h. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 0d49016bbab4fe9164710b1d4bbae116b89b7f7e Author: adam radford Date: Tue Dec 14 19:17:17 2010 -0800 [SCSI] megaraid_sas: Rename megaraid_sas.c to megaraid_sas_base.c This patch renames megaraid_sas.c to megaraid_sas_base.c to facilitate other files in the compile. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit fd01a6632da253210c3dbc7814bc6eceda96623d Author: Hillf Danton Date: Thu Dec 16 14:26:37 2010 -0600 [SCSI] fix the return value of scsi_target_queue_read() It seems that zero should be returned if scsi_target_is_busy(starget) is true, no matter if sdev is on the starved list. Signed-off-by: Hillf Danton Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit db422318cbca55168cf965f655471dbf8be82433 Author: Menny Hamburger Date: Thu Dec 16 14:57:07 2010 -0500 [SCSI] scsi_dh: propagate SCSI device deletion Currently, when scsi_dh_activate() returns with an error (e.g. SCSI_DH_NOSYS) the activate_complete callback is not called and the error is not propagated to DM mpath. When a SCSI device attached to a device handler is deleted, userland processes currently performing I/O on the device will have their I/O hang forever. - Set SCSI_DH_NOSYS error when the handler is in the process of being deleted (e.g. the SCSI device is in a SDEV_CANCEL or SDEV_DEL state). - Set SCSI_DH_DEV_OFFLINED error when device is in SDEV_OFFLINE state. - Call the activate_complete callback function directly from scsi_dh_activate if an error has been set (when either the scsi_dh internal data has already been deleted or is in the process of being deleted). The patch was tested in an iSCSI environment, RDAC H/W handler and multipath. In the following reproduction process, dd will I/O hang forever and the only way to release it will be to reboot the machine: 1) Perform I/O on a multipath device: dd if=/dev/dm-0 of=/dev/zero bs=8k count=1000000 & 2) Delete all slave SCSI devices contained in the mpath device: I) In an iSCSI environment, the easiest way to do this is by stopping iSCSI: /etc/init.d/iscsi stop II) Another way to delete the devices is by applying the following bash scriptlet: dm_devs=$(ls /sys/block/ | grep dm- | xargs) for dm_dev in $dm_devs; do devices=$(ls /sys/block/$dm_dev/slaves) for device in $devices; do echo 1 > /sys/block/$device/device/delete done done NOTE: when DM mpath's fail_path uses blk_abort_queue this scsi_dh change isn't strictly required. However, DM mpath's call to blk_abort_queue will soon be reverted because it has proven to be unsafe due to a race (between blk_abort_queue and scsi_request_fn) that can lead to list corruption. Therefore we cannot rely on blk_abort_queue via fail_path, but even if we could this scsi_dh change is still preferrable. Signed-off-by: Menny Hamburger Signed-off-by: Mike Snitzer Reviewed-by: Babu Moger Signed-off-by: James Bottomley commit 35dd3039e09cd46ca3a8733ff1c817bf7b7b19ce Author: Stephen M. Cameron Date: Thu Dec 16 13:01:03 2010 -0600 [SCSI] hpsa: do not consider RAID level to be part of device identity Otherwise, after doing a RAID level migration, the disk will be disruptively removed and re-added as a different disk on rescan. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a0b89872b305bd0f6f5af1dd26274a3f057a2303 Author: Stephen M. Cameron Date: Thu Dec 16 13:00:58 2010 -0600 [SCSI] hpsa: do not consider firmware revision when looking for device changes. The firmware may have been updated, in which case, it's the same device, and in that case, we do not want to remove and add the device, we want to let it continue as is. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 774342844f368a0c3ba907f192d844ae337d01aa Author: James Smart Date: Wed Dec 15 17:58:20 2010 -0500 [SCSI] lpfc 8.3.20: Update lpfc driver version to 8.3.20 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4042629e426da5ff0c793276a61103bd3f6b2183 Author: James Smart Date: Wed Dec 15 17:58:10 2010 -0500 [SCSI] lpfc 8.3.20: Updates to FC discovery commands Updated commands used for ELS to utilize VPI Allocate RPI at node creation time and pass in ELS commnads. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2fcee4bf874a8ae72ada68b62728d1fdeb30e3d4 Author: James Smart Date: Wed Dec 15 17:57:46 2010 -0500 [SCSI] lpfc 8.3.20: Implement new SLI4 init procedures based on if_type Implement new SLI4 init procedures based on if_type: - Add structure changes for new SLIPORT registers and BAR changes. - Update register names to be consistent with inteface spec terms. - Added union to encapsulate Hardward error registers. - Rework lpfc_sli4_post_status_check() around SLI-4's SLI_INTF type - Removed the lpfc_sli4_fw_cfg_check routine - Segmented driver logic to include evaluation of the if_type to engage different behaviors. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 70f3c073362ef7b5e55c92b83eb2dd9a7fb4e9bf Author: James Smart Date: Wed Dec 15 17:57:33 2010 -0500 [SCSI] lpfc 8.3.20: Implement the FC and SLI async event handlers Implement the FC and SLI async event handlers: - Updated MQ_CREATE_EXT mailbox structure to include fc and SLI async events. - Added the SLI trailer code. - Split physical field into type and number to reflect latest SLI spec. - Changed lpfc_acqe_fcoe to lpfc_acqe_fip to reflect latest Spec changes. - Added lpfc_acqe_fc_la structure for FC link attention async events. - Added lpfc_acqe_sli structure for sli async events. - Added lpfc_sli4_async_fc_evt routine to handle fc la async events. - Added lpfc_sli4_async_sli routine to handle sli async events. - Moved LPFC_TRAILER_CODE_FC to be handled by its own handler function. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit be858b65cf9701e75bc49ed38c56e5b51ff281cd Author: James Smart Date: Wed Dec 15 17:57:20 2010 -0500 [SCSI] lpfc 8.3.20: Critical fixes - Use for iocbq->context1 to hold the ndlp pointer. - Set ndlp in all iocbs generated from ioctl functions. - Turn parity and serr bits back on after performing sli4 board reset. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 395eb20238f5f1d5fba0ae284760a68095dd9e66 Author: Krishna Gudipati Date: Mon Dec 13 16:23:51 2010 -0800 [SCSI] bfa: Update the driver version to 2.3.2.3 Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 15821f05b78dbeb2f897d1d22576449103a4d8d5 Author: Krishna Gudipati Date: Mon Dec 13 16:23:27 2010 -0800 [SCSI] bfa: io tag handling and minor bug fix. Fix iotag handling: 1) Update and check io tag for retry case. 2) Clearing upper 3 bits in io tag when an IO completes. The 3 upper bits in io tags are used for counting FCP exchange retry. Un-cleared bits will cause firmware to access invalid memory when the same io tag is used for an IO to a target that doesn't support FCP exchange retry. 3) Only check the effective bits when validating an iotag. Other minor fixes: 1) Added trace to get FC header type with assert of unhandled packet received. Ignore the type FC_TYPE_FC_FSS (FC_XS). 2) Fixed the adapter info display check - to check for fcmode flag even. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit b704495c6707013806d1b66507a967896e2b4a7c Author: Krishna Gudipati Date: Mon Dec 13 16:17:42 2010 -0800 [SCSI] bfa: direct attach mode fix. - Direct attach is not working due to the check of PID in fcxp_send request. - Added logic to set the lps->lp_pid with the PID assigned for n2n mode. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f1d584d70f31f54e0a559049906f42db89e2746d Author: Krishna Gudipati Date: Mon Dec 13 16:17:11 2010 -0800 [SCSI] bfa: IOC auto recovery fix. - Made IOC auto_recovery synchronized and not timer based. - Only one PCI function will attempt to recover and reinitialize the ASIC on a failure, after all the active PCI fns acknowledge the IOC failure. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f3a060ca57903daaf2f1a88c6c25832619b2a74f Author: Krishna Gudipati Date: Mon Dec 13 16:16:50 2010 -0800 [SCSI] bfa: Store port configuration in flash for persistency. When the bfa driver is loaded a flogi is sent without the knowledge of trunking configuration. This normal flogi causes the switch ports which had trunking enabled to go to persistent offline. Solution is to store the port configuration (which has trunking info) in the flash for persistency. The firmware will read this configuration when the very first fcport enable is received. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4e78efefa3c083240bd47153ffa99642bfdc7811 Author: Krishna Gudipati Date: Mon Dec 13 16:16:09 2010 -0800 [SCSI] bfa: IOC fwtrace save logic & state machine fixes. - Move fw trace save logic to bfa_ioc_sm_fail_entry(), so that fw trace is saved irrespective of the cause of the failure. - Make bfa_ioc_sm_fail() a failure parking state. - Rename bfa_ioc_sm_initfail() to a more appropriate bfa_ioc_sm_fail_retry() as it is no longer a parking state. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit da99dcc98dd66a2de4864645bcafffd93cf5a62f Author: Maggie Zhang Date: Thu Dec 9 19:13:20 2010 -0800 [SCSI] bfa: remove unused functions and misc cleanups Remove unused functions and fix checkpatch errors. Misc cleanups in comment and formatting. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f16a17507b09e10e0cccc4d675ccbfe030d51ef1 Author: Maggie Zhang Date: Thu Dec 9 19:12:32 2010 -0800 [SCSI] bfa: remove all OS wrappers Remove OS wrapper functions/macros, and as a result remove bfa_os_inc.h. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f314878ab95d4802ddde066096f7b30087cea7ba Author: Maggie Zhang Date: Thu Dec 9 19:11:39 2010 -0800 [SCSI] bfa: remove all SCSI IO callbacks Remove SCSI IO callbacks, and as a result remove bfa_cb_ioim.h. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit e3e7d3eebb08735c8a14cd27f76dac784e9a9b75 Author: Maggie Zhang Date: Thu Dec 9 19:10:27 2010 -0800 [SCSI] bfa: scatter gather processing change Modified scatter gather processing to use the kernel provided scsi_for_each_sg() macro. 1) Instead of allocating and setting up sgpg in bfa_ioim_sge_setup(), we only do allocation. As a result, we remove bfa_ioim_sgpg_setup() and rename bfa_ioim_sge_setup() to bfa_ioim_sgpg_alloc(). 2) bfa_ioim_send_ioreq() call scsi_for_each_sg() to handle both inline and sgpg setup. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit b77ee1fb10e4b76dc61094b3678d805be0e4f7ba Author: Maggie Zhang Date: Thu Dec 9 19:09:26 2010 -0800 [SCSI] bfa: remove a file with small size Removed bfa_drv.c, merged it to bfa_core.c and modified Makefile. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f7f73812e95077c19a2801bbf4f483fcdab5232f Author: Maggie Zhang Date: Thu Dec 9 19:08:43 2010 -0800 [SCSI] bfa: clean up one line functions Cleaned up one line functions. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit df0f1933eb5454a5c481311837076056557467ad Author: Maggie Zhang Date: Thu Dec 9 19:07:46 2010 -0800 [SCSI] bfa: remove unused and empty functions Removed unused and empty functions. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 402c6eec1bd04581c04de758e4efddc020b78f91 Author: Robert Jennings Date: Thu Dec 9 14:03:59 2010 -0600 [SCSI] ibmvfc: Improve ibmvfc_async_desc memory layout By changing field ordering we can avoid a couple of memory holes in the tables that use the ibmvfc_async_desc structure. Signed-off-by: Robert Jennings Acked-by: Brian King Signed-off-by: James Bottomley commit 058548ae23f5811d0ccdb39d5ad40f078aca63ef Author: Stephen Hemminger Date: Thu Dec 9 09:37:56 2010 -0800 [SCSI] iscsi: add module alias Since iscsi transport can be built as a module and uses netlink socket to communicate. The module should have an alias to autoload when socket of NETLINK_ISCSI type is requested. Signed-off-by: Stephen Hemminger Acked-by: Mike Christie Signed-off-by: James Bottomley commit 0d81b4e8dcc4177726f30a1ac8df1f726d2a7c0c Author: Christof Schmitt Date: Wed Dec 8 17:30:46 2010 +0100 [SCSI] zfcp: Add allow_lun_scan module parameter The zfcpdump tool requires a method to attach exactly one LUN. The easiest way to achieve this is to add a new zfcp module parameter. When allow_lun_scan is set to "false", zfcp only accepts LUNs that have been configured through the unit_add sysfs interface. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 51780d2c38a7294c2c302ae9d2ea517bd4153dec Author: Christof Schmitt Date: Thu Dec 2 15:16:18 2010 +0100 [SCSI] zfcp: Add __init declaration to zfcp_cache_hw_align The function zfcp_cache_hw_align is only called from zfcp_module_init, so it should be declared with __init as well. Reviewed-by: Steffen Maier Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 3d63d3b4fb5fb3674f2d97725e187cbfa22562bc Author: Christof Schmitt Date: Thu Dec 2 15:16:17 2010 +0100 [SCSI] zfcp: Move qdio setup from erp to zfcp_qdio.c Initialization of the qdio waitqueue should happen when the qdio data is initialized and the QDIOUP flag should be handled in the qdio code as well. Adjust the code accordingly and remove the superfluos function zfcp_erp_adapter_strategy_open_qdio. Reviewed-by: Steffen Maier Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ea4a3a6ac40e2a585654808d4aefb39a6d57dca0 Author: Swen Schillig Date: Thu Dec 2 15:16:16 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing final cleanup. This patch is the final cleanup of the redesign from the zfcp tracing. Structures and elements which were used by multiple areas of the former debug tracing are now changed to the new scheme. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 250a1352b95e1db3216e5c5d4f4365bea5122f4a Author: Swen Schillig Date: Thu Dec 2 15:16:15 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for SCSI records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp SCSI area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit a54ca0f62f953898b05549391ac2a8a4dad6482b Author: Swen Schillig Date: Thu Dec 2 15:16:14 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for HBA records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp HBA area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 2c55b750a884b86dea8b4cc5f15e1484cc47a25c Author: Swen Schillig Date: Thu Dec 2 15:16:13 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for SAN records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp SAN area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ae0904f60fab7cb20c48d32eefdd735e478b91fb Author: Swen Schillig Date: Thu Dec 2 15:16:12 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for recovery actions. The tracing environment of the zfcp LLD has become very bulky and hard to maintain. Small changes involve a large modification process which is error-prone and not effective. This patch is the first of a set to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. It removes all interpretation and visualization parts and focuses on bare logging of the information. This patch deals with all trace records of the zfcp error recovery. Signed-off-by: Swen schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 6b57b159709dcb4d53e64738f2d1f73b36e41601 Author: Vikas Chaudhary Date: Thu Dec 2 22:13:00 2010 -0800 [SCSI] qla4xxx: Update driver version to 5.02.00-k5 Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 7d01d0698f450ed8cc9fd4557f88a3309c868d44 Author: Vikas Chaudhary Date: Thu Dec 2 22:12:51 2010 -0800 [SCSI] qla4xxx: Updated the Copyright header Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 3930b8c1f3582d43757cbcc9b7ecaf05f6b4a66e Author: Vikas Chaudhary Date: Thu Dec 2 22:12:47 2010 -0800 [SCSI] qla4xxx: do not reset hba if ql4xdontresethba is set Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit d56a1f7b39631806ee3d49445a65da6288b099b4 Author: Lalit Chandivade Date: Thu Dec 2 22:12:45 2010 -0800 [SCSI] qla4xxx: do not check for fw hung if reset retry is in progress Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit e128271b7bcb9c8955cadbf2e18f8af288979e6b Author: Prasanna Mumbai Date: Thu Dec 2 22:12:43 2010 -0800 [SCSI] qla4xxx: cache new IP address acquired via DHCP Prior to firmware state change from ACQUIRING to READY, an 0x8029 AEN is received. Added code to check previous state being ACQUIRING in order to update the ip address in the driver. Signed-off-by: Vikas Chaudhary Signed-off-by: Prasanna Mumbai Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 4cd83cbef878b5d0d4c65ac0a20d12a8bf9f551d Author: Lalit Chandivade Date: Thu Dec 2 22:12:40 2010 -0800 [SCSI] qla4xxx: Fail initialization if qla4_8xxx_pci_mem_write_2M fails Since if fw load is failing, running on incomplete fw load would be fatal. Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit fe998527e3f1f5a6eeab5baa23ac2b60ae47e96b Author: Lalit Chandivade Date: Thu Dec 2 22:12:36 2010 -0800 [SCSI] qla4xxx: put device in FAILED state for 82XX initialization failure Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit e6b07df8b0f1530a8ed606f6f464487520d74ad9 Author: Lalit Chandivade Date: Thu Dec 2 22:12:27 2010 -0800 [SCSI] qla4xxx: do not process interrupt unconditionally in mailbox command do not process interrupt unconditionally, process interrupt only in polling mode Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 6790d4fecf4373016e2983f913bcc0f1cdfa8ca0 Author: Karen Higgins Date: Thu Dec 2 22:12:22 2010 -0800 [SCSI] qla4xxx: use correct fw_ddb_index in abort task Signed-off-by: Vikas Chaudhary Signed-off-by: Karen Higgins Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit a1fc26baae41e00a3ecfd99bbe91aa2435045625 Author: Swapnil Nagle Date: Thu Dec 2 22:12:15 2010 -0800 [SCSI] qla4xxx: memory wedge with peg_halt test in loop Signed-off-by: Swapnil Nagle Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 61391d314e856030b2b40b5d6ea22b93de0f1fed Author: Shyam Sundar Date: Thu Dec 2 22:12:08 2010 -0800 [SCSI] qla4xxx: initialize MSI in correct way IRQF_SHARED flag should not be set when calling request_irq for MSI since this interrupt mechanism cannot be shared like standard INTx Signed-off-by: Vikas Chaudhary Signed-off-by: Shyam Sundar Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 3e1350c4dc8900476c4db2066c00f13e9e939817 Author: Vikas Chaudhary Date: Thu Dec 2 22:12:03 2010 -0800 [SCSI] qla4xxx: Drop use of IRQF_DISABLE IRQF_DISABLE flag is deprecated and this flag is a NOOP in kernel. Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 5f0e385fdafb7d6c8ded6464fa6421c735d96caf Author: Joe Eykholt Date: Tue Nov 30 16:20:18 2010 -0800 [SCSI] libfc: fix statistics for FCP input/output megabytes The statistics for InputMegabytes and OutputMegabytes are misnamed. They're accumulating bytes, not megabytes. The statistic returned via /sys must be in megabytes, however, which is what the HBA-API wants. The FCP code needs to accumulate it in bytes and then divide by 1,000,000 (not 2^20) before it presented via sysfs. This affects fcoe.ko only, not fnic. The fnic driver correctly by accumulating bytes and then converts to megabytes. I checked that libhbalinux is using the /sys file directly without conversion. BTW, qla2xxx does divide by 2^20, which I'm not fixing here. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ba9cd5d095b42271588c20ccd6ddd561d0e4cc1e Author: Joe Eykholt Date: Tue Nov 30 16:20:12 2010 -0800 [SCSI] libfcoe: change fip_select to return new FCF Neaten several calls to fip_select() by having it return the pointer to the new FCF. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 981c1154b240ee77133a478fcd3853ac18111672 Author: Joe Eykholt Date: Tue Nov 30 16:20:07 2010 -0800 [SCSI] libfcoe: reorder FCF list to put latest advertiser first When there are several FCFs to choose from, the one most likely to accept a FLOGI on certian switches is the one that last answered a multicast solicit. So, when receiving an advertisement, move the FCF to the front of the list so that it gets chosen first among those with the same priority. Without this, more FLOGIs need to be sent in a test with multiple FCFs and a switch in NPV mode, but it still eventually finds one that accepts the FLOGI. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 9069f5c433e402be5707f37f3d0dfb376659c1e4 Author: Joe Eykholt Date: Tue Nov 30 16:20:02 2010 -0800 [SCSI] libfcoe: add debug message for FCF destination MAC When multiple FCFs to the same fabric exist, the debug messages all look alike. Change the message to include the MAC address. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 794d98e77f5901ceded697f1633463e88f078038 Author: Joe Eykholt Date: Tue Nov 30 16:19:56 2010 -0800 [SCSI] libfcoe: retry rejected FLOGI to another FCF if possible Switches using multiple-FCFs may reject FLOGI in order to balance the load between multiple FCFs. Even though the FCF was available, it may have more load at the point we actually send the FLOGI. If the FLOGI fails, select a different FCF if possible, among those with the same priority. If no other FCF is available, just deliver the reject to libfc for retry. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit b69ae0ae3f322d9a6bc4e209049b5b6e193ad652 Author: Joe Eykholt Date: Tue Nov 30 16:19:51 2010 -0800 [SCSI] libfcoe: fix checking of conflicting fabrics in fcoe_ctlr_select() The check for conflicting fabrics in fcoe_ctlr_select() ignores any FCFs that aren't usable. This is a minor problem now but becomes more pronounced after later patches. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit c47036a7cd378533495d8cc06a7cf8a881072a9d Author: Joe Eykholt Date: Tue Nov 30 16:19:46 2010 -0800 [SCSI] libfcoe: move some timer code to make it reusable. Move some of the code in fcoe_ctlr_timer_work() to fcoe_ctlr_select() so that it can be shared with another function in a forthcoming patch. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 69316ee2e375c5af0cf1f8d2d30f9aa277f0b454 Author: Joe Eykholt Date: Tue Nov 30 16:19:40 2010 -0800 [SCSI] libfcoe: update FIP FCF announcements Move the announcement code to a separate function for reuse in a forthcoming patch. For messages regarding FCF timeout and selection, use the previously-announced FCF MAC address (dest_addr) in the fcoe_ctlr struct. Only print (announce) the FCF if it is new. Print MAC for timed-out or deselected FCFs. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit b5fe5e953c65cd0ec4e9ffd001072700e5b89317 Author: Yi Zou Date: Tue Nov 30 16:19:35 2010 -0800 [SCSI] libfc: fix fc_tm_done not freeing the allocated fsp pkt Frame should be freed in fc_tm_done, this is an updated patch on the one initially submitted by Hillf Danton. Signed-off-by: Hillf Danton Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 3a91090fe0df10091c5612db8528ee7a822ab83d Author: Yi Zou Date: Tue Nov 30 16:19:30 2010 -0800 [SCSI] libfc: the timeout for the REC itself is 2 * R_A_TOV_els The timeout for the exchange carrying REC itself is 2 * R_A_TOV_els. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ea3e2e72eeb3e8a9440a5da965914f9b12088626 Author: Yi Zou Date: Tue Nov 30 16:19:25 2010 -0800 [SCSI] libfc: fix exchange being deleted when the abort itself is timed out Should not continue when the abort itself is being timeout since in that case the exchange will be deleted and relesased. We still want to call the associated response handler to let the layer, e.g., fcp, know the exchange itself is being timed out. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit d889b30a9196c453120ca54323fe80acb4c27b94 Author: Yi Zou Date: Tue Nov 30 16:19:20 2010 -0800 [SCSI] libfc: do not fc_io_compl on fsp w/o any scsi_cmnd associated Do not call fc_io_compl() on fsp w/o any scsi_cmnd, e.g., lun reset is built inside fc_fcp, not from a scsi command from queuecommnd from scsi-ml, so in in case target is buggy that is invalid flags in the FCP_RSP, as we have seen in some SAN Blaze target where all bits in flags are 0, we do not want to call io_compl on this fsp. [ Comment block added by Robert Love ] Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 9b90dc80ba2e566a48585174b1e5ab00e16f0456 Author: Yi Zou Date: Tue Nov 30 16:19:15 2010 -0800 [SCSI] libfc: add print of exchange id for debugging fc_fcp This is very helpful to match up the corresponding exchange to the actual I/O described by the fsp, particularly when you do a side-by-side comparison of the syslog with your trace. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 11aa99001afdbe5fe152e833aa1fea82b85dbeda Author: Joe Perches Date: Tue Nov 30 16:19:09 2010 -0800 [SCSI] drivers/scsi/fcoe: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 0e9e3d3b155c35d5750805c2b8bb6d5b6e6a3bfb Author: Hillf Danton Date: Tue Nov 30 16:19:04 2010 -0800 [SCSI] libfc: fix memory leakage in remote port There seems rdata should get put before return. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 72e0daad555bc0ca2e7abd68593087d098d866a8 Author: Hillf Danton Date: Tue Nov 30 16:18:59 2010 -0800 [SCSI] libfc: fix memory leakage in local port There seems info should get freed when error encountered. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 2d6dfb005e24d7e3404f4c0d333a94b050059173 Author: Hillf Danton Date: Tue Nov 30 16:18:54 2010 -0800 [SCSI] libfc: fix memory leakage in local port There seems info should get freed when error encountered. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 05fee645e96e732a79ad083cab8ddd4efd108e2c Author: john fastabend Date: Tue Nov 30 16:18:49 2010 -0800 [SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct We can easily remove the tgt_flags from fc_fcp_pkt struct and use rpriv->tgt_flags directly where needed. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e0883a3c3e7766b390971a49bf728004816c9520 Author: john fastabend Date: Tue Nov 30 16:18:44 2010 -0800 [SCSI] libfc: use rport timeout values for fcp recovery Use the rport value for rec_tov for timeout values when sending fcp commands. Currently, defaults are being used which may or may not match the advertised values. The default may cause i/o to timeout on networks that set this value larger then the default value. To make the timeout more configurable in the non-REC mode we remove the FC_SCSI_ER_TIMEOUT completely allowing the scsi-ml to do the timeout. This removes an unneeded timer and allows the i/o timeout to be configured using the scsi-ml knobs. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ac17ea8d7d45d0495316edff13faa0dfd6bb2225 Author: john fastabend Date: Tue Nov 30 16:18:39 2010 -0800 [SCSI] libfc: incorrect scsi host byte codes returned to scsi-ml The fcp packet recovery handler fc_fcp_recover() is called when errors occurr in a fcp session. Currently it is generically setting the status code to FC_CMD_RECOVERY for all error types. This results in DID_BUS_BUSY errors being returned to the scsi-ml. DID_BUS_BUSY errors indicate "BUS stayed busy through time out period" according to scsi.h. Many of the error reported by fc_rcp_recovery() are pkt errors. Here we update fc_fcp_recovery to use better host byte codes. With certain FAST FAIL flags set DID_BUS_BUSY and DID_ERROR will have different behaviors this was causing dm multipath to fail quickly in some cases where a retry would be a better action. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e90ff5ef0aab1d40f0e92a44d66f8d45a20d8c95 Author: Hillf Danton Date: Tue Nov 30 16:18:33 2010 -0800 [SCSI] libfc: fix stats computation in fc_queuecommand() There seems accumulation needed. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 530994d69e5b6b4eca2db4a21b6d945d13646053 Author: Hillf Danton Date: Tue Nov 30 16:18:28 2010 -0800 [SCSI] libfc: fix mem leak in fc_seq_assign() There is a typo cleaned, which triggers memory leakage. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 3c2c3bf23cbef8eed6cf815715d0bece5cb7b5ec Author: Robert Love Date: Tue Nov 30 16:18:23 2010 -0800 [SCSI] libfc: Fix incorrect locking and unlocking in FCP The error handler grabs the si->scsi_queue_lock, but in the case where the fsp pointer is NULL it releases the scsi_host lock. This can lead to a variety of system hangs depending on which is used first- the scsi_host lock or the scsi_queue_lock. This patch simply unlocks the correct lock when fcp is NULL. Signed-off-by: Robert Love Tested-by: Ross Brattain Signed-off-by: James Bottomley commit 2034c19ce8f8503aa14cb1e763fbfe60316aaa8e Author: Hillf Danton Date: Tue Nov 30 16:18:17 2010 -0800 [SCSI] libfc: tune fc_exch_em_alloc() to be O(2) For allocating new exch from pool, scanning for free slot in exch array fluctuates when exch pool is close to exhaustion. The fluctuation is smoothed, and the scan looks to be O(2). Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 8236554a27af870ecd1cd588d9558ccdc212037b Author: Hillf Danton Date: Tue Nov 30 16:18:12 2010 -0800 [SCSI] libfc: fix mem leak in fc_exch_recv_seq_resp() There seems that ep should get released, or it will no longer get freed. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 80e736f8a37bebeb5bff18f2aec31caab4104b8b Author: Yi Zou Date: Tue Nov 30 16:18:07 2010 -0800 [SCSI] libfc: fix NULL pointer dereference bug in fc_fcp_pkt_release This happens when then tearing down the fcoe interface with active I/O. The back trace shows dead000000200200 in RAX, i.e., LIST_POISON2, indicating that the fsp is already being dequeued, which is probably why no complaining was seen in fc_fcp_destroy() about outstanding fsp not freed, since we dequeue it in the end of fc_io_compl() before releasing it. The bug is due to the fact that we have already destroyed lport's scsi_pkt_pool while on-going i/o is still accessing it through fc_fcp_pkt_release(), like this trace or the similar code path from scsi-ml to fc_eh_abort, etc. This is fixed by moving the fc_fcp_destroy() after lport is detached from scsi-ml since fc_fcp_destroy is supposed to called only once where no lport lock is taken, otherwise the fc_fcp_pkt_release() would have to grab the lport lock. BUG: unable to handle kernel NULL pointer dereference at (null) ....... RIP: 0010:[<0000000000000000>] [<(null)>] (null) RSP: 0018:ffff8803270f7b88 EFLAGS: 00010282 RAX: dead000000200200 RBX: ffff880197d2fbc0 RCX: 0000000000005908 RDX: ffff880195ea6d08 RSI: 0000000000000282 RDI: ffff880180f4fec0 RBP: ffff8803270f7bc0 R08: ffff880197d2fbe0 R09: 0000000000000000 R10: ffff88032867f090 R11: 0000000000000000 R12: ffff880195ea6d08 R13: 0000000000000282 R14: ffff880180f4fec0 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8801b5820000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000000 CR3: 00000001a6eae000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process fc_rport_eq (pid: 5278, threadinfo ffff8803270f6000, task ffff880326254ab0) Stack: ffffffffa02c39ca ffff8803270f7ba0 ffff88019331cbc0 ffff880197d2fbc0 0000000000000000 ffff8801a8c895e0 ffff8801a8c895e0 ffff8803270f7c10 ffffffffa02c4962 ffff8803270f7be0 ffffffff814c94ab ffff8803270f7c10 Call Trace: [] ? fc_io_compl+0x10a/0x530 [libfc] [] fc_fcp_complete_locked+0x72/0x150 [libfc] [] ? _spin_unlock_bh+0x1b/0x20 [] ? fc_exch_done+0x3f/0x60 [libfc] [] fc_fcp_retry_cmd+0x4f/0x60 [libfc] [] fc_fcp_recv+0x9b0/0xc30 [libfc] [] ? _call_console_drivers+0x4a/0x80 [] ? lock_timer_base+0x3c/0x70 [] ? try_to_del_timer_sync+0x7b/0xe0 [] fc_exch_mgr_reset+0x1df/0x250 [libfc] [] ? fc_fcp_recv+0x0/0xc30 [libfc] [] fc_rport_work+0xf2/0x4e0 [libfc] [] ? prepare_to_wait+0x4e/0x80 [] ? fc_rport_work+0x0/0x4e0 [libfc] [] worker_thread+0x170/0x2a0 [] ? autoremove_wake_function+0x0/0x40 [] ? worker_thread+0x0/0x2a0 [] kthread+0x96/0xa0 [] child_rip+0xa/0x20 [] ? kthread+0x0/0xa0 [] ? child_rip+0x0/0x20 Code: Bad RIP value. RIP [<(null)>] (null) RSP CR2: 0000000000000000 Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 12137f5c28284cc51b5f50932c8d02a5823fcd3c Author: Hillf Danton Date: Tue Nov 30 16:18:01 2010 -0800 [SCSI] libfc: remove define of fc_seq_exch in fc_exch.c The define for fc_seq_exch is unnecessary, since it also appears in scsi/libfc.h Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 50444a340028119ce5ba45d60b4cf44e3e6e1b32 Author: Maggie Date: Mon Nov 29 18:26:32 2010 -0800 [SCSI] bfa: fix endianess sparse check warnings First round of fix for the endianess check warnings from make C=2 CF="-D__CHECK_ENDIAN__". Signed-off-by: Maggie Signed-off-by: James Bottomley commit 52f94b6fd0d1ff9d935c52f8a6360834ed871d92 Author: Maggie Date: Mon Nov 29 18:21:32 2010 -0800 [SCSI] bfa: fix regular sparse check warnings. Fix all sparse check warnings from make C=2. Signed-off-by: Maggie Signed-off-by: James Bottomley commit 3db86353abba4549f665fbdde8572d619566afbb Author: Eddie Wai Date: Tue Nov 23 15:29:32 2010 -0800 [SCSI] bnx2i: Updated version to 2.6.2.2 Signed-off-by: Eddie Wai Signed-off-by: James Bottomley commit 11cec1e2e9d94bcda3446f52a868a2099a2eba4f Author: Eddie Wai Date: Tue Nov 23 15:29:31 2010 -0800 [SCSI] bnx2i: Updated copyright and maintainer info Signed-off-by: Eddie Wai Signed-off-by: James Bottomley commit a91031a6526441ff36552d53363037c3bbca0c5b Author: Eddie Wai Date: Tue Nov 23 15:29:30 2010 -0800 [SCSI] bnx2i: Cleaned up various error conditions in ep_connect/disconnect Various error conditions inside ep_connect and ep_disconnect were either not being handled or not being handled correctly. This patch fixes all those issues. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit bee348770dcaeafa57bbd32129ce0cb16a4342d6 Author: Eddie Wai Date: Tue Nov 23 15:29:29 2010 -0800 [SCSI] bnx2i: Added return code check for chip kwqe submission request Added the handling for cases when a chip request is made to the CNIC module but the hardware is not ready to accept. This would lead to many unnecessary wait timeouts. This code adds check in the connect establishment and destruction path. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 842158d7b7bc3b1a49c31f43ac20414234c33a8d Author: Eddie Wai Date: Tue Nov 23 15:29:28 2010 -0800 [SCSI] bnx2i: Modified the bnx2i stop path to compensate for in progress ops The stop path has been augmented to wait a max of 10s for all in progress offload and destroy activities to complete before proceeding to terminate all active connections (via iscsid or forcefully). Note that any new offload and destroy requests are now blocked and return to the caller immediately. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Benjamin Li Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 016ef69076f3e8f9e42f31152157f46812d25566 Author: Eddie Wai Date: Tue Nov 23 15:29:27 2010 -0800 [SCSI] bnx2i: Removed the dynamic registration of CNIC The code no longer needs to dynamically register and unregister the CNIC device. The CNIC device will be kept registered until module unload. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 7a2962c77ced218faeeb7b5eda48abfebc578df2 Author: Eddie Wai Date: Tue Nov 23 15:29:26 2010 -0800 [SCSI] bnx2i: Added mutex lock protection to conn_get_param Added net_dev mutex lock protection before accessing the csk parameters. Signed-off-by: Eddie Wai Reviewed-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 252e44805bcfff5de2e05dd126f69a18e0b760f0 Author: Eddie Wai Date: Tue Nov 23 15:29:25 2010 -0800 [SCSI] bnx2i: Allow to abort the connection if connect request times out In the situation where the connect completion response arrives after the connect request has already timed out, the connection was not being aborted but only the resource was being freed. This creates a problem for 5771X (10g) as the chip flags this with an assertion. This change will properly aborts the connection before freeing the resource. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 94810e824df1509ad3ba401e57f74b922fd928c5 Author: Eddie Wai Date: Tue Nov 23 15:29:24 2010 -0800 [SCSI] bnx2i: Fixed the remote TCP RST handling for the 570X (1g) Modified the handling of the remote TCP RST code so the chip can now flush the tx pipe accordingly upon a remote TCP RST reception. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 5bf3f39f9bda2750145a7da69ea9ae76d0054956 Author: Eddie Wai Date: Tue Nov 23 15:29:23 2010 -0800 [SCSI] bnx2i: Fixed a cid leak issue for 5771X (10g) A cid leak issue was found when the connect destroy request exceeded the driver's disconnection timeout. This will lead to a cid resource leak issue. The fix is to allow the cid cleanup even when this happens. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit cf464fc5eb272f3f5964560ef2b8d632333afe0d Author: Eddie Wai Date: Tue Nov 23 15:29:22 2010 -0800 [SCSI] bnx2i: Fixed the endian bug in the TMF LUN cmd send Added a be32_to_cpu call for the TMF LUN wqe. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 8eea2f55a65b9471276e78e5c86ddd19c4c0365c Author: Eddie Wai Date: Tue Nov 23 15:29:21 2010 -0800 [SCSI] bnx2i: Added fix for NOP-Out response panic from unsolicited NOP-In The patch fixes the following situations where NOP-Out pkt is called for: - local unsolicited NOP-Out requests (requesting no NOP-In response) - local NOP-Out responses to unsolicited NOP-In requests kernel panic is observed due to double session spin_lock requests; one in the bnx2i_process_nopin_local_cmpl routine in bnx2i_hwi.c and the other in the iscsi_put_task routine in libiscsi.c The proposed fix is to export the currently static __iscsi_put_task() routine and have bnx2i call it directly instead of the iscsi_put_task() routine which holds the session spin lock. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Anil Veerabhadrappa Acked-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 5ee32576269f33b66c6dbc98144aead1e74a1e91 Author: Eddie Wai Date: Tue Nov 23 15:29:20 2010 -0800 [SCSI] bnx2i: Fixed bugs in the handling of unsolicited NOP-Ins Unsolicited NOP-Ins are placed in the receive queue of the hardware which requires to be read out regardless if the receive pipe is suspended or not. This patch adds the disposal of this RQ element under this condition. Also fixed the bug in the unsolicited NOP-In handling routine which checks for the RESERVED_ITT. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit f0cebfb0177f26e214adca3511f37c089d1317f8 Author: Kashyap, Desai Date: Sat Nov 13 04:42:28 2010 +0530 [SCSI] mpt2sas: Bump version 07.100.00.00 Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 37aaa78b8144d48d77bcd69a3353c88c0686df9e Author: Kashyap, Desai Date: Sat Nov 13 04:41:32 2010 +0530 [SCSI] mpt2sas: Debug string changes from target to device. Changing debug print to correct string. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit b41c09d1afc2708b3fab395085f538e1fce9b571 Author: Kashyap, Desai Date: Sat Nov 13 04:40:51 2010 +0530 [SCSI] mpt2sas: Sanity check for phy count is added using max phy count Fix oops loading driver when there is direct attached SEP device The driver set max phys count to the value reported in sas iounit page zero. However this page doesn't take into account additional virutal phys. When sas topology event arrives, the phy count is larger than expected, and the driver accesses memory array beyond the end of allocated space, then oops. Manufacturing page 8 contains the info on direct attached phys. For this fix will making sure that sas topology event is not processing phys greater than the expected phy count. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit a93c6b45df57332b1703e0dc6f99a1bafc17f5e3 Author: Kashyap, Desai Date: Sat Nov 13 04:39:11 2010 +0530 [SCSI] mpt2sas: change queue depth with reason argument more appropriately change_queue_depth callback API changed The change_queue_depth callback changed where there is now an additional parameter called reason, with SCSI_QDEPTH_DEFAULT, SCSI_QDEPTH_QFULL, and SCSI_QDEPTH_RAMP_UP codes. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 90d2a672250b9d6e5c700f2d2c07c19d6fad064a Author: Kashyap, Desai Date: Sat Nov 13 04:37:36 2010 +0530 [SCSI] mpt2sas: Remove code for TASK_SET_FULL from driver. remove support for MPI2_EVENT_TASK_SET_FULL This event is obsoleted, so this processing of this event needs to be removed from the driver. The controller firmware is going to handle TASK_SET_FULL, the driver doesn't need to do anything. Even though we are removing the EVENT handling, the behavour has not changed between driver versions becuase fimrware will still be handling queue throttling, and retrying of commands when the target device queues are full. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 7d061402590efc37d553a9155dbf41277675c179 Author: Kashyap, Desai Date: Sat Nov 13 04:36:14 2010 +0530 [SCSI] mpt2sas: MPI 2.0 Header updated MPI2 Rev header files. 1) Removed Task Set Full Event. Modified description of Disable SCSI Initiator Task Set Full Handling bit in the Flags field of IO Unit Page 1. Modified the descriptions for the three queue depth fields in SAS IO Unit Page 1. (2) Added new value for the Current Operation bits of the Flags field in the RAID Volume Indicator Structure to indicate that the Make Data Consistent operation is running. (3) Added a value of 0x6 to various SAS link rate fields to indicate an attached PHY that is not using any commonly supported settings. (4) Added Volume Not Consistent bit to the VolumeStatusFlags field of RAID Volume Page 0. (5) Added a new value for the IncompatibleReason field of RAID Physical Disk Page 0 to indicate an incompatible media type. (6) Added Diagnostic Data Upload tool for the Toolbox Request. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 7f6f794dee50ba33710145140f39de59f5ec764e Author: Kashyap, Desai Date: Sat Nov 13 04:35:30 2010 +0530 [SCSI] mpt2sas: Modify code to support Expander switch Issue : Switch swap doesn't work when device missing delay is enabled. (1) add support to individually add and remove phys to and from existing ports. This replaces the routine _transport_delete_duplicate_port. (2) _scsih_sas_host_refresh - was modified to change the link rate from zero to 1.5 GB rate when the firmware reports there is an attached device with zero link. (3) add new function mpt2sas_device_remove, this is wrapper function deletes some redundant code through out driver by combining into one subrountine (4) two subroutines were modified so the sas_device, raid_device, and port lists are traversed once when objects are deleted from the list. Previously it was looping back each time an object was deleted from the list. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 35f805b52c94f8e6cb22907ef32517132a15cb96 Author: Kashyap, Desai Date: Sat Nov 13 04:34:06 2010 +0530 [SCSI] mpt2sas: Create a pool of chain buffer instead of dedicated per IOs Create a pool of chain buffers, instead of dedicated per IO: This enahancment is to address memory allocation failure when asking for more than 2300 IOs per host. There is just not enough contiquious DMA physical memory to make one single allocation to hold both message frames and chain buffers when asking for more than 2300 request. In order to address this problem we will have to allocate memory for each chain buffer in a seperate individual memory allocation, placing each chain element of 128 bytes onto a pool of available chains, which can be shared amoung all request. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 6cb8ef573fd4c2bd72248f492fe336133660148d Author: Kashyap, Desai Date: Sat Nov 13 04:32:18 2010 +0530 [SCSI] mpt2sas: Added loadtime para for IOMissingDelay and DMD Ability to override/set the ReportDeviceMissingDelay and IODeviceMissingDelay from driver: Add new command line option missing_delay, this is an array, where the first element is the device missing delay, and the second element is io missing delay. The driver will program sas iounit page 1 with the new setting when the driver loads. This is programmed to the current and persistent configuration page so this takes immediately, as will be sticky across host reboots. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit dd3741d30300f9cf1adc046773a4bb87252d96ac Author: Kashyap, Desai Date: Sat Nov 13 04:31:14 2010 +0530 [SCSI] mpt2sas: Added sanity check for cb_idx and smid access. Sometime it is seen that controller firmware returns an invalid system message id (smid). the oops is occurring becuase mpt_callbacks pointer is referenced to either null or invalid virtual address. this is due to cb_idx set incorrectly from routine _base_get_cb_idx. the cb_idx was set incorrectly becuase there is no check to make sure smid is less than maxiumum anticapted smid. to fix this issue, we add a check in _base_get_cb_idx to make sure smid is not greater than ioc->hba_queue_depth. in addition, a similar check was added to make sure the reply address was less than the largest anticapated address. Newer firmware has sovled this issue, however it good to have this sanity check. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 363fa50fc35357b1361fb63b0726335de993374a Author: Kashyap, Desai Date: Sat Nov 13 04:29:20 2010 +0530 [SCSI] mpt2sas: Removed compiler warnnings when logging is disabled The compiler throws warning messages while compiling without CONFIG_SCSI_MPT2SAS_LOGGING. Set proper ifdef for CONFIG_SCSI_MPT2SAS_LOGGING to avoid warnnings. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 1f768e91e1fcd9f0df657783847347a833fdc573 Author: James Smart Date: Sat Nov 20 23:12:11 2010 -0500 [SCSI] lpfc 8.3.19: Update lpfc driver version to 8.3.19 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit eb7a339e67dceec30f70a5cbed8e2bf6d8318f20 Author: James Smart Date: Sat Nov 20 23:12:02 2010 -0500 [SCSI] lpfc 8.3.19: Change heartbeat to default to disabled Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 19ca760979e4be41a3eb215fb8d0e96637161947 Author: James Smart Date: Sat Nov 20 23:11:55 2010 -0500 [SCSI] lpfc 8.3.19: Added support for ELS RRQ command Added support for ELS RRQ command - Add new routine lpfc_set_rrq_active() to track XRI qualifier state. - Add new module parameter lpfc_enable_rrq to control RRQ operation. - Add logic to ELS RRQ completion handler and xri qualifier timeout to clear XRI qualifier state. - Use OX_ID from XRI_ABORTED_CQE for RRQ payload. - Tie abort and XRI_ABORTED_CQE andler to RRQ generation. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 76a95d75ede64e4f1684ddb8c626fdfdb641bda2 Author: James Smart Date: Sat Nov 20 23:11:48 2010 -0500 [SCSI] lpfc 8.3.19: Add SLI4 FC Discovery support Add SLI4 FC Discovery support - Replace READ_LA and READ_LA64 with READ_TOPOLOGY mailbox command. - Converted the old READ_LA structure to use bf_set/get instead of bit fields. - Rename HBA_FCOE_SUPPORT flag to HBA_FCOE_MODE. Flag now indicates function is running as SLI-4 FC or FCoE port. Make sure flag reset each time READ_REV completed as it can dynamically change. - Removed BDE union in the READ_TOPOLOGY mailbox command and added a define to define the ALPA MAP SIZE. Added FC Code for async events. - Added code to support new 16G link speed. - Define new set of values to keep track of valid user settable link speeds. - Used new link speed definitions to define link speed max and bitmap. - Redefined FDMI Port sppeds to be hax values and added the 16G value. - Added new CQE trailer code for FC Events. - Add lpfc_issue_init_vfi and lpfc_init_vfi_cmpl routines. - Replace many calls to the initial_flogi routine with lpfc_issue_init_vfi. - Add vp and vpi fields to the INIT_VFI mailbox command. - Addapt lpfc_hba_init_link routine for SLI4 use. - Use lpfc_hba_init_link call from lpfc_sli4_hba_setup. - Add a check for FC mode to register the FCFI before init link. - Convert lpfc_sli4_init_vpi to be called without a vpi (get it from vport). Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 085c647c3377c3e39c8c572278507b1e1c7e7bf7 Author: James Smart Date: Sat Nov 20 23:11:37 2010 -0500 [SCSI] lpfc 8.3.19: Add latest SLI4 Hardware initialization support - Add the Lancer FC and FCoE PCI IDs - Add new SLI4 INTF register definitions - Implement new SLI4 doorbell register Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 63e801ce685d151c5faca8f491adc2ad2e732259 Author: James Smart Date: Sat Nov 20 23:14:19 2010 -0500 [SCSI] lpfc 8.3.19: Fix critical errors and crashes Fix critical errors and crashes - Replace LOF_SECURITY with LOG_SECURITY - When calculating diag test memory size, use full size with header. - Return LS_RJT with status=UNSUPPORTED on unrecognized ELS's - Correct NULL pointer dereference when lpfc_create_vport_work_array() returns NULL. - Added code to handle CVL when port is in LPFC_VPORT_FAILED state. - In lpfc_do_scr_ns_plogi, check the nodelist for FDMI_DID and reuse the resource. - Check for generic request 64 and calculate the sgl offset for the request and reply sgls, also calculate the xmit length using only the request bde. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 98db519573e805f9f7e988fb5661da951fcb16b1 Author: James Bottomley Date: Mon Oct 25 15:53:41 2010 -0500 [SCSI] fix id computation in scsi_eh_target_reset() The current code in scsi_eh_target_reset() has an off by one error that actually sends spurious extra resets. Since there's no real need to reset the targets in numerical order, simply chunk up the command recovery list doing target resets and pulling matching targets out of the list (that also makes the loop O(N) instead of O(N^2). [mike christie found and fixed a list_splice -> list_splice_init problem] Reported-by: Hillf Danton Signed-off-by: James Bottomley commit 110def851fc823bb1a4584cb6308e30e5ffb3e05 Author: Wayne Boyer Date: Thu Nov 4 09:36:16 2010 -0700 [SCSI] ipr: fix mailbox register definition and add a delay before reading The definition for the mailbox register for new adapters was incorrect. The value has been updated to the correct offset. After an adapter reset, the mailbox register on the new adapters takes a number of seconds to stabilize. A delay has been added before reading the register. Signed-off-by: Wayne Boyer Acked-by: Brian King Signed-off-by: James Bottomley commit 0cb992eda1f7e7672775032378690baa87c0e13d Author: Wayne Boyer Date: Thu Nov 4 09:35:58 2010 -0700 [SCSI] ipr: fix lun assignment and comparison The lun value was not getting set up correctly for all devices attached to the new 64 bit adapters. The fix is to move the logic to earlier in the ipr_init_res_entry routine such that the value does get set correctly for all devices. Then the ipr_is_same_device comparison function was using the wrong lun value in the logic for the new adapters. Change this to use the correct lun value. Signed-off-by: Wayne Boyer Acked-by: Brian King Signed-off-by: James Bottomley commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1 Author: Luben Tuikov Date: Fri Oct 22 21:24:36 2010 -0700 [SCSI] Retrieve the Caching mode page Some kernel transport drivers unconditionally disable retrieval of the Caching mode page. One such for example is the BBB/CBI transport over USB.  Such a restraint is too harsh as some devices do support the Caching mode page. Unconditionally enabling the retrieval of this mode page over those transports at their transport code level may result in some devices failing and becoming unusable. This patch implements a method of retrieving the Caching mode page without unconditionally enabling it in the transports which unconditionally disable it. The idea is to ask for all supported pages, page code 0x3F, and then search for the Caching mode page in the mode parameter data returned. The sd driver already asks for all the mode pages supported by the attached device by setting the page code to 0x3F in order to find out if the media is write protected by reading the WP bit in the Device Specific Parameter field. It then attempts to retrieve only the Caching mode page by setting the page code to 8 and actually attempting to retrieve it if and only if the transport allows it. The method implemented here is that if the transport doesn't allow retrieval of the Caching mode page and the device is not RBC, then we ask for all pages supported by setting the page code to 0x3F (similarly to how the WP bit is retrieved above), and then we search for the Caching mode page in the mode parameter data returned. With this patch, devices over SATA, report this (no change): Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] 976773168 512-byte logical blocks: (500 GB/465 GiB) Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: Attached scsi generic sg0 type 0 Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write Protect is off Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00 Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA Smart devices report their Caching mode page. This is a change where we'd previously see the kernel making assumption about the device's cache being write-through: Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: Attached scsi generic sg2 type 0 Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] 610472646 4096-byte logical blocks: (2.50 TB/2.27 TiB) Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write Protect is off Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Mode Sense: 47 00 10 08 Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write cache: enabled, read cache: enabled, supports DPO and FUA And "dumb" devices over BBB, are correctly shown not to support reporting the Caching mode page: Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] 15663104 512-byte logical blocks: (8.01 GB/7.46 GiB) Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Write Protect is off Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Mode Sense: 23 00 00 00 Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] No Caching mode page present Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Assuming drive cache: write through Signed-off-by: Luben Tuikov Signed-off-by: James Bottomley commit 00f0254ed9b19164d416dc2e3c2e81eda55a6faf Author: Dan Williams Date: Fri Oct 1 13:55:52 2010 -0700 [SCSI] libsas: fix definition of wideport, include local sas address To date libsas has only looked at the attached sas address when determining the formation of wide ports. The specification and some hardware expects that phys with different addresses will not form a wide port unless the local peer phys also match each other. Introduce a flag to select stricter behavior at sas_register_ha() time. The flag can be dropped once it is known that all libsas users expect the same behavior. Current drivers just initialize this field to zero and get the traditional behavior. Reported-by: Patrick Thomson Signed-off-by: Dan Williams Signed-off-by: James Bottomley commit 3ff5588d3f8afad65ded52ac0e4191462fe034cb Author: Alan Stern Date: Tue Sep 7 11:44:01 2010 -0400 [SCSI] sd: improve logic and efficiecy of media-change detection This patch (as1415) improves the formerly incomprehensible logic in sd_media_changed() (the current code refers to "changed" as a state, whereas in fact it is a relation between two states). It also adds a big comment so that everyone can understand what is really going on. The patch also improves efficiency by not reporting a media change when no medium was ever present. If no medium was present the last time we checked and there's still no medium, it's not necessary to tell the caller that a change occurred. Doing so merely causes the caller to attempt to revalidate a non-existent disk, which is a waste of time. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit fde52dbd7f71934aba4e150f3d1d51e826a08850 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:04 2010 +0100 perf probe: Don't always consider EOF as an error when listing source code When listing a whole file or a function which is located at the end, perf-probe -L output wrongly: "Source file is shorter than expected.". This is because show_one_line() always consider EOF as an error. This patch fixes this by not considering EOF as an error when dumping the trailing lines. Otherwise it's still an error and perf-probe still outputs its warning. Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-6-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 9d95b580a8d64ef4d1660a21a9de0658fe29f041 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:03 2010 +0100 perf probe: Fix line range description since a single file is allowed $ perf-probe -L sched.c is currently allowed but not documented. Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-5-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 44b81e929b0c00e703a31a3d634b668bb27eb1c8 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:02 2010 +0100 perf probe: Clean up redundant tests in show_line_range() It also removes some superflous parentheses. Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-4-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit befe341468f4e61ecaf337a0237f2aab76817437 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:01 2010 +0100 perf probe: Rewrite show_one_line() to make it simpler Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-3-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 62c15fc49bd1b35d79b34ea96f132ab435e2215a Author: Franck Bui-Huu Date: Mon Dec 20 15:18:00 2010 +0100 perf probe: Make -L display the absolute path of the dumped file The actual file used by 'perf probe -L sched.c' is reported in the ouput of the command. But it's simply displayed as it has been given to the command (simply sched.c) which is too ambiguous to be really usefull since several sched.c files can be found into the same project and we also don't know which search path has been used. Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-2-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 0e43e5d222095ca2d1d825dd2e4fa158bdc4cc9b Author: Masami Hiramatsu Date: Fri Dec 17 22:12:11 2010 +0900 perf probe: Cleanup messages Add new lines for error or debug messages, change dwarf related words to more generic words (or just removed). Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20101217131211.24123.40437.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit ec5761eab318e50e69fcf8e63e9edaef5949c067 Author: David Ahern Date: Thu Dec 9 13:27:07 2010 -0700 perf symbols: Add symfs option for off-box analysis using specified tree The symfs argument allows analysis of perf.data file using a locally accessible filesystem tree with debug symbols - e.g., tree created during image builds, sshfs mount, loop mounted KVM disk images, USB keys, initrds, etc. Anything with an OS tree can be analyzed from anywhere without the need to populate a local data store with build-ids. Commiter notes: o Fixed up symfs="/" variants handling. o prefixed DSO__ORIG_GUEST_KMODULE case with symfs too, avoiding use of files outside the symfs directory. LKML-Reference: <1291926427-28846-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit eac23d1c384b55e4bbb89ea9e5a6bb77fb4d1140 Author: Ian Munsie Date: Thu Dec 9 16:33:53 2010 +1100 perf record,report,annotate,diff: Process events in order This patch changes perf report to ask for the ID info on all events be default if recording from multiple CPUs. Perf report, annotate and diff will now process the events in order if the kernel is able to provide timestamps on all events. This ensures that events such as COMM and MMAP which are necessary to correctly interpret samples are processed prior to those samples so that they are attributed correctly. Before: # perf record ./cachetest # perf report # Events: 6K cycles # # Overhead Command Shared Object Symbol # ........ ....... ................. ............................... # 74.11% :3259 [unknown] [k] 0x4a6c 1.50% cachetest ld-2.11.2.so [.] 0x1777c 1.46% :3259 [kernel.kallsyms] [k] .perf_event_mmap_ctx 1.25% :3259 [kernel.kallsyms] [k] restore 0.74% :3259 [kernel.kallsyms] [k] ._raw_spin_lock 0.71% :3259 [kernel.kallsyms] [k] .filemap_fault 0.66% :3259 [kernel.kallsyms] [k] .memset 0.54% cachetest [kernel.kallsyms] [k] .sha_transform 0.54% :3259 [kernel.kallsyms] [k] .copy_4K_page 0.54% :3259 [kernel.kallsyms] [k] .find_get_page 0.52% :3259 [kernel.kallsyms] [k] .trace_hardirqs_off 0.50% :3259 [kernel.kallsyms] [k] .__do_fault After: # perf report # Events: 6K cycles # # Overhead Command Shared Object Symbol # ........ ....... ................. ............................... # 44.28% cachetest cachetest [.] sumArrayNaive 22.53% cachetest cachetest [.] sumArrayOptimal 6.59% cachetest ld-2.11.2.so [.] 0x1777c 2.13% cachetest [unknown] [k] 0x340 1.46% cachetest [kernel.kallsyms] [k] .perf_event_mmap_ctx 1.25% cachetest [kernel.kallsyms] [k] restore 0.74% cachetest [kernel.kallsyms] [k] ._raw_spin_lock 0.71% cachetest [kernel.kallsyms] [k] .filemap_fault 0.66% cachetest [kernel.kallsyms] [k] .memset 0.54% cachetest [kernel.kallsyms] [k] .copy_4K_page 0.54% cachetest [kernel.kallsyms] [k] .find_get_page 0.54% cachetest [kernel.kallsyms] [k] .sha_transform 0.52% cachetest [kernel.kallsyms] [k] .trace_hardirqs_off 0.50% cachetest [kernel.kallsyms] [k] .__do_fault Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1291872833-839-1-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 21ef97f05a7da5bc23b26cb34d6746f83ca9bf20 Author: Ian Munsie Date: Fri Dec 10 14:09:16 2010 +1100 perf session: Fallback to unordered processing if no sample_id_all If we are running the new perf on an old kernel without support for sample_id_all, we should fall back to the old unordered processing of events. If we didn't than we would *always* process events without timestamps out of order, whether or not we hit a reordering race. In other words, instead of there being a chance of not attributing samples correctly, we would guarantee that samples would not be attributed. While processing all events without timestamps before events with timestamps may seem like an intuitive solution, it falls down as PERF_RECORD_EXIT events would also be processed before any samples. Even with a workaround for that case, samples before/after an exec would not be attributed correctly. This patch allows commands to indicate whether they need to fall back to unordered processing, so that commands that do not care about timestamps on every event will not be affected. If we do fallback, this will print out a warning if report -D was invoked. This patch adds the test in perf_session__new so that we only need to test once per session. Commands that do not use an event_ops (such as record and top) can simply pass NULL in it's place. Acked-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1291951882-sup-6069@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 0719e1d23aab3b445c823404fd1b8b027757bb0a Author: Yann E. MORIN Date: Thu Dec 16 00:19:00 2010 +0100 Documentation/kbuild: add info that 'choice' can have a symbol name Changeset 5a1aa8a1 added the possibility to name a choice, and to have the same choice be defined multiple times. But the documentation was forgotten, so this updates it accordingly. Thanks to Arnaud Lacombe for pointing it to me in the first place: http://www.spinics.net/lists/linux-kbuild/msg03940.html Signed-off-by: "Yann E. MORIN" Cc: Roman Zippel Cc: Arnaud Lacombe Signed-off-by: Michal Marek commit fec6e5252b542e748871c88f8455e69ae73ea156 Author: Henrik Rydberg Date: Tue Dec 21 18:11:25 2010 +0100 Input: synaptics - add multi-finger and semi-mt support The Synaptics 2.7 series of touchpads support a mode for reporting two sets of X/Y/Pressure data (advanced gesture mode). By default, these devices report only single finger data, depriving userspace of the nowadays ubiquitous two-finger scroll gesture. Enabling advanced gesture mode also enables the multi-finger report, although the device does not claim that capability. Up to three fingers can be reported this way. While two or three fingers are touching, the normal packet is prepended by a reduced finger packet of lower resolution. From the two packets (which do not represent the actual fingers), the bounding rectangle of the individual contacts can be extracted. This information is sufficient to perform scaling gestures and a limited form of rotation gesture. The behavior has been coined semi-mt capability, and is signaled to userspace via the INPUT_PROP_SEMI_MT device property. Work to decode the advanced gesture packet: Takashi Iwai. Cleanup and testing of the original patch: Chase Douglas. Minor cleanup and testing: Chris Bagwell. Finalization and semi-mt support: Henrik Rydberg. Reported-by: Tobyn Bertram Signed-off-by: Takashi Iwai Signed-off-by: Chase Douglas Signed-off-by: Chris Bagwell Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit c14890a8e54977f895773d393d6a640d6d698fb8 Author: Henrik Rydberg Date: Thu Dec 16 09:52:23 2010 +0100 Input: synaptics - report clickpad property With the new input property interface, it is possible to report the special quirks of a device using ioctl/sysfs. This patch sets up the device as a pointer, and reports the clickpad functionality via the INPUT_PROP_BUTTONPAD property. Acked-by: Chase Douglas Signed-off-by: Henrik Rydberg commit 17742dc743716eebbf5892add0e0bf91f541fc39 Author: Michal Marek Date: Mon Dec 20 16:06:44 2010 +0100 kconfig: Make expr_copy() take a const argument Fixes scripts/kconfig/expr.c: In function ‘expr_get_leftmost_symbol’: scripts/kconfig/expr.c:1026:2: warning: passing argument 1 of ‘expr_copy’ discards qualifiers from pointer target type scripts/kconfig/expr.c:67:14: note: expected ‘struct expr *’ but argument is of type ‘const struct expr *’ Signed-off-by: Michal Marek commit 1137c56b7420c801147e0863845c03b07554721a Author: Arnaud Lacombe Date: Sun Sep 26 16:24:08 2010 -0400 kconfig: simplify select-with-unmet-direct-dependency warning This is an attempt to simplify the expressing printed by kconfig when a symbol is selected but still has direct unmet dependency. First, the symbol reverse dependency is split in sub-expression. Then, each sub-expression is checked to ensure that it does not contains the unmet dependency. This removes the false-positive symbols and fixed symbol which already have the correct dependency. Finally, only the symbol responsible of the "select" is printed, instead of its full dependency tree. CC: Catalin Marinas Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit b080ac8ad47aeeb845d8d11924f09255cf49b5e9 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 21:34:51 2010 +0100 ARM: 6459/2: sa1100: Add nanoEngine PCI support. This patch adds nanoEngine's PCI support. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit fa87672ab30ce6564393778b8cbc67fc32712a30 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:41:29 2010 +0100 ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. This patch adds nanoEngine PCMCIA support, with support for two sockets. In order to have a fully functional pcmcia subsystem in a BSE nanoEngine board you should carefully read this: http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/ Acked-by: Dominik Brodowski Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 17b38ebb6a32250a220d6af77293f7e3f9c62a6e Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:39:05 2010 +0100 ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c. This patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit d2ccb52d88dcb7eb3539d0e0c77a7028b8d46037 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 21:31:32 2010 +0100 ARM: 6455/2: Better use of the RTC framework for sa11xx. This patch uses the RTC framework to treat some common ioctl. In particular, it fixes the behaviour of rtc_irq_set_freq(), which did not work as expected because the timer was not beeing retriggered. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 47bb3b31ab2c95e275b850a291794a29aaaa31cd Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:32:48 2010 +0100 ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. This patch fixes checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 9f15d2caca102c4b79e34562296bcbf982665cb2 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 20:51:30 2010 +0100 ARM: 6447/3: sa1100: Put nanoEngine support back in the kernel Adds Bright Star Engineering's nanoEngine board support to the kernel. Also: - Adds the nanoEngine memory chip to arch/arm/mach-sa1100/cpu-sa1110.c (Micron MT48LC8M16A2TG-75). - Increase in the sdram_params->name[] field length to accomodate the name of the memory chip. - Clean up of header content and order of arch/arm/mach-sa1100/cpu-sa1110.c Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 215faf9c5f6e319e97edea9e178123e07825c14d Author: Joe Perches Date: Tue Dec 21 02:16:10 2010 -0800 drivers/net/*/: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 75a84eb5d144dc761e1bb0f7dcacbf2b5cee562c Author: Joe Perches Date: Tue Dec 21 02:16:09 2010 -0800 tulip: Use DEFINE_PCI_DEVICE_TABLE and static const Moves the PCI table to the right read-only section. Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 5591c75dc345d93d353d2ab2962824648a73efe4 Author: Joe Perches Date: Tue Dec 21 02:16:09 2010 -0800 usb: Use static const, consolidate code Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Consolidate duplicated code into new fix_crc_bug function and declare data in that function static const. Signed-off-by: Joe Perches commit b6bc765067ece933cc3dc7f5e95665a89100b1d5 Author: Joe Perches Date: Tue Dec 21 02:16:08 2010 -0800 drivers/net/*.c: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 895950c2a6565d9eefda4a38b00fa28537e39fcb Author: Joe Perches Date: Tue Dec 21 02:16:08 2010 -0800 tg3: Use DEFINE_PCI_DEVICE_TABLE Moves the PCI tables to the right read-only section. Signed-off-by: Joe Perches commit 356f039822b8d802138f7121c80d2a9286976dbd Author: Nandita Dukkipati Date: Mon Dec 20 14:15:56 2010 +0000 TCP: increase default initial receive window. This patch changes the default initial receive window to 10 mss (defined constant). The default window is limited to the maximum of 10*1460 and 2*mss (when mss > 1460). draft-ietf-tcpm-initcwnd-00 is a proposal to the IETF that recommends increasing TCP's initial congestion window to 10 mss or about 15KB. Leading up to this proposal were several large-scale live Internet experiments with an initial congestion window of 10 mss (IW10), where we showed that the average latency of HTTP responses improved by approximately 10%. This was accompanied by a slight increase in retransmission rate (0.5%), most of which is coming from applications opening multiple simultaneous connections. To understand the extreme worst case scenarios, and fairness issues (IW10 versus IW3), we further conducted controlled testbed experiments. We came away finding minimal negative impact even under low link bandwidths (dial-ups) and small buffers. These results are extremely encouraging to adopting IW10. However, an initial congestion window of 10 mss is useless unless a TCP receiver advertises an initial receive window of at least 10 mss. Fortunately, in the large-scale Internet experiments we found that most widely used operating systems advertised large initial receive windows of 64KB, allowing us to experiment with a wide range of initial congestion windows. Linux systems were among the few exceptions that advertised a small receive window of 6KB. The purpose of this patch is to fix this shortcoming. References: 1. A comprehensive list of all IW10 references to date. http://code.google.com/speed/protocols/tcpm-IW10.html 2. Paper describing results from large-scale Internet experiments with IW10. http://ccr.sigcomm.org/drupal/?q=node/621 3. Controlled testbed experiments under worst case scenarios and a fairness study. http://www.ietf.org/proceedings/79/slides/tcpm-0.pdf 4. Raw test data from testbed experiments (Linux senders/receivers) with initial congestion and receive windows of both 10 mss. http://research.csc.ncsu.edu/netsrv/?q=content/iw10 5. Internet-Draft. Increasing TCP's Initial Window. https://datatracker.ietf.org/doc/draft-ietf-tcpm-initcwnd/ Signed-off-by: Nandita Dukkipati Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit eda83e3b63e88351310c13c99178eb4634f137b2 Author: Eric Dumazet Date: Mon Dec 20 12:54:58 2010 +0000 net_sched: sch_sfq: better struct layouts Here is a respin of patch. I'll send a short patch to make SFQ more fair in presence of large packets as well. Thanks [PATCH v3 net-next-2.6] net_sched: sch_sfq: better struct layouts This patch shrinks sizeof(struct sfq_sched_data) from 0x14f8 (or more if spinlocks are bigger) to 0x1180 bytes, and reduce text size as well. text data bss dec hex filename 4821 152 0 4973 136d old/net/sched/sch_sfq.o 4627 136 0 4763 129b new/net/sched/sch_sfq.o All data for a slot/flow is now grouped in a compact and cache friendly structure, instead of being spreaded in many different points. struct sfq_slot { struct sk_buff *skblist_next; struct sk_buff *skblist_prev; sfq_index qlen; /* number of skbs in skblist */ sfq_index next; /* next slot in sfq chain */ struct sfq_head dep; /* anchor in dep[] chains */ unsigned short hash; /* hash value (index in ht[]) */ short allot; /* credit for this slot */ }; Signed-off-by: Eric Dumazet Cc: Jarek Poplawski Cc: Patrick McHardy Signed-off-by: David S. Miller commit 4584acc3ee236424b5d0b52f143d980cae3c2be5 Merge: f0c61d3 c7d3e9e b89cd71 Author: Tony Lindgren Date: Mon Dec 20 19:13:40 2010 -0800 Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus commit f0c61d3d3c319def8feebb99682ae0223a41dffe Author: Jarkko Nikula Date: Sat Dec 18 18:17:10 2010 +0000 omap: rx51: Switch rx51_tpa6130a2_data __initdata to__initdata_or_module If the TPA6130 is compiled as module the id and power_gpio values are arbitrary at module probing time since the rx51_tpa6130a2_data was marked as __initdata. Fix this by using __initdata_or_module. Then __initdata is defined only if the kernel is built without CONFIG_MODULES and omitted otherwise. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit f861fc1766888858db6abd57adae3af7abc286ca Author: Grazvydas Ignotas Date: Sun Dec 19 22:33:36 2010 +0000 omap: pandora: fix wifi support After commit ed919b0 "mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD" it is required to specify MMC_CAP_POWER_OFF_CARD to have runtime PM support. As the wl1251 driver expects card to be powered down when it's not used, wifi will no longer work after interface is brought down at least once without functioning runtime PM. Fix this by declaring MMC_CAP_POWER_OFF_CARD for MMC3. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit d920e52020bcad791b12137deea341665160b974 Author: Raghuveer Murthy Date: Fri Dec 17 18:15:07 2010 -0800 OMAP4: Pandaboard: Add omap_reserve functionality This patch adds omap_reserve functionality to board-omap4panda.c. Helps in the reserving boot time memory in SDRAM, used here for framebuffer allocation. This patch is in similar lines to commit id 71ee7dad9b6991, from Russell king Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Raghuveer Murthy [tony@atomide.com: fixed to be before .map_io as pointed out by Russell King] Signed-off-by: Tony Lindgren commit f389f4cb46e69fe2cea81e21fd01efc4daf07c8e Author: Hemanth V Date: Fri Dec 17 18:15:08 2010 -0800 omap4: Add platform changes for PWM LED Register TWL6030 PWM, which is used as charging LED Signed-off-by: Hemanth V Signed-off-by: Tony Lindgren commit d048aca2e2e023204c10ca6b705642c1de54d95c Author: Hemanth V Date: Fri Dec 17 18:15:08 2010 -0800 omap4: Add platform changes for Ambient Light sensor Register BH1780GLI Ambient light sensor, which is an I2C device for 4430SDP board. Signed-off-by: Hemanth V Signed-off-by: Tony Lindgren commit 70e77760639625e6ec4564c262552e6002eb5ba6 Author: Laurent Pinchart Date: Fri Dec 17 18:15:08 2010 -0800 omap3: igepv2: LED gpio-led:green:d1 is active low Make sure the LED is turned off at boot time, and configure the GPIO LED device as active low. Signed-off-by: Laurent Pinchart Acked-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 62d8e9e2613032c6c8397b554b5f789131bb3d60 Author: Laurent Pinchart Date: Fri Dec 17 18:15:07 2010 -0800 omap3: igepv2: Don't call gpio_set_value right aftergpio_direction_output gpio_direction_output() has a value argument, there's no need to call gpio_set_value() explicitly right after. Signed-off-by: Laurent Pinchart Acked-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 65dd4c1626b396af839881708fdf3bc726a16f73 Author: Tony Lindgren Date: Fri Dec 17 18:37:08 2010 -0800 omap1: Fix innovator FPGA init for multi-omap No need to call this early from init_irq. Also recent changes initialize GPIO now later, so calling gpio_request from init_irq will make it fail. While at it, also remove the unnecessary EXPORT_SYMBOL. Signed-off-by: Tony Lindgren commit da07c0cff295d887427ad2519e452ee3c27e47ff Author: Marc Zyngier Date: Mon Dec 20 18:48:16 2010 -0800 Fix IGEPv2 second MMC channel power supply Commit 72f381ba056 (omap3: Remove VMMC2 regulator on IGEP v2) removed an unused regulator entry, but left the second MMC channel (used by the Libertas WLAN module) without link to power regulator. This causes the SDIO module to fail being detected. This patch adds the two regulators that actually feed the WLAN module (1v8 from the TWL4030 VIO LDO, and a fixed 3v3). With that patch, the second channel is properly detected. Details of the power supply implementation were kindly provided by Enric Balletbo i Serra. Also change vmmc1 to use symbolic names instead of direct device reference. Tested on an IGEPv2 Rev-B. Signed-off-by: Marc Zyngier Acked-by: Enric Balletbo i Serra Cc: Tony Lindgren Signed-off-by: Tony Lindgren commit cd303e1712e3ebdf174bb378bb8df851eac2701a Author: Anand Gadiyar Date: Mon Dec 20 18:48:16 2010 -0800 omap2430: hwmod: remove stray declaration Patch "OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430" in linux-next as of 20101203 introduced the following build warning - fix this by removing the stray i2c_dev_attr. arch/arm/mach-omap2/omap_hwmod_2430_data.c:483: warning: 'i2c_dev_attr' defined but not used Signed-off-by: Anand Gadiyar Cc: Kevin Hilman Signed-off-by: Tony Lindgren commit 60d24eeda7c7e3b0551f5a349224c7cc721206bd Author: Srikar Date: Mon Dec 20 18:48:16 2010 -0800 Added video data to support tvout on rx51 To support tvout on rx51,added Intilization data, tvout as display device and enabled venc through gpio on rx51 Signed-off-by: Srikar Signed-off-by: Tony Lindgren commit caeeb4aadfbff8d8efbb055594c0459cff94adad Author: Jarkko Nikula Date: Mon Dec 20 18:48:16 2010 -0800 omap: rx51: Add supplies and data for codec b part ofTLV320AIC34 Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies and platform data for b part of the codec. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 91db7b2985555bd0456ad30440dd615c985fc9c6 Author: Jarkko Nikula Date: Mon Dec 20 18:48:15 2010 -0800 omap: rx51: Remove extra tlv320aic3x.h inclusion Remove second tlv320aic3x.h inclusion that came along the commit f0fba2a "ASoC: multi-component - ASoC Multi-Component Support". Signed-off-by: Jarkko Nikula Cc: Liam Girdwood Signed-off-by: Tony Lindgren commit 5690597fc648c92b94771993a56c7e4f614874bf Author: Aaro Koskinen Date: Mon Dec 20 18:48:15 2010 -0800 arm: mach-omap2: Kconfig: fix incorrect option There is no MFD config option, MFD_SUPPORT should be selected instead. This will prevent build errors when trying out different configurations. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 434c23a7ef48763fd8d4adfb0edebb4237770f9d Author: Aaro Koskinen Date: Mon Dec 20 18:48:15 2010 -0800 arm: mach-omap2: hsmmc_reset: fix clk_get() error handling clk_get() return value should be checked with IS_ERR(). Furthermore, clocks should be put and disabled properly. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit f31cc9622d75c1c6f041d786698daa425c0425c2 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP: DMA: Convert DMA library into platform driver Convert DMA library into DMA platform driver and make use of platform data provided by hwmod data base for OMAP2+ onwards. For OMAP1 processors, the DMA driver in mach-omap uses resource structures for getting platform data. Thanks to Tony Lindgren for fixing various omap1 issues and testing the same on OSK5912 board. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 59de3cf1ce9a961ba9ab657707727db2111e72fa Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP2+: DMA: hwmod: Device registration Prepare OMAP2+ DMA to use hwmod infrastructure so that DMA can register as platform device. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 6568f7c43a72f9631910e26092ef3ecf67cc99eb Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP1: DMA: Implement in platform device model Implement OMAP1 DMA as platform device and add support for registering through platform device layer using resource structures. Signed-off-by: G, Manjunath Kondaiah Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 531ce0d57caf7e49073608873de6976558fd7e4f Author: Benoit Cousson Date: Mon Dec 20 18:27:19 2010 -0800 OMAP4: hwmod data: add system DMA Add OMAP4 DMA hwmod data. In addition to original dma hwmod data, the following changes are added. 1. DMA device attributes structure is introduced for diffenrenciating OMAP cpu's based on DMA features. Signed-off-by: Benoit Cousson Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 01438ab6a49b63ef02b2eb44b63345a09792f982 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP3: hwmod data: add system DMA Add OMAP3 DMA hwmod data Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 82cbd1aebafd126f40a8ed0725a6feb6ed710576 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP2430: hwmod data: add system DMA Add OMAP2430 DMA hwmod data and also add required DMA device attributes. Signed-off-by: G, Manjunath Kondaiah Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 745685df95961ebbf0bcafcf28f31217a75070ae Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP2420: hwmod data: add system DMA Add OMAP2420 DMA hwmod data and also add required DMA device attributes. Signed-off-by: G, Manjunath Kondaiah Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit d3c9be2f42223f256d06b2b69ed26afdcb02f64a Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP: DMA: Introduce errata handling feature Implement errata handling to use flags instead of cpu_is_* and cpu_class_* in the code. The errata flags are initialized at init time and during runtime we are using the errata variable (via the IS_DMA_ERRATA macro) to execute the required errata workaround. Reused errata handling patch from: Peter Ujfalusi https://patchwork.kernel.org/patch/231191/ Changes to above patch: 1. Changes are done for converting all the existing errata work arounds to use this feature. 2. Detailed description for each errata is added. 3. Fixed bug in SET_DMA_ERRATA macro 4. Bit shifting in macro definitions are replaced with BIT() macro Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit a4c537c7f60704691efc5f833b3d440252275c3b Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:17 2010 -0800 OMAP: DMA: Replace read/write macros with functions Prepare DMA library to get converted into DMA driver using platform device model and hwmod infrastucture(for omap2+, resource structures for omap1) The low level read/write macros are replaced with static inline functions and register offsets are handled through static register offset tables mapped through enumeration constants. These low level read/write functions along with static register offset tables will be moved to respective mach-omap dma files in the later patches of this series. There are no functionality changes with these changes except change in logic for handling 16bit registers of OMAP1. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit f7bb0d9ab29e3159e22c3bfc843bd37c7d3c91a0 Author: Benoit Cousson Date: Thu Dec 9 14:24:16 2010 +0000 I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c The convention for omap device naming is omap_XXX. Rename the device and driver name in order to stick to this naming convention. Change device name in clock nodes as well. Signed-off-by: Benoit Cousson Cc: Kevin Hilman Cc: Rajendra Nayak Cc: Ben Dooks Acked-by: Paul Walmsley Acked-by: Ben Dooks Signed-off-by: Tony Lindgren commit 05f185c774992f1d9edb646a3ecfdabdc8e358f3 Author: Marek Belisko Date: Mon Dec 6 13:23:48 2010 +0000 omap1: pm_bus: Fix compilation warning Fix following compilation warning: arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_resume': arch/arm/mach-omap1/pm_bus.c:51: warning: unused variable 'ret' Signed-off-by: Marek Belisko Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 16c8a3b0c193dca0826dde77423ec4f7a81ed9f6 Author: Marek Belisko Date: Mon Dec 6 12:49:05 2010 +0000 omap1: htc_herald: Fix compilation warning Patch fix following compilation warning: arch/arm/mach-omap1/board-htcherald.c:442: warning: large integer implicitly truncated to unsigned type Hopefully this is just a typo. Signed-off-by: Marek Belisko Signed-off-by: Tony Lindgren commit 374b8cfd61f33b3c1dd4b0f4c2b1bb20079d3090 Author: Benoit Cousson Date: Thu Dec 9 14:24:17 2010 +0000 omap: serial: Change device name: omap-hsuart -> omap_uart The naming convention for omap_device is omap_XXX. Rename the device and driver name in order to stick to this naming convention. Remove the hs prefix that is implicit for every OMAP uarts. Signed-off-by: Benoit Cousson Acked-by: Govindraj Raja Cc: Paul Walmsley Cc: Kevin Hilman Signed-off-by: Tony Lindgren commit d9993be65a77f500ae926176baa264816bfe3816 Merge: c426626 aa3e219 Author: David S. Miller Date: Mon Dec 20 13:24:14 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit c4266263249f22479eb1abb1a1709c38240b1597 Author: Eric Dumazet Date: Wed Dec 15 08:18:36 2010 +0000 net_sched: sch_sfq: add backlog info in sfq_dump_class_stats() We currently return for each active SFQ slot the number of packets in queue. We can also give number of bytes accounted for these packets. tc -s class show dev ifb0 Before patch : class sfq 11:3d9 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 3p requeues 0 allot 1266 After patch : class sfq 11:3e4 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 4380b 3p requeues 0 allot 1212 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ba119204ff6ff722dcec387b305d9c2d23380726 Merge: cf7d7e5 0c521cc Author: David Brown Date: Mon Dec 20 13:11:10 2010 -0800 Merge branches 'msm-core' and 'msm-mmc' into for-next * msm-core: (28 commits) msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables msm: iommu: Don't flush page tables if no devices attached msm: iommu: Mark functions with the right section names msm: iommu: Support for the 2nd GFX core's IOMMU msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings msm: iommu: Use more consistent naming in platform data msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU ... * msm-mmc: (33 commits) mmc: msm_sdcc: Check for only DATA_END interrupt to end a request mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned mmc: msm_sdcc: Reset SDCC in case of data transfer errors mmc: msm_sdcc: Add prog done interrupt support mmc: msm_sdcc: Fix possible circular locking dependency warning msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables msm: iommu: Don't flush page tables if no devices attached msm: iommu: Mark functions with the right section names ... commit 0c521ccbd0c9ad5623ff9b37b20b3ff9d4ad65a7 Author: Sahitya Tummala Date: Wed Dec 8 15:03:07 2010 +0530 mmc: msm_sdcc: Check for only DATA_END interrupt to end a request The current code checks for both DATA_END and DATA_BLK_END bits in MCI_STATUS register and ends a request only if both are set at a time. The hardware doesn't always set DATA_BLK_END when DATA_END is set. But DATA_END status itself is sufficient condition from hardware that data transfer is done and hence, check for only DATA_END interrupt in software to end a request. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 71dd9106af54de0f758875fa4b595af42a327448 Author: Sahitya Tummala Date: Wed Dec 8 15:03:06 2010 +0530 mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned The current code for PIO doesn't transfer whole data when data size is not in multiple of 4 bytes. The last few bytes are not written to the card resulting in no DATAEND interrupt from SDCC. This patch allows data transfer for non-aligned data size in PIO mode. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit b08bb35d1a5ee5426198eb3a2861008c2e9e6fc4 Author: Sahitya Tummala Date: Wed Dec 8 15:03:05 2010 +0530 mmc: msm_sdcc: Reset SDCC in case of data transfer errors SDCC uses an asynchronous FIFOs for data synchronization (one for TX and one for RX). For any error when DPSM (Data path state machine) is involved the transfer is terminated with the remaining data stuck inside FIFOs. Reset the controller in case of data errors to ensure that any left over data in FIFOs is flushed out and DPSM is in good state. The following problems are observed without this reset functionality - 1. After the card is removed in an unsafe way (removed when there is an on going data transfer), the card will not be detected upon its next insertion. This is because the controller wouldn't respond to few initialization commands. 2. When an error occurs for a data transfer in non-DMA mode, sometimes we get spurious PIO interrupt after the request is processed. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit d5137bdd91b8267ada3973806443013f4bf079f6 Author: Sahitya Tummala Date: Wed Dec 8 15:03:04 2010 +0530 mmc: msm_sdcc: Add prog done interrupt support Enable prog done interrupt for stop command(CMD12) that is sent after a multi-block write(CMD25). The PROG_DONE bit is set when the card has finished its programming and is ready for next data. After every write request the card will be polled for ready status using CMD13. For a multi-block write(CMD25) before sending CMD13, stop command (CMD12) will be sent. If we enable prog done interrupt for CMD12, then CMD13 polling can be avoided. The prog done interrupt means that the card is done with its programming and is ready for next request. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 62612cf9d97068dc75b48a7a3044ee907a3283ec Author: Sahitya Tummala Date: Wed Dec 8 15:03:03 2010 +0530 mmc: msm_sdcc: Fix possible circular locking dependency warning In the context of request processing thread, data mover lock is acquired after the host lock. In another context, in the completion handler of data mover the locks are acquired in the reverse order, resulting in possible circular lock dependency warning. Hence, schedule a tasklet to process the dma completion so as to avoid nested locks. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 3d986b25b5faa50ba6afd94f60f270b6c3061e5e Author: John W. Linville Date: Thu Dec 16 14:59:49 2010 -0500 rtlwifi: use alloc_workqueue create_workqueue is deprecated. The workqueue usage does not seem to demand any special treatment, so do not set any flags either. Signed-off-by: John W. Linville Tested-by: Larry Finger Acked-by: Tejun Heo commit d4d5dc3d6f86cc70f08e45b840f3e681588d2718 Author: Felix Fietkau Date: Sun Dec 19 00:31:55 2010 +0100 ath9k: do not limit the chainmask to 1 for legacy mode Restricting the chainmask to 1 for legacy mode disables useful features such as MRC, and it reduces the available transmit power. I can't think of a good reason to do this in legacy mode, so let's just get rid of that code. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f1a8abb0459e96765bd1d300f434256d8dfac73d Author: Felix Fietkau Date: Sun Dec 19 00:31:54 2010 +0100 ath9k_hw: fix PA predistortion HT40 mask The commit 'ath9k_hw: Disable PAPRD for rates with low Tx power' changed the code that sets the PAPRD rate masks to use only either the HT20 mask or the HT40 mask. This is wrong, as the hardware can still use HT20 rates even when configured for HT40, and the operating channel mode does not affect PAPRD operation. The register for the HT40 rate mask is applied as a mask on top of the other registers to selectively disable PAPRD for specific rates on HT40 packets only. This patch changes the code back to the old behavior which matches the intended use of these registers. While with current cards this should not make any practical difference (according to Atheros, the HT20 and HT40 mask should always be equal), it is more correct that way, and maybe the HT40 mask will be used for some rare corner cases in the future. Cc: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f8a0a781488ec7288d1049e5d2022850aa98f7b6 Author: Felix Fietkau Date: Sat Dec 18 19:30:50 2010 +0100 mac80211: fix potentially redundant skb data copying When an skb is shared, it needs to be duplicated, along with its data buffer. If the skb does not have enough headroom, using skb_copy might cause the data buffer to be copied twice (once by skb_copy and once by pskb_expand_head). Fix this by using skb_clone initially and letting ieee80211_skb_resize sort out the rest. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4cd06a344db752f513437138953af191cbe9a691 Author: Felix Fietkau Date: Sat Dec 18 19:30:49 2010 +0100 mac80211: skip unnecessary pskb_expand_head calls If the skb is not cloned and we don't need any extra headroom, there is no point in reallocating the skb head. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 489ee9195a7de9e6bc833d639ff6b553ffdad90e Author: Felix Fietkau Date: Sat Dec 18 19:30:48 2010 +0100 mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit The change 'mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs' added a check for copying the skb if it's shared, however the tx info variable still points at the cb of the old skb Signed-off-by: Felix Fietkau Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit ae29fbb189c7a80677500c718c9ce08095ccde01 Author: Dan Carpenter Date: Sat Dec 18 11:52:10 2010 +0300 wl1251: wl12xx_get_platform_data() returns an ERR_PTR wl12xx_get_platform_data() returns an ERR_PTR on failure and it never returns a NULL. Signed-off-by: Dan Carpenter Acked-by: Kalle Valo Signed-off-by: John W. Linville commit d704300fa546a613ec3821b908528b20685cb92a Author: Larry Finger Date: Fri Dec 17 19:36:25 2010 -0600 rtlwifi: Fix use of mutex in interrupt code A previous conversion from semaphoreto mutexes missed the fact that one of the semaphores was used in interrupt code. Fixed by changing to a spinlock. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f0b3e4b7307f02a203029441b0473a84aebc6435 Author: Larry Finger Date: Fri Dec 17 16:04:11 2010 -0600 MAINTAINERS: Fix typo in rtl8192ce entry Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit b1c1d0003d6d07c3b269340b8ac3fd2b42fd5ebe Author: Mohammed Shafi Shajakhan Date: Fri Dec 17 20:44:36 2010 +0530 ath9k: Properly initialize channel table for 2GHz ath9k channel table for 2Ghz does not seems to initialize the 'band' parameter.Though it does not seems to cause any visible issue it looks odd when we initialize the 'band' parameter for 5Ghz channel table while not so for 2Ghz. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 18db45c46eae31cee7cfdfd7e671b0201dcdbcd8 Author: Anisse Astier Date: Fri Dec 17 11:45:01 2010 +0100 rtl8192ce: Fix typo in Kconfig description Signed-off-by: Anisse Astier Signed-off-by: John W. Linville commit 55821324dc6a10fab36871534a322bad159fad79 Author: Felix Fietkau Date: Fri Dec 17 00:57:01 2010 +0100 ath9k_hw: remove baseband rfsilent support When rfkill is enabled, ath9k_hw unnecessarily configured the baseband to turn off based on GPIO input, however that code was hardcoded to GPIO 0 instead of ah->rfkill_gpio. Since ath9k uses software rfkill anyway, this code is completely unnecessary and should be removed in case anything else ever uses GPIO 0. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4b3ba66a47311770b21e7aba481f4f2a90ba3084 Author: Felix Fietkau Date: Fri Dec 17 00:57:00 2010 +0100 ath9k: fix queue depth check for forming new aggregates To improve aggregation length, there should not be more than two fully formed A-MPDU frames in the hardware queue. To ensure this, the code checks the tx queue length before forming new A-MPDUs. This can reduce the throughput (or maybe even starve out A-MPDU traffic) when too many non-aggregated frames are in the queue. Fix this by keeping track of pending A-MPDU frames (even when they're sent out as single frames), but exclude rate control probing frames to improve performance. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5c405b5c3e435fd332058c59ee58eaa1ac9c513a Author: John W. Linville Date: Thu Dec 16 15:43:36 2010 -0500 rtl8192ce: drop 'rtl8192c-' prefix from files Signed-off-by: John W. Linville Tested-by: Larry Finger commit 61ad5394590c5c5338ab4ec50553d809a9996d50 Author: Javier Cardona Date: Thu Dec 16 17:23:34 2010 -0800 mac80211: Remove unused third address from mesh address extension header. The Mesh Control header only includes 0, 1 or 2 addresses. If there is one address, it should be interpreted as Address 4. If there are 2, they are interpreted as Addresses 5 and 6 (Address 4 being the 4th address in the 802.11 header). The address extension used to hold up to 3 addresses instead of the current 2. I'm not sure which draft version changed this, but it is very unlikely that it will change again given the state of the approval process of this draft. See section 7.1.3.6.3 in current draft (8.0). Also, note that the extra address that I'm removing was not being used, so this change has no effect on over-the-air frame formats. But I thought I better remove it before someone does start using it. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 3de135dba9341a3d10a7a5b9533ce11cb77d4f4d Author: Bruno Randolf Date: Thu Dec 16 11:30:33 2010 +0900 ath5k: Set available antenna information for cfg80211 Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 39fd5de4472b7b222c6cec78d72b069133f694e4 Author: Bruno Randolf Date: Thu Dec 16 11:30:28 2010 +0900 nl80211: Export available antennas Export the information which antennas are available for configuration as TX or RX antennas via nl80211. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 7f531e03abf0162df3966c4fa5fa6fdd9302cb6b Author: Bruno Randolf Date: Thu Dec 16 11:30:22 2010 +0900 cfg80211: Separate available antennas for RX and TX As has been pointed out by Daniel Halperin some devices (e.g. Intel IWL5100) can only TX from a subset of RX antennas, so use separate availability masks for RX and TX. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c7108a7111cd9e592d6ad498be37276dbea75d2b Author: Javier Cardona Date: Thu Dec 16 17:37:50 2010 -0800 mac80211: Send mesh non-HWMP path selection frames to userspace Let path selection frames for protocols other than HWMP be sent to userspace via NL80211_CMD_REGISTER_FRAME. Also allow userspace to send and receive mesh path selection frames. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit c80d545da3f7c0e534ccd4a780f322f80a92cff1 Author: Javier Cardona Date: Thu Dec 16 17:37:49 2010 -0800 mac80211: Let userspace enable and configure vendor specific path selection. Userspace will now be allowed to toggle between the default path selection algorithm (HWMP, implemented in the kernel), and a vendor specific alternative. Also in the same patch, allow userspace to add information elements to mesh beacons. This is accordance with the Extensible Path Selection Framework specified in version 7.0 of the 802.11s draft. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 24bdd9f4c9af75b33b438d60381a67626de0128d Author: Javier Cardona Date: Thu Dec 16 17:37:48 2010 -0800 mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup Mesh parameters can be to setup a mesh or to configure it. This patch renames the ambiguous name mesh_params to mesh_config in preparation for mesh_setup. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit f955e1415f381c7fa6ebe8630cd1fe5a694e8f4a Author: Dan Carpenter Date: Mon Dec 20 03:03:15 2010 +0000 vmxnet3: locking problems in xmit There were several paths that didn't release their locks. Signed-off-by: Dan Carpenter Signed-off-by: Bhavesh Davda Signed-off-by: David S. Miller commit 6561a3b12d62ed5317e6ac32182d87a03f62c8dc Author: David S. Miller Date: Sun Dec 19 21:11:20 2010 -0800 ipv4: Flush per-ns routing cache more sanely. Flush the routing cache only of entries that match the network namespace in which the purge event occurred. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit 782615aea84e57dc7f2f922cea823df3de635a78 Author: Breno Leitao Date: Mon Dec 20 10:35:25 2010 -0800 ehea: Fixing some message level Currently there are some info message that is set as error, and an error message that is set as debug. This patch just fixes it. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit c8efcc2589464ac70255bb83e10cad61c7c6d295 Author: Tejun Heo Date: Mon Dec 20 19:32:04 2010 +0100 workqueue: allow chained queueing during destruction Currently, destroy_workqueue() makes the workqueue deny all new queueing by setting WQ_DYING and flushes the workqueue once before proceeding with destruction; however, there are cases where work items queue more related work items. Currently, such users need to explicitly flush the workqueue multiple times depending on the possible depth of such chained queueing. This patch updates the queueing path such that a work item can queue further work items on the same workqueue even when WQ_DYING is set. The flush on destruction is automatically retried until the workqueue is empty. This guarantees that the workqueue is empty on destruction while allowing chained queueing. The flush retry logic whines if it takes too many retries to drain the workqueue. Signed-off-by: Tejun Heo Cc: James Bottomley commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5 Author: Sven Eckelmann Date: Mon Dec 20 10:32:03 2010 -0800 batman-adv: Return hna count on local buffer fill hna_local_fill_buffer must return the number of added hna entries and not the last checked hash bucket. Signed-off-by: Sven Eckelmann Signed-off-by: David S. Miller commit 58231186c4532821cb815a3a3248ca02ce5f6f0d Author: Joe Perches Date: Mon Dec 20 10:30:06 2010 -0800 pktgen: Remove unnecessary prefix from pr_ Remove "pktgen: " prefix string from one pr_info. pr_fmt adds it, so this is a duplicate. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit faabfa0816916b0a7cfc93f6a9be382830658c80 Author: Russell King Date: Mon Dec 20 16:58:19 2010 +0000 ARM: SMP: ensure frame pointer is reinitialized for soft-CPU hotplug When we soft-CPU hotplug a CPU, we reset the stack pointer and jump back to start_secondary(). This allows us to restart as if the CPU was actually reset. However, we weren't resetting the frame pointer, which could cause problems with backtracing. Reset the frame pointer to zero (which means no parent frame) just like the early assembly code also does. Signed-off-by: Russell King commit 1d3f33d541312acd34bd2fa780396d111a0f73b1 Author: Shawn Guo Date: Mon Dec 13 20:55:03 2010 +0800 ARM: mxs: Add build configuration for mxs Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 4afbbb7c1b20dc10513c522849735a3293243af8 Author: Shawn Guo Date: Sat Dec 18 21:39:35 2010 +0800 ARM: mxs: Add initial mx28evk support Add initial mx28evk support with duart and fec0. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 55cf4183d371e00cf4a2fc4fb9a25ae3d806ff87 Author: Shawn Guo Date: Mon Dec 20 22:57:44 2010 +0800 ARM: mxs: Add initial mx23evk support Add initial mx23evk support with duart. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit b9a2ada8ff2ace20b1518a18872319d8619fe1ab Author: Shawn Guo Date: Thu Dec 9 23:12:47 2010 +0800 ARM: mxs: Dynamically allocate fec devices Dynamically allocate fec devices for MX28, which gets dual fec interface. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit dc38ad4052a50b9e73fdcc970ecdd4f69ee9d97a Author: Shawn Guo Date: Thu Dec 9 23:12:46 2010 +0800 ARM: mxs: Dynamically allocate duart devices Dynamically allocate duart devices for MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit faff3dc947738ce7c905a4a2936a089d3fa9ddda Author: Shawn Guo Date: Thu Dec 9 23:12:45 2010 +0800 ARM: mxs: Add static memory mapping Create static memory mapping for MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 30a7585ff7464ceb1dceb941700654923becb769 Author: Shawn Guo Date: Sat Dec 18 21:39:33 2010 +0800 ARM: mxs: Add clock support Add clock for MXS-based SoCs, MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit bf985969e27b507f734435a99df8bf745a3dbb2b Author: Shawn Guo Date: Mon Dec 20 22:57:43 2010 +0800 ARM: mxs: Add iomux support MXS-based SoCs implements iomux functions in block PINCTRL. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit fba311fcf0987396f2760553fbe01ab61ec67139 Author: Shawn Guo Date: Sat Dec 18 21:39:31 2010 +0800 ARM: mxs: Add gpio support MXS-based SoCs implement gpio support in block PINCTRL. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 4e472096fa4ef751e7ea90e304d971843a1e350d Author: Shawn Guo Date: Sat Dec 18 21:39:30 2010 +0800 ARM: mxs: Add timer support There are 2 versions of the timrot on Freescale MXS-based SoCs. The v1 on MX23 only gets 16 bits counter, while v2 on MX28 extends the counter to 32 bits. The implementation uses two timers, one for clock_event and another for clocksource. MX28 uses timrot 0 and 1, while MX23 uses 0 and 2. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 41fa75bc09d31c47d6606233b60f595524c28cd4 Author: Shawn Guo Date: Mon Dec 20 22:57:42 2010 +0800 ARM: mxs: Add low-level debug UART support - DEBUG_LL support, which is incompatible with multi-soc MXS image because of different DUART base address on MX23 and MX28 - uncompress message support Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 623eb15647fc35c5a8cd38985d5958240eb072c1 Author: Alexey Charkov Date: Mon Dec 20 16:09:57 2010 +0300 fbdev: Modify vsync timing calculation in wm8505fb This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code. Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit a7f53284e97af9670a68993c31f61a4e62a19ea5 Author: Alexey Charkov Date: Mon Dec 20 16:03:14 2010 +0300 fbdev: Minor cleanup in WM8505-related code This replaces the last remaining driver name reference with the macro for uniformity in wm8505fb. In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places. Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit 521bc83b0fcda6f323f1de0e7bf137401a8145a2 Author: Andres Salomon Date: Fri Dec 17 19:00:13 2010 -0800 s1d13xxxfb: drop unused code Silence warnings such as - drivers/video/s1d13xxxfb.c:421: warning: ‘bltbit_wait_bitset’ defined but not used Just drop the unused code. Signed-off-by: Andres Salomon Signed-off-by: Paul Mundt commit 4959212c18669f254daa0ae796ad676b67939ba2 Author: Jingoo Han Date: Fri Dec 17 16:45:46 2010 +0900 s3c-fb: add support for runtime pm This patch adds support for runtime pm using the functions. - pm_runtime_get_sync() - pm_runtime_put_sync() pm_runtime_get_sync() and pm_runtime_put_sync() are called when open or release function of framebufer driver is called to inform the system if hardware is idle or not. Signed-off-by: Jingoo Han Signed-off-by: Paul Mundt commit 55f88eccf9c288eed2f93f9ca7d7fe4dd2da762e Author: Asbjoern Sloth Toennesen Date: Sun Dec 12 17:39:40 2010 +0000 kbuild, deb-pkg: support overriding userland architecture Usefull if building for sparc64 userland, because the sparc and sparc64 userlands use the same 64-bit kernel, making it impossible to always select the correct userland architecture for the resulting debian package. Might also be usefull, if you want a i386 userland with a amd64 kernel. Example usage: make KBUILD_DEBARCH=i386 deb-pkg LKML-reference: Signed-off-by: Asbjoern Sloth Toennesen Reviewed-by: WANG Cong Acked-by: maximilian attems Signed-off-by: Michal Marek commit 8bcee1832d23869c2cdb6886ae5210b0143256f0 Merge: 5ce2a2d 1cf215a Author: Paul Mundt Date: Tue Dec 21 00:40:51 2010 +0900 Merge branch 'rmobile/urgent' into rmobile-latest Conflicts: arch/arm/mach-shmobile/include/mach/entry-macro.S Signed-off-by: Paul Mundt commit 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb Author: Magnus Damm Date: Mon Dec 20 11:00:19 2010 +0000 ARM: mach-shmobile: Bump up NR_IRQS to 1024 Increase NR_IRQS from 512 to 1024 on SH-Mobile ARM. Needed to support vectors in the sh73a0 INTCS block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6155f77d09b968f591876f368d4843168910449e Author: Magnus Damm Date: Mon Dec 20 11:04:50 2010 +0000 ARM: mach-shmobile: Clean up headsmp.S Use PAGE_OFFSET and PHYS_OFFSET for secondary_startup entry point as recommended by Russell King. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 56e78dafc4137f86abf6f5f07282afa39ead4056 Author: Yusuke Goda Date: Mon Dec 20 01:06:04 2010 +0000 ARM: mach-shmobile: mackerel: Add GPS support Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 59bdd133561a432c4655146e283caf85fa64c2fb Author: Marek Vasut Date: Tue Oct 19 17:06:49 2010 +0200 ARM: pxa: Add Balloon3 NAND ready check Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 1b9169d8a0fe2b41fbbb8d152c8108190865f3cf Author: Marek Vasut Date: Tue Oct 19 16:19:32 2010 +0200 ARM: pxa: Update Balloon3 for new FPGA firmware The new FPGA firmware in Balloon3 uses different methods to control it's bus control lines. In the new version, there are separate registers to set/clear bus control lines. This patch updates affected places. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit e60f137b715b0a19b84502c23a09c5af9107399d Author: Marek Vasut Date: Tue Oct 19 16:17:24 2010 +0200 ARM: pxa: Fix number of IRQs on Balloon3 Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 03b505eae6a276b8c38b6222694afb6cea10b1cc Author: Russell King Date: Mon Dec 20 14:44:32 2010 +0000 ARM: SMP: split out software TLB maintainence broadcasting smp.c is becoming too large, so split out the TLB maintainence broadcasting into a separate smp_tlb.c file. Signed-off-by: Russell King commit 10034aabca9032246762daaca3152f3e79380ea0 Author: Russell King Date: Mon Dec 20 14:28:02 2010 +0000 ARM: localtimer: clean up local timer on hot unplug When a CPU is hot unplugged, the generic tick code cleans up the clock event device, but fails to call down to the device's set_mode function to actually shut the device down. To work around this, we've historically had a local_timer_stop() callback out of the hotplug code. However, this adds needless complexity when we have the clock event device itself available. Explicitly call the clock event device's set_mode function with CLOCK_EVT_MODE_UNUSED, so that the hardware can be cleanly shutdown without any special external callbacks. When/if the generic code is fixed, percpu_timer_stop() can be killed off. Signed-off-by: Russell King commit e3d9c625f5e4158014e041f492b46e38ad10987e Author: Russell King Date: Sun Dec 19 11:36:33 2010 +0000 ARM: CPU hotplug: fix hard-coded control register constants Use the definition we've provided in asm/system.h rather than numeric constants. Signed-off-by: Russell King commit e9882777d992b76e0b80deadd66ad886c25f5d1f Author: Russell King Date: Sun Dec 19 11:33:12 2010 +0000 ARM: CPU hotplug: add Versatile Express hotplug CPU support Signed-off-by: Russell King commit d4450261e546953c4a1ce8b48e29164a57c6ed33 Author: Russell King Date: Sun Dec 19 11:30:43 2010 +0000 ARM: CPU hotplug: fix reporting of spurious wakeups The original scheme for reporting spurious wakeups was broken - it tried to use printk() from a context which wasn't coherent with the other CPUs, which risks corrupting the printk() data. Fix this by noting the number spurious wakeups, and only report them when we are properly woken - when we will be coherent with the rest of the system. Signed-off-by: Russell King commit 58613cd1d4f8c2d5f25b6c57ad7fbed80e75a67b Author: Russell King Date: Sat Dec 18 12:34:39 2010 +0000 ARM: smp: improve CPU bringup failure diagnostics We used to print a bland error message which gave no clue as to the failure when we failed to bring up a secondary CPU. Resolve this by separating the two failure cases. If boot_secondary() fails, we print a message indicating the returned error code from boot_secondary(): "CPU%u: failed to boot: %d\n", cpu, ret. However, if boot_secondary() succeeded, but the CPU did not appear to mark itself online within the timeout, indicate that it failed to come online: "CPU%u: failed to come online\n", cpu Signed-off-by: Russell King commit 90b44199e83ec780d6def11a602d825dc68438e3 Author: Russell King Date: Sat Dec 18 10:59:49 2010 +0000 ARM: VFP: re-initialize VFP coprocessor access enables on CPU hotplug We can not guarantee that VFP will be enabled when CPU hotplug brings a CPU back online from a reset state. Add a hotplug CPU notifier to ensure that the VFP coprocessor access is enabled whenever a CPU comes back online. Signed-off-by: Russell King commit 3705ff6da538aff6dba535e2e9cbcbb9456d0d53 Author: Russell King Date: Sat Dec 18 10:53:12 2010 +0000 ARM: Fix subtle race in CPU pen_release hotplug code There is a subtle race in the CPU hotplug code, where a CPU which has been offlined can online itself before being requested, which results in things going astray on the next online/offline cycle. What happens in the normal online/offline/online cycle is: CPU0 CPU3 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 ... requests CPU3 offline ... ... dies ... checks pen_release, reads -1 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 However, as the write of -1 of pen_release is not fully flushed back to memory, and the checking of pen_release is done with caches disabled, this allows CPU3 the opportunity to read the old value of pen_release: CPU0 CPU3 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 ... requests CPU3 offline ... ... dies ... checks pen_release, reads 3 starts boot pen_release = -1 requests boot of CPU3 pen_release = 3 flush cache line Fix this by grouping the write of pen_release along with its cache line flushing code to ensure that any update to pen_release is always pushed out to physical memory. Signed-off-by: Russell King commit ed3768a8d9dc2d345d4f27eb44ee1e4825056c08 Author: Dave Martin Date: Wed Dec 1 15:39:23 2010 +0100 ARM: 6516/1: Allow SMP_ON_UP to work with Thumb-2 kernels. * __fixup_smp_on_up has been modified with support for the THUMB2_KERNEL case. For THUMB2_KERNEL only, fixups are split into halfwords in case of misalignment, since we can't rely on unaligned accesses working before turning the MMU on. No attempt is made to optimise the aligned case, since the number of fixups is typically small, and it seems best to keep the code as simple as possible. * Add a rotate in the fixup_smp code in order to support CPU_BIG_ENDIAN, as suggested by Nicolas Pitre. * Add an assembly-time sanity-check to ALT_UP() to ensure that the content really is the right size (4 bytes). (No check is done for ALT_SMP(). Possibly, this could be fixed by splitting the two uses ot ALT_SMP() (ALT_SMP...SMP_UP versus ALT_SMP...SMP_UP_B) into two macros. In the first case, ALT_SMP needs to expand to >= 4 bytes, not == 4.) * smp_mpidr.h (which implements ALT_SMP()/ALT_UP() manually due to macro limitations) has not been modified: the affected instruction (mov) has no 16-bit encoding, so the correct instruction size is satisfied in this case. * A "mode" parameter has been added to smp_dmb: smp_dmb arm @ assumes 4-byte instructions (for ARM code, e.g. kuser) smp_dmb @ uses W() to ensure 4-byte instructions for ALT_SMP() This avoids assembly failures due to use of W() inside smp_dmb, when assembling pure-ARM code in the vectors page. There might be a better way to achieve this. * Kconfig: make SMP_ON_UP depend on (!THUMB2_KERNEL || !BIG_ENDIAN) i.e., THUMB2_KERNEL is now supported, but only if !BIG_ENDIAN (The fixup code for Thumb-2 currently assumes little-endian order.) Tested using a single generic realview kernel on: ARM RealView PB-A8 (CONFIG_THUMB2_KERNEL={n,y}) ARM RealView PBX-A9 (SMP) Signed-off-by: Dave Martin Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 86e62b93368cffca9111996e3ed9e5b7bf6f0af3 Author: Russell King Date: Tue Nov 30 18:24:57 2010 +0000 ARM: SMP: remove smp_mpidr.h With "ARM: CPU hotplug: remove bug checks in platform_cpu_die()", we now do not use hard_smp_processor_id(), we no longer need to read the hardware processor ID. Remove the include providing this function. Signed-off-by: Russell King commit f36d340122ae8744e64af0a92a6f77b97542c0a4 Author: Russell King Date: Tue Nov 30 12:21:30 2010 +0000 ARM: CPU hotplug: ensure correct ordering of unplug Don't call idle_task_exit() with interrupts disabled, and ensure that we have a memory barrier after interrupts are disabled but before signalling that this CPU has shut down. Signed-off-by: Russell King commit bbc81fd4327f9ed4480b05981e38acd48b1d184a Author: Russell King Date: Tue Nov 30 11:12:30 2010 +0000 ARM: CPU hotplug: remove bug checks in platform_cpu_die() platform_cpu_die() is entered from the CPU's own idle thread, which can not be migrated to other CPUs. Moreover, the 'cpu' argument comes from the thread info, which will always be the 'current' CPU. So remove this useless bug check. Signed-off-by: Russell King commit 3c030beabf937b1d3b4ecaedfd1fb2f1e2aa0c70 Author: Russell King Date: Tue Nov 30 11:07:35 2010 +0000 ARM: CPU hotplug: move cpu_killed completion to core code We always need to wait for the dying CPU to reach a safe state before taking it down, irrespective of the requirements of the platform. Move the completion code into the ARM SMP hotplug code rather than having each platform re-implement this. Signed-off-by: Russell King commit 2c0136dba4e43b0916ccc9ecc7f11e6d6b73f046 Author: Russell King Date: Fri Dec 3 15:00:49 2010 +0000 ARM: SMP: consolidate trace_hardirqs_off() into common SMP code All platforms call trace_hardirqs_off() in their secondary startup code, so move this into the core SMP code - it doesn't need to be in the per-platform code. Signed-off-by: Russell King commit 05c74a6cbcfb416286a947668ba32f63d99fe74a Author: Russell King Date: Fri Dec 3 11:09:48 2010 +0000 ARM: SMP: consolidate the common parts of smp_prepare_cpus() There is a certain amount of smp_prepare_cpus() which doesn't belong in the platform support code - that is, code which is invariant to the SMP implementation. Move this code into arch/arm/kernel/smp.c, and add a platform_ prefix to the original function. Signed-off-by: Russell King commit aec66ba1f75c2030cf66f5a21d1c81aa83aa5d95 Author: Russell King Date: Thu Dec 2 19:10:01 2010 +0000 ARM: SMP: get rid of references to poke_milo and Milo Milo is an old boot loader, which is no longer relevant for these platforms. References to it are misleading. Move the code out of poke_milo(), and remove references to milo in comments. Signed-off-by: Russell King commit fd778f0ad7dda1108281410ddca0d07936256d3c Author: Russell King Date: Thu Dec 2 18:09:37 2010 +0000 ARM: SMP: get rid of get_core_count() We don't need this small function as well as scu_get_core_count() Signed-off-by: Russell King commit 8975b6c0fdd57e061f4d1040163778ceaf340ad8 Author: Russell King Date: Fri Dec 3 19:29:53 2010 +0000 ARM: SMP: Clean up ncores sanity checks scu_get_core_count() never returns zero cores, so we don't need to check and correct if ncores is zero. Tegra was missing the check against NR_CPUS, leading to a potential bitfield overflow if this becomes the case. Signed-off-by: Russell King commit bbc3d14e9aca023bb98e580aa1c9350af8effdb1 Author: Russell King Date: Fri Dec 3 10:42:58 2010 +0000 ARM: SMP: move CPU number sanity checks to smp_init_cpus() Ensure that the number of CPUs is sanity checked before setting the number of possible CPUs. This avoids any chance of overflowing the cpu_possible bitmap. Signed-off-by: Russell King commit 28e18293cf0f8d23a0950d7b1d2212d11af494dc Author: Russell King Date: Thu Dec 2 09:53:54 2010 +0000 ARM: SMP: ensure smp_send_stop() waits for CPUs to stop Wait for CPUs to indicate that they've stopped, after sending the stop IPI, rather than blindly continuing on and hoping that they've stopped in time. Print a warning if we fail to stop the other CPUs. Signed-off-by: Russell King commit 0eb0511d176534674600a1986c3c766756288908 Author: Russell King Date: Mon Nov 22 12:06:28 2010 +0000 ARM: SMP: use more sane register allocation for __fixup_smp_on_up Use r0,r3-r6 rather than r0,r3,r4,r6,r7, which makes it easier to understand which registers can be modified. Also document which registers hold values which must be preserved. Signed-off-by: Russell King commit b54992fe1b4bad7b7488d58b8696e4e8974fdab0 Author: Russell King Date: Mon Nov 15 14:46:46 2010 +0000 ARM: SMP: collect IPI and local timer IRQs for /proc/stat The IPI and local timer interrupts weren't being properly accounted for in /proc/stat. Collect them from the irq_stat structure, and return their sum. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 4a88abd7b48e8ec8084b1252d0f5ebdab43c2508 Author: Russell King Date: Mon Nov 15 14:40:29 2010 +0000 ARM: SMP: provide individual IPI interrupt statistics This separates out the individual IPI interrupt counts from the total IPI count, which allows better visibility of what IPIs are being used for. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 3534cccd26afdfd3ce0915a4942afca185f2a39b Author: Bjorn Forsman Date: Wed Nov 3 00:46:04 2010 +0100 ARM: pxa/colibri: setup pins for USB host port 3 Tested on a Colibri Evaluation Board Rev.2.1 with a Colibri PXA310 module. Signed-off-by: Bjorn Forsman Signed-off-by: Marek Vasut commit e97d0fac8492dd6566f71f9c81ed453c2105f459 Author: Mark F. Brown Date: Mon Dec 13 22:56:59 2010 -0500 ARM: mmp: refactored 5V regulator support using fixed-regulator Signed-off-by: Mark F. Brown Reviewed-by: Mark Brown Signed-off-by: Eric Miao commit a8fb0b55314144a37755729d3b40b027b0020e3c Author: Eric Miao Date: Sat Dec 18 21:57:07 2010 +0800 ARM: mmp: correct the naming of GPIOxx_GPIO definitions Signed-off-by: Eric Miao commit 5fe2acce127638ccf1123e8a079ca12e8db5b7c1 Author: Marek Vasut Date: Mon Aug 9 06:13:06 2010 +0200 ARM: pxa: Add gpio-leds and vibrator support to PalmTC Signed-off-by: Marek Vasut Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4c6a832d2841a3bacc3327380dfc0660c22a71fb Author: Marek Vasut Date: Mon Aug 9 05:01:45 2010 +0200 ARM: pxa: Modularize Palm Tungsten|C Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit fd62999bad9fc3b176ef6bc9d2a71be940efd908 Author: Marek Vasut Date: Wed Aug 11 05:04:53 2010 +0200 ARM: pxa: Colibri PXA320 PCMCIA driver Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit c085052bc52d7caaca1172aabbedc06777253961 Author: Eric Miao Date: Mon Nov 29 22:56:00 2010 +0800 ARM: pxa: add clock for static memory controller Signed-off-by: Eric Miao commit a3172e5413a06af772c6ad34c0f68a2ebbdbcf86 Author: Marek Vasut Date: Thu Aug 12 01:45:05 2010 +0200 ARM: pxa: Rename Colibri evalboard Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with all Colibri modules. Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 072e1ae73c65496355279505de378b33c916e364 Author: Marek Vasut Date: Thu Aug 12 01:30:39 2010 +0200 ARM: pxa: Add M41T00 RTC support into Colibri evalboard Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 9b6956f45132f9bf696e9f6c2e457bdfa8e08721 Author: Marek Vasut Date: Thu Aug 12 01:18:38 2010 +0200 ARM: pxa: Push Colibri evalboard MFP into module files This change -- pushing the MFP configuration back into Module files -- is necessary because some evalboards can be used with multiple modules, where MFP differs from module to module. Therefore MFP isn't board-specific, but module-specific and the module should preconfigure itself for the board. (And there is also the C preprocesor limitation and conflicting #define-s) Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 960c0acaabf603e39b121ae5c0580aaca6f8aa7b Author: Marek Vasut Date: Wed Aug 11 03:32:53 2010 +0200 ARM: pxa: Toradex Colibri PXA270 CF support This driver also contains structures to eventually support PXA320. This is planned to be added in a later patch. Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit a4257af5b0c5479bb81597579841e9daaeccd7f6 Author: Marek Vasut Date: Wed Nov 3 16:26:42 2010 +0100 ARM: pxa: Add pxa320 PCMCIA check On PXA320, there's only one PCMCIA slot available. Check for cases where the user would want to register multiple. Also, rework failpath. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit ef6c84454f8567d4968c210d7d194fb711ed3739 Author: Haojian Zhuang Date: Wed Nov 24 11:54:25 2010 +0800 ARM: pxa: add iwmmx support for PJ4 iwmmxt is used in XScale, XScale3, Mohawk and PJ4 core. But the instructions of accessing CP0 and CP1 is changed in PJ4. Append more files to support iwmmxt in PJ4 core. Signed-off-by: Zhou Zhu Signed-off-by: Haojian Zhuang Acked-by: Nicolas Pitre Signed-off-by: Eric Miao commit f13cd4170ee789f63b3c9585c1ae34e028bd549d Author: Russell King Date: Mon Nov 15 14:33:51 2010 +0000 ARM: fix /proc/interrupts formatting As per x86, align the initial column according to how many IRQs we have. Also, provide an english explaination for the 'LOC:' and 'IPI:' lines. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit cab8c6f3053c1b147bba825844c8e208f8b3b9f4 Author: Russell King Date: Mon Nov 15 14:20:41 2010 +0000 ARM: SMP: move ipi_count into irq_stat structure Move the ipi_count into irq_stat, which allows the ipi_data structure to be entirely removed. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 46c48f222f568decb881a552caa1c8f9c96c521e Author: Russell King Date: Mon Nov 15 14:15:03 2010 +0000 ARM: SMP: provide accessors for irq_stat data Provide __inc_irq_stat() and __get_irq_stat() to increment and read the irq stat counters. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit ec405ea9fe5fdeb40824edba7082803b3e98f176 Author: Russell King Date: Mon Nov 15 13:38:06 2010 +0000 ARM: include local timer irq stats only when local timers configured Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit e3fbb087650df130788d8e3ac29875ee56819249 Author: Russell King Date: Mon Dec 20 14:47:19 2010 +0000 ARM: SMP: remove send_ipi_message() send_ipi_message() does nothing except call smp_cross_call(). As this is a static function, nothing external to this file calls it, so we can easily clean up this now unnecessary indirection. Signed-off-by: Russell King commit 6e5f6856427abe5418f535cb46c454ae8ea7f8e7 Author: Geert Uytterhoeven Date: Wed Aug 25 12:22:40 2010 +0200 checksyscalls: Fix stand-alone usage The usage help in the comments - refers to the wrong script name, - doesn't mention that $srctree must be set. Hence correct the script name, and derive the source tree path from the script path, so we no longer need to rely on $srctree being set by the caller. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg Signed-off-by: Michal Marek commit 22f075a8d8bb5a8d203392df809739c1817e578f Author: Henrik Rydberg Date: Mon Dec 20 15:09:27 2010 +0100 input: mt: Document interface updates This patch documents the recent input-mt interface changes. Signed-off-by: Henrik Rydberg commit 763eef8b5b64dbbfc0f6273af9a57024069785a9 Author: Vincent Guittot Date: Fri Dec 3 18:18:39 2010 +0100 ux500: add debugfs support for powerdebug Signed-off-by: Vincent Guittot Signed-off-by: Linus Walleij commit abda3a24a99998279fe890ea8a789ebe4d605d78 Author: Samuel Ortiz Date: Mon Dec 20 13:01:30 2010 +0100 mfd: Use dummy_irq_chip for tc3589x This also converts tc3589x to the new irq API. Cc: Rabin Vincent Signed-off-by: Samuel Ortiz Signed-off-by: Linus Walleij commit 289569f902dc70fc42b8c7cab627f9d615a720f1 Author: Shawn Guo Date: Sat Dec 18 21:39:28 2010 +0800 ARM: mxs: Add interrupt support Add Interrupt Collector (ICOLL) support for MXS-based. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 65d7d94405dcc1845ad2680eeb6af43ced74fdc4 Author: Shawn Guo Date: Sat Dec 18 21:39:27 2010 +0800 ARM: mxs: Add reset routines - The mxs wdog is implemented in RTC block. - There is a generic software reset routine for most modules on mxs. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit fcd3027abbbcc26248714eddae40af3fb3c8a82e Author: Henrik Rydberg Date: Sat Dec 18 20:28:26 2010 +0100 Input: fix double equality sign in uevent Looking at the uevent stream for input devices, all properties are on the form "A=B" except the bitmap values, which are on the form "A==B". This bug has been around at least since 2007, and the input uevent code has been untouched since. The recent addition of device properties suggests this is a good time for a remedy. Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 85b7720039fc000b561c20fe2aaa3b54cddae4a7 Author: Henrik Rydberg Date: Sat Dec 18 20:51:13 2010 +0100 Input: introduce device properties Today, userspace sets up an input device based on the data it emits. This is not always enough; a tablet and a touchscreen may emit exactly the same data, for instance, but the former should be set up with a pointer whereas the latter does not need to. Recently, a new type of touchpad has emerged where the buttons are under the pad, which changes logic without changing the emitted data. This patch introduces a new ioctl, EVIOCGPROP, which enables user access to a set of device properties useful during setup. The properties are given as a bitmap in the same fashion as the event types, and are also made available via sysfs, uevent and /proc/bus/input/devices. Acked-by: Ping Cheng Acked-by: Chase Douglas Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 4c306a9291a077879fc3e933326caac3bc319caa Author: Shan Wei Date: Sun Dec 19 21:59:35 2010 -0800 net: kill unused macros These macros never be used, so remove them. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit ba27d85c96c57111ae8acfa959643e5ce8e4bcbe Author: Tejun Heo Date: Wed Dec 15 04:03:29 2010 +0000 vxge: add missing flush of reset_task Commit 6e07ebd84 (drivers/net: remove unnecessary flush_scheduled_work() calls) incorrectly removed the flush call without replacing it with the appropriate work specific operation. Fix it by flushing vdev->reset_task explicitly. Pointed out by Jon Mason. Signed-off-by: Tejun Heo Cc: Jon Mason Acked-by: Jon Mason Signed-off-by: David S. Miller commit 71d9dec24dce548bf699815c976cf063ad9257e2 Author: Changli Gao Date: Wed Dec 15 19:57:25 2010 +0000 net: increase skb->users instead of skb_clone() In dev_queue_xmit_nit(), we have to clone skbs as we need to mangle skbs, however, we don't need to clone skbs for all the packet_types. Except for the first packet_type, we increase skb->users instead of skb_clone(). Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 1a75972c61f2c224eb5283c183f9f6b17fb09b6b Author: Eric Dumazet Date: Tue Dec 14 22:39:58 2010 +0000 ifb: use netif_receive_skb() instead of netif_rx() In ri_tasklet(), we run from softirq, so can directly handle packet through netif_receive_skb() instead of netif_rx(). There is no risk of recursion. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 3c5728edbeb44819dba25a3c1b56702c87c9e419 Author: Jonas Aaberg Date: Wed Dec 15 08:36:02 2010 +0100 ux500: platsmp: Fix section mismatch Signed-off-by: Jonas Aaberg Signed-off-by: Linus Walleij commit 556fb03869ad4d14e5336093a7a8565456a26c21 Author: Sundar Iyer Date: Fri Dec 3 20:35:38 2010 +0530 mach-ux500: add STMPE1601 platform data Signed-off-by: Sundar Iyer [Minor fixups to GPIO enumerators] Signed-off-by: Linus Walleij commit e43abe6f98641e40460d74a002f09c7751db48f9 Author: Sundar Iyer Date: Fri Dec 3 20:35:36 2010 +0530 mach-ux500: move keymaps to new file Move keylayouts to a dedicated file and plug these keylayouts for input platform data. This will make addition of new and custom keylayouts localized. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 593e9d70fb0f1ece1cf2a61c701dec35d8e41f8d Author: Sundar Iyer Date: Mon Dec 13 09:33:18 2010 +0530 mfd/tc3589x: add suspend/resume support Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 523bc3820f023169671e9726b8dc075669d14bec Author: Sundar Iyer Date: Mon Dec 13 09:33:17 2010 +0530 mfd/tc3589x: undo gpio module reset during chip init Skip putting the GPIO module into a reset during the chip init. This makes sure to preserve any existing GPIO configurations done by pre-kernel boot code. Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit bd77efd0cea80865d4cfcc1e4b62789c51a74b2d Author: Sundar Iyer Date: Mon Dec 13 09:33:16 2010 +0530 mfd/tc3589x: fix random interrupt misses On the TC35892, a random delayed interrupt clear (GPIO IC) write locks up the child interrupts. In such a case, the original interrupt is active and not yet acknowledged. Re-check the IRQST bit for any pending interrupts and handle those. Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 611b7590afa6e6c6b0942b1d3efef17fbb348ef5 Author: Sundar Iyer Date: Mon Dec 13 09:33:15 2010 +0530 mfd/tc3589x: add block identifier for multiple child devices Add block identifier to be able to add multiple mfd clients to the mfd core Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 20406ebff4a298e6e3abbc1717a90bb3e55dc820 Author: Sundar Iyer Date: Mon Dec 13 09:33:14 2010 +0530 mfd/tc3589x: rename tc35892 structs/registers to tc359x Most of the register layout, client IRQ numbers on the TC35892 is shared also by other variants. Make this generic as tc3589x Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit f4e8afdc7ab1b5a0962be02a9dd15d29a81f4c53 Author: Sundar Iyer Date: Mon Dec 13 09:33:13 2010 +0530 mfd/tc35892: rename tc35892 core driver to tc3589x Rename the tc35892 core/gpio drivers to tc3589x to include new variants in the same mfd core Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit c6eda6c5eeb357ff231121619fb49d2bc0605faf Author: Sundar Iyer Date: Mon Dec 13 09:33:12 2010 +0530 mfd/tc35892: rename tc35892 header to tc3589x Rename the header file to include further variants within the same mfd core driver Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit d5d228158e77998a1659c1783fb204f275fab93b Author: Sundar Iyer Date: Mon Dec 13 09:33:11 2010 +0530 mach-ux500: deprecate spi support for ab8500 Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 991a86e182203913b71607f0695955d7e23075d7 Author: Linus Walleij Date: Fri Dec 10 09:35:53 2010 +0100 ARM: 6530/1: mmci: partially revert clock divisor code I misread the datasheet as if bypass mode was not available at all on the ux500's, I was wrong. It is there, the datasheet just states that you should not have to use it. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit b70a67f938e4a7544ca4dea2856b88f3c47669ff Author: Linus Walleij Date: Mon Dec 6 09:24:14 2010 +0100 ARM: 6526/1: mmci: corrected calculation of clock div for ux500 The Ux500 variant of this block has a different divider. The value used right now is too big and which means a loss in performance. This fix corrects it. Also expand the math comments a bit so it's clear what's happening. Further the Ux500 variant does not like if we use the BYPASS bit, instead we are supposed to set the clock divider to zero. Signed-off-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 132b16325fae0742a02075894af16197e83febe8 Author: Russell King Date: Mon Dec 13 13:14:55 2010 +0000 ARM: AT91: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Russell King commit 40cc52440073903f3b7477a3391c4ca0761445d0 Author: Russell King Date: Sun Dec 19 15:43:34 2010 +0000 ARM: clockevents: fix IOP clock events initialization Ensure that no interrupt is pending before registering the clock event device, and properly initialize the periodic tick in the ->set_mode callback. Signed-off-by: Russell King commit 19e5eebb8eaa5ca3ff8aa18cb57ccb7a9f67277d Author: Paul Turner Date: Wed Dec 15 19:10:18 2010 -0800 sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight Mike Galbraith reported poor interactivity[*] when the new shares distribution code was combined with autogroups. The root cause turns out to be a mis-ordering of accounting accrued execution time and shares updates. Since update_curr() is issued hierarchically, updating the parent entity weights to reflect child enqueue/dequeue results in the parent's unaccounted execution time then being accrued (vs vruntime) at the new weight as opposed to the weight present at accumulation. While this doesn't have much effect on processes with timeslices that cross a tick, it is particularly problematic for an interactive process (e.g. Xorg) which incurs many (tiny) timeslices. In this scenario almost all updates are at dequeue which can result in significant fairness perturbation (especially if it is the only thread, resulting in potential {tg->shares, MIN_SHARES} transitions). Correct this by ensuring unaccounted time is accumulated prior to manipulating an entity's weight. [*] http://xkcd.com/619/ is perversely Nostradamian here. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Linus Torvalds LKML-Reference: <20101216031038.159704378@google.com> Signed-off-by: Ingo Molnar commit 43365bd7ff37979d2afdccbe953299ed64a4649b Author: Paul Turner Date: Wed Dec 15 19:10:17 2010 -0800 sched: Move periodic share updates to entity_tick() Long running entities that do not block (dequeue) require periodic updates to maintain accurate share values. (Note: group entities with several threads are quite likely to be non-blocking in many circumstances). By virtue of being long-running however, we will see entity ticks (otherwise the required update occurs in dequeue/put and we are done). Thus we can move the detection (and associated work) for these updates into the periodic path. This restores the 'atomicity' of update_curr() with respect to accounting. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101216031038.067028969@google.com> Signed-off-by: Ingo Molnar commit ca680888d5d0d03862ec311a83c6a1c7a1e00a01 Merge: 40dc11f b0c3844 Author: Ingo Molnar Date: Sun Dec 19 16:35:08 2010 +0100 Merge commit 'v2.6.37-rc6' into sched/core Merge reason: Update to the latest -rc. Signed-off-by: Ingo Molnar commit c16714704bb35165e5b85d927873dcc643772648 Author: Stefan Richter Date: Fri Dec 17 22:22:33 2010 +0100 firewire: net: set carrier state at ifup At ifup, carrier status would be shown on even if it actually was off. Also add an include for ethtool_ops rather than to rely on the one from netdevice.h. Note, we can alas not use fwnet_device_mutex to serialize access to dev->peer_count (as I originally wanted). This would cause a lock inversion: - fwnet_probe | takes fwnet_device_mutex + register_netdev | takes rtnl_mutex - devinet_ioctl | takes rtnl_mutex + fwnet_open | ...must not take fwnet_device_mutex Hence use the dev->lock spinlock for serialization. Signed-off-by: Stefan Richter commit 18bb36f9fab5980efeff063755c037a622f0231c Author: Maxim Levitsky Date: Wed Dec 8 04:22:57 2010 +0200 firewire: net: add carrier detection To make userland, e.g. NetworkManager work with firewire, we need to detect whether cable is plugged or not. Simple and correct way of doing that is just counting number of peers. No peers - no link and vice versa. Signed-off-by: Stefan Richter commit da169f5df2764a6a937cb3b07562e269edfb1c0e Author: Robert Richter Date: Fri Sep 24 15:54:43 2010 +0200 oprofile, x86: Add support for 6 counters (AMD family 15h) This patch adds support for up to 6 hardware counters for AMD family 15h cpus. There is a new MSR range for hardware counters beginning at MSRC001_0200 Performance Event Select (PERF_CTL0). Signed-off-by: Robert Richter commit 30570bced107243d5227527dd5317b22883dcf0c Author: Robert Richter Date: Tue Aug 31 10:44:38 2010 +0200 oprofile, x86: Add support for AMD family 15h This patch adds support for AMD family 15h (Interlagos/Valencia/ Zambezi) cpus. Signed-off-by: Robert Richter commit d03a5d888fb688c832d470b749acc5ed38e0bc1d Author: Tetsuo Handa Date: Sun Dec 19 12:54:22 2010 +0900 MAINTAINERS: Add tomoyo-dev-en ML. MAINTAINERS: Add tomoyo-dev-en ML. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit d1ed113f1669390da9898da3beddcc058d938587 Author: stephen hemminger Date: Thu Dec 16 17:42:54 2010 +0000 ipv6: remove duplicate neigh_ifdown When device is being set to down, neigh_ifdown was being called twice. Once from addrconf notifier and once from ndisc notifier. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc3ef6605ea325e41b586a76aadc3f731c317504 Author: stephen hemminger Date: Thu Dec 16 17:42:40 2010 +0000 ipv6: fib6_ifdown cleanup Remove (unnecessary) casts to make code cleaner. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b89cd71a159b5edca4c429687e4af01708eb1b26 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:06 2010 +0530 omap4: l2x0: Enable early BRESP bit The AXI protocol specifies that the write response can only be sent back to an AXI master when the last write data has been accepted. This optimization enables the PL310 to send the write response of certain write transactions as soon as the store buffer accepts the write address. This behavior is not compatible with the AXI protocol and is disabled by default. You enable this optimization by setting the Early BRESP Enable bit in the Auxiliary Control Register (bit [30]). Signed-off-by: Santosh Shilimkar Signed-off-by: Mans Rullgard Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit b0f20ff9d7e347c284ea7718597c978a2969ad7b Author: Santosh Shilimkar Date: Fri Nov 19 23:01:05 2010 +0530 omap4: l2x0: Set share override bit Clearing bit 22 in the PL310 Auxiliary Control register (shared attribute override enable) has the side effect of transforming Normal Shared Non-cacheable reads into Cacheable no-allocate reads. Coherent DMA buffers in Linux always have a Cacheable alias via the kernel linear mapping and the processor can speculatively load cache lines into the PL310 controller. With bit 22 cleared, Non-cacheable reads would unexpectedly hit such cache lines leading to buffer corruption Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 11e0264046e00544eb044fafc27125babd105e41 Author: Mans Rullgard Date: Fri Nov 19 23:01:04 2010 +0530 omap4: l2x0: enable instruction and data prefetching Enabling L2 prefetching improves performance as shown on Panda ES2.1 board with mem test, and it has measurable impact on performances. I think we should consider it, even though it damages "writes" a bit. (rebased to k.org) Usually the prefetch is used at both levels together L1 + L2, however, to enable the CP15 prefetch engines, these are under security, and on GP devices, we cannot enable it(e.g. on PandaBoard). However, just enabling PL310 prefetch seems to provide performance improvement, as shown in the data below (from Ubuntu) and would be a great thing to pull in. What prefetch does is enable automatic next line prefetching. With this enabled, whenever the PL310 receives a cachable read request, it automatically prefetches the following cache line as well. Measurement Data: == STOCK 10.10 WITHOUT PATCH ======================== ~# ./memspeed size 8388608 8192k 8M offset 8388608, 0 buffers 0x2aaad000 0x2b2ad000 copy libc 133 MB/s copy Android v5 273 MB/s copy Android NEON 235 MB/s copy INT32 116 MB/s copy ASM ARM 187 MB/s copy ASM VLDM 64 204 MB/s copy ASM VLDM 128 173 MB/s copy ASM VLD1 216 MB/s read ASM ARM 286 MB/s read ASM VLDM 242 MB/s read ASM VLD1 286 MB/s write libc 1947 MB/s write ASM ARM 1943 MB/s write ASM VSTM 1942 MB/s write ASM VST1 1935 MB/s 10.10 + PATCH ============= ~# ./memspeed size 8388608 8192k 8M offset 8388608, 0 buffers 0x2ab17000 0x2b317000 copy libc 129 MB/s copy Android v5 256 MB/s copy Android NEON 356 MB/s copy INT32 127 MB/s copy ASM ARM 321 MB/s copy ASM VLDM 64 337 MB/s copy ASM VLDM 128 321 MB/s copy ASM VLD1 350 MB/s read ASM ARM 496 MB/s read ASM VLDM 470 MB/s read ASM VLD1 488 MB/s write libc 1701 MB/s write ASM ARM 1682 MB/s write ASM VSTM 1693 MB/s write ASM VST1 1681 MB/s Signed-off-by: Mans Rullgard Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 1773e60a816b28f4084810f96e9195aaaa7fb8c3 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:03 2010 +0530 omap4: l2x0: Construct the AUXCTRL value using defines This patch removes the hardcoded value of auxctrl value and construct it using bitfields Bit 25 is reserved and is always set to 1. Same value of this bit is retained in this patch Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 0aaa6f8f1da195ae1a993d3e9c80d600480cf947 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:02 2010 +0530 ARM: l2x0: Add aux control register bitfields This patch adds the PL310 Auxiliary Control Register bitfields so that SOC's can use these bit fields to construct the AUXCTRL value to be passed/programmed instead of hardcoding it. Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Signed-off-by: Tony Lindgren commit 7c83912062c801738d7d19acaf8f7fec25ea663c Author: Christoph Lameter Date: Tue Dec 14 10:28:46 2010 -0600 vmstat: User per cpu atomics to avoid interrupt disable / enable Currently the operations to increment vm counters must disable interrupts in order to not mess up their housekeeping of counters. So use this_cpu_cmpxchg() to avoid the overhead. Since we can no longer count on preremption being disabled we still have some minor issues. The fetching of the counter thresholds is racy. A threshold from another cpu may be applied if we happen to be rescheduled on another cpu. However, the following vmstat operation will then bring the counter again under the threshold limit. The operations for __xxx_zone_state are not changed since the caller has taken care of the synchronization needs (and therefore the cycle count is even less than the optimized version for the irq disable case provided here). The optimization using this_cpu_cmpxchg will only be used if the arch supports efficient this_cpu_ops (must have CONFIG_CMPXCHG_LOCAL set!) The use of this_cpu_cmpxchg reduces the cycle count for the counter operations by %80 (inc_zone_page_state goes from 170 cycles to 32). Signed-off-by: Christoph Lameter commit 20b876918c065818b3574a426d418f68b4f8ad19 Author: Christoph Lameter Date: Tue Dec 14 10:28:45 2010 -0600 irq_work: Use per cpu atomics instead of regular atomics The irq work queue is a per cpu object and it is sufficient for synchronization if per cpu atomics are used. Doing so simplifies the code and reduces the overhead of the code. Before: christoph@linux-2.6$ size kernel/irq_work.o text data bss dec hex filename 451 8 1 460 1cc kernel/irq_work.o After: christoph@linux-2.6$ size kernel/irq_work.o text data bss dec hex filename 438 8 1 447 1bf kernel/irq_work.o Cc: Peter Zijlstra Signed-off-by: Christoph Lameter commit 05c2d088d0eb904e50460b04d77324c26cef4637 Merge: 3ea9f68 8270137 Author: Tejun Heo Date: Sat Dec 18 15:54:36 2010 +0100 Merge branch 'this_cpu_ops' into for-2.6.38 commit 8270137a0d50507a5b40f880db636527045b8466 Author: Christoph Lameter Date: Tue Dec 14 10:28:47 2010 -0600 cpuops: Use cmpxchg for xchg to avoid lock semantics Use cmpxchg instead of xchg to realize this_cpu_xchg. xchg will cause LOCK overhead since LOCK is always implied but cmpxchg will not. Baselines: xchg() = 18 cycles (no segment prefix, LOCK semantics) __this_cpu_xchg = 1 cycle (simulated using this_cpu_read/write, two prefixes. Looks like the cpu can use loop optimization to get rid of most of the overhead) Cycles before: this_cpu_xchg = 37 cycles (segment prefix and LOCK (implied by xchg)) After: this_cpu_xchg = 11 cycle (using cmpxchg without lock semantics) Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 7296e08abac0a22a2534a4f6e493c764f2c77583 Author: Christoph Lameter Date: Tue Dec 14 10:28:44 2010 -0600 x86: this_cpu_cmpxchg and this_cpu_xchg operations Provide support as far as the hardware capabilities of the x86 cpus allow. Define CONFIG_CMPXCHG_LOCAL in Kconfig.cpu to allow core code to test for fast cpuops implementations. V1->V2: - Take out the definition for this_cpu_cmpxchg_8 and move it into a separate patch. tj: - Reordered ops to better follow this_cpu_* organization. - Renamed macro temp variables similar to their existing neighbours. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 2b7124428561c7c3cfa4a58cc4c6feea53f3148e Author: Christoph Lameter Date: Sat Dec 18 15:54:04 2010 +0100 percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support Generic code to provide new per cpu atomic features this_cpu_cmpxchg this_cpu_xchg Fallback occurs to functions using interrupts disable/enable to ensure correct per cpu atomicity. Fallback to regular cmpxchg and xchg is not possible since per cpu atomic semantics include the guarantee that the current cpus per cpu data is accessed atomically. Use of regular cmpxchg and xchg requires the determination of the address of the per cpu data before regular cmpxchg or xchg which therefore cannot be atomically included in an xchg or cmpxchg without segment override. tj: - Relocated new ops to conform better to the general organization. - This patch contains a trivial comment fix. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 9326845f45650f6af9953a4b6a31e89b54fab82f Merge: 2f841ed 5af244f Author: Russell King Date: Sat Dec 18 14:28:31 2010 +0000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable commit 2f841ed13b9f10037e25ddf417d01700ecd886d0 Merge: 961ec6d 8fbf397 Author: Russell King Date: Sat Dec 18 14:27:55 2010 +0000 Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable commit a79a9ad94acdbd0106491f5a444167636562460f Author: Haojian Zhuang Date: Wed Nov 24 11:54:22 2010 +0800 ARM: pxa: sanitize IRQ registers access based on offset Signed-off-by: Eric Miao Signed-off-by: Haojian Zhuang commit 3f408fa071418183742110f7314d6b596916e31e Author: Haojian Zhuang Date: Wed Nov 24 11:54:21 2010 +0800 ARM: mmp: select CPU_PJ4 Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2 configuration. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit c9b5ef47dc9d154a79f320eeaddc4bc9684ae1ea Author: Haojian Zhuang Date: Wed Nov 24 11:54:20 2010 +0800 ARM: pxa: support saarb platform Saarb platform is a handheld platform that supports Marvell PXA955 silicon. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit a4553358d94b4a1f3e6f24aacfd076022ac14855 Author: Haojian Zhuang Date: Wed Nov 24 11:54:19 2010 +0800 ARM: pxa: support pxa95x The core of PXA955 is PJ4. Add new PJ4 support. And add new macro CONFIG_PXA95x. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit aae8224ddd72e045bb92eaf6b73b89282c771c69 Author: Eric Miao Date: Tue Nov 23 17:07:48 2010 +0800 ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4dd295a73e80b55c3fec25555bf0a5d253023740 Author: Andy Ross Date: Thu Dec 16 15:53:19 2010 -0800 hid: egalax: Add support for Wetab (726b) This patch adds support for another Wetab device (726b), and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Andy Ross Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit c7d3e9e801d72e86eb8a0f311453192a84f14412 Merge: 28257f7 1cd25df Author: Tony Lindgren Date: Fri Dec 17 19:19:50 2010 -0800 Merge branch 'for_2.6.38' of git://gitorious.org/iommu_mailbox/iommu_mailbox into devel-iommu-mailbox commit 6bc56aaecce78113500b150f1f1506029145a370 Author: Anand Gadiyar Date: Fri Dec 3 17:26:56 2010 +0000 omap: remove dead wdt code in plat-omap/devices.c Commit f2ce62312650 (OMAP: WDT: Split OMAP1 and OMAP2PLUS device registration) removed omap_init_wdt and related structures from plat-omap/devices.c. However a subsequent commit or merge seems to have reintroduced these by accident. The caller of omap_init_wdt was also removed by that commit, and this did not get restored. So we have the following build warning now: CC arch/arm/plat-omap/devices.o arch/arm/plat-omap/devices.c:252: warning: 'omap_init_wdt' defined but not used Fix this by removing this dead code. Signed-off-by: Anand Gadiyar Cc: Tony Lindgren Signed-off-by: Tony Lindgren commit fe297dde5ae8f8bf67d3a87759289a99b48ecb2c Author: John Rigby Date: Wed Dec 1 05:57:51 2010 +0000 OMAP4: enable smc instruction in new assembler versions New assemblers need -march=armv7-a+sec on command line or .arch_extension sec inline to enable use of the smc instruction. This patch uses as-instr to check the latter to conditionally enable the former in AFLAGS for files that use smc. Checked on both old and new binutils to verify that it does not break old versions. Signed-off-by: John Rigby Signed-off-by: Tony Lindgren commit 1a6b59232bbaf612265e364c9e06ba1d15bbe7e0 Author: Bryan Wu Date: Wed Dec 8 02:41:25 2010 +0000 omap: kill all section mismatch warning for omap2plus_defconfig This patch will kill following section mismatch warnings: WARNING: vmlinux.o(.text+0x24a00): Section mismatch in reference from the function zoom_twl_gpio_setup() to the (unknown reference) .init.data:(unknown) The function zoom_twl_gpio_setup() references the (unknown reference) __initdata (unknown). This is often because zoom_twl_gpio_setup lacks a __initdata annotation or the annotation of (unknown) is wrong. WARNING: vmlinux.o(.text+0x24bfc): Section mismatch in reference from the function cm_t35_twl_gpio_setup() to the (unknown reference) .init.data:(unknown) The function cm_t35_twl_gpio_setup() references the (unknown reference) __initdata (unknown). This is often because cm_t35_twl_gpio_setup lacks a __initdata annotation or the annotation of (unknown) is wrong. WARNING: vmlinux.o(.data+0x1d3e0): Section mismatch in reference from the variable h4_config to the (unknown reference) .init.data:(unknown) The variable h4_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: vmlinux.o(.data+0x1dc08): Section mismatch in reference from the variable sdp2430_config to the (unknown reference) .init.data:(unknown) The variable sdp2430_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: vmlinux.o(.data+0x1e1d8): Section mismatch in reference from the variable apollon_config to the (unknown reference) .init.data:(unknown) The variable apollon_config references the (unknown reference) __initdata (unknown) If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Bryan Wu Cc: Paul Walmsley Signed-off-by: Tony Lindgren commit 7c50152f0851e44ef7491546a29fddbbea47735b Author: Ohad Ben-Cohen Date: Wed Nov 24 10:04:50 2010 +0000 omap: boards w/ wl12xx should select REGULATOR_FIXED_VOLTAGE Power to the wl12xx wlan device is controlled by a fixed regulator. Boards that have the wl12xx should select REGULATOR_FIXED_VOLTAGE so users will not be baffled. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Tony Lindgren commit 447b8da5d78ac8f2815a7824c0eb4ad66ba3e11e Author: Jean Pihet Date: Wed Nov 17 17:52:11 2010 +0000 OMAP3: add comments for erratas i540 and i478 workarounds Add comments and IDs for the following erratas: - i540: MPU cannot exit from Standby, - i478: Unexpected Cold-Reset is generated when device is coming back from OFF mode Signed-off-by: Jean Pihet Signed-off-by: Tony Lindgren commit fea83f6a9b0a90fefca16ac3534e308f6c34144b Merge: df127ee 2d20066 Author: Tony Lindgren Date: Fri Dec 17 15:14:02 2010 -0800 Merge branch 'devel-board' into omap-for-linus commit 2d200665c37f544f648d77a05a06ab63328f0d3a Author: Aaro Koskinen Date: Fri Dec 17 15:13:47 2010 -0800 arm: omap: add minimal support for RM-680 Add minimal support for Nokia RM-680 board. Tested with omap2plus_defconfig. Signed-off-by: Aaro Koskinen [tony@atomide.com: updated to remove omap_gpio_init Signed-off-by: Tony Lindgren commit 20dbeb1081327aefaac7044d9908c97bf445858c Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: add 97.6/195.2 MHz timing data Introduce 97.6/195.2 MHz memory timing data. Based on patches by Eduardo Valentin, Igor Dmitriev and Juha Keski-Saari. Signed-off-by: Aaro Koskinen Cc: Eduardo Valentin Cc: Igor Dmitriev Signed-off-by: Tony Lindgren commit 15d24e118d51601a5cc2f021005aa7354b03b1c8 Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: delete redundant timing data 41.5 MHz SDRAM clock is not usable. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 2b1af87ace4776f0d0c3513923a79529fc1b5a00 Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: improve error handling Actually check for errors: print an error log and return NULL. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit e5f5b5422d064b7a393e39332da31af68e975f91 Author: Aaro Koskinen Date: Fri Dec 17 15:13:45 2010 -0800 arm: omap: sdram-nokia: use array to list timings Use an array to make it easier to add new values. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit fbd208e9772005c193459d1a0575c0787ad52f69 Author: Aaro Koskinen Date: Fri Dec 17 15:13:45 2010 -0800 arm: omap: sdram-nokia: prepare for new memory timings Rename the current timings to indicate they're for 166 MHz. Based on patches by Eduardo Valentin and Juha Keski-Saari. Signed-off-by: Aaro Koskinen Cc: Eduardo Valentin Signed-off-by: Tony Lindgren commit fcd8d84633902fd1717d80f36a38b8a4305ca3d4 Author: Aaro Koskinen Date: Fri Dec 17 15:13:44 2010 -0800 arm: omap: add sdram-nokia.h Add a header file for Nokia SDRAM functions. Based on patches by Juha Keski-Saari. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 6c3bc4eb5608665b7330b3d2044fca976cbd1a50 Author: Aaro Koskinen Date: Fri Dec 17 15:13:44 2010 -0800 arm: omap: rename board-rx51-sdram.c to sdram-nokia.c Rename the file and functions so that it can be reused by future Nokia boards. Based on patches by Juha Keski-Saari. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 3c2dcf2aed5ea22ecf65a9a871c4963faec421b3 Author: Paul E. McKenney Date: Wed Dec 15 21:12:15 2010 -0800 rcu: remove unused __list_for_each_rcu() macro Signed-off-by: Paul E. McKenney commit 8a9c1cee26c0ece23b38c45b92b724438878f842 Author: Mariusz Kozlowski Date: Wed Dec 15 23:11:12 2010 +0100 rculist: fix borked __list_for_each_rcu() macro This restores parentheses blance. Signed-off-by: Mariusz Kozlowski Signed-off-by: Paul E. McKenney commit b52573d2796274f7f31cfeff7185c320adcd4f12 Author: Paul E. McKenney Date: Tue Dec 14 17:36:02 2010 -0800 rcu: reduce __call_rcu()-induced contention on rcu_node structures When the current __call_rcu() function was written, the expedited APIs did not exist. The __call_rcu() implementation therefore went to great lengths to detect the end of old grace periods and to start new ones, all in the name of reducing grace-period latency. Now the expedited APIs do exist, and the usage of __call_rcu() has increased considerably. This commit therefore causes __call_rcu() to avoid worrying about grace periods unless there are a large number of RCU callbacks stacked up on the current CPU. Signed-off-by: Paul E. McKenney commit 0209f6490b030f35349a2bb71294f3fd75b0f36d Author: Paul E. McKenney Date: Tue Dec 14 16:07:52 2010 -0800 rcu: limit rcu_node leaf-level fanout Some recent benchmarks have indicated possible lock contention on the leaf-level rcu_node locks. This commit therefore limits the number of CPUs per leaf-level rcu_node structure to 16, in other words, there can be at most 16 rcu_data structures fanning into a given rcu_node structure. Prior to this, the limit was 32 on 32-bit systems and 64 on 64-bit systems. Note that the fanout of non-leaf rcu_node structures is unchanged. The organization of accesses to the rcu_node tree is such that references to non-leaf rcu_node structures are much less frequent than to the leaf structures. Signed-off-by: Paul E. McKenney commit 121dfc4b3eba9e2f3c42d35205a3510cc65b9931 Author: Paul E. McKenney Date: Fri Dec 10 15:02:47 2010 -0800 rcu: fine-tune grace-period begin/end checks Use the CPU's bit in rnp->qsmask to determine whether or not the CPU should try to report a quiescent state. Handle overflow in the check for rdp->gpnum having fallen behind. Signed-off-by: Paul E. McKenney commit 5ff8e6f0535fe730e921ca347bc38dcb9e01791a Author: Frederic Weisbecker Date: Fri Dec 10 22:11:11 2010 +0100 rcu: Keep gpnum and completed fields synchronized When a CPU that was in an extended quiescent state wakes up and catches up with grace periods that remote CPUs completed on its behalf, we update the completed field but not the gpnum that keeps a stale value of a backward grace period ID. Later, note_new_gpnum() will interpret the shift between the local CPU and the node grace period ID as some new grace period to handle and will then start to hunt quiescent state. But if every grace periods have already been completed, this interpretation becomes broken. And we'll be stuck in clusters of spurious softirqs because rcu_report_qs_rdp() will make this broken state run into infinite loop. The solution, as suggested by Lai Jiangshan, is to ensure that the gpnum and completed fields are well synchronized when we catch up with completed grace periods on their behalf by other cpus. This way we won't start noting spurious new grace periods. Suggested-by: Lai Jiangshan Signed-off-by: Frederic Weisbecker Cc: Paul E. McKenney Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Steven Rostedt commit 20377f32dcb77941d450728da18cce5b1a7faec5 Author: Frederic Weisbecker Date: Fri Dec 10 22:11:10 2010 +0100 rcu: Stop chasing QS if another CPU did it for us When a CPU is idle and others CPUs handled its extended quiescent state to complete grace periods on its behalf, it will catch up with completed grace periods numbers when it wakes up. But at this point there might be no more grace period to complete, but still the woken CPU always keeps its stale qs_pending value and will then continue to chase quiescent states even if its not needed anymore. This results in clusters of spurious softirqs until a new real grace period is started. Because if we continue to chase quiescent states but we have completed every grace periods, rcu_report_qs_rdp() is puzzled and makes that state run into infinite loops. As suggested by Lai Jiangshan, just reset qs_pending if someone completed every grace periods on our behalf. Suggested-by: Lai Jiangshan Signed-off-by: Frederic Weisbecker Cc: Paul E. McKenney Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Steven Rostedt Signed-off-by: Paul E. McKenney commit e27fc9641e8ddc8146f8e01f06e5eba2469698de Author: Tejun Heo Date: Mon Nov 22 21:36:11 2010 -0800 rcu: increase synchronize_sched_expedited() batching The fix in commit #6a0cc49 requires more than three concurrent instances of synchronize_sched_expedited() before batching is possible. This patch uses a ticket-counter-like approach that is also not unrelated to Lai Jiangshan's Ring RCU to allow sharing of expedited grace periods even when there are only two concurrent instances of synchronize_sched_expedited(). This commit builds on Tejun's original posting, which may be found at http://lkml.org/lkml/2010/11/9/204, adding memory barriers, avoiding overflow of signed integers (other than via atomic_t), and fixing the detection of batching. Signed-off-by: Tejun Heo Signed-off-by: Paul E. McKenney commit b4aa9e05a61b845541fa6f5b1d246976922601f0 Merge: 1dc0f3c 4b8fe66 Author: David S. Miller Date: Fri Dec 17 12:27:22 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c commit 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 Author: Rajesh Borundia Date: Thu Dec 16 22:59:02 2010 +0000 qlcnic: reset pci function unconditionally during probe Some boot code drivers dont have cleanup routine, so pci function remains in unknown state prior to driver load. So during driver load issue FLR unconditionally. Update driver version to 5.0.14. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b5006dcb10a4b19e86f413b46787c55bd0d1277b Author: Rajesh Borundia Date: Thu Dec 16 22:59:01 2010 +0000 qlcnic: fix ocm window register offset calculation OCM window register offset was calculated incorrectly for pci function greater than zero. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit c75822a3091a899d982d59cd2b4454fe7c3e0318 Author: Sucheta Chakraborty Date: Thu Dec 16 22:59:00 2010 +0000 qlcnic: fix LED test when interface is down. When interface is down, create temporary context to config LED. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 403047754cf690b012369b8fb563b738b88086e6 Author: Tejun Heo Date: Fri Dec 17 15:47:04 2010 +0100 percpu,x86: relocate this_cpu_add_return() and friends - include/linux/percpu.h: this_cpu_add_return() and friends were located next to __this_cpu_add_return(). However, the overall organization is to first group by preemption safeness. Relocate this_cpu_add_return() and friends to preemption-safe area. - arch/x86/include/asm/percpu.h: Relocate percpu_add_return_op() after other more basic operations. Relocate [__]this_cpu_add_return_8() so that they're first grouped by preemption safeness. Signed-off-by: Tejun Heo Cc: Christoph Lameter commit 3ea9f6833c8f865a221b59ce37d7650dcf3b3e17 Author: Christoph Lameter Date: Wed Dec 8 17:42:23 2010 +0100 connector: Use this_cpu operations The patch was originally in the use cpuops patchset but it needs an inc_return and is therefore dependent on an extension of the cpu ops. Fixed up and verified that it compiles. get_seq can benefit from this_cpu_operations. Address calculation is avoided and the increment is done using an xadd. Cc: Scott James Remnant Cc: Mike Frysinger Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b2e4ae69757cdfef4c612a04f097c1e20489a565 Author: Christoph Lameter Date: Mon Dec 6 11:40:07 2010 -0600 xen: Use this_cpu_inc_return __this_cpu_inc_return reduces code and simplifies code. Cc: Jeremy Fitzhardinge Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter commit cd85fc58cd71bf6b89612efafb9a84e655ed7d66 Author: Christoph Lameter Date: Wed Dec 8 17:42:22 2010 +0100 taskstats: Use this_cpu_ops Use this_cpu_inc_return in one place and avoid ugly __raw_get_cpu in another. V3->V4: - Fix off by one. V4-V4f: - Use &listener_array Cc: Michael Holzheu Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b29c617af3b09d150d3889836c24d39564b39180 Author: Christoph Lameter Date: Mon Dec 6 11:40:06 2010 -0600 random: Use this_cpu_inc_return __this_cpu_inc can create a single instruction to do the same as __get_cpu_var()++. Cc: Richard Kennedy Cc: Matt Mackall Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit ee1be8626355e6a1f3f8c44e2351ff2661c5998d Author: Christoph Lameter Date: Mon Dec 6 11:40:05 2010 -0600 fs: Use this_cpu_inc_return in buffer.c __this_cpu_inc can create a single instruction with the same effect as the _get_cpu_var(..)++ construct in buffer.c. Cc: Wu Fengguang Cc: Christoph Hellwig Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit cfb824349556904b319464139be5c75fce983b0d Author: Christoph Lameter Date: Mon Dec 6 11:40:03 2010 -0600 highmem: Use this_cpu_xx_return() operations Use this_cpu operations to optimize access primitives for highmem. The main effect is the avoidance of address calculations through the use of a segment prefix. V3->V4 - kmap_atomic_idx: Do not return a value. - Use __this_cpu_dec without HIGHMEM_DEBUG Cc: Peter Zijlstra Cc: Catalin Marinas Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 908ee0f122bf2a67414854af5b90c6621d186a71 Author: Christoph Lameter Date: Mon Dec 6 11:40:02 2010 -0600 vmstat: Use this_cpu_inc_return for vm statistics this_cpu_inc_return() saves us a memory access there. Code size does not change. V1->V2: - Fixed the location of the __per_cpu pointer attributes - Sparse checked V2->V3: - Move fixes to __percpu attribute usage to earlier patch Reviewed-by: Pekka Enberg Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 275c8b93288ef0c2281e414e069ea8ed4bad03f7 Merge: 909ea96 8f1d97c Author: Tejun Heo Date: Fri Dec 17 15:16:46 2010 +0100 Merge branch 'this_cpu_ops' into for-2.6.38 commit 8f1d97c79eb65de1d05799d6b81d79cd94169114 Author: Christoph Lameter Date: Mon Dec 6 11:40:00 2010 -0600 x86: Support for this_cpu_add, sub, dec, inc_return Supply an implementation for x86 in order to generate more efficient code. V2->V3: - Cleanup - Remove strange type checking from percpu_add_return_op. tj: - Dropped unused typedef from percpu_add_return_op(). - Renamed ret__ to paro_ret__ in percpu_add_return_op(). - Minor indentation adjustments. Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit a663ffff1d2e94a7c549a37d08ed9169ce83bdd6 Author: Christoph Lameter Date: Mon Dec 6 11:39:59 2010 -0600 percpu: Generic support for this_cpu_add, sub, dec, inc_return Introduce generic support for this_cpu_add_return etc. The fallback is to realize these operations with simpler __this_cpu_ops. tj: - Reformatted __cpu_size_call_return2() to make it more consistent with its neighbors. - Dropped unnecessary temp variable ret__ from __this_cpu_generic_add_return(). Reviewed-by: Tejun Heo Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 909ea96468096b07fbb41aaf69be060d92bd9271 Author: Christoph Lameter Date: Wed Dec 8 16:22:55 2010 +0100 core: Replace __get_cpu_var with __this_cpu_read if not used for an address. __get_cpu_var() can be replaced with this_cpu_read and will then use a single read instruction with implied address calculation to access the correct per cpu instance. However, the address of a per cpu variable passed to __this_cpu_read() cannot be determined (since it's an implied address conversion through segment prefixes). Therefore apply this only to uses of __get_cpu_var where the address of the variable is not used. Cc: Pekka Enberg Cc: Hugh Dickins Cc: Thomas Gleixner Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 780f36d8b3fa9572f731d4fb85067b2e45e6f993 Author: Christoph Lameter Date: Mon Dec 6 11:16:29 2010 -0600 xen: Use this_cpu_ops Use this_cpu_ops to reduce code size and simplify things in various places. V3->V4: Move instance of this_cpu_inc_return to a later patchset so that this patch can be applied without infrastructure changes. Cc: Jeremy Fitzhardinge Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit c7b92516a9c68fa5403879225a5a19974a801ef6 Author: Christoph Lameter Date: Mon Dec 6 11:16:28 2010 -0600 fs: Use this_cpu_xx operations in buffer.c Optimize various per cpu area operations through these new percpu operations. These operations avoid address calculations through the use of segment prefixes and multiple memory references through RMW instructions etc. Reduces code size: Before: christoph@linux-2.6$ size fs/buffer.o text data bss dec hex filename 19169 80 28 19277 4b4d fs/buffer.o After: christoph@linux-2.6$ size fs/buffer.o text data bss dec hex filename 19138 80 28 19246 4b2e fs/buffer.o V3->V4: - Move the use of this_cpu_inc_return into a later patch so that this one can go in without percpu infrastructure changes. Cc: Wu Fengguang Cc: Christoph Hellwig Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 5309665dcc1143d659d82568da8d00f0e08a58f9 Author: Christoph Lameter Date: Mon Dec 6 11:16:26 2010 -0600 fakekey: Simplify speakup_fake_key_pressed through this_cpu_ops The whole function can be expressed as a simple this_cpu_read() operation. The function overhead is now likely multiple times that of the single instruction that is executed in it. Sedat: fixed compile failure caused by an extra ')'. Cc: William Hubbs Cc: Sedat Dilek Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b76834bc1b6db0a0923eed85c81b1113021b0612 Author: Christoph Lameter Date: Mon Dec 6 11:16:25 2010 -0600 kprobes: Use this_cpu_ops Use this_cpu ops in various places to optimize per cpu data access. Cc: Jason Baron Cc: Namhyung Kim Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 4a6f4fe8377720e5a279fdbb769946c242e936d3 Author: Christoph Lameter Date: Mon Dec 6 11:16:24 2010 -0600 drivers: Replace __get_cpu_var with __this_cpu_read if not used for an address. __get_cpu_var() can be replaced with this_cpu_read and will then use a single read instruction with implied address calculation to access the correct per cpu instance. However, the address of a per cpu variable passed to __this_cpu_read() cannot be determed (since its an implied address conversion through segment prefixes). Therefore apply this only to uses of __get_cpu_var where the addres of the variable is not used. V3->V4: - Move one instance of this_cpu_inc_return to a later patch so that this one can go in without percpu infrastructrure changes. Sedat: fixed compile failure caused by an extra ')'. Cc: Neil Horman Cc: Martin Schwidefsky Cc: Sedat Dilek Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 12938a9220a38d555e38dc9b40021e664b99a1f1 Author: Christoph Lameter Date: Mon Dec 6 11:16:20 2010 -0600 vmstat: Optimize zone counter modifications through the use of this cpu operations this cpu operations can be used to slightly optimize the function. The changes will avoid some address calculations and replace them with the use of the percpu segment register. If one would have this_cpu_inc_return and this_cpu_dec_return then it would be possible to optimize inc_zone_page_state and dec_zone_page_state even more. V1->V2: - Fix __dec_zone_state overflow handling - Use s8 variables for temporary storage. V2->V3: - Put __percpu annotations in correct places. Reviewed-by: Pekka Enberg Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 819a72af8d6653daa48334f24ce0a935ccdd33c7 Author: Christoph Lameter Date: Mon Dec 6 11:16:19 2010 -0600 percpucounter: Optimize __percpu_counter_add a bit through the use of this_cpu() options. The this_cpu_* options can be used to optimize __percpu_counter_add a bit. Avoids some address arithmetic and saves 12 bytes. Before: 00000000000001d3 <__percpu_counter_add>: 1d3: 55 push %rbp 1d4: 48 89 e5 mov %rsp,%rbp 1d7: 41 55 push %r13 1d9: 41 54 push %r12 1db: 53 push %rbx 1dc: 48 89 fb mov %rdi,%rbx 1df: 48 83 ec 08 sub $0x8,%rsp 1e3: 4c 8b 67 30 mov 0x30(%rdi),%r12 1e7: 65 4c 03 24 25 00 00 add %gs:0x0,%r12 1ee: 00 00 1f0: 4d 63 2c 24 movslq (%r12),%r13 1f4: 48 63 c2 movslq %edx,%rax 1f7: 49 01 f5 add %rsi,%r13 1fa: 49 39 c5 cmp %rax,%r13 1fd: 7d 0a jge 209 <__percpu_counter_add+0x36> 1ff: f7 da neg %edx 201: 48 63 d2 movslq %edx,%rdx 204: 49 39 d5 cmp %rdx,%r13 207: 7f 1e jg 227 <__percpu_counter_add+0x54> 209: 48 89 df mov %rbx,%rdi 20c: e8 00 00 00 00 callq 211 <__percpu_counter_add+0x3e> 211: 4c 01 6b 18 add %r13,0x18(%rbx) 215: 48 89 df mov %rbx,%rdi 218: 41 c7 04 24 00 00 00 movl $0x0,(%r12) 21f: 00 220: e8 00 00 00 00 callq 225 <__percpu_counter_add+0x52> 225: eb 04 jmp 22b <__percpu_counter_add+0x58> 227: 45 89 2c 24 mov %r13d,(%r12) 22b: 5b pop %rbx 22c: 5b pop %rbx 22d: 41 5c pop %r12 22f: 41 5d pop %r13 231: c9 leaveq 232: c3 retq After: 00000000000001d3 <__percpu_counter_add>: 1d3: 55 push %rbp 1d4: 48 63 ca movslq %edx,%rcx 1d7: 48 89 e5 mov %rsp,%rbp 1da: 41 54 push %r12 1dc: 53 push %rbx 1dd: 48 89 fb mov %rdi,%rbx 1e0: 48 8b 47 30 mov 0x30(%rdi),%rax 1e4: 65 44 8b 20 mov %gs:(%rax),%r12d 1e8: 4d 63 e4 movslq %r12d,%r12 1eb: 49 01 f4 add %rsi,%r12 1ee: 49 39 cc cmp %rcx,%r12 1f1: 7d 0a jge 1fd <__percpu_counter_add+0x2a> 1f3: f7 da neg %edx 1f5: 48 63 d2 movslq %edx,%rdx 1f8: 49 39 d4 cmp %rdx,%r12 1fb: 7f 21 jg 21e <__percpu_counter_add+0x4b> 1fd: 48 89 df mov %rbx,%rdi 200: e8 00 00 00 00 callq 205 <__percpu_counter_add+0x32> 205: 4c 01 63 18 add %r12,0x18(%rbx) 209: 48 8b 43 30 mov 0x30(%rbx),%rax 20d: 48 89 df mov %rbx,%rdi 210: 65 c7 00 00 00 00 00 movl $0x0,%gs:(%rax) 217: e8 00 00 00 00 callq 21c <__percpu_counter_add+0x49> 21c: eb 04 jmp 222 <__percpu_counter_add+0x4f> 21e: 65 44 89 20 mov %r12d,%gs:(%rax) 222: 5b pop %rbx 223: 41 5c pop %r12 225: c9 leaveq 226: c3 retq Reviewed-by: Pekka Enberg Reviewed-by: Tejun Heo Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit e72df0b847adf064e64bcbd5141f0031524e723e Author: Tejun Heo Date: Fri Dec 10 17:02:49 2010 +0100 MAINTAINERS: Add percpu allocator entry Add me and Christoph Lameter as maintainers for the percpu memory allocator. Signed-off-by: Tejun Heo Cc: Christoph Lameter Acked-by: Christoph Lameter commit 41491b9adc6ba47b73100991e9295ae70c58db0f Author: Yusuke Goda Date: Wed Dec 15 08:31:04 2010 +0000 ARM: mach-shmobile: mackerel: Add mmcif support v2 Add comment of J22 and OCR field. Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 03aa18f550900855c1d3d17ac83c14a3d668d344 Author: Paul Mundt Date: Fri Dec 17 19:16:10 2010 +0900 dma: shdma: NMI support. Presently DMA transfers are interrupted and aborted by the NMI. This implements some basic logic for more gracefully handling and clearing each controller's NMIF flag via the NMI die chain, needed to resume transfers post-NMI. Reported-by: Michael Szafranek Signed-off-by: Paul Mundt commit 76496f8f2e104b8bb08db09c063a6817d18829a6 Author: Paul Mundt Date: Fri Dec 17 18:58:04 2010 +0900 sh: mach-sdk7786: Handle baseboard NMI source selection. The on-board NMI switch is routed through and mangled by the FPGA prior to its delivery to the NMI pin, so add some glue for the various configuration options. The default is to unmask it and enable all input sources. Signed-off-by: Paul Mundt commit b7b8de087384cc1954a8cd075af3f9e5977caa2e Author: Werner Fink Date: Fri Dec 3 12:48:23 2010 +0100 TTY: Add tty ioctl to figure device node of the system console. This has been in the SuSE kernels for a very long time. Signed-off-by: Werner Fink Signed-off-by: Greg Kroah-Hartman commit fbc92a3455577ab17615cbcb91826399061bd789 Author: Kay Sievers Date: Wed Dec 1 18:51:05 2010 +0100 tty: add 'active' sysfs attribute to tty0 and console device tty: add 'active' sysfs attribute to tty0 and console device Userspace can query the actual virtual console, and the configured console devices behind /dev/tt0 and /dev/console. The last entry in the list of devices is the active device, analog to the console= kernel command line option. The attribute supports poll(), which is raised when the virtual console is changed or /dev/console is reconfigured. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman index 0000000..b138b66 commit 7edc3453e54432a9f1c636b6481f1107c9db19bd Author: Eric Dumazet Date: Wed Dec 15 23:52:55 2010 +0000 ifb: fix a lockdep splat After recent ifb changes, we must use lockless __skb_dequeue() since lock is not anymore initialized. Signed-off-by: Eric Dumazet Cc: Jamal Hadi Salim Cc: Changli Gao Acked-by: Changli Gao Signed-off-by: David S. Miller commit 0d0b16727f24f8258eeb33818347ca0f4557f982 Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Fix drivers advertising HW_CSUM feature to use csum_start Some drivers are using skb_transport_offset(skb) instead of skb->csum_start for NETIF_F_HW_CSUM offload. This does not matter now, but if someone implements checksumming of encapsulated packets then this will break silently. TSO output paths are left as they are, since they are for IP+TCP only (might be worth converting though). Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 55508d601dab7df5cbcc7a63f4be8620eface204 Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Use skb_checksum_start_offset() Replace skb->csum_start - skb_headroom(skb) with skb_checksum_start_offset(). Note for usb/smsc95xx: skb->data - skb->head == skb_headroom(skb). Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 04fb451eff978ca059399eab83d5594b073caf6f Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Introduce skb_checksum_start_offset() Introduce skb_checksum_start_offset() to replace repetitive calculation. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit bc2ce894e113ed95b92541134b002fdc641e8080 Author: Eric Dumazet Date: Thu Dec 16 14:08:34 2010 -0800 tcp: relax tcp_paws_check() Some windows versions have wrong RFC1323 implementations, with SYN and SYNACKS messages containing zero tcp timestamps. We relaxed in commit fc1ad92dfc4e363 the passive connection case (Windows connects to a linux machine), but the reverse case (linux connects to a Windows machine) has an analogue problem when tsvals from windows machine are 'negative' (high order bit set) : PAWS triggers and we drops incoming messages. Fix this by making zero ts_recent value special, allowing frame to be processed. Based on a report and initial patch from Dmitiy Balakin Bugzilla reference : https://bugzilla.kernel.org/show_bug.cgi?id=24842 Reported-by: dmitriy.balakin@nicneiron.ru Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 1121584f5db8a99a7ad94c6c5d62431b3187ad98 Author: H.J. Lu Date: Wed Dec 15 17:11:22 2010 -0800 modpost: Put .zdebug* section on white list "as --compress-debug-sections" will generate compressed debug sections with section names ".zdebug*". This patch puts .zdebug* section on white list. Signed-off-by: H.J. Lu Signed-off-by: Michal Marek commit 443457242beb6716b43db4d62fe148eab5515505 Author: Octavian Purdila Date: Mon Dec 13 12:44:07 2010 +0000 net: factorize sync-rcu call in unregister_netdevice_many Add dev_close_many and dev_deactivate_many to factorize another sync-rcu operation on the netdevice unregister path. $ modprobe dummy numdummies=10000 $ ip link set dev dummy* up $ time rmmod dummy Without the patch With the patch real 0m 24.63s real 0m 5.15s user 0m 0.00s user 0m 0.00s sys 0m 6.05s sys 0m 5.14s Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 5155e2c70fc50bc475911dab5dba2f80130523c7 Author: Pavankumar Kondeti Date: Wed Dec 8 13:37:08 2010 +0530 MSM: Add USB support for MSM7x30 Add USB OTG, peripheral and host devices. This patch also adds usb_phy_clk which is required for resetting the PHY. VBUS power up and shutdown routines depends on PMIC module. As PMIC driver is unavailable, configure USB in peripheral only mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: David Brown commit 7032d512cff979319f308e02223d0cf39b6e9a91 Author: Pavankumar Kondeti Date: Wed Dec 8 13:37:07 2010 +0530 MSM: Add USB suport for QSD8x50 OTG driver takes care of putting hardware into low power mode. Hence make peripheral and host devices as children of OTG device and let runtime PM takes care of notifying peripheral and host state to OTG device. VBUS power up and shutdown routines are implemented by modem processor. As RPC infrastructure is not available, configure USB in peripheral only mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: David Brown commit c6c8fea29769d998d94fcec9b9f14d4b52b349d3 Author: Sven Eckelmann Date: Mon Dec 13 11:19:28 2010 +0000 net: Add batman-adv meshing protocol B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. The networks may be wired or wireless. See http://www.open-mesh.org/ for more information and user space tools. Signed-off-by: Sven Eckelmann Signed-off-by: David S. Miller commit c466cd2bb9cee2e576fc9663b828f51e322d7b4b Author: Greg Kroah-Hartman Date: Thu Dec 16 13:40:42 2010 -0800 USB: serial: ftdi_sio: add support for TIOCSERGETLSR Willem-Jan noticed that the ftdi_sio driver did not support the TIOCSERGETLSR ioctl, and some userspace programs rely on it. This patch adds the support. Reported-by: Willem-Jan de Hoog Tested-by: Willem-Jan de Hoog Signed-off-by: Greg Kroah-Hartman commit 0247a7bcd4273fa10c4aba9b3f567c659bab2d2b Author: Fabio Estevam Date: Wed Dec 15 22:31:28 2010 -0200 USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport In order to read/write to the i.MX OTG viewport register it is necessary to setup the PORTSCx register first. By default i.MX OTG port is configured for USB serial PHY. In order to use a ULPI PHY the PORTSCx register needs to be configured properly. commit 724c852 (USB: ehci/mxc: compile fix) placed the PORTSC setup after the OTG viewport is accessed and this causes ULPI read/write to fail. Revert the PORTSC setup order. Tested on a MX31PDK board with a ISP1504 transceiver: ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver mxc-ehci mxc-ehci.0: initializing i.MX USB Controller ULPI transceiver vendor/product ID 0x04cc/0x1504 Found NXP ISP1504 ULPI transceiver. ULPI integrity check: passed. Signed-off-by: Fabio Estevam Signed-off-by: Greg Kroah-Hartman commit 2c8245c4990e75d86ab30bb0af9bb90cbe04985d Author: Rob Emanuele Date: Tue Dec 14 19:00:30 2010 +0100 USB: atmel_usba_udc: fix freeing irq in usba_udc_remove() Add a free_irq() call on vbus gpio when we remove udc so that the vbus irq is properly released. Signed-off-by: Rob Emanuele Signed-off-by: Nicolas Ferre Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Greg Kroah-Hartman commit 6ef9fc657bd69c708ada2ee9fd3b2e13f7600a3d Author: Anand Gadiyar Date: Mon Dec 13 22:00:34 2010 +0530 usb: ehci-omap: fix tll channel enable mask The TLL channel enable code searches for the wrong mask, and could end up enabling the wrong port. Fix this. Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit a0c9e95dfc6898dbc178d7b962916f3823434e6e Author: Keshava Munegowda Date: Mon Dec 13 22:00:51 2010 +0530 usb: ohci-omap3: fix trivial typo This is the ohci-omap3 driver, not ehci-omap. Correct this obvious typo. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 0a313c4d2435ed0d86cf2295514f02de34cecd88 Author: Artem Leonenko Date: Tue Dec 14 23:47:06 2010 -0800 USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096 Page size for transaction descriptors for CI13XXX has nothing common with page size from MM. Using platform and configuration specific PAGE_SIZE is wrong. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit 7c25a82684364da44643cbe3bdbd0f8835293767 Author: Artem Leonenko Date: Tue Dec 14 23:46:55 2010 -0800 USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's CI13xxx UDC driver doesn't call complete() callback for requests with flag no_interrupt set. Thus gadget drivers (like g_ether) are never notifed about successfully (or not) transmitted requests. As a result in case of g_ether and queued request with no_interrupt=1 fields g_ether is never notifed about sent packets and TX stalls. Solution: treat no_interrupt flag like all other UDC drivers do and call complete() callback for all requests. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit d9bb9c1820cb2a7aeb5e42a5470cf208002d9aa8 Author: Artem Leonenko Date: Tue Dec 14 23:45:50 2010 -0800 USB: gadget: update ci13xxx to work with g_ether There is one nasty scenario when CI13xxx driver fails: a) two or more rx requests are queued (g_ether does that) b) rx request completed, interrupt fires and ci13xxx dequeues rq c) request complete() callback gets called and in turn it calls ep_queue() c1) in ep_queue() request gets added to the TAIL of the rx queue list d) ep gets primed with rq from (b) e) interrupt fires f) request gets popped from queue head for hw dequeue G) requets from queue head wasn't enqueued g1) isr_tr_complete_low() doesn't enqueue more requests and it doesn't prime EP, rx traffic stalls Solution: a) enque queued requests ASAP, i.e. before calling complete() callback. b) don't HW enqueue and prime endpoint with recently added request and use the oldest request in the queue. Fixed issues: a) ep_queue() may return an error code despite request was successfully added to the queue (if _hardware_enqueue() fails) b) Added requests are always processed in LIFO order, even if they are added in complete() callback c) Finally more than two and more queued requests are processed consistently, even if they were added in complete() callback The fix was successfully tested on MIPS based SoC with 4KEc CPU core and CI13612 USB core. Board successfully boots with NFS root using g_ether on ci13xxx udc. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit 6549e8b7f34b456d5689b98c2c0cf38c98414e47 Author: Artem Leonenko Date: Tue Dec 14 23:46:40 2010 -0800 USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers Built-in gadget drivers have NULL-ifed unbind() function. Checking whether unbind() is NULL will never let any compiled into kernel driver attach. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit b236da6931e2482bfe44a7865dd4e7bb036f3496 Author: Changli Gao Date: Tue Dec 14 03:09:15 2010 +0000 net: use NUMA_NO_NODE instead of the magic number -1 Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit caafa84251b886feb6cdf23d50e2cc99dcdaaaf3 Author: Taku Izumi Date: Sun Dec 12 19:04:43 2010 +0000 bonding: add the debugfs interface to see RLB hash table This patch provices the debugfs interface to see RLB hash table like the following: # cat /sys/kernel/debug/bonding/bond0/rlb_hash_table SourceIP DestinationIP Destination MAC DEV 10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4 10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3 10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0 This is helpful to check if the receive load balancing works as expected. Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 411204a5a1ec1a35363d8ef450c77e2b8235da4d Author: Taku Izumi Date: Sun Dec 12 19:03:24 2010 +0000 bonding: migrate some macros from bond_alb.c to bond_alb.h This patch simply migrates some macros from bond_alb.c to bond_alb.h. Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit ad6bad3efbb82206837daad8cba2bc9343d778bf Author: Dimitris Michailidis Date: Tue Dec 14 21:36:55 2010 +0000 cxgb4: NUMA-aware Tx queue allocations Allocate Tx queue memory on the node indicated by the new netdev_queue_numa_node_read. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 23d88e1d3e4a5b807ce6725f9294b7b9dfcd89a1 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:54 2010 +0000 cxgb4: extend VPD parsing Current code parses the VPD RO section for keywords but makes static assumptions about the location of the section. Remove them and parse the VPD to find it. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 005b5717faac22264c1f61908ec5ac5b98108d99 Author: Joe Perches Date: Tue Dec 14 21:36:53 2010 +0000 cxgb4: add const to static arrays Patch originally from Joe Perches, unmodified. Signed-off-by: Joe Perches Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 8f3a76769ee50a839282f70d07d5f3429524b68a Author: Dimitris Michailidis Date: Tue Dec 14 21:36:52 2010 +0000 cxgb4: remove a bitmap The driver keeps a bitmap of the netdevs it registered so it knows what to unregister later. Remove that and look at reg_state instead. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b1a3c2b698ec333edc86bf8b5a636162ca309870 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:51 2010 +0000 cxgb4: remove the name field from the adapter structure Remove a field the driver uses to keep track of the name of the first netdev it manages to register. Do this by changing the registration loop to stop the first time it fails so the first registered device is trivial to tell. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ba27816cd8167c64652406d86ca78bcc5989f20f Author: Dimitris Michailidis Date: Tue Dec 14 21:36:50 2010 +0000 cxgb4: correct formatting of MSI-X interrupt names The last byte of the buffer for MSI-X names could not be used due to a bogus -1. Also do not explicitly clear the last byte, snprintf will do the right thing. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 8cd18ac47f9642bcd0d30d4b3521359b1896c208 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:49 2010 +0000 cxgb4: allocate more space for MSI-X interrupt names Currently MSI-X names for netdevs with long names are truncated in /proc/interrupts due to insufficient space. Use IFNAMSIZ to size the needed space. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 118969ed21b6895045b0a5a8a32feac1c9341096 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:48 2010 +0000 cxgb4: print port information after registering each netdev Print information about each port when its netdev is registered instead of looping separately over the ports at the end. The bulk of this patch is due to indentation change. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 7d5e77aafa39f3210b6273a44fe07508e837c3cb Author: Dimitris Michailidis Date: Tue Dec 14 21:36:47 2010 +0000 cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports And fix the supported flags ethtool reports for the two cases. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit a57cabe09f843a3f71277c485494496b3b9ee84a Author: Dimitris Michailidis Date: Tue Dec 14 21:36:46 2010 +0000 cxgb4: set the number of queues before device registration The number of queues is known early, move the calls to netif_set_real_num_[rt]x_queues before register_netdev. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ec16400823ce63bc0cfe89df78c6b7bf4a4d684b Author: Dimitris Michailidis Date: Tue Dec 14 21:36:45 2010 +0000 cxgb4: do not read the clock frequency from VPD No need to read the clock frequency from VPD, we already get it a bit later from FW, after any potential adjustments. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ef306b50b983be4873aed453c1feeaab22f3a098 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:44 2010 +0000 cxgb4: enable PCIe relaxed ordering Enable relaxed ordering for descriptor reads and packet I/O. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 986d730a696277520084180071ac4873aac63905 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:50 2010 +0000 bnx2x: update version to 1.62.00-2 Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit b0200e250b5eef29e5ed8aa17979499affcc11cd Author: Vladislav Zolotarov Date: Mon Dec 13 22:34:37 2010 +0200 bnx2x: remove old FW files Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 5928c8baf67a36f553fe23a1b7820c7745e8bb2e Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:35 2010 +0000 bnx2x: replace FW to 6.2.5 Includes FCoE releated fixes in FW flows Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 40392d4e49c29bf5e939803d804dc8c7b600f297 Author: Vladislav Zolotarov Date: Mon Dec 13 22:28:42 2010 +0200 bnx2x: add FW 6.2.5 files Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit bcab15c5d780bafb38311f00fcb263d03d2b00f1 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:25 2010 +0000 bnx2x: Add DCB/PFC support - link layer Add appropriate HW DCB/PFC configuration Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit e4901dde12d92b70dd13fa8b3bbc9df7a6129aab Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:18 2010 +0000 bnx2x: add DCB support Adding DCB initialization and handling on 57712 FW/HW Signed-off-by: Dmitry Kravkov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8307fa3e86a83924dd7f8310ce1e051f34986fe8 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:09 2010 +0000 bnx2x: add a select queue callback This callback required to allow FCoE traffic to be sent on separate priority queue from other L2 traffic, which is managed by PFC in HW. Signed-off-by: Vladislav Zolotarov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ec6ba945211b1c1f97d3d19fe60f166c9a92241d Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:01 2010 +0000 bnx2x: add FCoE ring Includes new driver structures and FW/HW configuration for FCoE ring Signed-off-by: Vladislav Zolotarov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a3d22a68d752ccc1a01bb0a64dd70b7a98bf9e23 Author: Vladislav Zolotarov Date: Mon Dec 13 06:27:10 2010 +0000 bnx2x: Take the distribution range definition out of skb_tx_hash() Move the calcualation of the Tx hash for a given hash range into a separate function and define the skb_tx_hash(), which calculates a Tx hash for a [0; dev->real_num_tx_queues - 1] hash values range, using this function (__skb_tx_hash()). Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 35c64e5d13c3d7d8c4ad061ad5e20498b9160c24 Author: Thomas Gleixner Date: Thu Dec 16 13:06:35 2010 +0000 drivers: serial: apbuart: Handle OF failures gracefully The apbuart driver depends on OF and relies on everything being available. So if it's probed on a platform which has OF support, but no device tree is available it crashes. Triggered by the upcoming x86 OF support in randconfig testing. Further it's inconsistent vs. the probing and exiting from the of_match loop. Make it robust and consistent: - check the availablility of OF nodes before dereferencing - return -ENODEV when the device tree lookup fails - return -ENODEV when no uart port configuration is found - return -ENODEV when invalid uart port configuration is found Remove the enum_done check while at it. Driver init functions are only called once. Remove the pointless vendor and device queries as well. Reported-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Grant Likely Cc: Kristoffer Glembo Signed-off-by: Greg Kroah-Hartman commit 3f960dbb9dfe29ff283810624c4340c79fde87f5 Author: Govindraj.R Date: Thu Dec 16 18:12:47 2010 +0530 Serial: Avoid unbalanced IRQ wake disable during resume To avoid unbalanced IRQ wake disable, ensure that wakeups are disabled only when wakeups have been successfully enabled. Tested on OMAP3630SDP/ZOOM3. Signed-off-by: Govindraj.R Reported-by: Paul Walmsley Cc: Santosh Shilimkar Acked-by: Kevin Hilman Signed-off-by: Greg Kroah-Hartman commit 6ce5b1ce5f6922db32599e73bcb22f5cdcbf241f Author: Timur Tabi Date: Mon Dec 13 14:08:53 2010 -0600 tty: fix typos/errors in tty_driver.h comments Fix various typos and other errors in comments of tty_driver.h. The most significant is the wrong name of a function for the description of TTY_DRIVER_DYNAMIC_DEV. Signed-off-by: Timur Tabi Signed-off-by: Greg Kroah-Hartman commit 1c5189976ffc130416e808f41049c12615a6380c Author: Tomoya MORINAGA Date: Thu Dec 16 16:13:29 2010 +0900 pch_uart : fix warnings for 64bit compile Fix the following warnings drivers/serial/pch_uart.c: In function ‘dma_handle_rx’: drivers/serial/pch_uart.c:685:24: warning: cast from pointer to integer of different size drivers/serial/pch_uart.c: In function ‘dma_handle_tx’: drivers/serial/pch_uart.c:778:23: warning: cast from pointer to integer of different size drivers/serial/pch_uart.c: In function ‘pch_uart_init_port’: drivers/serial/pch_uart.c:1289:20: warning: cast to pointer from integer of different size drivers/serial/pch_uart.c: In function ‘pch_uart_exit_port’: drivers/serial/pch_uart.c:1328:2: warning: cast from pointer to integer of different size Signed-off-by: Tomoya MORINAGA Reported-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 8a09d6d80c90c02f2f8c89f69c702cab0c8d9b42 Author: Larry Finger Date: Thu Dec 16 11:13:57 2010 -0600 rtlwifi: Switch locking from semaphores to mutexes Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3cf0c8ad94ba1ba241b970cd19c11a4f3cea93c2 Author: Larry Finger Date: Thu Dec 16 09:13:21 2010 -0600 rtl8192ce: Update MAINTAINERS Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f15a4bb2637253680f09f0161d51e22446b6478f Author: Bruno Randolf Date: Thu Dec 16 16:22:20 2010 +0900 ath5k: Fix survey The old survey implementation was broken and returned nonsense data. Clear cycle counters and survey data on reset. Since the cycle counters easily overflow it's better to keep a local version of collected survey data (in ms resolution, instead of clockrate) and update this every time survey is retrieved. If survey is retrieved often enough to avoid cycle counter overflows this works fine, otherwise we could update survey more often, like ath9k does. Still only the survey for the current channel is kept. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 4aea248dd7a67097d683a97f94a0aeaf0d248f3f Author: Larry Finger Date: Wed Dec 15 22:55:34 2010 -0600 rtl8192ce: Fix build on powerpc After merge of the rtl8192ce driver, a powerpc build fails with: drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_init_sw_vars': drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: error: implicit declaration of function 'vmalloc' drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: warning: cast to pointer from integer of different size drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_deinit_sw_vars': drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:91: error: implicit declaration of function 'vfree' The problem is fixed by explicitly including the appropriate header. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 931299cf87701962ea1811dc216f48f3f7a4ebc8 Author: Luis R. Rodriguez Date: Wed Dec 15 19:24:12 2010 -0800 ath: fix NULL pointer dereference on reg_notifier() The reg_notifier() was recently updated as being capable of having the request passed as NULL, fix ath to follow this API change. Without this we end up oopsing: BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 IP: [] ath_reg_notifier_apply+0x5b/0xa0 [ath] PGD b4c4c067 PUD b4c4d067 PMD 0 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC last sysfs file: /sys/devices/pci0000:00/0000:00:1b.0/uevent CPU 1 Modules linked in: Pid: 436, comm: modprobe Not tainted 2.6.37-rc5-wl+ #36 6460DWU/6460DWU RIP: 0010:[] [] ath_reg_notifier_apply+0x5b/0xa0 [ath] RSP: 0018:ffff8800b6f6baa8 EFLAGS: 00010246 RAX: ffff8800b527b254 RBX: ffff8800b532c180 RCX: 0000000000000018 RDX: ffff8800b530c108 RSI: 0000000000000000 RDI: ffff8800b532c180 RBP: ffff8800b6f6baa8 R08: ffff8800b532f268 R09: 0000000000000235 R10: 00000000000016ad R11: 0000000000000018 R12: 0000000000000000 R13: 0000000000000016 R14: ffff8800b532f268 R15: 0000000000000011 FS: 00007f0c53104700(0000) GS:ffff8800bed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000004 CR3: 00000000b6531000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 436, threadinfo ffff8800b6f6a000, task ffff8800b404dc40) Stack: ffff8800b6f6bac8 ffffffffa03ea651 ffff8800b532c180 ffff8800b527b254 ffff8800b6f6bb38 ffffffffa01835ca ffffffffa019ed00 00000000a019ed80 0000000000000002 ffff880000000002 ffffffffa0366140 0000000010aee572 Call Trace: [] ath9k_reg_notifier+0x41/0x50 [ath9k] [] wiphy_update_regulatory+0x4ba/0x5a0 [cfg80211] [] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211] [] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211] [] wiphy_register+0x1d4/0x360 [cfg80211] [] ? __kmalloc+0x108/0x1c0 [] ieee80211_register_hw+0x183/0x5b0 [mac80211] [] ath9k_init_device+0x66b/0x850 [ath9k] [] ath_pci_probe+0x2f6/0x3c0 [ath9k] [] ? default_spin_lock_flags+0x9/0x10 [] local_pci_probe+0x5f/0xd0 [] pci_device_probe+0x101/0x120 [] ? driver_sysfs_add+0x7a/0xb0 [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0x9b/0xa0 [] ? __driver_attach+0x0/0xa0 [] bus_for_each_dev+0x68/0x90 [] driver_attach+0x1e/0x20 [] bus_add_driver+0xe9/0x290 [] ? ath9k_init+0x0/0x4d [ath9k] [] driver_register+0x80/0x150 [] ? ath9k_init+0x0/0x4d [ath9k] [] ? ath9k_init+0x0/0x4d [ath9k] [] __pci_register_driver+0x56/0xd0 [] ath_pci_init+0x23/0x30 [ath9k] [] ath9k_init+0x2b/0x4d [ath9k] [] do_one_initcall+0x43/0x190 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Code: RIP [] ath_reg_notifier_apply+0x5b/0xa0 [ath] RSP CR2: 0000000000000004 ---[ end trace 6d03d3c7eda9f06b ]--- Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2784fe915cd25adf23ea28534019308d8a144721 Author: Luis R. Rodriguez Date: Wed Dec 15 19:24:11 2010 -0800 cfg80211: fix null pointer dereference with a custom regulatory request Once we moved the core regulatory request to the queue and let the scheduler process it last_request will have been left NULL until the schedular decides to process the first request. When this happens and we are loading a driver with a custom regulatory request like all Atheros drivers we end up with a NULL pointer dereference. We fix this by checking if the request was a custom one. BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 IP: [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] PGD 71f91067 PUD 712b2067 PMD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/devices/pci0000:00/0000:00:1d.7/usb2/2-1/firmware/2-1/loading CPU 0 Modules linked in: ath9k_htc(+) ath9k_common ath9k_hw ath Pid: 3094, comm: insmod Tainted: G W 2.6.37-rc5-wl #16 INVALID/28427ZQ RIP: 0010:[] [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] RSP: 0018:ffff88007045db78 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffffffffa047d9a0 RCX: ffff88007045dbd0 RDX: 0000000000004e20 RSI: 000000000024cde0 RDI: ffff8800700483e0 RBP: ffff88007045db98 R08: ffffffffa02f5b40 R09: 0000000000000001 R10: 000000000000000e R11: 0000000000000001 R12: 0000000000000000 R13: ffff88007004e3b0 R14: 0000000000000000 R15: ffff880070048340 FS: 00007f635a707700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000004 CR3: 00000000708a9000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process insmod (pid: 3094, threadinfo ffff88007045c000, task ffff8800713e3ec0) Stack: ffffffffa047d9a0 0000000000000000 ffff88007004e3b0 0000000000000000 ffff88007045dc08 ffffffffa016e147 000000007045dc08 0000000000000002 ffff8800700483e0 ffffffffa02f5b40 ffff88007045dbd8 0000000000000000 Call Trace: [] wiphy_apply_custom_regulatory+0x137/0x1d0 [cfg80211] [] ? ath9k_reg_notifier+0x0/0x50 [ath9k_htc] [] ath_regd_init+0x347/0x430 [ath] [] ath9k_htc_probe_device+0x6c5/0x960 [ath9k_htc] [] ath9k_htc_hw_init+0xc/0x30 [ath9k_htc] [] ath9k_hif_usb_probe+0x216/0x3b0 [ath9k_htc] [] usb_probe_interface+0x10c/0x210 [usbcore] [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0xa3/0xb0 [] ? __driver_attach+0x0/0xb0 [] bus_for_each_dev+0x5e/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0x168/0x320 [] driver_register+0x71/0x140 [] ? __raw_spin_lock_init+0x38/0x70 [] usb_register_driver+0xdc/0x190 [usbcore] [] ? ath9k_htc_init+0x0/0x4f [ath9k_htc] [] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc] [] ath9k_htc_init+0x2b/0x4f [ath9k_htc] [] do_one_initcall+0x3f/0x180 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Code: RIP [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] RSP CR2: 0000000000000004 ---[ end trace 79e4193601c8b713 ]--- Reported-by: Sujith Manoharan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 45ef6a0bcc9cd8f13004789ec6decb52e1d3045c Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:53 2010 -0800 ath9k_hw: Configure appropriate Tx power when PAPRD fails Target Tx power available in eeprom is for PAPRD. If PAPRD fails, paprd scale factor needs to be detected from this target tx power. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7072bf62fb7abe5a91389d6271da520f29c79326 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:52 2010 -0800 ath9k_hw: Disable PAPRD for rates with low Tx power When the drop in Tx power for a particular mcs rate exceeds the paprd scale factor, paprd may not work properly. Disable paprd for any such rates. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8698bca6b53d1f6641850b270de9c953078ed1ce Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:51 2010 -0800 ath9k_hw: Add a helper to get paprd scale factor Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 0b2084bc578128be866d6fc9926ed887c3432bb1 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:50 2010 -0800 ath9k_hw: Tx IQ cal changes for AR9003 Add multiple Tx IQ cal support to improve EVM accross different power levels. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 895ad7eb21ed228444169dbbff44f3dccfc7e006 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:49 2010 -0800 ath9k_hw: Move get_streams() to hw.h This helper can be used in multiple places. Also make it inline returning u8. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d8a8440e3f1f0cdd23074c6d2d8cbbde204a4374 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:48 2010 -0800 ath9k_hw: Remove unnecessary Rx IQ cal register configuration in ar9003_hw_tx_iq_cal() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7e68b746681289c00e8fd818fdd0144c6896d425 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:47 2010 -0800 ath9k_hw: Remove delay during regwrite of analog shift registers This is not needed for AR9003. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit cf4e594ea7e55555e81647b74a3a8e8b2826a529 Author: Jouni Malinen Date: Thu Dec 16 00:52:40 2010 +0200 nl80211: Add notification for dropped Deauth/Disassoc Add a new notification to indicate that a received, unprotected Deauthentication or Disassociation frame was dropped due to management frame protection being in use. This notification is needed to allow user space (e.g., wpa_supplicant) to implement SA Query procedure to recover from association state mismatch between an AP and STA. This is needed to avoid getting stuck in non-working state when MFP (IEEE 802.11w) is used and a protected Deauthentication or Disassociation frame is dropped for any reason. After that, the station would silently discard any unprotected Deauthentication or Disassociation frame that could be indicating that the AP does not have association for the STA (when the Reason Code would be 6 or 7). IEEE Std 802.11w-2009, 11.13 describes this recovery mechanism. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 5928b91acae97622a6f2e679eb7a9f19bed68e3e Merge: 7d5f01a 248daa0 Author: John W. Linville Date: Thu Dec 16 15:21:33 2010 -0500 Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit 36facadd9ea98f8415d0dbb63e0763b7ee9d3911 Merge: 2faa83e 0b83ae9 Author: Greg Kroah-Hartman Date: Thu Dec 16 10:05:06 2010 -0800 Merge branch 'usb-next' into musb-merge * usb-next: (132 commits) USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added usb: gadget: f_ncm.c added usb: gadget: u_ether: prepare for NCM usb: pch_udc: Fix setup transfers with data out usb: pch_udc: Fix compile error, warnings and checkpatch warnings usb: add ab8500 usb transceiver driver USB: gadget: Implement runtime PM for MSM bus glue driver USB: gadget: Implement runtime PM for ci13xxx gadget USB: gadget: Add USB controller driver for MSM SoC USB: gadget: Introduce ci13xxx_udc_driver struct USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc USB: gadget: Separate out PCI bus code from ci13xxx_udc ... commit 2faa83e2a519abea1055d156ce1b42b8fa57e87b Author: Greg Kroah-Hartman Date: Thu Dec 16 10:04:17 2010 -0800 Revert "USB: musb: pm: don't rely fully on clock support" This reverts commit 32d5dc9520f0c6f60f691dd478741c774e292406. Needed to properly merge the musb changes that are in the usb-next branch into Linus's tree. Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 224acb1839f5fbb4ba85a440f6dd30dfb0e561b6 Author: Greg Kroah-Hartman Date: Thu Dec 16 10:03:27 2010 -0800 Revert "USB: musb: blackfin: pm: make it work" This reverts commit 1e393c6eece048052d4131ec4dad3b98e35a98e2. Needed to properly merge the musb changes that are in the usb-next branch into Linus's tree. Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8 Author: Eric Paris Date: Thu Dec 16 11:46:51 2010 -0500 SELinux: define permissions for DCB netlink messages Commit 2f90b865 added two new netlink message types to the netlink route socket. SELinux has hooks to define if netlink messages are allowed to be sent or received, but it did not know about these two new message types. By default we allow such actions so noone likely noticed. This patch adds the proper definitions and thus proper permissions enforcement. Signed-off-by: Eric Paris commit 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb Merge: 56a8bd6 69479f8 Author: Dmitry Torokhov Date: Thu Dec 16 09:17:48 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next Conflicts: drivers/input/Makefile commit b2837fcf4994e699a4def002e26f274d95b387c1 Author: Anton Salikhmetov Date: Thu Dec 16 18:08:41 2010 +0200 hfsplus: %L-to-%ll, macro correction, and remove unneeded braces Clean-up based on checkpatch.pl report against unnecessary braces (`{' and `}'), non-standard format option %Lu (%llu recommended) as well as one trailing statement in a macro definition which should have been on the next line. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 20b7643d8ee44254fc972d42655bace81e7ab50a Author: Anton Salikhmetov Date: Thu Dec 16 18:08:40 2010 +0200 hfsplus: spaces/indentation clean-up Fix incorrect spaces and indentation reported by checkpatch.pl. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 21f2296a598c4089e0a9bdf54634269ac913a693 Author: Anton Salikhmetov Date: Thu Dec 16 18:08:39 2010 +0200 hfsplus: C99 comments clean-up Match coding style restriction against C99 comments where checkpatch.pl reported errors about their usage. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd Author: Anton Salikhmetov Date: Thu Dec 16 18:08:38 2010 +0200 hfsplus: over 80 character lines clean-up Match coding style line length limitation where checkpatch.pl reported over-80-character-line warnings. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 596276c3571e2108f4b336be545ece2eacf3da59 Author: Anton Salikhmetov Date: Thu Dec 16 14:44:51 2010 +0200 hfsplus: fix an artifact in ioctl flag checking Fix a flag checking artifact in hfsplus_ioctl_getflags() routine found while doing clean-up against assignments inside `if's. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 846f40455276617275284a4b76b89311b4aed0b9 Author: Steven Whitehouse Date: Thu Dec 16 15:18:48 2010 +0000 GFS2: Don't flush delete workqueue when releasing the transaction lock There is no requirement to flush the delete workqueue before a gfs2 filesystem is suspended. The workqueue's work will just be suspended along with the rest of the tasks on the filesystem. The resolves a deadlock situation where the transaction lock's demotion code was trying to flush the delete workqueue while at the same time, the workqueue was waiting for the transaction lock. The delete workqueue is flushed by gfs2_make_fs_ro() already, so that umount/remount are correctly protected anyway. Signed-off-by: Steven Whitehouse commit 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6 Author: Sedat Dilek Date: Thu Dec 16 12:46:23 2010 +0100 iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate While compiling linux-next (next-20101216) I fell over this breakage: ... drivers/net/wireless/iwlwifi/iwl-agn-rs.c: In function ‘iwl_rs_rate_init’: drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2876:8: error: ‘struct iwl_lq_sta’ has no member named ‘dbg_fixed_rate’ dbg_fixed_rate is only used when CONFIG_MAC80211_DEBUGFS is set: [ drivers/net/wireless/iwlwifi/iwl-agn-rs.h ] ... #ifdef CONFIG_MAC80211_DEBUGFS struct dentry *rs_sta_dbgfs_scale_table_file; struct dentry *rs_sta_dbgfs_stats_table_file; struct dentry *rs_sta_dbgfs_rate_scale_data_file; struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file; u32 dbg_fixed_rate; #endif The issue was introduced by commit a1da077bc36368eb7d6312e7e49260f0a3d92c77: "iwlwifi: clear dbg_fixed_rate during init" Signed-off-by: Sedat Dilek Signed-off-by: John W. Linville commit e137478b56fd79c397b5c5c74fc08c049a42835a Author: John W. Linville Date: Thu Dec 16 09:20:16 2010 -0500 rtlwifi: convert to __packed notation Use "__packed" instead of "__attribute__ ((packed))"... Signed-off-by: John W. Linville commit 7639dae0ca11038286bbbcda05f2bef601c1eb8d Author: Peter Zijlstra Date: Tue Dec 14 21:26:40 2010 +0100 perf, x86: Provide a PEBS capable cycle event Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit abe43400579d5de0078c2d3a760e6598e183f871 Author: Peter Zijlstra Date: Wed Nov 17 23:17:37 2010 +0100 perf: Sysfs enumeration Simple sysfs emumeration of the PMUs. Use a "event_source" bus, and add PMU devices using their name. Each PMU device has a type attribute which contrains the value needed for perf_event_attr::type to identify this PMU. This is the minimal stub needed to start using this interface, we'll consider extending the sysfs usage later. Cc: Kay Sievers Cc: Greg KH Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.316982569@chello.nl> Signed-off-by: Ingo Molnar commit 2e80a82a49c4c7eca4e35734380f28298ba5db19 Author: Peter Zijlstra Date: Wed Nov 17 23:17:36 2010 +0100 perf: Dynamic pmu types Extend the perf_pmu_register() interface to allow for named and dynamic pmu types. Because we need to support the existing static types we cannot use dynamic types for everything, hence provide a type argument. If we want to enumerate the PMUs they need a name, provide one. Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.259707703@chello.nl> Signed-off-by: Ingo Molnar commit 9f58a205c62d0dad1df38d076324a89b1a0f1d65 Author: Peter Zijlstra Date: Wed Nov 17 23:17:35 2010 +0100 init: Initialized IDR earlier perf_event_init() wants to start using IDR trees, its needs in turn are satisfied by mm_init(). Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.206992649@chello.nl> Signed-off-by: Ingo Molnar commit 24a24bb6ff3dc3a09bb131241be920ecc3f0e519 Author: Peter Zijlstra Date: Wed Nov 17 23:17:33 2010 +0100 perf: Move perf_event_init() into main.c Currently we call perf_event_init() from sched_init(). In order to make it more obvious move it to the cannnonical location. Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.093629821@chello.nl> Signed-off-by: Ingo Molnar commit 4407204c5c9037763aadce39b025529dfbfcac9e Author: Peter Zijlstra Date: Wed Dec 8 15:56:23 2010 +0100 perf, x86: Detect broken BIOSes that corrupt the PMU Some BIOSes use PMU resources, which can cause various bugs: - Non-working or erratic PMU based statistics - the PMU can end up counting the wrong thing, resulting in misleading statistics - Profiling can stop working or it can profile the wrong thing - A non-working or erratic NMI watchdog that cannot be relied on - The kernel may disturb whatever thing the BIOS tries to use the PMU for - possibly causing hardware malfunction in extreme cases. - ... and other forms of potential misbehavior Various forms of such misbehavior has been observed in practice - there are BIOSes that just corrupt the PMU state, consequences be damned. The PMU is a CPU resource that is handled by the kernel and the BIOS stealing+corrupting it is not acceptable nor robust, so we detect it, warn about it and further refuse to touch the PMU ourselves. Signed-off-by: Peter Zijlstra Cc: Jason Wessel Cc: Don Zickus Cc: Linus Torvalds Cc: Thomas Gleixner Cc: "H. Peter Anvin" LKML-Reference: Signed-off-by: Ingo Molnar commit 69479f8da68f1930b2078b2ebf6533fb00339918 Author: Dmitry Torokhov Date: Thu Dec 9 01:08:26 2010 -0800 Input: include MT library as source for kerneldoc Signed-off-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 7f9c2454010159e871e9416dcf64b1e6bfce78be Author: Henrik Rydberg Date: Tue Dec 7 09:18:28 2010 +0100 MAINTAINERS: Update input-mt entry The input multitouch core is now located in its own file, and maintained via a git tree. Update the maintainers entry accordingly. Signed-off-by: Henrik Rydberg commit 28906ad6d7c8a8090f720cf7c39461df0b1460f6 Author: Richard Nauber Date: Tue Dec 14 22:36:18 2010 +0100 hid: egalax: Add support for Samsung NB30 netbook The Samsung NB30 touch has a DWAV dual-touch device. This patch adds the NB30 to the list of supported devices, and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Richard Nauber Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit e12b355b57b4d330be3479b1e9a518cfed59866c Author: Henrik Rydberg Date: Mon Nov 29 14:40:11 2010 +0100 hid: egalax: Document the new devices in Kconfig Add the new supported devices to the kernel menu config help text. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 006b20fe4c69189b0d854e5eabf269e50ca86cdd Merge: 5f29805 d949750 Author: Ingo Molnar Date: Thu Dec 16 11:22:25 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: We want to apply a dependent patch. Signed-off-by: Ingo Molnar commit 4e93db23bf95cd763c9182b5d6187412fe6ce747 Author: Henrik Rydberg Date: Mon Nov 29 07:27:49 2010 +0100 hid: egalax: Add support for Wetab The Wetab tablet dual-touch controller works the same way as the one in the Joojoo tablet. This patch adds the Wetab to the list of supported devices, and grabs it accordingly in hid-core. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit f7bc8046b33b9fb2e61318f885cc5d94e0a6b805 Author: Henrik Rydberg Date: Mon Dec 6 14:04:21 2010 +0100 hid: egalax: Convert to MT slots The firmware in the joojoo reports touches sequentially, one per report, which confuses the current driver. A further complication is the absense of any indication of a touch frame. This patch converts the driver to the MT slots protocol, and outputs one full touch frame per report. This way, proper handling for both firmwares is ensured. Tested-by: Philipp Merkel Cc: Stephane Chatty Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit 17c760687f1270af9bd798d938198caa7d5aa3eb Author: Henrik Rydberg Date: Mon Oct 11 21:20:51 2010 +0200 hid: egalax: Add event filtering Use estimated signal-to-noise ratios to reduce noise and limit the amount of events emitted. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 80a469e4f4d01ad96447f85cc71a379ec82ffe2d Author: Henrik Rydberg Date: Mon Oct 11 21:16:43 2010 +0200 hid: egalax: Report zero as minimum pressure The firmware reports a logical minimum of one, but in order for userspace applications to correctly map all reported values to non-zero pressure, the driver needs to report a logical minimum of zero. Fixed with this patch. Tested-by: Philipp Merkel Cc: Stephane Chatty Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit b88cbd3a007608a224fad5413de6170c75afd5a7 Author: Henrik Rydberg Date: Wed Oct 13 22:18:32 2010 +0200 hid: egalax: Correct for device resolution report error The firmware of both supported devices report a X/Y maximum of 4095, whereas in reality, it is eight times larger. Fixed with this patch. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 4a864183fb28ddf553e5b0b47858bc3c518dae94 Author: Henrik Rydberg Date: Sat Nov 27 17:56:17 2010 +0100 hid: egalax: Setup input device manually The hid core does not yet handle input filtering. Take over the setup of the input device, so that proper signal-to-noise ratios can be used. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit e42a98b520bb22535687ead3120e80edc268279a Author: Henrik Rydberg Date: Mon Dec 6 10:05:43 2010 +0100 input: mt: Add hovering distance axis Touch devices capable of hovering, i.e., fingers detected a distance from the surface, are not supported by the current input MT protocol. This patch adds ABS_MT_DISTANCE, which may be used to indicate the distance between the contact and the surface. Signed-off-by: Henrik Rydberg commit c5f4dec1ceb6ab773bbbefbe64a7c990c7d6b17f Author: Henrik Rydberg Date: Wed Dec 15 13:50:34 2010 +0100 input: mt: Move tracking and pointer emulation to input-mt The drivers using the type B protocol all report tracking information the same way. The contact id is semantically equivalent to ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates the driver. The situation can be improved upon by providing a common pointer emulation code, thereby removing the need for the tracking id in the driver. This patch moves all tracking event handling over to the input core, simplifying both the existing drivers and the ones currently in preparation. Acked-by: Ping Cheng Acked-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit 8cde81001626c4c60b26ef2eb5fc522885ed9fd0 Author: Henrik Rydberg Date: Sat Nov 27 10:50:54 2010 +0100 input: mt: Collect slots initialization code The MT slots devices all follow the same initialization pattern of creating slots and hinting about buffer size. Let drivers call an initialization function instead, and make sure it can be called repeatedly without side effects. Signed-off-by: Henrik Rydberg commit 47c78e891323513e9909729b44033e2c6649e2b7 Author: Henrik Rydberg Date: Sat Nov 27 09:16:48 2010 +0100 input: mt: Break out slots handling In preparation for common code to handle a larger set of MT slots devices, move the slots handling over to a separate file. Signed-off-by: Henrik Rydberg commit 56a8bd6dcf81693e61a712097216904f3a4ab536 Author: Tony SIM Date: Wed Dec 15 23:39:25 2010 -0800 Input: add ST1232 touchscreen controller driver This patch introduces support for Sitronix ST1232 integrated capacitive touchscreen with LCD module. The touchscreen is multitouch capable and can report coordinates of up to two contact points. Signed-off-by: Tony SIM Reviewed-by: Trilok Soni Acked-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit f113fe4e844be15394edcbc32b0ec196cdd0a0ff Author: Eric Miao Date: Tue Nov 23 17:00:03 2010 +0800 ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume Signed-off-by: Eric Miao commit 2a125dd56b3a853701063fe8a678ad7603e385fd Author: Eric Miao Date: Mon Nov 22 22:48:49 2010 +0800 ARM: pxa: remove get_memclk_frequency_10khz() Introduce 'struct clk' for memory and remove get_memclk_frequency_10khz(). Signed-off-by: Eric Miao commit 4029813c89926ae5d78cc2dff49d845d934424f6 Author: Eric Miao Date: Mon Nov 22 10:49:55 2010 +0800 ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c Signed-off-by: Eric Miao commit 2e8581e756ddbd0dea8b0d4059e9a82d2929de01 Author: Eric Miao Date: Mon Nov 22 09:41:39 2010 +0800 ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK() Signed-off-by: Eric Miao commit bb71bdd31b48efa2b9834f1a47eb5f657e3c217c Author: Haojian Zhuang Date: Wed Nov 17 19:03:36 2010 +0800 ARM: pxa: redefine irqs.h Define all IRQs in irqs.h. If some IRQs are sharing one IRQ number, define them together. If some IRQs are sharing same name with different IRQ number, define different IRQ. Signed-off-by: Haojian Zhuang Cc: Eric Miao Signed-off-by: Eric Miao commit d04e67cd1d088762c17e8edf08fbc14e4af1981a Author: Haojian Zhuang Date: Wed Nov 17 19:03:35 2010 +0800 ARM: pxa: redefine the cpu_is_pxa3xx After introducing pxa930/pxa935 and new silicons, original cpuid rules of XScale generation 3 can't fit new silicons. Now redefine the rule of PXA3xx. Only PXA300/PXA310/PXA320/PXA930/PXA935 are family members of PXA3xx. PXA930/PXA935 are family members of PXA93x. PXA93x can be considered as PXA3xx + CP. Signed-off-by: Haojian Zhuang Cc: Eric Miao Signed-off-by: Eric Miao commit d38bdf48f30f5dc0fac4c1ab656aff74f6804f07 Author: Haojian Zhuang Date: Thu Nov 25 14:21:32 2010 +0800 ARM: mmp: fix the typo - MMP2 is compatible with ARMv7 Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 13dee960f37b3769baa0eae9d1de4a7ca9a2e999 Author: Haojian Zhuang Date: Thu Nov 25 11:33:13 2010 +0800 ARM: mmp: append brownstone support Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 7bdba92dcaefdc69c339db9e23861e5e21d3a2c4 Author: cxie4 Date: Tue Nov 23 10:43:22 2010 +0800 ARM: mmp: add usb clock for pxa168/pxa910 Signed-off-by: Chao Xie Signed-off-by: Eric Miao commit aa11781671279c67d56b95c4d73cde5cd1a6d594 Author: Daniel Mack Date: Thu Nov 4 14:44:01 2010 -0400 ARM: pxa/raumfeld: enable PXA3XX_GCU driver Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 364dbdf3b6c31a4a5fb7a6d479e7aafb4a7a10b6 Author: Daniel Mack Date: Thu Nov 4 14:44:00 2010 -0400 video: add driver for PXA3xx 2D graphics accelerator This adds a driver for the the 2D graphics accelerator found on PXA3xx processors. Only resource mapping, interrupt handling and a simple ioctl handler is done by the kernel part, the rest of the logic is implemented in DirectFB userspace. Graphic applications greatly benefit for line drawing, blend, and rectangle and triangle filling operations. Benchmarks done on a PXA303 using the df_dok benchmarking tool follow, where the value in square brackets show the CPU usage during that test. Without accelerator (benchmarking 256x252 on 480x262 RGB16 (16bit)): Anti-aliased Text 3.016 secs ( 65.649 KChars/sec) [ 99.6%] Fill Rectangle 3.021 secs ( 175.107 MPixel/sec) [ 98.0%] Fill Rectangle (blend) 3.582 secs ( 3.602 MPixel/sec) [ 99.7%] Fill Rectangles [10] 3.177 secs ( 182.753 MPixel/sec) [ 98.1%] Fill Rectangles [10] (blend) 18.020 secs ( 3.580 MPixel/sec) [ 98.7%] Fill Spans 3.019 secs ( 145.306 MPixel/sec) [ 98.0%] Fill Spans (blend) 3.616 secs ( 3.568 MPixel/sec) [ 99.4%] Blit 3.074 secs ( 39.874 MPixel/sec) [ 98.0%] Blit 180 3.020 secs ( 32.042 MPixel/sec) [ 98.0%] Blit with format conversion 3.005 secs ( 19.321 MPixel/sec) [ 99.6%] Blit from 32bit (blend) 4.792 secs ( 2.692 MPixel/sec) [ 98.7%] With accelerator: Anti-aliased Text 3.056 secs (* 36.518 KChars/sec) [ 21.3%] Fill Rectangle 3.015 secs (* 115.543 MPixel/sec) [ 8.9%] Fill Rectangle (blend) 3.180 secs (* 20.286 MPixel/sec) [ 1.8%] Fill Rectangles [10] 3.251 secs (* 119.062 MPixel/sec) [ 1.2%] Fill Rectangles [10] (blend) 6.293 secs (* 20.502 MPixel/sec) [ 0.3%] Fill Spans 3.051 secs (* 97.264 MPixel/sec) [ 35.7%] Fill Spans (blend) 3.377 secs (* 15.282 MPixel/sec) [ 17.8%] Blit 3.046 secs (* 27.533 MPixel/sec) [ 2.6%] Blit 180 3.098 secs (* 27.070 MPixel/sec) [ 2.2%] Blit with format conversion 3.131 secs (* 39.148 MPixel/sec) [ 2.8%] Blit from 32bit (blend) 3.346 secs (* 11.568 MPixel/sec) [ 0.8%] Signed-off-by: Daniel Mack Tested-by: Sven Neumann Cc: Eric Miao Cc: Denis Oliver Kropp Cc: Sven Neumann Cc: Haojian Zhuang Signed-off-by: Eric Miao commit fe805986b20a86257e6de8cb12a7e5b991925aab Author: Zhangfei Gao Date: Wed Nov 3 01:15:32 2010 -0400 ARM: mmp: add sd card to jasper Signed-off-by: Zhangfei Gao Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 5382f419c128c85af3933958d73b18ed063d0264 Author: Zhangfei Gao Date: Wed Sep 29 16:18:51 2010 -0400 ARM: mmp: add mmc resource Signed-off-by: Zhangfei Gao Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit ad68bb9f7a3cd47396635a5e3895215af57579da Author: Marek Vasut Date: Wed Nov 3 16:29:35 2010 +0100 ARM: pxa: Access SMEMC via virtual addresses This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well. Also, various places in the kernel had to be patched to use __raw_read/__raw_write. Signed-off-by: Marek Vasut Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 851982c1b6ca18cedf6d01e4529a0c1ddb30771e Author: Marek Vasut Date: Mon Oct 11 02:20:19 2010 +0200 ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA25x/PXA27x and PXA3xx memory mapping. Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io() and pxa3xx_map_io() is included. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 64ed267bdac799485a938dd2cba8243ba383cd5f Author: Eric Miao Date: Wed Oct 13 14:51:25 2010 +0800 ARM: pxa: introduce addr-map.h for large bus addresses and ranges Signed-off-by: Eric Miao commit ead67b6e6679b14befb0cef59db60e2853e19cd8 Author: Eric Miao Date: Wed Oct 13 10:38:56 2010 +0800 ARM: pxa: remove un-used mapping of camera registers The camera registers start and range are encoded into the platform device, and are actually handled by ioremap()'ed, thus the mapping in pxa_map_io() is not necessary. Signed-off-by: Eric Miao commit 0b83ae960cd7d4a5ee02786ecf41ab45688999bf Author: Matthew Wilcox Date: Wed Dec 15 15:44:06 2010 -0500 USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path If swap is on a UAS device, we could recurse into the driver by using GFP_KERNEL. Using GFP_NOIO ensures we won't. Reported-by: James Bottomley Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 89dc29051b626756e69db12f3ffb22e49a817bfe Author: Matthew Wilcox Date: Wed Dec 15 15:44:05 2010 -0500 USB: uas: Ensure we only bind to a UAS interface While all existing UAS devices use alternate interface 1, this is not guaranteed, and it has caused confusion with people trying to bind the uas driver to non-uas devices. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 92a3f767f5cd079351ae04a337c40266e9c6048f Author: Matthew Wilcox Date: Wed Dec 15 15:44:04 2010 -0500 USB: uas: Rename sense pipe and sense urb to status pipe and status urb The spec calls this the status pipe. While it is used to receive sense IUs, it is also used to receive other IUs, so this can be confusing. Reported-by: Luben Tuikov Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit ac563cfd528033ee6e3bb4801b5c73468d0145c8 Author: Matthew Wilcox Date: Wed Dec 15 15:44:03 2010 -0500 USB: uas: Use kzalloc instead of kmalloc The IUs are not being fully initialised by the driver (due to the reserved space). Since we should be zeroing reserved fields, use kzalloc to do it for us. Reported-by: Luben Tuikov Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 4400ef311e10666a2e5acf97d040df89cb880cb2 Author: Matthew Wilcox Date: Wed Dec 15 15:44:02 2010 -0500 USB: uas: Fix up the Sense IU Add a comment to the Sense IU data structure that it's also used for Read Ready and Write Ready. Remove the 'service response' element since it's gone from the current draft (04). Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit ab60bd0b92ec57c98df08616b7d0664be5551eae Author: Arnaud Lacombe Date: Sun Dec 5 01:29:25 2010 -0500 kconfig: add more S_INT and S_HEX consistency checks This patch add more number consistency checkg, trying to catch the following situation: config FOO0 hex default 42 config FOO1 string config BAR0 int default FOO1 config BAR1 hex default FOO1 config FOO2 hex default 42h config FOO3 int default "1bar" Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 50bc0ef42c76879f5d68a88c7063603dc0c9789b Author: Daniel Walker Date: Mon Dec 13 14:35:11 2010 -0800 msm: initial framebuffer support Initial framebuffer components. Add board-trout-panel.c as well as platform parts to enable the framebuffer. This code comes directly from Google's tree. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 3a790bbe790e79a9744adf105ed135624a590f5b Author: Daniel Walker Date: Mon Dec 13 14:35:10 2010 -0800 msm: add handling for clocks tagged as CLK_MINMAX CLK_MINMAX is used to denote clocks that have a wide variation in possible frequencies. This handling just sets the min and max values to the same value. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 304a09c3251c7c74660fc2ff9c590edf3d4bdd7e Author: Daniel Walker Date: Mon Dec 13 14:35:09 2010 -0800 msm: trout: change name of pmdh_clk to mddi_clk This clock is used in the framebuffer driver as mddi_clk. This just changes the name to match that. This also mirrors a change in Google tree. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 078dde9311dd067a76275ea2c903623cec504e31 Author: Daniel Walker Date: Mon Dec 13 14:35:08 2010 -0800 msm: add CLK_MINMAX to pmdh_clk This adds in the CLK_MINMAX flag to the pmdh_clk since it's actual a min/max clock instead of a single frequency clock. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 940f2efc28564c478033b075bcfc8e7b694831e1 Author: Daniel Walker Date: Mon Dec 13 14:35:07 2010 -0800 msm: trout: add gpio_to_irq trout has gpiolib support and interrupt support, but was missing the gpio_to_irq function. This adds that functions which should allow proper translation. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 294b2dea83ba0a6d6034a7521bc62c317efab17b Author: Stepan Moskovchenko Date: Fri Dec 10 14:12:03 2010 -0800 msm: iommu: Use the correct memory allocation flag Change msm_iommu_map to use GFP_ATOMIC instead of GFP_KERNEL due to the fact that the call occurs within a spinlock-protected region. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 38cd6b4f52a75926fd81fc85f53f5067dcd809f7 Author: Shan Wei Date: Wed Dec 15 14:27:28 2010 +0800 wireless:mac80211: kill unuse macro MESH_CFG_CMP_LEN in mesh.h Commit 00d3f14c has removed the references of this macro, but left it only. So remove this definition. commit 00d3f14cf9f12c21428121026a5e1d5f65926447 Author: Johannes Berg Date: Tue Feb 10 21:26:00 2009 +0100 mac80211: use cfg80211s BSS infrastructure Remove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely. Signed-off-by: Shan Wei Signed-off-by: John W. Linville commit 2b7e6bce41b6b944bd4302cf0914e2a6f4bc704b Author: Mohammed Shafi Shajakhan Date: Wed Dec 15 13:02:46 2010 +0530 ath9k: Add comments for making pm-qos as modparam PM-QOS value can be user specified via module parameter. This patch adds few comments regarding this in the driver code. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 64c6e50c0732b793e4bd5fd2954b7bef088f83f8 Author: Sujith Manoharan Date: Wed Dec 15 07:47:23 2010 +0530 ath9k_htc: Remove PCI specific configuration This is not required for USB devices. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit bd2ce6e43f65127bc723e7fcc044758cf8113260 Author: Sujith Manoharan Date: Wed Dec 15 07:47:10 2010 +0530 mac80211: Add timeout to BA session start API Allow drivers or rate control algorithms to specify BlockAck session timeout when initiating an ADDBA transaction. This is useful in cases where maintaining persistent BA sessions does not incur any overhead. The current timeout value of 5000 TUs is retained for all non ath9k/ath9k_htc drivers. Signed-off-by: Sujith Manoharan Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit a293911d4fd5e8593dbf478399a77f990d466269 Author: Johannes Berg Date: Tue Dec 14 17:54:28 2010 +0100 nl80211: advertise maximum remain-on-channel duration With the upcoming hardware offload implementation, some devices will have a different maximum duration for the remain-on-channel command. Advertise the maximum duration in mac80211, and make mac80211 set it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 14a085e77063090fb12ad391d0f4d46e593be225 Author: Wey-Yi Guy Date: Tue Dec 14 07:38:58 2010 -0800 iwlagn: fix witespace damage patch "iwlagn: check ready in iwlagn_bss_info_changed()" introduce whitespace, fix it please merge with the previous patch Reported by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4dc3530df7c0428b41c00399a7ee8c929406d181 Author: Mohammed Shafi Shajakhan Date: Tue Dec 14 13:18:28 2010 +0530 ath9k: Make PM-QOS value as user configurable This patch allows the pm-qos value to be user configurable by making it as a module parameter.This will help our customers to configure the pm-qos value according to the effect in throughput due to the DMA latency problem which was observed in Intel Pinetrail platforms. The tested value of '55' will be filled as the default pm-qos-value incase the user does not specifies pm-qos value as a module parameter. example usage: sudo modprobe ath9k pmqos=65 Cc: Senthilkumar Balasubramanian Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 17b3c17ecde36db5db7760a2802990b3129a4d65 Merge: 1fcfe76 65af8de Author: John W. Linville Date: Wed Dec 15 16:37:55 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c drivers/net/wireless/iwlwifi/iwl-core.h commit 1fcfe76a760e78d7774a254608557c84071b0cfb Merge: 0c81733 56e6417 Author: John W. Linville Date: Wed Dec 15 16:33:28 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h commit 0c8173385e549f95cd80c3fff5aab87b4f881d8d Author: Larry Finger Date: Wed Dec 8 11:12:31 2010 -0600 rtl8192ce: Add new driver Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468 Author: Felipe Contreras Date: Mon Oct 11 09:53:49 2010 +0000 OMAP: iommu: make iva2 iommu selectable It seems dsp-link will do this, and tidspbridge too at some point, but right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU. Cc: Fernando Guzman Lugo Cc: Yogesh Marathe Signed-off-by: Felipe Contreras commit 5cdc5bd8b2b1190cb54548c03194b154b4892e2a Merge: 6c34d28 e4a2b35 Author: Greg Kroah-Hartman Date: Wed Dec 15 09:29:38 2010 -0800 Merge branch 'musb-hw' of git://gitorious.org/usb/usb into musb * 'musb-hw' of git://gitorious.org/usb/usb: (43 commits) usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource arm: OMAP4430: musb: Configure musb to OTG mode usb: musb: Adding musb support for OMAP4430 usb: otg: TWL6030: Add twl6030_usb file for compilation mfd: TWL6030: OMAP4: Registering the TWL6030-usb device usb: musb: TWL6030: Selecting TWL6030_USB transceiver usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver. usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 mfd: TWL6030: USBOTG VBUS event generation on usb: musb: add support for ux500 platform musb: am35x: fix compile error due to control apis arm: omap4: enable usb on 4430sdp usb: musb: drop board_set_vbus usb: musb: drop musb_platform_suspend/resume usb: musb: blackfin: usb dev_pm_ops structure usb: musb: am35x: usb dev_pm_ops structure usb: musb: omap2430: use dev_pm_ops structure usb: musb: omap2430: drop the nops usb: musb: mark musb_save/restore_context static ... commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:03 2010 +0000 OMAP: iommu: create new api to set valid da range Some IOMMUs cannot use the whole 0x0 - 0xFFFFFFFF range. With this new API the valid range can be set. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit 9205a109fbeee180254bb5a4020eb71d50735944 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:02 2010 +0000 OMAP: iovmm: replace __iounmap with iounmap __iounmap function is wrong for OMAP architecture, instead use iounmap which will call to the correct function. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit ad1081210f3c91874f9fe9b48c3934c7db9714b7 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:01 2010 +0000 OMAP: iovmm: add superpages support to fixed da address This patch adds superpages support to fixed ad address inside iommu_kmap function. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit ba6e1f4ff41314906d81e6d96e646cdeafe42827 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:00 2010 +0000 OMAP: iovmm: no gap checking for fixed address If some fixed da address is wanted to be mapped and the page is freed but it is used as gap, the mapping will fail. This patch is fixing that and olny keeps the gap for not fixed address. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit 5af244fdf2a2405b2181da2a32636f3ca5ef162e Author: Mike Rapoport Date: Mon Nov 15 11:48:33 2010 +0200 [ARM] Dove: add support for multi-purpose pins configuration Signed-off-by: Mike Rapoport Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 8d4ce4cd7480ccd8412d4391d063733d6fc52f5c Author: Mike Rapoport Date: Mon Nov 15 11:48:32 2010 +0200 [ARM] Dove: add support for GPIOs 64-71 Signed-off-by: Mike Rapoport Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 248daa084cee4b212ff4408e9c9b05b3bdc0da0d Author: Luciano Coelho Date: Wed Dec 15 16:10:12 2010 +0200 wl12xx_sdio_test: rename files to match current style Change some file names and Kconfig settings so that this new module matches the new way of using wl12xx instead of wl1271. Also fix SDIO power enabling and disabling to match the latest way of doing it. Cc: Roger Quadros Signed-off-by: Luciano Coelho commit f0a6332ce221614fbd0731af92f668892fa4b700 Author: Jonas Aaberg Date: Wed Dec 15 08:37:00 2010 +0100 kbuild: add numeric --set-val option to scripts/config Add new option to scripts/config for changing .config numeric values Acked-by: Linus Walleij Signed-off-by: Jonas Aaberg Signed-off-by: Michal Marek commit ee1ae4d7b1c9a8b73e232fa33dc733be59368ff6 Author: Sascha Hauer Date: Wed Dec 15 09:56:35 2010 +0100 ARM i.MX51: Full iomux support This iomux file has been constructed from the Freescale pinmux tool. It contains all pins from the tool, but the datasheet lists some configurations not present in the tool, these are not yet added. Signed-off-by: Sascha Hauer commit 4ce2c1e8e899831dd152bd0d534a60da6fb1582a Author: Arnaud Lacombe Date: Sun Dec 5 01:41:18 2010 -0500 kconfig: fix `zconfdebug' extern declaration This symbol is only exist if YYDEBUG is defined. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit bf128f5265625b8015789ea8f12b3582dc29faa3 Author: Arnaud Lacombe Date: Sun Dec 5 01:41:17 2010 -0500 kconfig/conf: merge duplicate switch's case Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc Author: Arnaud Lacombe Date: Sun Dec 5 01:41:16 2010 -0500 kconfig: fix typos Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 1ebfa5198ee96f34f2ee4ae95c92318f07341fbd Author: Arnaud Lacombe Date: Sun Dec 5 01:41:15 2010 -0500 kbuild/gconf: add dummy inline for bind_textdomain_codeset() This symbols is used by gconf. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit fe04ce0bf955eaf53f7e4cd6bb35976fa94e0925 Author: Arnaud Lacombe Date: Sun Dec 5 01:41:14 2010 -0500 kbuild/nconf: fix spaces damage Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 6742f554db14da94172da9eb1875a1aa944a827f Author: Juuso Oikarinen Date: Mon Dec 13 09:52:37 2010 +0200 wl12xx: Change TX queue to be per AC With the current single-queue implementation traffic priorization is not working correctly - when using multiple BE streams and one, say VI stream, the VI stream will share bandwidth almost equally with the BE streams. To fix the issue, implement per AC queues, which are emptied in priority order to the firmware. To keep it relatively simple, maintain a global buffer count and global queue stop/wake instead of per-AC. With these changes, priorization appears to work just fine. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 17c1755c24d83f9fd0509b64c76cc43fc60cc642 Author: Eliad Peller Date: Sun Dec 12 12:15:35 2010 +0200 wl12xx: allow runtime changing of debug_level Currently, the debug level is set in compilation time (by the DEBUG_LEVEL const). This method has the advantage of compiling only the relevant messages, while optimizing out the unused ones. In order to allow runtime control over the debug_level, while optimizing out messages when debug messages are not needed, we combine some methods: 1. use dynamic_debug (pr_debug) rather then printk. 2. add debug_level module param in order to set debug level during insmod. 3. add debug_level sysfs file in order to allow dynamic control over the debug level. Since patches for pr_debug_hex_dump() implementation haven't been applied yet, we are still temporarly using print_hex_dump(). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ea559b460509b241cc1a3f36eebe0b2b634b3cf2 Author: Guy Eilam Date: Thu Dec 9 16:54:59 2010 +0200 wl1271: fixed problem with WPS IEs in probe requests Inclusion of a WPS IE in probe requests caused a problem in the driver due to the maximum size of the probe request template and the max_scan_ie_len values at initialization. Increased the size of probe request template to the maximum size allowed by the firmware. Struct wl12xx_probe_req_template, which was only used for calculating the max size of the probe request template, is no longer used and needed. max_scan_ie_len is used for validating the size of additional IEs in scan requests. Initialized the max_scan_ie_len field to the maximum size of the probe request template minus the ieee80211 header size. Signed-off-by: Guy Eilam Signed-off-by: Luciano Coelho commit 0dce631092f410bb22b21b3d47ef20d69389dfd9 Author: Arnaud Lacombe Date: Sun Dec 5 01:33:16 2010 -0500 kconfig: nuke second argument of conf_write_symbol() Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol(). Signed-off-by: Arnaud Lacombe [mmarek: Fix unused variable warning in conf_write()] Signed-off-by: Michal Marek commit c5312772156bb5f9b2e95e4c91526d578426a069 Author: Eliad Peller Date: Thu Dec 9 11:31:27 2010 +0200 wl12xx: add auto-arp support The auto-arp feature of wl12xx allows the firmware to automatically response to arp requests asking for its ip. in order to use it, we configure the arp response template and enable the corresponding bit in wl1271_acx_arp_filter (along with passing its ip) Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit b69eb80bf7a6922fef8056d42b06124a7de31501 Author: Roger Quadros Date: Wed Dec 1 11:58:54 2010 +0200 wl1271_sdio_test: Add module for sdio RX/TX testing This module enables individually generating RX and TX traffic over the SDIO bus on which the WL1271 chipset is connected. This is required to perform RF interference testing. The module takes 2 module parameters 'rx' and 'tx'. To generate RX traffic: modprobe wl1271_sdio_test rx=1 To generate TX traffic: modprobe wl1271_sdio_test tx=1 To generate both RX & TX traffic, set both rx and tx to 1. You can change the testing configuration at runtime by changing the rx & tx values at /sys/modules/wl1271_sdio_test/ To stop testing simply unload the module. Signed-off-by: Roger Quadros Reviewed-by: Carlos Chinea Signed-off-by: Luciano Coelho commit fb6a6819fad0d71b47577a51709440a9f8441f0a Author: Luciano Coelho Date: Fri Dec 3 17:05:40 2010 +0200 wl12xx: disable 11a channels when wl->enable_11a is known Disabling the 11a channels when not supported in the reg_notify function was not working as it should, because when the driver is initiailizing (and registering itself with mac80211), it would get the reg notification too early. At that point the driver wouldn't have received the NVS yet, so it wouldn't know whether 11a was supported. To fix this, we disable 11a channels when we read the NVS instead. Also, it is easier (and still safe) to set n_channels to zero instead of setting the disabled flag on every 11a channel. Signed-off-by: Luciano Coelho commit 6e71fabe9e60b1c6db587fbeac349848647920ab Author: Arnaud Lacombe Date: Sun Dec 5 01:31:57 2010 -0500 kconfig: do not define AUTOCONF_INCLUDED AUTOCONF_INCLUDED is not checked is not used within the tree and its parent header, `autoconf.h', is safe to be re-included. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 8fbf397c3389c1dedfa9ee412715046ab28fd82d Author: Will Deacon Date: Wed Dec 1 17:37:45 2010 +0000 ARM: hw_breakpoint: do not fail initcall if monitor mode is disabled The debug registers can only be manipulated from software if monitor debug mode is enabled. On some cores, this can never be enabled (i.e. the corresponding bit in the DSCR is RAZ/WI). This patch ensures we can handle this hardware configuration and fail gracefully, rather than blow up the kernel during boot. Reported-by: Cyril Chemparathy Signed-off-by: Will Deacon commit 96f3e2568456402769f3998e111746941f549dc6 Author: Lothar Waßmann Date: Mon Nov 22 09:39:51 2010 +0100 MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) This patch actually replaces the 'struct pad_desc' with a u64 cookie to facilitate adding platform specific pad_ctrl settings to an existing pad definition. So, instead of: iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21; power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2; mxc_iomux_v3_setup_pad(&power_key); one can write: mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2); Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6 Signed-Off-By: Lothar Waßmann Signed-off-by: Sascha Hauer commit ed41390fa57a21d06e6e3a3c4bc238bab8957fbb Author: Tejun Heo Date: Tue Dec 14 16:23:10 2010 +0100 workqueue: deprecate cancel_rearming_delayed_work[queue]() There's no in-kernel user left for these two obsolete functions. Mark them deprecated and schedule for removal during 2.6.39 cycle. Signed-off-by: Tejun Heo Acked-by: David S. Miller commit afe2c511fb2d75f1515081ff1be15bd79cfe722d Author: Tejun Heo Date: Tue Dec 14 16:21:17 2010 +0100 workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() cancel_rearming_delayed_work[queue]() has been superceded by cancel_delayed_work_sync() quite some time ago. Convert all the in-kernel users. The conversions are completely equivalent and trivial. Signed-off-by: Tejun Heo Acked-by: "David S. Miller" Acked-by: Greg Kroah-Hartman Acked-by: Evgeniy Polyakov Cc: Jeff Garzik Cc: Benjamin Herrenschmidt Cc: Mauro Carvalho Chehab Cc: netdev@vger.kernel.org Cc: Anton Vorontsov Cc: David Woodhouse Cc: "J. Bruce Fields" Cc: Neil Brown Cc: Alex Elder Cc: xfs-masters@oss.sgi.com Cc: Christoph Lameter Cc: Pekka Enberg Cc: Andrew Morton Cc: netfilter-devel@vger.kernel.org Cc: Trond Myklebust Cc: linux-nfs@vger.kernel.org commit 3b1826cebe1d534ec05417a29b9a9f82651a5cb5 Author: Mimi Zohar Date: Mon Dec 13 16:53:13 2010 -0500 encrypted-keys: style and other cleanup Cleanup based on David Howells suggestions: - use static const char arrays instead of #define - rename init_sdesc to alloc_sdesc - convert 'unsigned int' definitions to 'size_t' - revert remaining 'const unsigned int' definitions to 'unsigned int' Signed-off-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit 1f35065a9e2573427ce3fd6c4a40b355c2ddfb92 Author: Mimi Zohar Date: Mon Dec 13 16:53:12 2010 -0500 encrypted-keys: verify datablob size before converting to binary Verify the hex ascii datablob length is correct before converting the IV, encrypted data, and HMAC to binary. Reported-by: David Howells Signed-off-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit 1bdbb4024c309e470711b434a24fb356fc92edea Author: Mimi Zohar Date: Mon Dec 13 16:53:11 2010 -0500 trusted-keys: kzalloc and other cleanup Cleanup based on David Howells suggestions: - replace kzalloc, where possible, with kmalloc - revert 'const unsigned int' definitions to 'unsigned int' Signed-off-by: David Safford Acked-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit bc5e0af0b36b6cc9de301074426c279fc9b72675 Author: Mimi Zohar Date: Mon Dec 13 16:53:10 2010 -0500 trusted-keys: additional TSS return code and other error handling Previously not all TSS return codes were tested, as they were all eventually caught by the TPM. Now all returns are tested and handled immediately. This patch also fixes memory leaks in error and non-error paths. Signed-off-by: David Safford Acked-by: Mimi Zohar Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit df127ee375af4cb40b979605e0c336fc79bd38e7 Author: Tony Lindgren Date: Tue Dec 14 19:17:31 2010 -0800 omap: Fix setting omap_irq_base for 2430 We need to test for 24xx not 242x. Otherwise interrupts won't work. Reported-by: Rajendra Nayak Signed-off-by: Tony Lindgren commit 41263fc6716dea402125c95f38ed83ebf59d5172 Author: Ben Gardiner Date: Tue Dec 14 11:39:44 2010 -0500 kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG If you try to build a kernel with KCONFIG_CONFIG set (to a value not equal to .config) and that config sets CONFIG_IKCONFIG then the build will fail with: make[1]: *** No rule to make target `.config', needed by \ `kernel/config_data.gz'. Stop. because the kernel/Makefile contains a direct reference to .config. This issue has been present since the introduction of KCONFIG_CONFIG in 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21. Signed-off-by: Ben Gardiner CC: Roman Zippel CC: Michal Marek Reviewed-by: Michal Marek Signed-off-by: Michal Marek commit ba9effa2ecdc08325bd297d541b4207b2df38184 Author: Kirill A. Shutemov Date: Mon Dec 13 19:10:29 2010 +0200 kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all Export linux/a.out.h, linux/kvm.h and linux/kvm_para.h on headers_install_all if at least one architecture has appropriate files in arch-dependent headers. Signed-off-by: Kirill A. Shutemov Signed-off-by: Michal Marek commit f6820308e025d645d9d766c97586badd4ddb8754 Author: Kirill A. Shutemov Date: Mon Dec 13 19:10:28 2010 +0200 kbuild: introduce HDR_ARCH_LIST for headers_install_all Using HDR_ARCH_LIST you can specify subset of architectures you want to get headers for. Signed-off-by: Kirill A. Shutemov Signed-off-by: Michal Marek commit 8990c1bc4be46473ad19bf2fa612ca57286f3df4 Merge: 2979076 c8ddb27 Author: Michal Marek Date: Tue Dec 14 22:01:55 2010 +0100 Merge commit 'v2.6.37-rc1' into kbuild/kbuild commit d33e455337ea2c71d09d7f4367d6ad6dd32b6965 Author: David S. Miller Date: Tue Dec 14 13:01:14 2010 -0800 net: Abstract default MTU metric calculation behind an accessor. Like RTAX_ADVMSS, make the default calculation go through a dst_ops method rather than caching the computation in the routing cache entries. Now dst metrics are pretty much left as-is when new entries are created, thus optimizing metric sharing becomes a real possibility. Signed-off-by: David S. Miller commit 88606e80da0e8d862a42ee19e5bb60b01b940ea7 Author: Thomas Gleixner Date: Tue Dec 14 21:37:13 2010 +0100 MAINTAINERS: Update timer related entries Bring the existing file list up to date and add a new entry for timekeeping and ntp. Assign John Stultz to this new entry so he gets all the blame :) Signed-off-by: Thomas Gleixner Cc: John Stultz commit 9fe146aef44afe5ec677d8150b6ae94e09b773f7 Merge: 6389aa7 4e53f78 Author: David S. Miller Date: Tue Dec 14 11:33:23 2010 -0800 Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 Author: Russell King Date: Mon Dec 6 10:38:14 2010 +0000 ARM: GIC: move enablement of PPI interrupts to gic.c Avoid adding nasty genirq-specific code to local timers to enable PPI interrupts. Instead, provide a gic function to do this. Signed-off-by: Russell King commit 7627dc802a98aebebc6a34e5b6558ea4717c968c Author: Russell King Date: Sun Dec 5 08:51:38 2010 +0000 ARM: GIC: private a standard get_irqnr_preamble assembler macro Provide a standard get_irqnr_preamble assembler macro for platforms to use, which retrieves the base address of the GIC CPU interface from gic_cpu_base_addr. Allow platforms to override this by defining HAVE_GET_IRQNR_PREAMBLE. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit bef8f9ee32511a28f1c9a7d3b8c51cdac030b564 Author: Russell King Date: Sat Dec 4 16:50:58 2010 +0000 ARM: GIC: move gic_data[] initialization into gic_init() This avoids writing unnecessarily to gic_data[] from other CPUs, making this a mostly read-only variable. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit ff2e27ae0b17f53a6a289c87d325f706598f3788 Author: Russell King Date: Sat Dec 4 16:13:29 2010 +0000 ARM: GIC: consolidate gic_cpu_base_addr to common GIC code Every architecture using the GIC has a gic_cpu_base_addr pointer for GIC 0 for their entry assembly code to use to decode the cause of the current interrupt. Move this into the common GIC code. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit 384895330e0f3954d9478fd0853145f9c169df12 Author: Russell King Date: Sat Dec 4 16:01:03 2010 +0000 ARM: GIC: Remove MMIO address from gic_cpu_init, rename to gic_secondary_init We don't need to re-pass the base address for the CPU interfaces to the GIC for secondary CPUs, as it will never be different from the boot CPU - and even if it was, we'd overwrite the boot CPU's base address. Get rid of this argument, and rename to gic_secondary_init(). Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit b580b899dd05a007ad232ee49a07b32d91876462 Author: Russell King Date: Sat Dec 4 15:55:14 2010 +0000 ARM: GIC: provide a single initialization function for boot CPU Provide gic_init() which initializes the GIC distributor and current CPU's GIC interface for the boot (or single) CPU. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit 6389aa73ab8c15084fce18307a8e198eaff818da Merge: 0dbaee3 1d212aa Author: David S. Miller Date: Tue Dec 14 10:52:54 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit d52784eb3607bf887628742f99041b4f18d7d1de Author: akpm@linux-foundation.org Date: Tue Nov 30 13:52:14 2010 -0800 headers_check: Fix warning text Fix the warning text too, per Randy. Cc: Alexander Shishkin Cc: Michal Marek Cc: Randy Dunlap Cc: Stephen Hemminger Cc: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit de323f22a83b024b7432e813609c6efb74b1bbfc Author: akpm@linux-foundation.org Date: Tue Nov 30 13:51:13 2010 -0800 headers_check: better search for functions in headers Some headers don't bother with "extern" in function prototypes, which results in said prototypes being unnoticed and exported to userland. This patch slightly improves detection of such cases by checking for C type names as well in the beginning of a line. Signed-off-by: Alexander Shishkin Cc: Stephen Hemminger Cc: Michal Marek Cc: WANG Cong Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 2979076fbf17a0947d6eba367b0cac19c907c160 Author: Mike Frysinger Date: Tue Nov 23 19:54:02 2010 -0500 headers_install: check exit status of unifdef If unifdef fails for any reason (like segfaulting), we should be aborting the install steps. So check its exit status in this unlikely scenario. Reported-by: Diego Elio Pettenò Signed-off-by: Mike Frysinger Signed-off-by: Michal Marek commit 1874542d952bbea01997191aee868b472555fd9a Author: Florian Fainelli Date: Tue Dec 14 11:56:56 2010 +0100 HID: replace offsets values with their corresponding BTN_* defines Instead of using magic values, use their corresponding BTN_* defines from linux/input.h. Signed-off-by: Florian Fainelli Signed-off-by: Jiri Kosina commit c25bcd340033bf5b8dc30c16a99e64259f099446 Author: Benjamin Tissoires Date: Mon Dec 13 15:59:13 2010 +0100 HID: hid-mosart: support suspend/resume The device has 2 modes. The first one is an emulation of a touchscreen by sending left and right button, and the second mode is the one used in dual-touch (sending trackingID, touch and else). In case of a suspend/resume, the device switch back to the first mode described above (with left and right buttons). This adds a hook in .reset_resume for the device to be switched to the correct mode (I just copied the code in mosart_probe). Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit ad6d42670279da8f33f633f8a96a67cd7ef3b1da Author: Benjamin Tissoires Date: Tue Dec 14 11:38:18 2010 +0100 HID: hid-mosart: ignore buttons report This commit allows the device to be recognized as a touchscreen, and not a touchpad by xf86-input-evdev. The device has 2 modes. The first one is an emulation of a touchscreen by sending left and right button, and the second mode is the one used in dual-touch (sending trackingID, touch and else). That's why there is a hid report containing left and right buttons (9000001 and 9000002). The point is that xorg relies on these fields to determine if it's a touchpad or a touchscreen. Clearing the report (return -1) makes xorg detecting it out of the box as a quite pleasant (dual)touchscreen. Signed-off-by: Benjamin Tissoires Acked-by: Chase Douglas Signed-off-by: Jiri Kosina commit 72f4d57923d2aa651db060a71a6f6211654c119e Author: Magnus Damm Date: Tue Dec 14 16:57:11 2010 +0900 ARM: mach-shmobile: sh73a0 SMP support Add SMP support for ag5evm and the sh73a0 processor. Onlining and offlining works well, but at this point offlined processor cores are not put into sleep mode. There is no spinlock for syncing the secondary core with the first one in this implementation. The code instead relies on the cpu_online() check in __cpu_up(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4d7ec69576ca4427478405190bd32e560f06fe99 Author: Magnus Damm Date: Tue Dec 14 16:57:03 2010 +0900 ARM: mach-shmobile: Enable SMP support Allow SMP to be enabled on R-Mobile / SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1c51ed4fb9f11fa1e0873aa2d5b28f42a85ac299 Author: Magnus Damm Date: Tue Dec 14 16:56:55 2010 +0900 ARM: mach-shmobile: SMP base support Add SMP base support for R-Mobile / SH-Mobile processors. This patch contains all base code to support CONFIG_SMP regardless of ARCH_SHMOBILE processor type. Both local timer and CPU hotplug are supported, but no processor specific code is included. At this point only the default behavior is in place, so a single core will always be used even though CONFIG_SMP is enabled on multicore systems. The SMP Kconfig entry for arch/arm/Kconfig is excluded from this patch to simplify merging. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6dff7da2adbba9c5cd1b3a3f67191fe3471c663c Author: Yusuke Goda Date: Tue Dec 14 14:18:03 2010 +0900 ARM: mach-shmobile: mackerel: Add sdhi support Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 09dd7ded60019d6a4fd2ae20a08c4ad2bc3ed3e9 Author: Magnus Damm Date: Tue Dec 14 16:15:35 2010 +0900 ARM: mach-shmobile: Fix up pinmux entries in Makefile Compiling in multiple CPUs into the same kernel binary requires a Makefile update. With this patch in place it is possible to enable the pinmux code for both the SH7372 and the SH7377. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3b80ffdef001ac7ff53bdcb80ad2baadb5953f91 Author: Joe Perches Date: Mon Dec 13 13:42:21 2010 -0800 video: mx3fb: Use vsprintf extension %pR for struct resource Signed-off-by: Joe Perches Signed-off-by: Paul Mundt commit 28a4f908acb342350b9ecbfcdf0a999cb83e05aa Author: Fabio Estevam Date: Mon Dec 13 10:47:05 2010 -0200 ARM: mx5: check for error in ioremap Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit bb477de2efc560e55c4a830329273661f3664bc8 Author: Arnaud Patard (Rtp) Date: Wed Dec 1 09:37:17 2010 +0100 Fix imx cpufreq driver as module When building as module: ERROR: "cpufreq_gov_performance" [arch/arm/plat-mxc/cpufreq.ko] undefined! WARNING: modpost: Found 1 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 It's due to the driver using CPUFREQ_DEFAULT_GOVERNOR, even it should not (see commit 8122c6cea033e8034e99d3b10a4e3f377ce23994 in Linus tree), so remove it. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit cdc3f10630ecddb7870e087ff9679eef3d7b4e21 Author: Peter Horton Date: Mon Dec 6 11:37:38 2010 +0000 mx51: support FIQ on TZIC, revised Add support for FIQ on mx51 TZIC TZIC changes tested with FIQ audio on an mx51 board AVIC changes build with mx3_defconfig, not tested Signed-off-by: Peter Horton Signed-off-by: Sascha Hauer commit 8be9252f7ccde4148e4b203bf64d38ae66b111e4 Author: Fabio Estevam Date: Tue Dec 7 17:14:45 2010 -0200 ARM: imx/mx27_3ds: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit bfdde3a90b6d1c508e4f305dd385efd234fcdd66 Author: Fabio Estevam Date: Tue Dec 7 17:14:44 2010 -0200 ARM: mx3/mx31_3ds: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit f25972233fbe4b60dc4b514def4caf40aa1bb85a Author: Peter Horton Date: Fri Dec 3 17:07:28 2010 +0000 mx51: add SSI3 Add SSI3 to MX51 Signed-off-by: Peter Horton Signed-off-by: Sascha Hauer commit 2c1f4672f0711e7f23ae49cbb7541088126fe576 Author: Fabio Estevam Date: Tue Dec 7 14:16:04 2010 -0200 watchdog: imx: use clk_get to acquire the watchdog clock Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 3fb82d56ad003e804923185316236f26b30dfdd5 Author: Suresh Siddha Date: Tue Nov 23 16:11:40 2010 -0800 x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume During suspend, we disable all the non boot cpus. And during resume we bring them all back again. So no need to do alternatives_smp_switch() in between. On my core 2 based laptop, this speeds up the suspend path by 15msec and the resume path by 5 msec (suspend/resume speed up differences can be attributed to the different P-states that the cpu is in during suspend/resume). Signed-off-by: Suresh Siddha LKML-Reference: <1290557500.4946.8.camel@sbsiddha-MOBL3.sc.intel.com> Cc: Rafael J. Wysocki Signed-off-by: H. Peter Anvin commit 65af8dea26aa89ae4a810bdaa05545a8e670b636 Author: Wey-Yi Guy Date: Wed Dec 8 07:51:50 2010 -0800 iwlagn: code clean up to remove duplicate code Multiple devices use almost the same .cfg with minor differences. Use macro and remove the duplication. By doing this, reduce the chance for mistake while modify .cfg parameters Signed-off-by: Wey-Yi Guy commit f21dd005df95e0fc6a578342c61b5333ce2abc2b Author: Wey-Yi Guy Date: Wed Dec 8 15:34:52 2010 -0800 iwlwifi: keep track of bt coex enable/disable stage For debugging purpose, keep track of the bt coex enable/disable state. Signed-off-by: Wey-Yi Guy commit 50619ac9ba48f5ab0c6bcfa10f5d50e4115cdca8 Author: Wey-Yi Guy Date: Tue Dec 7 08:06:31 2010 -0800 iwlwifi: do not reload fw if WiMAX own the RF For WiFi/WiMAX combo devices, if WiMAX own the RF, WiFi driver try to access RF and fail. This is the W/A to To avoid WiFi keep reloading firmware and try to access RF again. Signed-off-by: Wey-Yi Guy commit 33c68770a8605d84aea35c2cd90009edfc4b161a Author: Wey-Yi Guy Date: Fri Dec 3 10:33:36 2010 -0800 iwlagn: More detail tx power logging For enhanced tx power table in EEPROM, add more detail logging to help debugging Signed-off-by: Wey-Yi Guy commit d058ff8b9255b2a15bcb040cc9901baca66dc9c4 Author: Wey-Yi Guy Date: Fri Dec 3 10:33:35 2010 -0800 iwlwifi: use IWL_DEBUG_EEPROM for EEPROM related info For logging EEPROM related info, instead of using IWL_DEBUG_INFO, use the dedicated logging (IWL_DEBUG_EEPROM) for easier debugging Signed-off-by: Wey-Yi Guy commit fb4c32bba1e0941db5972e2b612cbfdf10522a43 Author: Wey-Yi Guy Date: Fri Dec 3 10:33:34 2010 -0800 iwlwifi: add new EEPROM debug log type Adding new debug type to log EEPROM related data Signed-off-by: Wey-Yi Guy commit c6fc108776e77e38e099d5b13c4f57a2172c6698 Author: Johannes Berg Date: Thu Dec 9 12:56:42 2010 -0800 iwlagn: remove old EEPROM TX power reading This removes the old TX power reading code, it isn't necessary since the new code is able to read all the various EEPROM layouts due to relying on information contained in the EEPROM. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 8d6748ca73a0caffed4304a47a9cb4cd0aba361e Author: Johannes Berg Date: Thu Dec 9 09:30:14 2010 -0800 iwlagn: implement layout-agnostic EEPROM reading The current EEPROM reading code has some layout assumptions that now turned out to be false with some newer versions of the EEPROM. Luckily, we can avoid all such assumptions by using data in the EEPROM itself, so implement using that. However, for risk mitigation purposes, keep the old reading code for current hardware for now. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit e7362a0069f8448bb346d65f07d98b319f243e30 Author: Johannes Berg Date: Tue Nov 30 11:03:44 2010 -0800 iwlagn: rename enhanced txpower fields Some fields we didn't previously use from the enhanced TX power structure will be needed in the next patch, so rename them to their correct names to be able to use them and change code reading them accordingly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 17423ea8776362100b0a9a162cdd4b16b886a4a2 Author: Wey-Yi Guy Date: Mon Dec 6 11:51:39 2010 -0800 iwlagn: rx antenna diversity For the new 1x1 devices, hw and uCode will support rx antenna diversity, but we need to indicate 1x1 device to AccessPoint to make sure it won't use MIMO. Signed-off-by: Wey-Yi Guy commit 9decde95be8a77a16f5668544bee45d41a7ae665 Author: Johannes Berg Date: Tue Nov 30 13:24:36 2010 -0800 iwlagn: fix debug variable access The compiler correctly warns: iwl-agn-tx.c: In function ‘iwlagn_tx_status_reply_compressed_ba’: iwl-agn-tx.c:1240: warning: ‘bitmap’ may be used uninitialized in this function Move the debug print to the branch that reads the bitmap, and move the variables too so it's more obvious where they are needed. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit ae0b693c12cc78913085733d28e0e0e6020db6f4 Author: Shanyu Zhao Date: Thu Dec 2 11:02:28 2010 -0800 iwlagn: check ready in iwlagn_bss_info_changed() In function iwlagn_bss_info_changed(), we need to check if the driver is ready before doing real work. Also, the previously put WARN() is removed because the vif is not guaranteed to be valid. uCode restart routine will clear the vif. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit a1da077bc36368eb7d6312e7e49260f0a3d92c77 Author: Shanyu Zhao Date: Thu Dec 2 11:02:54 2010 -0800 iwlwifi: clear dbg_fixed_rate during init This prevent bad fixed_rate keeps crashing uCode in an endless loop. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit 4fb33244d17b973f17cbc7cf8b7efd0875950474 Author: Wey-Yi Guy Date: Mon Nov 29 10:45:16 2010 -0800 iwlagn: change led compensation for 6005 and 6030 devices For both 6005 and 6030 devices, change the led compensation to 57 Signed-off-by: Wey-Yi Guy commit 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be Author: David S. Miller Date: Mon Dec 13 12:52:14 2010 -0800 net: Abstract default ADVMSS behind an accessor. Make all RTAX_ADVMSS metric accesses go through a new helper function, dst_metric_advmss(). Leave the actual default metric as "zero" in the real metric slot, and compute the actual default value dynamically via a new dst_ops AF specific callback. For stacked IPSEC routes, we use the advmss of the path which preserves existing behavior. Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates advmss on pmtu updates. This inconsistency in advmss handling results in more raw metric accesses than I wish we ended up with. Signed-off-by: David S. Miller commit cc6f02dd490dac4ad821d5077b934c9b37037cd0 Author: Eric Dumazet Date: Mon Dec 13 12:50:49 2010 -0800 net: change ip_default_ttl documentation Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cfb7e5f187e787bb1430decea339fdea6a669f92 Author: Tomoya Date: Sun Dec 12 20:24:26 2010 +0000 pch_can: Replace netif_rx to netif_receive_skb Since this driver is implemented as NAPI, netif_receive_skb must be used not netif_rx. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 0c78ab76a05cd788af0383354ffe819e0617f6a0 Author: Tomoya Date: Sun Dec 12 20:24:25 2010 +0000 pch_can: Add setting TEC/REC statistics processing Add setting TEC/REC statistics processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit fea9294c5f2902c45613681ad995ca27899d2016 Author: Tomoya Date: Sun Dec 12 20:24:24 2010 +0000 pch_can: Optimize "if" condition in rx/tx processing For reduce "if" condition, easy to read/understand the code, optimize "if" condition in rx/tx processing. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 3332bc5446e034566e8a56bf7a7cd479ca35bd6d Author: Tomoya Date: Sun Dec 12 20:24:23 2010 +0000 pch_can: Fix incorrect return processing Fix incorrect return processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit a6f6d6b51b110e661ae5f862d60c27da4970bec6 Author: Tomoya Date: Sun Dec 12 20:24:22 2010 +0000 pch_can: Move MSI processing to probe/remove processing Currently, in case this driver is integrated as module, and when this module is re-installed, no interrupts is to be occurred. For the above issue, move MSI processing to open/release processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit c755145649fa73bd197ac1a73d141047c61b543a Author: Tomoya Date: Sun Dec 12 20:24:21 2010 +0000 pch_can: Comment optimization Comment optimization Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit d06848be64e13d5d1d73e581fb185e815893d8b7 Author: Tomoya Date: Sun Dec 12 20:24:20 2010 +0000 pch_can: Fix miss-setting status issue Modify miss-setting status issue at suspend. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 0e0805c4063d0611e282bb7fdebe2e223bfe7220 Author: Tomoya Date: Sun Dec 12 20:24:19 2010 +0000 pch_can: Fix bit timing calculation issue Modify like use calculated value directly passed by CAN core module. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 8714fcaca63203fe10331fe530ff48d3dd31de4e Author: Tomoya Date: Sun Dec 12 20:24:18 2010 +0000 pch_can: Delete unnecessary/redundant code Delete unnecessary/redundant code Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 9388b166a323f8f7e35eb7a0d17b297ca695fa91 Author: Tomoya Date: Sun Dec 12 20:24:17 2010 +0000 pch_can: Fix coding rule violation Fix coding rule violation. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 435b4efe93d4cec3aa0b36e8707df8d292d3641b Author: Tomoya Date: Sun Dec 12 20:24:16 2010 +0000 pch_can: Replace netdev_dbg instead of dev_dbg partly For easy to readable, use netdev_dbg instead of dev_dbg partly Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit e91530ea959295a31911488c62088d5c372032ea Author: Tomoya Date: Sun Dec 12 20:24:15 2010 +0000 pch_can: Change Copyright and module description Currently, Copyright and module description are not formal. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 44c9aa890a2587f48920485b7487bc6d516dbbdf Author: Tomoya Date: Sun Dec 12 20:24:14 2010 +0000 pch_can: Reduce register access For improve tx/rx speed, reduce register access. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit ca2b004e89484e89b1815157fae2d7f933c5af9e Author: Tomoya Date: Sun Dec 12 20:24:13 2010 +0000 pch_can: Change functions type Currently, these two functions spec(returned value) is unnatural. Thus, change the return value's spec Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit bd58cbc322e97550af5e12584324b7117180435d Author: Tomoya Date: Sun Dec 12 20:24:12 2010 +0000 pch_can: Rename function/macro name For easy to read/understand, Rename function/macro name. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 7f2bc50efeaeb1dff62ef7e128ae36499fbcf35d Author: Tomoya Date: Sun Dec 12 20:24:11 2010 +0000 pch_can: Fix warnings Currently, in case CONFIG_PM is disabled, compiler outputs warnings. Move six functions which are used only CONFIG_PM is enabled, into "#ifdef CONFIG_PM" area. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 1d5b4b2778e8e40f42ae5d9556777583f3556d81 Author: Tomoya Date: Sun Dec 12 20:24:10 2010 +0000 pch_can: Improve rx processing Replace complex "goto" to "do~while". For easy to read/understand, it divides a rx function into some functions. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 8ac9702b9d5d81b819fc7d6b4f6abad22af01f3c Author: Tomoya Date: Sun Dec 12 20:24:09 2010 +0000 pch_can: Fix endianness issue there is endianness issue both Tx and Rx. Currently, data is set like below. Register: MSB--LSB x x D0 D1 x x D2 D3 x x D4 D5 x x D6 D7 But Data to be sent must be set like below. Register: MSB--LSB x x D1 D0 x x D3 D2 x x D5 D4 x x D7 D6 (x means reserved area.) Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit e489ccebf14657774fd877dc841b458703730586 Author: Tomoya Date: Sun Dec 12 20:24:08 2010 +0000 pch_can: Divide poll function To easy to read/understand, divide poll function into two sub-functions. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 76d94b232940ca91e9b26c590cb7312ab88ff722 Author: Tomoya Date: Sun Dec 12 20:24:07 2010 +0000 pch_can: Add flow control processing Currently, there is no flow control processing. Thus, Add flow control processing as when there is no empty of tx buffer, netif_stop_queue is called. When there is empty buffer, netif_wake_queue is called. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 412b31334b831a8c2909afaca017c5a236ac2dd0 Author: Wolfgang Kufner Date: Mon Dec 13 12:39:39 2010 +0100 rt2x00: Fix firmware loading regression on x86_64. Commit 6175ddf06b6172046a329e3abfd9c901a43efd2e changes the way memcpy_toio() works for x86_64, causing firmware loading to fail for some Ralink WLAN devices with the rt2800pci driver since linux 2.6.34. This causes the log message: "phy0 -> rt2800pci_load_firmware: Error - PBF system register not ready.". Fix this by using __iowrite32_copy instead of memcpy_toio(). Signed-off-by: Wolfgang Kufner Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 739fd9405416e22732e46a9226a8cac379bd57fc Author: Wolfgang Kufner Date: Mon Dec 13 12:39:12 2010 +0100 rt2x00: Pad beacon to multiple of 32 bits. Pad beacon to a multiple of 32 bits in preparation for the change from memcpy_toio() to __iowrite32_copy() in register_multiwrite(). Signed-off-by: Wolfgang Kufner Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e85b4c04646f7fa62ebf0afe11cd8dffde689da7 Author: Johannes Stezenbach Date: Mon Dec 13 12:38:49 2010 +0100 rt2x00: remove stray semicolon The stray semicolon after DEBUG_PRINTK_MSG causes things like "if (...) WARNING(...); else {}" to fail with syntax error. Signed-off-by: Johannes Stezenbach Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f615e9a38a8e6239d35891a05f2ac1159088780a Author: Ivo van Doorn Date: Mon Dec 13 12:36:38 2010 +0100 rt2x00: Fix WMM Queue naming The Queue names were incorrectly copied from the legacy drivers, as a result the queue names were inversed to what was expected. This renames the queues using this mapping: QID_AC_BK -> QID_AC_VO (priority 0) QID_AC_BE -> QID_AC_VI (priority 1) QID_AC_VI -> QID_AC_BE (priority 2) QID_AC_VO -> QID_AC_BK (priority 3) Note that this was a naming problem only, which didn't affect the assignment of frames to their respective queues. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit dba5dc1ae9764902f46d5225c9ff40e4f7b614c7 Author: Ivo van Doorn Date: Mon Dec 13 12:36:18 2010 +0100 rt2x00: Introduce extra queue entry sanity flag Add a queue entry flag ENTRY_DATA_STATUS_PENDING, which can be used to indicate a queue entry has returned from the hardware and is waiting for status processing. Using this flag we can add some extra sanity checks to prevent queue corruption. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 64e7d72384c2ecef5a892b2243623af265dd83cc Author: Ivo van Doorn Date: Mon Dec 13 12:36:00 2010 +0100 rt2x00: Cleanup RX index counting Add the rt2x00_dmastart function to rt2x00lib which marks the queue_entry as "owned by device", and increased the Q_INDEX number. This cleanups up the index handling by rt2x00lib which at until so far used hackish approaches to keep the RX queue index numbering sane. The rt2x00pci.c changes are from Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 5be65609fec2e331c7d804471be3d59089a30d98 Author: Ivo van Doorn Date: Mon Dec 13 12:35:40 2010 +0100 rt2x00: Add "flush" queue command Add a new command to the queue handlers: "flush", this moves the flush() callback from mac80211 into rt2x00queue and adds support for flushing the RX queue as well. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 0b7fde54f94979edc67bbf86b5adba702ebfefe8 Author: Ivo van Doorn Date: Mon Dec 13 12:35:17 2010 +0100 rt2x00: Protect queue control with mutex Add wrapper functions in rt2x00queue.c to start & stop queues. This control must be protected using a mutex. Queues can also be paused which will halt the flow of packets between the driver and mac80211. This doesn't require a mutex protection. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit dbba306f2ae574450a7a5133d6637fe6f5fafc72 Author: Ivo van Doorn Date: Mon Dec 13 12:34:54 2010 +0100 rt2x00: Reorganize queue callback functions As part of the queue refactoring, change the queue callback function names to have 3 different actions: start, kick & stop. We can now also remove the STATE_RADIO_RX_ON/STATE_RADIO_RX_OFF device_state flags, and replace the usage with using the start_queue/stop_queue callback functions. This streamlines the RX queue handling to the similar approach as all other queues. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 5450b7e2f0b47e52175b31399d8186a74ef3c46d Author: Ivo van Doorn Date: Mon Dec 13 12:34:22 2010 +0100 rt2x00: Introduce 3 queue commands in drivers (start, kick, stop). As part of the queue refactoring, we now introduce 3 queue commands: start, kick, stop. - Start: will enable a queue, for TX this will not mean anything, while for beacons and RX this will update the registers to enable the queue. - Kick: This will kick all pending frames to the hardware. This is needed for the TX queue to push all frames to the HW after the queue has been started - Stop: This will stop the queue in the hardware, and cancel any pending work (So this doesn't mean the queue is empty after a stop!). Move all code from the drivers into the appropriate functions, and link those calls to the old rt2x00lib callback functions (we will fix this later when we refactor the queue control inside rt2x00lib). Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 094a1d92fdb18c4455758b1c33e99d647c837ee9 Author: Johannes Stezenbach Date: Mon Dec 13 12:34:00 2010 +0100 rt2x00: trivial: add missing \n on warnings Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 89b25f60e08180d7e00e6239398b467142aaec01 Author: Helmut Schaa Date: Mon Dec 13 12:33:36 2010 +0100 rt2x00: Don't frequently reset beacon interval in AdHoc mode Commit 0204464329c17ba6d293e1899f71223599a0e582 "Check for specific changed flags when updating the erp config" changed the way in which a new beacon interval gets handled. However, due to a bug in rt2800usb and rt2800pci the beacon interval was reset during each scan, thus causing problems in AdHoc mode. Fix this by not cleaning up the beacon interval when killing the beacon queue but just prevent the device from sending out beacons. Reported-by: Wolfgang Kufner Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a061a93b6eb8db8227b251666436da1e344771a0 Author: Gertjan van Wingerde Date: Mon Dec 13 12:33:12 2010 +0100 rt2x00: Ensure TX-ed frames are returned in the original state. Recent changes to the TX-done code of rt2x00 resulted in TX-ed frames not being returned to mac80211 in the original state, and therefore with insufficient headroom for re-transmissions. Fix this by reverting the changes done and by ensuring we remove the inserted L2pad by moving the header backwards instead of the data forwards. At the same time also make sure that the rt2x00queue_remove_l2pad will not move any memory when a frame has no data at all. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Cc: Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d7bb5f845f437662296adbfeaab8fbfce1c32289 Author: Johannes Stezenbach Date: Mon Dec 13 12:32:49 2010 +0100 rt2x00: fix hang when unplugging USB device in use When an rt2x00 USB device is unplugged while in use, it reliably hangs the whole system. After some time the watchdog prints: BUG: soft lockup - CPU#0 stuck for 64s! [kworker/u:0:5] ... [] (usb_submit_urb+0x0/0x2ac) from [] (rt2x00usb_kick_rx_entry+0xb4/0xe8 [rt2x00usb]) [] (rt2x00usb_kick_rx_entry+0x0/0xe8 [rt2x00usb]) from [] (rt2x00usb_clear_entry+x28/0x2c [rt2x00usb]) [] (rt2x00usb_clear_entry+0x0/0x2c [rt2x00usb]) from [] (rt2x00lib_rxdone+0x2e0/0x2f8 [rt2x00lib]) [] (rt2x00lib_rxdone+0x0/0x2f8 [rt2x00lib]) from [] (rt2x00usb_work_rxdone+0x54/0x74 [rt2x00usb]) [] (rt2x00usb_work_rxdone+0x0/0x74 [rt2x00usb]) from [] (process_one_work+0x20c/0x35c) Clear the DEVICE_STATE_PRESENT flag when usb_submit_urb() returns -ENODEV to fix this. Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8d4ff3f3045e57f57634559c063bf70993a1d00a Author: RA-Jay Hung Date: Mon Dec 13 12:32:22 2010 +0100 rt2x00: Add RF chip definition Add RF chip definition Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 977206d79fdc9fc1b153e0b52c56e0be59586f37 Author: Helmut Schaa Date: Mon Dec 13 12:31:58 2010 +0100 rt2x00: Implement get_survey callback for rt2800 Implement the get_survey callback to allow user space to read statistics about the current channel condition. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 38c8a566fcfe080c910bb6b348d40121df2b8e88 Author: RA-Jay Hung Date: Mon Dec 13 12:31:27 2010 +0100 rt2x00: Add rt2800 EEPROM definition Add and modify NIC Configuration and LED definition of EEPROM Signed-off-by: RA-Jay Hung Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7a7793ef078e56fa395f96567630032c44ab5951 Author: Felix Fietkau Date: Mon Dec 13 08:40:56 2010 +0100 ath9k_hw: update AR9003 initvals to improve carrier leak calibration/correction Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e172e0f8c25a513d253c07b1dc1d7e3c66a811ff Author: Felix Fietkau Date: Mon Dec 13 08:40:55 2010 +0100 ath9k_hw: update AR9003 initvals for improved radar detection Reduces the likelihood of false pulse detects in the hardware Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1bf38661822049931a0ab8d2b43153b26cc919f6 Author: Felix Fietkau Date: Mon Dec 13 08:40:54 2010 +0100 ath9k_hw: fix PA predistortion training power selection The EEPROM contains scale factors for the tx power, which define the range of allowable difference between target power and training power. If the difference is too big, PA predistortion cannot be used. For 2.4 GHz there is only one scale factor, for 5 GHz there are three, depending on the specific frequency range. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1782352d4908c79d195b43e0c1b6b109e0d93d05 Author: Felix Fietkau Date: Mon Dec 13 08:40:53 2010 +0100 ath9k_hw: fix the PA predistortion rate mask The EEPROM PAPRD rate mask fields only contain mask values for actual rates in the low 25 bits. The upper bits are reserved for tx power scale values. Add the proper mask definitions and use them before writing the values to the register. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7607cbe2ad6931400c5d15ced342ab329ab8f92c Author: Felix Fietkau Date: Mon Dec 13 08:40:52 2010 +0100 ath9k: fix PA predistortion thermal measurement handling To be able to measure the thermal values correctly for PAPRD, we need to send training frames before setting up the gain table for the measurement, and then again afterwards for the actual training. For further improvement, send training frames at MCS0 instead of 54 MBit/s legacy. That way we can use the No-ACK flag for the transmission, which speeds up PAPRD training in general, as the hardware won't have to retransmit and wait for ACK timeout (was previously set to 4 * 6 transmission attempts). Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit caabf2bf228cd6b1c6197dbb25bddb4682d30c9d Author: Felix Fietkau Date: Mon Dec 13 08:40:51 2010 +0100 ath9k_hw: fix the slot time setting for long distance links Testing shows that adjusting the slot time based on the coverage class produces very high latencies and very low throughput on long distance links. Adjusting only the ACK timeout and leaving the slot time at the regular values - while technically not optimal for CSMA - works a lot better on long links (tested with 10 km distance) Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4357c6bfc83d4e8b1f18588f640be27bf4b0d0f7 Author: Felix Fietkau Date: Mon Dec 13 08:40:50 2010 +0100 ath9k_hw: initialize ah->slottime (u32) -1 is not particularly useful as a slottime default, so even though the ath9k_hw default should never get used, it's better to pick something sane here. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 452d7dd816744efb5d0c22c2b038f2ffa5c7ec14 Author: Sujith Manoharan Date: Mon Dec 13 07:39:32 2010 +0530 ath9k_htc: Add Ubiquiti wifistation ext to supported devices Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 62a957e99f6edced4a87f79cc49bfca42fe9a1a0 Author: Felix Fietkau Date: Sun Dec 12 00:51:14 2010 +0100 ath9k_hw: remove ah->txpower_indexoffset Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5f65c309be7b9eae06136a5e7df43ea08b25d3f9 Author: Felix Fietkau Date: Sun Dec 12 00:51:13 2010 +0100 ath9k_hw: remove ah->beacon_interval Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6da5a720bab3866ba23a37841f6a61d96e498a3f Author: Felix Fietkau Date: Sun Dec 12 00:51:12 2010 +0100 ath9k_hw: clean up SREV version checks There's no need to have separate callbacks for pre-AR9003 vs AR9003 SREV version checks, so just merge those into one function. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit df3c8b2b10b47429d2f3fe79d00daa38a3381aad Author: Felix Fietkau Date: Sun Dec 12 00:51:11 2010 +0100 ath9k_hw: remove antenna configuration eeprom ops and variables AR9280 based hardware with 3 antennas and slow antenna diversity has not been seen in the wild and ath9k does not support that form of antenna diversity, so remove the EEPROM ops for it. These EEPROM ops are currently only used for setting the AR_PHY_SWITCH_COM register, which is being done in the EEPROM specific file already. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 940cd2c12ebff688cfdc14f21c4b0e5b845ad47f Author: Felix Fietkau Date: Sun Dec 12 00:51:10 2010 +0100 ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs Also add a comment about a potential array overrun that needs to be reviewed. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 115277a3bc0683d04da797268ddafdc3bf67ca33 Author: Felix Fietkau Date: Sun Dec 12 00:51:09 2010 +0100 ath9k_hw: merge ath9k_hw_get_gain_boundaries_pdadcs between eeprom_def.c and eeprom_4k.c Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4ddfcd7daf57247ff718b849a152d97a80b7ae4d Author: Felix Fietkau Date: Sun Dec 12 00:51:08 2010 +0100 ath9k_hw: clean up duplicate and unnused eeprom related defines AR*_MAX_RATE_POWER => MAX_RATE_POWER AR*_EEPROM_MODAL_SPURS => AR_EEPROM_MODAL_SPURS AR*_OPFLAGS_* => AR5416_OPFLAGS_* ... Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 040b74f741b20dbf07359716d5c540356a036ade Author: Felix Fietkau Date: Sun Dec 12 00:51:07 2010 +0100 ath9k_hw: only use the PCIe disable register write sequence for AR5416 Newer chips do not need this, and maybe these register writes could have negative side effects on newer hardware. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 248a38d0ed754bf9f002e66f3d607e12ae6a673c Author: Felix Fietkau Date: Fri Dec 10 21:16:46 2010 +0100 ath9k: fix sequence number assigment for non-AMPDU QoS data frames wireless-testing commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435 ('ath9k: more tx setup cleanups') merged tx path code for HT vs non-HT frames, however it did not pass the tid pointer to ath_tx_send_normal, causing an inconsistency between AMPDU vs non-AMPDU sequence number handling. Fix this by always passing in the tid pointer for all QoS data frames. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 207aba6018a7b1757b5248ced2b280d20790c498 Author: Johannes Berg Date: Fri Dec 10 17:10:44 2010 +0100 mac80211: support IBSS RSN with SW crypto When software crypto is used, mac80211 will support IBSS RSN, it doesn't depend on the driver in that case. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9abbfb27dd96361187bb3872b2c349a76f5e09e9 Author: Sujith Manoharan Date: Fri Dec 10 11:27:06 2010 +0530 ath9k: Use power save wrappers for TSF get/set The HW has to be awake when accessing registers. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 44316cb1e97a1e7f76eb3f07e5b0ba91d72e9693 Author: Bing Zhao Date: Thu Dec 9 18:24:41 2010 -0800 ieee80211: add Parameter Set Count bitmask WMM IE QoS Info field lower 4 bits: Parameter Set Count Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 91f44b02992f632ac6c070f985cd58d5acee4199 Author: Tim Harvey Date: Thu Dec 9 13:15:45 2010 -0800 mac80211 default tx_last_beacon false (congestion) The 802.11 spec states that the STA that generated the last Beacon frame shall be the STA that response to a probe request. This is important for congestion reduction when a probe request is received - only 1 node in an adhoc BSS will transmit a response. While mac80211 drivers should provide the tx_last_beacon function to report if they transmitted the last beacon many do not. As an attempt to reduce probe response congestion default this to 0 such that a node not implementing this capability does not contribute to unnecessary congestion. In a modern medium sized office environment I see upwards of 100 probe requests per second received at a given node from various hardware/OS/drivers doing zeroconf 'active probing' as opposed to passively listening for beacons. With a modest 10-node adhoc network consisting of drivers that do not implement this tx_last_beacon feature, I have seen this result in the simultaneous xmit of probe responses accumulating to 500 probe responses per second because of collisions which brings the adhoc network to its knees as well as causes needless congestion. Signed-off-by: John W. Linville commit 42ab135fe78025910bed8ff56e00a375f2b04db1 Author: Rafał Miłecki Date: Thu Dec 9 20:56:01 2010 +0100 b43: rename TMS defines, drop useless condition from core reset As discussed we do not know band width at core reset time and it is not a good idea to reset whole just to change band. So just set unconditionally 20 MHz band width as default during core reset. As for defines PHY clock changed to band width in specs and it makes much more sens to call defines by band width which is self-explainable. Updated specs do not mention 0 value, but comparing to old ones you can notice lineral relation between PHY clock speed and band width. So it makes sense for 0x0 value to be 10 MHz band width. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d242b90adf4e1918ac86433dfbb32a1136515bdd Author: Rafał Miłecki Date: Thu Dec 9 20:56:00 2010 +0100 b43: N-PHY: use designed function and macro for writing tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ea85ffd627b5da346b348d784fafec0ce4632d4d Author: Rafał Miłecki Date: Thu Dec 9 20:55:59 2010 +0100 b43: N-PHY: one more fix for order of tables initialization I missed that part in previous reordering. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f61afc291a64d0362258f5a1ab45c828fe15ab04 Author: Rafał Miłecki Date: Thu Dec 9 20:55:58 2010 +0100 b43: N-PHY: use correct bit for controlling MAC and PHY Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f7e0104c1a4e77cc4f23d5969b0677bdc4f62c63 Author: Johannes Berg Date: Thu Dec 9 19:49:02 2010 +0100 mac80211: support separate default keys Add support for split default keys (unicast and multicast) in mac80211. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit dbd2fd656f2060abfd3a16257f8b51ec60f6d2ed Author: Johannes Berg Date: Thu Dec 9 19:58:59 2010 +0100 cfg80211/nl80211: separate unicast/multicast default TX keys Allow userspace to specify that a given key is default only for unicast and/or multicast transmissions. Only WEP keys are for both, WPA/RSN keys set here are GTKs for multicast only. For more future flexibility, allow to specify all combiations. Wireless extensions can only set both so use nl80211; WEP keys (connect keys) must be set as default for both (but 802.1X WEP is still possible). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 897bed8b4320774e56f282cdc1cceb4d77442797 Author: Johannes Berg Date: Thu Dec 9 19:49:00 2010 +0100 mac80211: clean up RX key checks Using the default key for "any key set" isn't quite what we should do. It works, but with the upcoming changes it makes life unnecessarily complex, so do something better here and really check for "any key". Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f33fdcf1b3a02fb92971a577d194ec6c579374af Author: Mohammed Shafi Shajakhan Date: Thu Dec 9 21:48:54 2010 +0530 ath9k: clean up hardware code for beacon handling The registers TBTT_TIMER ,DMA_BEACON_ALERT ,NEXT_SWBA are need to be configured only for AP and IBSS mode. SWBA register is used for generating software interrupts so that beacon frames will be created by the software.DMA beacon alert register is to indicate the hardware to DMA the contents of beacon buffer to PCU buffer and TBTT to start transmitting the packet buffer to the base band. Clearly these things are not needed for station/monitor mode so remove configuring them. Cc: doug dahlby Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 01123e233193a544c85b622e1690f44532052c5b Author: Sven Neumann Date: Thu Dec 9 15:05:24 2010 +0100 cfg80211: update information elements in cached BSS struct When a cached BSS struct is updated because a new beacon was received, the code replaces the cached information elements by the IEs from the new beacon. However it did not update the pub.information_elements and pub.len_information_elements fields leaving them either pointing to the old beacon IEs or in an inconsistent state where the data is replaced by the new beacon IEs but len_information_elements still has its value from the first beacon. Fix this by updating the information elements fields if they are pointing to beacon IEs. Signed-off-by: Sven Neumann Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 998d516d9546eba04dd99ae49a78acb0cf770478 Author: Rajkumar Manoharan Date: Wed Dec 8 20:01:05 2010 +0530 ath: Missed to clear key4 of micentry key4 of micentry is used, if ATH_CRYPT_CAP_MIC_COMBINED is set. But is not cleared on key cache reset. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 6b3b991dbdb66a65a2167abbd9503e519fa999f3 Author: Rajkumar Manoharan Date: Wed Dec 8 19:38:55 2010 +0530 ath9k: Add change_interface callback Add support to change interface type without bringing down the interface. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit a7ffac9591a2a0ee74c431396ae475a8d0caa51e Author: Bruno Randolf Date: Wed Dec 8 13:59:24 2010 +0900 cfg80211: Add antenna availability information Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed. Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises. The antenna configuration is now also checked against the availabe antennas and rejected if it does not match. Signed-off-by: Bruno Randolf -- v3: always apply available antenna mask (for "all" antennas case). v2: reject antenna configurations which don't match the available antennas Signed-off-by: John W. Linville commit a08e7ade9ddf4fe79576f953cc5c1725e944d26c Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:20 2010 -0800 ath9k: fix assumptions for idle calls on suspend/resume mac80211 will notify drivers when to go idle and ath9k assumed that it would get further notifications for idle states after a device stop() config call but as per agreed semantics the idle state of the radio is left up to driver after mac80211 issues the stop() callback. The driver is resposnbile for ensuring the device remains idle after that even between suspend / resume calls. This fixes suspend/resume when you issue suspend and resume twice on ath9k when ath9k_stop() was already called. We need to put the radio to full sleep in order for resume to work correctly. What might seem fishy is we are turning the radio off after resume. The reason why we do this is because we know we should not have anything enabled after a mac80211 tells us to stop(), if we resume and never get a start() we won't get another stop() by mac80211 so to be safe always bring the 802.11 device with the radio disabled after resume, this ensures that if we suspend we already have the radio disabled and only a start() will ever trigger it on. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c2731b814e2aaaa40072ee761b7373c052d86e37 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:19 2010 -0800 ath9k: Fix power save count imbalance on ath_radio_enable() Upon a failure we never call ath9k_ps_restore() on ath_radio_enable(), this will throw off the sc->ps_usecount. When the sc->ps_usecount is > 0 we never put the chip to full sleep. This drains battery, and will also make the chip fail upon resume with: ath: Starting driver with initial channel: 5745 MHz ath: timeout (100000 us) on reg 0x7000: 0xdeadbeef & 0x00000003 != 0x00000000 This would make the chip useless upon resume. I cannot prove this can happen but in theory it is so best to avoid this race completely and not have users complain about a broken device after resume. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1d212aa96e1b63459486f729af9a3fa38768b801 Merge: 8c4877a b761337 Author: John W. Linville Date: Mon Dec 13 15:20:45 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 249fab773dd5f689318c969ed649c4db077cdfc3 Author: Eric Dumazet Date: Mon Dec 13 12:16:14 2010 -0800 net: add limits to ip_default_ttl ip_default_ttl should be between 1 and 255 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit b9d41052794385f9d47ebb7acf4a772f3ad02398 Author: Namhyung Kim Date: Mon Dec 13 13:42:24 2010 -0600 dlm: sanitize work_start() in lowcomms.c The create_workqueue() returns NULL if failed rather than ERR_PTR(). Fix error checking and remove unnecessary variable 'error'. Signed-off-by: Namhyung Kim Cc: Tejun Heo Signed-off-by: David Teigland commit c4d6fd40df38eb4c187565d48807f5f902481ba8 Author: Maxim Levitsky Date: Mon Nov 29 04:09:53 2010 +0200 firewire: net: ratelimit error messages Unfortunately its easy to trigger such error messages by removing the cable while sending streams of data over the link. Such errors are normal, and therefore this patch stops firewire-net from flooding the kernel log with these errors, by combining series of same errors together. Signed-off-by: Maxim Levitsky (Stefan R:) Eventually we should remove this logging when firewire-net and related firewire-ohci facilities have been stabilized. Signed-off-by: Stefan Richter commit dd23736e092035b71df1117482b71fdfb5634239 Author: Maxim Levitsky Date: Mon Nov 29 04:09:50 2010 +0200 firewire: ohci: restart iso DMA contexts on resume from low power mode Restore iso channels DMA so that iso channels could continue to work after resume from RAM/disk. Signed-off-by: Maxim Levitsky Signed-off-by: Stefan Richter commit 8662b6b029636c35e5876e184d90daf6b0072667 Author: Maxim Levitsky Date: Mon Nov 29 04:09:49 2010 +0200 firewire: ohci: restore GUID on resume. Some lousy BIOSes, e.g. my Aspire 5720 BIOS forget to restore the GUID register on resume from RAM. Fix that by setting it to the last value that was read from it. Signed-off-by: Maxim Levitsky Signed-off-by: Stefan Richter commit ec766a7970126f99665992c0b0b10bd60a4d6208 Author: Clemens Ladisch Date: Tue Nov 30 08:25:17 2010 +0100 firewire: ohci: use common buffer for self IDs and AR descriptors The buffers used for the selfIDs packets and the AR request and response descriptors end up using three pages because dma_alloc_coherent() allocates at least one page per call. However, these data structures would all fit into 4 KB, so we can save space by using a common buffer for them. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 2dd5bed59356e03610bebe1a37c397788df50b9b Author: Clemens Ladisch Date: Tue Nov 30 08:25:05 2010 +0100 firewire: ohci: optimize iso context checks in the interrupt handler When the isochRx/isochTx bit is clear, we do not need to read the corresponding iso interrupt event register. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 5b06db166c4d38638980283505259fa165d4f369 Author: Clemens Ladisch Date: Tue Nov 30 08:24:47 2010 +0100 firewire: make PHY packet header format consistent Change the header of PHY packets to be sent to include a pseudo transaction code. This makes the header consistent with that of received PHY packets, and allows at_context_queue_packet() and log_ar_at_event() to see the packet type directly instead of having to deduce it from the header length or even from the header contents. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 8327b37b18addfc6f8cf41a2f1a4490b656377b9 Author: Clemens Ladisch Date: Tue Nov 30 08:24:32 2010 +0100 firewire: ohci: properly clear posted write errors To remove the error information from the controller's queue and to allow more posted writes, the driver has to read the failed posted write address before clearing the postedWriteErr interrupt bit. Signed-off-by: Clemens Ladisch (Stefan R:) The spec is somewhat fuzzy about the actual requirements. To err on the safe side, let's do these two read accesses. Signed-off-by: Stefan Richter commit e597e9898abe45beff4696159c7fe5c96f53e581 Author: Clemens Ladisch Date: Tue Nov 30 08:24:19 2010 +0100 firewire: ohci: flush MMIO writes in the interrupt handler Make sure that interrupt event clear bit writes are executed before the interrupt handler returns. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit c088ab30ebf184afae01d919c77cebcfdce39df3 Author: Clemens Ladisch Date: Tue Nov 30 08:24:01 2010 +0100 firewire: ohci: fix AT context initialization error handling Add proper error handling for the context_init() calls. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 7a39d8b82165462729d09066bddb395a19025acd Author: Clemens Ladisch Date: Fri Nov 26 08:57:31 2010 +0100 firewire: ohci: Asynchronous Reception rewrite Move the AR DMA descriptors out of the buffer pages, and map the buffer pages linearly into the kernel's address space. This allows the driver to ignore any page boundaries in the DMA data and thus to avoid any copying around of packet payloads. This fixes the bug where S800 packets that are so big (> 4080 bytes) that they can be split over three pages were not handled correctly. Due to the changed algorithm, we can now use arbitrarily many buffer pages, which improves performance because the controller can more easily unload its DMA FIFO. Furthermore, using streaming DMA mappings should improve perfomance on architectures where coherent DMA mappings are not cacheable. Even on other architectures, the caching behaviour should be improved slightly because the CPU no longer writes to the buffer pages. v2: Detect the last filled buffer page by searching the descriptor's residual count value fields in order (like in the old code), instead of going backwards through the transfer status fields; it looks as if some controllers do not set the latter correctly. v3: Fix an old resume bug that would now make the handler run into a BUG_ON, and replace that check with more useful error handling. Increase the buffer size for better performance with non-TI chips. Signed-off-by: Clemens Ladisch Maxim Levitsky writes: Works almost perfectly. I can still see RCODE_BUSY errors sometimes, not very often though. 64K here eliminates these errors completely. This is most likely due to nouveau drivers and lowest perf level I use to lower card temperature. That increases latencies too much I think. Besides that the IO is just perfect. Tested-by: Maxim Levitsky Signed-off-by: Stefan Richter commit 8c4877a4128e7931077b024a891a4b284d8756a3 Author: Joe Perches Date: Mon Dec 13 10:05:14 2010 -0800 ehea: Use the standard logging functions Remove ehea_error, ehea_info and ehea_debug macros. Use pr_fmt, pr_, netdev_ and netif_ as appropriate. Fix messages to use trailing "\n", some messages had an extra one as the old ehea_ macros added a trailing "\n". Coalesced long format strings. Signed-off-by: Joe Perches Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 5f29805a4f4627e766f862ff9f10c14f5f314359 Author: Don Zickus Date: Mon Dec 13 10:31:58 2010 -0500 x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled When adjusting the code to handle removing the old nmi watchdog, I forgot to consider the compile case when the local apic is not enabled. This change fixes the following build error: arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’ Signed-off-by: Don Zickus Acked-by: Randy Dunlap Cc: Randy Dunlap Cc: Stephen Rothwell Cc: Rakib Mullick LKML-Reference: <20101213153719.GD18577@redhat.com> Signed-off-by: Ingo Molnar commit fb410aef0314ef183fe6da879d29536311971a20 Author: Shawn Guo Date: Thu Dec 9 23:12:37 2010 +0800 ARM: mxs: Add helper definition and function Add helper definition and function for MXS-based. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit b0b6e42aa63fbd00a3b509e75702aca4be8618cd Author: Shawn Guo Date: Mon Dec 13 20:54:58 2010 +0800 ARM: mxs: Add core definitions Add core definitions for MXS-based SoC MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit a8760eca6cf60ed303ad494ef45901f63165d2c8 Author: Thomas Gleixner Date: Mon Dec 13 11:28:02 2010 +0100 x86: Check tsc available/disabled in the delayed init function The delayed TSC init function does not check whether the system has no TSC or TSC is disabled at the kernel command line, which results in a crash in the work queue based extended calibration due to division by zero because the basic calibration never happened. Add the missing checks and do not touch TSC when not available or disabled. Signed-off-by: Thomas Gleixner Cc: John Stultz commit 598e227ea9af687547d46bff6906151e728f7b7b Merge: 2818b19 f6d84f4 cd8ab00 Author: Paul Mundt Date: Mon Dec 13 15:36:36 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest commit c43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1 Merge: 7d0dbea 80fbf83 852af59 Author: Paul Mundt Date: Mon Dec 13 15:35:10 2010 +0900 Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest commit 852af59f6084bf1c48df16d2728216705621d598 Author: Paul Mundt Date: Mon Dec 13 15:33:16 2010 +0900 sh: mach-rsk: Add polled GPIO buttons support for RSK+7203. Now that there's an upstream polled gpio-keys driver, add the outstanding platform data for it. Signed-off-by: Paul Mundt commit 323e126f0c5995f779d7df7fd035f6e8fed8764d Author: David S. Miller Date: Sun Dec 12 21:55:08 2010 -0800 ipv4: Don't pre-seed hoplimit metric. Always go through a new ip4_dst_hoplimit() helper, just like ipv6. This allowed several simplifications: 1) The interim dst_metric_hoplimit() can go as it's no longer userd. 2) The sysctl_ip_default_ttl entry no longer needs to use ipv4_doint_and_flush, since the sysctl is not cached in routing cache metrics any longer. 3) ipv4_doint_and_flush no longer needs to be exported and therefore can be marked static. When ipv4_doint_and_flush_strategy was removed some time ago, the external declaration in ip.h was mistakenly left around so kill that off too. We have to move the sysctl_ip_default_ttl declaration into ipv4's route cache definition header net/route.h, because currently net/ip.h (where the declaration lives now) has a back dependency on net/route.h Signed-off-by: David S. Miller commit a02e4b7dae455151c423e2f69ef222c502a321fd Author: David S. Miller Date: Sun Dec 12 21:39:02 2010 -0800 ipv6: Demark default hoplimit as zero. This is for consistency with ipv4. Using "-1" makes no sense. It was made this way a long time ago merely to be consistent with how the ipv6 socket hoplimit "default" is stored. Signed-off-by: David S. Miller commit 5170ae824ddf1988a63fb12cbedcff817634c444 Author: David S. Miller Date: Sun Dec 12 21:35:57 2010 -0800 net: Abstract RTAX_HOPLIMIT metric accesses behind helper. Signed-off-by: David S. Miller commit abbf46ae0e4954584eac599bec73502c1c805e9e Author: David S. Miller Date: Sun Dec 12 21:14:46 2010 -0800 ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls. Signed-off-by: David S. Miller commit cd8ab0041d131e8e210c4b5ded7257da50473dcb Author: Tony SIM Date: Thu Dec 9 01:55:55 2010 +0000 ARM: mach-shmobile: mackerel: Add keypad tca6408a support This patch maps key0/key1/key2/key3 as HOME/MENU/BACK/POWER buttons on mackerel board. Signed-off-by: Tony SIM Signed-off-by: Paul Mundt commit bce5feeab418fb1df9ce1c3fcc14f0aacf740208 Author: David S. Miller Date: Sun Dec 12 14:57:53 2010 -0800 sparc: Eliminate prom_stdin. Completely unused. Based upon a patch by Julian Calaby. Signed-off-by: David S. Miller commit 154337688bfa970453836e65a27de011aba55331 Author: Julian Calaby Date: Fri Dec 3 17:56:45 2010 +0000 sparc: prom: Sanitize return value from prom_nbputchar() Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit 7496351ad87e61e96b49dd7b43c6534e3401f566 Author: Christoph Lameter Date: Tue Nov 30 14:05:53 2010 -0600 timers: Use this_cpu_read Eric asked for this. [tglx: Because it generates faster code according to Erics ] Signed-off-by: Christoph Lameter Cc: Pekka Enberg Cc: Eric Dumazet Cc: Mathieu Desnoyers Cc: Tejun Heo Cc: linux-mm@kvack.org LKML-Reference: Signed-off-by: Thomas Gleixner commit 1635953305694ece16d99078ca6d32f3d4e7eb36 Author: Tejun Heo Date: Sun Dec 12 16:45:15 2010 +0100 hostap: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. Drop flush_scheduled_work() from prism2_free_local_data() and replace it with explicit flushing of work items on the respective free functions. Work items in ap_data are flushed from hostap_free_data() and the ones in local_info from prism2_free_local_data(). Flush is used instead of cancel as some process and free items from queue. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Jes Sorensen Cc: netdev@vger.kernel.org commit 781ba4567698be9db7ca94d827c4b38d8583c168 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 i2400m: drop i2400m_schedule_work() i2400m implements dynamic work allocation and queueing mechanism in i2400_schedule_work(); however, this is only used for reset and recovery which can be served equally well with preallocated per device works. Replace i2400m_schedule_work() with two work structs in struct i2400m. These works are explicitly canceled when the device is released making calls to flush_scheduled_work(), which is being deprecated, unnecessary. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Inaky Perez-Gonzalez Cc: linux-wimax@intel.com Cc: netdev@vger.kernel.org commit fe8998c5e3b173f3d5c450bbde6173e7fbe5158d Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 sungem: update gp->reset_task flushing gp->reset_task_pending is always set right before reset_task is scheduled and as there is no synchronization between the setting and scheduling, busy looping on reset_task_pending before flushing reset_task doesn't really buy anything. Directly flush gp->reset_task on suspend and cancel on detach. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: netdev@vger.kernel.org commit 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 igb[v],ixgbe: don't use flush_scheduled_work() All three drivers use flush_scheduled_work() similarly during driver detach. Replace it with explicit cancels. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: e1000-devel@lists.sourceforge.net Cc: netdev@vger.kernel.org commit 9beb4896cec71e40738a7752072174fbf0d5b7b4 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 iseries_veth: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. Remove its usage from iseries_veth. * Cancelling a delayed work, queueing it for immediate execution if cancelled and then waiting for completion can be done by simply calling flush_delayed_work_sync(). * Explicitly cancel cnx->statemachine_wq on module unload. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Santiago Leon Cc: netdev@vger.kernel.org commit f5c35cc191afd08d660e6db0fecc9f431dc8f273 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 ehea: don't use flush_scheduled_work() Directly cancel port->reset_task from ehea_shutdown_single_port() instead. As this cancels the work for each port on driver detach, flushing system_wq from ehea_remove() or ehea_module_exit() is no longer necessary. Signed-off-by: Tejun Heo Cc: Breno Leitao Cc: netdev@vger.kernel.org commit 3d6b892bcc4c810071e36d8aff25aa171f55f93d Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 ehea: kill unused ehea_rereg_mr_task ehea_rereg_mr_task is not used. Remove it and drop @work parameter from ehea_rereg_mrs(). Signed-off-by: Tejun Heo Cc: Breno Leitao Cc: netdev@vger.kernel.org commit 23f333a2bfafba80339315b724808982a9de57d9 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 drivers/net: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. This patch contains simple conversions to replace flush_scheduled_work() usage with direct cancels and flushes. Directly cancel the used works on driver detach and flush them in other cases. The conversions are mostly straight forward and the only dangers are, * Forgetting to cancel/flush one or more used works. * Cancelling when a work should be flushed (ie. the work must be executed once scheduled whether the driver is detaching or not). I've gone over the changes multiple times but it would be much appreciated if you can review with the above points in mind. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Jay Cliburn Cc: Michael Chan Cc: Divy Le Ray Cc: e1000-devel@lists.sourceforge.net Cc: Vasanthy Kolluri Cc: Samuel Ortiz Cc: Lennert Buytenhek Cc: Andrew Gallatin Cc: Francois Romieu Cc: Ramkrishna Vepa Cc: Matt Carlson Cc: David Brownell Cc: Shreyas Bhatewara Cc: netdev@vger.kernel.org commit 6e07ebd84eef00be9e169a6d15a0bc20b06578fa Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 drivers/net: remove unnecessary flush_scheduled_work() calls janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there is no reason to flush the system_wq. Drop flush_scheduled_work() calls and references to workqueue. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Wolfgang Grandegger Cc: Stephen Hemminger Cc: Ramkrishna Vepa Cc: Sivakumar Subramani Cc: Sreenivasa Honnur Cc: Jon Mason Cc: netdev@vger.kernel.org commit 5878730be4e3d0c9527d6f2f688874e38acacc98 Author: Joe Perches Date: Sat Oct 30 14:08:27 2010 -0700 firewire: core: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Stefan Richter commit 60a74a6ff86b4e90b9558956589390efdeb4e924 Author: Stefan Richter Date: Sat Oct 23 13:18:56 2010 +0200 firewire: nosy: char device is not seekable Amend .open handler accordingly and remove the .llseek handler. .llseek = NULL means no_llseek (return error) since commit 776c163b1b93. The only client that uses this interface is nosy-dump in linux/tools/firewire and it knows not to seek in this char dev. Signed-off-by: Stefan Richter commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0 Author: Manuel Lauss Date: Sat Dec 11 09:53:42 2010 +0000 net: au1000_eth: remove unused global variable. The driver global au_macs[] is unused in the entire kernel tree, so remove it. Signed-off-by: Manuel Lauss Signed-off-by: David S. Miller commit 85a564983aff948b9ea8b6e734b3e80b5755d12a Author: Jon Mason Date: Fri Dec 10 15:40:04 2010 +0000 s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 109387 389 24432 134208 20c40 drivers/net/s2io.o.old 109358 389 24432 134179 20c23 drivers/net/s2io.o.new Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit 11410b62cf9bdaed5863696c7994286a900424c7 Author: Jon Mason Date: Fri Dec 10 15:40:03 2010 +0000 s2io: Update Driver Version Update Driver Version Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83 Author: Jon Mason Date: Fri Dec 10 15:40:02 2010 +0000 s2io: make strings at tables const Put immutable data in read/only section. Signed-off-by: Stephen Hemminger Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1853e2e15dc95ff3430530941b5856581251ef70 Author: Jon Mason Date: Fri Dec 10 15:40:01 2010 +0000 s2io: rx_ring_sz bounds checking modparm rx_ring_sz can be set to be greater than the maximum allowable number of blocks. This results in an array overrun when probing the driver, and causes memory corruption. Also, the MAX_RX_DESC_1 multiply the max number of rings by max number of blocker per ring by 127, but the driver does the same calculation with 127+1. This results in the possibility of the value being set being larger than the maximum allowable value. Finally, clean-up the s2io_ethtool_gringparam code to be more intuitive. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit c4ffafa51bb0bea648a4ca119033a95057799c9d Author: Tejun Heo Date: Sat Dec 11 17:51:36 2010 +0100 HID: hid-picolcd: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush picolcd_fb_cleanup on exit instead. Signed-off-by: Tejun Heo Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit 45f74264e18449cf3c93cccaf098ee6e9524ab78 Author: Thomas Gleixner Date: Sat Dec 11 12:34:34 2010 +0100 timerqueue: Make timerqueue_getnext() static inline No point in calling a function just to dereference a pointer. Signed-off-by: Thomas Gleixner Cc: John Stultz commit e4a2b3565fc7ac2d70361a36337be57a59d783da Author: Sergei Shtylyov Date: Fri Dec 10 22:48:28 2010 +0300 usb: musb: core: kill unneeded #include's musb_core.c #include's a bunch of ARM and DaVinci specific headers, goodness knows why -- it happily compiles without them... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi commit 5a166f4f9999355720f829e94cf3bd306bae6f8b Author: Sergei Shtylyov Date: Fri Dec 10 20:23:06 2010 +0300 DA8xx: assign name to MUSB IRQ resource Commit fcf173e4511193b1efeccb0f22a8c641b464353b (usb: musb: add names for IRQs in structure resource) forgot to assign name to the DA8xx MUSB IRQ resource. Because of that MUSB driver fails to load on DA8xx machines. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi commit b007c389d3e09b823eccda1503390fa2a9adca0d Author: John Stultz Date: Fri Dec 10 22:19:53 2010 -0800 hrtimer: fix timerqueue conversion flub In converting the hrtimers to timerqueue, I missed a spot in hrtimer_run_queues where we loop running timers. We end up not pulling the new next value out and instead just use the last next value, causing boot time hangs in some cases. The proper fix is to pull timerqueue_getnext each iteration instead of using a local next value. Reported-by: Ingo Molnar Signed-off-by: John Stultz commit 9835fd7321a67feba6432e63bf2cba43f5a56bd9 Author: Carolyn Wyborny Date: Mon Nov 22 17:17:21 2010 +0000 igb: Add new function to read part number from EEPROM in string format New adapters will have part numbers stored in string format rather than simple hex format. This function will read part number formats in either hex or string. Signed-off-by: Carolyn Wyborny Signed-off-by: Jeff Kirsher commit c920aa8b87bfec3dbd926ae777430e613e5088df Author: Bruce Allan Date: Wed Dec 1 08:45:24 2010 +0000 e1000e: increment the driver version Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 61c758166701c4f156c0aba10260f5729b1a6f43 Author: Bruce Allan Date: Thu Dec 9 23:04:25 2010 +0000 e1000e: static analysis tools complain of a possible null ptr p dereference Adding this default case resolves the issue. v2- Removed "break" in default case based on feedback Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit e9262447233037e9336d5866628821156a17366f Author: Bruce Allan Date: Wed Nov 24 06:02:06 2010 +0000 e1000e: minor error message corrections Correct error messages when setting up Rx resources and when checking module parameters. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 36b973df713e1395b79896de667ad7dbb1925fa7 Author: Bruce Allan Date: Wed Nov 24 07:42:43 2010 +0000 e1000e: prevent null ptr dereference in e1000_tx_queue() tx_desc can be dereferenced as a null pointer when count is passed in as 0. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 073287c037083497ebaaf75ead469b769f218615 Author: Bruce Allan Date: Wed Nov 24 06:01:51 2010 +0000 e1000e: support new PBA format from EEPROM Provide support to e1000e for displaying the new format of the PBA found in the EEPROM. The unique PBA identifier is no longer restricted to hexadecimal numbers and must now be read and displayed as a string. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 664dc878ed6f0476b875547547a49e06f7a4e73b Author: Bruce Allan Date: Wed Nov 24 06:01:46 2010 +0000 e1000e: 82579 PHY incorrectly identified during init During init, reading the 2 PHY ID registers back-to-back in the default fast mode could return invalid data (all F's) and in slow mode could return data to the second read the data from the first read. To resolve the issue in fast mode, set to slow mode before any PHY accesses; to resolve the issue in slow mode, put in a delay for every 82579 PHY access. Since this PHY is currently only paired with the pch2lan MAC and the PHY type is not known before the first PHY access which can fail this way, check for this based on MAC-type. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit ce54afd16d874ac07378a8bb55d26f7f5b613c0e Author: Bruce Allan Date: Wed Nov 24 06:01:41 2010 +0000 e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx The LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits) were being configured incorrectly when device goes to D3 state. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit d9c76f99c2a79feb413e3e751362d59c0f5323f6 Author: Bruce Allan Date: Wed Nov 24 06:01:35 2010 +0000 e1000e: 82571 Serdes can fail to get link When link partner is sending continuous Config symbols, the 82571 Serdes FIFO can overflow resulting in Invalid bit getting set. To resolve this, if Sync and Config bits are both 1 ignore the Invalid bit and restart auto-negotiation. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit cbd006cb7d4e7b76c6febf7f51e970bced132914 Author: Bruce Allan Date: Wed Nov 24 06:01:30 2010 +0000 e1000e: 82577/8 must acquire h/w semaphore before workaround The workaround function e1000_configure_k1_pchlan() assumes the h/w semaphore is already acquired. This was originally missed when setting up the part for the ethtool loopback test. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit ed5c2b0b78e5467f7948bef92b21f3c76823f392 Author: Bruce Allan Date: Wed Nov 24 06:01:25 2010 +0000 e1000e: 82574/82583 performance improvement Increasing the transmit fifo by 4K (by decreasing the receive fifo size specified in .pba by the same amount) increases Tx performance. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43 Author: Bruce Allan Date: Wed Nov 24 06:01:20 2010 +0000 e1000e: 82571-based mezzanine card can fail ethtool link test On certain 82571-based mezzanine NICs in some blade servers, the ethtool link test can fail due to the serdes_has_link flag not set correctly. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 9633e63bb1d82c02950983d5d3317e6656b11c8e Author: Holger Eitzenberger Date: Wed Nov 17 15:43:52 2010 +0000 e1000e: fix double initialization in blink path The kernel goes BUG() at the time 'ethtool -p eth0 3' comes back, which is due to adapter->led_blink_task initialized several times. At the time it is still running this results in a corrupted task_list of the associated workqueue. The fix is to move the workqueue initialization to the probe function instead. Signed-off-by: Holger Eitzenberger Reviewed-by: Jesse Brandeburg Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 9fe93afdd07aba52a018eb52784124579a80470e Author: Don Skidmore Date: Fri Dec 3 09:33:54 2010 +0000 ixgbe: cleanup string function calls to use bound checking versions. Some minor cleanup to use string calls that use bound checks just to be extra safe. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af Author: Emil Tantilov Date: Wed Dec 1 05:47:05 2010 +0000 ixgbe: fix ntuple support commit f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef ixgbe: Update ixgbe to use new vlan accleration. removed ETH_FLAG_NTUPLE from the supported flags. This patch puts it back on to allow for setting ntuple via ethtool. CC: Jesse Gross Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit d994653db465616a7bf27703e733170c47488cdf Author: Don Skidmore Date: Thu Dec 9 06:55:19 2010 +0000 ixgbe: fix X540 to use it's own info struct This patch enables X540 hardware to use it's own set of support functions. This is useful as it has no need of SFP+ support. A couple minor bugs with the eeprom semaphore were also cleaned up. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 2b264909c660717a67da997a181a4a4f551ef9b6 Author: Don Skidmore Date: Thu Dec 9 06:55:14 2010 +0000 ixgbe: fix X540 phy id to correct value The existing PHY ID for X540 was from early production hardware and is no longer correct. This patch corrects that. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit ae54496f9e8d40c89e5668205c181dccfa9ecda1 Author: Emil Tantilov Date: Sat Dec 4 05:35:17 2010 +0000 ixgb: Don't check for vlan group on transmit Based on a patch from Jesse Gross. Enable vlan tag insertion even when vlan group is not configured. For ixgb HW both CTRL0.VME and VLE bit in the Tx descriptor need to be set in order to enable HW acceleration. Introduced separate functions for enabling/disabling of vlan tag stripping similar to ixgbe. CC: Jesse Gross Signed-off-by: Emil Tantilov Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 667445008db3f45a760c235d771be0c9671e59e5 Author: Jeff Kirsher Date: Wed Dec 1 19:59:50 2010 +0000 Intel Wired LAN drivers: Use static const Based on work by Joe Perches Using static const to decrease data and overall object size. CC: Joe Perches Signed-off-by: Jeff Kirsher Tested-by: Emil Tantilov commit 19a0b67afd174c4db261d587b5c67704dcd53c17 Author: Dean Nelson Date: Thu Nov 11 05:50:25 2010 +0000 e1000: fix return value not set on error Dean noticed that 'err' wasn't being set when the "goto err_dma" statement is executed in the following hunk from the commit. It's value will be zero as a result of a successful call to e1000_init_hw_struct(). This patch changes the error condition to be correctly propagated. CC: stable@kernel.org Signed-off-by: Dean Nelson Signed-off-by: Jesse Brandeburg Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit fa795e6b9c59a14c80a475428df7e4cb97396f47 Author: Jeff Kirsher Date: Fri Dec 10 00:09:08 2010 -0800 MAINTAINERS: Update Intel Wired LAN info Update with Intel Wired Ethernet public git trees. Signed-off-by: Jeff Kirsher commit dabee56860bc6b617c7ea481bb9b00fba41c9c48 Author: Jeff Kirsher Date: Fri Dec 10 00:01:44 2010 -0800 Documentation/networking/ixgbevf.txt: Update documentation Update Intel Wired LAN ixgbevf documentation. Signed-off-by: Jeff Kirsher commit 872857a84e18f4bf9b56b298309a977b2ce77b5b Author: Jeff Kirsher Date: Thu Dec 9 23:55:47 2010 -0800 Documentation/networking/ixgbe.txt: Update ixgbe documentation Update Intel Wired LAN ixgbe documentation. Signed-off-by: Jeff Kirsher commit f2be1429798785c6b7d4747ac1fda2c40b3f26eb Author: Jeff Kirsher Date: Thu Dec 9 23:49:34 2010 -0800 Documentation/networking/igbvf.txt: Update documentation Update Intel Wired LAN igbvf documentation. Signed-off-by: Jeff Kirsher commit 1ffd7246445038569f4c2f4b39bda1e71e68f1a2 Author: Jeff Kirsher Date: Thu Dec 9 23:47:39 2010 -0800 Documentation/networking/igb.txt: update documentation Update Intel Wired LAN igb documentation. v2- Updated the ethtool support link, removed the LRO section and anti-spoofing sections. Signed-off-by: Jeff Kirsher commit 072ed34fa97374b390a2493fa281ec8a7888b312 Author: Jeff Kirsher Date: Thu Dec 9 23:44:42 2010 -0800 Documentation/networking/e1000e.txt: Update documentation Update Intel Wired LAN e1000e documentation. Signed-off-by: Jeff Kirsher commit 96c3c0330dea8856f02fc59e25c866d6d5eebed5 Author: Jeff Kirsher Date: Thu Dec 9 23:42:00 2010 -0800 Documentation/networking/e1000.txt: Update documentation Update Intel Wired LAN e1000 documentation. Signed-off-by: Jeff Kirsher commit a5d62a149bb8f5359aff7ed7dce339752fbabfd9 Author: David S. Miller Date: Fri Dec 10 16:49:24 2010 -0800 isdn: Fix printed out copy_from_user() return value after previous change. Signed-off-by: David S. Miller commit 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca Merge: 6313e3c 595a251 Author: David S. Miller Date: Fri Dec 10 16:34:10 2010 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit f073c7ca29a4a7e14060d9d3ddf09bfbb7cd9cc0 Author: Taku Izumi Date: Thu Dec 9 15:17:13 2010 +0000 bonding: add the debugfs facility to the bonding driver This patch provides the debugfs facility to the bonding driver. The "bonding" directory is created in the debugfs root and directories of each bonding interface (like bond0, bond1...) are created in that. # mount -t debugfs none /sys/kernel/debug # ls /sys/kernel/debug/bonding bond0 bond1 Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 6c2c9d964e71770e7d6efc1a82f3621005d12185 Author: Roopa Prabhu Date: Fri Dec 10 12:02:33 2010 +0000 enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 36accaed22347f4b09cbc3c9fe2c1163a3575ea1 Author: Dan Carpenter Date: Fri Dec 10 02:40:09 2010 +0000 isdn: return -EFAULT if copy_from_user() fails We should be returning -EFAULT here. Mostly this patch is to silence a smatch warning. The upper levels of this driver turn all non-zero return values from isar_load_firmware() into 1. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 5d52040d4d1eabb56a4d51b760ab8f74eabb9001 Author: Jon Mason Date: Fri Dec 10 14:03:02 2010 +0000 vxge: update driver version Update vxge driver version to 2.5.1 Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit b55e7b153f698bb027102759388d0c09542f68bd Author: Jon Mason Date: Fri Dec 10 14:03:01 2010 +0000 vxge: independent interrupt moderation Configure the workload clock register and TIM register for independent interrupt moderation based on the individual vpath utilization instead of common link utilization. This greatly improves latency. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 9c1638871671721e8f3693a0dfbb0e2e05b08742 Author: Jon Mason Date: Fri Dec 10 14:03:00 2010 +0000 vxge: hotplug stall When hot-unplugging a vxge adapter while running, the driver's remove routine prints warning and then stalls the calling thread. This is due to vxge_remove calling vxge_device_unregister to unregister the netdev before calling flush_scheduled_work clear any pending work. Swapping the order of these two functions resolves the issue. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 2e41f6449c561e6e3f572e11d0f2240bd51104db Author: Jon Mason Date: Fri Dec 10 14:02:59 2010 +0000 vxge: transmit timeout deadlock Use a workqueue to handle the device reset during a transmit timeout, as there can be a deadlock during bringup. Also, set the netif carrier off before the watchdog reset is started to prevent the timeout from reoccurring while still processing the first. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee Author: Jon Mason Date: Fri Dec 10 14:02:58 2010 +0000 vxge: use pci_request_region() Only BAR0 is ever accessed, thus making the calls to pci_request_regions overkill. Change calls of pci_request_regions to pci_request_region to reduce the size of the mapped area. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit c92bf70dcb9d08f821e4c9f09f8fc328495ba998 Author: Jon Mason Date: Fri Dec 10 14:02:57 2010 +0000 vxge: fix crash of VF when unloading PF Calling pci_disable_sriov when unloading a SR-IOV physical function driver from a host when a guest is using a virtual function from that device can cause a host crash or VM crash. The crash is caused by the virtual config space no longer being present when PF is removed (due to the pci_disable_sriov). This can be avoided by not calling pci_disable_sriov to disable the PCI space when shutting down the PF. Each function in the X3100 operates independently and in this case will operate properly in the absence of the PF. Also, added improved logic in the detection of SR-IOV initialization. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 528f727279ae840db8a06c94f5e82cdaeb00da6f Author: Jon Mason Date: Fri Dec 10 14:02:56 2010 +0000 vxge: code cleanup and reorganization Move function locations to remove the need for internal declarations and other misc clean-ups. Signed-off-by: Jon Mason Signed-off-by: Arpit Patel Signed-off-by: David S. Miller commit deef4b522b814593407cfd56216840c2b75e9f15 Author: Herbert Xu Date: Thu Dec 9 17:38:11 2010 +0000 bridge: Use consistent NF_DROP returns in nf_pre_routing The nf_pre_routing functions in bridging have collected two distinct ways of returning NF_DROP over the years, inline and via goto. There is no reason for preferring either one. So this patch arbitrarily picks the inline variant and converts the all the gotos. Also removes a redundant comment. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c053fd96d0d3d18c721f880b8fdd0b925894d9c4 Author: Changli Gao Date: Fri Dec 10 16:02:20 2010 -0800 af_packet: use swap() instead of the open coded macro XC() Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit ed4ba4b5b96742d29225308ccccbdb1810b63064 Author: Ben Hutchings Date: Thu Dec 9 12:10:25 2010 +0000 netdev: Use default implementation of ethtool_ops::get_link where possible Various drivers are using implementations of ethtool_ops::get_link that are equivalent to the default ethtool_op_get_link(). Change them to use that instead. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit e596e6e4d578f2639416e620d367a3af34814a40 Author: Ben Hutchings Date: Thu Dec 9 12:08:35 2010 +0000 ethtool: Report link-down while interface is down While an interface is down, many implementations of ethtool_ops::get_link, including the default, ethtool_op_get_link(), will report the last link state seen while the interface was up. In general the current physical link state is not available if the interface is down. Define ETHTOOL_GLINK to reflect whether the interface *and* any physical port have a working link, and consistently return 0 when the interface is down. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 29639059a0122d95b34b5475bd9fee3910b401a3 Author: Roopa Prabhu Date: Wed Dec 8 13:54:03 2010 +0000 enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data This patch adds support in enic 802.1Qbh port profile provisioning code to use the mac address set by IFLA_VF_MAC. For now we handle this mac as a special case for a VM mac address sent to us by libvirt. The VM mac address is sent to the switch along with the rest of the port profile provisioning data. This patch also adds calls to register and deregister the mac address during port profile association/deassociation. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7 Author: Roopa Prabhu Date: Wed Dec 8 13:53:58 2010 +0000 enic: Add ndo_set_vf_mac support for enic dynamic devices This patch implements the ndo_set_vf_mac netdev operation for enic dynamic devices. It treats the mac address set by IFLA_VF_MAC as a special case to use it in the port profile provisioning data. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 319d7e847355ec7e03d3c865917b2b0e2e592fb8 Author: Roopa Prabhu Date: Wed Dec 8 13:19:58 2010 +0000 enic: Add ndo_set_rx_mode support for enic vnics Add ndo_set_rx_mode support to register unicast and multicast address filters for enic devices Signed-off-by: Roopa Prabhu Signed-off-by: Vasanthy Kolluri Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit a8d764b9832d3cc86019f71916665dd2d337d7c2 Author: Junchang Wang Date: Wed Dec 8 16:55:16 2010 +0000 pktgen: adding prefetchw() call We know for sure pktgen is going to write skb->data right after *_alloc_skb, causing unnecessary cache misses. Idea is to add a prefetchw() call to prefetch the first cache line indicated by skb->data. On systems with Adjacent Cache Line Prefetch, it's probably two cache lines are prefetched. With this patch, pktgen on Intel SR1625 server with two E5530 quad-core processors and a single ixgbe-based NIC went from 8.63Mpps to 9.03Mpps, with 4.6% improvement. Signed-off-by: Junchang Wang Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit e4f05af136016958f52455da3070ca6622439b10 Author: Ondrej Puzman Date: Sat Dec 4 21:17:38 2010 +0100 8250: fix uninitialized FIFOs I have found a bug in 8250.c driver which causes that 16550A uart FIFOs are not turned on during initialization if they are manually configured by setserial. UART is then working only as plain 16450 without FIFOs. On systems with higher interrupt latency this causes buffer overruns and loss of received data when using higher communication speeds. I'm working for a company which produces industrial computers. These devices typically contain high number (8 or more) of traditional 16550A uarts - we use TL16C554A chips, but that is not much relevant. UARTs are connected to the CPU by ISA bus (Celeron based devices) or LPC bus (Atom based devices). In the Linux the UARTs are using standard 8250.c driver and are initialized using setserial command: setserial /dev/ttyS4 uart 16550A port 0x3E0 irq 10 baud_base 115200 This executes the UART initialization through serial8250_startup() function. At the beginning of the function up->capabilities is initialized from uart_config: up->capabilities = uart_config[up->port.type].flags; Please note that neither up->port.fifosize nor up->tx_loadsz is initialized here!! Later in the same function serial8250_clear_fifos() is called and disables FIFOs. The above comment says that they will be reenabled in set_termios (they won't ...) After serial8250_startup() the serial8250_set_termios() is called. In this function the following check fails because up->port.fifosize is zero because it is not initialized correctly. if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) { if (baud < 2400) fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1; else fcr = uart_config[up->port.type].fcr; } fcr variable remains zero and in the end the FCR register is set to zero which results in disabled FIFOs even if the UART type is 16550A. This is also true for other types of UARTs with FIFOs. If the UART is autoconfigured via 'setserial /dev/ttySx autoconfig' then port.fifosize and tx_loadsz are initialized correctly in the autoconfig() function and the UART is working correctly then. I checked the source codes and I can say that this bug is present in 2.6.x series of kernels for a couple of years. Namely I can confirm its presence in 2.6.16.57, 2.6.32.24 and 2.6.36.1 (tested all of them on our hardware). I think it was not noticed before because not many people use manually configured non PNP UARTs on ISA/LPC bus these days. Also the data loss caused by buffer overruns occures only if IRQ latency is higher then time needed to receive one character on given communication speed. For example our hardware looses received characters only if the UARTs are connected throught LPC bus with SERIRQ (serial IRQ transport) and not if they are connected to ISA bus because LPC SERIRQ has higher interrupt latency then parallel ISA interupt lines. Here is the patch to correct the bug created against 2.6.36.1: Signed-off-by: Ondrej Puzman Signed-off-by: Greg Kroah-Hartman commit 53139e36cdd7bbc5efcbdc5e70fbff66e2da3c09 Author: Namhyung Kim Date: Tue Dec 7 23:27:43 2010 +0900 ip2: fix compiler warning on ip2main_pci_tbl Annotate ip2main_pci_tbl as '__used' to fix following warning: CC drivers/char/ip2/ip2main.o drivers/char/ip2/ip2main.c:3227: warning: ‘ip2main_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Cc: "Michael H. Warfield" Signed-off-by: Greg Kroah-Hartman commit fd0f5c54eeb66e3e89e3cdd34c5abf8d5fbcf61c Author: Namhyung Kim Date: Tue Dec 7 23:27:42 2010 +0900 specialix: fix compiler warning on specialix_pci_tbl Annotate specialx_pci_tbl as '__used' to fix following warning: CC drivers/char/specialix.o drivers/char/specialix.c:2358: warning: ‘specialx_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Cc: Roger Wolff Signed-off-by: Greg Kroah-Hartman commit 6835a209f6c24b3704aa58d8b558a513a5a08c52 Author: Namhyung Kim Date: Tue Dec 7 23:27:41 2010 +0900 rocket: fix compiler warning on rocket_pci_ids Annotate rocket_pci_ids as '__used' to fix following warning: CC drivers/char/rocket.o drivers/char/rocket.c:1767: warning: ‘rocket_pci_ids’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit a3ae0fc34f58e7163b7724feb3d77aa4603f0dc3 Author: Jamie Iles Date: Wed Dec 1 23:39:36 2010 +0000 8250: add a UPIO_DWAPB32 for 32 bit accesses Some platforms contain a Synopsys DesignWare APB UART that is attached to a 32-bit APB bus where sub-word accesses are not allowed. Add a new IO type (UPIO_DWAPB32) that performs 32 bit acccesses to the UART. v2: - don't test for 32 bit in the output fast path, provide a separate dwabp32_serial_out() function. Refactor dwabp_serial_out() so that we can reuse the LCR saving code. v3: - rebased on top of "8250: use container_of() instead of casting" Signed-off-by: Jamie Iles Signed-off-by: Greg Kroah-Hartman commit 49d5741be27aa90301b89bf254972b355ed9c8ee Author: Jamie Iles Date: Wed Dec 1 23:39:35 2010 +0000 8250: use container_of() instead of casting The 8250 driver structure uart_8250_port took advantage of the fact that the struct uart_port was the first member of its structure and used an explicit cast to convert to the derived class. Replace the explicit casts with container_of() for safety and clarity. Signed-off-by: Jamie Iles Signed-off-by: Greg Kroah-Hartman commit 1b41dbc1296269797efbb2b0837732b74de4731d Author: Cosmin Cojocar Date: Sun Dec 5 16:15:10 2010 +0100 serial: omap-serial: Add support for kernel debugger The kgdb invokes the poll_put_char and poll_get_char when communicating with the host. This patch also changes the initialization order because the kgdb will check at the very beginning, if there is a valid serial driver. Signed-off-by: Cosmin Cojocar Signed-off-by: Greg Kroah-Hartman commit 5ac387d983149d4658aad17242d24eef85a43fa8 Author: Randy Dunlap Date: Thu Dec 2 09:19:48 2010 -0800 serial: fix pch_uart kconfig & build The dma_request_channel/dma_release_channel interfaces are not built when DMADEVICES is not enabled, so make the driver depend on DMADEVICES. Also, the help text says that the driver enables & uses PCH_DMA, which is not enabled, so select that. ERROR: "__dma_request_channel" [drivers/serial/pch_uart.ko] undefined! ERROR: "dma_release_channel" [drivers/serial/pch_uart.ko] undefined! Signed-off-by: Randy Dunlap Cc: Tomoya MORINAGA Reported-by: Zimny Lech Signed-off-by: Greg Kroah-Hartman commit 4afb7527ac8cc7bd8f03570e12f6eed0eca03363 Author: stephen hemminger Date: Mon Dec 6 12:33:01 2010 +0000 sfc: convert references to LRO to GRO This driver now uses Generic Receive Offload, not the older LRO. Change references to LRO in names and comments. Signed-off-by: Stephen Hemminger Acked-by: Ben Hutchings Signed-off-by: David S. Miller commit 376d940ee91318cc6becefbb9454bb4454d7473f Author: Tobias Klauser Date: Thu Dec 9 04:37:48 2010 +0000 inet6: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 0e51d67ebb8e109a0990a13dafa937fb469aa3fb Author: Tobias Klauser Date: Thu Dec 9 04:50:22 2010 +0000 stmmac: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 040253c931e336360453c8d81f76d1b010b2b5e7 Author: Martin Willi Date: Wed Dec 8 04:37:51 2010 +0000 xfrm: Traffic Flow Confidentiality for IPv6 ESP Add TFC padding to all packets smaller than the boundary configured on the xfrm state. If the boundary is larger than the PMTU, limit padding to the PMTU. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit d979e20f2b9f8a50c8d5f889e0b5d78580440d1f Author: Martin Willi Date: Wed Dec 8 04:37:50 2010 +0000 xfrm: Traffic Flow Confidentiality for IPv4 ESP Add TFC padding to all packets smaller than the boundary configured on the xfrm state. If the boundary is larger than the PMTU, limit padding to the PMTU. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 35d2856b4693e8de5d616307b56cef296b839157 Author: Martin Willi Date: Wed Dec 8 04:37:49 2010 +0000 xfrm: Add Traffic Flow Confidentiality padding XFRM attribute The XFRMA_TFCPAD attribute for XFRM state installation configures Traffic Flow Confidentiality by padding ESP packets to a specified length. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 957fca95e3521e471aac4c2e4cfbc21f399bdd84 Author: Changli Gao Date: Sat Dec 4 15:01:52 2010 +0000 ifb: use the lockless variants of skb_queue rq and tq are both protected by tx queue lock, so we can simply use the lockless variants of skb_queue. skb_queue_splice_tail_init() is used instead of the open coded and slow one. Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c6350362cbb19882ba0eb3578cc1abc07e6ea204 Author: Changli Gao Date: Fri Dec 3 19:55:20 2010 +0000 ifb: remove unused macro TX_TIMEOUT Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit e1f91505025db74c261962dc16d58f79b9b0c83c Author: Changli Gao Date: Fri Dec 3 19:55:19 2010 +0000 ifb: remove the useless debug stats These debug stats are not exported, and become useless. Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 6c34d2888221ca3df81e29f598873b4fb6cf838d Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:06 2010 +0200 usb: gadget: g_ncm added This patches makes possible to use composite framework and f_ncm NCM function driver to build a standalone NCM gadget device. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 9f6ce4240a2bf456402c15c06768059e5973f28c Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:05 2010 +0200 usb: gadget: f_ncm.c added Initial submittion of NCM link function driver. The driver's logic is based on f_ecm driver and does not use most of the NCM advantages like frame grouping and alignment. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 5c1168dbc508282f7717a4472477d52d64403060 Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:04 2010 +0200 usb: gadget: u_ether: prepare for NCM NCM is a Network Control Model, subclass of USB CDC class, specification is available at http://www.usb.org/developers/devclass_docs This patch makes possible for u_ether to use multiply of wMaxPacketSize predefined size transfers without ZLP (Zero Length Packet), required by NCM spec. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit a6a5ff26975c87a97f88c6ea077c325ff20c4cf2 Author: Jan Glauber Date: Wed Dec 8 02:58:01 2010 +0000 qeth: buffer count imbalance The used buffers counter is not incremented in case of an error so the counter can become negative. Increment the used buffers counter before checking for errors. Signed-off-by: Jan Glauber Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 91d4576bfe87980b1b86305c29912d96b96ce98e Author: Frank Blaschka Date: Wed Dec 8 02:58:00 2010 +0000 qeth: l3 add vlan hdr in passthru frames OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we add the vlan hdr to a passthru frame in the device driver. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f154b79cd7db221240ab6e8e4d844d3a3f10b04c Author: Einar Lueck Date: Wed Dec 8 02:57:59 2010 +0000 qeth: support VIPA add/del in offline mode Only work through the IP adddress to do list if the card is UP or SOFTSETUP. Enables to configure VIPA add/del in offline mode. Signed-off-by: Einar Lueck Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd Author: Einar Lueck Date: Wed Dec 8 02:57:58 2010 +0000 qeth: support ipv6 query arp cache for HiperSockets Function qeth_l3_arp_query now queries for IPv6 addresses, too, if QETH_QARP_WITH_IPV6 is passed as parameter to the ioctl. HiperSockets and GuestLAN in HiperSockets mode provide corresponding entries. Signed-off-by: Einar Lueck Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit ff176a4e2972bdc7a8d65cdcb0bd0d26ab1528cf Author: Richard Röjfors Date: Tue Dec 7 17:28:33 2010 +0100 usb: pch_udc: Fix setup transfers with data out This patch fixes an issue where the driver does not handle out data in setup transactions. The per endpoint cached status register is cleared in the pch_udc_svc_control_out function. When there is out data available the function pch_udc_svc_data_out is called which tries to pick it up the status, which now is cleared to 0. When the status is 0, the function doesn't start reading the data from the FIFO. There is a second bug in all this, pch_udc_svc_data_out takes the endpoint number (0 for EP0), while pch_udc_svc_control_out passes the endpoint index (1 for EP0). Effectively pch_udc_svc_data_out picks up the wrong internal ep structure. This patch makes sure to put back the cached status and pass the endpoint number rather than index when calling pch_udc_svc_data_out. Signed-off-by: Richard Röjfors Signed-off-by: Greg Kroah-Hartman commit 49e208346616328e535b5d6ecd510ab38f210858 Author: Richard Röjfors Date: Tue Dec 7 17:28:30 2010 +0100 usb: pch_udc: Fix compile error, warnings and checkpatch warnings Building pch_udc in linux-next fails, this patch fixes the a compile error: drivers/usb/gadget/pch_udc.c: In function ‘usb_gadget_register_driver’: drivers/usb/gadget/pch_udc.c:2645: error: ‘struct usb_gadget_driver’ has no member named ‘bind’ drivers/usb/gadget/pch_udc.c:2664: error: ‘struct usb_gadget_driver’ has no member named ‘bind’ And a couple of compiler warnings and checkpatch warnings. Signed-off-by: Richard Röjfors Signed-off-by: Greg Kroah-Hartman commit 969152341e852ae7a5e1b11c33ef6244f3cb3579 Author: Mian Yousaf Kaukab Date: Tue Dec 7 15:00:09 2010 +0100 usb: add ab8500 usb transceiver driver Basic driver for ab8500 usb otg transceiver TODO: -Regulators support -Host and OTG testing -Interface with PRCMU -Charging support Signed-off-by: Mian Yousaf Kaukab Acked-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman commit 2d0cdcc5a0e4e5e467fc4be4d00cc6c531c80b64 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:05 2010 +0530 USB: gadget: Implement runtime PM for MSM bus glue driver OTG driver takes care of putting hardware in low power mode. Hence not registered for any runtime PM callbacks. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit c036019ed2b729cb9517806c2b388b4f4323a904 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:04 2010 +0530 USB: gadget: Implement runtime PM for ci13xxx gadget The actual suspend/resume work is delegated to bus glue driver, which is responsible for putting hardware in low power mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 33f82f387b9cb27bc903e1368fce88b73213910a Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:03 2010 +0530 USB: gadget: Add USB controller driver for MSM SoC MSM SoC has chipidea USB controller. So use ci13xxx_udc core. This driver depends on transceiver driver for clock control, PHY initialization, VBUS detection. Register for notify_event callback to perform MSM specific quirks after controller is reset and stopped. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit f01ef5748f4c4dcd2e49ccb7d75dc113219559d2 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:02 2010 +0530 USB: gadget: Introduce ci13xxx_udc_driver struct Introduces ci13xxx_udc_driver struct for bus glue drivers to hint ci13xxx_udc core about their special requirements. The flags include avoiding hardware register access when controller is not in peripheral mode, enabling pull-up upon VBUS, disabling streaming mode and dependency on transceiver driver. Initialize gadget_ops in udc_probe so that transceiver can notify VBUS presence even when no gadget driver is bounded. A notify_event callback is embedded in the same struct. This patch implements two events called CONTROLLER_RESET_EVENT and CONTROLLER_STOPPED_EVENT to notify the bus glue driver after resetting and stopping the controller for performing SoC specific quirks. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 61948ee4d525174cceee2135a38a482124fcc02c Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:01 2010 +0530 USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask dma_alloc_coherent() which is internally called by dma_pool_alloc() flags a warning if device's coherent DMA mask. Hence initialize gadget device's coherent DMA mask to it's parent mask. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 0a91efa2f951d790969dec96fb675ca7869eca83 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:00 2010 +0530 USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc dma_pool_alloc() require sleeping context when called with GFP_KERNEL argument. Hence release the spin lock before calling dma_pool_alloc(). usb_ep_alloc_request can also be called with non-atomic GFP flags. Hence get rid off spin lock while allocation request memory. Use GFP_ATOMIC flag for allocating request for ep0 in interrupt handler. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 409a15da9851b6e6a5e1c5787be31a987184b7cf Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:59 2010 +0530 USB: gadget: Separate out PCI bus code from ci13xxx_udc Move PCI bus code from ci13xxx_udc to a new file ci13xxx_pci. SoC's which has MIPS USB core can include the ci13xxx_udc and keep bus glue code in their respective gadget controller drivers. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 87c0104af742af2acfcbd685f2b9a40f33770dc0 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:58 2010 +0530 USB: OTG: msm: Add support for power management Implement runtime and system pm ops to put hardware into low power mode (LPM). As part of LPM, USB clocks are turned off, PHY is put into suspend state and PHY comparators are turned off if VBUS/Id notifications are not required from PHY. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 8bb6a164b906bb7ca319202f85b30e3ef096cd65 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:57 2010 +0530 USB: EHCI: msm: Add support for power management Enable runtime PM and mark no_callbacks flag. OTG device, parent of HCD takes care of putting hardware into low power mode. Adjust port power wakeup flags during system suspend and resume. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit b0848aea10da186372582f33152efdda43944f26 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:56 2010 +0530 USB: EHCI: Add MSM Host Controller driver This patch adds support for EHCI compliant HSUSB Host controller found on MSM chips. The root hub has a single port and TT is built into it. This driver depends on OTG driver for PHY initialization, clock management and powering up VBUS. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit e0c201f339fe7fc38d1b0f6f4755ff627686c7e0 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:55 2010 +0530 USB: Add MSM OTG Controller driver This driver implements PHY initialization, clock management, ULPI IO ops and simple OTG state machine to kick host/peripheral based on Id/VBUS line status. VBUS/Id lines are tied to a reference voltage on some boards. Hence provide debugfs interface to select host/peripheral mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 05570297ecbe834b1756b522412b68eaffb9ab11 Author: Alex He Date: Tue Dec 7 10:10:08 2010 +0800 USB: EHCI: ASPM quirk of ISOC on AMD SB800 When ASPM PM Feature is enabled on UMI link, devices that use ISOC stream of data transfer may be exposed to longer latency causing less than optimal per- formance of the device. The longer latencies are normal and are due to link wake time coming out of low power state which happens frequently to save power when the link is not active. The following code will make exception for certain features of ASPM to be by passed and keep the logic normal state only when the ISOC device is connected and active. This change will allow the device to run at optimal performance yet minimize the impact on overall power savings. Signed-off-by: Alex He Acked-by: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 66921edd7df109196bd1a41309c17896ea0913d7 Author: Peter Huewe Date: Thu Dec 9 23:27:35 2010 +0100 USB: serial: usb_wwan: Add missing uaccess.h / fix build failure This patch fixes a build failure[1] by adding the missing uaccess.h needed for copy_from_user and copy_to_user References: http://kisskb.ellerman.id.au/kisskb/buildresult/3607218/ Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 352a337832774a6929c16b569abe9cedc3db01cc Author: Guennadi Liakhovetski Date: Thu Dec 9 22:46:29 2010 +0100 USB: otg: fix link breakage, when the NOP USB Xceiver is a module If the NOP USB OTG transceiver driver is built as a module, the otg.h header declares external functions, but if they are referenced from the kernel proper, as, e.g., in the OMAP3 case, where the omap3evm board is calling the usb_nop_xceiv_register() function, linkage breaks. This patch fixes this problem. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 Author: Tobias Klauser Date: Thu Dec 9 15:52:39 2010 +0100 usb: gadget: f_fs: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 16325f18eaa6066c4b913a5661fc8190ce564f7c Author: Tobias Ollmann Date: Thu Dec 9 14:24:27 2010 +0100 USB: host: uhci-q: Fixed minor coding style issues Fixed coding style issues (delete trailing whitespaces, break long line) Signed-off-by: Tobias Ollmann Signed-off-by: Greg Kroah-Hartman commit 34404082bbdc5d981fa8eb2f9f5dfaae74463877 Author: Uwe Kleine-König Date: Mon Dec 6 17:38:24 2010 +0100 usb: gadget/imx-udc: fix interrupt name again Commit 06c3859 (usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0) was a bit precipitant because the name used instead didn't match the usual naming scheme for irqs on arm/imx. I renamed the irq to the right name in e083000 (ARM: imx: dynamically allocate imx_udc device) when 06c3859 didn't hit Linus' tree, so I missed to add a compat #define. This patch allows compiling imx_udc.c with and without e083000. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 8170344cb8aaa726bf1afae83288946b7cfcb556 Author: Namhyung Kim Date: Tue Dec 7 01:03:32 2010 +0900 USB: whci-hcd: fix compiler warning Annotate whci_hcd_id_table as '__used' to fix following warning: CC drivers/usb/host/whci/hcd.o drivers/usb/host/whci/hcd.c:359: warning: ‘whci_hcd_id_table’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit c07224005dd3fe746246acadc9be652a588a4d7f Author: Jiri Pirko Date: Thu Dec 9 03:40:30 2010 +0000 net/ipv6/udp.c: fix typo in flush_stack() skb1 should be passed as parameter to sk_rcvqueues_full() here. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 457de4383ec6144df7d5a82cdfb110c825305a51 Author: David S. Miller Date: Fri Dec 10 13:16:09 2010 -0800 ipv6: Fix 'release_it' logic in tcp_v6_get_peer() We accidently set it to "true" for the case where we are using a route bound peer. Signed-off-by: David S. Miller commit 4c0833bcd4d302fe783b9f8286a00ca2999d6200 Author: Tobias Klauser Date: Fri Dec 10 03:18:04 2010 +0000 bridge: Fix return values of br_multicast_add_group/br_multicast_new_group If br_multicast_new_group returns NULL, we would return 0 (no error) to the caller of br_multicast_add_group, which is not what we want. Instead br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case. Also propagate the error number returned by br_mdb_rehash properly. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 998adc3dda59f811966b3ccb21eb223680b25ec4 Author: John Stultz Date: Mon Sep 20 19:19:17 2010 -0700 hrtimers: Convert hrtimers to use timerlist infrastructure Converts the hrtimer code to use the new timerlist infrastructure Signed-off-by: John Stultz LKML Reference: <1290136329-18291-3-git-send-email-john.stultz@linaro.org> Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit 9bb99b147018945366c763b3d4d7008927dc8557 Author: John Stultz Date: Mon Dec 6 13:32:12 2010 -0800 timers: Fixup allmodconfig build issue Adds missed EXPORT_SYMBOL lines that cause the following build failures with allmodconfig: ERROR: "timerqueue_add" [drivers/rtc/rtc-core.ko] undefined! ERROR: "timerqueue_getnext" [drivers/rtc/rtc-core.ko] undefined! ERROR: "timerqueue_del" [drivers/rtc/rtc-core.ko] undefined! Reported-by: Ingo Molnar Reported-by: Thomas Gleixner Signed-off-by: John Stultz commit c04bfc6b223662c42a77727342c1df7d39e686a2 Author: Ben Hutchings Date: Fri Dec 10 01:24:16 2010 +0000 sfc: Remove ancient support for nesting of TX stop Long before this driver went into mainline, it had support for multiple TX queues per port, with lockless TX enabled. Since Linux did not know anything of this, filling up any hardware TX queue would stop the core TX queue and multiple hardware TX queues could fill up before the scheduler reacted. Thus it was necessary to keep a count of how many TX queues were stopped and to wake the core TX queue only when all had free space again. The driver also previously (ab)used the per-hardware-queue stopped flag as a counter to deal with various things that can inhibit TX, but it no longer does that. Remove the per-channel tx_stop_count, tx_stop_lock and per-hardware-queue stopped count and just use the networking core queue state directly. Signed-off-by: Ben Hutchings commit 6ecfd0c70c05531b2850649d0cec46833cd6c381 Author: Ben Hutchings Date: Fri Dec 10 01:19:53 2010 +0000 sfc: Remove unused field and comment on a previously removed field Signed-off-by: Ben Hutchings commit 1f5a24794a54588ea3a9efd521be31d826e0b9d7 Author: John Stultz Date: Thu Dec 9 12:02:18 2010 -0800 timers: Rename timerlist infrastructure to timerqueue Thomas pointed out a namespace collision between the new timerlist infrastructure I introduced and the existing timer_list.c So to avoid confusion, I've renamed the timerlist infrastructure to timerqueue. Reported-by: Thomas Gleixner Signed-off-by: John Stultz commit 79b357c2171ab3e52148503f0efa66d64a13413e Merge: b2d6fef 5de62b8 Author: Tony Lindgren Date: Fri Dec 10 11:37:47 2010 -0800 Merge branch 'devel-gpio' into omap-for-linus commit eaa7dcde1d092c792cbca4be81d2e506e84c6122 Merge: cf78f8e b7ec19a Author: David S. Miller Date: Fri Dec 10 11:22:57 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4 Merge: 1e13f86 c39d35e Author: David S. Miller Date: Fri Dec 10 10:20:43 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 1e13f863ca88014d9550876c05c939fdab1017d1 Merge: f404c2f f435d9e Author: David S. Miller Date: Fri Dec 10 09:50:47 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c commit b2d6fef51223a1913c0d3230df4252ab49990bc1 Author: Tony Lindgren Date: Fri Dec 10 09:46:25 2010 -0800 omap1: Delete old defconfigs Please use omap1_defconfig instead, or search online for a more optimized defconfig for your omap1 board. Signed-off-by: Tony Lindgren commit 6cfce27c14aad746fe6f1b0bbeefab52b8b6217f Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap1: Add omap1_defconfig The omap1_defconfig this should be eventually usable for booting all omap1 machines. Generated based on: $ grep ARCH_OMAP1=y arch/arm/configs/* | cut -d: -f1 | xargs cat | \ sort | uniq >> arch/arm/configs/omap1_defconfig Then change few things manually, like use Nokia 770 CONFIG_CMDLINE as it does not allow setting it in the bootloader. Finally ran make savedefconfig on it. Signed-off-by: Tony Lindgren commit 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap1: Add initcall checks for omap1 and booted board Otherwise multi-omap1 configurations will fail. Tested-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit df1e9d1c218ba696e376cad371b57c0109fe98c9 Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap: Split omap_read/write functions for omap1 and omap2+ Otherwise multi-omap1 support for omap1 won't work as the cpu_class_is_omap1() won't work until the SoC is detected. Note that eventually these will go away, please use ioremap + read/write instead. Signed-off-by: Tony Lindgren commit 67b738ef32df7ec429004866d2a739a3775894d2 Merge: c451278 5d190c4 Author: Tony Lindgren Date: Fri Dec 10 09:44:39 2010 -0800 Merge branch 'devel-omap-irq' into omap-for-linus commit 5d190c40100793a6dfc37bf325677c10f3c80edf Author: Tony Lindgren Date: Thu Dec 9 15:49:23 2010 -0800 omap2+: Initialize omap_irq_base for entry-macro.S from platform code This way we can use the generic omap SoC detection code instead. Signed-off-by: Tony Lindgren commit 22ca466847ad477d060baed84733c495bc6e81c8 Author: Kevin Hilman Date: Fri Nov 19 07:25:30 2010 -0800 davinci: kconfig: select at24 eeprom for selected boards Ensure that the at24 eeprom driver is selected for certain boards that need boot data (e.g. MAC address) from EEPROM. Signed-off-by: Kevin Hilman commit 3506f27731439bf6ff3bfa86f04e0104f7edad68 Author: Ben Gardiner Date: Fri Nov 19 16:43:04 2010 -0500 da850-evm, trivial: use da850_evm prefix for consistency There was a single case of 'da850evm' prefix in the board-da850-evm.c file where the reset of the prefixes were 'da850_evm'; change it to 'da850_evm' for consistency. Signed-off-by: Ben Gardiner Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit d5539ca0a5c9abd5cbf9ddcbbc1c2a507b5fd63c Author: Ben Gardiner Date: Fri Nov 19 09:17:35 2010 -0500 da850-evm: allow pca953x module build Change the mach-davinci Kconfig file so that GPIO_PCA953X is default when MACH_DAVINCI_DA850_EVM is set instead of always selecting. This allows users to compile pca953x as a module. Signed-off-by: Ben Gardiner CC: Sergei Shtylyov CC: Nori, Sekhar Reviewed-by: Kevin Hilman Signed-off-by: Kevin Hilman commit 47e7cb148a12f6f825302a85cd2b78a0948be741 Author: Ben Gardiner Date: Mon Nov 15 09:42:52 2010 -0500 davinci: da850-evm: UI expander gpio_set_value can sleep, use _cansleep When the RMII PHY on the UI board is enabled with CONFIG_DA850_UI_RMII then then following will be printed to the console when warnings are also enabled: WARNING: at drivers/gpio/gpiolib.c:1567 __gpio_set_value+0x4c/0x5c() Modules linked in: [] (unwind_backtrace+0x0/0xf8) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_null+0x1c/0x24) [] (warn_slowpath_null+0x1c/0x24) from [] (__gpio_set_value+0x4c/0x5c) [] (__gpio_set_value+0x4c/0x5c) from [] (da850_evm_ui_expander_setup+0x1e4/0x2 44) [] (da850_evm_ui_expander_setup+0x1e4/0x244) from [] (pca953x_probe+0x1f8/0x29 0) Traced the WARN_ON to the gpio_set_value(rmii_sel,0) call in da850_evm_setup_emac_rmii. Replacing the call with the _cansleep variant results in no more warning. Also replacing the gpio_set_value calls in the teardown function. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi Signed-off-by: Kevin Hilman commit 12cdd3d71954c2cd6dd556eec25dd7d346735831 Author: Nicolas Kaiser Date: Mon Nov 15 19:40:28 2010 +0100 davinci: aemif: signedness bug in davinci_aemif_setup_timing() aemif_calc_rate() can return a negative error value, so all the variables that get tested for this value need to be signed. The maximum bit width of WSETUP(WSETUP_MAX) appears to be 30 bits (0xf << 26). Using a signed instead of an unsigned integer shouldn't make a difference here. Signed-off-by: Nicolas Kaiser Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 1a07bfb5215e11227403f121097ed72187dc3241 Author: Nicolas Kaiser Date: Mon Oct 25 14:41:18 2010 +0200 davinci: psc: simplify if-statement A common do-while loop can be factored out from the end of the branches. Signed-off-by: Nicolas Kaiser Signed-off-by: Kevin Hilman commit ced98628bf6ca7705b2d06df9c71a80cd1cd49bb Author: Cyril Chemparathy Date: Wed Oct 20 17:49:57 2010 -0400 davinci: minor tnetv107x clock tree fixes This patch applies the following modifications to the tnetv107x clock tree: - reparent tnetv107x usb clocks to usbss - mark timer1 as always enabled - enable set_rate on pll divider output clocks - adjust tnetv107x tsc sysclk rate lower to fix invalid reset defaults Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit b1d05be61f5d29118c2934e684628a5034186825 Author: Cyril Chemparathy Date: Wed Oct 20 17:49:56 2010 -0400 davinci: use divide ratio limits from pll_data This patch modifies the sysclk rate setting code to use the divider mask specified in pll_data. Without this, devices with different divider ranges (e.g. tnetv107x) fail. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 6d1c57c84cc474a0fa63aadaa260b13dc5c7d68b Author: Andreas Gaeer Date: Wed Oct 6 10:38:55 2010 +0200 davinci: Implement sched_clock() Overwrite the default implementation of sched_clock that is based on jiffies by something more precise. This improves timestamps in ftrace. Implementation is copied from OMAP platform code. Signed-off-by: Andreas Gaeer Signed-off-by: Kevin Hilman commit 2ade0c1d9d93b7642212657ef76f4a1e30233711 Merge: 504499f 6313e3c Author: Jiri Kosina Date: Fri Dec 10 15:19:18 2010 +0100 Merge branch 'master' into upstream commit 504499f22c08a03e2e19dc88d31aa0ecd2ac815e Author: Joe Perches Date: Thu Dec 9 19:29:08 2010 -0800 HID: simplify an index check in hid_lookup_collection Save the struct hid_collection * in a temporary to shorten the generated code a bit and perhaps improve readability. $ size drivers/hid/hid-core.o* text data bss dec hex filename 16460 78 8 16546 40a2 drivers/hid/hid-core.o.new 16469 78 8 16555 40ab drivers/hid/hid-core.o.old Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit a3789a1783d37f2772ba5046b26416c98dfe1bfa Author: Joe Perches Date: Thu Dec 9 19:29:07 2010 -0800 HID: Hoist assigns from ifs Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit 16ee4cc82b5dbb81a5dbfedcdb268b9467fe4605 Author: Joe Perches Date: Thu Dec 9 19:29:05 2010 -0800 HID: Remove superfluous __inline__ Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit fe2580204d8bbcd18540736a283ed0b784c6a024 Author: Joe Perches Date: Thu Dec 9 19:29:04 2010 -0800 HID: Use vzalloc for vmalloc/memset(,0...) Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit 4291ee305e9bb0699504a66f0e2b7aefcf0512a5 Author: Joe Perches Date: Thu Dec 9 19:29:03 2010 -0800 HID: Add and use hid_: dev_ equivalents Neaten current uses of dev_ by adding and using hid specific hid_ macros. Convert existing uses of dev_ uses to hid_. Convert hid-pidff printk uses to hid_. Remove err_hid and use hid_err instead. Add missing newlines to logging messages where necessary. Coalesce format strings. Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt Other miscellaneous changes: Add const struct hid_device * argument to hid-core functions extract() and implement() so hid_ can be used by them. Fix bad indentation in hid-core hid_input_field function that calls extract() function above. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit 09e7200221a04ab899e15a0a3cf4b230afd1ab86 Author: Hema HK Date: Fri Dec 10 18:11:42 2010 +0530 arm: OMAP4430: musb: Configure musb to OTG mode Enabling the musb OTG mode for SDP and PANDA boards. Signed-off-by: Hema HK Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 594632efbb9a4ac323cbf8dbf37c608d418ca8c1 Author: Hema HK Date: Fri Dec 10 18:10:51 2010 +0530 usb: musb: Adding musb support for OMAP4430 OMAP4430 supports UTMI and ULPI types of transceiver interface. In UTMI mode: The PHY is embedded within OMAP4430. The transceiver functionality is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY functionality is embedded within the OMAP4430. There is no direct interactions between the MUSB controller and TWL6030 chip to communicate the session-valid, session-end and ID-GND events. It has to be done through a software by setting/resetting bits in one of the control module register of OMAP4430 which in turn toggles the appropriate signals to MUSB controller. musb driver is register for blocking notifications from the transceiver driver to get the event notifications for connect/disconnect and ID-GND. Based on these events call the transceiver init/shutdown function to configure the transceiver to toggle the VBUS valid, session end and ID_GND signals to musb and power on/off the internal PHY. For ID_GND event notifications, toggle the ID_GND signal and then wait for musb to be configured as "A" device, and then call the transceiver function to set the VBUS. In OTG mode and musb as a host, When the Micro A connector used, VBUS is turned on and session bit set. When the device is connected, enumeration goes through. When the device disconnected from the other end of the connector(ID is still grounded), link will detect the disconnect and end the session. When the device is connected back, there are no events generated in the TWL6030-usb, and link is already down. So the device is not detected. Removed the session bit disable code which will recognize the connect of the device. Limitation: In OTG host mode, if device is connected during boot, it does not get detected. If disconnect and connect it back or connect after boot only it works. Fix for this, I will submit seperate patch later. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit 221946d04aa9bd3cffd93e4876bcb2e616941df9 Author: Hema HK Date: Fri Dec 10 18:10:37 2010 +0530 usb: otg: TWL6030: Add twl6030_usb file for compilation Add the twl6030_usb transceiver file for compilation. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit e70357e35c522776d9f56f6800af4ed7a5bdbaaf Author: Hema HK Date: Fri Dec 10 18:09:52 2010 +0530 mfd: TWL6030: OMAP4: Registering the TWL6030-usb device Registering the twl6030-usb transceiver device as a child to twl6030 core. Removed the NOP transceiver init call from board file. Populated twl4030_usb_data platform data structure with the function pointers for OMAP4430 internal PHY operation to be used by twl630-usb driver. Signed-off-by: Hema HK Cc: Samuel Ortiz Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 0aa002fe602939370e9476e5ec32b562000a0425 Author: Tejun Heo Date: Thu Dec 9 11:47:21 2010 +0100 x86: apic: Cleanup and simplify setup_local_APIC() setup_local_APIC() is used to setup local APIC early during CPU initialization and already assumes that preemption is disabled on entry. However, The function unnecessarily disables and enables preemption and uses smp_processor_id() multiple times in and out of the nested preemption disabled section. This gives the wrong impression that the function might be able to handle being called with preemption enabled and/or migrated to another processor in the middle. Make it clear that the function is always called with preemption disabled, drop the confusing preemption disable block and call smp_processor_id() once at the beginning of the function. Signed-off-by: Tejun Heo Acked-by: Cyrill Gorcunov Reviewed-by: Pekka Enberg Cc: Yinghai Lu Cc: brgerst@gmail.com LKML-Reference: <4D00B3B9.7060702@kernel.org> Signed-off-by: Thomas Gleixner commit 4c42fbc99fc8656efc7d2b5e92be0d430ccefdc6 Author: Hema HK Date: Fri Dec 10 18:09:35 2010 +0530 usb: musb: TWL6030: Selecting TWL6030_USB transceiver Selecting the twl6030-usb for OMAP4430SDP and OMAP4PANDA boards and adding OMAP4 internal phy code for compilation Signed-off-by: Hema HK Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 6b296123cc1d958fe5045114f7ae0c1e19cbb29a Author: Hema HK Date: Fri Dec 10 18:08:48 2010 +0530 usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver. Added the TWL6030-usb transceiver option in the Kconfig Signed-off-by: Hema HK Cc: David Brownell Signed-off-by: Felipe Balbi commit c33fad0c37481c4ba5c8b98cb62de3f4d95a44da Author: Hema HK Date: Fri Dec 10 17:58:20 2010 +0530 usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 Adding the twl6030-usb transceiver support for OMAP4 musb driver. OMAP4 supports 2 types of transceiver interface. 1. UTMI: The PHY is embedded within OMAP4. The transceiver functionality is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY functionality is embedded within the OMAP4430. There is no direct interactions between the MUSB controller and TWL6030 chip to communicate the session-valid, session-end and ID-GND events. It has to be done through a software by setting/resetting bits in one of the control module register of OMAP4430 which in turn toggles the appropriate signals to MUSB controller. The internal transceiver has functional clocks and powerdown bits to powerdown the PHY for power saving. Since there is no option available for having 2 transceiver drivers for one USB controller, internal PHY specific APIs are passed through plaform_data function pointers to use in the twl6030-usb transceiver driver. 2. ULPI interface is provided for off-chip transceivers. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: David Brownell Signed-off-by: Felipe Balbi commit 77b1d3fa88dcb9d6e885926f972c421e4069b849 Author: Hema HK Date: Fri Dec 10 17:55:37 2010 +0530 mfd: TWL6030: USBOTG VBUS event generation on With TWL6030-usb, VBUS SESS_VLD and SESS_END events are not generated as expected. When these interrupts are enabled, charger VBUS detection interrupt does not get generated. So USBOTG has to be dependent on charger VBUS interrupts. So added one bit for USBOTG and changed the handler to call the USBOTG handler whenever there is a charger VBUS interrpt. VBUS SESS_VLD and SESS_END event generation issue is under debug with HW team. This fix might not be required once after fixing the issue. Signed-off-by: Balaji TK Signed-off-by: Hema HK Cc: Samuel Ortiz Signed-off-by: Felipe Balbi commit b7ec19af63b467e30189984fb24e6157603608e3 Author: Shan Wei Date: Fri Dec 10 12:49:23 2010 +0100 dccp: remove unused macros Remove macros which have been unused since the initial implementation (commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial implementation from Tue Aug 9 20:14:34 2005 -0700). Signed-off-by: Shan Wei Acked-by: Gerrit Renker commit 4bc36fd31b07054bdf7378cca7162c10598f3eff Author: Mian Yousaf Kaukab Date: Thu Dec 9 13:05:01 2010 +0100 usb: musb: add support for ux500 platform Initial support for u8500 and u5500 platform. Signed-off-by: Mian Yousaf Kaukab Acked-by: Linus Walleij Signed-off-by: Felipe Balbi commit a9c037832e9624e240c5019d0e01e9352e8f638d Author: Ajay Kumar Gupta Date: Tue Dec 7 18:57:45 2010 +0530 musb: am35x: fix compile error due to control apis commit 4814ced5116e3b73dc4f63eec84999739fc8ed11 (OMAP: control: move plat-omap/control.h to mach-omap2/control.h) moved to another location, preventing drivers from accessing it, so we need to pass function pointers from arch code to be able to talk to internal PHY on AM35x. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi commit 46960847ef3e3a5d395121635fffa5dfa279fe90 Author: Felipe Balbi Date: Tue Dec 7 09:57:59 2010 +0200 arm: omap4: enable usb on 4430sdp Let musb work on 4430sdp as well. We can now test any problems with multi-omap builds. Signed-off-by: Felipe Balbi commit 92b48df24eec49ed1eb0ec9c5f6165d8282153ea Author: Felipe Balbi Date: Thu Dec 2 14:30:06 2010 +0200 usb: musb: drop board_set_vbus that's not used anymore. So let's drop it. Signed-off-by: Felipe Balbi commit 784173723e2fd23332af948a90612950964cd140 Author: Felipe Balbi Date: Thu Dec 2 13:17:53 2010 +0200 usb: musb: drop musb_platform_suspend/resume all glue layers are now fully moved to the new setup. We are now using dev_pm_ops to implement suspend/resume functionality and thus, musb_platform_suspend/resume has become deprecated and useless. This patch drops those function pointers and its uses. Signed-off-by: Felipe Balbi commit fcd22e3b1f12e026dfefca20c97ff550a0e11b2b Author: Felipe Balbi Date: Thu Dec 2 13:13:09 2010 +0200 usb: musb: blackfin: usb dev_pm_ops structure instead of using musb_platform_suspend_resume, we can use dev_pm_ops and let platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit 6f783e287c074afe1e9cf3f32ded9948e184b45e Author: Felipe Balbi Date: Thu Dec 2 12:53:22 2010 +0200 usb: musb: am35x: usb dev_pm_ops structure instead of using musb_platform_suspend_resume, we can use dev_pm_ops and let platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit c20aebb92796cf54ae8171ad7f53a8fa7c61d2d8 Author: Felipe Balbi Date: Thu Dec 2 12:44:40 2010 +0200 usb: musb: omap2430: use dev_pm_ops structure instead of using musb_platform_suspend/resume, we can use dev_pm_ops and let the platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit e6326358a43a9ac23f6df69ed1f4707c0d1ac473 Author: Felipe Balbi Date: Thu Dec 2 12:35:59 2010 +0200 usb: musb: omap2430: drop the nops we don't need those nops, so drop them. Signed-off-by: Felipe Balbi commit 3c8a5fcc051c05cfdd8e3f0d37ba3c183d509cb9 Author: Felipe Balbi Date: Thu Dec 2 12:28:39 2010 +0200 usb: musb: mark musb_save/restore_context static those aren't used outside musb_core.c, so mark them as static. Signed-off-by: Felipe Balbi commit 496351413a227a6c0ea1a704d3d4c775d413fd08 Author: Felipe Balbi Date: Thu Dec 2 12:27:35 2010 +0200 usb: musb: drop musb_platform_save/restore_context ... that can be easily folded into the musb_platform_suspend/resume calls. Signed-off-by: Felipe Balbi commit fa56df915d101770a495569473b4c13b1904087b Author: Felipe Balbi Date: Thu Dec 2 10:55:29 2010 +0200 usb: musb: drop the set_clock magic now that platform glue layer handles clock completely, that function is completely useless for us. Drop it. Signed-off-by: Felipe Balbi commit 0349176120aa3024e96ae4fd7dc0e0181dc55f52 Author: Felipe Balbi Date: Thu Dec 2 09:57:08 2010 +0200 usb: musb: move clock handling to glue layer musb core doesn't need to know about platform specific details. So start moving clock handling to platform glue layer and make musb core agnostic about that. Signed-off-by: Felipe Balbi commit 3b7029670d39d22f288ece95254e9ba5ceddd6ba Author: Felipe Balbi Date: Thu Dec 2 09:51:00 2010 +0200 usb: musb: mark ->set_clock deprecated ... we will completely drop that need by moving clock handling to platform glue layer. Marking as deprecated will allow us to catch all users easily. Signed-off-by: Felipe Balbi commit f7ec94370f417fedad4db1054228ef958d48b926 Author: Felipe Balbi Date: Thu Dec 2 09:48:58 2010 +0200 usb: musb: pass platform_ops via platform_data ... then we don't need to export any symbols from glue layer to musb_core. Signed-off-by: Felipe Balbi commit a023c631f546ef95d58969385825a47652ab9039 Author: Felipe Balbi Date: Thu Dec 2 09:42:50 2010 +0200 usb: musb: blackfin: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit e6480faa1067af91ab403fd3aaf6db2fe1134b13 Author: Felipe Balbi Date: Thu Dec 2 09:40:34 2010 +0200 usb: musb: da8xx: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit e110de4d5358f2e67c333d23d608cbabe26b6220 Author: Felipe Balbi Date: Thu Dec 2 09:38:12 2010 +0200 usb: musb: davinci: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 1add75d2bd1a44553e2c40e30db5f90a500dc1ab Author: Felipe Balbi Date: Thu Dec 2 09:35:58 2010 +0200 usb: musb: tusb6010: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 0919dfc12a43d5ea21411e67984c268e84d05204 Author: Felipe Balbi Date: Thu Dec 2 09:33:24 2010 +0200 usb: musb: am35x: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit a3cee12aa9129b576c5403a31e37d0e0113235b3 Author: Felipe Balbi Date: Thu Dec 2 09:27:29 2010 +0200 usb: musb: omap2430: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 9cb0308eec7a965136fe9fc6d1be3548c01a4a1e Author: Felipe Balbi Date: Thu Dec 2 09:21:05 2010 +0200 usb: musb: split blackfin to its own platform_driver Just adding its own platform_driver, not really using it yet. Later patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 8ceae51ed5d1739d4ed5c4b947d12ff1d7df0e89 Author: Felipe Balbi Date: Thu Dec 2 09:19:35 2010 +0200 usb: musb: split da8xx to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 73b089b052a69020b953312a624a6e1eb5b81fab Author: Felipe Balbi Date: Thu Dec 2 09:16:55 2010 +0200 usb: musb: split davinci to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 18688fbeb09665725c842291bbadd88295a359e1 Author: Felipe Balbi Date: Thu Dec 2 09:13:54 2010 +0200 usb: musb: split tusb6010 to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit ce40c5767a0ea1e77ca5d0b73269cb86301a35cf Author: Felipe Balbi Date: Thu Dec 2 09:06:51 2010 +0200 usb: musb: split am35x to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit dc09886bfa781e2b442301116c18199519e36f0f Author: Felipe Balbi Date: Wed Dec 1 15:01:11 2010 +0200 usb: musb: split omap2430 to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 05ac10dd6862a3fcce33d2203fbb2ef285e3ca87 Author: Felipe Balbi Date: Thu Dec 2 08:49:26 2010 +0200 usb: musb: trivial search and replace patch change all ocurrences of musb_hdrc to musb-hdrc. We will call glue layer drivers musb-, so in order to keep things somewhat standard, let's change the underscore into a dash. Signed-off-by: Felipe Balbi commit 7c925546427a0428b84bc5ba1f28b3698e492072 Author: Felipe Balbi Date: Wed Dec 1 14:23:48 2010 +0200 usb: musb: add Kconfig options for each glue layer This will make things simpler when choosing which glue layer to compile. It avoids a lot of magic around the "default" Kconfig option and lets the user choose what exactly s/he wants to compile. Signed-off-by: Felipe Balbi commit 7421107b293cace2fc081731306d447ecd8517ab Author: Felipe Balbi Date: Wed Dec 1 13:53:27 2010 +0200 usb: musb: hold context on musb structure when we start splitting HW glue layer, it's gonna make it easier to re-use that structure. Signed-off-by: Felipe Balbi commit 1ea7f352d832d5abe43d5e9198098acb4d611ba3 Author: Felipe Balbi Date: Wed Dec 1 13:48:54 2010 +0200 arm: omap4: panda: initialize musb initialize the musb port on pandaboard. Signed-off-by: Ming Lei Signed-off-by: Felipe Balbi commit f404c2fea37e02bec7c8b6edddf5edd22ca60505 Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:37 2010 +0000 bnx2x: Update version number and a date. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 5cd737c2e84bebf532f536f7addfdd75162bba04 Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:29 2010 +0000 bnx2x: Fixed a compilation warning bnx2x_src_init_t2() is used only when BCM_CNIC is defined. So, to avoid a compilation warning, we won't define it unless BCM_CNIC is defined. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d245a1111251d77c804e9fe362e9f70aba856e1e Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:17 2010 +0000 bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2297a2da5a8507bf6596dc30ace3483c00bd85ed Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:09 2010 +0000 bnx2x: LSO code was broken on BE platforms Make the LSO code work on BE platforms: parsing_data field of a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong values for TCP header's length and offset and, as a result, the corresponding PCI device was performing bad DMA reads triggering EEH. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4bc65dd8d88671712d71592a83374cfb0b5fce7a Author: Eric Dumazet Date: Tue Dec 7 22:26:15 2010 +0000 filter: use size of fetched data in __load_pointer() __load_pointer() checks data we fetch from skb is included in head portion, but assumes we fetch one byte, instead of up to four. This wont crash because we have extra bytes (struct skb_shared_info) after head, but this can read uninitialized bytes. Fix this using size of the data (1, 2, 4 bytes) in the test. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 60d509c823cca21e77d537bd356785f7cfe8f0d1 Author: Jozsef Kadlecsik Date: Fri Dec 3 02:39:01 2010 +0000 The new jhash implementation The current jhash.h implements the lookup2() hash function by Bob Jenkins. However, lookup2() is outdated as Bob wrote a new hash function called lookup3(). The patch replaces the lookup2() implementation of the 'jhash*' functions with that of lookup3(). You can read a longer comparison of the two and other hash functions at http://burtleburtle.net/bob/hash/doobs.html. Signed-off-by: Jozsef Kadlecsik Acked-by: Rusty Russell Signed-off-by: David S. Miller commit 68835aba4d9b74e2f94106d13b6a4bddc447c4c8 Author: Eric Dumazet Date: Tue Nov 30 19:04:07 2010 +0000 net: optimize INET input path further Followup of commit b178bb3dfc30 (net: reorder struct sock fields) Optimize INET input path a bit further, by : 1) moving sk_refcnt close to sk_lock. This reduces number of dirtied cache lines by one on 64bit arches (and 64 bytes cache line size). 2) moving inet_daddr & inet_rcv_saddr at the beginning of sk (same cache line than hash / family / bound_dev_if / nulls_node) This reduces number of accessed cache lines in lookups by one, and dont increase size of inet and timewait socks. inet and tw sockets now share same place-holder for these fields. Before patch : offsetof(struct sock, sk_refcnt) = 0x10 offsetof(struct sock, sk_lock) = 0x40 offsetof(struct sock, sk_receive_queue) = 0x60 offsetof(struct inet_sock, inet_daddr) = 0x270 offsetof(struct inet_sock, inet_rcv_saddr) = 0x274 After patch : offsetof(struct sock, sk_refcnt) = 0x44 offsetof(struct sock, sk_lock) = 0x48 offsetof(struct sock, sk_receive_queue) = 0x68 offsetof(struct inet_sock, inet_daddr) = 0x0 offsetof(struct inet_sock, inet_rcv_saddr) = 0x4 compute_score() (udp or tcp) now use a single cache line per ignored item, instead of two. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 03a9e5126147c9f92aeba4b34f62b15b625087fb Author: Tony Lindgren Date: Thu Dec 9 15:49:23 2010 -0800 omap1: Use asm_irq_flags for entry-macro.S Initialize asm_irq_flags in omap_init_irq and use it in get_irqnr_and_base to detect between omap7xx and omap15xx/16xx. Note that both INT_1510_IH2_IRQ and INT_1510_IH2_IRQ are defined as 0, so use INT_1510_IH2_IRQ for both of them. Tested-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit c451278c2864e253a4bb303b596a29edc3bb527c Merge: 7b045c9 5403187 Author: Tony Lindgren Date: Thu Dec 9 15:48:03 2010 -0800 Merge branch 'devel-cleanup' into omap-for-linus commit 67b96c182c36c83cd6881122b4a7922b2634047b Merge: efc70d2 ddbc24b Author: Ingo Molnar Date: Fri Dec 10 00:31:30 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit efc70d241f5c7fc0a9f1c2a01781ed946d9dbe21 Author: Ingo Molnar Date: Fri Dec 10 00:27:23 2010 +0100 perf, sparc: Fix CONFIG_PERF_EVENTS=y build error Fix a typo in: 004417a6d468: perf, arch: Cleanup perf-pmu init vs lockup-detector Which caused a build failure on Sparc, reported by Stephen Rothwell. Reported-by: Stephen Rothwell Cc: David S. Miller Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 Author: Don Zickus Date: Mon Nov 29 17:07:17 2010 -0500 x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls Originally adapted from Huang Ying's patch which moved the unknown_nmi_panic to the traps.c file. Because the old nmi watchdog was deleted before this change happened, the unknown_nmi_panic sysctl was lost. This re-adds it. Also, the nmi_watchdog sysctl was re-implemented and its documentation updated accordingly. Patch-inspired-by: Huang Ying Signed-off-by: Don Zickus Reviewed-by: Cyrill Gorcunov Acked-by: Yinghai Lu Cc: fweisbec@gmail.com LKML-Reference: <1291068437-5331-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 96a84c20d635fb1e98ab92f9fc517c4441f5c424 Author: Don Zickus Date: Mon Nov 29 17:07:16 2010 -0500 lockup detector: Compile fixes from removing the old x86 nmi watchdog My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot. Signed-off-by: Don Zickus Reviewed-by: Cyrill Gorcunov Cc: fweisbec@gmail.com Cc: yinghai@kernel.org LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit dc6bbc991b0c408daad5df43e5851f1d369e50f7 Author: Tobias Klauser Date: Thu Dec 9 15:51:32 2010 +0100 msm_serial: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David Brown commit d1b758ebc2a82d738092cb42e742470f9d0ea53e Author: Konrad Rzeszutek Wilk Date: Thu Dec 9 14:53:29 2010 -0500 xen/irq: Cleanup the find_unbound_irq The "find_unbound_irq" is a bit unusual - it allocates virtual IRQ (event channels) in reverse order. This means starting at the "top" of the available IRQs (nr_irqs) down to the GSI/MSI IRQs (nr_irqs_gsi). Lets document this and also make the variables easier to understand. Signed-off-by: Konrad Rzeszutek Wilk commit 0e3fa13f4ee110de007bca3bf395b77997319fc8 Author: Feng Tang Date: Wed Dec 8 15:18:57 2010 +0800 x86: Further simplify mp_irq info handling assign_to_mp_irq() is copying the struct mpc_intsrc members one by one. That's silly. Use memcpy() and let the compiler figure it out. Same for the identical function assign_to_mpc_intsrc() mp_irq_mpc_intsrc_cmp() is comparing the struct members one by one, but no caller ever checks the different return codes. Use memcmp() instead. Remove the extra printk in MP_ioapic_info() Signed-off-by: Feng Tang Cc: Yinghai Lu Cc: "Alan Cox Cc: Len Brown LKML-Reference: <20101208151857.212f0018@feng-i7> Signed-off-by: Thomas Gleixner commit 2d8009ba67f9503ceadf9d5a3b5637cee291ea8d Author: Feng Tang Date: Fri Nov 19 11:33:35 2010 +0800 x86: Unify 3 similar ways of saving mp_irqs info There are 3 places defining similar functions of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. Replace the redundant code by a common function in io_apic.c as it's only called when CONFIG_X86_IO_APIC=y Signed-off-by: Feng Tang Cc: Alan Cox Cc: Len Brown Cc: Yinghai Lu LKML-Reference: <20101207133204.4d913c5a@feng-i7> Signed-off-by: Thomas Gleixner commit 60d79fd99ff3b9c692b260a4d53a203f537c052a Author: Yinghai Lu Date: Tue Dec 7 00:59:49 2010 -0800 x86, ioapic: Avoid writing io_apic id if already correct For 32bit mptable path, setup_ids_from_mpc() always writes the io_apic id register, even there is no change needed. Skip the write, when readout and mptable match. Signed-off-by: Yinghai Lu Cc: Sebastian Siewior LKML-Reference: <4CFDF785.7010401@kernel.org> Signed-off-by: Thomas Gleixner commit 0450193bffed6e4b6160c4a5ccb0df158eba7d2a Author: Yinghai Lu Date: Tue Dec 7 00:55:56 2010 -0800 x86, x2apic: Don't map lapic addr for preenabled x2apic systems If x2apic is preenabled and used by the kernel, we don't need to map the lapic address. That mapping will never be used. So just skip that in register_lapic_address() Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF69C.9070501@kernel.org> Signed-off-by: Thomas Gleixner commit 53301f36f316a6519c464b0ef2a155386c20be19 Author: Yinghai Lu Date: Tue Dec 7 00:55:47 2010 -0800 x86, sfi: Use register_lapic_address() register_lapic_address() and mp_sfi_register_lapic_address() are almost identical. Use the common function. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" Cc: Len Brown LKML-Reference: <4CFDF693.6000908@kernel.org> Signed-off-by: Thomas Gleixner commit 326a2e6bae250b1172c0ae80f3b259d79e9cb56c Author: Yinghai Lu Date: Tue Dec 7 00:55:38 2010 -0800 x86, apic: Use register_lapic_address() in init_apic_mapping() Remove the printk as well, we don't want to print when nothing changed. We print in register_lapic_address() already. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF68A.7020902@kernel.org> Signed-off-by: Thomas Gleixner commit f1157141636848f52c5f74040bed0ba355cf59b7 Author: Yinghai Lu Date: Tue Dec 7 00:55:29 2010 -0800 x86, apic: Remove early_init_lapic_mapping() It is almost the same as smp_register_lapic_addr(). We just need to let smp_read_mpc() call smp_register_lapic_addr() when early==1. Add the apic_printk to smp_register_lapic_address() Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF681.3030509@kernel.org> Signed-off-by: Thomas Gleixner commit c0104d38a740b25662c592c71f6907676510289c Author: Yinghai Lu Date: Tue Dec 7 00:55:17 2010 -0800 x86, apic: Unify identical register_lapic_address() functions They are the same, move the common function to apic.c to allow further cleanups. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" Cc: Len Brown LKML-Reference: <4CFDF675.4060305@kernel.org> Signed-off-by: Thomas Gleixner commit defb3519a64141608725e2dac5a5aa9a3c644bae Author: David S. Miller Date: Wed Dec 8 21:16:57 2010 -0800 net: Abstract away all dst_entry metrics accesses. Use helper functions to hide all direct accesses, especially writes, to dst_entry metrics values. This will allow us to: 1) More easily change how the metrics are stored. 2) Implement COW for metrics. In particular this will help us put metrics into the inetpeer cache if that is what we end up doing. We can make the _metrics member a pointer instead of an array, initially have it point at the read-only metrics in the FIB, and then on the first set grab an inetpeer entry and point the _metrics member there. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit 51ddafcbc735155a7e946b8b6ff19fcd5351375b Merge: d834a9d 991cfff Author: Thomas Gleixner Date: Thu Dec 9 18:19:13 2010 +0100 Merge branch 'x86/platform' into x86/apic-cleanups Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform Signed-off-by: Thomas Gleixner commit d834a9dcecae834cd6b2bc5e50e1907738d9cf6a Merge: a38c538 f658bcf Author: Thomas Gleixner Date: Thu Dec 9 18:17:25 2010 +0100 Merge branch 'x86/amd-nb' into x86/apic-cleanups Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform Conflicts: arch/x86/include/asm/io_apic.h Signed-off-by: Thomas Gleixner commit 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 Author: Rakib Mullick Date: Thu Dec 9 14:47:34 2010 +0600 x86: Address 'unused' warning in hw_nmi.c again arch/x86/kernel/apic/hw_nmi.c:29: warning: backtrace_mask defined but not used commit 0e2af2a9(x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG) addressed this warning, but it was reintroduced by commit 5f2b0ba4(x86, nmi_watchdog: Remove the old nmi_watchdog). Move backtrace_mask into the #ifdef arch_trigger_all_cpu_backtrace section again. Signed-off-by: Rakib Mullick Cc: Don Zickus Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Thomas Gleixner commit b7613370db5ba66ad81e41cd3a5417fde4d5e03c Author: John W. Linville Date: Thu Dec 9 09:08:47 2010 -0500 ath: fix build break with ATH_DBG_WARN_ON_ONCE Description by Hauke: "If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and returns something, but if CONFIG_ATH_DEBUG is not set it does not return anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in an if case and is not returning anything and causes a compile error. CC [M] /drivers/net/wireless/ath/ath9k/main.o /drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’: /drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression before ‘do’ make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1 make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2" Reported-by: Hauke Mehrtens Signed-off-by: John W. Linville commit ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b Author: Arnaldo Carvalho de Melo Date: Thu Dec 9 12:20:20 2010 -0200 perf session: Remove unneeded dump_printf calls Since we check at the beginning of the callers, no need to ask if dump_trace is set multiple times. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ba74f0640d963ccc914ac533cb0ba133ee07bcf2 Author: Thomas Gleixner Date: Tue Dec 7 12:49:01 2010 +0000 perf session: Split out user event processing Simplify further. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124551.110956235@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 3dfc2c0aee789843d18f6e4675658e6879465a56 Author: Thomas Gleixner Date: Tue Dec 7 12:48:58 2010 +0000 perf session: Split out sample preprocessing Simplify the code a bit. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124551.014649793@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 532e7269c01098f0be6e08113c6947ec6ed11bfa Author: Thomas Gleixner Date: Tue Dec 7 12:48:55 2010 +0000 perf session: Move dump code to event delivery path Preparatory patch for ordered perf report -D Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.918655066@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit f74725dcf2f6931c26bc65e77e34e693eeb8441c Author: Thomas Gleixner Date: Tue Dec 7 12:48:53 2010 +0000 perf session: Add file_offset to event delivery function Preparatory patch for ordered output of perf report -D Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.818568607@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit e4c2df132fef60a28b851abc1859a531e64f350c Author: Thomas Gleixner Date: Tue Dec 7 12:48:50 2010 +0000 perf session: Store file offset in sample_queue Preparatory patch for ordered output of perf report -D. Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.725128545@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10 Author: Michael S. Tsirkin Date: Mon Nov 29 19:16:37 2010 +0200 tools/virtio: virtio_test tool This is the userspace part of the tool: it includes a bunch of stubs for linux APIs, somewhat simular to linuxsched. This makes it possible to recompile the ring code in userspace. A small test example is implemented combining this with vhost_test module. Signed-off-by: Michael S. Tsirkin commit 71ccc212e5b28dfcc870b6db6589c2df264fdc6a Author: Michael S. Tsirkin Date: Mon Nov 29 19:09:01 2010 +0200 vhost test module This adds a test module for vhost infrastructure. Intentionally not tied to kbuild to prevent people from installing and loading it accidentally. Signed-off-by: Michael S. Tsirkin commit 28831ee60b79bed50958c9cb0d2e76cdc98406f9 Author: Michael S. Tsirkin Date: Mon Nov 29 10:22:10 2010 +0200 vhost: better variable name in logging We really store a page offset in write_address, so rename it write_page to avoid confusion. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit b7ee1d01c5ff3bf2e51c8565ea00823cdbc2a9f3 Author: Sedat Dilek Date: Tue Dec 7 22:35:50 2010 +0100 ath5k: Fix modinfo does not list alias -> pci-id lines The AHB bus support patchset moved the table "Known PCI ids" from base.c to pci.c - unfortunately, MODULE_DEVICE_TABLE() was not transferred. With this fix 'modinfo ath5k' lists the alias -> pci-id lines, again. The issue was introduced by: commit e5b046d86fac609f636d127a38de94a175c7e83b "ath5k: Move PCI bus functions to separate file." Signed-off-by: Sedat Dilek Signed-off-by: John W. Linville commit 6a66bbd693c12f71697c61207aa18bc5a12da0ab Author: Chase Douglas Date: Wed Dec 8 15:08:04 2010 -0800 HID: magicmouse: Don't report REL_{X,Y} for Magic Trackpad With the recent switch to having the hid layer handle standard axis initialization, the Magic Trackpad now reports relative axes. This would be fine in the normal mode, but the driver puts the device in multitouch mode where no relative events are generated. Also, userspace software depends on accurate axis information for device type detection. Thus, ignoring the relative axes from the Magic Trackpad is best. Signed-off-by: Chase Douglas Signed-off-by: Jiri Kosina commit 3bf9be40ff76b6df136f14a497167c116b2b3c53 Author: Michael S. Tsirkin Date: Mon Nov 29 10:19:07 2010 +0200 vhost: correctly set bits of dirty pages Fix two bugs in dirty page logging: When counting pages we should increase address by 1 instead of VHOST_PAGE_SIZE. Make log_write() correctly process requests that cross pages with write_address not starting at page boundary. Reported-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit a290aec88a9c4747353ea7aa9b2569bd61297c3c Author: Jason Wang Date: Mon Nov 29 13:48:40 2010 +0800 vhost: fix typos in comment Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit bf5e0bd27f7cbaca4d52ae395bbf3715775efebd Author: Michael S. Tsirkin Date: Sun Nov 14 17:33:25 2010 +0200 vhost: remove unused include vhost.c does not need to know about sockets, don't include sock.h Signed-off-by: Michael S. Tsirkin commit 9aefcab0de472ee2b3ab195a6827ddd4b170e3a7 Author: Thomas Gleixner Date: Tue Dec 7 12:48:47 2010 +0000 perf session: Consolidate the dump code The dump code used by perf report -D is scattered all over the place. Move it to separate functions. Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.625434869@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 79a14c1f458d598642bf11f09512c83d33a114e6 Author: Thomas Gleixner Date: Tue Dec 7 12:48:44 2010 +0000 perf session: Dont queue events w/o timestamps If the event has no timestamp assigned then the parse code sets it to ~0ULL which causes the ordering code to enqueue it at the end. Process it right away. Reported-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.528788441@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 3835bc00c5b2d8e337a6e9d7b44f47e02760dba3 Author: Thomas Gleixner Date: Tue Dec 7 12:48:42 2010 +0000 perf event: Prevent unbound event__name array access event__name[] is missing an entry for PERF_RECORD_FINISHED_ROUND, but we happily access the array from the dump code. Make event__name[] static and provide an accessor function, fix up all callers and add the missing string. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.432593943@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit b226a5a72901bc9c73d639ea2e53e6c304bf3b74 Author: David Ahern Date: Tue Dec 7 19:39:46 2010 -0700 perf report: Allow user to specify path to kallsyms file This is useful for analyzing a perf data file on a different system than the one data was collected on and still include symbols from loaded kernel modules in the output. Commiter note: Updated the man page accordingly. LKML-Reference: <1291775986-16475-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit 7c1a70e99819d723cde610d83de48a8ab01ec609 Author: Martin Persson Date: Wed Dec 8 15:13:42 2010 +0100 ux500: Add cpufreq support for u8500 Signed-off-by: Martin Persson Signed-off-by: Linus Walleij commit e0befb23dfed4d4d0de9d97dac936ccc0bbec093 Author: Martin Persson Date: Wed Dec 8 15:13:28 2010 +0100 ux500: Add prcmu support for operating points Adds support in PRCMU driver to handle CPU and APE operating points. Signed-off-by: Martin Persson Signed-off-by: Linus Walleij commit 84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3 Author: David S. Miller Date: Wed Dec 8 18:41:03 2010 -0800 can: slcan: Add missing linux/sched.h include. drivers/net/can/slcan.c: In function 'slcan_open': drivers/net/can/slcan.c:568: error: dereferencing pointer to incomplete type Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 38ef4c2e437d11b5922723504b62824e96761459 Author: Serge E. Hallyn Date: Wed Dec 8 15:19:01 2010 +0000 syslog: check cap_syslog when dmesg_restrict Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set. (I'm also consolidating the now common error path) Signed-off-by: Serge E. Hallyn Acked-by: Eric Paris Acked-by: Kees Cook Signed-off-by: James Morris commit fe6c791570efe717946ea7b7dd50aec96b70d551 Merge: f8bf568 f198725 Author: David S. Miller Date: Wed Dec 8 13:15:38 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c commit 393934c6b5c8d00f9d1ae20670d4a770f07a418a Merge: 69f4aab 0a54917 Author: John W. Linville Date: Wed Dec 8 16:23:31 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/xmit.c commit 69f4aab1157d2a386e7ea4de77cc253629d1b4f2 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:23 2010 -0800 ath9k_hw: warn if we cannot change the power to the chip Suspend requires the device to be in fullsleep otherwise upon resume the device becomes unresponsive. We need to ensure that when we want the device to go to sleep it yields to the request, otherwise we'll have a useless devices upon resume. Warn when changing the power fails as we need to look into these issues. Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ff9f0b639f33c92a89b0799263ab625444be6ee1 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:22 2010 -0800 ath9k: skip ATH9K_INT_TIM_TIMER when we are idle We should not be idle when we get the ATH9K_INT_TIM_TIMER, otherwise its a sign of something broken in our design with our idle state machine and mac80211. Skip these and WARN once just in case this is triggerable. Cc: Paul Stewart Cc: Amod Bodas signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b7e8941b2df518186d9f7679c007f6b619bb4e89 Author: Amitkumar Karwar Date: Tue Dec 7 13:43:03 2010 -0800 cfg80211: add some element IDs in enum ieee80211_eid 1)WLAN_EID_BSS_COEX_2040 2)WLAN_EID_OVERLAP_BSS_SCAN_PARAM 3)WLAN_EID_EXT_CAPABILITY Signed-off-by: Amitkumar Karwar Signed-off-by: John W. Linville commit 692d2c0fb36c02ad07d54641c26f48e644b27fbd Author: Rafał Miłecki Date: Tue Dec 7 21:56:00 2010 +0100 b43: rename config option for N-PHY, drop BROKEN Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 82a52043c7801f83c7387deb45bf9323af04644b Author: Rafał Miłecki Date: Tue Dec 7 21:55:59 2010 +0100 b43: fix split of N-PHY devices into supported and not (based on PHY rev) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit abc1f7cd531f80a8468ab654f1dfd35d58bd2490 Author: Rafał Miłecki Date: Tue Dec 7 21:55:58 2010 +0100 b43: set TMS to work with current band width for N-PHY Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c7455cf988f06ba578cc6a680392426fce382ca1 Author: Rafał Miłecki Date: Tue Dec 7 21:55:57 2010 +0100 b43: N-PHY: silence warnings Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2f886750118c1781d3b53268bf25519aef1d4d71 Author: Ben Greear Date: Tue Dec 7 11:27:01 2010 -0800 mac80211: Show max number of probe tries in debug message. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 155180803c95c7b14b355f60431bef45116c151e Author: Rafał Miłecki Date: Tue Dec 7 09:42:07 2010 +0100 b43: flush PHY writes when needed Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 755fd183b89bc8a302669b6f35cd98faee473f7a Author: Rafał Miłecki Date: Tue Dec 7 09:42:06 2010 +0100 b43: N-PHY: implement own maskset This let us avoid double addressing while still having reg check. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d Author: Rafał Miłecki Date: Tue Dec 7 09:42:05 2010 +0100 b43: N-PHY: reorder and optimize tables initialization Order was changed in specs. For writing arrays we have designed bulk function which makes use of auto increment and do not write table address over and over. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 857581bdf1a3b36bfd42609d6f5433bd83397127 Author: Rafał Miłecki Date: Tue Dec 7 09:42:04 2010 +0100 b43: N-PHY: update init tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a9927ba3c5f3c5f6b0e8fa7557452335edeaf5fa Author: Ben Greear Date: Mon Dec 6 21:13:49 2010 -0800 ath9k: Check for NULL sta in ath_tx_start It can be NULL according to docs, and logging showed it to be NULL in practice. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 80d7e403c97b712e302ec37e9beceff1dbdc9402 Author: Helmut Schaa Date: Fri Nov 19 12:40:26 2010 +0100 mac80211: Apply ht_opmode changes in ieee80211_change_bss Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 50b12f597be354a5a224f05c65c54c0667e57aec Author: Helmut Schaa Date: Fri Nov 19 12:40:25 2010 +0100 cfg80211: Add new BSS attribute ht_opmode Add a new BSS attribute to allow hostapd to set the current HT opmode. Otherwise drivers won't be able to set up protection for HT rates in AP mode. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit c277443cfc29b1623b4923219ff0bdb48b91b589 Author: Peter Zijlstra Date: Wed Dec 8 15:29:02 2010 +0100 perf: Stop all counters on reboot Use the reboot notifier to detach all running counters on reboot, this solves a problem with kexec where the new kernel doesn't expect running counters (rightly so). It will however decrease the coverage of the NMI watchdog. Making a kexec specific reboot notifier callback would be best, however that would require touching all notifier callback handlers as they are not properly structured to deal with new state. As a compromise, place the perf reboot notifier at the very last position in the list. Reported-by: Yinghai Lu Signed-off-by: Peter Zijlstra Cc: Vivek Goyal Cc: Eric W. Biederman Cc: Jason Wessel Cc: Don Zickus LKML-Reference: Signed-off-by: Ingo Molnar commit c079c791c5a0627fc7b752d31d72e274e0596ba8 Author: Peter Zijlstra Date: Thu Nov 25 08:56:17 2010 +0100 perf, amd: Remove the nb lock Since all the hotplug stuff is serialized by the hotplug mutex, do away with the amd_nb_lock. Cc: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 40dc11ffb35e8c4e8fa71092048e0f8de9db758c Author: Eric Dumazet Date: Fri Nov 26 17:22:16 2010 +0100 printk: Use this_cpu_{read|write} api on printk_pending __get_cpu_var() is a bit inefficient, lets use __this_cpu_read() and __this_cpu_write() to manipulate printk_pending. printk_needs_cpu(cpu) is called only for the current cpu : Use faster __this_cpu_read(). Remove the redundant unlikely on (cpu_is_offline(cpu)) test: # size kernel/printk.o* text data bss dec hex filename 9942 756 263488 274186 42f0a kernel/printk.o.new 9990 756 263488 274234 42f3a kernel/printk.o.old Signed-off-by: Eric Dumazet Cc: Heiko Carstens Cc: H. Peter Anvin Cc: Christoph Lameter Signed-off-by: Peter Zijlstra LKML-Reference: <1290788536.2855.237.camel@edumazet-laptop> Signed-off-by: Ingo Molnar commit 806c09a7db457be3758e14b1f152761135d89af5 Author: Dario Faggioli Date: Tue Nov 30 19:51:33 2010 +0100 sched: Make pushable_tasks CONFIG_SMP dependant As noted by Peter Zijlstra at https://lkml.org/lkml/2010/11/10/391 (while reviewing other stuff, though), tracking pushable tasks only makes sense on SMP systems. Signed-off-by: Dario Faggioli Acked-by: Steven Rostedt Acked-by: Gregory Haskins Signed-off-by: Peter Zijlstra LKML-Reference: <1291143093.2697.298.camel@Palantir> Signed-off-by: Ingo Molnar commit 8e9255e6a2141e050d51bc4d96dbef494a87d653 Merge: 5091faa 6313e3c Author: Ingo Molnar Date: Wed Dec 8 20:15:26 2010 +0100 Merge branch 'linus' into sched/core Merge reason: we want to queue up dependent cleanup Signed-off-by: Ingo Molnar commit f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 Author: Namhyung Kim Date: Tue Dec 7 04:49:06 2010 +0000 isdn/hisax: fix compiler warning on hisax_pci_tbl Annotate hisax_pci_tbl as '__used' to fix following warning: CC drivers/isdn/hisax/config.o drivers/isdn/hisax/config.c:1920: warning: ‘hisax_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: David S. Miller commit 920b8d913bd3d963d5c88bca160a272b71e0c95a Author: Changli Gao Date: Tue Dec 7 05:05:18 2010 +0000 af_packet: fix freeing pg_vec twice on error path It is introduced in: commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051 Author: Changli Gao Date: Tue Dec 7 04:26:16 2010 +0000 af_packet: eliminate pgv_to_page on some arches Some arches don't need flush_dcache_page(), and don't implement it, so we can eliminate pgv_to_page() calls on those arches. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 15c2d75f49189e1769c5e8f5f099d03d055c4910 Author: Eric Dumazet Date: Tue Dec 7 00:30:37 2010 +0000 net: call dev_queue_xmit_nit() after skb_dst_drop() Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit() after skb_dst_drop() in dev_hard_start_xmit(). When queueing a packet into af_packet socket, we drop dst anyway. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 62ab0812137ec4f9884dd7de346238841ac03283 Author: Eric Dumazet Date: Mon Dec 6 20:50:09 2010 +0000 filter: constify sk_run_filter() sk_run_filter() doesnt write on skb, change its prototype to reflect this. Fix two af_packet comments. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 38f49e8801565674c424896c3dcb4228410b43a8 Author: Roger Luethi Date: Mon Dec 6 00:59:40 2010 +0000 via-rhine: hardware VLAN support This patch adds VLAN hardware support for Rhine chips. The driver uses up to 3 additional bytes of buffer space when extracting 802.1Q headers; PKT_BUF_SZ should still be sufficient. The initial code was provided by David Lv. I reworked it to use standard kernel facilities. Coding style clean up mostly follows via-velocity. Adapted to new interface for VLAN acceleration (per request of Jesse Gross). Signed-off-by: David Lv Signed-off-by: Roger Luethi drivers/net/via-rhine.c | 326 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 312 insertions(+), 14 deletions(-) Signed-off-by: David S. Miller commit 941666c2e3e0f9f6a1cb5808d02352d445bd702c Author: Eric Dumazet Date: Sun Dec 5 01:23:53 2010 +0000 net: RCU conversion of dev_getbyhwaddr() and arp_ioctl() Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit : > Hmm.. > > If somebody can explain why RTNL is held in arp_ioctl() (and therefore > in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so > that your patch can be applied. > > Right now it is not good, because RTNL wont be necessarly held when you > are going to call arp_invalidate() ? While doing this analysis, I found a refcount bug in llc, I'll send a patch for net-2.6 Meanwhile, here is the patch for net-next-2.6 Your patch then can be applied after mine. Thanks [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl() dev_getbyhwaddr() was called under RTNL. Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use RCU locking instead of RTNL. Change arp_ioctl() to use RCU instead of RTNL locking. Note: this fix a dev refcount bug in llc Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a2d4b65d477aad1fe8c7218781a031fa9cf5abfc Merge: 01b0c5c 0491026 Author: David S. Miller Date: Wed Dec 8 10:01:00 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8 Author: Thiago Farina Date: Sat Dec 4 15:22:46 2010 +0000 net/9p/protocol.c: Remove duplicated macros. Use the macros already provided by kernel.h file. Signed-off-by: Thiago Farina Signed-off-by: David S. Miller commit aa9421041128abb4d269ee1dc502ff65fb3b7d69 Author: Changli Gao Date: Sat Dec 4 02:31:41 2010 +0000 net: init ingress queue The dev field of ingress queue is forgot to initialized, then NULL pointer dereference happens in qdisc_alloc(). Move inits of tx queues to netif_alloc_netdev_queues(). Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit a1044e36e457fb6dbdf90ce756d578b251d99b5e Author: Oliver Hartkopp Date: Thu Dec 2 10:57:59 2010 +0000 can: add slcan driver for serial/USB-serial CAN adapters This patch adds support for serial/USB-serial CAN adapters implementing the LAWICEL ASCII protocol for CAN frame transport over serial lines. The driver implements the SLCAN line discipline and is heavily based on the slip.c driver. Therefore the code style remains similar to slip.c to be able to apply changes of the SLIP driver to the SLCAN driver easily. For more details see the slcan Kconfig entry. Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 58e481f66e31e9976558f3e4f709baf9201052fe Author: Andy Shevchenko Date: Thu Dec 2 02:45:08 2010 +0000 atm: lanai: use kernel's '%pM' format option to print MAC Signed-off-by: Andy Shevchenko Cc: Chas Williams Cc: linux-atm-general@lists.sourceforge.net Signed-off-by: David S. Miller commit 28257f7fdee0facc3b7f934e82c2485f27120d41 Author: Russell King Date: Wed Dec 8 13:57:48 2010 +0000 ARM: io: simplify ioremap* and iounmap definitions We don't need to repeat the same definitions of the ioremap*(), once in terms of __arch_ioremap() and again in terms of __arm_ioremap(). Instead, if the platform hasn't provided an __arch_ioremap, define this to be __arm_ioremap, and only define the ioremap*() set using __arch_ioremap. Signed-off-by: Russell King commit a0b7bd0829194c03921915a68ee4a331ee394223 Author: Russell King Date: Wed Dec 8 13:49:04 2010 +0000 ARM: io: make iounmap() a simple macro Defining iounmap() with arguments prevents it from being used as a function pointer, causing platforms to work around this. Instead, define it to be a simple macro. Do the same for __arch_io(re|un)map too. Signed-off-by: Russell King commit 5bea7660bba973dc5e8e9d92b11fb1dd5b524ebf Author: Dmitry Torokhov Date: Tue Dec 7 23:02:48 2010 -0800 HID: add hid_hw_open/close/power() handlers Instead of exposing the guts of hid->ll_driver relationship to HID sub-drivers provide these helpers to encapsulate the details. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 20e218a77fc0b0576817b6b204fe5b9391a5b209 Author: Rabin Vincent Date: Wed Dec 8 17:18:46 2010 +0530 ux500: fix 5500 PER6 clock rate The DB5500 PER6 clock rate is the same as the DB8500 one, i.e. 133.33 MHz. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 22039b7cc54a636f80434e9b149fcdec148c4cb9 Author: Rabin Vincent Date: Wed Dec 8 11:07:56 2010 +0530 ux500: remove ambiguous irq macros Remove the irq number macros which don't specify which SoC they're for. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 01afdd1353ca83904f430be4f6202d1a20912f4d Author: Rabin Vincent Date: Wed Dec 8 11:07:55 2010 +0530 ux500: rework gpio registration Rework gpio registration to remove build-time changing macros. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 8d568ae5362c00c5b0b8e61bceb1829c8051002e Author: Rabin Vincent Date: Wed Dec 8 11:07:54 2010 +0530 nomadik-gpio: use dev name if no name is specified Platforms may choose not to provide an additional name for the GPIO block. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit ec4a637d35d4e05d1f43a68d647fb2453891379a Author: Carl-Johan Irekvist Date: Wed Dec 8 11:07:53 2010 +0530 ux500: fix uncompressor UART address for U5500 The uncompress code for zImage uses the UART to print status messages, this was hard coded to use UART2 for the U8500 platform. This patch checks at run time which platform it is run on. U5500 uses UART0 as console UART. Signed-off-by: Carl-Johan Irekvist Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit e8b1cc3a341684dfc02fd02f52308752b031668c Author: Per Forlin Date: Sun Dec 5 13:35:12 2010 +0100 ux500: Add DMA support for U5500 Add basic DMA configuration for u5500 supporting memcpy. Make way for SDI0 dma support by setting SDI0 to -1, indicating it will be configured in runtime. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit bab263e0ce624b05bdcf568e83a9ca4ce71f5e3d Author: Per Forlin Date: Sun Dec 5 12:49:03 2010 +0100 ux500: Add eMMC support in U5500. U5500 now boots from sdi0 (onboard eMMC). Change machine type to U5500. Adjust uart and sdi0 clock rates for u5500. All necessary clocks must be enabled before Linux starts because there is no clock tree support in u5500 yet. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit 9b04f8b9070e60fe9d335613ec538223c159a5c9 Author: Per Forlin Date: Sun Dec 5 12:27:05 2010 +0100 ux500: Call prmcu_init only for u8500 PRCMU driver only supports u8500. Don't initialize prcmu if running on u5500. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit 592b2f254d68b6eb8665658cc7d8fc3cd61ebc94 Author: Sundar Iyer Date: Fri Dec 3 20:35:52 2010 +0530 mach-ux500: clean up checkpatch spits Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit f306954c9b69aa21bd26724c59ac8c98b7d6e003 Author: Sundar Iyer Date: Fri Dec 3 20:35:51 2010 +0530 mach-ux500: explicit enable MTU TCR in the kernel PRCM_TCR enables the various timers in the system. This must be achieved before any of the MTUs are usable for kernel usage. Explicit enabling of this in the kernel makes it independent of bootloader actions. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit dacdc96cd33dee876c704aaed78f41515abe8a81 Author: Rabin Vincent Date: Fri Dec 3 20:35:37 2010 +0530 nomadik-gpio: allow sleep mode dir/pull to differ from normal mode In the nomadik GPIO pin configuration, allow the sleep mode direction and pull configurations to differ from the ones for the normal state. PIN_SLPM_PULL_*, PIN_SLPM_INPUT, PIN_SLPM_OUTPUT* macros are provided for this. Since the hardware does not allow seperate configurations for sleep mode and normal mode, this is implemented by having software remux the configurations as necessary. Reviewed-by: Srinidhi KASAGAR Signed-off-by: Rabin Vincent Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit edaa86a4142474c99e4741efb6a916067978a1ee Author: Linus Walleij Date: Thu Dec 2 12:05:18 2010 +0100 ux500: minor revision to the eMMC/SD config A small fixup for the v1(.0) ASIC. Signed-off-by: Linus Walleij commit a5de3dc240eb4e58f02b199ed529c17b65f9adfb Author: Mattias Wallin Date: Thu Dec 2 13:46:00 2010 +0100 mach-ux500: AB8500 irqs is taken from header file This patch removes the dublicated define for number of interrupts and instead include the needed header file. Signed-off-by: Mattias Wallin Signed-off-by: Linus Walleij commit fcbd458e95316fe5031f1b8eaf5e66ce8f3c3146 Author: Mattias Wallin Date: Thu Dec 2 16:20:42 2010 +0100 ARM: ux500: prcmu db8500 v2 support This patch adds support for db8500 chip version 2. The TCDM memory address of the PRCMU is changed and dynamic detection of that is added. Signed-off-by: Mattias Wallin Acked-by: Linus Walleij commit fbf1eadf950da1f5f5ed2e454d2f191f90fe1ebe Author: Rabin Vincent Date: Wed Sep 29 19:46:32 2010 +0530 ux500: rework device registration Change the Ux500 devices to be dynamically allocated and added by calling functions instead of referencing structures, thereby allowing 5500 and other derivatives' support to be added without having to duplicate structures, use fixup functions, or use compile-time macros. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 1bde668c8afa279d81b8f26b2120b906f38f7822 Author: Linus Walleij Date: Thu Sep 9 22:29:34 2010 +0200 ux500: use _cansleep GPIO functions Similar to the patch to MMCI this silences similar messages from the platform code. Signed-off-by: Linus Walleij commit b8410a150fbc4e61a28032637dc0ae7e8609131d Author: Rabin Vincent Date: Mon Aug 9 19:18:17 2010 +0530 ux500: mop500: add TC35892 and MicroSD slot support Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 80f1dc7cc9341b160beb9c833edc1cd131f45a7f Author: Tony SIM Date: Tue Dec 7 09:12:14 2010 +0000 ARM: mach-shmobile: mackerel: Add Accelerometer sensor support Signed-off-by: Tony SIM Signed-off-by: Paul Mundt commit 356c6f654d1c03e2ae45ef58b267e83dfd1a17f2 Author: Dmitry Torokhov Date: Tue Dec 7 22:11:09 2010 -0800 Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE This should allow loading this module automatically on systems that have such device. Signed-off-by: Dmitry Torokhov commit b8a3d6bcbc85d7636d9f2adede8479ce2999c232 Author: Tony SIM Date: Tue Dec 7 02:54:00 2010 -0800 Input: tca6416-keypad - add support for tca6408a Support 8-bit tca6408a I/O expander as a keypad. Signed-off-by: Tony SIM Signed-off-by: Dmitry Torokhov commit a40c406cbdd28dcca3483065bc2ba794cf5aaab7 Author: Johan Hedberg Date: Wed Dec 8 00:21:07 2010 +0200 Bluetooth: Make hci_send_to_sock usable for management control sockets In order to send data to management control sockets the function should: - skip checks intended for raw HCI data and stack internal events - make sure RAW HCI data or stack internal events don't go to management control sockets In order to accomplish this the patch adds a new member to the bluetooth skb private data to flag skb's that are destined for management control sockets. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 0381101fd6a73c7d6b545044dc1472d019fc64e3 Author: Johan Hedberg Date: Wed Dec 8 00:21:06 2010 +0200 Bluetooth: Add initial Bluetooth Management interface callbacks Add initial code for handling Bluetooth Management interface messages. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Acked-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit c02178d22b3ef2d18c38c96151600ee1c7ed94f0 Author: Johan Hedberg Date: Wed Dec 8 00:21:05 2010 +0200 Bluetooth: Add Bluetooth Management interface definitions Add initial definitions for the new Bluetooth Management interface to the bluetooth headers. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 Author: Tony Lindgren Date: Tue Dec 7 16:26:58 2010 -0800 omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx We need to divide the 15xx/16xx offset by 2 for 7xx. Use bank->stride for that. This allows us to get rid of the duplicate defines for the MPUIO registers. Note that this will cause omap-keypad.c driver to not work on 7xx. However, the right fix there is to move over to matrix_keypad instead as suggested by Cory Maccarrone and Janusz Krzysztofik . Cc: Cory Maccarrone Acked-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit 77640aabd7558e43b65bc1a0311be2dbb42c3ff8 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP: GPIO: Implement GPIO as a platform device Implement GPIO as a platform device. GPIO APIs are used in machine_init functions. Hence it is required to complete GPIO probe before board_init. Therefore GPIO device register and driver register are implemented as postcore_initcalls. omap_gpio_init() does nothing now and this function would be removed in the next patch as it's usage is spread across most of the board files. Inorder to convert GPIO as platform device, modifications are required in clockxxxx_data.c file for OMAP1 so that device names can be used to obtain clock instead of getting clocks by name/NULL ptr. Use runtime pm APIs (pm_runtime_put*/pm_runtime_get*) for enabling or disabling the clocks, modify sysconfig settings and remove usage of clock FW APIs. Note 1: Converting GPIO driver to use runtime PM APIs is not done as a separate patch because GPIO clock names are different for various OMAPs and are different for some of the banks in the same CPU. This would need usage of cpu_is checks and bank id checks while using clock FW APIs in the gpio driver. Hence while making GPIO a platform driver framework, PM runtime APIs are used directly. Note 2: While implementing GPIO as a platform device, pm runtime APIs are used as mentioned above and modification is not done in gpio's prepare for idle/ resume after idle functions. This would be done in the next patch series and GPIO driver would be made to use dev_pm_ops instead of sysdev_class in that series only. Due to the above, the GPIO driver implicitly relies on CM_AUTOIDLE = 1 on its iclk for power management to work, since the driver never disables its iclk. This would be taken care in the next patch series (see Note 3 below). Refer to http://www.mail-archive.com/linux-omap@vger.kernel.org/msg39112.html for more details. Note 3: only pm_runtime_get_sync is called in gpio's probe() and pm_runtime_put* is never called. This is to make the implementation similar to the existing GPIO code. Another patch series would be sent to correct this. In OMAP3 and OMAP4 gpio's debounce clocks are optional clocks. They are enabled/ disabled whenever required using clock framework APIs TODO: 1. Cleanup the GPIO driver. Use function pointers and register offest pointers instead of using hardcoded values 2. Remove all cpu_is_ checks and OMAP specific macros 3. Remove usage of gpio_bank array so that only instance specific information is used in driver code 4. Rename 'method'/ avoid it's usage 5. Fix the non-wakeup gpios handling for OMAP2430, OMAP3 & OMAP4 6. Modify gpio's prepare for idle/ resume after idle functions to use runtime pm implentation. Signed-off-by: Charulatha V Signed-off-by: Rajendra Nayak Reviewed-by: Basak, Partha Acked-by: Kevin Hilman [tony@atomide.com: updated for bank specific revision and updated boards] Signed-off-by: Tony Lindgren commit f547170fe721f145b7b7d6eb8b252e45f489dc4b Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP2+: GPIO: device registration Use omap_device_build() API to do platform_device_register of GPIO devices. For OMAP2+ chips, the device specific data defined in the centralized hwmod database will be used. gpio_init needs to be done before machine_init functions access gpio APIs. Hence gpio_init is made as a postcore_initcall. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Reviewed-by: Basak, Partha Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9780a9cfa7b1f913d5f7099290e77b381a8b01d5 Author: Benoit Cousson Date: Tue Dec 7 16:26:57 2010 -0800 OMAP4: hwmod data: Add GPIO Add GPIO hwmod data for OMAP4 Signed-off-by: Benoit Cousson Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 70034d38fbfd0f98a49367d36aa72f776a9e663a Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP3: hwmod data: Add GPIO Add GPIO hwmod data for OMAP3 Also remove "omap34xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Signed-off-by: Rajendra Nayak Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit aeac0e441045974757e901b46719980a98c270a5 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP2430: hwmod data: Add GPIO Add GPIO hwmod data for OMAP2430 Also remove "omap24xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 59c348c38fbe85e6e86c711b9a38c37315008d9e Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP2420: hwmod data: Add GPIO Add GPIO hwmod data for OMAP2420 and add the required GPIO device attributes in the gpio header file Also remove "omap24xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9d52342c27b7b43c4a7b24bac24ff7bee0b80e07 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP7xx: GPIO: Introduce support for GPIO init Add support for handling OMAP7xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 87fe6229c75a2ca1ebfa1e9e937cba2535e961a8 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP16xx: GPIO: Introduce support for GPIO init Add support for handling OMAP16xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit c95d10bc49d50a9bc0f63a6eae79bb2707dabfdc Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP15xx: GPIO: Introduce support for GPIO init Add support for handling OMAP15xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9a748053f5f58a77cd71864f1d7b804175b0e47d Author: Tony Lindgren Date: Tue Dec 7 16:26:56 2010 -0800 OMAP: GPIO: Make omap_gpio_show_rev bank specific Otherwise GPIO init on 16xx may try to access uninitialized GPIO bank as the MPUIO bank does not have a revision register. Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 2fae7fbed072705d91e09ed393b2e580b2d895fc Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:55 2010 -0800 OMAP: GPIO: prepare for platform driver Prepare for implementing GPIO as a platform driver. Modifies omap_gpio_init() to make use of omap_gpio_chip_init() and omap_gpio_mod_init(). omap_gpio_mod_init() does the module init by clearing the status register and initializing the GPIO control register. omap_gpio_chip_init() initializes the chip request, free, get, set and other function pointers and sets the gpio irq handler. This is only to reorganize the code so that the "omap gpio platform driver implementation patch" looks cleaner and better to review. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit c2cdaffe0bb32015e84af8e31f73e620ba271165 Author: Tony Lindgren Date: Tue Dec 7 16:26:55 2010 -0800 omap: Fix gpio_request calls to happen as arch_initcall Looks like some boards are calling gpio_request from init_irq. This will make the request_irq fail, as GPIO will be initialized as postcore_initcall. Reported-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 Author: Tony Lindgren Date: Tue Dec 7 16:25:41 2010 -0800 omap: Don't select mux by default for each board This should be only selected in CONFIG_ARCH_OMAP2PLUS_TYPICAL to make it easy to disable. Signed-off-by: Tony Lindgren commit 6722a7238d062b747fc03b35d3371b935bcc965d Author: Shubhrajyoti D Date: Tue Dec 7 16:25:41 2010 -0800 omap: McBSP: Make the free variable update more readable Using true/false instead of 1/0 to update the free variable. Signed-off-by: Shubhrajyoti D Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 5f3b7284cb35c9e3eead279cb35f017b9735bb43 Author: Jarkko Nikula Date: Tue Dec 7 16:25:40 2010 -0800 omap: McBSP: Fix potential memory leak in omap_mcbsp_remove Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups and clk_disable calls since they are not needed here. This is not problem currently but becomes if the mcbsp driver is ever modularized. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit b1cc4c55c69efed3ebbb2a13e4c77a2a1a4a6bc9 Author: Evgeny Kuznetsov Date: Tue Dec 7 16:25:40 2010 -0800 omap: Ptr "isr_reg" tracked as NULL was dereferenced Value of "isr_reg" pointer is depend on configuration and GPIO method. Potentially it may have NULL value and it is dereferenced later in code. Warning and exit from function are added in this case. Signed-off-by: Evgeny Kuznetsov Signed-off-by: Tony Lindgren commit be40f7a3d7b53c1a44e11b376b4a395d6b91f58d Author: Tony Lindgren Date: Tue Dec 7 16:25:40 2010 -0800 omap: Fix undefined reference to omap2_i2c_mux_pins In some cases we can get error function `omap2_i2c_add_bus': arch/arm/plat-omap/i2c.c:136: undefined reference to `omap2_i2c_mux_pins' arch/arm/plat-omap/i2c.c:141: undefined reference to `omap_hwmod_lookup' arch/arm/plat-omap/i2c.c:157: undefined reference to `omap_device_build' Signed-off-by: Tony Lindgren commit 00b4ade1f1968b55bb57a91c1f09a40fc33f72a0 Author: Paul Walmsley Date: Tue Dec 7 04:30:57 2010 +0000 OMAP1: I2C: fix device initialization Commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 ("OMAP: I2C: split device registration and convert OMAP2+ to omap_device") broke I2C on OMAP1. The following messages appear at boot: i2c_omap i2c_omap.1: failure requesting irq 0 i2c_omap: probe of i2c_omap.1 failed with error -22 Investigation revealed that a chunk of code is missing from the original plat-omap/i2c.c file which configured the IRQ and base address for the I2C block on OMAP1. Upon adding this back, the OMAP1 I2C block seems to initialize correctly. Thanks to Cory Maccarrone for reporting the bug, and apologies for the breakage. Signed-off-by: Paul Walmsley Cc: Janusz Krzysztofik Tested-by: Cory Maccarrone Signed-off-by: Tony Lindgren commit 7659a193f94c0003dd06e9e874d19bade1a8c952 Author: Javier Cardona Date: Tue Dec 7 10:41:47 2010 -0800 mac80211: Fix compilation error when mesh is disabled Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf. Signed-off-by: John W. Linville commit cae6b74d907e2abd22d496fe30417b088d3302cf Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 21:23:16 2010 +0530 ath9k: Remove dead code in recv.c The structure struct ieee80211_rx_status *rxs is no longer needed to be passed to ath_rx_send_to_mac80211 function Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 0ce3bcfc84900a64347b0fe1140229bd81314008 Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 21:14:15 2010 +0530 ath9k: Parse DTIM period from mac80211 With the current save power save implementation we assume a dtim period of 1.This value is assigned based on a sanity check in the driver eventhough we had not parsed it from mac80211.This patch obtains the actual DTIM period from AP by parsing it from mac80211.Yet for handling multicast traffic we may still have it as fixed rather than parsing it from mac80211 .This does not breaks power save or anything as the sleep duration is currently fixed in the driver.This patch may serve to improve power save in the future by using dtim period for sleep duration and using correct dtim period adhoc mode. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit aaef24b4c9f5db726e618977b74ffef924360de5 Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 20:40:58 2010 +0530 ath9k: Properly use unlikely check macro AUTOSLEEP feature is enabled only for AR9271 and AR9003 version chipsets.So unlikely macro should be used only to check whether auto-sleep feature is enabled Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit caa0a99acd2c4eb0a8d4e9caae397291e4cf743a Author: Sujith Manoharan Date: Tue Dec 7 16:32:02 2010 +0530 ath9k_htc: Fix panic on FW download failure Use the correct error condition exit in case firmware download fails for some reason. Not doing so results in a panic: usb 1-3: ath9k_htc: Transferred FW: ar9271.fw, size: 51280 usb 1-3: ath9k_htc: Firmware - ar9271.fw download failed usb 1-3: ath9k_htc: Target is unresponsive Failed to initialize the device INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. Pid: 2823, comm: insmod Tainted: G W 2.6.37-rc4-wl #11 Call Trace: [] __lock_acquire+0xe3e/0x1d00 [] ? restore_args+0x0/0x30 [] ? vprintk+0x321/0x500 [] lock_acquire+0xa0/0x190 [] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] _raw_spin_lock_irq+0x48/0x60 [] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] ? printk+0x3c/0x3f [] usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] ath9k_hif_usb_dealloc_urbs+0x18/0x40 [ath9k_htc] [] ath9k_hif_usb_probe+0x227/0x3d0 [ath9k_htc] [] usb_probe_interface+0x10c/0x210 [usbcore] [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0xa3/0xb0 [] ? __driver_attach+0x0/0xb0 [] bus_for_each_dev+0x5e/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0x168/0x320 [] driver_register+0x71/0x140 [] ? __raw_spin_lock_init+0x38/0x70 [] usb_register_driver+0xdc/0x190 [usbcore] [] ? ath9k_htc_init+0x0/0x4f [ath9k_htc] [] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc] [] ath9k_htc_init+0x2b/0x4f [ath9k_htc] [] do_one_initcall+0x3f/0x180 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 692d6b175b392512881ab374567e900fc825d487 Author: Sujith Manoharan Date: Tue Dec 7 16:31:54 2010 +0530 ath9k_htc: Add support for handling TX power configuration Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 0b5ead91cda63e0db964dadc77601233434f60cb Author: Sujith Manoharan Date: Tue Dec 7 16:31:38 2010 +0530 ath9k_htc: Cleanup device identification ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc. Adding driver specific data to the shared structure would impact all the drivers. Handling USB device recognition for devices specific to ath9k_htc can be handled within the driver itself. Also, AR7010 refers to the processor used in both AR9280/AR9287 based devices. Rename the device enumerations accordingly. While at it, check properly for the bus type when choosing the EEPROM base address for UB95. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit c658e5db01117bf2a321a9a782754dd5b10e2f15 Author: Felix Fietkau Date: Tue Dec 7 04:40:18 2010 +0100 mac80211: fix a compiler warning net/mac80211/mlme.c: In function 'ieee80211_sta_work': net/mac80211/mlme.c:1981: warning: too many arguments for format Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d ("mac80211: speed up AP probing using nullfunc frames"). Reported-by: Stephen Rothwell Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 22d8d9f81b8b054df2f7f82daffcb71608f411e4 Author: Bruno Randolf Date: Tue Dec 7 11:08:12 2010 +0900 ath5k: Use capabilities information for the number of TX queues One thing I missed in my WME series: Older hardware does not have enough hardware queues to support WME. In this case we just set up one data queue. Use the capability information to decide how many queues to set up. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 5c6d1125f8dbd1bfef39e38fbc2837003be78a59 Author: Jarkko Sakkinen Date: Tue Dec 7 13:34:01 2010 +0200 Smack: Transmute labels on specified directories In a situation where Smack access rules allow processes with multiple labels to write to a directory it is easy to get into a situation where the directory gets cluttered with files that the owner can't deal with because while they could be written to the directory a process at the label of the directory can't write them. This is generally the desired behavior, but when it isn't it is a real issue. This patch introduces a new attribute SMACK64TRANSMUTE that instructs Smack to create the file with the label of the directory under certain circumstances. A new access mode, "t" for transmute, is made available to Smack access rules, which are expanded from "rwxa" to "rwxat". If a file is created in a directory marked as transmutable and if access was granted to perform the operation by a rule that included the transmute mode, then the file gets the Smack label of the directory instead of the Smack label of the creating process. Note that this is equivalent to creating an empty file at the label of the directory and then having the other process write to it. The transmute scheme requires that both the access rule allows transmutation and that the directory be explicitly marked. Signed-off-by: Jarkko Sakkinen Signed-off-by: Casey Schaufler commit d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b Author: Ben Greear Date: Mon Dec 6 13:13:07 2010 -0800 ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE. This decreases spammage in the log. A single line message will still be printed, so users can be aware that problem exists. Signed-off-by: Ben Greear Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1435894dcd263fdbdd5e1ea2a684289dff187c34 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:28:00 2010 -0800 ath9k: Add device id of AR9485 to pci table Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a95f1600081211433c5ff6f3668061c821552e9f Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:59 2010 -0800 ath9k_hw: Disable MRC CCK for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 11441fb8b700bd782ae72d3dd87453fc5bc2ff12 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:58 2010 -0800 ath9k_hw: Setup paprd only for supported chains Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7090ad1416d0311677c43728494c6028aa2436b6 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:57 2010 -0800 ath9k_hw: Program appropriate register for temperature compensation cal for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 858b7e36e82cc03cb77b64f096b64446a24a346a Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:56 2010 -0800 ath9k_hw: Add IQ cal changes for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 73ff5fc0a86b28b77e02a6963b388d1dbfa0a263 Author: Eric Paris Date: Tue Dec 7 16:17:28 2010 -0500 selinux: cache sidtab_context_to_sid results sidtab_context_to_sid takes up a large share of time when creating large numbers of new inodes (~30-40% in oprofile runs). This patch implements a cache of 3 entries which is checked before we do a full context_to_sid lookup. On one system this showed over a x3 improvement in the number of inodes that could be created per second and around a 20% improvement on another system. Any time we look up the same context string sucessivly (imagine ls -lZ) we should hit this cache hot. A cache miss should have a relatively minor affect on performance next to doing the full table search. All operations on the cache are done COMPLETELY lockless. We know that all struct sidtab_node objects created will never be deleted until a new policy is loaded thus we never have to worry about a pointer being dereferenced. Since we also know that pointer assignment is atomic we know that the cache will always have valid pointers. Given this information we implement a FIFO cache in an array of 3 pointers. Every result (whether a cache hit or table lookup) will be places in the 0 spot of the cache and the rest of the entries moved down one spot. The 3rd entry will be lost. Races are possible and are even likely to happen. Lets assume that 4 tasks are hitting sidtab_context_to_sid. The first task checks against the first entry in the cache and it is a miss. Now lets assume a second task updates the cache with a new entry. This will push the first entry back to the second spot. Now the first task might check against the second entry (which it already checked) and will miss again. Now say some third task updates the cache and push the second entry to the third spot. The first task my check the third entry (for the third time!) and again have a miss. At which point it will just do a full table lookup. No big deal! Signed-off-by: Eric Paris commit 31faff815bd9d87c370f799dff03948ed362d260 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:55 2010 -0800 ath9k_hw: Define IQcal correction coefficient registers using index Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 6559e83ebd2cac06c54ebb2b7f635cf2e434f25c Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:54 2010 -0800 ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5f139eba4174d9a3343efc7cfb8a0a9cb184c647 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:53 2010 -0800 ath9k_hw: Configure power control only for the supported chains Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit dd040f76cef0cc977b83e905a16b68d41322b735 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:52 2010 -0800 ath9k_hw: Read and configure turnning caps to regulate freq accuracy Right now it is done for only AR9485, will be done for ar9003 also after proper testing. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ab09b5b4beda8b33a117bf6fbbb2b5aa8f566129 Author: Vasanthakumar Thiagarajan Date: Tue Dec 7 02:20:39 2010 -0800 ath9k_hw: Configure internal regulator for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 47e84dfb411fcaa51e12d94ab82570ec3aa86e32 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:49 2010 -0800 ath9k_hw: Read and configure antenna diversity control for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 9936e65fae6d95c2acc2438c60a8f4908130530e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:48 2010 -0800 ath9k_hw: Configure xpa bias level for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d9a2545ac713e26ab8c8eee741d2da1626cebd6e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:47 2010 -0800 ath9k: Read spur channel information from eeprom for AR9485 Also spur channel count and range is different for AR9485. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 272ceba892208013a45847276a00ccae54e2b94a Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:46 2010 -0800 ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family This helper function would be used for AR9485. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 85dd0921e686ed2f0283cef358a91ecaa36ccc8f Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:45 2010 -0800 ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d09b17f73fd8f475f33d0b8311d7b5a0bed67c67 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:44 2010 -0800 ath9k: Configure pll control for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 47c80de62e9d6d262a829502d689a8b56add8d3d Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:43 2010 -0800 ath9k_hw: Find the maximum number of chains that hw supports Have it in ah->caps. This will be used during various calibrations. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8060e169e02fe855f5533b5ef6af1f23ae2db0c4 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:42 2010 -0800 ath9k: Enable extended synch for AR9485 to fix L0s recovery issue Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7f1c7a6ac57ff0482219aa3f62eb9d0f8fe65867 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:41 2010 -0800 ath9k: Disable TX STBC for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 784ad50324ec531fa4ab22586fe305657cc6e307 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:40 2010 -0800 ath9k_hw: Disable LDPC for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 60e0c3a782f9060327751492dac949210154759b Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:39 2010 -0800 ath9k_hw: Eeeprom changes for AR9485 Calibration data are stored at 4k address (0xfff). The cal data for AR9485 is not compressed so its lengh can exceed 1024 limit, take care of that. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ff48ba464e3503149657c60d46e8f4e9b4ed27fa Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:38 2010 -0800 ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit c88457eb83fb6db7a3286a685ecc6e33a7aac49d Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:37 2010 -0800 ath9k_hw: Initialize mode registers for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3050c9146b2a4c98a916192fac2867c0023ec2b1 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:36 2010 -0800 ath9k_hw: Enable hw initialization for AR9485 Also make it a supported mac Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d9c803e1864d563b07382eb1bb8979cd70b1001e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:35 2010 -0800 ath9k_hw: Add initvals.h for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3bbb780cca79dfe0200d33afb95a8990acde65b9 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:34 2010 -0800 ath9k_hw: Define hw version macros for AR9485 AR9485 is a single chain and single band (2.4 Ghz) chip. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b7555ec7c604f2f00e432579dac29df5ce525433 Author: John W. Linville Date: Tue Dec 7 14:13:49 2010 -0500 ath5k: remove MODULE_VERSION Since this is updated manually and sporadically, it is fairly useless anyway. Signed-off-by: John W. Linville commit a1cbc7a88985976267a851a2e1080578711b3b0d Author: Joe Perches Date: Thu Dec 2 19:12:38 2010 -0800 ath: Fix ath_dbg access beyond array bound ar9300RateSize is not necessarily a power of 4. Change ar9003_hw_set_target_power_eeprom to print the targetPowerValT2 array one per line. ath9k_hw_ar9300_set_txpower repeated the output 4 times per line, change it to print the targetPowerValT2 value one per line. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 226afe68fdbd1aa3680158aca0a3631cbd019626 Author: Joe Perches Date: Thu Dec 2 19:12:37 2010 -0800 ath: Convert ath_print to ath_dbg Remove ath/debug.h and the includes of these files. Coalesce long formats. Correct a few misspellings and missing "\n"s from these logging messages. Remove unnecessary trailing space before a newline. Remove ARRAY_SIZE casts, use printf type %zu Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 3800276a40751539a920ef8e0537ef2e19126799 Author: Joe Perches Date: Thu Dec 2 19:12:36 2010 -0800 ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err So these errors are always emitted at KERN_ERR level. Remove ARRAY_SIZE casts, use printf type %zu Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 21a99f934949807dc0c9dc7642bbf0081b7582f9 Author: Joe Perches Date: Thu Dec 2 19:12:35 2010 -0800 ath: Add and use ath_printk and ath_ Add ath_printk and ath_ similar to dev_printk and dev_ from device.h This allows a more gradual rename of ath_print to to ath_dbg or perhaps ath_debug. This basically removes debug.h leaving only an #define ath_printk ath_dbg there and moving all the ATH_DBG_ enums to ath.h I do not think there's much purpose for struct ath_common * being passed to the ath_printk functions, but perhaps there might be. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206 Author: Eliad Peller Date: Fri Dec 3 02:16:23 2010 +0200 mac80211: fix dynamic-ps/pm_qos magic numbers mac80211 uses pm_qos (/dev/network_latency) in order to determine the dynamic ps timeout (or disable the dynamic-ps at all in some cases). commit ff616381 added a comparison for the current network_latency against one high value (1900ms), and against the default value (2000sec, rather than the commented 2sec). however, the representation of 1900ms was incorrect: 1900ms = 1900000us ( != 1900000000 ) fix it by using USEC_TO_MSEC/SEC consts. Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit 329b32fedc94fd9158f1635ac64f4ae6a00d374c Author: David Kilroy Date: Thu Dec 2 18:19:21 2010 +0000 orinoco: allow IW_AUTH_MFP to pass through The card doesn't support MFP, so silently accept DISABLED and OPTIONAL settings. This avoids the following failure in wpa_supplicant logs: State: SCANNING -> ASSOCIATING wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT) netlink: Operstate: linkmode=-1, operstate=5 wpa_driver_wext_associate wpa_driver_wext_set_drop_unencrypted wpa_driver_wext_set_psk wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed Association request to the driver failed Signed-off by: David Kilroy Reported by: Giacomo Comes Signed-off-by: John W. Linville commit 541a45a142df281c974d74eac2066138fc107b23 Author: Bruno Randolf Date: Thu Dec 2 19:12:43 2010 +0900 nl80211/mac80211: Report signal average Extend nl80211 to report an exponential weighted moving average (EWMA) of the signal value. Since the signal value usually fluctuates between different packets, an average can be more useful than the value of the last packet. This uses the recently added generic EWMA library function. -- v2: fix ABI breakage and change factor to be a power of 2. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: fix ioctl ABI In kernel ABI version 7.16 and later FUSE_IOCTL_RETRY reply from a unrestricted IOCTL request shall return with an array of 'struct fuse_ioctl_iovec' instead of 'struct iovec'. This fixes the ABI ambiguity of 32bit vs. 64bit. Reported-by: "ccmail111" Signed-off-by: Miklos Szeredi CC: Tejun Heo commit 02c048b919455aaa38628563cdcc2e691c8a9f53 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: allow batching of FORGET requests Terje Malmedal reports that a fuse filesystem with 32 million inodes on a machine with lots of memory can take up to 30 minutes to process FORGET requests when all those inodes are evicted from the icache. To solve this, create a BATCH_FORGET request that allows up to about 8000 FORGET requests to be sent in a single message. This request is only sent if userspace supports interface version 7.16 or later, otherwise fall back to sending individual FORGET messages. Reported-by: Terje Malmedal Signed-off-by: Miklos Szeredi commit 07e77dca8a1f17a724a9b7449f0ca02e70e9d057 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: separate queue for FORGET requests Terje Malmedal reports that a fuse filesystem with 32 million inodes on a machine with lots of memory can go unresponsive for up to 30 minutes when all those inodes are evicted from the icache. The reason is that FORGET messages, sent when the inode is evicted, are queued up together with regular filesystem requests, and while the huge queue of FORGET messages are processed no other filesystem operation can proceed. Since a full fuse request structure is allocated for each inode, these take up quite a bit of memory as well. To solve these issues, create a slim 'fuse_forget_link' structure containing just the minimum of information required to send the FORGET request and chain these on a separate queue. When userspace is asking for a request make sure that FORGET and non-FORGET requests are selected fairly: for each 8 non-FORGET allow 16 FORGET requests. This will make sure FORGETs do not pile up, yet other requests are also allowed to proceed while the queued FORGETs are processed. Reported-by: Terje Malmedal Signed-off-by: Miklos Szeredi commit 8ac835056ca39b242d98332f46e4d65428a8b7db Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: ioctl cleanup Get rid of unnecessary page_address()-es. Signed-off-by: Miklos Szeredi CC: Tejun Heo commit c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf Author: Ben Hutchings Date: Tue Dec 7 19:11:26 2010 +0000 sfc: Generalise filter spec initialisation Move search_depth arrays into per-table state. Define initialisation function efx_filter_init_rx() which sets everything apart from the match fields. Define efx_filter_set_{ipv4_local,ipv4_full,eth_local}() to set the match fields. This allows some simplification of callers and later support for additional protocols and more flexible matching using multiple calls to these functions. Signed-off-by: Ben Hutchings commit a96efbc1fc8e4540dc1d561bb5e42a16a7b472d5 Author: Fabio Estevam Date: Mon Dec 6 16:38:34 2010 -0200 ARM: mx5/mx51_babbage: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 7f77f91dc0171ac11a8b95ba761144d732d4e907 Author: Fabio Estevam Date: Mon Dec 6 16:38:33 2010 -0200 ARM: mx5: add watchdog clocks Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8c2efec3cd5fcc6240da8931222ccab556a40ff3 Author: Fabio Estevam Date: Mon Dec 6 16:38:32 2010 -0200 ARM: mx5: add support for the two watchdog modules MX51 has two watchdog modules. Add support for both of them. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8891681af928f1da795cd4bd59043e5e0fadd6c8 Author: Ben Hutchings Date: Tue Dec 7 19:02:27 2010 +0000 sfc: Remove filter table IDs from filter functions The separation between filter tables is largely an internal detail and it may be removed in future hardware. To prepare for that: - Merge table ID with filter index to make an opaque filter ID - Wrap efx_filter_table_clear() with a function that clears filters from both RX tables, which is all that the current caller requires Signed-off-by: Ben Hutchings commit bcd7278d8a423a255e45f4d10afe564328f1885f Author: Bob Peterson Date: Tue Dec 7 13:58:56 2010 -0500 GFS2: fsck.gfs2 reported statfs error after gfs2_grow When you do gfs2_grow it failed to take the very last rgrp into account when adding up the new free space due to an off-by-one error. It was not reading the last rgrp from the rindex because of a check for "<=" that should have been "<". Therefore, fsck.gfs2 was finding (and fixing) an error with the system statfs file. Signed-off-by: Bob Peterson commit ce56d169976488e888878eed5f1bc304cf116c43 Author: Martin Michlmayr Date: Mon Dec 6 21:53:16 2010 +0000 Kirkwood: Add support for 6282 based QNAP devices Add support for the QNAP NAS devices based on Marvell's 6282 Kirkwood chip (TS-119P+, TS-219P+ and TS-419P+). The differences to the 6281 based devices are: - Ethernet PHY address - GPIOs used for buttons (TS-119P+/TS-219P+) Signed-off-by: Martin Michlmayr Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 4bba1c34e0a70d0db2506e1b68f69d7edc8afd78 Author: Ash Hughes Date: Tue Nov 30 21:53:09 2010 +0000 [ARM] Orion: added Buffalo LS-CHL support Adds support for Buffalo Linkstation Live v3 (LS-CHL) NAS drives. Signed-off-by: Ash Hughes Acked-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit ac33ac610dc613b2b1c938f8b61eef651ab72563 Author: Ben Hutchings Date: Tue Dec 7 18:29:52 2010 +0000 sfc: Log start and end of ethtool self-test at INFO level Add message at start of self-test and increase log level of message at end of self-test, so that any other messages produced during the test are clearly associated with it. Signed-off-by: Ben Hutchings commit ff2109f5f94ff75f45e0c8d2d1d56fefdf20733f Author: Tracey Dent Date: Sun Nov 21 15:03:12 2010 +0000 Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 33d6eb570b1f3fe5ba93cef465c5be66535c2c9a Author: Valentine Barshak Date: Mon Dec 6 18:16:11 2010 +0300 HID: Consolidate device existence checks in hiddev_ioctl Currently, if the device has been removed before hiddev_ioctl(), the -EIO is returned. If it's removed while hiddev_ioctl() is in progress, some commands are still processed fine, others return -ENODEV. This change takes the "existancelock" before processing ioctl commands and releases it at the end. If the device has been removed, always returns -ENODEV. Signed-off-by: Valentine Barshak Signed-off-by: Jiri Kosina commit 1a8e8fab790ea7af81b8f964fdec706ad1ec2271 Author: Valentine Barshak Date: Mon Dec 6 17:51:41 2010 +0300 HID: Fix race between disconnect and hiddev_ioctl A USB HID device can be disconnected at any time. If this happens right before or while hiddev_ioctl is in progress, the hiddev_ioctl tries to access invalid hiddev->hid pointer. When the hid device is disconnected, the hiddev_disconnect() ends up with a call to hid_device_release() which frees hid_device, but doesn't set the hiddev->hid pointer to NULL. If the deallocated memory region has been re-used by the kernel, this can cause a crash or memory corruption. Since disconnect can happen at any time, we can't initialize struct hid_device *hid = hiddev->hid at the beginning of ioctl and then use it. This change checks hiddev->exist flag while holding the existancelock and uses hid_device only if it exists. Signed-off-by: Valentine Barshak Signed-off-by: Jiri Kosina commit b38aa89600be39b3e10c5b6529aed2e66518598e Author: Ian Munsie Date: Mon Nov 29 11:53:07 2010 +1100 perf makefile: Allow strong and weak functions in LIB_OBJS When we build perf we place all of the .o files from the library files (util, arch/x/util, etc) into libperf.a which is then linked into perf. The problem is that the linker will by default only consider .o files within the .a archive if they are necessary to satisfy an unresolved symbol. As weak functions are not unresolved, it will not consider a .o file from the archive containing the strong versions of weak functions unless it requires it for another reason. This patch adds the --whole-archive flags to the linker when passing in the libperf.a file to ensure that it will consider every .o file in the archive, not just what it believes that it needs. The end result is that weak functions can now be overridden by strong variants of them in the libperf.a file. Cc: "tom.leiming" Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290991642-sup-5890@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 7af4c0932437f97938eef67e553c8d211f9edf33 Author: Jesper Juhl Date: Sat Oct 30 15:56:54 2010 +0200 percpu: zero memory more efficiently in mm/percpu.c::pcpu_mem_alloc() Don't do vmalloc() + memset() when vzalloc() will do. tj: dropped unnecessary temp variable ptr. Signed-off-by: Jesper Juhl Signed-off-by: Tejun Heo commit 04910265078f08a73208beab70ed2a3cce4a919f Author: Tomasz Grobelny Date: Sat Dec 4 13:39:13 2010 +0100 dccp qpolicy: Parameter checking of cmsg qpolicy parameters Ensure that cmsg->cmsg_type value is valid for qpolicy that is currently in use. Signed-off-by: Tomasz Grobelny Signed-off-by: Gerrit Renker commit 871a2c16c21b988688b4ab1a78eadd969765c0a3 Author: Tomasz Grobelny Date: Sat Dec 4 13:38:01 2010 +0100 dccp: Policy-based packet dequeueing infrastructure This patch adds a generic infrastructure for policy-based dequeueing of TX packets and provides two policies: * a simple FIFO policy (which is the default) and * a priority based policy (set via socket options). Both policies honour the tx_qlen sysctl for the maximum size of the write queue (can be overridden via socket options). The priority policy uses skb->priority internally to assign an u32 priority identifier, using the same ranking as SO_PRIORITY. The skb->priority field is set to 0 when the packet leaves DCCP. The priority is supplied as ancillary data using cmsg(3), the patch also provides the requisite parsing routines. Signed-off-by: Tomasz Grobelny Signed-off-by: Gerrit Renker commit e745a6676c76280f9721adeec79b08a0f2dfcc21 Author: Magnus Damm Date: Tue Nov 16 01:07:19 2010 +0100 ARM: 6481/1: Use shared GIC entry macros on OMAP Common GIC entry macro for omap Signed-off-by: Tony Lindgren Signed-off-by: Magnus Damm Acked-by: Santosh Shilimkar Signed-off-by: Russell King commit c91a2bd70a617a638e157a7e99d4b21ee0e7b1cf Author: Magnus Damm Date: Tue Nov 16 01:03:34 2010 +0100 ARM: 6480/1: Use shared GIC entry macros on Vexpress Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Versatile Express subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 5488324a6cbae617d103c42944827d82d8f5efd4 Author: Magnus Damm Date: Tue Nov 16 01:02:06 2010 +0100 ARM: 6479/1: Use shared GIC entry macros on UX500 Use the GIC demux code in asm/hardware/entry-macro-gic.S on the UX500 subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 0005b349d5dc71471e1d47bd3efbf93f685620e1 Author: Magnus Damm Date: Tue Nov 16 01:00:40 2010 +0100 ARM: 6478/1: Use shared GIC entry macros on Tegra Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Tegra subarchitecture. Signed-off-by: Magnus Damm Acked-by: Olof Johansson Signed-off-by: Russell King commit c4d8c80f59f0611d747399a774ebef71f517a30c Author: Magnus Damm Date: Tue Nov 16 00:58:43 2010 +0100 ARM: 6477/1: Use shared GIC entry macros on Realview Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Realview subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 960351fb8e980f0aa6682f11630ff98d3a18e2c0 Author: Magnus Damm Date: Tue Nov 16 00:54:55 2010 +0100 ARM: 6476/1: Use shared GIC entry macros on CNS3XXX Use the GIC demux code in asm/hardware/entry-macro-gic.S on the CNS3XXX subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 161d1907607a5a562a152058c8daf1780ce7a00b Author: Magnus Damm Date: Tue Nov 16 00:48:07 2010 +0100 ARM: 6475/1: Introduce asm/hardware/entry-macro-gic.S This patch is the identical GIC demux implementation merge V3. Instead of implementing same code over and over simply share it in entry-macro-gic.S. The shared code is based on the realview implementation. Each GIC demux instance still has to setup the base address of the controller using the get_irqnr_preamble macro. The rest of the GIC specific code can be shared. Signed-off-by: Magnus Damm Acked-by: Srinidhi Kasagar Signed-off-by: Russell King commit 743411b3f3e96e8ac4cae73551a0a95392fed1ea Author: Felipe Balbi Date: Wed Dec 1 13:22:05 2010 +0200 usb: musb: make all glue layer export struct musb_platform_ops preparing to a big refactor on musb code. We need to be able to compile in all glue layers (or at least all ARM-based ones) together and have a working binary. While preparing for that, we move every glue layer to export only one symbol, which is a struct musb_platform_ops, and make all other functions static. Later patches will come to allow for compiling all glue layers together and have a working binary. Signed-off-by: Felipe Balbi commit 75b5293a5d176cd9caf6dc590da4f3458c048c3c Merge: 10a18d7 ce47dc5 Author: Ingo Molnar Date: Tue Dec 7 07:51:14 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 10a18d7dc0d9f12483c95ffc234118e9b80edfeb Merge: f984ba4 cf7d7e5 Author: Ingo Molnar Date: Tue Dec 7 07:49:48 2010 +0100 Merge commit 'v2.6.37-rc5' into perf/core Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar commit 3ca8abb84522f4b773678726db6ebd6fc277bc96 Author: Felipe Balbi Date: Thu Oct 21 13:56:40 2010 +0300 usb: musb: introduce struct musb_platform_ops This will be passed to musb_core by platform glue layer in order to make it easier to compile support for several HW glue layers. Later patches will come using this structure and also moving HW glue layers to its own platform driver; the idea is to be able to handle platform peculiarities in a manner which doesn't affect one another. Signed-off-by: Felipe Balbi commit cfa969e385a23e4c85f50e0ed5de25a2e18bf9d4 Author: David S. Miller Date: Mon Dec 6 20:45:28 2010 -0800 Revert "ehea: Use the standard logging functions" This reverts commit 539995d18649023199986424d140f1d620372ce5. As reported by Stephen Rothwell, this breaks the build. Signed-off-by: David S. Miller commit cd38557d78554fd4318fe448f728a8d7ff1cbabb Author: Ben Hutchings Date: Mon Nov 15 23:53:11 2010 +0000 sfc: Use TX push whenever adding descriptors to an empty queue Whenever we add DMA descriptors to a TX ring and update the ring pointer, the TX DMA engine must first read the new DMA descriptors and then start reading packet data. However, all released Solarflare 10G controllers have a 'TX push' feature that allows us to reduce latency by writing the first new DMA descriptor along with the pointer update. This is only useful when the queue is empty. The hardware should ignore the pushed descriptor if the queue is not empty, but this check is buggy, so we must do it in software. In order to tell whether a TX queue is empty, we need to compare the previous transmission count (write_count) and completion count (read_count). However, if we do that every time we update the ring pointer then read_count may ping-pong between the caches of two CPUs running the transmission and completion paths for the queue. Therefore, we split the check for an empty queue between the completion path and the transmission path: - Add an empty_read_count field representing a point at which the completion path saw the TX queue as empty. - Add an old_write_count field for use on the completion path. - On the completion path, whenever read_count reaches or passes old_write_count the TX queue may be empty. We then read write_count, set empty_read_count if read_count == write_count, and update old_write_count. - On the transmission path, we read empty_read_count. If it's set, we compare it with the value of write_count before the current set of descriptors was added. If they match, the queue really is empty and we can use TX push. Signed-off-by: Ben Hutchings commit e506147271229d6c53b42c6a9897db67b5cfdb6d Author: Ben Hutchings Date: Mon Dec 6 22:58:41 2010 +0000 sfc: Remove locking from implementation of efx_writeo_paged() It is not necessary to serialise writes to the paged 128-bit registers. However, if we don't then we must always write the last dword separately, not as part of a qword write. Signed-off-by: Ben Hutchings commit 1a29cc40115c011895143c5f8278dee49423d5df Author: Ben Hutchings Date: Mon Dec 6 22:55:33 2010 +0000 sfc: Add compile-time checks for correctness of paged register writes Signed-off-by: Ben Hutchings commit 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa Author: Ben Hutchings Date: Mon Dec 6 22:55:18 2010 +0000 sfc: Remove redundant memory barriers between MMIOs Signed-off-by: Ben Hutchings commit 9f2f6cd07a09bc0af1f2950189e426569561d1e6 Author: Ben Hutchings Date: Mon Dec 6 22:55:00 2010 +0000 sfc: Expand/correct comments on collector behaviour and function usage Document exactly which registers and functions have special behaviour, and why races on writes to descriptor pointers are safe. Signed-off-by: Ben Hutchings commit 51c56f40ef41ca780ff001d59727eda03fa39374 Author: Ben Hutchings Date: Wed Nov 10 18:46:40 2010 +0000 sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count Signed-off-by: Ben Hutchings commit ab28c12a8e6fea875b6757052e211772f62fa771 Author: Ben Hutchings Date: Mon Dec 6 22:53:15 2010 +0000 sfc: Reorder struct efx_nic to separate fields by volatility Place the regularly updated fields (locks, MAC stats, etc.) on a separate cache-line from fields which are mostly constant. This should reduce cache misses for access to the latter on the data path. Signed-off-by: Ben Hutchings commit 40fe7d88ab3eb711b307fab1b92aa6870914c975 Author: Tobias Klauser Date: Thu Dec 2 07:22:05 2010 +0000 net: cris/eth_v10: Use net_device_stats from struct net_device_stats struct net_device has its own struct net_device_stats member, so use this one instead of a private copy in struct net_local. Note: This patch was not even compile tested. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit b27d50a9ff5cf2775b7a4daf571a0cc72d013b9c Author: Tobias Klauser Date: Thu Dec 2 07:20:39 2010 +0000 net: emaclite: Omit private ndo_get_stats function xemaclite_get_stats() just returns dev->stats so we can leave it out alltogether and let dev_get_stats() do the job. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit e176bbc5893bef36a0909de31dea97865660a7c9 Author: Tobias Klauser Date: Thu Dec 2 07:20:05 2010 +0000 net: am79c961a: Omit private ndo_get_stats function am79c961_getstats() just returns dev->stats so we can leave it out alltogether and let dev_get_stats() do the job. Signed-off-by: Tobias Klauser Acked-by: Russell King Signed-off-by: David S. Miller commit 9f91170773d852e65e4fc36e1f8173ce614f62e1 Author: Don Skidmore Date: Fri Dec 3 13:24:05 2010 +0000 ixgbe: fix enum type mismatch on disable laser Fixes a recent bug on the patch (c6ecf39a10ceec3e97096e2a8d3eadcecd593422) that disabled the laser on ifconfig down. Compilers were seeing a enum mismatch. Signed-off-by Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a7f5a5fcd9f13afd3471a0de8c1fdaa8f989497c Author: Don Skidmore Date: Fri Dec 3 13:23:30 2010 +0000 ixgbe: fix for link failure on SFP+ DA cables This patch helps prevent FW/SW semaphore collision from leading to link establishment failure. The collision might mess up the PHY registers so we reset the PHY. However there are SFI/KR areas in the PHY that are not reset with a Reset_AN so we need to change LMS to reset it. Also wait until AN state machine is AN_GOOD Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8917a3c0b7d1557548f50bfe3f0e18e0354e38f6 Author: David Shwatrz Date: Thu Dec 2 09:01:55 2010 +0000 Fix a typo in datagram.c and sctp/socket.c. Hi, This patch fixes a typo in net/core/datagram.c and in net/sctp/socket.c Regards, David Shwartz Signed-off-by: David Shwartz Signed-off-by: David S. Miller commit 22de94de7de78b8de2fb1f2df5aa85b5556cfcfd Author: Stanislaw Gruszka Date: Fri Dec 3 15:41:48 2010 +0100 iwlwifi: jiffies based tx queues watchdog This patch replace monitor/recover timer by watchdog based on time stamp. New code allow to discover hangs more precisely. Timeout values are currently doubled monitoring period values of previous timer. This have to be tuned based of firmware timing capabilities. Tested on 3945, 4965, 5300, 6300. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit abc471dc31be15f9fee5ec77f25d31b927d334b9 Author: Stanislaw Gruszka Date: Fri Dec 3 15:41:47 2010 +0100 iwl3945: prevent too frequent firmware resets Similarly like on iwlagn, initialize reset duration on iwl3945 to prevent too frequent firmware resets. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 29cbe68c516a48a9a88b3226878570c6cbd83c02 Author: Johannes Berg Date: Fri Dec 3 09:20:44 2010 +0100 cfg80211/mac80211: add mesh join/leave commands Instead of tying mesh activity to interface up, add join and leave commands for mesh. Since we must be backward compatible, let cfg80211 handle joining a mesh if a mesh ID was pre-configured when the device goes up. Note that this therefore must modify mac80211 as well since mac80211 needs to lose the logic to start the mesh on interface up. We now allow querying mesh parameters before the mesh is connected, which simply returns defaults. Setting them (internally renamed to "update") is only allowed while connected. Specify them with the new mesh join command instead where needed. In mac80211, beaconing must now also follow the mesh enabled/not enabled state, which is done by testing the mesh ID. Signed-off-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit bd90fdcc5fbd99a2a778999610420cf793bd1be2 Author: Johannes Berg Date: Fri Dec 3 09:20:43 2010 +0100 nl80211: refactor mesh parameter parsing I'm going to need this in a new place later. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f9e10ce4cf86945eb5efcab31284c971877ed012 Author: Johannes Berg Date: Fri Dec 3 09:20:42 2010 +0100 cfg80211: require add_virtual_intf to return new dev cfg80211 used to do all its bookkeeping in the notifier, but some new stuff will have to use local variables so make the callback return the netdev pointer. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 09b174702601079c3a04806754be30ffbd70db4d Author: Johannes Berg Date: Fri Dec 3 09:20:41 2010 +0100 mac80211: move mesh filter adjusting Logically, the filter adjusting belongs with starting/stopping mesh, not interface up/down, so move it there. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 45904f21655cf4f0ae7d0fab5906fe51bf56ecf4 Author: Javier Cardona Date: Fri Dec 3 09:20:40 2010 +0100 nl80211/mac80211: define and allow configuring mesh element TTL The TTL in path selection information elements is different from the mesh ttl used in mesh data frames. Version 7.03 of the 11s draft calls this ttl 'Element TTL'. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b9e61f11f47035e3b4545b51fb547fef48eb3096 Author: Nick Kossifidis Date: Fri Dec 3 06:12:39 2010 +0200 ath5k: Include tx ack reporting on hw flags * Since we report tx acks to the protocol stack, add the needed flag to hw_flags. This way we'll also use the new AP probing mechanism. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit f0e134a53ad95ba7a393b299ae56c9bdcaed8aec Author: Nick Kossifidis Date: Fri Dec 3 06:09:38 2010 +0200 ath5k: Fix reporting of RX dma stop failure * Correctly report failure to stop RX DMA Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 344b54b971bc5578281264fb6896e13b4120352b Author: Nick Kossifidis Date: Fri Dec 3 06:07:13 2010 +0200 ath5k: Disable ANI during reset * Stop ANI durring reset to prevent false PHY error reports Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 19252ecb672d3f35959c576d1d26b9aca350f5bf Author: Nick Kossifidis Date: Fri Dec 3 06:05:19 2010 +0200 ath5k: Always free tx buffers before reset * Always free tx buffers before reset, since we also empty hw queues. If we don't and a queue gets stuck, we'll never decrease txq_len and sw will keep thinking the queue is still stuck even after reset. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 2d5311e4e8272fd398fc1cf278f12fd6dee4074b Author: Eric Dumazet Date: Wed Dec 1 20:46:24 2010 +0000 filter: add a security check at install time We added some security checks in commit 57fe93b374a6 (filter: make sure filters dont read uninitialized memory) to close a potential leak of kernel information to user. This added a potential extra cost at run time, while we can perform a check of the filter itself, to make sure a malicious user doesnt try to abuse us. This patch adds a check_loads() function, whole unique purpose is to make this check, allocating a temporary array of mask. We scan the filter and propagate a bitmask information, telling us if a load M(K) is allowed because a previous store M(K) is guaranteed. (So that sk_run_filter() can possibly not read unitialized memory) Note: this can uncover application bug, denying a filter attach, previously allowed. Signed-off-by: Eric Dumazet Cc: Dan Rosenberg Cc: Changli Gao Acked-by: Changli Gao Signed-off-by: David S. Miller commit ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5 Author: Changli Gao Date: Wed Dec 1 20:07:31 2010 +0000 net: arp: use assignment Only when dont_send is 0, arp_filter() is consulted, so we can simply assign the return value of arp_filter() to dont_send instead. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 6464281161e46254ac39505ad41d21dbe7d1738f Author: Sathya Perla Date: Wed Dec 1 01:04:17 2010 +0000 be2net: Handle out of buffer completions for lancer If Lancer chip does not have posted RX buffers, it posts an RX completion entry with the same frag_index as the last valid completion. The Error bit is also set. In BE, a flush completion is indicated with a zero value for num_rcvd in the completion. Such completions don't carry any data and are not processed. This patch refactors code to handle both cases with the same code. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 359a972fae84242efa26b86bf09c3ac3784405ba Author: Sathya Perla Date: Wed Dec 1 01:03:36 2010 +0000 be2net: FW init cmd fix for lancer Lancer can use the same pattern as BE to indicate a driver load to the FW. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 63657b9c319588cd35ed869e19cc6255dbef0d20 Author: Sathya Perla Date: Wed Dec 1 01:02:28 2010 +0000 be2net: Fix be_dev_family_check() return value check Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit c56b4d90123b77e29a91b9b96bb791f929139d8e Author: Changli Gao Date: Wed Dec 1 02:52:57 2010 +0000 af_packet: remove pgv.flags As we can check if an address is vmalloc address with is_vmalloc_addr(), we remove pgv.flags. Then we may get more pg_vecs. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 0af55bb58f8fa7865004ac48d16affe125ac1b7f Author: Changli Gao Date: Wed Dec 1 02:52:20 2010 +0000 af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc() The following commit causes the pgv->buffer may point to the memory returned by vmalloc(). And we can't use virt_to_page() for the vmalloc address. This patch introduces a new inline function pgv_to_page(), which calls vmalloc_to_page() for the vmalloc address, and virt_to_page() for the __get_free_pages address. We used to increase page pointer to get the next page at the next page address, after Neil's patch, it is wrong, as the physical address may be not continuous. This patch also fixes this issue. commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit f7fce74e387e0563e5a165704664aa5ee8b2f48b Author: Eric Dumazet Date: Wed Dec 1 06:03:06 2010 +0000 net: kill an RCU warning in inet_fill_link_af() commits 9f0f7272 (ipv4: AF_INET link address family) and cf7afbfeb8c (rtnl: make link af-specific updates atomic) used incorrect __in_dev_get_rcu() in RTNL protected contexts, triggering PROVE_RCU warnings. Switch to __in_dev_get_rtnl(), wich is more appropriate, since we hold RTNL. Based on a report and initial patch from Amerigo Wang. Reported-by: Amerigo Wang Signed-off-by: Eric Dumazet Cc: Thomas Graf Reviewed-by: WANG Cong Signed-off-by: David S. Miller commit 06a9701f4b3e3381dea96fee1cc8a3bb41b0a1f1 Author: Eric Dumazet Date: Wed Dec 1 01:37:42 2010 +0000 __in_dev_get_rtnl() can use rtnl_dereference() If caller holds RTNL, we dont need a memory barrier (smp_read_barrier_depends) included in rcu_dereference(). Just use rtnl_dereference() to properly document the assertions. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit da2033c282264bfba4e339b7cb3df62adb5c5fc8 Author: Eric Dumazet Date: Tue Nov 30 21:45:56 2010 +0000 filter: add SKF_AD_RXHASH and SKF_AD_CPU Add SKF_AD_RXHASH and SKF_AD_CPU to filter ancillary mechanism, to be able to build advanced filters. This can help spreading packets on several sockets with a fast selection, after RPS dispatch to N cpus for example, or to catch a percentage of flows in one queue. tcpdump -s 500 "cpu = 1" : [0] ld CPU [1] jeq #1 jt 2 jf 3 [2] ret #500 [3] ret #0 # take 12.5 % of flows (average) tcpdump -s 1000 "rxhash & 7 = 2" : [0] ld RXHASH [1] and #7 [2] jeq #2 jt 3 jf 4 [3] ret #1000 [4] ret #0 Signed-off-by: Eric Dumazet Cc: Rui Acked-by: Changli Gao Signed-off-by: David S. Miller commit 539995d18649023199986424d140f1d620372ce5 Author: Joe Perches Date: Tue Nov 30 08:18:44 2010 +0000 ehea: Use the standard logging functions Remove ehea_error, ehea_info and ehea_debug macros. Use pr_fmt, pr_, netdev_ and netif_ as appropriate. Fix messages to use trailing "\n", some messages had an extra one as the old ehea_ macros added a trailing "\n". Coalesced long format strings. Uncompiled/untested. Signed-off-by: Joe Perches Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 7903264402546f45f9bac8ad2bfdb00d00eb124a Author: Michał Mirosław Date: Tue Nov 30 06:38:00 2010 +0000 net: Fix too optimistic NETIF_F_HW_CSUM features NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but some drivers miss the difference. Fix this and also fix UFO dependency on checksumming offload as it makes the same mistake in assumptions. Signed-off-by: Michał Mirosław Acked-by: Jon Mason Signed-off-by: David S. Miller commit 900d495a189dc3ff5952b98a77d18e3018f8286c Author: Alexey Orishko Date: Mon Nov 29 23:23:28 2010 +0000 USB CDC NCM host driver The patch provides USB CDC NCM host driver support in the Linux Kernel. Changes: drivers/net/usb/cdc_ncm.c: - initial submission of the CDC NCM host driver; - verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM) - throughput measured over 100 Mbits duplex; - driver supports 16-bit NTB format only, but it is more than enough for transfers up to 64K; - driver can handle up to 32 datagrams in received NTB; - timer is used to collect several packets in Tx direction drivers/net/usb/Kconfig: - a new entry to compile CDC NCM host driver drivers/net/usb/Makefile: - a new entry to compile CDC NCM host driver Signed-off-by: Alexey Orishko Signed-off-by: David S. Miller commit 073285fd392f6dc901da7c698d46e1e2a7e26436 Author: Alexey Orishko Date: Mon Nov 29 23:23:27 2010 +0000 usbnet: changes for upcoming cdc_ncm driver Changes: include/linux/usb/usbnet.h: - a new flag to indicate driver's capability to accumulate IP packets in Tx direction and extract several packets from single skb in Rx direction. drivers/net/usb/usbnet.c: - the procedure of counting packets in usbnet was updated due to the accumulating of IP packets in the driver - no short packets are sent if indicated by the flag in driver_info structure Signed-off-by: Alexey Orishko Signed-off-by: David S. Miller commit d84938c9be85f4738a350ef44210789fef915cb7 Author: Nick Kossifidis Date: Fri Dec 3 06:03:00 2010 +0200 ath5k: Always write tx powertable on hw * By skipping tx power table calibration we also skip setting tx power table on hw. Make sure we always write tx power table on hw since it gets cleared on reset. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 04ac3c0ee2c773c321ec472d892635a20556f34d Author: Felix Fietkau Date: Thu Dec 2 21:01:08 2010 +0100 mac80211: speed up AP probing using nullfunc frames If the nullfunc frame used to probe the AP was not acked, there is no point in waiting for the probe timeout, so advance to the next try (or disconnect) immediately. If we do reach the probe timeout without having received a tx status, the connection is probably really bad and worth disconnecting. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 75706d0e9d19601534446982b70102bb9327169b Author: Felix Fietkau Date: Thu Dec 2 21:01:07 2010 +0100 mac80211: remove a redundant check ieee80211_is_nullfunc() implies ieee80211_is_data() Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit af5568843594fb71055debe36e521fa8072fcecc Author: Bruno Randolf Date: Thu Dec 2 19:50:37 2010 +0900 lib: Improve EWMA efficiency by using bitshifts Using bitshifts instead of division and multiplication should improve performance. That requires weight and factor to be powers of two, but i think this is something we can live with. Thanks to Peter Zijlstra for the improved formula! Signed-off-by: Bruno Randolf -- v2: use log2.h functions Signed-off-by: John W. Linville commit 5dcc03fe29537edd7819f5b121bf3d779693f37b Author: Bruno Randolf Date: Thu Dec 2 19:12:31 2010 +0900 ath5k: Use EWMA factor of 1024 instead of 1000 This prepares the only place which uses the EWMA library so far for the performance improved implementation coming up, which requires factor and weight to be a power of two. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 9a10a870e09f1fd50fd024d55232b4b72cf4e387 Author: Joe Perches Date: Wed Dec 1 09:37:55 2010 -0800 MAINTAINERS: Add ATH GENERIC UTILITIES This file pattern is not currently shown as maintained by atheros. Perhaps it should be? Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit c1ce5a74d113f221d40625bd3ad83df2db2695b7 Author: Helmut Schaa Date: Wed Dec 1 16:34:45 2010 +0100 mac80211: Update last_tx_rate only for data frames The last_tx_rate field was also updated for non-data frames that are often sent with a lower rate (for example management frames at 1 Mbps). This is confusing when the data rate is actually much higher. Hence, only update the last_tx_rate field with tx rate information gathered from last data frames. If the rate control algorithm filled in txrc.reported_rate we don't need to verify this information. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 5f79ed3b1aa7af260c82ba714b90907070aeca7a Merge: 09f921f 9f28ebc Author: John W. Linville Date: Mon Dec 6 15:52:27 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit f435d9eea01309aa7b6c1f134569a7b5957918ae Merge: 5ee4937 09f921f Author: John W. Linville Date: Mon Dec 6 15:35:34 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 991cfffa7c19aa648546aff666595af896e568ba Author: Feng Tang Date: Fri Dec 3 11:51:37 2010 +0800 x86, earlyprintk: Move mrst early console to platform/ and fix a typo Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST Signed-off-by: Feng Tang Cc: alan@linux.intel.com LKML-Reference: <1291348298-21263-1-git-send-email-feng.tang@intel.com> Signed-off-by: Thomas Gleixner commit 5ee493767352314893520ac40aec5bb07d0147e0 Author: Matt Carlson Date: Mon Dec 6 08:28:54 2010 +0000 tg3: Update version to 3.116 This patch updates the tg3 version to 3.116. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit a386b9011a4687470e6168e2f2a08c468f25f72f Author: Matt Carlson Date: Mon Dec 6 08:28:53 2010 +0000 tg3: Relax EEE thresholds The hardware defaults to fairly aggressive EEE thresholds. While there appear to be no ill effects, this patch relaxes them, just as a precaution. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit a6b68dab169e2a51e59f43504f1279cbc2afcde8 Author: Matt Carlson Date: Mon Dec 6 08:28:52 2010 +0000 tg3: Minor EEE code tweaks The first hunk of this patch makes sure that the driver checks for the appropriate preconditions before checking if EEE negotiation succeeded. More specifically the link needs to be full duplex for EEE to be enabled. The second and third hunks of this patch fix a bug where the eee advertisement register would be programmed with extra bits set. The fourth hunk of this patch makes sure the EEE capability flag is not set for 5718 A0 devices and that the device is not a serdes device. None of these modifications are strictly necessary. The driver / hardware still does the right thing. They are submitted primarily for correctness. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 699c019385fcb13498a5a3a8bd368f04f1d4a223 Author: Matt Carlson Date: Mon Dec 6 08:28:51 2010 +0000 tg3: Fix 57765 EEE support EEE support in the 57765 internal phy will not enable after a phy reset unless it sees that EEE is supported in the MAC. This patch moves the code that programs the CPMU EEE registers to a place before the phy reset. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 3110f5f5545a645c50ef66b1f705d08dfd1df404 Author: Matt Carlson Date: Mon Dec 6 08:28:50 2010 +0000 tg3: Move EEE definitions into mdio.h In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add EEE support", Ben Hutchings had commented that the EEE advertisement register will be in a standard location. This patch moves that definition into mdio.h and changes the code to use it. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 8fc2f9956127d2b85280c07e69aeb08b9bd85150 Author: Matt Carlson Date: Mon Dec 6 08:28:49 2010 +0000 tg3: Raise the jumbo frame BD flag threshold The current transmit routines set the jumbo frame BD flag too aggressively. This can reduce performance for common cases. This patch raises the jumbo flag threshold to 1518, up from 1500. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit df6bd743b6f06b066c1c3ba7f2853a6e8d61468c Author: Gustavo F. Padovan Date: Mon Jun 14 02:26:15 2010 -0300 Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state If such event happens we shall reply with a Command Reject, because we are not expecting any configure request. Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit f984ba4eb575e4a27ed28a76d4126d2aa9233c32 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:34 2010 +0900 kprobes: Use text_poke_smp_batch for unoptimizing Use text_poke_smp_batch() on unoptimization path for reducing the number of stop_machine() issues. If the number of unoptimizing probes is more than MAX_OPTIMIZE_PROBES(=256), kprobes unoptimizes first MAX_OPTIMIZE_PROBES probes and kicks optimizer for remaining probes. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Peter Zijlstra Cc: Steven Rostedt LKML-Reference: <20101203095434.2961.22657.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit cd7ebe2298ff1c3112232878678ce5fe6be8a15b Author: Masami Hiramatsu Date: Fri Dec 3 18:54:28 2010 +0900 kprobes: Use text_poke_smp_batch for optimizing Use text_poke_smp_batch() in optimization path for reducing the number of stop_machine() issues. If the number of optimizing probes is more than MAX_OPTIMIZE_PROBES(=256), kprobes optimizes first MAX_OPTIMIZE_PROBES probes and kicks optimizer for remaining probes. Changes in v5: - Use kick_kprobe_optimizer() instead of directly calling schedule_delayed_work(). - Rescheduling optimizer outside of kprobe mutex lock. Changes in v2: - Allocate code buffer and parameters in arch_init_kprobes() instead of using static arraies. - Merge previous max optimization limit patch into this patch. So, this patch introduces upper limit of optimization at once. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Peter Zijlstra Cc: Steven Rostedt LKML-Reference: <20101203095428.2961.8994.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 7deb18dcf0478940ac979de002db1ed8ba6531dc Author: Masami Hiramatsu Date: Fri Dec 3 18:54:22 2010 +0900 x86: Introduce text_poke_smp_batch() for batch-code modifying Introduce text_poke_smp_batch(). This function modifies several text areas with one stop_machine() on SMP. Because calling stop_machine() is heavy task, it is better to aggregate text_poke requests. ( Note: I've talked with Rusty about this interface, and he would not like to expand stop_machine() interface, since it is not for generic use. ) Signed-off-by: Masami Hiramatsu Acked-by: Steven Rostedt Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Jan Beulich Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095422.2961.51217.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 0490cd1f9d99569d3bd64e17adc88db06a5007be Author: Masami Hiramatsu Date: Fri Dec 3 18:54:16 2010 +0900 kprobes: Reuse unused kprobe Reuse unused (waiting for unoptimizing and no user handler) kprobe on given address instead of returning -EBUSY for registering a new kprobe. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095416.2961.39080.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6274de4984a630b45c6934b3ee62e5692c745328 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:09 2010 +0900 kprobes: Support delayed unoptimizing Unoptimization occurs when a probe is unregistered or disabled, and is heavy because it recovers instructions by using stop_machine(). This patch delays unoptimization operations and unoptimize several probes at once by using text_poke_smp_batch(). This can avoid unexpected system slowdown coming from stop_machine(). Changes in v5: - Split this patch into several cleanup patches and this patch. - Fix some text_mutex lock miss. - Use bool instead of int for behavior flags. - Add additional comment for (un)optimizing path. Changes in v2: - Use dynamic allocated buffers and params. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095409.2961.82733.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 61f4e13ffd85c037a942c5b7fd13f2b0c3162862 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:03 2010 +0900 kprobes: Separate kprobe optimizing code from optimizer Separate kprobe optimizing code from optimizer, this will make easy to introducing unoptimizing code in optimizer. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095403.2961.91201.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6f0f1dd71953d4243c11e490dd49ef24ebaf6c0b Author: Masami Hiramatsu Date: Fri Dec 3 18:53:57 2010 +0900 kprobes: Cleanup disabling and unregistering path Merge disabling kprobe to unregistering kprobe function and add comments for disabing/unregistring process. Current unregistering code disables(disarms) kprobes after checking target kprobe status. This patch changes it to disabling kprobe first after that it changing the kprobe's state. This allows to share probe disabling code between disable_kprobe() and unregister_kprobe(). Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095356.2961.30152.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6d8e40a85ef72a0514ebd00748eb18cab432b200 Author: Masami Hiramatsu Date: Fri Dec 3 18:53:50 2010 +0900 kprobes: Rename old_p to more appropriate name Rename irrelevant uses of "old_p" to more appropriate names. Originally, "old_p" just meant "the old kprobe on given address" but current code uses that name as "just another kprobe" or something like that. This patch renames those pointer names to more appropriate one for maintainability. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095350.2961.48110.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit e4d2ebcab11b308b5b59073578efd33eccd55d46 Author: Feng Tang Date: Fri Dec 3 11:51:38 2010 +0800 x86, apbt: Setup affinity for apb timers acting as per-cpu timer Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot the affinity setup when cleaning up the code, this patch just adds the forgotten part Signed-off-by: Feng Tang Cc: Jacob Pan Cc: Alan Cox LKML-Reference: <1291348298-21263-2-git-send-email-feng.tang@intel.com> Signed-off-by: Thomas Gleixner commit 5ec6960f6f0c7be9cc6e5506fdf0070add3b6e08 Author: Dirk Brandewie Date: Mon Nov 22 06:28:48 2010 -0800 ce4100: Add errata fixes for UART on CE4100 This patch enables the UART on the CE4100. The UART has a couple of issues that need to be worked around. First the UART is mostly PC compatible except that it is clocked eight times faster than a standard PC so the default configuration provided in arch/x86/include/asm/serial.h needs to be overridden. Second the TX interrupt may not be set correctly all the time. Lastly accessing the UART via I/O space for early_prink() hangs the chip when the IOAPIC is enabled. A custom mem_serial_in() is provided to work around the TX interrupt issue. The configuration issues are dealt with in the call back registered with the 8250 driver via serial8250_set_isa_configurator() Signed-off-by: Dirk Brandewie LKML-Reference: <1290436128-17958-1-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit ce47dc56a2241dc035160a85bc5e34283cdd622c Author: Chris Samuel Date: Sat Nov 13 13:35:06 2010 +1100 perf tools: Catch a few uncheck calloc/malloc's There were a few stray calloc()'s and malloc()'s which were not having their return values checked for success. As the calling code either already coped with failure or didn't actually care we just return -ENOMEM at that point. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Chris Samuel LKML-Reference: <4CDDF95A.1050400@csamuel.org> Signed-off-by: Arnaldo Carvalho de Melo commit 965bb6beaf70862d3846e330ea7a14996d82c499 Author: Stephane Eranian Date: Fri Dec 3 17:52:01 2010 +0200 perf script: Fix compiler warning in builtin_script.c:is_top_script() Fix annoying compiler warning in the is_top_script() function. The issue was that a const char * was cast into a char * to call ends_with(). We fix the users of ends_with() instead. Some are passing a char *, but it is okay to cast the return value of ends_with() to char * (because we understand what ends_with() does). Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian LKML-Reference: <4cf92096.17edd80a.1540.5d60@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit cbf41645f35224798cb61641766e6a16e141ffe4 Author: Thomas Gleixner Date: Sun Dec 5 14:32:55 2010 +0100 perf session: Sort all events if ordered_samples=true Now that we have timestamps on FORK, EXIT, COMM, MMAP events we can sort everything in time order. This fixes the following observed problem: mmap(file1) -> pagefault() -> munmap(file1) mmap(file2) -> pagefault() -> munmap(file2) Resulted in decoding both pagefaults in file2 because the file1 map was already replaced by the file2 map when the map address was identical. With all events sorted we decode both pagefaults correctly. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit e4e18d568b0e833c75c1f7833e1690cdde8f4d76 Author: Akihiro Nagai Date: Fri Dec 3 12:58:53 2010 +0900 perf options: add OPT_CALLBACK_DEFAULT_NOOPT Add new macro OPT_CALLBACK_DEFAULT_NOOPT for parse_options. It enables to pass the default value (opt->defval) to the callback function processing options require no argument. Reviewed-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20101203035853.7827.17502.stgit@localhost6.localdomain6> Signed-off-by: Akihiro Nagai Signed-off-by: Arnaldo Carvalho de Melo commit 1437a30aae865d83c7d96e3401f503a73fffe14d Author: Ian Munsie Date: Mon Dec 6 13:37:04 2010 +1100 perf hist: Better displaying of unresolved DSOs and symbols In the event that a DSO has not been identified, just print out [unknown] instead of the instruction pointer as we previously were doing, which is pretty meaningless for a shared object (at least to the users perspective). The IP we print out is fairly meaningless in general anyway - it's just one (the first) of the many addresses that were lumped together as unidentified, and could span many shared objects and symbols. In reality if we see this [unknown] output then the report -D output is going to be more useful anyway as we can see all the different address that it represents. If we are printing the symbols we are still going to see this IP in that column anyway since they shouldn't resolve either. This patch also changes the symbol address printouts so that they print out 0x before the address, are left aligned, and changes the %L format string (which relies on a glibc bug) to %ll. Before: 74.11% :3259 4a6c [k] 4a6c After: 74.11% :3259 [unknown] [k] 0x4a6c Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <1291603026-11785-2-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 Author: Sebastian Andrzej Siewior Date: Fri Nov 26 17:50:20 2010 +0100 x86: io_apic: Split setup_ioapic_ids_from_mpc() Sodaville needs to setup the IO_APIC ids as the boot loader leaves them uninitialized. Split out the setter function so it can be called unconditionally from the sodaville board code. Signed-off-by: Sebastian Andrzej Siewior Cc: Yinghai Lu LKML-Reference: <20101126165020.GA26361@www.tglx.de> Signed-off-by: Thomas Gleixner commit 4a55c18e2023096c8684fae5fa1cfa96a03172ff Author: Will Deacon Date: Mon Nov 29 17:06:53 2010 +0000 ARM: hw_breakpoint: fix warnings generated by sparse sparse doesn't like per-cpu accesses such as: static DEFINE_PER_CPU(struct perf_event *, foo[MAXLEN]); struct perf_event **bar = __get_cpu_var(foo); and shouts quite loudly about it: | warning: incorrect type in assignment (different modifiers) | expected struct perf_event **slots | got struct perf_event *[noderef] * This patch adds casts to these sorts of assignments in hw_breakpoint.c in order to silence the warnings. Reported-by: Russell King Signed-off-by: Will Deacon commit ce9b1b09520789223f72a9fefd5f0e329f8d89d0 Author: Will Deacon Date: Thu Nov 25 12:59:31 2010 +0000 ARM: ptrace: fix style issue with hw_breakpoint interface This patch fixes a trivial style issue in ptrace.c. Signed-off-by: Will Deacon commit 3ce70b2e24cd35cc9f2df8cf5205b8ab4e6178e1 Author: Will Deacon Date: Wed Dec 1 17:05:24 2010 +0000 ARM: hw_breakpoint: disallow per-cpu breakpoints without overflow handler Single-stepping a breakpoint requires us to disable it temporarily so that we don't get stuck in a recursive debug trap. With per-cpu breakpoints this presents a problem where an interrupt can be taken before the single-step has completed and a new task is eventually scheduled. This new task will not hit the breakpoint because it will have been disabled during the previous handling code. This patch disallows per-cpu breakpoints on ARM when an overflow handler is not present. A similar effect can be created by placing breakpoints on a shell and then running applications there. Signed-off-by: Will Deacon commit 9ebb3cbcc39d4e61ae6751167086acfb5c201e6f Author: Will Deacon Date: Wed Dec 1 14:12:13 2010 +0000 ARM: hw_breakpoint: unify single-stepping code for watchpoints and breakpoints The single-stepping code is currently different depending on whether we are stepping over a breakpoint or a watchpoint. There is no good reason for this, so let's sort it out. This patch adds functions for enabling/disabling single-step for a particular hw_breakpoint and integrates this with the exception handling code. Signed-off-by: Will Deacon commit 93a04a3416da12647c47840ebe2bb812fcb801d0 Author: Will Deacon Date: Mon Nov 29 16:56:01 2010 +0000 ARM: hw_breakpoint: do not allocate new breakpoints with preemption disabled The watchpoint single-stepping code calls register_user_hw_breakpoint to register a mismatch breakpoint for stepping over the watchpoint. This is performed with preemption disabled, which is unsafe as we may end up scheduling whilst in_atomic(). Furthermore, using the perf API is rather overkill since we are already in the hw-breakpoint backend and only require access to reserved breakpoints anyway. This patch reworks the watchpoint stepping code so that we don't require another perf_event for the mismatch breakpoint. Instead, we hold a separate arch_hw_breakpoint_ctrl struct inside the watchpoint which is used exclusively for stepping. We can check whether or not stepping is enabled when installing or uninstalling the watchpoint and operate on the breakpoint accordingly. Signed-off-by: Will Deacon commit 0017ff42ac37ff6aeb87d0b006c5d32b9a39f5fc Author: Will Deacon Date: Sun Nov 28 15:09:36 2010 +0000 ARM: hw_breakpoint: don't advertise reserved breakpoints To permit handling of watchpoint exceptions without signalling a debugger, it is necessary to reserve breakpoint registers for in-kernel use only. This patch ensures that we record and subtract the number of reserved breakpoints from the number of usable breakpoint registers that we advertise to userspace via the ptrace API. Signed-off-by: Will Deacon commit 7e20269647169e7ea08a62bdc4979a3ba32e615c Author: Will Deacon Date: Sun Nov 28 14:57:24 2010 +0000 ARM: hw_breakpoint: disable preemption during debug exception handling On ARM, debug exceptions occur in the form of data or prefetch aborts. One difference is that debug exceptions require access to per-cpu banked registers and data structures which are not saved in the low-level exception code. For kernels built with CONFIG_PREEMPT, there is an unlikely scenario that the debug handler ends up running on a different CPU from the one that originally signalled the event, resulting in random data being read from the wrong registers. This patch adds a debug_entry macro to the low-level exception handling code which checks whether the taken exception is a debug exception. If it is, the preempt count for the faulting process is incremented. After the debug handler has finished, the count is decremented. Acked-by: Catalin Marinas Signed-off-by: Will Deacon commit 6ee33c2712fcdff2568d9bbadb25c8e5a7c36212 Author: Will Deacon Date: Thu Nov 25 12:01:54 2010 +0000 ARM: hw_breakpoint: correct and simplify alignment fixup code The current hw_breakpoint code tries to fix up the alignment of breakpoints so that we can make use of sparse byte-address-select bits in the control register and give the illusion that we can set breakpoints on unaligned addresses. Although this works on v6 cores, v7 forbids this behaviour, instead requiring breakpoints to be set on aligned addresses and have contiguous byte-address-select ranges depending on the instruction set in use. For ARM the only supported size is 4 bytes, whilst Thumb-2 also permits 2 byte breakpoints (watchpoints can be of 1, 2, 4 or 8 bytes long). This patch simplifies the alignment fixup code so that we require addresses to be aligned to the size of the corresponding breakpoint. This allows us to handle the common case of breaking on a half-word aligned Thumb-2 instruction and also allows us to set byte watchpoints on arbitrary addresses. Signed-off-by: Will Deacon commit 7d99331e4793b52d488e911876ef11d843c6c8c9 Author: Will Deacon Date: Wed Nov 24 17:45:49 2010 +0000 ARM: hw_breakpoint: reset control registers in hotplug path The ARMv7 debug architecture doesn't make any guarantees about the contents of debug control registers following a debug logic reset. This patch ensures that we reset the control registers when a cpu comes ONLINE (for example, with hotplug) so that when we enable monitor mode while inserting a breakpoint we won't exhibit random behaviour. Signed-off-by: Will Deacon commit ac88e07122fc0eb5cbad403be97ef02c317a06b7 Author: Will Deacon Date: Wed Nov 24 16:51:17 2010 +0000 ARM: hw_breakpoint: ensure OS lock is clear before writing to debug registers ARMv7 architects a system for saving and restoring the debug registers across low-power modes. At the heart of this system is a lock register which, when set, forbids writes to the debug registers. While locked, writes to debug registers via the co-processor interface will result in undefined instruction traps. Linux currently doesn't make use of this feature because we update the debug registers on context switch anyway, however the status of the lock is IMPLEMENTATION DEFINED on reset. This patch ensures that the lock is cleared during boot so that we can write to the debug registers safely. Signed-off-by: Will Deacon commit 0e44e059588e1d91f3a1974d2ce3348864d1d799 Merge: 96886c4 e8a7e48 Author: Sascha Hauer Date: Mon Dec 6 09:36:17 2010 +0100 Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer commit 4a50bfe365a977f634311504484342fbfffe855c Author: Russell King Date: Sun Dec 5 23:06:22 2010 +0000 ARM: Ensure experimental options are so marked It is kernel-wide policy that options depending on EXPERIMENTAL should also have '(EXPERIMENTAL)' in their option text, and options with '(EXPERIMENTAL)' depend on EXPERIMENTAL. Ensure that all ARM options comply with this. Signed-off-by: Russell King commit 3d09fbcd26851ffb2c40cec411b8e56db02520d1 Author: Kuninori Morimoto Date: Wed Dec 1 07:40:16 2010 +0100 ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. This is the board-specific portion of this patch-set. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman Acked-by: Magnus Damm Signed-off-by: Russell King commit 9a4af112bd252be801a433fc3bef793b7b487c3c Author: Kuninori Morimoto Date: Wed Dec 1 07:45:00 2010 +0100 ARM: 6515/1: Add zboot support for SuperH Mobile ARM When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. This is the non-board-specific framework portion of this patch-set. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman Acked-by: Magnus Damm Signed-off-by: Russell King commit 0385ebc0c9b16fc2d8262c082843165313f7b1e4 Author: Russell King Date: Sat Dec 4 17:45:55 2010 +0000 ARM: move high-usage mostly read variables in setup.c to __read_mostly Signed-off-by: Russell King commit daf8741675562197d4fb4c4e9d773f53494203a5 Author: Russell King Date: Sat Dec 4 17:08:32 2010 +0000 ARM: implement support for read-mostly sections As our SMP implementation uses MESI protocols. Grouping together data which is mostly only read together means that we avoid unnecessary cache line bouncing when this code shares a cache line with other data. In other words, cache lines associated with read-mostly data are expected to spend most of their time in shared state. Signed-off-by: Russell King commit 0b05da7200dd56a5364c4d9cf5441715c1d706ed Author: Hans Ulli Kroll Date: Thu Dec 2 12:32:15 2010 +0100 ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI Today more boards with arm cpu have selectable pci bus. This patch makes this more scalable and remove line continuations in Kconfig Acked-by: Arnd Bergmann Signed-off-by: Hans Ulli Kroll Signed-off-by: Russell King commit 9c90a61c7e4286aa5a38b314a2d8f5a1e70b5135 Author: Arnaldo Carvalho de Melo Date: Thu Dec 2 10:25:28 2010 -0200 perf tools: Ask for ID PERF_SAMPLE_ info on all PERF_RECORD_ events So that we can use -T == --timestamp, asking for PERF_SAMPLE_TIME: $ perf record -aT $ perf report -D | grep PERF_RECORD_ 3 5951915425 0x47530 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff8138c1a2 period: 215979 cpu:3 3 5952026879 0x47588 [0x90]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff810cb480 period: 215979 cpu:3 3 5952059959 0x47618 [0x38]: PERF_RECORD_FORK(6853:6853):(16811:16811) 3 5952138878 0x47650 [0x78]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff811bac35 period: 431478 cpu:3 3 5952375068 0x476c8 [0x30]: PERF_RECORD_COMM: find:6853 3 5952395923 0x476f8 [0x50]: PERF_RECORD_MMAP 6853/6853: [0x400000(0x25000) @ 0]: /usr/bin/find 3 5952413756 0x47748 [0xa0]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff810d080f period: 859332 cpu:3 3 5952419837 0x477e8 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44600000(0x21d000) @ 0]: /lib64/ld-2.5.so 3 5952437929 0x47840 [0x48]: PERF_RECORD_MMAP 6853/6853: [0x7fff7e1c9000(0x1000) @ 0x7fff7e1c9000]: [vdso] 3 5952570127 0x47888 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f46200000(0x218000) @ 0]: /lib64/libselinux.so.1 3 5952623637 0x478e0 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44a00000(0x356000) @ 0]: /lib64/libc-2.5.so 3 5952675720 0x47938 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44e00000(0x204000) @ 0]: /lib64/libdl-2.5.so 3 5952710080 0x47990 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f45a00000(0x246000) @ 0]: /lib64/libsepol.so.1 3 5952847802 0x479e8 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff813897f0 period: 1142536 cpu:3 First column is the cpu and the second the timestamp. That way we can investigate problems in the event stream. If the new perf binary is run on an older kernel, it will disable this feature automatically. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: <1291318772-30880-5-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit 640c03ce837fe8d4b56342aba376ea0da3960459 Author: Arnaldo Carvalho de Melo Date: Thu Dec 2 14:10:21 2010 -0200 perf session: Parse sample earlier At perf_session__process_event, so that we reduce the number of lines in eache tool sample processing routine that now receives a sample_data pointer already parsed. This will also be useful in the next patch, where we'll allow sample the identity fields in MMAP, FORK, EXIT, etc, when it will be possible to see (cpu, timestamp) just after before every event. Also validate callchains in perf_session__process_event, i.e. as early as possible, and keep a counter of the number of events discarded due to invalid callchains, warning the user about it if it happens. There is an assumption that was kept that all events have the same sample_type, that will be dealt with in the future, when this preexisting limitation will be removed. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: <1291318772-30880-4-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit c980d1091810df13f21aabbce545fd98f545bbf7 Author: Arnaldo Carvalho de Melo Date: Sat Dec 4 23:02:20 2010 -0200 perf events: Make sample_type identity fields available in all PERF_RECORD_ events If perf_event_attr.sample_id_all is set it will add the PERF_SAMPLE_ identity info: TID, TIME, ID, CPU, STREAM_ID As a trailer, so that older perf tools can process new files, just ignoring the extra payload. With this its possible to do further analysis on problems in the event stream, like detecting reordering of MMAP and FORK events, etc. V2: Fixup header size in comm, mmap and task processing, as we have to take into account different sample_types for each matching event, noticed by Thomas Gleixner. Thomas also noticed a problem in v2 where if we didn't had space in the buffer we wouldn't restore the header size. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Peter Zijlstra Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6844c09d849aeb00e8ddfe9525e8567a531c22d0 Author: Arnaldo Carvalho de Melo Date: Fri Dec 3 16:36:35 2010 -0200 perf events: Separate the routines handling the PERF_SAMPLE_ identity fields Those will be made available in sample like events like MMAP, EXEC, etc in a followup patch. So precalculate the extra id header space and have a separate routine to fill them up. V2: Thomas noticed that the id header needs to be precalculated at inherit_events too: LKML-Reference: Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Peter Zijlstra Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: <1291318772-30880-2-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit 614b6780eb0c393d2fb49ff62d61f29b877bd07e Author: Thomas Gleixner Date: Fri Dec 3 16:24:32 2010 -0200 perf events: Fix event inherit fallout of precalculated headers The precalculated header size is not updated when an event is inherited. That results in bogus sample entries for all child events. Bug introduced in c320c7b. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit ed60453fa8f8fc3d034dfdf10371a99cc6905626 Author: Rabin Vincent Date: Tue Nov 30 17:36:48 2010 +0100 ARM: 6511/1: ftrace: add ARM support for C version of recordmcount Depending on the compiler version, ARM GCC calls the mcount function either __gnu_mcount_nc or mcount. Acked-by: Steven Rostedt Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit cd3478f2bd8f2cec19f9247a8a9cd711cbe37683 Author: Rabin Vincent Date: Tue Nov 30 17:33:53 2010 +0100 ARM: 6509/1: ftrace: ignore any ftrace.o in C version of recordmcount arch/arm/kernel/ftrace.c references mcount like kernel/tracing/ftrace.c, so change the exclusion filter to match any ftrace.o. Acked-by: Steven Rostedt Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 961ec6daa7b14f376c30d447a830fa4783a2112c Author: Will Deacon Date: Thu Dec 2 18:01:49 2010 +0100 ARM: 6521/1: perf: use raw_spinlock_t for pmu_lock For kernels built with PREEMPT_RT, critical sections protected by standard spinlocks are preemptible. This is not acceptable on perf as (a) we may be scheduled onto a different CPU whilst reading/writing banked PMU registers and (b) the latency when reading the PMU registers becomes unpredictable. This patch upgrades the pmu_lock spinlock to a raw_spinlock instead. Reported-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit 4d6b7a779be34e1df296abc1dc555134a8cf34af Author: Will Deacon Date: Tue Nov 30 18:15:53 2010 +0100 ARM: 6512/1: perf: fix warnings generated by sparse Russell reported a number of warnings coming from sparse when checking the ARM perf_event.c files: | perf_event.c seems to also have problems too: | | CHECK arch/arm/kernel/perf_event.c | arch/arm/kernel/perf_event.c:37:1: warning: symbol 'pmu_lock' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:70:1: warning: symbol 'cpu_hw_events' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1006:1: warning: symbol 'armv6pmu_enable_event' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1113:1: warning: symbol 'armv6pmu_stop' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1956:6: warning: symbol 'armv7pmu_enable_event' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:3072:14: warning: incorrect type in argument 1 (different address spaces) | arch/arm/kernel/perf_event.c:3072:14: expected void const volatile [noderef] * | arch/arm/kernel/perf_event.c:3072:14: got struct frame_tail *tail | arch/arm/kernel/perf_event.c:3074:49: warning: incorrect type in argument 2 (different address spaces) | arch/arm/kernel/perf_event.c:3074:49: expected void const [noderef] *from | arch/arm/kernel/perf_event.c:3074:49: got struct frame_tail *tail This patch resolves these issues so we can live in silence again. Reported-by: Russell King Signed-off-by: Will Deacon Signed-off-by: Russell King commit b23065313297e750edd57ab6edfd36224826724e Author: Per Fransson Date: Fri Dec 3 10:53:38 2010 +0100 ARM: 6522/1: kexec: Add call to non-crashing cores through IPI When kexec is used to start a crash kernel the other cores are notified. These non-crashing cores will save their state in the crash notes and then do nothing. Signed-off-by: Per Fransson Signed-off-by: Russell King commit cd849ae9cd291117c0f7e0e8d531ab62a906e308 Author: Dave Martin Date: Wed Dec 1 18:05:14 2010 +0100 ARM: 6518/1: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL * Fix kexec build failure with CONFIG_THUMB2_KERNEL. * Avoids deprecated/forbidden sp and pc usage in for ARMv7 onwards, retaining compatibility with older architecture versions. * The pc value saved to newregs is now aligned on a predictable instruction boundary. (stmia { ... pc } or str pc has implementation-defined results in most versions of the ARM architecutre, and is prohibited (unpredictable) in Thumb-2.) * Switch to named inline asm arguments (else I get readily confused ...) The resulting code should be compatible with all architecture versions >= v3, with or without CONFIG_THUMB2_KERNEL. Reviewed-by: Will Deacon Tested-by: Mika Westerberg Signed-off-by: Dave Martin Acked-by: Catalin Marinas Signed-off-by: Russell King commit 0946b8c5c5982088a26da7ad99e8bcf57f972fb5 Author: Dave Martin Date: Wed Dec 1 18:05:13 2010 +0100 ARM: 6517/1: kexec: Add missing memory clobber to inline asm in crash_setup_regs() Currently, the inline asm is passed &newregs->ARM_r0 as in input, when modifying multiple fields of newregs. It's plausible to assume that GCC will assume newregs->ARM_r0 is modified when passed the address, but unfortunately this assumption is incorrect. Also, GCC has no way to guess that the other ARM_r* fields are modified without the addition of a "memory" clobber. Signed-off-by: Dave Martin Acked-by: Catalin Marinas Acked-by: Will Deacon Signed-off-by: Russell King commit 8165984acf825917437debae519209073c32a5a7 Author: Tero Roponen Date: Wed Dec 1 20:04:20 2010 +0200 slub: Fix a crash during slabinfo -v Commit f7cb1933621bce66a77f690776a16fe3ebbc4d58 ("SLUB: Pass active and inactive redzone flags instead of boolean to debug functions") missed two instances of check_object(). This caused a lot of warnings during 'slabinfo -v' finally leading to a crash: BUG ext4_xattr: Freepointer corrupt ... BUG buffer_head: Freepointer corrupt ... BUG ext4_alloc_context: Freepointer corrupt ... ... BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 IP: [] file_sb_list_del+0x1c/0x35 PGD 79d78067 PUD 79e67067 PMD 0 Oops: 0002 [#1] SMP last sysfs file: /sys/kernel/slab/:t-0000192/validate This patch fixes the problem by converting the two missed instances. Acked-by: Christoph Lameter Signed-off-by: Tero Roponen Signed-off-by: Pekka Enberg commit fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 Merge: 367576b e3e9887 Author: Greg Kroah-Hartman Date: Fri Dec 3 12:12:29 2010 -0800 Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into work * 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects. usb: ehci-sh: Add missing ehci helpers. usb: ehci-sh: Fix up fault in shutdown path. sh: Add EHCI support for SH7786. usb: ehci-hcd: Add support for SuperH EHCI. usb: ohci-sh: Set IRQ as shared. commit 367576b813ed66a000e66ec18f7082bbc84c05d7 Merge: 16350a7 0607f86 Author: Greg Kroah-Hartman Date: Fri Dec 3 12:10:06 2010 -0800 Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next * 'for-next' of git://gitorious.org/usb/usb: usb: musb: gadget: prevent a NULL pointer dereference usb: musb: add names for IRQs in structure resource usb: musb: remove board_data parameter from musb_platform_init() commit 16350a7258a3158807f3fafe33f1bb22b8ddd127 Author: Namhyung Kim Date: Thu Dec 2 05:52:22 2010 +0900 uwb: fix compiler warning on i1480_est_id_table Annotate i1480_est_id_table as '__used' to fix following warning: CC drivers/uwb/i1480/i1480-est.o drivers/uwb/i1480/i1480-est.c:94: warning: ‘i1480_est_id_table’ defined but not used Signed-off-by: Namhyung Kim Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit fc33b0eb38ccbd3080a4885e8f742a72a085261d Author: Namhyung Kim Date: Thu Dec 2 05:52:21 2010 +0900 uwb: fix compiler warning on whcrc_id_table Annotate whcrc_id_table as '__used' to fix following warning: CC drivers/uwb/whc-rc.o drivers/uwb/whc-rc.c:452: warning: ‘whcrc_id_table’ defined but not used Signed-off-by: Namhyung Kim Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit df4fedeaa623f6af0b72c0089000b5ea5540ed22 Author: Richard Röjfors Date: Wed Dec 1 11:53:00 2010 +0100 usb: g_audio: Fix crash at driver removal If g_audio fails to open the sound control device, it crashes at removal: Insertion: [ 4143.836536] g_audio gadget: unable to open sound control device file: /dev/snd/controlC0 [ 4143.836543] g_audio gadget: we need at least one control device [ 4143.836551] g_audio gadget: Linux USB Audio Gadget, version: Dec 18, 2008 [ 4143.836558] g_audio gadget: g_audio ready Removal: [ 4146.802643] BUG: unable to handle kernel paging request at 00023018 [ 4146.802655] IP: [] filp_close+0xa/0x5b [ 4146.802674] *pdpt = 0000000015426001 *pde = 0000000000000000 [ 4146.802684] Oops: 0000 [#1] PREEMPT SMP [ 4146.802692] last sysfs file: /sys/power/state [ 4146.802701] Modules linked in: g_audio(-) ioh_udc fuse asix usbnet [last unloaded: g_audio] [ 4146.802719] [ 4146.802728] Pid: 1394, comm: rmmod Not tainted 2.6.33.5-26.1-ivi #1 To be filled by O.E.M./To be filled by O.E.M. [ 4146.802738] EIP: 0060:[] EFLAGS: 00010206 CPU: 0 [ 4146.802746] EIP is at filp_close+0xa/0x5b [ 4146.802753] EAX: 00023000 EBX: 00023000 ECX: 00000046 EDX: df842680 [ 4146.802760] ESI: e071cd4c EDI: df842680 EBP: ddbbbef0 ESP: ddbbbee4 [ 4146.802768] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 4146.802776] Process rmmod (pid: 1394, ti=ddbba000 task=dd95a4f0 task.ti=ddbba000) [ 4146.802782] Stack: [ 4146.802787] d540c280 e071cd4c df2bc000 ddbbbefc e071b82c df11e440 ddbbbf04 e071c622 [ 4146.802804] <0> ddbbbf28 e071c47f 00000008 e071cd74 df11e464 df2bc01c df2bc000 e071ce68 [ 4146.802822] <0> 00000880 ddbbbf38 e07fd1b8 e071cef0 00000000 ddbbbf40 e071b9f4 ddbbbf48 [ 4146.802842] Call Trace: [ 4146.802857] [] ? gaudio_cleanup+0x87/0xe0 [g_audio] [ 4146.802869] [] ? audio_unbind+0x8/0xc [g_audio] [ 4146.802881] [] ? composite_unbind+0x8d/0xcb [g_audio] [ 4146.802895] [] ? usb_gadget_unregister_driver+0x7b/0xc0 [ioh_udc] [ 4146.802908] [] ? usb_composite_unregister+0x15/0x17 [g_audio] [ 4146.802920] [] ? cleanup+0xd/0xf [g_audio] [ 4146.802932] [] ? sys_delete_module+0x185/0x1dd [ 4146.802944] [] ? do_page_fault+0x248/0x276 [ 4146.802956] [] ? sysenter_do_call+0x12/0x26 [ 4146.802962] Code: 12 5f 3a 00 8b 43 04 8b 40 0c 0f b3 30 3b 73 44 73 03 89 73 44 89 f8 e8 f1 61 3a 00 5b 5e 5f 5d c3 55 89 e5 57 89 d7 56 53 89 c3 <8b> 40 18 85 c0 75 0f 68 32 15 5e c1 31 f6 e8 52 39 3a 00 5a eb [ 4146.803058] EIP: [] filp_close+0xa/0x5b SS:ESP 0068:ddbbbee4 [ 4146.803071] CR2: 0000000000023018 [ 4146.803112] ---[ end trace 0989a7e023da0434 ]--- This patch makes sure not to assign the_card if gaudio_open_snd_dev fails, since the parent function will deallocate the card. Also make sure all filp's in gaudio_open_snd_dev is assigned NULL upon error and gaudio_close_snd_dev only cleanups when the filp's are non-NULL. Signed-off-by: Richard Röjfors Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit ca44ac386181ba710a9ab6db900d6c1e5451b366 Author: Changli Gao Date: Mon Nov 29 22:48:46 2010 +0000 net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared skb head being allocated by kmalloc(), it might be larger than what actually requested because of discrete kmem caches sizes. Before reallocating a new skb head, check if the current one has the needed extra size. Do this check only if skb head is not shared. Signed-off-by: Changli Gao Cc: Eric Dumazet Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 289700dbc40c78741f17e2304ed4ac0db3c3afd3 Author: Don Skidmore Date: Fri Dec 3 03:32:58 2010 +0000 ixgbe: add support for new format of PBA numbers The new PBA format is stored as a string. This patch allows the driver to support both the old and new format. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dbffcb210f45239ea530e0a71470e48abefe4210 Author: Don Skidmore Date: Fri Dec 3 03:32:34 2010 +0000 ixgbe: add support for 82599 FCoE SKU Add both NIC and backplane support for FCoE enabled devices IDs. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0b077feac00a8b7b0afbab3274b2e74b749bc917 Author: Don Skidmore Date: Fri Dec 3 03:32:13 2010 +0000 ixgbe: add WOL support for SFP+ subdevice This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9. This will also include ixgbe ethtool support for this device. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c6ecf39a10ceec3e97096e2a8d3eadcecd593422 Author: Don Skidmore Date: Fri Dec 3 03:31:51 2010 +0000 ixgbe: fix link behavior for SFP+ when driver is brought down We have had several requests to have ifconfig down command disable the SFP+ laser and thus make link go down. Likewise on ifconfig up the laser would be enabled and link would come up. This patch enables that behavior. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e4d849b8113b0cf7b6ebfa9ee4c47bd514ea49d3 Author: Anirban Chakraborty Date: Thu Dec 2 20:42:08 2010 +0000 qlcnic: Updated driver version to 5.0.13 Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 40839129f77903cbbb7f232e2e2ab08dfe4a4f8d Author: Sritej Velaga Date: Thu Dec 2 20:41:56 2010 +0000 qlcnic: LICENSE file for qlcnic Signed-off-by: Sritej Velaga Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 091056b2ad04df09a3cb78a4c4ea098709b98eb3 Author: Amit Kumar Salecha Date: Thu Dec 2 20:41:43 2010 +0000 qlcnic: validate eswitch config values for PF Currently driver set default eswitch configuration values for PF function, instead of validating values sent by application. Signed-off-by: Amit Kumar Salecha Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 97319a270da37a5eab14a770f1417d8229245270 Author: Sucheta Chakraborty Date: Thu Dec 2 20:41:23 2010 +0000 qlcnic: Disable loopback support Loopback mode can not be supported in CNA mode. Removing it until FW is fixed. Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 7e300bc8e6736d41e7b92978f415572ac60fd59b Author: Ben Hutchings Date: Thu Dec 2 13:48:28 2010 +0000 sfc: Store MAC address from NVRAM in net_device::perm_addr For some reason we failed to make this change when perm_addr was introduced. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 02ebc26865c2755720d2ede90a5ab27c45741823 Author: Ben Hutchings Date: Thu Dec 2 13:48:20 2010 +0000 sfc: Use current MAC address, not NVRAM MAC address, for WoL filter Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4f3907e9a600a46d8c946469ce6636080310d12e Author: Steve Hodgson Date: Thu Dec 2 13:48:14 2010 +0000 sfc: When waking a stopped tx_queue, only lock that tx_queue Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 78d4189d6b000898db2d9a9d745468f1322cbc71 Author: Ben Hutchings Date: Thu Dec 2 13:47:56 2010 +0000 sfc: Update kernel-doc to match earlier move of Toeplitz hash key Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit cef68bde74f083d83c18ce870ed834e82ee0ae5a Author: Ben Hutchings Date: Thu Dec 2 13:47:51 2010 +0000 sfc: Move xmac_poll_required into struct falcon_nic_data Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 40641ed93cd53561f7d53b5fd5ed656b35f3aabd Author: Ben Hutchings Date: Thu Dec 2 13:47:45 2010 +0000 sfc: Move Falcon global event handling to falcon.c Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4833f02a2972b7da4c8a15e1e329db0f984a75d9 Author: Ben Hutchings Date: Thu Dec 2 13:47:35 2010 +0000 sfc: Move mdio_lock to struct falcon_nic_data We only have direct access to MDIO on Falcon, so move this out of struct efx_nic. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4de92180258ac661bbce0f0065c9c81633ac862b Author: Ben Hutchings Date: Thu Dec 2 13:47:29 2010 +0000 sfc: Move SPI state to struct falcon_nic_data We only have direct access to SPI on Falcon, so move all this state out of struct efx_nic. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 90b7a4ee610bf1d14120f5e0618ae2a3568394a5 Author: Ben Hutchings Date: Thu Dec 2 13:47:17 2010 +0000 sfc: Remove unnecessary inclusion of various private header files Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6a8872c54d177abd900a0cf165b76ecb4803f052 Author: Ben Hutchings Date: Thu Dec 2 13:47:10 2010 +0000 sfc: Expose Falcon BootROM config through MTD, not ethtool The ethtool EEPROM interface is really meant for exposing chip configuration, not BootROM configuration. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6c88b0b6dc886e49c0e6ee21d677c2e380bde688 Author: Ben Hutchings Date: Thu Dec 2 13:47:01 2010 +0000 sfc: Remove broken automatic fallback for invalid Falcon chip/board config If the Falcon board config is invalid, we cannot proceed - we do not have a valid board type to pass to falcon_probe_board(), and if we kluge that to work with an unknown board then other initialisation code will crash. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 18e3ee2cf96adf072deeb291eed670f2c23bb2fc Author: Steve Hodgson Date: Thu Dec 2 13:46:55 2010 +0000 sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue The mcfw *never* sends CMDDONE when rebooting. Changing this so that it always sends CMDDONE *before* REBOOT is easy on Siena, but it's not obvious that we could guarantee to be able to implement this on future hardware. Given this, I'm less convinced that the protocol should be changed. To reiterate the failure mode: The driver sees this: issue command receive REBOOT event Was that reboot event sent before the command was issued, or in response to the command? If the former then there will be a subsequent CMDDONE event, if the latter, then there will be no CMDDONE event. Options to resolve this are: 1. REBOOT always completes an outstanding mcdi request, and we set the credits count to ignore a subsequent CMDDONE event with mismatching seqno. 2. REBOOT never completes an outstanding mcdi request. If there is no CMDDONE event then we rely on the mcdi timeout code to complete the outstanding request, incurring a 10s delay. I'd argue that (2) is tidier, but that incurring a 10s delay is a little needless. Let's go with (1). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3157183a90fdbd686f939d2f032b675f7e9983d6 Author: Ben Hutchings Date: Thu Dec 2 13:46:37 2010 +0000 sfc: Clear RXIN_SEL when soft-resetting QT2025C When we enable PMA/PMD loopback this automatically sets RXIN_SEL (inverse polarity for RXIN). We need to clear that bit during the soft-reset sequence, as it is not done automatically. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit adc1d234116c22247e3886fb6e9bef450a0110f2 Author: Ben Hutchings Date: Thu Dec 2 13:46:31 2010 +0000 sfc: Read-to-clear LM87 alarm/interrupt status at start of day We do not want to shut down the board based on a fault that has already been cleared. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 71839f7d162f973f5931d30d1376a2dc5c0bed5a Author: Ben Hutchings Date: Thu Dec 2 13:46:24 2010 +0000 sfc: Distinguish critical and non-critical over-temperature conditions Set both the 'maximum' and critical temperature limits for LM87 hardware monitors on Falcon boards. Do not shut down a port until the critical temperature is reached, but warn as soon as the 'maximum' temperature is reached. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4484cd7dedecf59aee0775c6658f95bdee65f277 Author: Ben Hutchings Date: Thu Dec 2 13:46:14 2010 +0000 sfc: Fix condition for no-op in set_phy_flash_cfg() Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit f18ca364617d5e1fdd7300e025473496e397db4b Author: Ben Hutchings Date: Thu Dec 2 13:46:09 2010 +0000 sfc: Reduce log level for MCDI error response in efx_mcdi_rpc() Some errors are expected, e.g. when sending new commands to an MC running old firmware. Only the caller of efx_mcdi_rpc() can decide what is a real error. Therefore log the error responses with netif_dbg(). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 287050d390264402e11bea8b811859e42e8faa29 Author: Steven Rostedt Date: Thu Dec 2 16:46:18 2010 -0500 tracing: Add TRACE_EVENT_CONDITIONAL() There are instances in the kernel that we only want to trace a tracepoint when a certain condition is set. But we do not want to test for that condition in the core kernel. If we test for that condition before calling the tracepoin, then we will be performing that test even when tracing is not enabled. This is 99.99% of the time. We currently can just filter out on that condition, but that happens after we write to the trace buffer. We just wasted time writing to the ring buffer for an event we never cared about. This patch adds: TRACE_EVENT_CONDITION() and DEFINE_EVENT_CONDITION() These have a new TP_CONDITION() argument that comes right after the TP_ARGS(). This condition can use the parameters of TP_ARGS() in the TRACE_EVENT() to determine if the tracepoint should be traced or not. The TP_CONDITION() will be placed in a if (cond) trace; For example, for the tracepoint sched_wakeup, it is useless to trace a wakeup event where the caller never actually wakes anything up (where success == 0). So adding: TP_CONDITION(success), which uses the "success" parameter of the wakeup tracepoint will have it only trace when we have successfully woken up a task. Acked-by: Mathieu Desnoyers Acked-by: Frederic Weisbecker Cc: Arjan van de Ven Cc: Thomas Gleixner Signed-off-by: Steven Rostedt commit a1087ef6abedf0bfd60e5e3fddf33192cb2c1325 Author: Julia Lawall Date: Wed Nov 24 15:54:18 2010 +0100 scripts/coccinelle: update for compatability with Coccinelle 0.2.4 For doubleinit.cocci, Coccinelle 0.2.4 requires a comma after ... in a field list. Coccinelle also now behaves gracefully when a definition is provided for a virtual that doesn't exist, so there is no need for the semantic patch code to check for this case. Updated the documentation to reflect the fact that the best results will now be obtained with Coccinelle version 0.2.4 or later. Signed-off-by: Julia Lawall commit 96886c4361f1ae3f6c775d7c9295e2d557101d0f Author: Arnaud Patard (Rtp) Date: Fri Nov 26 15:20:52 2010 +0100 iMX51: introduce IMX_GPIO_NR Currently, to define a GPIO number, we're using something like : #define EFIKAMX_PCBID0 (2*32 + 16) to define GPIO 3 16. This is not really readable and it's error prone imho (note the 3 vs 2). So, I'm introducing a new macro to define this in a better way. Now, the code sample become : #define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16) v2: - move to gpio.h - add parens & spaces - switch to IMX_GPIO_NR instead of MX51_GPIO_NR Signed-off-by: Arnaud Patard Cc: Amit Kucheria Cc: Sascha Hauer Cc: Eric Bénard Signed-off-by: Sascha Hauer commit b99545cb59dc0a55507100a1335f4fd0ed521032 Author: Fabio Estevam Date: Fri Nov 26 12:25:59 2010 -0200 ARM: mx5: dynamically allocate imx2-wdt devices Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit d94ed1287e11f91e4f4096838179984b0206be5e Author: Fabio Estevam Date: Fri Nov 26 12:25:58 2010 -0200 ARM: mx5: introduce SOC_IMX51 Introduce SOC_IMX51 to keep consistency with the other i.MX devices Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit abebbb468050ad63caed55fdb7a6bfce732e9a7f Author: Vasiliy Kulikov Date: Fri Nov 26 20:05:55 2010 +0300 arm: dma: check clk_get() result clk_get() may return ERR_PTR(), if so propagate return code as imx_dma_init() return code. Signed-off-by: Vasiliy Kulikov Signed-off-by: Sascha Hauer commit 0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c Author: Arnaud Patard (Rtp) Date: Fri Nov 26 15:27:53 2010 +0100 mx5: Fix efikamx build Commit 124bf94a "ARM: imx: fix name for functions adding sdhci-esdhc-imx devices" changed some devices and Kconfig entry and didn't change every places it should have. It's breaking efikamx build. I've fixed 3ds Kconfig entry as I believe it's broken there too. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 4c6c32b3f856346158161a8c9824b4dd2bff0893 Author: Uwe Kleine-König Date: Mon Nov 29 08:58:14 2010 +0100 ARM: mx25: fix offset for usb host controller In commit 2c20b9f (ARM: mx25: dynamically allocate mxc-ehci devices) I changed the offset to the value specified in the reference manual intending to test this change on hardware. This slipped through and now prooved to be wrong. So fix it and add a comment about the documentation being wrong. Reported-by: Jaume Ribot Cc: Michael Trimarchi Cc: Shawn Guo Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 29bb6afcb077bd153c7738e73840dde808132fb5 Author: Eric Bénard Date: Sat Nov 27 09:15:38 2010 +0100 plat-mxc/ehci.c: fix compile breakage commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and 9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines but didn't fix all the places where these defines are used leading to a compile failure for USB on i.MX31, 35 and 27. Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 4e5cf41eeb254b7e50666496ac5697188b31320b Author: Sascha Hauer Date: Thu Nov 4 15:50:38 2010 +0100 ARM i.MX SDMA: Add ROM script addresses to platform_data Signed-off-by: Sascha Hauer commit 5b28aa319bba96987316425a1131813d87cbab35 Author: Sascha Hauer Date: Wed Oct 6 15:41:15 2010 +0200 dmaengine i.MX SDMA: Allow to run without firmware The SDMA firmware consists of a ROM part and a RAM part. The ROM part is always present in the SDMA engine and is sufficient for many cases. This patch allows to pass in platform data containing the script addresses in ROM, so loading a firmware is optional now. Signed-off-by: Sascha Hauer Acked-by: Dan Williams commit 0df7095205cbf6ea1cdfe6254e0d6a3b823caa3b Author: Russell King Date: Thu Dec 2 19:16:56 2010 +0000 ARM: SMP: remove IRQ-disabling for smp_cross_call() As we've now removed the spinlock and bitmask, we have nothing left which requires interrupts to be disabled when sending an IPI. All current IPI-sending implementations use the GIC, which also does not require interrupts disabled when calling gic_raise_softirq(). Remove the now unnecessary IRQ disable. Signed-off-by: Russell King commit 24480d980e9063b3ebd0dfdf2f396c305956c356 Author: Russell King Date: Mon Nov 15 09:54:18 2010 +0000 ARM: SMP: avoid using bitmasks and locks for IPIs, use hardware instead Avoid using bitmasks and locks in the percpu area for IPIs, and instead use individual software generated interrupts to identify the reason for the IPI. This avoids the problems of having spinlocks in the percpu area. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit ad3b6993b9c5482e8a2ec5aed181538c921fdcbd Author: Russell King Date: Mon Nov 15 09:42:08 2010 +0000 ARM: SMP: pass an ipi number to smp_cross_call() This allows us to use smp_cross_call() to trigger a number of different software generated interrupts, rather than combining them all on one SGI. Recover the SGI number via do_IPI. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit d92e04713c6323e09a0d0fdfa0d7cbcedb175e49 Author: Russell King Date: Mon Nov 15 09:36:18 2010 +0000 ARM: remove obsolete smp_cross_call_done() smp_cross_call_done() was removed long ago (see 78d236c - remove useless smp_cross_call_done()). Remove those which have been subsequently merged. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit f6d84f4a7df8057247a3f1723169586af3882436 Author: Magnus Damm Date: Fri Dec 3 07:22:31 2010 +0000 ARM: mach-shmobile: AG5 clock framework improvements This patch improves the state of the AG5 clock framework support. The main clock parent is automatically detected, but most of the clocks are not used by any driver or subsystem at this point. More work is needed for support of multi media hardware such as FSI and/or LCDC/MIPI-DSI. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5403187f83c12c6f4c03547e0cc05bac0310be7b Author: Aaro Koskinen Date: Thu Dec 2 15:51:24 2010 +0000 arm: mach-omap2: rx51: clean up dummy onenand init When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit a1a92e6fccadbba1846a081f21d0c12a10addd56 Author: Aaro Koskinen Date: Thu Dec 2 15:51:23 2010 +0000 arm: mach-omap2: n8x0: clean up dummy onenand init When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d Author: Aaro Koskinen Date: Thu Dec 2 13:25:40 2010 +0000 arm: mach-omap2: remove NULL board_mux from board files If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header file instead of forcing every single board to define it. Signed-off-by: Aaro Koskinen [tony@atomide.com: updated for combined board-zoom files] Signed-off-by: Tony Lindgren commit 08ec0c58fb8a05d3191d5cb6f5d6f81adb419798 Author: John Stultz Date: Tue Jul 27 17:00:00 2010 -0700 x86: Improve TSC calibration using a delayed workqueue Boot to boot the TSC calibration may vary by quite a large amount. While normal variance of 50-100ppm can easily be seen, the quick calibration code only requires 500ppm accuracy, which is the limit of what NTP can correct for. This can cause problems for systems being used as NTP servers, as every time they reboot it can take hours for them to calculate the new drift error caused by the calibration. The classic trade-off here is calibration accuracy vs slow boot times, as during the calibration nothing else can run. This patch uses a delayed workqueue to calibrate the TSC over the period of a second. This allows very accurate calibration (in my tests only varying by 1khz or 0.4ppm boot to boot). Additionally this refined calibration step does not block the boot process, and only delays the TSC clocksoure registration by a few seconds in early boot. If the refined calibration strays 1% from the early boot calibration value, the system will fall back to already calculated early boot calibration. Credit to Andi Kleen who suggested using a timer quite awhile back, but I dismissed it thinking the timer calibration would be done after the clocksource was registered (which would break things). Forgive me for my short-sightedness. This patch has worked very well in my testing, but TSC hardware is quite varied so it would probably be good to get some extended testing, possibly pushing inclusion out to 2.6.39. Signed-off-by: John Stultz LKML-Reference: <1289003985-29060-1-git-send-email-johnstul@us.ibm.com> Reviewed-by: Thomas Gleixner CC: Thomas Gleixner CC: Ingo Molnar CC: Martin Schwidefsky CC: Clark Williams CC: Andi Kleen commit b0f969009f647cd473c5e559aeec9c4229d12f87 Merge: 3561d43 d3b8f88 Author: John Stultz Date: Thu Dec 2 16:47:52 2010 -0800 Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc Conflicts: Documentation/kernel-parameters.txt commit 87de5ac782761a3ebf806e434e8c9cc205a87274 Author: John Stultz Date: Mon Sep 20 17:42:46 2010 -0700 timers: Introduce timerlist infrastructure. The timerlist infrastructure is a thin layer over the rbtree code that implements a simple list of timers sorted by an expires value, and a getnext function that provides a pointer to the earliest timer. This infrastructure allows drivers and other kernel infrastructure to easily implement timers without duplicating code. Signed-off-by: John Stultz LKML Reference: <1290136329-18291-2-git-send-email-john.stultz@linaro.org> Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit b924dcf0038b8f83e65b44f679ad480d44f85aa6 Author: Allan Stephens Date: Tue Nov 30 12:01:03 2010 +0000 tipc: Delete tipc_ownidentity() Moves the content of the native API routine tipc_ownidentity() into the sole routine that calls it, since it can no longer be called in isolation. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 12bae479ee414f45ad8fe93530f5b6ea241bde3f Author: Allan Stephens Date: Tue Nov 30 12:01:02 2010 +0000 tipc: Eliminate obsolete native API forwarding routines Moves the content of each native API message forwarding routine into the sole routine that calls it, since the forwarding routines no longer be called in isolation. Also removes code in each routine that altered the outgoing message's importance level since this is now no longer possible. The previous function mapping (parent function, and child API) was as follows: tipc_send2name \--tipc_forward2name tipc_send2port \--tipc_forward2port tipc_send_buf2port \--tipc_forward_buf2port After this commit, the children don't exist and their functionality is completely in the respective parent. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 471450f7ec24ccd9ac24e6f05cd9358d40c09d03 Author: Allan Stephens Date: Tue Nov 30 12:01:01 2010 +0000 tipc: Eliminate an unused symbolic constant in link code Removes a symbol that is not referenced anywhere by TIPC's link code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 52fe7b725e0a1360d36c720ee87ab1e559df69db Author: Allan Stephens Date: Tue Nov 30 12:01:00 2010 +0000 tipc: Eliminate useless initialization when creating subscriber Removes initialization of a local variable that is always assigned a different value before it is referenced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 38f232eae20cefed2e2379d77c54babb0de6d024 Author: Allan Stephens Date: Tue Nov 30 12:00:59 2010 +0000 tipc: Remove unused domain argument from multicast send routine Eliminates an unused argument from tipc_multicast(), now that this routine can no longer be called by kernel-based applications. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit a5c2af9922a94a875c5f4b2dcd357a1c399b7ea6 Author: Allan Stephens Date: Tue Nov 30 12:00:58 2010 +0000 tipc: Remove support for TIPC mode change callback Eliminates support for the callback routine invoked when TIPC changes its mode of operation from inactive to standalone or from standalone to networked. This callback was part of TIPC's obsolete native API and is not used by TIPC internally. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 528c771e87c3fa661bc6983b5bf0ba464d9f7c3a Author: Allan Stephens Date: Tue Nov 30 12:00:57 2010 +0000 tipc: Delete useless function prototypes Removes several function declarations that aren't used anywhere, either because they reference routines that no longer exist or because all users of the function reference it after it has already been defined. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 28cc937eac00805e8b9c6e7ed7d590567378187f Author: Allan Stephens Date: Tue Nov 30 12:00:56 2010 +0000 tipc: Eliminate useless return value when disabling a bearer Modifies bearer_disable() to return void since it always indicates success anyway. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8d71919d7afc4ade0d9de09e1d50fbf9168c368d Author: Allan Stephens Date: Tue Nov 30 12:00:55 2010 +0000 tipc: Delete unused configuration service structure definition Removes a structure definition that is no longer used by TIPC's configuration service. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit c80262829769419e19527f972672e8df0480235a Author: Allan Stephens Date: Tue Nov 30 12:00:54 2010 +0000 tipc: Remove obsolete inclusions of header files Gets rid of #include statements that are no longer required as a result of the merging of obsolete native API header file content into other TIPC include files. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit d265fef6ddf9042195aae551e1fde211c2a1588b Author: Allan Stephens Date: Tue Nov 30 12:00:53 2010 +0000 tipc: Remove obsolete native API files and exports As part of the removal of TIPC's native API support it is no longer necessary for TIPC to export symbols for routines that can be called by kernel-based applications, nor for it to have header files that kernel-based applications can include to access the declarations for those routines. This commit eliminates the exporting of symbols by TIPC and migrates the contents of each obsolete native API include file into its corresponding non-native API equivalent. The code which was migrated in this commit was migrated intact, in that there are no technical changes combined with the relocation. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit dca9b2404a6d6579828da2425c051462701efd3f Author: Shan Wei Date: Wed Dec 1 18:05:17 2010 +0000 net: kill unused macros from head file These macros have been defined for several years since v2.6.12-rc2（tracing by git）, but never be used. So remove them. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit b672083ed36a49c323737b7c7e1d5264a7c193af Author: Shan Wei Date: Wed Dec 1 18:05:12 2010 +0000 ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number ND_REACHABLE_TIME and ND_RETRANS_TIMER have defined since v2.6.12-rc2, but never been used. So use them instead of magic number. This patch also changes original code style to read comfortably . Thank YOSHIFUJI Hideaki for pointing it out. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 97b1ce25e8fc27f74703537ec09d4996c7a6e38a Author: Shan Wei Date: Wed Dec 1 18:04:50 2010 +0000 tcp: use TCP_BASE_MSS to set basic mss value TCP_BASE_MSS is defined, but not used. commit 5d424d5a introduce this macro, so use it to initial sysctl_tcp_base_mss. commit 5d424d5a674f782d0659a3b66d951f412901faee Author: John Heffner Date: Mon Mar 20 17:53:41 2006 -0800 [TCP]: MTU probing Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a9527a3b621e507c85b639c183c3aa22afd4eb61 Author: Shan Wei Date: Wed Dec 1 18:04:43 2010 +0000 net: snmp: fix the wrong ICMP_MIB_MAX value __ICMP_MIB_MAX is equal to the total number of icmp mib, So no need to add 1. This wastes 4/8 bytes memory. Change it to be same as ICMP6_MIB_MAX, TCP_MIB_MAX, UDP_MIB_MAX. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit fe27d4b012273640e033be80f143bdc54daa8e16 Merge: ad9c2b0 676dac4 Author: James Morris Date: Fri Dec 3 08:21:01 2010 +1100 Merge branch 'smack-next-master' into next commit 415103f9932d45f7927f4b17e3a9a13834cdb9a1 Author: Eric Paris Date: Thu Dec 2 16:13:40 2010 -0500 SELinux: do not compute transition labels on mountpoint labeled filesystems selinux_inode_init_security computes transitions sids even for filesystems that use mount point labeling. It shouldn't do that. It should just use the mount point label always and no matter what. This causes 2 problems. 1) it makes file creation slower than it needs to be since we calculate the transition sid and 2) it allows files to be created with a different label than the mount point! # id -Z staff_u:sysadm_r:sysadm_t:s0-s0:c0.c1023 # sesearch --type --class file --source sysadm_t --target tmp_t Found 1 semantic te rules: type_transition sysadm_t tmp_t : file user_tmp_t; # mount -o loop,context="system_u:object_r:tmp_t:s0" /tmp/fs /mnt/tmp # ls -lZ /mnt/tmp drwx------. root root system_u:object_r:tmp_t:s0 lost+found # touch /mnt/tmp/file1 # ls -lZ /mnt/tmp -rw-r--r--. root root staff_u:object_r:user_tmp_t:s0 file1 drwx------. root root system_u:object_r:tmp_t:s0 lost+found Whoops, we have a mount point labeled filesystem tmp_t with a user_tmp_t labeled file! Signed-off-by: Eric Paris Reviewed-by: Reviewed-by: James Morris commit 2989042ca86b94bf4ffa9486921bb300ad44225f Author: Tomoya Date: Mon Nov 29 18:19:52 2010 +0000 can: EG20T PCH: Delete unnecessary spin_lock Delete unnecessary spin_lock for accessing Message Object. Since all message objects are divided into tx/rx area completely, spin_lock processing is unnecessary. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit d68f6837c4972b0433e41f8bee4b2b8205610f31 Author: Tomoya Date: Mon Nov 29 18:16:15 2010 +0000 can: EG20T PCH: Enumerate LEC macros For easy to readable, LEC #define macros are replaced to enums. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 15ffc8fddf72712cc45d51c64bd500760ec63c80 Author: Tomoya Date: Mon Nov 29 18:15:02 2010 +0000 can: EG20T PCH: Change Message Object Index For easy to readable, add Message Object index like below. PCH_RX_OBJ_START PCH_RX_OBJ_END PCH_TX_OBJ_START PCH_TX_OBJ_END Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 8339a7ed562719e040ca783bf59fa2d614d10ac9 Author: Tomoya Date: Mon Nov 29 18:11:52 2010 +0000 can: EG20T PCH: Separate Interface Register(IF1/IF2) CAN register of Intel PCH EG20T has 2 sets of interface register. To reduce whole of code size, separate interface register. As a result, the number of function also can be reduced. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 09f921f83faa49cdea25abfb98c439c01526b89d Merge: 4cebb34 d89197c Author: John W. Linville Date: Thu Dec 2 15:46:37 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c commit 4cebb34caa5122216a1e2451eae9e0fc47ec2589 Author: Felix Fietkau Date: Thu Dec 2 10:27:21 2010 +0100 ath5k: Fix reset and interrupts for AHB type of devices. On WiSoc we cannot access mac register before it is resetted. It will crash hardware otherwise. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit a0b907ee2a71052fefdf6151764095f3f97b3275 Author: Felix Fietkau Date: Thu Dec 2 10:27:16 2010 +0100 ath5k: Add AHB bus support. AHB specific functions are now in ahb.c file. AHB bus is compiled in when CONFIG_ATHEROS_AR231X is set in kernel. All other platforms will use PCI bus. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit c31b5c9c806b1fbdc9e98885d897664a0d482989 Author: Felix Fietkau Date: Thu Dec 2 10:27:11 2010 +0100 ath5k: Add initial registers values for radio RF2317 chip. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit e7aecd327d80b2f156b54769013aaccb2a20645a Author: Felix Fietkau Date: Thu Dec 2 10:27:06 2010 +0100 ath5k: Add a function to read chipset's MAC revision Add bus dependent revision read function which is used to determine chipset's MAC before hardware is initialized. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 8efa5d7d6ad307ae2d220def37ca89594062c40d Author: Felix Fietkau Date: Thu Dec 2 10:27:06 2010 +0100 ath5k: Check if pci pdev struct is initialized in common functions. To be able to support other busses than PCI check if pci device structure is initialized. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 4aa5d783c9e1c72e4950ff34f388077ccecac74a Author: Felix Fietkau Date: Thu Dec 2 10:27:01 2010 +0100 ath5k: Use generic eeprom read from common ath_bus_opts struct. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit e5b046d86fac609f636d127a38de94a175c7e83b Author: Felix Fietkau Date: Thu Dec 2 10:27:01 2010 +0100 ath5k: Move PCI bus functions to separate file. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 132b1c3ee38ea6fa0501004fd0f19acb554e5a44 Author: Felix Fietkau Date: Thu Dec 2 10:26:56 2010 +0100 ath5k: Introduce ath5k_init_softc function as in ath9k Split pci initialization into hardware specific functions and softc structure initialization. Make function naming similar to ones ath9k. Introduce ath_bus_opts in ath5k for later AHB bus integration. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit aeae4ac9090462ea38387dcdbac4f01b944af6a4 Author: Felix Fietkau Date: Thu Dec 2 10:26:51 2010 +0100 ath5k: Use Generic DMA for later support of AHB bus. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit c30ae138aa0570665725166679bdf4207041c8df Merge: 78b8595 be21871 Author: John W. Linville Date: Thu Dec 2 15:17:46 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit 78b8595691c34478a51d1c2bcbbb0f6ec8a28247 Author: Andy Shevchenko Date: Thu Dec 2 14:45:07 2010 +0200 wireless: ray_cs: use '%pm' format option to print MAC Signed-off-by: Andy Shevchenko Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Signed-off-by: John W. Linville commit 547025d5d4d1056fb4b5a0c9c3c0d5c2fe22c082 Author: Bruno Randolf Date: Thu Dec 2 16:23:12 2010 +0900 cfg80211: Add documentation for antenna ops The last patch with the same title was for mac80211 ops, accidentally. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c1927d7a8fab07171d08f7a3a8b7e5fe87bb70d4 Author: Johannes Berg Date: Wed Dec 1 09:43:35 2010 +0100 mac80211: publish SMPS docs Create a new chapter about SMPS in the driver API part of the mac80211 book and populate it with the existing docs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f6b8bef3634a5c9ea326b3ab0c9615fdac5f18ab Author: Johannes Berg Date: Wed Dec 1 09:43:34 2010 +0100 mac80211: document station handling Add some existing documentation about station handling to a new chapter about advanced APIs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit eebbb348df5a8c239a6300188907dec7e427bf70 Author: Johannes Berg Date: Wed Dec 1 09:43:33 2010 +0100 mac80211: publish interface iteration docs Publish the documentation for the interface iteration functions in the right section of the book. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e16c01030b8794992590ff9b1b1e4b1b89e0cad3 Author: Johannes Berg Date: Wed Dec 1 09:43:32 2010 +0100 mac80211: document aggregation Include the aggregation documentation in the docbook, split up by public and internal docs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cf6cb7ab59e0b37afe6e76b2e444479bf86bf933 Author: Johannes Berg Date: Wed Dec 1 09:43:31 2010 +0100 mac80211: publish some rate control docs Add an API chapter to the rate control part of the mac80211 book and populate it with some existing documentation. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 625208138550562fd3bc731f53f43cb66a3be70a Author: Johannes Berg Date: Wed Dec 1 09:43:30 2010 +0100 mac80211: publish some misc docs There isn't a clear TX documentation yet, so put these into the misc section for now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7bcfda13fea4a8770deaf4b22093dc2708760128 Author: Johannes Berg Date: Wed Dec 1 09:43:29 2010 +0100 mac80211: publish docs for _ni functions Put them along with their "regular" versions for now, we should write more docs in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d7ae30f073a179a9cebd663e7502843ddf4ba672 Author: Johannes Berg Date: Wed Dec 1 09:43:28 2010 +0100 mac80211: document workqueue Create a new chapter for the mac80211 workqueue that contains the documentation written for it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2e54a7a20cf7c02ee17c56488fedb8cd3d2c2f35 Author: Johannes Berg Date: Wed Dec 1 09:43:27 2010 +0100 cfg80211: include CQM packet loss docs Just include them in the list of functions, there aren't any more detailed docs (yet). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6a0141175b6026e13652339e607a35f4b6687f27 Author: Sujith Manoharan Date: Wed Dec 1 12:30:09 2010 +0530 ath9k_htc: Remove unused structures Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit b2767363192d5937e0f61f05b1b6b881da9ee55a Author: Joe Perches Date: Tue Nov 30 13:42:08 2010 -0800 wireless: Remove unnecessary casts of usb_get_intfdata Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit e7797bf2c0297098056a95b6b03ea5a9a3285e36 Author: Rafał Miłecki Date: Tue Nov 30 22:33:16 2010 +0100 b43: N-PHY: fix code path on PHY init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 76b002bd6dfdd66c58669cbdfa5cd92084b6936e Author: Rafał Miłecki Date: Tue Nov 30 22:33:15 2010 +0100 b43: N-PHY: use defines for RSSI types Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 99f6c2ef1e968c0dbdfa8c5b8f2869129b860d88 Author: Rafał Miłecki Date: Tue Nov 30 22:33:14 2010 +0100 b43: N-PHY: fix RSSI selection Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 44b23b488d44e56d467764ecb661830e5b02b308 Author: Joe Perches Date: Tue Nov 30 12:19:11 2010 -0800 ath9k: hif_usb: Reduce indent 1 column Invert test and return early. Move variable declarations to local scope. Don't initialize variables to 0 unnecessarily. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit eb272441fc14ad126abfa46de8a9c58bda8added Author: Ben Greear Date: Mon Nov 29 14:13:22 2010 -0800 ath9k: Move debugfs under ieee80211/[phyname]/ath9k/ This fixes debugfs problems when a phy is renamed, and is able to remove a bit of code that is no longer needed. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit db3949c4506a21633469d71f2915cf660eea0a35 Author: David S. Miller Date: Thu Dec 2 11:52:07 2010 -0800 tcp: Implement ipv6 ->get_peer() and ->tw_get_peer(). Now ipv6 timewait recycling is fully implemented and enabled. Signed-off-by: David S. Miller commit 493f377d6dd56f4e98b198d637fe714ab124681b Author: David S. Miller Date: Thu Dec 2 12:14:29 2010 -0800 tcp: Add timewait recycling bits to ipv6 connect code. This will also improve handling of ipv6 tcp socket request backlog when syncookies are not enabled. When backlog becomes very deep, last quarter of backlog is limited to validated destinations. Previously only ipv4 implemented this logic, but now ipv6 does too. Now we are only one step away from enabling timewait recycling for ipv6, and that step is simply filling in the implementation of tcp_v6_get_peer() and tcp_v6_tw_get_peer(). Signed-off-by: David S. Miller commit 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67 Author: Rafał Miłecki Date: Sun Nov 28 12:59:45 2010 +0100 b43: N-PHY: fix RSSI calibration Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8c1d5a7a2230a162af709fa118f051e0d18ff427 Author: Rafał Miłecki Date: Sun Nov 28 12:59:44 2010 +0100 b43: N-PHY: initialize perical variable, add missing call to CCA reset Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 161d540c8ef31e5adbced3248873024476e2c26f Author: Rafał Miłecki Date: Sun Nov 28 12:59:43 2010 +0100 b43: N-PHY: implement very basic TX power control management Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 40277cabfee7c8ef45055155895dcbef0f983c63 Author: Rafał Miłecki Date: Sun Nov 28 12:59:42 2010 +0100 b43: N-PHY: swap values for radio registers 0x3b and 0x3c Specs were updated plus we become wl compatible. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7 Author: Hauke Mehrtens Date: Sun Nov 28 12:22:52 2010 +0100 ssb: Add sysfs attributes to ssb devices Make it possible to read out the attributes, till now only show on dmesg, through sysfs. This patch was some time in OpenWrt. Signed-off-by: Bernhard Loos Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 172c69a47675dc1ca9c7243c031d8d77701bccc0 Author: Rafał Miłecki Date: Sun Nov 28 10:39:35 2010 +0100 ssb: extract indexes for power tables Signed-off-by: Rafał Miłecki Acked-by: Michael Buesch Signed-off-by: John W. Linville commit ae4694b2d3e4c0f47c0e804a68417be57e5daf85 Author: David S. Miller Date: Thu Dec 2 10:59:22 2010 -0800 ipv6: Create inet6_csk_route_req(). Brother of ipv4's inet_csk_route_req(). Signed-off-by: David S. Miller commit 15c054251ab84895ec043e90826612c1a3d6d4f1 Author: David S. Miller Date: Thu Dec 2 10:16:06 2010 -0800 ipv6: Add rt6_get_peer() helper. To go along side ipv4's rt_get_peer(). Signed-off-by: David S. Miller commit 21486af0f34d03b813b023d7a2b887b329f60486 Author: Sebastian Andrzej Siewior Date: Fri Oct 8 18:11:19 2010 +0200 spi/pxa2xx: pass of_node to spi device and set a parent device the of_node will auto-publish devices which are added to the device tree. Signed-off-by: Sebastian Andrzej Siewior commit 579d3bb2ac1a351bbf536480a9ab38199bbf901d Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:17 2010 -0800 spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. After all TX bytes are sent, the driver spins while the SPI core is busy and then it spins for a "short" period of time until RX bytes are available. On Sodavile the busy flag disappears pretty quick and after that it takes approx ~130ms (sometimes less but not much) until there are bytes available in the RX FIFO. This patch removes the busy loop and modifies the RX threshould so we get woken up once the remainings bytes arrived. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 2a8626a9e2d86d114a2d9f813a1acebf9d53dd10 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:17 2010 -0800 spi/pxa2xx: Add chipselect support for Sodaville The SPI core on Sodaville supports chip selects. Its configuration moved into the SSSR register at bit 0 and 1. Thus Sodaville can be hooked up with up to 4 devices. This patch ensures that the bits which are otherwiese reserved are only touched on Sodaville and not on any other PXAs. Also it makes sure that the status register does not lose the CS information while clearing the ROR bit. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 9f28ebc381ca00af0f9033a29776775068344b06 Author: Wey-Yi Guy Date: Fri Nov 26 13:24:19 2010 -0800 iwlagn: name change for bt_ch_announce module parameter Change the module parameter name to bt_ch_inhibition from bt_ch_announce to better describe the functionality In order to allow Bluetooth to activate a smart AFH mechanism and to maximize its available bandwidth the WiFi will request BT Core to inhibit its activity in channels that interfere with WiFi activity (and vice versa) if bt_ch_inhibition is enabled Set module parameter "bt_ch_inhibition=0" will disable the channel inhibition function Signed-off-by: Wey-Yi Guy commit adb90a00371a9a06a55c7b7ed7b38152f8e960c3 Author: Wey-Yi Guy Date: Fri Nov 26 11:09:42 2010 -0800 iwlwifi: check for STATUS_EXIT_PENDING when send RXON command If driver is on the way down, there is no need to send RXON to uCode, check the condition before continuous the process. Signed-off-by: Wey-Yi Guy commit 8b3ee29626031155c7844988ebe4321c151c03a2 Author: Wey-Yi Guy Date: Thu Nov 18 11:41:48 2010 -0800 iwlagn: remove structure name reference to gen2 Give the corresponding name for .cfg data structure Signed-off-by: Wey-Yi Guy commit e7cad69cdab4d6f0caadbcdd58b54214243ba98a Author: Grumbach, Emmanuel Date: Thu Nov 18 03:47:38 2010 -0800 iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded PCI L1 Active needs to be disabled while loading the uCode so that the bus doesn't go to sleep. The enablement of L1 Active should be done after the uCode has sent the ALIVE response. The enablement of L1 Active was missing. Enabling L1 Active allows to save power if the BIOS / bus driver allows it. I measured the power consumption while not associated and idle/associated: L1 Active disabled: 39 mA = 130mW L1 Active enabled: 6 mA = 20 mW Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 40b97c2fe96a476f1c228345f0c6a2d135a8b226 Author: Wey-Yi Guy Date: Wed Nov 17 14:17:53 2010 -0800 iwlagn: fix race condition when reprogram sta During reprogram stations, do not send link quality command. uCode will crash if receive link quality command for invalid station Signed-off-by: Wey-Yi Guy commit 676dac4b1bee0469d6932f698aeb77e8489f5861 Author: Casey Schaufler Date: Thu Dec 2 06:43:39 2010 -0800 This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running. Exception: in smack_task_wait() child task is checked for write access to parent task using label inherited from the task that forked it. Fixed issues from previous submit: - SMACK64EXEC was not read when SMACK64 was not set. - inode security blob was not updated after setting SMACK64EXEC - inode security blob was not updated when removing SMACK64EXEC commit 1036dc169f4cc6e5b753b1596d285d1cc3311a23 Author: Juuso Oikarinen Date: Mon Nov 29 12:05:53 2010 +0200 wl12xx: Remove 11j channels from the supported channels list. Because we don't support them at this stage. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 870c367cf829466f315de785ac613dd94eff5c50 Author: Roger Quadros Date: Mon Nov 29 16:24:57 2010 +0200 wl1271: Add wl1271_load_firmware() and export some functions For the SDIO testing module we need to load the firmware but not boot it. wl1271_load_firmware() is meant to do just the firmware loading part. We also export some functions so they are usable in the testing module. Signed-off-by: Roger Quadros Signed-off-by: Luciano Coelho commit 43a598d5e40485fcfbebe0700077e83afd803ed5 Author: Luciano Coelho Date: Tue Nov 30 14:58:46 2010 +0200 wl12xx: fix illegal memset if debugfs is not enabled If we try to reset the debugfs statistics when debugfs is not configured in the kernel, we're memset an illegal pointer, because it has never been allocated. So check whether we have debugfs enabled by looking into the wl->rootdir before trying to reset the fw_stats struct. Reported-by: Joerie de Gram Signed-off-by: Luciano Coelho commit d60080ae06b98790036104f07fa897cfc151ce12 Author: Eliad Peller Date: Wed Nov 24 12:53:16 2010 +0200 wl1271: move wl12xx debugfs directory to under wiphy's debugfs Use per-device debugfs path, so multiple devices won't collide. in order to use wl->hw->wiphy->debugfsdir, we have to move the debugfs creation from wl1271_debugfs_init() to wl1271_register_hw(). Reported-by: Johannes Berg Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 7cb2cea9f0f207f819db9823413fa263175b6230 Author: Eliad Peller Date: Wed Nov 24 12:53:15 2010 +0200 wl1271: use debugfs_remove_recursive Documentation/filesystems/debugfs.txt: """ Once upon a time, debugfs users were required to remember the dentry pointer for every debugfs file they created so that all files could be cleaned up. We live in more civilized times now, though, and debugfs users can call: void debugfs_remove_recursive(struct dentry *dentry); """ Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 43f901fbc8ba94bfa8d58155ba9378d7a13af636 Author: Thomas Chou Date: Wed Oct 6 15:13:53 2010 +0800 gen_init_cpio: remove leading `/' from file names When we extracted the generated cpio archive using "cpio -id" command, it complained, cpio: Removing leading `/' from member names var/run cpio: Removing leading `/' from member names var/lib cpio: Removing leading `/' from member names var/lib/misc It is worse with the latest "cpio" or "pax", which tries to overwrite the host file system with the leading '/'. So the leading '/' of file names should be removed. This is consistent with the initramfs come with major distributions such as Fedora or Debian, etc. Signed-off-by: Thomas Chou Acked-by: Mike Frysinger Signed-off-by: Michal Marek commit 0a18a9386c056028799938960f91be338c4ff349 Author: Uwe Kleine-König Date: Thu Nov 4 10:24:16 2010 +0100 tags: put function prototypes back! Commit 7db86dc (ctags: usability fix) removed function prototypes from tags file claiming "It makes no real sense to include function prototypes". But it is useful for quickly determining which header file developer needs to include to fix compilation. Now if someone wants to remove forward declarations (which I agree are baggage), write a postprocessing script. Signed-off-by: Alexey Dobriyan Signed-off-by: Uwe Kleine-König Signed-off-by: Michal Marek commit ff0fba0bca4182e022c0a2ac0f3e63508e86e9f1 Author: Omar Ramirez Luna Date: Fri Oct 22 20:10:58 2010 -0500 OMAP: mailbox: fix detection for previously supported chips Fix the mailbox detection for OMAP3630 and 2430, also minor cleanup on conditional ifdef's that could affect it. Given that 2430 has an iva too, include it, as the same steps for omap3 apply. Signed-off-by: Omar Ramirez Luna Acked-by: Hiroshi Doyu commit 5d783731c683161d5d921c2ed03a43d6d31cf418 Author: Omar Ramirez Luna Date: Wed Dec 1 14:15:08 2010 -0600 OMAP: mailbox: remove unreachable return Remove unreachable return statement. Signed-off-by: Omar Ramirez Luna Acked-by: Benoit Cousson Acked-by: Hiroshi Doyu commit 582563074a691eb45cb22d2eca70eed8f2091c5f Author: Kanigeri, Hari Date: Mon Nov 29 20:24:14 2010 +0000 OMAP: mailbox: add notification support for multiple readers In the current mailbox driver, the mailbox internal pointer for callback can be directly manipulated by the Users, so a second User can easily corrupt the first user's callback pointer. The initial effort to correct this issue can be referred here: https://patchwork.kernel.org/patch/107520/ Along with fixing the above stated issue, this patch adds the flexibility option to register notifications from multiple readers to the events received on a mailbox instance. The discussion regarding this can be referred here. http://www.mail-archive.com/linux-omap@vger.kernel.org/msg30671.html Signed-off-by: Hari Kanigeri Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi Doyu commit a42743c26a53a2a5f2b2018a9659ab3fb604d5bc Author: Kanigeri, Hari Date: Mon Nov 29 20:24:13 2010 +0000 OMAP: mailbox: send message in process context Schedule the Tasklet to send only when mailbox fifo is full and there are pending messages in kfifo, else send the message directly in the Process context. This would avoid needless scheduling of Tasklet for every message transfer Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit ab66ac3007cb3e59fe80dfcf36aff243d3008cb9 Author: Kanigeri, Hari Date: Mon Nov 29 20:24:12 2010 +0000 OMAP: mailbox: fix checkpatch warnings Fix the following checkpatch warnings observed in mailbox module. WARNING: please, no space for starting a line, excluding comments + fail_alloc_rxq:$ WARNING: please, no space for starting a line, excluding comments + fail_alloc_txq:$ WARNING: please, no space for starting a line, excluding comments + fail_request_irq:$ WARNING: line over 80 characters + mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size, sizeof(mbox_msg_t)); Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit d2295042b783c2b17d93cd5ab786bbfd4f2f5c90 Author: Fernando Guzman Lugo Date: Mon Nov 29 20:24:11 2010 +0000 OMAP: mailbox: change full flag per mailbox queue instead of global The variable rq_full flag is a global variable, so if there are multiple mailbox users there will be conflicts. Now there is a full flag per mailbox queue. Reported-by: Ohad Ben-Cohen Signed-off-by: Fernando Guzman Lugo Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit a44a11e9a049b491445bfbd93969d23c49047714 Author: Arnaud Lacombe Date: Thu Nov 4 00:16:08 2010 -0400 kconfig: the day kconfig warns about "select"-abuse has come CC: catalin.marinas@arm.com Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit e4b546a3643fbfc510d5ef7db538e4d3ab00effb Merge: b3d006c d7470b6 Author: Ingo Molnar Date: Thu Dec 2 11:20:11 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit ccb7c410ddc054b8c1ae780319bc98ae092d3854 Author: David S. Miller Date: Wed Dec 1 18:09:13 2010 -0800 timewait_sock: Create and use getpeer op. The only thing AF-specific about remembering the timestamp for a time-wait TCP socket is getting the peer. Abstract that behind a new timewait_sock_ops vector. Support for real IPV6 sockets is not filled in yet, but curiously this makes timewait recycling start to work for v4-mapped ipv6 sockets. Signed-off-by: David S. Miller commit 4399ce402c7c837dec80bf9fb40d079b39b9265a Author: David S. Miller Date: Wed Dec 1 17:29:08 2010 -0800 inetpeer: Fix incorrect comment about inetpeer struct size. Now with ipv6 support it is no longer less than 64 bytes. Signed-off-by: David S. Miller commit 8790ca172a1550949804a2ad59ccea310f680c9f Author: David S. Miller Date: Wed Dec 1 17:28:18 2010 -0800 inetpeer: Kill use of inet_peer_address_t typedef. They are verboten these days. Signed-off-by: David S. Miller commit be21871f24b0fcd8d0d09c8090385c9cec80efa3 Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:26 2010 +0200 Bluetooth: clean up legal text Remove extra spaces from legal text so that legal stuff looks the same for all bluetooth code. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 70f23020e6d89155504b5b39f22505f4aec6fa6f Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:25 2010 +0200 Bluetooth: clean up hci code Do not use assignment in IF condition, remove extra spaces, fixing typos, simplify code. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 894718a6be69d8cfd191dc291b42be32a1e4851b Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:24 2010 +0200 Bluetooth: clean up l2cap code Do not initialize static vars to zero, macros with complex values shall be enclosed with (), remove unneeded braces. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 285b4e90318dcf421a00b2ac3fe8ab713f3281e3 Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:23 2010 +0200 Bluetooth: clean up rfcomm code Remove extra spaces, assignments in if statement, zeroing static variables, extra braces. Fix includes. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 735cbc4784a084b7a76c43c69f9dba683bb3b48b Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:22 2010 +0200 Bluetooth: clean up sco code Do not use assignments in IF condition, remove extra spaces Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit b78d7b4f204a6ba1901af36c95e10fded9816054 Author: Anderson Lizardo Date: Mon Nov 29 12:15:50 2010 -0400 Bluetooth: Fix error handling for l2cap_init() create_singlethread_workqueue() may fail with errors such as -ENOMEM. If this happens, the return value is not set to a negative value and the module load will succeed. It will then crash on module unload because of a destroy_workqueue() call on a NULL pointer. Additionally, the _busy_wq workqueue is not being destroyed if any errors happen on l2cap_init(). Signed-off-by: Anderson Lizardo Signed-off-by: Gustavo F. Padovan commit eeb366564be7c311b31c70821d18a43a8a57f9bc Author: Gustavo F. Padovan Date: Mon Nov 1 18:43:53 2010 +0000 Bluetooth: Get rid of __rfcomm_get_sock_by_channel() rfcomm_get_sock_by_channel() was the only user of this function, so I merged both into rfcomm_get_sock_by_channel(). The socket lock now should be hold outside of rfcomm_get_sock_by_channel() once we hold and release it inside the same function now. Signed-off-by: Gustavo F. Padovan commit e0f0cb56364958223f0cb1f1b0b0eecf1b8dcb95 Author: Gustavo F. Padovan Date: Mon Nov 1 18:43:53 2010 +0000 Bluetooth: Get rid of __l2cap_get_sock_by_psm() l2cap_get_sock_by_psm() was the only user of this function, so I merged both into l2cap_get_sock_by_psm(). The socket lock now should be hold outside of l2cap_get_sock_by_psm() once we hold and release it inside the same function now. Signed-off-by: Gustavo F. Padovan commit cc11b9c14da4ca1c545b424dae2ae8fb1ab04063 Author: Andrei Emeltchenko Date: Mon Nov 22 13:21:37 2010 +0200 Bluetooth: do not use assignment in if condition Fix checkpatch errors like: "ERROR: do not use assignment in if condition" Simplify code and fix one long line. Signed-off-by: Andrei Emeltchenko Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 940a9eea80946b64b96bd8af1fc71b30c602d057 Author: Andrei Emeltchenko Date: Wed Nov 3 12:32:45 2010 +0200 Bluetooth: timer check sk is not owned before freeing In timer context we might delete l2cap channel used by krfcommd. The check makes sure that sk is not owned. If sk is owned we restart timer for HZ/5. Signed-off-by: Andrei Emeltchenko Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit a49184c229535ebedbb659214db2d4d1d77b7c07 Author: Andrei Emeltchenko Date: Wed Nov 3 12:32:44 2010 +0200 Bluetooth: Check sk is not owned before freeing l2cap_conn Check that socket sk is not locked in user process before removing l2cap connection handler. lock_sock and release_sock do not hold a normal spinlock directly but instead hold the owner field. This means bh_lock_sock can still execute even if the socket is "locked". More info can be found here: http://www.linuxfoundation.org/collaborate/workgroups/networking/socketlocks krfcommd kernel thread may be preempted with l2cap tasklet which remove l2cap_conn structure. If krfcommd is in process of sending of RFCOMM reply (like "RFCOMM UA" reply to "RFCOMM DISC") then kernel crash happens. ... [ 694.175933] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 694.184936] pgd = c0004000 [ 694.187683] [00000000] *pgd=00000000 [ 694.191711] Internal error: Oops: 5 [#1] PREEMPT [ 694.196350] last sysfs file: /sys/devices/platform/hci_h4p/firmware/hci_h4p/loading [ 694.260375] CPU: 0 Not tainted (2.6.32.10 #1) [ 694.265106] PC is at l2cap_sock_sendmsg+0x43c/0x73c [l2cap] [ 694.270721] LR is at 0xd7017303 ... [ 694.525085] Backtrace: [ 694.527587] [] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [] (sock_sendmsg+0xb8/0xd8) [ 694.537292] [] (sock_sendmsg+0x0/0xd8) from [] (kernel_sendmsg+0x48/0x80) Signed-off-by: Andrei Emeltchenko Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit d31dbf6e5989b2fd9a30ec5b25436e94f009d6df Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:31 2010 +0400 Bluetooth: hidp: fix information leak to userland Structure hidp_conninfo is copied to userland with version, product, vendor and name fields unitialized if both session->input and session->hid are NULL. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 3185fbd9d7bb166992f072440b3329f58bf2c60a Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:26 2010 +0400 Bluetooth: cmtp: fix information leak to userland Structure cmtp_conninfo is copied to userland with some padding fields unitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 5520d20f68310fc158dcbbecfd5eac5cdfc5a241 Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:21 2010 +0400 Bluetooth: bnep: fix information leak to userland Structure bnep_conninfo is copied to userland with the field "device" that has the last elements unitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 127178d24c7eb2df53b1ba2b6f6f743e88178a1b Author: Johan Hedberg Date: Thu Nov 18 22:22:29 2010 +0200 Bluetooth: Automate remote name requests In Bluetooth there are no automatic updates of remote device names when they get changed on the remote side. Instead, it is a good idea to do a manual name request when a new connection gets created (for whatever reason) since at this point it is very cheap (no costly baseband connection creation needed just for the sake of the name request). So far userspace has been responsible for this extra name request but tighter control is needed in order not to flood Bluetooth controllers with two many commands during connection creation. It has been shown that some controllers simply fail to function correctly if they get too many (almost) simultaneous commands during connection creation. The simplest way to acheive better control of these commands is to move their sending completely to the kernel side. This patch inserts name requests into the sequence of events that the kernel performs during connection creation. It does this after the remote features have been successfully requested and before any pending authentication requests are performed. The code will work sub-optimally with userspace versions that still do the name requesting themselves (it shouldn't break anything though) so it is recommended to combine this with a userspace software version that doesn't have automated name requests. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 392599b95d76f4f3102d8614bdc1957795cd1a3a Author: Johan Hedberg Date: Thu Nov 18 22:22:28 2010 +0200 Bluetooth: Create a unified authentication request function This patch adds a single function that's responsible for requesting authentication for outgoing connections. This is preparation for the next patch which will add automated name requests and thereby move the authentication requests to a different location. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit ccd556fe334914bf2e465eb5bc480d49cd4406d7 Author: Johan Hedberg Date: Wed Nov 10 17:11:51 2010 +0200 Bluetooth: Simplify remote features callback function logic The current remote and remote extended features event callbacks logic can be made simpler by using a label and goto statements instead of the current multiple levels of nested if statements. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 17f490bcedd7b6677140b2d49efe9e9e6b84de60 Merge: 61790c5 be93112 Author: Gustavo F. Padovan Date: Wed Dec 1 21:04:09 2010 -0200 Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test commit d7470b6afca85ed4388fff57fc9d89f5a3be02ff Author: Stephane Eranian Date: Wed Dec 1 18:49:05 2010 +0200 perf stat: Add csv-style output This patch adds an option (-x/--field-separator) to print counts using a CSV-style output. The user can pass a custom separator. This makes it very easy to import counts directly into your favorite spreadsheet without having to write scripts. Example: $ perf stat --field-separator=, -a -- sleep 1 4009.961740,task-clock-msecs 13,context-switches 2,CPU-migrations 189,page-faults 9596385684,cycles 3493659441,instructions 872897069,branches 41562,branch-misses 22424,cache-references 1289,cache-misses Works also in non-aggregated mode: $ perf stat -x , -a -A -- sleep 1 CPU0,1002.526168,task-clock-msecs CPU1,1002.528365,task-clock-msecs CPU2,1002.523360,task-clock-msecs CPU3,1002.519878,task-clock-msecs CPU0,1,context-switches CPU1,5,context-switches CPU2,5,context-switches CPU3,6,context-switches CPU0,0,CPU-migrations CPU1,1,CPU-migrations CPU2,0,CPU-migrations CPU3,1,CPU-migrations CPU0,2,page-faults CPU1,6,page-faults CPU2,9,page-faults CPU3,174,page-faults CPU0,2399439771,cycles CPU1,2380369063,cycles CPU2,2399142710,cycles CPU3,2373161192,cycles CPU0,872900618,instructions CPU1,873030960,instructions CPU2,872714525,instructions CPU3,874460580,instructions CPU0,221556839,branches CPU1,218134342,branches CPU2,218161730,branches CPU3,218284093,branches CPU0,18556,branch-misses CPU1,1449,branch-misses CPU2,3447,branch-misses CPU3,12714,branch-misses CPU0,8330,cache-references CPU1,313844,cache-references CPU2,47993728,cache-references CPU3,826481,cache-references CPU0,272,cache-misses CPU1,5360,cache-misses CPU2,1342193,cache-misses CPU3,13992,cache-misses This second version adds the ability to name a separator and uses field-separator as the long option to be consistent with perf report. Commiter note: Since we enabled --big-num by default in 201e0b0 and -x can't be used with it, we need to notice if the user explicitely enabled or disabled -B, add code to disable big_num if the user didn't explicitely set --big_num when -x is used. Cc: David S. Miller Cc: Frederik Weisbecker Cc: Ingo Molnar Cc: paulus@samba.org Cc: Peter Zijlstra Cc: Robert Richter LKML-Reference: <4cf68aa7.0fedd80a.5294.1203@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 67d5288049f46f816181f63eaa8f1371877ad8ea Author: Jon Mason Date: Mon Nov 29 18:02:47 2010 +0000 vxge: update driver version Update vxge driver version Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit ead5d238146981f922e3848fac83825d87c518f0 Author: Jon Mason Date: Mon Nov 29 18:02:46 2010 +0000 vxge: use strcpy for strings Use strncpy instead of memcpy when working on strings Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1bacdbb341e8c92c58651f06727318c3d0c1c30e Author: Jon Mason Date: Mon Nov 29 18:02:45 2010 +0000 vxge: remove unnecessary printks Remove printks for ring blocks, fifo blocks, and rx doorbell mode as they clutter the dmesg output during modprobe and provide no useful information. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 8afe7c8acd33bc52c56546e73e46e9d546269e2c Author: stephen hemminger Date: Mon Nov 29 09:47:49 2010 +0000 ipip: add module alias for tunl0 tunnel device If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4da6a738ffdb99b88efbe5b4c4fe521ca453640d Author: stephen hemminger Date: Mon Nov 29 09:47:48 2010 +0000 gre: add module alias for gre0 tunnel device If gre is built as a module the 'ip tunnel add' command would fail because the ip_gre module was not being autoloaded. Adding an alias for the gre0 device name cause dev_load() to autoload it when needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f Author: stephen hemminger Date: Mon Nov 29 09:47:47 2010 +0000 gre: minor cleanups Use strcpy() rather the sprintf() for the case where name is getting generated. Fix indentation. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f2cd2d3e9b3ef960612e362f0ad129d735452df2 Author: Eric Dumazet Date: Mon Nov 29 08:14:37 2010 +0000 net sched: use xps information for qdisc NUMA affinity Allocate qdisc memory according to NUMA properties of cpus included in xps map. To be effective, qdisc should be (re)setup after changes of /sys/class/net/eth/queues/tx-/xps_cpus I added a numa_node field in struct netdev_queue, containing NUMA node if all cpus included in xps_cpus share same node, else -1. Signed-off-by: Eric Dumazet Cc: Ben Hutchings Cc: Tom Herbert Signed-off-by: David S. Miller commit 0793f83f0ec2142d06abe53570417c8d95e0310a Author: Dmitry Kravkov Date: Wed Dec 1 12:39:28 2010 -0800 bnx2x: Add Nic partitioning mode (57712 devices) NIC partitioning is another flavor of multi function - having few PCI functions share the same physical port. Unlike the currently supported mode of multi-function which depends on the switch configuration and uses outer-VLAN, the NPAR mode is switch independent and uses the MAC addresses to distribute incoming packets to the different functions. This patch adds the specific HW setting of the NPAR mode and some distinctions between switch dependent (SD) and switch independent (SI) multi-function (MF) modes where the configuration is not the same. Advance driver version to 1.60.00-6 Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 201e0b06efee80ce090579aa165c65c3d0836d95 Author: Arnaldo Carvalho de Melo Date: Wed Dec 1 17:53:27 2010 -0200 perf stat: Use --big-num format by default [acme@mica linux]$ perf stat ls > /dev/null Performance counter stats for 'ls': 1.512532 task-clock-msecs # 0.801 CPUs 2 context-switches # 0.001 M/sec 0 CPU-migrations # 0.000 M/sec 241 page-faults # 0.159 M/sec 2,973,331 cycles # 1965.797 M/sec 1,460,802 instructions # 0.491 IPC 314,642 branches # 208.023 M/sec 18,475 branch-misses # 5.872 % cache-references cache-misses 0.001887676 seconds time elapsed To get the previous behaviour just use --no-big-num: [acme@mica linux]$ perf stat --no-big-num ls > /dev/null Performance counter stats for 'ls': 1.468014 task-clock-msecs # 0.795 CPUs 1 context-switches # 0.001 M/sec 0 CPU-migrations # 0.000 M/sec 241 page-faults # 0.164 M/sec 2900254 cycles # 1975.631 M/sec 1437991 instructions # 0.496 IPC 310905 branches # 211.786 M/sec 17912 branch-misses # 5.761 % cache-references cache-misses 0.001845435 seconds time elapsed [acme@mica linux]$ Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8c207692fc8fa3ea1a5ff97ad698efb09a81975a Author: Shawn Bohrer Date: Tue Nov 30 19:57:19 2010 -0600 perf stat: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-12-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit f68d6bd451782b58c2b563dc86f0a81ba106c30c Author: Shawn Bohrer Date: Tue Nov 30 19:57:20 2010 -0600 perf test: Fix spelling mistake in documentation Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-13-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 646420f1bcf6ddf3e150f92a5f2a8bd7d6057ff8 Author: Shawn Bohrer Date: Tue Nov 30 19:57:22 2010 -0600 perf trace: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-15-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 2e7a988198b11877d844d147ec81c7caea82c314 Author: Shawn Bohrer Date: Tue Nov 30 19:57:21 2010 -0600 perf top: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-14-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 1eacc94a66ce347abbf75f223361b21461331383 Author: Shawn Bohrer Date: Tue Nov 30 19:57:18 2010 -0600 perf sched: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-11-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit e04fffc321aeebab4962cfc120952272f2d1df98 Author: Shawn Bohrer Date: Tue Nov 30 19:57:17 2010 -0600 perf report: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-10-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 08dbd7e3fa2398910713b21399cca7c6e4b43011 Author: Shawn Bohrer Date: Tue Nov 30 19:57:16 2010 -0600 perf record: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-9-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 9d5b7f5b2b2c1ceade1fbbaefb2bd9167436329d Author: Shawn Bohrer Date: Tue Nov 30 19:57:15 2010 -0600 perf probe: Fix spelling mistake in documentation Acked-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-8-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 4aace251519745977f4b5ddf625b630b4807be3a Author: Shawn Bohrer Date: Tue Nov 30 19:57:14 2010 -0600 perf lock: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-7-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 5c0ef0ab077c8bdb224540fea60473439be1bdb4 Author: Shawn Bohrer Date: Tue Nov 30 19:57:13 2010 -0600 perf kvm: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-6-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 5ea4f857850450dc1442144a00547d6623d79d78 Author: Shawn Bohrer Date: Tue Nov 30 19:57:12 2010 -0600 perf diff: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-5-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 342955593af08f185279e074b3d77719d2f23b82 Author: Shawn Bohrer Date: Tue Nov 30 19:57:11 2010 -0600 perf diff: Fix displacement and modules options short flag The --displacement and --modules options to perf diff both use -m as a short flag. Change --displacement to use -M since other perf commands use -m, --modules. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-4-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit b6a535dbf615e168e796eec7318c77d1a3b7047f Author: Shawn Bohrer Date: Tue Nov 30 19:57:10 2010 -0600 perf buildid-list: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-3-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 1968ad911d0769e58a484bb721d275814baf9f2f Author: Shawn Bohrer Date: Tue Nov 30 19:57:09 2010 -0600 perf annotate: Document missing options. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-2-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit d0777f2c3eda180e3fc549e0efbe741014f17689 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:16 2010 -0800 spi/pxa2xx: Consider CE4100's FIFO depth For PXA the default threshold is FIFO_DEPTH / 2. Adjust this value for CE4100. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit d6ea3df0d470fb9260db93883f97764cf9f0e562 Author: Sebastian Andrzej Siewior Date: Wed Nov 24 10:17:14 2010 +0100 spi/pxa2xx: Add CE4100 support Sodaville's SPI controller is very much the same as in PXA25x. The difference: - The RX/TX FIFO is only 4 words deep instead of 16 - No DMA support - The SPI controller offers a CS functionality Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 8348c259dd6a6019a8fa01b0a3443409480f7b9d Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:15 2010 -0800 arm/pxa2xx: reorgazine SSP and SPI header files The PXA-SPI driver relies on some files / defines which are arm specific and are within the ARM tree. The CE4100 SoC which is x86 has also the SPI core. This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to include/linux where the CE4100 can access them. This move got verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 4a25605fb71f02b4f80091df91f777225a0309c5 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:15 2010 -0800 spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 49cbb1e0b6dcba9170e72fdf40c75fc24cadba4b Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:14 2010 -0800 spi/pxa2xx: add support for shared IRQ handler This is required in case the interrupt line is shared with other devices. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 50005a8deb38e5e6456ebd94e57adb321d4589de Author: Russell King Date: Fri Nov 12 13:04:16 2010 +0000 ARM: module: ignore unwind for sections not marked SHF_ALLOC If a section is not marked with SHF_ALLOC, it will be discarded by the module code. Therefore, it is not correct to register the unwind tables. Signed-off-by: Russell King commit 8931360eb9c6ec8bd30efef579cef81917a2fcf3 Author: Russell King Date: Fri Nov 12 13:02:46 2010 +0000 ARM: module: clean up handling of ELF unwind tables There's no need to keep pointers to the ELF sections available while the module is loaded - we only need the section pointers while we're finding and registering the unwind tables, which can all be done during the finalize stage of loading. Signed-off-by: Russell King commit 0607f8622953541e95030ab011258d9f1f381357 Author: Felipe Balbi Date: Wed Dec 1 11:03:54 2010 +0200 usb: musb: gadget: prevent a NULL pointer dereference Case we can't allocate struct musb_request, prevent a NULL pointer dereference by returning early. Signed-off-by: Felipe Balbi commit fcf173e4511193b1efeccb0f22a8c641b464353b Author: Hema Kalliguddi Date: Wed Sep 29 11:26:39 2010 -0500 usb: musb: add names for IRQs in structure resource Soon resource data will get automatically populated from a set of autogenerated data from TI's hardware database for the OMAP platform. Such database, might not have resources at the expected order by the current drivers. While we could hack in some exceptions to that tool to generate resources in a specific order, it seems less fragile to use the resource name instead. That way, no matter what order the resources are generated, the driver still work. Modified the OMAP, Blackfin and Davinci architecture files to add the name of the IRQs in the resource structures and musb driver to use the platform_get_irq_byname() api to get the device and dma irq numbers instead of using the index. Cc: Tony Lindgren Acked-by: Kevin Hilman Acked-by: Mike Frysinger Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit ea65df57c2eea803535a071752efb030c46a11f5 Author: Hema Kalliguddi Date: Wed Sep 22 19:27:40 2010 -0500 usb: musb: remove board_data parameter from musb_platform_init() Removed the board_data parameter being passed to musb_platform_init function as board_data can be extracted from device structure which is already member of musb structure. Acked-by: Kevin Hilman Cc: Tony Lindgren Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit b3d006c0e745bfd2dab4984ffe3279d5cf4e926a Merge: 4c635a4 133dc4c Author: Ingo Molnar Date: Wed Dec 1 09:18:12 2010 +0100 Merge branch 'perf/rename' into perf/core Merge reason: This is an older commit under testing that was not pushed yet - merge it. Also fix up the merge in command-list.txt. Signed-off-by: Ingo Molnar Acked-by: Tom Zanussi commit da0c490115de026618a7fdcd886602da44392a50 Author: Joe Perches Date: Mon Nov 29 23:33:07 2010 -0800 Input: use pr_fmt and pr_ Signed-off-by: Joe Perches Signed-off-by: Dmitry Torokhov commit 4eb3c30b2e034b673df3e8f21b497e39f3911a02 Author: Joe Perches Date: Mon Nov 29 23:33:07 2010 -0800 Input: i8042 - use pr_, pr_fmt, fix dbg and __FILE__ use Standardized message logging prefixes. Removed \n from dbg macro, added \n to each dbg call site. Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt) Added non-debug printf argument verification of dbg calls Removed "i8042.c" from printks, converted to pr_ Signed-off-by: Joe Perches Signed-off-by: Dmitry Torokhov commit b029ffafe89cf4b97cf39e0225a5205cbbf9e02f Author: Hemanth V Date: Tue Nov 30 23:03:54 2010 -0800 Input: add CMA3000 accelerometer driver Add support for CMA3000 Tri-axis accelerometer, which supports Motion detect, Measurement and Free fall modes. CMA3000 supports both I2C/SPI bus for communication, currently the driver supports I2C based communication. Signed-off-by: Hemanth V Reviewed-by: Jonathan Cameron Reviewed-by: Sergio Aguirre Reviewed-by: Shubhrajyoti Signed-off-by: Dmitry Torokhov commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 Author: Paul Mundt Date: Wed Dec 1 15:58:58 2010 +0900 sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects. This switches over to selects for the subtypes to enable OHCI/EHCI support explicitly rather than littering the usb Kconfig with subtype dependencies. Suggested-by: David Daney Signed-off-by: Paul Mundt commit 1a44d72a4058f870c305a23aa5cbc4cacb6758ea Author: Kuninori Morimoto Date: Wed Dec 1 00:31:46 2010 +0000 ARM: mach-shmobile: mackerel: Add FSI-AK4643 support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit d44deb35c26c74d0f1ebea95a5fc386f72d210f7 Author: Kuninori Morimoto Date: Tue Nov 30 06:52:18 2010 +0000 ARM: mach-shmobile: mackerel: Add LEDs support you can control it by echo 0 > /sys/class/leds/led0/brightness echo 1 > /sys/class/leds/led0/brightness Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2 Author: Daniel Walker Date: Tue Nov 30 11:25:39 2010 -0800 drivers: char: hvc: add arm JTAG DCC console support This driver adds a basic console that uses the arm JTAG DCC to transfer data back and forth. It has support for ARMv6 and ARMv7. This console is created under the HVC driver, and should be named /dev/hvcX (or /dev/hvc0 for example). Cc: Tony Lindgren Acked-by: Arnd Bergmann Acked-by: Nicolas Pitre Cc: Mike Frysinger Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman commit de6f86ce51341559dc3c9c9f5c562da12fcfcb31 Author: Yegor Yefremov Date: Mon Nov 22 11:06:32 2010 +0100 RS485 documentation: add 16C950 UART description Add a notion about 16C950 UART, that is using DTR signal for RS485 mode. Signed-off-by: Yegor Yefremov Signed-off-by: Greg Kroah-Hartman commit a4fb0b228e284107b9bdf44769bbdc80efd660e1 Author: Vasiliy Kulikov Date: Fri Nov 19 21:41:45 2010 +0300 serial: ifx6x60: fix memory leak If tty_register_driver() failed then tty_driver is still alive. Free it with put_tty_driver(). Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit badb9533abbbba70df099765afe4ae432b442430 Author: Vasiliy Kulikov Date: Fri Nov 19 21:42:03 2010 +0300 serial: ifx6x60: free IRQ on error If second request_irq() failed then the first IRQ must be freed in error handling code. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 3c6a483275f47a2ef7119309ad3d791c10cf30da Author: Tomoya MORINAGA Date: Wed Nov 17 09:55:54 2010 +0900 Serial: EG20T: add PCH_UART driver UART driver of Intel EG20T(Topcliff) PCH Intel EG20T PCH is the platform controller hub that is going to be used in Intel's general embedded platform. All IO peripherals in Intel EG20T PCH are actually devices sitting on AMBA bus. Intel EG20T PCH has UART I/F. Using this I/F, it is able to access system devices connected to UART. Signed-off-by: Tomoya MORINAGA Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 095e24b0ea75b2bdc532b39b04530993442f237f Author: Dirk Brandewie Date: Wed Nov 17 07:35:20 2010 -0800 Serial: ce4100: Add PCI UART support for the ce4100 This patch adds support for the PCI UART on the ce4100. Signed-off-by: Dirk Brandewie Signed-off-by: Greg Kroah-Hartman commit 0ae86689d88bebba16c2db899f845446578d53b3 Merge: e7cddda 6aa85a5 Author: Greg Kroah-Hartman Date: Tue Nov 30 17:04:33 2010 -0800 Merge branch 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into usb-next * 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb: omap4: 4430sdp: enable the ehci port on 4430SDP arm: omap4: select USB_ARCH_HAS_EHCI arm: omap4: usb: add platform init code for EHCI arm: omap4: add USBHOST and related base addresses usb: ehci-omap: Add OMAP4 support omap: usb: ehci: introduce HSIC mode usb: ehci-omap: add helpers for checking port mode usb: ehci-omap: use clkdev aliases for functional clocks omap: clock: add clkdev aliases for EHCI clocks usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP usb: ehci-omap: don't hard-code TLL channel count usb: ehci-omap: update clock names to be more generic commit 4c635a4e04700a371ef7e4d4bb33ed88747e801e Author: Corey Ashford Date: Tue Nov 30 14:27:01 2010 -0800 perf tools: fix event parsing of comma-separated tracepoint events There are number of issues that prevent the use of multiple tracepoint events being specified in a -e/--event switch, separated by commas. For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails because the tracepoint event parsing code doesn't recognize the comma separator properly. This patch corrects those issues. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Julia Lawall Cc: Paul Mackerras Cc: Peter Zijlstra Reported-by: Michael Ellerman LKML-Reference: <1291156021-17711-1-git-send-email-cjashfor@linux.vnet.ibm.com> Signed-off-by: Corey Ashford Signed-off-by: Arnaldo Carvalho de Melo commit 3e8e24f2fc66d32eb0e570e4117dfd05227047e6 Author: Don Zickus Date: Tue Nov 30 17:12:13 2010 -0500 perf packaging: add memcpy to perf MANIFEST There seems to be a new dependency on arch/*/lib/memcpy*.S when compiling the perf tool. Make sure that file is included in the MANIFEST when creating the tarball. Cc: Ingo Molnar LKML-Reference: <1291155133-3499-2-git-send-email-dzickus@redhat.com> Signed-off-by: Don Zickus Signed-off-by: Arnaldo Carvalho de Melo commit e7cddda48c7f892a3fb5c10a6f41a4395f46c0c2 Author: cxie4 Date: Tue Nov 30 13:35:15 2010 +0800 USB: pxa: Add USB client support for Marvell PXA9xx/PXA168 chips This patch add USB client support Marvell PXA9xx/PXA168 chips. The USB controller in PXA9xx/PXA168 is a High-Speed OTG controller. The available endpoints is different between PXA9xx and PXA168. NOTE: It is the first version of Marvell PXA9xx/PXA168 USB controller driver. The support for OTG mode will be added in later patch. PXA9xx and PXA168 has integrated UTMI PHY in the chips. The initialization for the PHY is a little different between PXA9xx and PXA168. Signed-off-by: Chao Xie Signed-off-by: Greg Kroah-Hartman commit b48d7f50e6f16478304170eaf5c2d1a540ba5e31 Author: Paul Mundt Date: Tue Nov 30 17:57:02 2010 +0900 usb: Add in missing EHCI helpers. Several of the EHCI glue drivers either predate or were merged in the same timeframe as API changes at the USB core level, resulting in some missing endpoint_reset and clear_tt_buffer_complete callbacks. This fixes up all of ehci-atmel, mxc, w90x900, and xilinx-of to tie in the new helpers, which brings them in line with everyone else. Reported-by: Alan Stern Signed-off-by: Paul Mundt Signed-off-by: Greg Kroah-Hartman commit 7fc56f0d9908fe140a01387d59954e3d0a2e7744 Author: Luo Andy Date: Tue Nov 23 10:41:21 2010 +0800 usb: gadget: langwell_udc: add usb test mode support This patch adds test mode support for Langwell gadget driver. Signed-off-by: Henry Yuan Signed-off-by: Andy Luo Signed-off-by: Greg Kroah-Hartman commit b23f2f94136884ebeb1b5e2196f4a53086444afa Author: Hao Wu Date: Mon Nov 29 15:17:03 2010 +0800 usb: composite gadget: set vbus_draw current limitation during suspend This patch modifies the composite gadget to set vbus_draw current limitation during suspend state. This current limitation in suspend state shouldn't be more than 2.5mA Signed-off-by: Hao Wu Signed-off-by: Greg Kroah-Hartman commit c3d6450e741da08c3bc2e2ba06d743c27540abac Author: Jarkko Nikula Date: Tue Nov 30 17:58:25 2010 +0200 usb: otg: twl4030-usb: Fix unbalanced regulator disables at module removal Function twl4030_usb_remove can cause unbalanced regulator disables in twl4030_phy_power if the cable is not connected. Regulator enable/disable calls are in balance only if the twl4030_phy_resume was called prior the twl4030_usb_remove, that is, the cable was connected. Fix this by checking the 'asleep' variable in twl4030_usb_remove since that variable is used to check state in other functions. Signed-off-by: Jarkko Nikula Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 02303f73373aa1da19dbec510ec5a4e2576f9610 Author: Dan Williams Date: Fri Nov 19 16:04:00 2010 -0600 usb-wwan: implement TIOCGSERIAL and TIOCSSERIAL to avoid blocking close(2) Some devices (ex ZTE 2726) simply don't respond at all when data is sent to some of their USB interfaces. The data gets stuck in the TTYs queue and sits there until close(2), which them blocks because closing_wait defaults to 30 seconds (even though the fd is O_NONBLOCK). This is rarely desired. Implement the standard mechanism to adjust closing_wait and let applications handle it how they want to. Signed-off-by: Dan Williams commit 73f35c60d5c4a98061fc0f94505bf26fd4bb1a1c Author: Jesper Juhl Date: Tue Nov 9 00:10:52 2010 +0100 USB: Remove unnecessary casts of void ptr returning alloc function return values Hi, The [vk][cmz]alloc(_node) family of functions return void pointers which it's completely unnecessary/pointless to cast to other pointer types since that happens implicitly. This patch removes such casts from drivers/usb/ Signed-off-by: Jesper Juhl commit b17ea167c5fb50dcd5dce5b874a467f04eec886d Author: Pete Zaitcev Date: Tue Nov 16 21:51:19 2010 -0700 usbmon: correct length for isochronous Usually the usbmon returns the amount of data specified in urb->transfer_buffer_length for output submissions and urb->actual_length for input callbacks. However, for Isochronous input transfers, this is not enough, since the returned data buffer may contain "holes". One easy way to fix this is to use urb->transfer_buffer_length, but this often transfers a whole lot of unused data, so we find how much was actually used instead. Original patch by Márton Németh. See also kernel bug 22182. Signed-off-by: Pete Zaitcev Signed-off-by: Márton Németh Signed-off-by: Greg Kroah-Hartman commit 33069739d1c2f03734d5b5b003593e9552d412c1 Author: Stepan Moskovchenko Date: Fri Nov 12 19:30:00 2010 -0800 msm: iommu: Miscellaneous code cleanup Remove some unneeded assignments and messages, restructure a failure path in iova_to_phys, and make __flush_iotlb return int in preparation for adding IOMMU clock control. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 100832c9b6adb3d63407416931caeba3f3b9a777 Author: Stepan Moskovchenko Date: Mon Nov 15 18:20:08 2010 -0800 msm: iommu: Support cache-coherent memory access Add support for allowing IOMMU memory transactions to be cache coherent, eliminating the need for software cache management in certain situations. This can lead to improvements in performance and power usage, assuming the multimedia core's access pattern exhibits spatial locality and that its working set fits into the cache. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 08bd6839783319085ee0db4c888534e626225774 Author: Stepan Moskovchenko Date: Mon Nov 15 18:19:35 2010 -0800 msm: iommu: Definitions for extended memory attributes Add the register field definitions and memory attribute definitions that will be needed to support IOMMU transactions with cache-coherent memory access. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 0ab84745ef65043a616b36b26bec58e1cb62a742 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:57 2010 -0800 msm: iommu: Kconfig dependency for the IOMMU API Make the IOMMU driver select the IOMMU API in the kernel configuration. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 00d4b2bb03b9ed27f28336b0a68f2bd7f67caa40 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:56 2010 -0800 msm: iommu: Check if device is already attached An IOMMU device can only be attached to one IOMMU domain at any given time. Check whether the device is already attached to a domain before allowing it to be attached to another domain. If so, return busy. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 2607b0a26094b2d2d174c3e27b2ecc9c49d86f40 Author: Stepan Moskovchenko Date: Mon Nov 15 17:46:10 2010 -0800 msm: iommu: Kconfig item for cacheable page tables Add a Kconfig item to allow the IOMMU page tables to be coherent in the L2 cache. This generally reduces IOTLB miss latencies and has been shown to improve multimedia performance. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 5b1c144475a7f2d0ab34d0b9b8414ab18b02a283 Author: Arnaldo Carvalho de Melo Date: Tue Nov 30 17:48:53 2010 -0200 perf debug: Simplify trace_event No need to check that many times if debug_trace is on. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 52aa8c539dad56728527de664f368915ff44badf Merge: 55a4e78 032a642 Author: Tony Lindgren Date: Tue Nov 30 14:46:36 2010 -0800 Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus commit 55a4e78952286d498d89a399d845e7cfaa8ddd56 Merge: 9c7bc45 27b1fec Author: Tony Lindgren Date: Tue Nov 30 14:45:49 2010 -0800 Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 1d9bc6dc5b6b9cc9299739f0245ce4841f066b92 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 SELinux: merge policydb_index_classes and policydb_index_others We duplicate functionality in policydb_index_classes() and policydb_index_others(). This patch merges those functions just to make it clear there is nothing special happening here. Signed-off-by: Eric Paris commit ac76c05becb6beedbb458d0827d3deaa6f479a72 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 selinux: convert part of the sym_val_to_name array to use flex_array The sym_val_to_name type array can be quite large as it grows linearly with the number of types. With known policies having over 5k types these allocations are growing large enough that they are likely to fail. Convert those to flex_array so no allocation is larger than PAGE_SIZE Signed-off-by: Eric Paris commit 23bdecb000c806cf4ec52764499a600f7200d7a9 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 selinux: convert type_val_to_struct to flex_array In rawhide type_val_to_struct will allocate 26848 bytes, an order 3 allocations. While this hasn't been seen to fail it isn't outside the realm of possibiliy on systems with severe memory fragmentation. Convert to flex_array so no allocation will ever be bigger than PAGE_SIZE. Signed-off-by: Eric Paris commit c41ab6a1b9028de33e74101cb0aae13098a56fdb Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 flex_array: fix flex_array_put_ptr macro to be valid C Using flex_array_put_ptr() results in a compile error "error: lvalue required as unary ‘&’ operand" fix the casting order to fix this. Signed-off-by: Eric Paris commit c9e86a9b95f198d7df49b25fcd808ee39cba218f Author: Eric Paris Date: Mon Nov 29 15:46:39 2010 -0500 SELinux: do not set automatic i_ino in selinuxfs selinuxfs carefully uses i_ino to figure out what the inode refers to. The VFS used to generically set this value and we would reset it to something useable. After 85fe4025c616 each filesystem sets this value to a default if needed. Since selinuxfs doesn't use the default value and it can only lead to problems (I'd rather have 2 inodes with i_ino == 0 than one pointing to the wrong data) lets just stop setting a default. Signed-off-by: Eric Paris Acked-by: James Morris commit 7ae9f23cbd3ef9daff7f768da4bfd4c56b19300d Author: Eric Paris Date: Tue Nov 23 11:40:09 2010 -0500 selinux: rework security_netlbl_secattr_to_sid security_netlbl_secattr_to_sid is difficult to follow, especially the return codes. Try to make the function obvious. Signed-off-by: Eric Paris commit 4b02b524487622ce1cf472123899520b583f47dc Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in selinuxfs.c selinuxfs.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit b77a493b1dc8010245feeac001e5c7ed0988678f Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in selinuxfs.c selinuxfs.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit 9398c7f794078dc1768cc061b3da8cdd59f179a5 Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in policydb.c policydb.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit 9c7bc451e41abf78b0fd856a9f916f7d39e26297 Merge: 2862945 662b083a 1cb125c Author: Tony Lindgren Date: Tue Nov 30 14:13:15 2010 -0800 Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus commit ad9c2b048b605fbc8d50526e330b88abdd631ab2 Author: Tetsuo Handa Date: Tue Nov 30 11:06:47 2010 +0900 security: Fix comment of security_key_permission Comment for return value of security_key_permission() has been wrong since it was added in 2.6.15. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 662b083a87a3489f3f19c6e0651c1b99b0de5df0 Author: Andrei Emeltchenko Date: Tue Nov 30 14:11:49 2010 -0800 omap: Serial: Define register access modes in LCR Access to some registers depends on register access mode Three different modes are available for OMAP (at least) • Operational mode LCR_REG[7] = 0x0 • Configuration mode A LCR_REG[7] = 0x1 and LCR_REG[7:0]! = 0xBF • Configuration mode B LCR_REG[7] = 0x1 and LCR_REG[7:0] = 0xBF Define access modes and remove redefinitions and magic numbers in serial drivers (and later in bluetooth driver). Signed-off-by: Andrei Emeltchenko Acked-by: Govindraj.R Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 498cb95175c29ed96bf32f30df2d11ec1c7f3879 Author: Andrei Emeltchenko Date: Tue Nov 30 14:11:49 2010 -0800 OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbers Define MDR1 register serial definitions used in serial and bluetooth drivers. Change magic number to ones defined in serial_reg for omap1/2 serial driver. Remove redefined MDR1 register definitions in omap-serial driver. Signed-off-by: Andrei Emeltchenko Acked-by: G, Manjunath Kondaiah Acked-by: Govindraj.R Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 5c891f3840a7a330c96d7203d4bb5be6fa033724 Author: Thomas Gleixner Date: Tue Nov 30 17:49:55 2010 +0000 perf session: Allocate chunks of sample objects The ordered sample code allocates singular reference objects struct sample_queue which have 48byte size on 64bit and 20 bytes on 32bit. That's silly. Allocate ~64k sized chunks and hand them out. Performance gain: ~ 15% Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.398713983@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit f6f41eb9ccc0e6fad0ccba4c5e0a97de935db734 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:54 2010 -0800 msm: iommu: Don't flush page tables if no devices attached Don't flush the page tables on an IOMMU domain if there are no IOMMU devices attached to the domain. The act of attaching to the domain will cause an implicit flush of those areas if the page tables are configured to not be L2 cacheable. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 020bb75a6deeca5ebeae531dc7378c157affc8fd Author: Thomas Gleixner Date: Tue Nov 30 17:49:53 2010 +0000 perf session: Cache sample objects When the sample queue is flushed we free the sample reference objects. Though we need to malloc new objects when we process further. Stop the malloc/free orgy and cache the already allocated object for resuage. Only allocate when the cache is empty. Performance gain: ~ 10% Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.338488630@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 516cbc793eb4be5123289d067b54dfcdabeddb25 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:53 2010 -0800 msm: iommu: Mark functions with the right section names Mark the init and exit functions as __init and __exit where appropriate. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit e8952e3b32701817705b216b492a9be4fa5cbefc Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:52 2010 -0800 msm: iommu: Support for the 2nd GFX core's IOMMU Add the platform data and resources needed for the second 2D graphics core's IOMMU. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit ff25ff842ea6afd58ccc2e3f386ee5ac540b6a63 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:51 2010 -0800 msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings Based on recommendations from chip designers, optimize the Machine ID to translation context mappings for the first 2D core's IOMMU. Remove the "gfx2d0_texv3_smmu" context, as it is no longer needed under the new mapping scheme. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit fe17420784a6d3602e98f798731369fa05936cbe Author: Thomas Gleixner Date: Tue Nov 30 17:49:49 2010 +0000 perf session: Keep file mmaped instead of malloc/memcpy Profiling perf with perf revealed that a large part of the processing time is spent in malloc/memcpy/free in the sample ordering code. That code copies the data from the mmap into malloc'ed memory. That's silly. We can keep the mmap and just store the pointer in the queuing data structure. For 64 bit this is not a problem as we map the whole file anyway. On 32bit we keep 8 maps around and unmap the oldest before mmaping the next chunk of the file. Performance gain: 2.95s -> 1.23s (Faktor 2.4) Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.278787719@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 55b44629f599a2305265ae9c77f9d9bcfd6ddc17 Author: Thomas Gleixner Date: Tue Nov 30 17:49:46 2010 +0000 perf session: Use sensible mmap size On 64bit we can map the whole file in one go, on 32bit we can at least map 32MB and not map/unmap tiny chunks of the file. Base the progress bar on 1/16 of the data size. Preparatory patch to get rid of the malloc/memcpy/free of trace data. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.213687773@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit d6513281c5f728d138ba895d600b9788e51508b1 Author: Thomas Gleixner Date: Tue Nov 30 17:49:44 2010 +0000 perf session: Simplify termination checks No need to check twice. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.152886642@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 85b99952ccd3d84707661d8ae103c710daca1c8a Author: Thomas Gleixner Date: Tue Nov 30 17:49:41 2010 +0000 perf session: Move ui_progress_update in __perf_session__process_events() The progress bar is changed when the file offset changes. This happens only when the next mmap is done. No need to call ui_progress_update() for every event. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.094836523@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 0331ee0cf4187dcdc2b184cf701d8b58bf9ff637 Author: Thomas Gleixner Date: Tue Nov 30 17:49:38 2010 +0000 perf session: Cleanup __perf_session__process_events() Replace the pseudo C++ self argument with session and give the mmap related variables a sensible name. shift is a complete misnomer - it took me several rounds of cursing to figure out that it's not a shift value. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.029687218@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit a5fcd5f59a2658a579533d6774e871aea7ab5e92 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:50 2010 -0800 msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings Based on recommendations from chip designers, optimize the Machine ID to translation context mappings for the 3D core's IOMMU. Remove the the "gfx3d_smmu" context device, as it is no longer needed under the new mapping scheme. Signed-off-by: Stepan Moskovchenko [dwalker@codeaurora.org: updated commit text] Signed-off-by: Daniel Walker commit 28990f75e66b36faf6ce56747890009d4e250243 Author: Thomas Gleixner Date: Tue Nov 30 17:49:35 2010 +0000 perf session: Use appropriate pointer type instead of silly typecasting There is no reason to use a struct sample_event pointer in struct sample_queue and type cast it when flushing the queue. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163819.969462809@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 12943325cda3be10819e047cd8b5032a4fef6080 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:49 2010 -0800 msm: iommu: Use more consistent naming in platform data Rename all the IOMMU platform devices so that the names are more consistent with the rest of the codebase. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit c4bd2eebee37b885b47ec48961923b671148703f Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:48 2010 -0800 msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU Add register addresses and IRQ numbers for the IOMMU used for the second 2D graphics core. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 23513c3b39207c569da2c8afdced62ec43b4a272 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:47 2010 -0800 msm: iommu: Increase maximum MID size to 5 bits On msm8x60, the MID field on the AXI connection to the IOMMU can be up to five bits wide. Thus, allow the IOMMU context platform data to map up to 32 MIDs. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit a1225decc43849a73f7e4c333c3fdbbb8a9c1e65 Author: Thomas Gleixner Date: Tue Nov 30 17:49:33 2010 +0000 perf session: Fix list sort algorithm The homebrewn sort algorithm fails to sort in time order. One of the problem spots is that it fails to deal with equal timestamps correctly. My first gut reaction was to replace the fancy list with an rbtree, but the performance is 3 times worse. Rewrite it so it works. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163819.908482530@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 70cc2c00d7471f21120befeb7fc107c856e3985b Author: Gregory Bean Date: Wed Nov 24 11:53:52 2010 -0800 msm: gpio: Add irq support to v2 gpiolib. Complete the MSM v2 gpio subsystem by adding irq_chip. Signed-off-by: Gregory Bean Signed-off-by: Daniel Walker commit 0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582 Author: Gregory Bean Date: Wed Nov 24 11:53:51 2010 -0800 msm: gpio: Add v2 gpio support to MSM SoCs. Beginning with the MSM8x60, the hardware block responsible for gpio support changes. Provide gpiolib support for the new v2 architecture. Cc: Baruch Siach Cc: Pavan Kondeti Signed-off-by: Gregory Bean Signed-off-by: Daniel Walker commit 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9 Author: Srinath Date: Tue Nov 16 14:26:58 2010 -0800 omap: AM3517/05: Add craneboard support Craneboard is a hardware development platform based on the Sitara AM3517 ARM Cortex - A8 microprocessor device. This is a low cost reference design. This patch adds basic board file. Detailed support will follow in subsequent patches. [1] http://www.ti.com/arm [2] http://www.mistralsolutions.com/products/craneboard.php Signed-off-by: Srinath Signed-off-by: Tony Lindgren commit 9632f9890e76aa7a78f719b0b3b572f65e3e968b Author: Janusz Krzysztofik Date: Tue Nov 16 14:26:57 2010 -0800 OMAP1: drop AMS_DELTA_FIQ config option This patches removes a config option that was used to select a FIQ handler to be build for Amstrad Delta, as required by the on-board serio interface driver. Not having any problem reports received since it was introduced in 2.6.35, the FIQ handler can now be built and initialized by default, thus reqiring no extra config option. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit c6c4dea4011278f03ab8a3c8329fba9098d2a892 Author: Felipe Balbi Date: Mon Nov 8 06:56:15 2010 +0000 arm: omap: zoom: substitute gpio number with symbolic name It's easier to understand what that number means and also avoids problems if we ever have to change it. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 20826853853aa1e1ba219ea65f1e6ba3bd662495 Author: Felipe Balbi Date: Mon Nov 8 06:56:14 2010 +0000 arm: omap: combine zoom2 and zoom3 board-files They are extremely similar anyway, let's get rid of one file. While at that, also remove the empty zoom_config variable. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 235228ba21e34ba732b413c12259bac386f83283 Author: Enric Balletbo i Serra Date: Sat Oct 23 16:49:00 2010 +0000 omap3: IGEP v2: Improve igep2_flash_init() function The changes are: - Use 'for' loop instead 'while' loop. - No need to initialize ret to 0, we're assigning it right after. - No need to check for onenandcs < GPMC_CS_NUM here, it will always be true. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit ae3e033362430f2684bb3519456c88d14e182f01 Author: Enric Balletbo i Serra Date: Sat Oct 23 16:48:59 2010 +0000 omap3: IGEP v2: Remove igep2_config array omap_board_config_size is implicitly initialized to 0 in plat-omap/common.c, get_config() won't dereference omap_board_config, so we can remove the empty igep2_config array. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit c320c7b7d380e630f595de1236d9d085b035d5b4 Author: Arnaldo Carvalho de Melo Date: Wed Oct 20 12:50:11 2010 -0200 perf events: Precalculate the header space for PERF_SAMPLE_ fields PERF_SAMPLE_{CALLCHAIN,RAW} have variable lenghts per sample, but the others can be precalculated, reducing a bit the per sample cost. Acked-by: Peter Zijlstra Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4 Author: Keshava Munegowda Date: Sun Nov 21 23:23:42 2010 +0530 omap4: 4430sdp: enable the ehci port on 4430SDP The OMAP4 SDP has an SMSC3320 PHY hooked up to EHCI on Port1. The PHY power is controlled by GPIO 157. Turn on the PHY power, and register the controller at init. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 56976b6ac4047ec456e2ba7e516ed2e9d96c3acf Author: Anand Gadiyar Date: Sun Nov 21 23:23:42 2010 +0530 arm: omap4: select USB_ARCH_HAS_EHCI The OMAP4 has an on-chip EHCI controller. Select USB_ARCH_HAS_EHCI to allow the EHCI driver to be built on OMAP4. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit becf0737cf25bd0084ed85ccb1ab6c902e600a3c Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 arm: omap4: usb: add platform init code for EHCI - Add platform init code for EHCI on OMAP4 - Add pad configuration for PHY and TLL modes Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 811406c2e69281b0e498d25a42902817299b6b3d Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 arm: omap4: add USBHOST and related base addresses Add base addresses for USBHOST, USBTLL, EHCI and OHCI to the header file. This will disappear when the drivers are converted to use the hwmod database, however this patch is needed until then. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 4792a15bf0f388838c3e16636f961c99bc2f3572 Author: Anand Gadiyar Date: Sun Nov 21 23:23:42 2010 +0530 usb: ehci-omap: Add OMAP4 support Update the ehci-omap glue layer to support the controller in the OMAP4. Major differences from OMAP3 is that the OMAP4 has per-port clocking, and supports ULPI output clocking mode. The old input clocking mode is not supported. Also, there are only 2 externally available ports as against 3 in the OMAP3. The third port is internally tied off and should not be used. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 1ed85659a29287bda958a9429461f4a1b0a033be Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 omap: usb: ehci: introduce HSIC mode The EHCI controller in OMAP4 supports a new interface mode - HSIC. Add this to the list of modes supported on OMAP3. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit a42ccdc14de388a35ad0e8057543369351395eb9 Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci-omap: add helpers for checking port mode Introduce helper functions to test port mode. These checks are performed in several places in the driver, and these helpers improve readability. Signed-off-by: Anand Gadiyar commit c5dff5545c97ab33bdb2a529a2375966ceb0700c Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci-omap: use clkdev aliases for functional clocks Use the recently updated aliases to get functional clocks needed by the driver. This allows the driver to acquire OMAP4-specific clocks without having to use different clock names for OMAP3 and OMAP4. Signed-off-by: Anand Gadiyar commit 5467e16d891090d54d036044e66f94b89b1c3683 Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 omap: clock: add clkdev aliases for EHCI clocks Add clkdev aliases for the USBHOST and USBTLL clocks on OMAP3 and OMAP4, so that the driver can refer to the clocks using a common alias. This will disappear when the driver is converted to use the hwmod database, but until then this patch is needed. Signed-off-by: Anand Gadiyar Acked-by: Paul Walmsley Acked-by: Tony Lindgren commit 7f124f4b353672bc150af959910cfc2a9778260a Author: Keshava Munegowda Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP Introduce the CONFIG_USB_EHCI_HCD_OMAP option to select EHCI support on OMAP3 and later chips. This scales better than having a long line of dependencies for each new OMAP with EHCI support. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit c072604115ab50d023eb5c33d4f3229400e441f4 Author: Keshava Munegowda Date: Sun Nov 21 23:23:40 2010 +0530 usb: ehci-omap: don't hard-code TLL channel count Make the TLL channel count a parameter instead of a hardcoded value. This allows us to be flexible with future OMAP revisions which could have a different number of channels. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 6dba39e278b81665a838f37a75fe37b89f3ce610 Author: Keshava Munegowda Date: Sun Nov 21 23:23:40 2010 +0530 usb: ehci-omap: update clock names to be more generic Rename usbhost2_120m_fck to usbhost_hs_fck and usbhost1_48m_fck to usbhost_fs_fck, to better reflect the clocks' functionalities. In OMAP4, the frequencies for the corresponding clocks are not necessarily the same as with OMAP3, however the functionalities are. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 3f419d2d487821093ee46e898b5f8747f9edc9cd Author: David S. Miller Date: Mon Nov 29 13:37:14 2010 -0800 inet: Turn ->remember_stamp into ->get_peer in connection AF ops. Then we can make a completely generic tcp_remember_stamp() that uses ->get_peer() as a helper, minimizing the AF specific code and minimizing the eventual code duplication when we implement the ipv6 side of TW recycling. Signed-off-by: David S. Miller commit b3419363808f2481b24a817f491878e1795db4c7 Author: David S. Miller Date: Tue Nov 30 12:27:11 2010 -0800 ipv6: Add infrastructure to bind inet_peer objects to routes. They are only allowed on cached ipv6 routes. Signed-off-by: David S. Miller commit 672f007d65f50468a4a1e55825fe58e5b035324d Author: David S. Miller Date: Tue Nov 30 12:20:00 2010 -0800 inetpeer: Add inet_getpeer_v6() Now that all of the infrastructure is in place, we can add the ipv6 shorthand for peer creation. Signed-off-by: David S. Miller commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd Author: David S. Miller Date: Tue Nov 30 12:12:23 2010 -0800 inetpeer: Add v6 peers tree, abstract root properly. Add the ipv6 peer tree instance, and adapt remaining direct references to 'v4_peers' as needed. Signed-off-by: David S. Miller commit 026630450244b8f8d1baf54548be0800aa1823ed Author: David S. Miller Date: Tue Nov 30 12:08:53 2010 -0800 inetpeer: Abstract address comparisons. Now v4 and v6 addresses will both work properly. Signed-off-by: David S. Miller commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617 Author: David S. Miller Date: Tue Nov 30 11:54:19 2010 -0800 inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer. And make an inet_getpeer_v4() helper, update callers. Signed-off-by: David S. Miller commit 582a72da9a41be9227dc931d728ae2906880a589 Author: David S. Miller Date: Tue Nov 30 11:53:55 2010 -0800 inetpeer: Introduce inet_peer_address_t. Currently only the v4 aspect is used, but this will change. Signed-off-by: David S. Miller commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b Author: David S. Miller Date: Tue Nov 30 11:41:59 2010 -0800 inetpeer: Abstract out the tree root accesses. Instead of directly accessing "peer", change to code to operate using a "struct inet_peer_base *" pointer. This will facilitate the addition of a seperate tree for ipv6 peer entries. Signed-off-by: David S. Miller commit 61790c5f3c5f158821821a00797d94504531839f Author: Stanislaw Gruszka Date: Tue Nov 30 15:33:40 2010 +0100 iwlagn: fix microcode error on 4965 Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use antenna information in EEPROM" caused 4965 device breakage with "Microcode SW error detected. Restarting 0x82000000." message. This patch reverts 4965 part of that commit. Signed-off-by: Stanislaw Gruszka Acked-by: Johannes Berg Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 08ca944eb240b2299e743c76b43fbc7c2dd251de Author: Helmut Schaa Date: Tue Nov 30 12:19:34 2010 +0100 mac80211: Minor optimization in ieee80211_rx_h_data Remove a superfluous ieee80211_is_data check as that was checked a few lines before already and we wont't get here for non-data frames at all. Second, the frame was already converted to 802.3 header format and reading the fc and addr1 fields was only possible because the 802.3 header is short enough and didn't overwrite the relevant parts of the 802.11 header. Make the code more obvious by checking the ethernet header's h_dest field. Furthermore reorder the conditions to reduce the number of checks when dynamic powersave is not needed (AP mode for example). Signed-off-by: Helmut Schaa Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4 Author: Johannes Stezenbach Date: Tue Nov 30 16:49:23 2010 +0100 mac80211/rt2x00: add ieee80211_tx_status_ni() All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from a workqueue, which causes "NOHZ: local_softirq_pending 08" messages. To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni() which can be called from process context, and call it from rt2x00lib_txdone(). For the rt2800pci special case a driver flag is introduced. Signed-off-by: Johannes Stezenbach Signed-off-by: John W. Linville commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba Author: Nick Kossifidis Date: Tue Nov 23 21:53:28 2010 +0200 ath5k: Set turbo bit on rf bank 2 * A diff between rfbuffer settings of turbo and non-turbo modes indicates there is a bit on bank 2 related to turbo operation (it's set on turbo modes). This bit is present on all radios except RF5413 that seems to have a completely different bank 2. Also since 2317 has the same rf-registers locations with 2425 and since the bit exists on 2317 I assume it also exists on 2425/2417). So in case we use turbo mode (40MHz) enable it on bank modification. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f Author: Nick Kossifidis Date: Tue Nov 23 21:51:38 2010 +0200 ath5k: Clean up turbo mode initvals/rfregs * Clean up what's left of turbo mode, since we handle all register modifications (rfbuffer comes next) on code there is no need to have duplicated arrays. * Rename change_channel to skip_pcu on initvals.c as we did on reset.c Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit acb091d67c5c9649cf5d25055ef6fd64239a6762 Author: Nick Kossifidis Date: Tue Nov 23 21:49:53 2010 +0200 ath5k: Cleanup turbo channel flags * Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 73a06a683455f472cc09ad249064c66a41e29e39 Author: Nick Kossifidis Date: Tue Nov 23 21:48:32 2010 +0200 ath5k: Use correct clock when setting ofdm timings * Use correct clock value when setting OFDM timings on non-default bwmodes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 3bb17654605965226e5b322dbc22ece5ff354ac5 Author: Nick Kossifidis Date: Tue Nov 23 21:45:21 2010 +0200 ath5k: Skip tx power setting on AR5210 for now * Don't return -EINVAL when trying to set tx power on RF5110 because AR5210 reset will fail. We need to add support for RF5110 and AR5210 eeprom in the future but for now just skip it. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b02f5d1a17c652a74098f2a04db7fb8e6220057e Author: Nick Kossifidis Date: Tue Nov 23 21:44:02 2010 +0200 ath5k: Tweak phy activate to rx start delay based on bwmode * Tweak phy activation -> rx delay for different bwmodes Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7 Author: Nick Kossifidis Date: Tue Nov 23 21:42:22 2010 +0200 ath5k: No need to save/restore staid flags on reset * Since we set antenna flags on phy init and ack bitrate mode on pcu init, there is no need to save/restore sta_id flags on ath5k_hw_reset. Also we don't need to re-set our mac address because it's not affected by resets. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e Author: Nick Kossifidis Date: Tue Nov 23 21:39:28 2010 +0200 ath5k: Support synth-only channel change for AR2413/AR5413 * Add synth-only channel change for AR2413/5413. When we call ath5k_reset with a channel ath5k_hw_reset will first try to set channel on PHY while PHY is running instead of doing a normal full reset. To do this phy_init has to change to implement this functionality. * Clean up change_channel flag, what it really did was skip PCU registers when setting initvals. This is done because on reset PCU registers are not affected (except the registers we set in pcu init and -due to hw problems- TSF). Use a new skip_pcu flag that's not misleading instead. In the future we might use that to also skip PCU reset and save us the TSF etc problems (needs testing because standard practice is to reset everything). * Use fast channel change only when setting channel, and set skip_pcu to false only on init. When we reset the card due to DMA or PHY problems skip pcu but never do a fast channel change. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 4c57581d939fd0f8f244b9730812069f4dac308a Author: Nick Kossifidis Date: Tue Nov 23 21:37:30 2010 +0200 ath5k: Skip powertable setting when we are on the same channel * Only set power table if we are changing channel/mode there is no need to recalculate and reset the power table all the time. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28 Author: Nick Kossifidis Date: Tue Nov 23 21:33:22 2010 +0200 ath5k: Update PLL programming for turbo/half/quarter * Set correct PLL settings for each bwmode Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit a2677fe4298c61f0e93c063e59815bf21c530c4a Author: Nick Kossifidis Date: Tue Nov 23 21:28:15 2010 +0200 ath5k: Update spur mitigation filter for turbo/half/quarter * Add spur mitigation filter support for half/quarter and turbo. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b2b4c69f682a2868411899a77842061dd745884f Author: Nick Kossifidis Date: Tue Nov 23 21:26:13 2010 +0200 ath5k: Tweak power detector delays on RF5111/RF5112 * Tweak power detector delays on AR5111/AR5112 when using half/quarter modes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c Author: Nick Kossifidis Date: Tue Nov 23 21:24:54 2010 +0200 ath5k: Always set IFS intervals on reset * Make sure we always set IFS timings even if no coverage class is set. If we don't we'll miss the needed changes for different bwmodes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 473cae27620c27377e278a6f92aaa483060e3c19 Author: Nick Kossifidis Date: Tue Nov 23 21:21:50 2010 +0200 ath5k: Use turbo flag on DCU * Set AR5K_DCU_GBL_IFS_MISC_TURBO_MODE flag on DCU when operating on 40MHz Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit eeb8832b3181d6ca8593051b68c466e5d2653bb3 Author: Nick Kossifidis Date: Tue Nov 23 21:19:45 2010 +0200 ath5k: Set all IFS intervals, not just slot time * Replace set_slot_time with set_ifs_intervals that also sets the various inter-frame space intervals based on current bwmode. * Clean up AR5210 mess from reset_tx_queue, AR5210 only has one data queue and we set IFS intervals for that queue on set_ifs_intervals so there is nothing left to do for 5210 on reset_tx_queue. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d Author: Nick Kossifidis Date: Tue Nov 23 21:12:23 2010 +0200 ath5k: Extend rate_duration * Extend ieee80211_generic_frame_duration to support the various bwmodes. * Better document what's going on with ack bitrates and update write_rate_duration to support the standard ack bitrates (when we don't set the high bit). * Get rid of set_ack_bitrate_high and introduce a flag on ath5k_hw for this (we only called the function on init anyway so there is no difference). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e Author: Nick Kossifidis Date: Tue Nov 23 21:09:11 2010 +0200 ath5k: Extend get_default_sifs/slot_time * Extend get_default_sifs/slot_time to include timings for turbo half and quarter rate modes. * AR5210 code for now uses timings already on core clock units instead of usecs so rename them (we 'll clean it up later). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 25ddfa195735934256fda55bb4f2d749c19386ff Author: Nick Kossifidis Date: Tue Nov 23 21:07:04 2010 +0200 ath5k: Move tx retries setting outside reset_tx_queue * Move setting of tx retry limits on a separate function (we 'll clean up this AR5210 mess later) Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744 Author: Nick Kossifidis Date: Tue Nov 23 21:04:43 2010 +0200 ath5k: Increase PHY settling parameters for turo mode * On turbo mode increase PHY settling times, note that we only increase switch settling time on AR5212 as indicated by initvals. * A few cleanups: Move frame control settings for AR5210 from reset_tx_queue to tweak_initvals and remove phy_scal settings from tweak_initvals (we tweak them alread on set_sleep_clock). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 325089ab5847f5c1e43f42bb90d32f981867c4c1 Author: Nick Kossifidis Date: Tue Nov 23 21:02:20 2010 +0200 ath5k: Small cleanup on tweak_initvals * Now that we properly set rx/tx latencies for AR5311 remove that old buggy part of code left inside ath5k_hw_tweak_initval_settings that was never executed (you can't have an RF5112 radio on a mac older than AR5212). Also use a magic value for 5311 PHY_SCAL value. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit c297560206adf0cda8ce38ef9b20b0a025754c4d Author: Nick Kossifidis Date: Tue Nov 23 21:00:37 2010 +0200 ath5k: Put core clock initialization on a new function * Handle all usec parameters in one function. It's much cleaner this way. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit fa3d2feeff4723cce8d4722902492d60b7f75fcc Author: Nick Kossifidis Date: Tue Nov 23 20:58:34 2010 +0200 ath5k: Add new field on ath5k_hw to track bandwidth modes * Prepare for half/quarter/turbo support, introduce a new ah_bwmode parameter and get rid of ah_turbo. Bwmode stands for "bandwidth mode" and can have 4 values, default (20MHz), turbo (40MHz), half rate (10MHz), and quarter rate (5MHz). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 14fae2d4b61b890cea58d63091406b86ec9bafcd Author: Nick Kossifidis Date: Tue Nov 23 20:55:17 2010 +0200 ath5k: Use new function to stop beacon queue * Since we only use ath5k_hw_stop_tx_dma to stop the beacon queue, introduce a new function ath5k_hw_stop_beacon_queue so that we can use that instead and have better control. In the future we can add more beacon queue specific stuff there (maybe tweak beacon timers or something), for now just call ath5k_hw_stop_tx_dma. * Also since we don't call ath5k_hw_stop_rx/tx_dma from outside dma.c, make them static. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106 Author: Nick Kossifidis Date: Tue Nov 23 20:52:24 2010 +0200 ath5k: Check RXE when setting RXDP * Make sure we are not trying to set RXDP while RX is active, for now ignore the return value. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit f7317ba2d669c1b54fb31ed7834361a700a79217 Author: Nick Kossifidis Date: Tue Nov 23 20:50:16 2010 +0200 ath5k: Use DCU early termination correctly * DCU early termination should be used to quickly flush QCU according to docs so don't enable it for all queues, enable it only when stopping each queue and disable it when we are done. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b3a28e68d5c8d788a4e538a119a5d326545add8a Author: Nick Kossifidis Date: Tue Nov 23 20:47:31 2010 +0200 ath5k: Debug DMA timeouts * Increase timeouts on ath5k_hw_stop_tx_dma and also wait for tx queue to stop before checking for pending frames * Add a new debug level to debug dma start/stop Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 80dac9eecbdb95f61b9b3c7081e02412155982b7 Author: Nick Kossifidis Date: Tue Nov 23 20:45:38 2010 +0200 ath5k: Use new dma_stop function on base.c * Since we stop rx/tx dma and pcu durring reset there is no need to call ath5k_hw_stop_rx/tx_dma before, also there is no need to call them durring stop_locked since we can use ath5k_hw_dma_stop for both. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit e088f23be166635b3938571c00c686094efa7cc4 Author: Nick Kossifidis Date: Tue Nov 23 20:43:18 2010 +0200 ath5k: Stop PCU on reset * Stop PCU receive logic (DRU) durring reset We need to be sure pcu is not active when trying to stop rx dma right now this is done on ath5k_reset (base.c) but later we are going to clean it up. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit d41174fabdae348c6583cf05aeb329da232c342c Author: Nick Kossifidis Date: Tue Nov 23 20:41:15 2010 +0200 ath5k: Add new function to stop rx/tx DMA * Add a new function to stop rx/tx dma and use in when reset starts Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 9320b5c4a7260d9593102f378201d17e3f030739 Author: Nick Kossifidis Date: Tue Nov 23 20:36:45 2010 +0200 ath5k: Reset cleanup and generic cleanup * No functional changes * Clean up reset: Introduce init functions for each unit and call them instead of having everything inside ath5k_hw_reset (it's just c/p for now so nothing changes except calling order -I tested it with various cards and it's ok-) * Further cleanups: ofdm_timings belongs to phy.c rate_duration belongs to pcu.c clock functions are general and belong to reset.c (more to follow) * Reorder functions for better organization: We start with helpers and other functions follow in categories, init functions are last Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit ea066d5a91f2610116dcd27054f749e4f07799d8 Author: Mohammed Shafi Shajakhan Date: Tue Nov 23 20:42:27 2010 +0530 ath9k: Add support for Adaptive Power Management This feature is to mitigate the problem of certain 3 stream chips that exceed the PCIe power requirements.An EEPROM flag controls which chips have APM enabled which is basically read from miscellaneous configuration element of the EEPROM header. This workaround will reduce power consumption by using 2 Tx chains for Single and Double stream rates (5 GHz only).All self generated frames (regardless of rate) are sent on 2 chains when this feature is enabled(Chip Limitation). Cc: Paul Shaw Signed-off-by: Mohammed Shafi Shajakhan Tested-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 47a25380e37f44db7202093ca92e4af569c34f55 Author: Steven Whitehouse Date: Tue Nov 30 15:49:31 2010 +0000 GFS2: Merge glock state fields into a bitfield We can only merge the fields into a bitfield if the locking rules for them are the same. In this case gl_spin covers all of the fields (write side) but a couple of them are used with GLF_LOCK as the read side lock, which should be ok since we know that the field in question won't be changing at the time. The gl_req setting has to be done earlier (in glock.c) in order to place it under gl_spin. The gl_reply setting also has to be brought under gl_spin in order to comply with the new rules. This saves 4*sizeof(unsigned int) per glock. Signed-off-by: Steven Whitehouse Cc: Bob Peterson commit e06dfc492870e1d380f02722cde084b724dc197b Author: Steven Whitehouse Date: Tue Nov 30 15:46:02 2010 +0000 GFS2: Fix uninitialised error value in previous patch Signed-off-by: Steven Whitehouse commit 086d8334cf73b3bb695b82dd864a7a8b00d96b7e Author: Benjamin Marzinski Date: Tue Nov 23 23:52:55 2010 -0600 GFS2: fix recursive locking during rindex truncates When you truncate the rindex file, you need to avoid calling gfs2_rindex_hold, since you already hold it. However, if you haven't already read in the resource groups, you need to do that. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit 0489b3f5eba735413ccedd425651cf41d6b1f7c5 Author: Benjamin Marzinski Date: Tue Nov 30 09:38:35 2010 -0600 GFS2: reread rindex when necessary to grow rindex When GFS2 grew the filesystem, it was never rereading the rindex file during the grow. This is necessary for large grows when the filesystem is almost full, and GFS2 needs to use some of the space allocated earlier in the grow to complete it. Now, if GFS2 fails to reserve the necessary space and the rindex file is not uptodate, it rereads it. Also, the only difference between gfs2_ri_update() and gfs2_ri_update_special() was that gfs2_ri_update_special() didn't clear out the existing resource groups, since you knew that it was only called when there were no resource groups. Attempting to clear out the resource groups when there are none takes almost no time, and rarely happens, so I simply removed gfs2_ri_update_special(). Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit 0b1246e6776c79719ff4a3afd9c38fba99b99d5a Author: Steven Whitehouse Date: Tue Nov 30 15:33:04 2010 +0000 GFS2: Remove duplicate #defines from glock.h There are a number of duplicated #defines in glock.h plus one which is unused. This removes the extra definitions. Signed-off-by: Steven Whitehouse commit 5091faa449ee0b7d73bc296a93bca9540fc51d0a Author: Mike Galbraith Date: Tue Nov 30 14:18:03 2010 +0100 sched: Add 'autogroup' scheduling feature: automated per session task groups A recurring complaint from CFS users is that parallel kbuild has a negative impact on desktop interactivity. This patch implements an idea from Linus, to automatically create task groups. Currently, only per session autogroups are implemented, but the patch leaves the way open for enhancement. Implementation: each task's signal struct contains an inherited pointer to a refcounted autogroup struct containing a task group pointer, the default for all tasks pointing to the init_task_group. When a task calls setsid(), a new task group is created, the process is moved into the new task group, and a reference to the preveious task group is dropped. Child processes inherit this task group thereafter, and increase it's refcount. When the last thread of a process exits, the process's reference is dropped, such that when the last process referencing an autogroup exits, the autogroup is destroyed. At runqueue selection time, IFF a task has no cgroup assignment, its current autogroup is used. Autogroup bandwidth is controllable via setting it's nice level through the proc filesystem: cat /proc//autogroup Displays the task's group and the group's nice level. echo > /proc//autogroup Sets the task group's shares to the weight of nice task. Setting nice level is rate limited for !admin users due to the abuse risk of task group locking. The feature is enabled from boot by default if CONFIG_SCHED_AUTOGROUP=y is selected, but can be disabled via the boot option noautogroup, and can also be turned on/off on the fly via: echo [01] > /proc/sys/kernel/sched_autogroup_enabled ... which will automatically move tasks to/from the root task group. Signed-off-by: Mike Galbraith Acked-by: Linus Torvalds Acked-by: Peter Zijlstra Cc: Markus Trippelsdorf Cc: Mathieu Desnoyers Cc: Paul Turner Cc: Oleg Nesterov [ Removed the task_group_path() debug code, and fixed !EVENTFD build failure. ] Signed-off-by: Ingo Molnar LKML-Reference: <1290281700.28711.9.camel@maggy.simson.net> Signed-off-by: Ingo Molnar commit cb5d39b3a1440eca79c742d95f1d78180c272286 Author: Mika Westerberg Date: Thu Nov 18 19:14:52 2010 +0100 ARM: 6487/1: add CONFIG_CRASH_DUMP to Kconfig Add CONFIG_CRASH_DUMP configuration option which is used by dump capture kernels. Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 4b3bf7aef94fc337610d78fce0d960e2ee1d5a8f Author: Mika Westerberg Date: Thu Nov 18 19:13:19 2010 +0100 ARM: 6486/1: provide zero vmcore_elf64_check_arch() Since we don't support 64-bit ELF vmcores. This also prevents the following warning: fs/proc/vmcore.c: In function 'parse_crash_elf64_headers': fs/proc/vmcore.c:502: warning: passing argument 1 of 'elf_check_arch' from incompatible pointer type Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 9833c39400c3e6ee19daeded6910df648741611e Author: Mika Westerberg Date: Fri Nov 19 09:29:24 2010 +0100 ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch() Allow architectures to redefine this macro if needed. This is useful for example in architectures where 64-bit ELF vmcores are not supported. Specifying zero vmcore_elf64_check_arch() allows compiler to optimize away unnecessary parts of parse_crash_elf64_headers(). We also rename the macro to vmcore_elf64_check_arch() to reflect that it is used for 64-bit vmcores only. Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 921169ca2f7c8a0a2ccda2ce33c465dfe3ae30ef Author: Steven Whitehouse Date: Mon Nov 29 12:50:38 2010 +0000 GFS2: Clean up of gdlm_lock function The DLM never returns -EAGAIN in response to dlm_lock(), and even if it did, the test in gdlm_lock() was wrong anyway. Once that test is removed, it is possible to greatly simplify this code by simply using a "normal" error return code (0 for success). We then no longer need the LM_OUT_ASYNC return code which can be removed. Signed-off-by: Steven Whitehouse commit 802ec9b6682349d9d9c92a9e55f44324d2954f41 Author: Abhijith Das Date: Thu Nov 18 11:26:46 2010 -0500 GFS2: Allow gfs2 to update quota usage values through the quotactl interface With this patch the gfs2_set_dqblk() function will be able to update the quota usage block count (FS_DQ_BCOUNT) in addition to the already supported FS_DQ_BHARD (limit) and FS_DQ_BSOFT (warn) fields of the dquot structure. Signed-off-by: Abhi Das Signed-off-by: Steven Whitehouse commit edc221d00bd5c6da0e5c67701f3782b72796619f Author: Joe Perches Date: Wed Nov 10 13:19:06 2010 -0800 GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg Functions that use printf formatting, especially those that use %pV, should have their uses of printf format and arguments checked by the compiler. Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit 5e69069c1afb655b5f1a154856ccdb4bb7327b81 Author: Joe Perches Date: Tue Nov 9 16:35:20 2010 -0800 GFS2: fs/gfs2/glock.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit 2ae51ed7b548c1d943d080da617515e801ea5c3e Author: Steven Whitehouse Date: Wed Nov 10 15:14:57 2010 +0000 GFS2: Clean up duplicated setattr code While preparing the last patch I noticed that the gfs2_setattr_simple code had been duplicated into two other places. This patch updates those to call gfs2_setattr_simple rather than open coding it. Signed-off-by: Steven Whitehouse commit 9e55cd53728719ac3a3234a6618259ab8e203a10 Author: Steven Whitehouse Date: Tue Nov 9 14:09:53 2010 +0000 GFS2: Remove unreachable calls to vmtruncate Suggested-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit cc18152eb7c27653199546bd14e991a451ab8d1b Author: Joe Perches Date: Fri Nov 5 16:12:36 2010 -0700 GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit d2115778c7ea0df2201f1ad9aab948c49ffa1078 Author: Steven Whitehouse Date: Wed Nov 3 19:58:53 2010 +0000 GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM The WQ_RESCUER flag should only be used internally to the workqueue implementation. Signed-off-by: Steven Whitehouse Acked-by: Tejun Heo commit 822bc180a7f7a7bc5fcaaea195f41b487cc8cae8 Author: Paul Turner Date: Mon Nov 29 16:55:40 2010 -0800 sched: Fix unregister_fair_sched_group() In the flipping and flopping between calling unregister_fair_sched_group() on a per-cpu versus per-group basis we ended up in a bad state. Remove from the list for the passed cpu as opposed to some arbitrary index. ( This fixes explosions w/ autogroup as well as a group creation/destruction stress test. ) Reported-by: Stephen Rothwell Signed-off-by: Paul Turner Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20101130005740.080828123@google.com> Signed-off-by: Ingo Molnar commit 46fdb0937f26124700fc9fc80da4776330cc00d3 Author: Paul E. McKenney Date: Tue Oct 26 02:11:40 2010 -0700 rcu: Make synchronize_srcu_expedited() fast if running readers The synchronize_srcu_expedited() function is currently quick if there are no active readers, but will delay a full jiffy if there are any. If these readers leave their SRCU read-side critical sections quickly, this is way too long to wait. So this commit first waits ten microseconds, and only then falls back to jiffy-at-a-time waiting. Reported-by: Avi Kivity Reported-by: Marcelo Tosatti Tested-by: Takuya Yoshikawa Signed-off-by: Paul E. McKenney commit db3a8920995484e5e9a0abaf3bad2c7311b163db Author: Paul E. McKenney Date: Mon Oct 25 07:39:22 2010 -0700 rcu: fix race condition in synchronize_sched_expedited() The new (early 2010) implementation of synchronize_sched_expedited() uses try_stop_cpu() to force a context switch on every CPU. It also permits concurrent calls to synchronize_sched_expedited() to share a single call to try_stop_cpu() through use of an atomically incremented synchronize_sched_expedited_count variable. Unfortunately, this is subject to failure as follows: o Task A invokes synchronize_sched_expedited(), try_stop_cpus() succeeds, but Task A is preempted before getting to the atomic increment of synchronize_sched_expedited_count. o Task B also invokes synchronize_sched_expedited(), with exactly the same outcome as Task A. o Task C also invokes synchronize_sched_expedited(), again with exactly the same outcome as Tasks A and B. o Task D also invokes synchronize_sched_expedited(), but only gets as far as acquiring the mutex within try_stop_cpus() before being preempted, interrupted, or otherwise delayed. o Task E also invokes synchronize_sched_expedited(), but only gets to the snapshotting of synchronize_sched_expedited_count. o Tasks A, B, and C all increment synchronize_sched_expedited_count. o Task E fails to get the mutex, so checks the new value of synchronize_sched_expedited_count. It finds that the value has increased, so (wrongly) assumes that its work has been done, returning despite there having been no expedited grace period since it began. The solution is to have the lowest-numbered CPU atomically increment the synchronize_sched_expedited_count variable within the synchronize_sched_expedited_cpu_stop() function, which is under the protection of the mutex acquired by try_stop_cpus(). However, this also requires that piggybacking tasks wait for three rather than two instances of try_stop_cpu(), because we cannot control the order in which the per-CPU callback function occur. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 2d999e03b7c8305b4385dd20992e4ed3e827177b Author: Paul E. McKenney Date: Wed Oct 20 12:06:18 2010 -0700 rcu: update documentation/comments for Lai's adoption patch Lai's RCU-callback immediate-adoption patch changes the RCU tracing output, so update tracing.txt. Also update a few comments to clarify the synchronization design. Signed-off-by: Paul E. McKenney commit 29494be71afe2a16ad04e344306a620d7cc22d06 Author: Lai Jiangshan Date: Wed Oct 20 14:13:06 2010 +0800 rcu,cleanup: simplify the code when cpu is dying When we handle the CPU_DYING notifier, the whole system is stopped except for the current CPU. We therefore need no synchronization with the other CPUs. This allows us to move any orphaned RCU callbacks directly to the list of any online CPU without needing to run them through the global orphan lists. These global orphan lists can therefore be dispensed with. This commit makes thes changes, though currently victimizes CPU 0 @@@. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 7b27d5475f86186914e54e4a6bb994e9a985337b Author: Lai Jiangshan Date: Thu Oct 21 11:29:05 2010 +0800 rcu,cleanup: move synchronize_sched_expedited() out of sched.c The first version of synchronize_sched_expedited() used the migration code in the scheduler, and was therefore implemented in kernel/sched.c. However, the more recent version of this code no longer uses the migration code, so this commit moves it to the main RCU source files. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit deb7a41815a8a32d4f9ea2af7a48ed1175222cec Author: Paul E. McKenney Date: Thu Sep 30 21:33:32 2010 -0700 rcu: get rid of obsolete "classic" names in TREE_RCU tracing The TREE_RCU tracing had obsolete rcuclassic_trace_init() and rcuclassic_trace_cleanup() function names. This commit brings them up to date: rcutree_trace_init() and rcutree_trace_cleanup(), respectively. Signed-off-by: Paul E. McKenney commit e940cc804ec212e483f91167b93d1740c2fd3415 Author: Paul E. McKenney Date: Thu Nov 4 14:55:26 2010 -0700 rcu: Distinguish between boosting and boosted RCU priority boosting's tracing did not distinguish between ongoing boosting and completion of boosting. This commit therefore adds this capability. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 8e79e1f9615b83d1e1d26b328d1b776111ca0cf7 Author: Paul E. McKenney Date: Thu Nov 4 14:31:19 2010 -0700 rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing. Add the required verbiage to Documentation/RCU/trace.txt. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 9e571a82f0cb205a65a0ea41657f19f22b7fabb8 Author: Paul E. McKenney Date: Thu Sep 30 21:26:52 2010 -0700 rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU Add tracing for the tiny RCU implementations, including statistics on boosting in the case of TINY_PREEMPT_RCU and RCU_BOOST. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 24278d148316d2180be6df40e06db013d8b232b8 Author: Paul E. McKenney Date: Mon Sep 27 17:25:23 2010 -0700 rcu: priority boosting for TINY_PREEMPT_RCU Add priority boosting, but only for TINY_PREEMPT_RCU. This is enabled by the default-off RCU_BOOST kernel parameter. The priority to which to boost preempted RCU readers is controlled by the RCU_BOOST_PRIO kernel parameter (defaulting to real-time priority 1) and the time to wait before boosting the readers blocking a given grace period is controlled by the RCU_BOOST_DELAY kernel parameter (defaulting to 500 milliseconds). Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e Merge: 5c4986b 193006f Author: Paul Mundt Date: Tue Nov 30 14:55:11 2010 +0900 Merge branch 'sh/urgent' into sh-latest commit 2818b19102fdc414248f772c46af176d36520ae7 Merge: 0ae26c8 25338f2 Author: Paul Mundt Date: Tue Nov 30 14:53:45 2010 +0900 Merge branch 'rmobile/mackerel' into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt commit 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 Merge: 1ad2096 208c7dc d8e7943 Author: Paul Mundt Date: Tue Nov 30 14:50:10 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest commit d8e7943d821d8ee7f48ff38f6f7c509297c88402 Merge: df73af8 22efa0f Author: Paul Mundt Date: Tue Nov 30 14:42:55 2010 +0900 Merge branch 'common/mmcif' into rmobile/mmcif commit 25338f2e09fcbaa0470841c928bf0e718ca13382 Author: Kuninori Morimoto Date: Tue Nov 30 04:37:33 2010 +0000 ARM: mach-shmobile: mackerel: Add USB1(Host) support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 93ae86e759299718c611bc543b9b1633bf32905a Author: Mimi Zohar Date: Mon Nov 29 16:20:04 2010 -0500 keys: add missing include file for trusted and encrypted keys This patch fixes the linux-next powerpc build errors as reported by Stephen Rothwell. Reported-by: Stephen Rothwell Signed-off-by: Mimi Zohar Tested-by: Rajiv Andrade Signed-off-by: James Morris commit dd318575ff0aae91ac4cbcc5b60c184e59267212 Author: Johannes Berg Date: Mon Nov 29 11:09:16 2010 +0100 mac80211: fix RX aggregation locking The RX aggregation locking documentation was wrong, which led Christian to also code the timer timeout handling for it somewhat wrongly. Fix the documentation, the two places that need to hold the reorder lock across accesses to the structure, and the debugfs code that should just use RCU. Also, remove acquiring the sta->lock across reorder timeouts since it isn't necessary, and change a few places to GFP_KERNEL because the code path here doesn't need atomic allocations as I noticed when reviewing all this. Signed-off-by: Johannes Berg Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1 Author: Felix Fietkau Date: Sun Nov 28 19:37:48 2010 +0100 ath9k: fix software retry counter tracking The recent tx path cleanups moved the software retry count tracking from the ath_buf to the skb cb, however the actual counter update referred to the wrong location, confusing block-ack window tracking. Fix this by using the retries counter in the struct ath_frame_info. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498 Author: Rajkumar Manoharan Date: Fri Nov 26 23:24:33 2010 +0530 Revert "ath9k_htc: Handle monitor mode properly for HTC devices" This reverts commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb. The change had broken the packet injection on monitoring mode. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894 Author: Vasanthakumar Thiagarajan Date: Fri Nov 26 06:10:07 2010 -0800 ath9k: Remove code which enables btcoex based on subsys id Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b Author: Vasanthakumar Thiagarajan Date: Fri Nov 26 06:10:06 2010 -0800 ath9k: Reintroduce modparam to enable btcoex It is not ideal to enable btcoex based on subsys id as it is not unique, they are so random. It is also a pain keeping all of them in a table to enable btcoex for a particular hw. Going back to the old idea. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5 Author: Johannes Berg Date: Thu Nov 25 10:02:30 2010 +0100 mac80211: implement off-channel mgmt TX This implements the new off-channel TX API in mac80211 with a new work item type. The operation doesn't add a new work item when we're on the right channel and there's no wait time so that for example p2p probe responses will be transmitted without delay. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae Author: Johannes Berg Date: Thu Nov 25 10:02:29 2010 +0100 nl80211/cfg80211: extend mgmt-tx API for off-channel With p2p, it is sometimes necessary to transmit a frame (typically an action frame) on another channel than the current channel. Enable this through the CMD_FRAME API, and allow it to wait for a response. A new command allows that wait to be aborted. However, allow userspace to specify whether or not it wants to allow off-channel TX, it may actually want to use the same channel only. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c20ec76157747434652e721cdd4dccd8654ad370 Author: Joe Perches Date: Mon Nov 29 07:42:02 2010 +0000 forcedeth: Use netdev_dbg for printk(KERN_DEBUG Use the normal debugging functions. Print mac address when using random_ether_addr. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ef46ffbc2841dddebe521764c06673474ca5d041 Author: Joe Perches Date: Mon Nov 29 07:42:01 2010 +0000 forcedeth: Remove netdev_dbg uses These were probably just for initial driver debugging and have not been enabled in builds in git history. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230 Author: Joe Perches Date: Mon Nov 29 07:42:00 2010 +0000 forcedeth: Convert dev_printk( to dev_( Use vsprintf extension %pM for a mac address in one instance. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit cd66328bdab782ee40d17b573a3067a591cb7b4f Author: Joe Perches Date: Mon Nov 29 07:41:59 2010 +0000 forcedeth: Separate vendor specific initializations into functions Neaten the phy_init function by adding and calling vendor specific functions. object size is reduced by ~1kb: $ size drivers/net/forcedeth.o.* text data bss dec hex filename 83475 1848 19304 104627 198b3 drivers/net/forcedeth.o.new 84459 1848 19544 105851 19d7b drivers/net/forcedeth.o.old Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c41d41e1687dcf344f55dd15c7121532e5c195d4 Author: Joe Perches Date: Mon Nov 29 07:41:58 2010 +0000 forcedeth: Add function init_realtek_8211b Deduplicate the code use for the init/reset of this device. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1d397f3698ec438c3c14abf45bfac88cca1882d9 Author: Joe Perches Date: Mon Nov 29 07:41:57 2010 +0000 forcedeth: Convert pr_ to netdev_ Use netdev_ when a struct net_device * is available. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 294a554e274f961ac33c7d739d5b912bd0005f5b Author: Joe Perches Date: Mon Nov 29 07:41:56 2010 +0000 forcedeth: Use pr_fmt and pr_ Convert printks to pr_. Remove "forcedeth: " from some calls as it's now added by pr_fmt. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb Author: Joe Perches Date: Mon Nov 29 07:41:55 2010 +0000 forcedeth: Convert remaining dprintk to netdev_dbg The remaining dprintk uses are emitted as KERN_INFO. Change these dprintk uses to netdev_dbg. Remove the now unused dprintk macros. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6 Author: Joe Perches Date: Mon Nov 29 07:41:54 2010 +0000 forcedeth: Use print_hex_dump Use the standard code to emit hex dumps. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc Author: Joe Perches Date: Mon Nov 29 07:41:53 2010 +0000 forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg Use the more standard macro to preface netdev->name. Fix casting on resource use. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248 Author: Joe Perches Date: Mon Nov 29 07:41:52 2010 +0000 forcedeth: Change reg_delay arguments and use Move the printk out of reg_delay and make the callers emit a message on error. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 77148625e10d0fda50d05e92d199c0df17b66e9a Merge: a417786 51cce8a Author: David S. Miller Date: Mon Nov 29 11:19:09 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac Author: Eric Dumazet Date: Sun Nov 28 21:43:02 2010 +0000 xps: add __rcu annotations Avoid sparse warnings : add __rcu annotations and use rcu_dereference_protected() where necessary. Signed-off-by: Eric Dumazet Cc: Tom Herbert Signed-off-by: David S. Miller commit b02038a17b271e0f70616c54e4eccb5cc33d1b74 Author: Eric Dumazet Date: Sun Nov 28 05:43:24 2010 +0000 xps: NUMA allocations for per cpu data store_xps_map() allocates maps that are used by single cpu, it makes sense to use NUMA allocations. Signed-off-by: Eric Dumazet Cc: Tom Herbert Signed-off-by: David S. Miller commit 49b4a6546fac02f58784f0744e0f99a6562ccc03 Author: Shan Wei Date: Mon Nov 29 00:14:58 2010 +0000 sctp: kill unused macros in head file 1. SCTP_CMD_NUM_VERBS,SCTP_CMD_MAX These two macros have never been used for several years since v2.6.12-rc2. 2.sctp_port_rover,sctp_port_alloc_lock The commit 063930 abandoned global variables of port_rover and port_alloc_lock, but still keep two macros to refer to them. So, remove them now. commit 06393009000779b00a558fd2f280882cc7dc2008 Author: Stephen Hemminger Date: Wed Oct 10 17:30:18 2007 -0700 [SCTP]: port randomization Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 7f51439a3c078393e7618a636fea403afa35948c Author: Konstantin Sinyuk Date: Tue Nov 16 08:55:03 2010 +0200 [ARM] Dove: add support for CM-A510 machine. This patch adds support for CM-A510 machine Signed-off-by: Konstantin Sinyuk Signed-off-by: Mike Rapoport Reviewed-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 1ccb53a4f3d0bfd65889fcfe988d829633641f49 Author: Evgeniy Dushistov Date: Tue Nov 9 22:46:17 2010 +0300 [ARM] mv78xx: wrong cpu1 window base register address The constant DDR_WINDOW_CPU1_BASE has wrong value. Because of that mv78xx0_mbus_dram_info is not filled properly on start, and in its turn drivers, that used mv78xx0_mbus_dram_info, in my case mv643xx_eth.c, not work on second core. According to MV76100, MV78100, and MV78200 DiscoveryTM Innovation Series CPU Family Functional Specifications address should be 0x1570. Signed-off-by: Evgeniy Dushistov Acked-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 760efe6910d5743084b586d3d0a3b65aea96fb2f Author: Mac Lin Date: Thu Nov 25 23:58:00 2010 +0800 USB: cns3xxx: Add EHCI and OHCI bus glue for cns3xxx SOCs The CNS3XXX SOC has include USB EHCI and OHCI compatible controllers. This patch adds the necessary glue logic to allow ehci-hcd and ohci-hcd drivers to work on CNS3XXX The EHCI and OHCI controllers share a common clock control and reset bit, therefore additional check for the timming of enabling and disabling is required. The USB bit of PLL Power Down Control is also shared by OTG, 24MHzUART clock, Crypto clock, PCIe reference clock, and Clock Scale Generator. Therefore we only ensure it is enabled, while not disabling it. Signed-off-by: Mac Lin Acked-by: Alan Stern Acked-by: Greg Kroah-Hartman Signed-off-by: Anton Vorontsov commit eb87e6770a9b1ad54b13fcfe80a1346d0c257536 Author: Kuninori Morimoto Date: Mon Nov 29 06:19:52 2010 +0000 ARM: mach-shmobile: mackerel: Add lost GPIO_FN_LCDD 18 - 23 RGB24 bus needs 18-23 pin Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit f4f0c135de9d359e22172adfb1d30ddcb38c00a7 Author: Kuninori Morimoto Date: Mon Nov 29 13:25:22 2010 +0900 ARM: mach-shmobile: mackerel: Add mackerel defconfig Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 4b82b68925d19ab32159ba94b30768f705812e0f Author: Kuninori Morimoto Date: Mon Nov 29 02:21:48 2010 +0000 ARM: mach-shmobile: mackerel: document switch and pin modes. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 11fee467a119afac02d336bf41dcd9c4db2b6106 Author: Kuninori Morimoto Date: Mon Nov 29 02:21:43 2010 +0000 ARM: mach-shmobile: mackerel: Add LCDC support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 2264c151efa632fa8aab7377d13d9aa1476547bf Author: Kuninori Morimoto Date: Mon Nov 29 02:21:37 2010 +0000 ARM: mach-shmobile: mackerel: Add SMSC support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 920adc75d51d23fe3e8a7ce2c946b2b24e6f7742 Author: Kuninori Morimoto Date: Mon Nov 29 02:21:21 2010 +0000 ARM: mach-shmobile: Add mackerel board support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 208c7dc2727ec0fbc678da5e749bcc178c08463d Author: Kuninori Morimoto Date: Mon Nov 29 02:10:08 2010 +0000 ARM: mach-shmobile: ag5evm: Add FSI resources Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 22efa0fee32d9e7f6f6fbc396a872b5708d86048 Author: Simon Horman Date: Sat Nov 27 00:11:55 2010 +0000 sh, mmc: Use defines when setting CE_CLK_CTRL The 16-19th bits of CE_CLK_CTRL set the MMC clock frequency. Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 1ae0affedce1d3e401991fbe7f2674753f0a7641 Author: Simon Horman Date: Fri Nov 26 23:02:58 2010 +0000 mmc, sh: Correct value for reset This resolves a regression that I introduced in "mmc, sh: Move constants to sh_mmcif.h". Having examined the manual and tested the code on an AP4EVB board it seems that the correct sequence is. 1) Write 1 to bit 31 and zeros to all other bits 2) Write zero to all bits Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 7211a1bae6eac26539eb2d77a26fcd1bccef8137 Author: Simon Horman Date: Fri Nov 26 23:02:57 2010 +0000 sh, mmc: Make mmcif_update_progress static inline extern inline doesn't make much sense Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd Author: Scott J. Goldman Date: Sat Nov 27 10:33:55 2010 +0000 vmxnet3: fix compilation when RSS is disabled If RSS is disabled, we can ifdef out some RSS specific code. This fixes the compile error found by Randy Dunlap. Signed-off-by: Scott J. Goldman Reviewed-by: Bhavesh Davda Signed-off-by: David S. Miller commit bf26414510103448ad3dc069c7422462f03ea3d7 Author: Tom Herbert Date: Fri Nov 26 08:36:09 2010 +0000 xps: Add CONFIG_XPS This patch adds XPS_CONFIG option to enable and disable XPS. This is done in the same manner as RPS_CONFIG. This is also fixes build failure in XPS code when SMP is not enabled. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 8fa9208e305e24978b897d6ea057604444ce77e1 Author: Frank Blaschka Date: Fri Nov 26 02:41:20 2010 +0000 qeth: l3 fix len in tso hdr The tso hdr is longer then the regular l3 hdr. Fix the calculation of the total len by accounting the size of the tso hdr. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf Author: Ursula Braun Date: Fri Nov 26 02:41:19 2010 +0000 qeth: enable interface setup if LAN is offline Device initialization of a qeth device contains a STARTLAN step. This step may fail, if cable is not yet plugged in. The qeth device stays in state HARDSETUP until cable is plugged in. This prevents further preparational initialization steps of the qeth device and its network interface. This patch makes sure initialization of qeth device continues, even though cable is not yet plugged in. Once carrier is available, qeth is notified, triggers a recovery which results in a working network interface. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit cdac082e051136a021f28d0f63c56e916b541253 Author: Joe Perches Date: Fri Nov 26 02:41:18 2010 +0000 drivers/s390/net: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f3aa3136d9c15ff693198eb34701a74bb0b6b969 Author: Sachin Sant Date: Fri Nov 26 02:41:17 2010 +0000 qeth lcs: convert mc rwlock to RCU Commit 1d7138de878d1d4210727c1200193e69596f93b3 igmp: RCU conversion of in_dev->mc_list converted rwlock to RCU. Update the s390 network drivers(qeth & lcs) code to adapt to this change. V2 : Changes based on suggestions given by Eric Dumazet Signed-off-by: Sachin Sant Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5 Author: Giuseppe Cavallaro Date: Sun Nov 28 18:10:53 2010 -0800 stmmac: fix stmmac_resume removing not yet used shutdown flag The commit to convert to use the dev_pm_ops struct introduces a bug. The shutdown flag is not yet used because the hibernation on memory is done by using the freeze callback. Thanks to Vlad for having reported it. Reported-by: Vlad Lungu Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit de855b992d75e49816eb09231764e7a63a4f555d Author: Szymon Janc Date: Sat Nov 27 08:39:48 2010 +0000 forcedeth: use usleep_range not msleep for small sleeps Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f Author: Szymon Janc Date: Sat Nov 27 08:39:46 2010 +0000 forcedeth: do not use assignment in if conditions Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 5504e1397cc860e61fbb68c56e7a10db613275fd Author: Szymon Janc Date: Sat Nov 27 08:39:45 2010 +0000 forcedeth: include and instead of and as suggested by checkpatch Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 9b03b06b65856f70564c53654d44053f3072379e Author: Szymon Janc Date: Sat Nov 27 08:39:44 2010 +0000 forcedeth: remove unnecessary checks before kfree Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9 Author: Szymon Janc Date: Sat Nov 27 08:39:43 2010 +0000 forcedeth: fix multiple code style issues Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 47c05314328d9c40f6006783dc4c1e3080bd2914 Author: Joe Perches Date: Sun Nov 28 00:02:59 2010 +0000 zd1211rw: document need for kmalloc cast Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6 Author: Joe Perches Date: Sat Nov 27 23:05:45 2010 +0000 vxge: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f3167460144cd2c24b964a32d40d32f851b5d5f4 Author: Joe Perches Date: Sat Nov 27 23:05:44 2010 +0000 qlcnic: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 0acdf68f495793143802dd4f3e47918dddcceed7 Author: Joe Perches Date: Sat Nov 27 23:05:43 2010 +0000 netxen: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90 Author: Casey Schaufler Date: Wed Nov 24 17:12:10 2010 -0800 Smack: UDS revision This patch addresses a number of long standing issues with the way Smack treats UNIX domain sockets. All access control was being done based on the label of the file system object. This is inconsistant with the internet domain, in which access is done based on the IPIN and IPOUT attributes of the socket. As a result of the inode label policy it was not possible to use a UDS socket for label cognizant services, including dbus and the X11 server. Support for SCM_PEERSEC on UDS sockets is also provided. Signed-off-by: Casey Schaufler Signed-off-by: James Morris commit 7e70cb4978507cf31d76b90e4cfb4c28cad87f0c Author: Mimi Zohar Date: Tue Nov 23 18:55:35 2010 -0500 keys: add new key-type encrypted Define a new kernel key-type called 'encrypted'. Encrypted keys are kernel generated random numbers, which are encrypted/decrypted with a 'trusted' symmetric key. Encrypted keys are created/encrypted/decrypted in the kernel. Userspace only ever sees/stores encrypted blobs. Changelog: - bug fix: replaced master-key rcu based locking with semaphore (reported by David Howells) - Removed memset of crypto_shash_digest() digest output - Replaced verification of 'key-type:key-desc' using strcspn(), with one based on string constants. - Moved documentation to Documentation/keys-trusted-encrypted.txt - Replace hash with shash (based on comments by David Howells) - Make lengths/counts size_t where possible (based on comments by David Howells) Could not convert most lengths, as crypto expects 'unsigned int' (size_t: on 32 bit is defined as unsigned int, but on 64 bit is unsigned long) - Add 'const' where possible (based on comments by David Howells) - allocate derived_buf dynamically to support arbitrary length master key (fixed by Roberto Sassu) - wait until late_initcall for crypto libraries to be registered - cleanup security/Kconfig - Add missing 'update' keyword (reported/fixed by Roberto Sassu) - Free epayload on failure to create key (reported/fixed by Roberto Sassu) - Increase the data size limit (requested by Roberto Sassu) - Crypto return codes are always 0 on success and negative on failure, remove unnecessary tests. - Replaced kzalloc() with kmalloc() Signed-off-by: Mimi Zohar Signed-off-by: David Safford Reviewed-by: Roberto Sassu Signed-off-by: James Morris commit d00a1c72f7f4661212299e6cb132dfa58030bcdb Author: Mimi Zohar Date: Tue Nov 23 17:50:34 2010 -0500 keys: add new trusted key-type Define a new kernel key-type called 'trusted'. Trusted keys are random number symmetric keys, generated and RSA-sealed by the TPM. The TPM only unseals the keys, if the boot PCRs and other criteria match. Userspace can only ever see encrypted blobs. Based on suggestions by Jason Gunthorpe, several new options have been added to support additional usages. The new options are: migratable= designates that the key may/may not ever be updated (resealed under a new key, new pcrinfo or new auth.) pcrlock=n extends the designated PCR 'n' with a random value, so that a key sealed to that PCR may not be unsealed again until after a reboot. keyhandle= specifies the sealing/unsealing key handle. keyauth= specifies the sealing/unsealing key auth. blobauth= specifies the sealed data auth. Implementation of a kernel reserved locality for trusted keys will be investigated for a possible future extension. Changelog: - Updated and added examples to Documentation/keys-trusted-encrypted.txt - Moved generic TPM constants to include/linux/tpm_command.h (David Howell's suggestion.) - trusted_defined.c: replaced kzalloc with kmalloc, added pcrlock failure error handling, added const qualifiers where appropriate. - moved to late_initcall - updated from hash to shash (suggestion by David Howells) - reduced worst stack usage (tpm_seal) from 530 to 312 bytes - moved documentation to Documentation directory (suggestion by David Howells) - all the other code cleanups suggested by David Howells - Add pcrlock CAP_SYS_ADMIN dependency (based on comment by Jason Gunthorpe) - New options: migratable, pcrlock, keyhandle, keyauth, blobauth (based on discussions with Jason Gunthorpe) - Free payload on failure to create key(reported/fixed by Roberto Sassu) - Updated Kconfig and other descriptions (based on Serge Hallyn's suggestion) - Replaced kzalloc() with kmalloc() (reported by Serge Hallyn) Signed-off-by: David Safford Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit c749ba912e87ccebd674ae24b97462176c63732e Author: Mimi Zohar Date: Tue Nov 23 18:54:16 2010 -0500 key: add tpm_send command Add internal kernel tpm_send() command used to seal/unseal keys. Changelog: - replaced module_put in tpm_send() with new tpm_chip_put() wrapper (suggested by David Howells) - Make tpm_send() cmd argument a 'void *' (suggested by David Howells) Signed-off-by: David Safford Signed-off-by: Mimi Zohar Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit a0e39349d80d8b5deeb264fb190bd064f7063252 Author: Mimi Zohar Date: Tue Nov 23 17:50:32 2010 -0500 tpm: add module_put wrapper For readability, define a tpm_chip_put() wrapper to call module_put(). Replace existing module_put() calls with the wrapper. (Change based on trusted/encrypted patchset review by David Howells.) Signed-off-by: Mimi Zohar Signed-off-by: David Safford Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit dc88e46029486ed475c71fe1bb696d39511ac8fe Author: Mimi Zohar Date: Tue Nov 23 17:50:31 2010 -0500 lib: hex2bin converts ascii hexadecimal string to binary Similar to the kgdb_hex2mem() code, hex2bin converts a string to binary using the hex_to_bin() library call. Changelog: - Replace parameter names with src/dst (based on David Howell's comment) - Add 'const' where needed (based on David Howell's comment) - Replace int with size_t (based on David Howell's comment) Signed-off-by: Mimi Zohar Acked-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit ce6ada35bdf710d16582cc4869c26722547e6f11 Author: Serge E. Hallyn Date: Thu Nov 25 17:11:32 2010 +0000 security: Define CAP_SYSLOG Privileged syslog operations currently require CAP_SYS_ADMIN. Split this off into a new CAP_SYSLOG privilege which we can sanely take away from a container through the capability bounding set. With this patch, an lxc container can be prevented from messing with the host's syslog (i.e. dmesg -c). Changelog: mar 12 2010: add selinux capability2:cap_syslog perm Changelog: nov 22 2010: . port to new kernel . add a WARN_ONCE if userspace isn't using CAP_SYSLOG Signed-off-by: Serge Hallyn Acked-by: Andrew G. Morgan Acked-By: Kees Cook Cc: James Morris Cc: Michael Kerrisk Cc: Stephen Smalley Cc: "Christopher J. PeBenito" Cc: Eric Paris Signed-off-by: James Morris commit 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab Merge: 074e61e 0f639a3 Author: James Morris Date: Mon Nov 29 08:27:07 2010 +1100 Merge branch 'master' into next commit c661c4a2b0d64c33afc9018a406162b1f8ac5617 Author: Breno Leitao Date: Thu Nov 25 07:53:55 2010 +0000 cxgb3: Removing unused return variable Currently the ret variable is not used for anything other than receive the value of the t3_adapter_error(), which will always be 0, because the reset parameter is 0. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 82a39eb6b3829a02e235656feddb4542517fcabc Author: Jozsef Kadlecsik Date: Thu Nov 25 03:15:07 2010 +0000 ipv6: Prepare the tree for un-inlined jhash. jhash is widely used in the kernel and because the functions are inlined, the cost in size is significant. Also, the new jhash functions are slightly larger than the previous ones so better un-inline. As a preparation step, the calls to the internal macros are replaced with the plain jhash function calls. Signed-off-by: Jozsef Kadlecsik Signed-off-by: David S. Miller commit aa285b1740f5b13e5a2606a927f3129954583d78 Author: Timo Teräs Date: Tue Nov 23 04:03:45 2010 +0000 xfrm: fix gre key endianess fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*. Make xfrm_flowi_{s|d}port return network byte order values for gre key too. Signed-off-by: Timo Teräs Signed-off-by: David S. Miller commit 6a632625c7da7594d059b88dae0e9c591af147ba Author: Jonas Bonn Date: Thu Nov 25 02:30:32 2010 +0000 ethoc: remove division from loops Calculating the BD entry using a modulus operation isn't optimal, especially inside the loop. This patch removes the modulus operations in favour of: i) simply checking for wrapping in the case of cur_rx ii) forcing num_tx to be a power of two and using it to mask out the entry from cur_tx The also prevents possible issues related overflow of the cur_rx and cur_tx counters. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3 Author: Jonas Bonn Date: Thu Nov 25 02:30:31 2010 +0000 ethoc: fix function return type update_ethoc_tx_stats doesn't need to return anything so make its return type void in order to avoid an unnecessary cast when the function is called. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8 Author: Jonas Bonn Date: Thu Nov 25 02:30:30 2010 +0000 ethoc: rework mdio read/write MDIO read and write were checking whether a timeout had expired to determine whether to recheck the result of the MDIO operation. Under heavy CPU usage, however, it was possible for the timeout to expire before the routine got around to be able to check a second time even, thus erroneousy returning an -EBUSY. This patch changes the the MDIO IO routines to try up to five times to complete the operation before giving up, thus lessening the dependency on CPU load. This resolves a problem whereby a ping flood would keep the CPU so busy that the above problem would manifest itself; the MDIO command to check link status would fail and the interface would erroneously be shut down. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3 Author: Jonas Bonn Date: Thu Nov 25 02:30:29 2010 +0000 ethoc: rework interrupt handling The old interrupt handling was incorrect in that it did not account for the fact that the interrupt source bits get set irregardless of whether or not their corresponding mask is set. This patch fixes that by masking off the source bits for masked interrupts. Furthermore, the handling of transmission events is moved to the NAPI polling handler alongside the reception handler, thus preventing a whole bunch of interrupts during heavy traffic. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3 Author: Jonas Bonn Date: Thu Nov 25 02:30:28 2010 +0000 ethoc: Double check pending RX packet An interrupt may occur between checking bd.stat and clearing the interrupt source register which would result in the packet going totally unnoticed as the interrupt will be missed. Double check bd.stat after clearing the interrupt source register to guard against such an occurrence. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 7438a5455734d109fdf18d97147dc57a6dbe5a44 Author: Adam Edvardsson Date: Thu Nov 25 02:30:27 2010 +0000 ethoc: enable interrupts after napi_complete Occasionally, it seems that some race is causing the interrupts to not be reenabled otherwise with the end result that networking just stops working. Enabling interrupts after calling napi_complete is more in line with what other drivers do. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit eac0d3ff5a92de410964fdf0d072314821ca39fc Author: Jonas Bonn Date: Thu Nov 25 02:30:26 2010 +0000 ethoc: remove unused spinlock Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit e0f4258be2515afce8ef1e6fb22312525c281798 Author: Jonas Bonn Date: Thu Nov 25 02:30:25 2010 +0000 ethoc: Add device tree configuration This patch adds the ability to describe ethernet devices via a flattened device tree. As device tree remains an optional feature, these bits all need to be guarded by CONFIG_OF ifdefs. MAC address is settable via the device tree parameter "local-mac-address"; however, the selection of the phy id is limited to probing, for now. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 85beb5869a4f6abb52a7cf8e01de6fa57e9ee47d Author: Steven Rostedt Date: Wed Nov 24 16:23:34 2010 -0500 tracing/slab: Move kmalloc tracepoint out of inline code The tracepoint for kmalloc is in the slab inlined code which causes every instance of kmalloc to have the tracepoint. This patch moves the tracepoint out of the inline code to the slab C file, which removes a large number of inlined trace points. objdump -dr vmlinux.slab| grep 'jmpq.* Signed-off-by: Pekka Enberg commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354 Author: andrew hendry Date: Thu Nov 25 02:18:45 2010 +0000 X25 remove bkl in call user data length ioctl Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5 Author: andrew hendry Date: Thu Nov 25 02:18:43 2010 +0000 X25 remove bkl from causediag ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5b7958dfa5db758e36e92e1790075b470b4947f8 Author: andrew hendry Date: Thu Nov 25 02:18:40 2010 +0000 X25 remove bkl from calluserdata ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit f90de660678cf553f63c387945830a2e4d26dd3e Author: andrew hendry Date: Thu Nov 25 02:18:35 2010 +0000 X25 remove bkl in facility ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b Author: andrew hendry Date: Thu Nov 25 02:18:15 2010 +0000 X25 remove bkl in subscription ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3 Author: Vladislav Zolotarov Date: Sun Nov 28 00:23:35 2010 +0000 bnx2x: Use helpers instead of direct access to the shinfo(skb) fields Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 9ab4650f718a0e1cb8792bab4ef97efca4ac75c2 Author: Dinh Nguyen Date: Mon Nov 15 11:30:01 2010 -0600 ARM: imx: Get the silicon version from the IIM module Instead of reading the silicon version from ROM, we should read the SREV register from the IIM. Freescale has dropped all support for MX51 REV1.0, only MX51 REV 2.0 and 3.0 are valid. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5 Author: Michael Chan Date: Wed Nov 24 13:48:55 2010 +0000 bnx2: Remove config access to non-standard registers In KVM passthrough mode, the driver may not have config access to non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register access to setup mailbox swapping can be done using MMIO. Update version to 2.0.20. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a5dac108d57072eec4d6745f32c162524509f2cb Author: Eddie Wai Date: Wed Nov 24 13:48:54 2010 +0000 bnx2: Fix reset bug on 5709 The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be cleared and polling for pending DMAs to complete before chip reset. Without this step, we've seen NMIs during repeated resets of the chip. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897 Author: John Fastabend Date: Wed Nov 24 13:14:50 2010 +0000 8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues Now that the vlan device is lockless and single queue do not transfer the real num queues. This is causing a BUG_ON to occur. kernel BUG at net/8021q/vlan.c:345! Call Trace: [] ? fib_rules_event+0x28/0x1b0 [] notifier_call_chain+0x55/0x80 [] raw_notifier_call_chain+0x16/0x20 [] call_netdevice_notifiers+0x37/0x70 [] netdev_features_change+0x16/0x20 [] ixgbe_fcoe_enable+0xae/0x100 [ixgbe] [] vlan_dev_fcoe_enable+0x2a/0x30 [8021q] [] fcoe_create+0x163/0x630 [fcoe] [] ? mmap_region+0x255/0x5a0 [] param_attr_store+0x50/0x80 [] module_attr_store+0x26/0x30 [] sysfs_write_file+0xf2/0x180 [] vfs_write+0xc8/0x190 [] sys_write+0x51/0x90 [] system_call_fastpath+0x16/0x1b Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 5a0d2268d259886f0c87131639d19eb4a67b4532 Author: Eric Dumazet Date: Tue Nov 23 10:42:02 2010 +0000 net: add netif_tx_queue_frozen_or_stopped When testing struct netdev_queue state against FROZEN bit, we also test XOFF bit. We can test both bits at once and save some cycles. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd Author: Shan Wei Date: Wed Nov 24 21:47:56 2010 +0000 ipv6: kill two unused macro definition 1. IPV6_TLV_TEL_DST_SIZE This has not been using for several years since created. 2. RT6_INFO_LEN commit 33120b30 kill all RT6_INFO_LEN's references, but only this definition remained. commit 33120b30cc3b8665204d4fcde7288638b0dd04d5 Author: Alexey Dobriyan Date: Tue Nov 6 05:27:11 2007 -0800 [IPV6]: Convert /proc/net/ipv6_route to seq_file interface Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a40c9f88b5e3da500ddab9440e5ddac170c12281 Author: Uwe Kleine-König Date: Tue Nov 23 22:57:47 2010 +0000 net: add some KERN_CONT markers to continuation lines Cc: netdev@vger.kernel.org Signed-off-by: Uwe Kleine-König Signed-off-by: David S. Miller commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66 Author: Rajesh Borundia Date: Tue Nov 23 03:08:27 2010 +0000 netxen: avoid using reset_devices as it may become obsolete In kdump environment do not depend on reset_devices parameter to reset the device as the parameter may become obsolete. Instead use an adapter specific mechanism to determine if the device needs a reset. Driver maintains a count of number of pci functions probed and decrements the count when remove handler of that pci function is called. If the first probe, probe of function 0, detects the count as non zero then reset the device. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b0044bcfa95ddf2e317863fb29121c284b6725ca Author: Rajesh Borundia Date: Tue Nov 23 01:25:21 2010 +0000 qlcnic: avoid using reset_devices as it may become obsolete. In kdump environment do not depend upon reset_devices parameter to reset the pci function as this parameter may become obsolete. Instead use an adapter specific mechanism to determine if the pci function needs to be reset. Per function refcount is maintained in driver, which is set in probe and reset in remove handler of adapter. If the probe detects the count as non zero then reset the function. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6 Author: Shan Wei Date: Mon Nov 22 23:00:42 2010 +0000 sctp: kill unused macro definition These macros have been existed for several years since v2.6.12-rc2. But they never be used. So remove them now. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit ce06b9d6d33fd2ed799b6e825d68fe95077da354 Author: Dmitry Torokhov Date: Sun Nov 28 16:37:14 2010 +0100 HID: hid-core - rename hid_blacklist to hid_have_special_driver To avoid confusion with hid_blacklist describing various quirks in usbhid code, let's rename this one. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f Author: Thomas Graf Date: Mon Nov 22 01:31:54 2010 +0000 rtnl: make link af-specific updates atomic As David pointed out correctly, updates to af-specific attributes are currently not atomic. If multiple changes are requested and one of them fails, previous updates may have been applied already leaving the link behind in a undefined state. This patch splits the function parse_link_af() into two functions validate_link_af() and set_link_at(). validate_link_af() is placed to validate_linkmsg() check for errors as early as possible before any changes to the link have been made. set_link_af() is called to commit the changes later. This method is not fail proof, while it is currently sufficient to make set_link_af() inerrable and thus 100% atomic, the validation function method will not be able to detect all error scenarios in the future, there will likely always be errors depending on states which are f.e. not protected by rtnl_mutex and thus may change between validation and setting. Also, instead of silently ignoring unknown address families and config blocks for address families which did not register a set function the errors EAFNOSUPPORT respectively EOPNOSUPPORT are returned to avoid comitting 4 out of 5 update requests without notifying the user. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 89bf67f1f080c947c92f8773482d9e57767ca292 Author: Eric Dumazet Date: Mon Nov 22 00:15:06 2010 +0000 drivers/net: use vzalloc() Use vzalloc() and vzalloc_node() in net drivers Signed-off-by: Eric Dumazet Acked-by: Jon Mason Signed-off-by: David S. Miller commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17 Author: Sathya Perla Date: Sun Nov 21 23:25:50 2010 +0000 be2net: adding support for Lancer family of CNAs Key changes are: - EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx vector to EQ-id. - BAR mapping and some req locations different for Lancer. - TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in Lancer. - CEV_IST reg not present in Lancer; so, peek into event queue to check for new entries - cq_create and mcc_create cmd interface is different for Lancer; handle accordingly Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 068ffaa8bfb67c2ddb3ecaf38cc90f94a1a92fe3 Author: Arnaldo Carvalho de Melo Date: Sat Nov 27 02:41:01 2010 -0200 perf tools: Fix lost and unknown events handling Fix it by explaining what can be happening and giving the number of processed and lost events. Also holler if unknown events were found, that can be due to processing a perf.data file collected using a newer tool where newer events got added on reporting using an older perf tool, that or a bug, so ask for a report to be made. Works on both --tui and --stdio. Suggested-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 008f29d3865828bb27e35d6d3fa889d0853b469f Author: Shawn Bohrer Date: Sun Nov 21 10:09:39 2010 -0600 perf trace: Handle DT_UNKNOWN on filesystems that don't support d_type Some filesystems like xfs and reiserfs will return DT_UNKNOWN for the d_type. Handle this case by calling stat() to determine the type. Cc: Andreas Schwab Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290355779-3276-1-git-send-email-sbohrer@rgmadvisors.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 9d1faba5fe410558099f13cfada2eab03186769d Author: Ian Munsie Date: Thu Nov 25 15:12:53 2010 +1100 perf symbols: Correct final kernel map guesses If a 32bit userspace perf is running on a 64bit kernel, the end of the final map in the kernel would incorrectly be set to 2^32-1 rather than 2^64-1. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290658375-10342-1-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 37982ba0a0630066a6a0844a66aedaf91c66db84 Author: Arnaldo Carvalho de Melo Date: Fri Nov 26 18:31:54 2010 -0200 perf events: Default to using event__process_lost Tool developers have to fill in a 'perf_event_ops' method table to specify how to handle each event, so far the ones that were not explicitely especified would get a stub that would just discard the event. Change that so that tool developers can get the lost event details and the total number of such events at the end of 'perf report -D' output. Suggested-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian CC: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit baa2f6cedbfae962f04281a31f08ec29667d31a0 Author: Arnaldo Carvalho de Melo Date: Fri Nov 26 19:39:15 2010 -0200 perf record: Add option to disable collecting build-ids Collecting build-ids for long running sessions may take a long time because it needs to traverse the whole just collected perf.data stream of events, marking the DSOs that had hits and then looking for the .note.gnu.build-id ELF section. For things like the 'trace' tool that records and right away consumes the data on systems where its unlikely that the DSOs being monitored will change while 'trace' runs, it is desirable to remove build id collection, so add a -B/--no-buildid option to perf record to allow such use case. Longer term we'll avoid all this if we, at DSO load time, in the kernel, take advantage of this slow code path to collect the build-id and stash it somewhere, so that we can insert it in the PERF_RECORD_MMAP event. Reported-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f6e3354d02aa1f30672e3671098c12cb49c7da25 Author: Russell King Date: Tue Nov 16 00:22:09 2010 +0000 ARM: pgtable: introduce pteval_t to represent a pte value This makes everywhere dealing with pte values use the same type. Signed-off-by: Russell King commit 97092e0c56830457af0639f6bd904537a150ea4a Author: Russell King Date: Tue Nov 16 00:16:01 2010 +0000 ARM: pgtable: use phys_addr_t for physical addresses Ensure that physical addresses are typed as phys_addr_t Signed-off-by: Russell King commit 6e4beb5e682953212da48ebb9e5c90408b8d38ae Author: Russell King Date: Sun Nov 21 23:48:55 2010 +0000 ARM: pgtable: use pXd_none_or_clear_bad() in pgd_free() Remove knowledge of the 2-level wrapping in pgd_free(), and use the pXd_none_or_clear_bad() macros when checking the entries. Signed-off-by: Russell King commit b0d03745b18c39b8e86e70f7778f2093d2cd4ed7 Author: Russell King Date: Sun Nov 21 11:00:56 2010 +0000 ARM: pgtable: get rid of get_pgd_slow()/free_pgd_slow() These old names are just aliases for pgd_alloc/pgd_free. Just use the new names. Signed-off-by: Russell King commit 69529c0eb76469168f1dd5851f363dbab17ce8fd Author: Russell King Date: Tue Nov 16 00:19:55 2010 +0000 ARM: pgtable: directly pass pgd/pmd/pte to their error functions Rather than passing the pte value to __pte_error, pass the raw pte_t cookie instead. Do the same for pmd and pgd functions. Signed-off-by: Russell King commit b510b049b549500816280f7ceaa087cfefdec581 Author: Russell King Date: Fri Nov 26 20:35:25 2010 +0000 ARM: pgtable: group pte functions together Signed-off-by: Russell King commit 4eec4b1396ac6a6a602b4521d40e9cf596ab776d Author: Russell King Date: Fri Nov 26 20:12:12 2010 +0000 ARM: pgtable: group pgd functions and data together Signed-off-by: Russell King commit cf36797f35676dafae9d44484391ac7f56b2485a Author: Mac Lin Date: Tue Nov 23 00:32:44 2010 +0800 ARM: cns3xxx: Add architecture definition for EHCI/OHCI controller This patch add plateform_device for EHCI and OHCI controller on CNS3XXX. Power reference count (usb_pwr_ref) is used to control enabling and disabling the single clock control for both EHCI and OHCI controller. It also removes EHCI/OHCI unused virtual address definitions. Signed-off-by: Mac Lin Signed-off-by: Anton Vorontsov commit 38e64ba0f13918d11e50bbd5bb775781ccd6439d Author: Mac Lin Date: Tue Nov 23 00:32:43 2010 +0800 ARM: cns3xxx: Add new and export the old power management functions This patch adds cns3xxx_pwr_clk_dis, and exports these power management functions that may be used by many other device drivers on CNS3XXX. Signed-off-by: Mac Lin Signed-off-by: Anton Vorontsov commit df8f4d2f3ef9ca2154f7bd531492a83c4ab4558a Author: Anton Vorontsov Date: Fri Nov 26 20:48:35 2010 +0300 ARM: cns3xxx: Make cns3xxx_pwr_soft_rst_force() to actually reset blocks commit 6eb5d146d4535 ("ARM: cns3xxx: Use IO memory accessors everywhere") breaks cns3xxx_pwr_soft_rst_force() function, so that it doesn't write cleared bit into the register. This patch fixes the issue by adding the necessary __raw_writel(). Signed-off-by: Anton Vorontsov commit eb9b2b69d3bdfe9cd98cd9b2c5715346a0f0140d Author: Russell King Date: Fri Nov 26 17:39:28 2010 +0000 ARM: pgtable: move pgprot functions to one place Rather than scattering them throughout the file, group them together. Signed-off-by: Russell King commit af86da5318136eb49c0453c2e2be3280ee5d18d9 Author: Cyrill Gorcunov Date: Fri Nov 26 14:32:09 2010 +0300 perf, x86: P4 PMU - describe config format Add description of .config in a sake of RAW events. At least this should bring some light to those who will be reading this code. Signed-off-by: Cyrill Gorcunov Reviewed-by: Stephane Eranian Cc: Lin Ming Signed-off-by: Ingo Molnar commit 004417a6d468e24399e383645c068b498eed84ad Author: Peter Zijlstra Date: Thu Nov 25 18:38:29 2010 +0100 perf, arch: Cleanup perf-pmu init vs lockup-detector The perf hardware pmu got initialized at various points in the boot, some before early_initcall() some after (notably arch_initcall). The problem is that the NMI lockup detector is ran from early_initcall() and expects the hardware pmu to be present. Sanitize this by moving all architecture hardware pmu implementations to initialize at early_initcall() and move the lockup detector to an explicit initcall right after that. Cc: paulus Cc: davem Cc: Michael Cree Cc: Deng-Cheng Zhu Acked-by: Paul Mundt Acked-by: Will Deacon Signed-off-by: Peter Zijlstra LKML-Reference: <1290707759.2145.119.camel@laptop> Signed-off-by: Ingo Molnar commit 5ef428c4b5950dddce7311e84321abb3aff7ebb0 Author: Andi Kleen Date: Thu Nov 18 11:47:31 2010 +0100 x86: Set cpu masks before calling CPU_STARTING notifiers When booting up a CPU set the various topology masks before calling the CPU_STARTING notifier. This way the notifier can actually use the masks. This is needed for a perf change. Signed-off-by: Andi Kleen Signed-off-by: Peter Zijlstra LKML-Reference: <1290077254-12165-2-git-send-email-andi@firstfloor.org> Signed-off-by: Ingo Molnar commit 963988262c3c8f4234f64a0dde59446a295e07bb Author: Peter Zijlstra Date: Wed Nov 24 18:55:29 2010 +0100 perf: Ignore non-sampling overflows Some arch implementations call perf_event_overflow() by 'accident', ignore this. Reported-by: Francis Moreau Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 5d508e820a23d9b6e8a149dfaa8ba5cbedf3d95c Author: Franck Bui-Huu Date: Tue Nov 23 16:21:45 2010 +0100 perf: Don't bother to init the hrtimer for no SW sampling counters Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-3-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 2e939d1da9b5628642314c1e68b4319e61263c94 Author: Franck Bui-Huu Date: Tue Nov 23 16:21:44 2010 +0100 perf: Limit event refresh to sampling event Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-2-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 6c7e550f13f8ad82efb6a5653ae628c2543c1768 Author: Franck Bui-Huu Date: Tue Nov 23 16:21:43 2010 +0100 perf: Introduce is_sampling_event() and use it when appropriate. Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-1-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 35d3778a8fe3c8b4a7513565e34d3bde00ce43ec Author: Peter Zijlstra Date: Wed Nov 24 10:43:55 2010 +0100 scripts/tags.sh: Add magic for trace-events Make tags find the trace-event definitions Signed-off-by: Peter Zijlstra Acked-by: WANG Cong LKML-Reference: <1290591835.2072.438.camel@laptop> Signed-off-by: Ingo Molnar commit 6c869e772c72d509d0db243a56c205ef48a29baf Merge: e4e91ac ee6dcfa Author: Ingo Molnar Date: Fri Nov 26 15:07:02 2010 +0100 Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar commit b7a2b39d9b7703ccf068f549c8dc3465fc41d015 Author: Nikanth Karthikesan Date: Fri Nov 26 12:37:09 2010 +0530 sched: Remove unused argument dest_cpu to migrate_task() Remove unused argument, 'dest_cpu' of migrate_task(), and pass runqueue, as it is always known at the call site. Signed-off-by: Nikanth Karthikesan Signed-off-by: Peter Zijlstra LKML-Reference: <201011261237.09187.knikanth@suse.de> Signed-off-by: Ingo Molnar commit 335d7afbfb71faac833734a94240c1e07cf0ead8 Author: Gerald Schaefer Date: Mon Nov 22 15:47:36 2010 +0100 mutexes, sched: Introduce arch_mutex_cpu_relax() The spinning mutex implementation uses cpu_relax() in busy loops as a compiler barrier. Depending on the architecture, cpu_relax() may do more than needed in this specific mutex spin loops. On System z we also give up the time slice of the virtual cpu in cpu_relax(), which prevents effective spinning on the mutex. This patch replaces cpu_relax() in the spinning mutex code with arch_mutex_cpu_relax(), which can be defined by each architecture that selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so this patch should not affect other architectures than System z for now. Signed-off-by: Gerald Schaefer Signed-off-by: Peter Zijlstra LKML-Reference: <1290437256.7455.4.camel@thinkpad> Signed-off-by: Ingo Molnar commit 22a867d81707b0a2720bb5f65255265b95d30526 Merge: 5bb6b1e 3561d43 Author: Ingo Molnar Date: Fri Nov 26 15:03:27 2010 +0100 Merge commit 'v2.6.37-rc3' into sched/core Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar commit e4e91ac410356da3a518188f371e9d3b52ee38ee Merge: ea7872b 3561d43 Author: Ingo Molnar Date: Fri Nov 26 15:04:42 2010 +0100 Merge commit 'v2.6.37-rc3' into perf/core Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar commit 2f6724b24525fc989c0707974b23d96b36132385 Author: Juuso Oikarinen Date: Wed Nov 24 08:16:57 2010 +0200 wl1271: Fix setting of the hardware connection monitoring probe-req template The probe-request template used in the hardware connection monitoring feature thus far has been an empty one, without the SSID IE and without supported rate IEs. This causes problems with some AP's. Additionally, after connected scans, the template for connection maintenance would remain to be the one last used for scanning - potentially incorrect. Fix these by getting a pre-filled directed probe-request template for the associated-to AP from mac80211. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 573c67cf819d52d2e12adf75a9a8cfbd216190a3 Author: Luciano Coelho Date: Fri Nov 26 13:44:59 2010 +0200 wl12xx: disable 11a channels when regulatory changes if 11a is not supported Instead of simply not scanning for the 11a channels when not supported by the hardware, disable the channels in reg_notify. This centralizes the decision on whether to scan 5GHz channel in one place and allows userspace to know exactly which channels are in use. Based on Juuso Oikarinen's idea. Cc: Juuso Oikarinen Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen commit 65500fa94aaeb3475e39c0c5180f188014164ca4 Author: Linus Walleij Date: Thu Nov 4 13:06:59 2010 +0100 ARM: 6467/1: amba: optional PrimeCell core voltage switch On some contemporary sub-micron SoCs, peripherals on the chip have power domain switches, i.e. the voltage to the core may be turned off to conserve power. In the Ux500 we have this for out PrimeCell derivates. This patch makes it possible to specify an (optional) regulator to handle the voltage domain switch on AMBA PrimeCells, modeled very similar to how block clocks are handled. Additional amba_vcore_[enable|disable] calls are supplied to make it possible introduce optional powering off of the core voltage. Using this will require code to spool/unspool any core HW state. Cc: Rabin Vincent Cc: Bengt Jonsson Cc: Jonas Aaberg Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 283a1b92e25fe3a62c766a042f96dad2eefa7d17 Author: Russell King Date: Mon Nov 8 10:11:19 2010 +0000 ARM: always build swp_emulate as ARMv7 swp_emulate is only used on ARMv7+, and includes ARMv7+ assembly instructions. Allow the assembler to accept ARMv7 instructions, but leave the compiler's code generation options alone. Signed-off-by: Russell King commit 6d803ba736abb5e122dede70a4720e4843dd6df4 Author: Jean-Christop PLAGNIOL-VILLARD Date: Wed Nov 17 10:04:33 2010 +0100 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Acked-by: Paul Mundt Signed-off-by: Russell King commit fbd29a14af42d374ddce9c16ff5f7805e69c764f Author: Sebastian Andrzej Siewior Date: Fri Nov 19 09:00:11 2010 -0800 spi/pxa2xx: register driver properly use platform_driver_register instead of platform_driver_probe. The latter only checks available devices at the time of calling. So if a device gets inserter at a later point in time then the driver will never play with it. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 83cf1eecfe9afee99d6b86f963187acd414c019d Merge: f1690d1 0e341af Author: Russell King Date: Fri Nov 26 10:28:11 2010 +0000 Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable commit f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd Merge: 612275a 43eab87 Author: Russell King Date: Fri Nov 26 10:26:43 2010 +0000 Merge branch 'perf-split' of git://linux-arm.org/linux-2.6-wd into devel-stable commit 612275ad3966dd7ba491d5fe94e894a3861c9062 Merge: 698fd6a2 176bfc4 Author: Russell King Date: Fri Nov 26 10:26:10 2010 +0000 Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable commit 6e9d4476063a820764ec063bf683379c38ea1e18 Author: Paul Mundt Date: Fri Nov 26 16:48:31 2010 +0900 usb: ehci-sh: Add missing ehci helpers. The ehci-sh driver was missing tie-ins for endpoint_reset and clear_tt_buffer_complete, add them in. Reported-by: Alan Stern Signed-off-by: Paul Mundt commit c1e0774d74481fdc3082d2096a99a3aa411a71f1 Author: Paul Mundt Date: Fri Nov 26 16:43:38 2010 +0900 usb: ehci-sh: Fix up fault in shutdown path. We can't use the generic usb_hcd_platform_shutdown helper on account of the fact we don't stash the hcd pointer in the driver data, so we provide our own shutdown handler. Signed-off-by: Paul Mundt commit ea7872b9d6a81101f6ba0ec141544a62fea35876 Author: Hitoshi Mitake Date: Thu Nov 25 16:04:53 2010 +0900 perf bench: Add feature that measures the performance of the arch/x86/lib/memcpy_64.S memcpy routines via 'perf bench mem' This patch ports arch/x86/lib/memcpy_64.S to perf bench mem memcpy for benchmarking memcpy() in userland with tricky and dirty way. util/include/asm/cpufeature.h, util/include/asm/dwarf2.h, and util/include/linux/linkage.h are mostly dummy files with small wrappers, so that we are able to include memcpy_64.S unmodified. Signed-off-by: Hitoshi Mitake Cc: h.mitake@gmail.com Cc: Miao Xie Cc: Ma Ling Cc: Zhao Yakui Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Andi Kleen LKML-Reference: <1290668693-27068-2-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 49ce8fc651794878189fd5f273228832cdfb5be9 Author: Hitoshi Mitake Date: Thu Nov 25 16:04:52 2010 +0900 perf bench: Print both of prefaulted and no prefaulted results by default After applying this patch, perf bench mem memcpy prints both of prefualted and without prefaulted score of memcpy(). New options --no-prefault and --only-prefault are added to print single result, mainly for scripting usage. Usage example: | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 634.969014 MB/Sec | 4.828062 GB/Sec (with prefault) | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --only-prefault | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 4.705192 GB/Sec (with prefault) | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --no-prefault | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 642.725568 MB/Sec Signed-off-by: Hitoshi Mitake Cc: h.mitake@gmail.com Cc: Miao Xie Cc: Ma Ling Cc: Zhao Yakui Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Andi Kleen LKML-Reference: <1290668693-27068-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit cffd9348a3ae87ac98a4b3c03a5359e28ad50b93 Author: Michael Hennerich Date: Wed Nov 24 09:33:59 2010 +0000 fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver Driver for ADV7393 add-on card for multiple Blackfin boards. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit dbcc465a3c8d81da132cc1dd4e5fbf731172477f Author: Michael Hennerich Date: Wed Nov 24 09:33:58 2010 +0000 fbdev: bf537-lq035: new Blackfin Sharp LQ035 framebuffer driver For LCDs hooked up to BF537-STAMP boards. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit 43eab87828fee65f89f4088736b2b7a187390a2f Author: Will Deacon Date: Sat Nov 13 19:04:32 2010 +0000 ARM: perf: separate PMU backends into multiple files The ARM perf_event.c file contains all PMU backends and, as new PMUs are introduced, will continue to grow. This patch follows the example of x86 and splits the PMU implementations into separate files which are then #included back into the main file. Compile-time guards are added to each PMU file to avoid compiling in code that is not relevant for the version of the architecture which we are targetting. Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 629948310e4270e9b32c37b4a65a8cd5d6ebf38a Author: Will Deacon Date: Sat Nov 13 18:45:27 2010 +0000 ARM: perf: encode PMU name in arm_pmu structure Currently, perf uses the PMU ID as an index into a string table to look up the name of a given PMU. This patch encodes the name of a PMU directly into the arm_pmu structure so that PMU-specific code can be factored out into separate files. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 3cb314bae2191b432a7e898abf865db880f6d07d Author: Will Deacon Date: Sat Nov 13 17:37:46 2010 +0000 ARM: perf: add _init() functions to PMUs In preparation for separating the PMU-specific code, this patch adds self-contained init functions to each PMU, therefore removing any PMU-specific knowledge from the PMU-agnostic init_hw_perf_events function. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 59a98a1e56edea4d7d9c5f4ce9d50e271a04993c Author: Will Deacon Date: Sat Nov 13 17:18:36 2010 +0000 ARM: perf: avoid exposing internal stop function for v6 PMU Unlike other pmu functions, armv6pmu_pmu_stop is not declared static. This patch adds the missing keyword. Acked-by: Jamie Iles Signed-off-by: Will Deacon commit 84fee97a026ca085f08381054513f9e24689a303 Author: Will Deacon Date: Sat Nov 13 17:13:56 2010 +0000 ARM: perf: consolidate common PMU behaviour The functions for mapping PMU events (perf, cache and raw) are common between all PMU types and differ only in the data on which they operate. This patch implements common definitions of these mapping functions and changes the arm_pmu struct to hold pointers to the data which they require. This is in anticipation of separating out the PMU-specific code into separate files. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 01660dfc37933c92dbb7c5718aea61f88025d71f Author: Arnaud Lacombe Date: Mon Nov 8 18:31:53 2010 -0500 scripts/genksyms: fix header usage FreeBSD does not like when __STDC__ is defined, use the standard instead. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit b9e4b1e0cd401e915e3ba97afc152946f78f9f0b Author: Dennis Kügler Date: Tue Nov 23 21:40:09 2010 +0100 HID: Add support for Perixx PERIBOARD-707 (Plus) This patch adds support for the media keys of the Perixx PERIBOARD-707 (Plus) keyboard / remote control. Signed-off-by: Dennis Kügler Signed-off-by: Jiri Kosina commit 45f53cc90e8f0e46ab024d0bc1de49ebee0dc583 Author: Andi Kleen Date: Fri Nov 5 12:06:05 2010 +0100 Kconfig: fix single letter command in scripts/config The one letter commands in scripts/config didn't work and always printed usage. Fix this here. Cc: erick@openchill.org Reported-by: erick@openchill.org Signed-off-by: Andi Kleen Signed-off-by: Michal Marek commit 6e5b86924a633f5b6eefb051404339a5a7bb005e Author: Américo Wang Date: Fri Nov 5 14:16:10 2010 +0800 gitignore: add scripts/recordmcount This file is generated, should be ignored by git. Signed-off-by: WANG Cong Signed-off-by: Michal Marek commit 10f26fa64200095af0e5d80a980e47877865e4b7 Author: Asbjoern Sloth Toennesen Date: Fri Nov 5 13:30:08 2010 +0000 kbuild, deb-pkg: select userland architecture based on UTS_MACHINE Instead of creating the debian package for the compiling userland, create it for a userland matching the kernel thats being compiled. This patch supports all Lenny release architectures, and Linux-based architecture candidates for Squeeze. If it can't find a proper Debian userspace it displays a warning, and fallback to let deb-gencontrol use the host's userspace arch. Eg. with this patch the following make command: make ARCH=i386 deb-pkg will output an i386 Debian package instead of an amd64 one, when run on an amd64 machine. Signed-off-by: Asbjoern Sloth Toennesen Acked-by: maximilian attems Signed-off-by: Michal Marek commit 1ad2096c4eba144522d87541c4024b8c84e95051 Merge: c4d73e7 df73af8 Author: Paul Mundt Date: Thu Nov 25 16:45:43 2010 +0900 Merge branch 'rmobile/mmcif' into rmobile-latest commit 696d6e178a95d95dbb222d89e5e91a6fa9911440 Author: Kuninori Morimoto Date: Wed Nov 24 07:41:14 2010 +0000 ARM: mach-shmobile: clock-sh73a0: modify MSTP order This patch permuted clock arrays in the order of MSTP Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit df73af86b6e737f357aae85e0b5e621516117780 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:26 2010 +0000 ARM: mach-shmobile: enable MMCIF DMA on ap4evb Have to add DMA slave configuration to enable DMA for the sh7372 MMCIF controller. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit a782d688e9c6f9ca9a7a9a28e8e2876969ddef53 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:22 2010 +0000 mmc: sh_mmcif: add DMA support The MMCIF controller on sh-mobile platforms can use the DMA controller for data transfers. Interface to the SH dmaengine driver to enable DMA. We also have to lower the maximum number of segments to match with the number od DMA descriptors on SuperH, this doesn't significantly affect driver's PIO performance. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e47bf32aa8de06ec72e18b4fbbd880caeedb0088 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:18 2010 +0000 mmc: sh_mmcif: cosmetic clean up Replace pr_* with respective dev_*, sort headers alphabetically, remove an unused struct member, superfluous variable initialisations and type-casts. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 6d11dc14e608d637b09277c7b499f2f46b29cc35 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:15 2010 +0000 ARM: mach-shmobile: add DMA defines for MMCIF on sh7372 Add DMA slave IDs and slave definitions for MMCIF on sh7372. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit aa0787a90c70587db6934547bb7687efc30062c7 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:12 2010 +0000 mmc: sh_mmcif: switch to completion, fix flags In sh_mmcif.c an event is used as a completion, switch over. When a wait_for_completion*_timeout() returns, it suffices to check the remaining time, setting an additional flag before waking up the waiting task only reduces the race window, but does not eliminate it. This patch switches the driver to use a completion to signal an interrupt, the only case, when an interrupt should not wake up the waiter, is when an automatic CMD12 completes. Also fix MODULE_ALIAS. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 2d3e4e7652f1db2de0fe8798a1a9be460ac9057b Merge: 698fd6a2 da1d39e Author: Paul Mundt Date: Thu Nov 25 16:26:14 2010 +0900 Merge branch 'common/mmcif' into rmobile/mmcif commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31 Author: Wey-Yi Guy Date: Thu Nov 18 10:40:03 2010 -0800 iwlagn: minor change in bt coex normal LUT Minor changes in LUT Signed-off-by: Wey-Yi Guy commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea Author: Wey-Yi Guy Date: Wed Nov 24 17:25:03 2010 -0800 iwlagn: use different kill mask when SCO active use different kill_ack_mask and kill_cts_mask when detect SCO is active. Signed-off-by: Wey-Yi Guy commit 638514ff5d5845c6eba8c266ea04325be6e7d106 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:55 2010 -0800 iwlagn: Offical name for 100/130 device Change to offical name for 100 devices: "Intel(R) Centrino(R) Wireless-N 100" Change to offical name for 130 devices: "Intel(R) Centrino(R) Wireless-N 130" Signed-off-by: Wey-Yi Guy commit d2eceef02e717751d4f6a01eddea6f241d63c213 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:54 2010 -0800 iwlagn: Offical name for 6000g2b device Change to offical name for 6000g2b devices: "Intel(R) Centrino(R) Wireless-N 1030" "Intel(R) Centrino(R) Advanced-N 6230" Signed-off-by: Wey-Yi Guy commit 55017ab87831b3ca449b81b83b180baac2895666 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:53 2010 -0800 iwlagn: Offical name for 6000g2a device Change to offical name for 6000g2a devices: "Intel(R) Centrino(R) Advanced-N 6205" Signed-off-by: Wey-Yi Guy commit f9dc6467223319acaea64d95ff208409e4e48d07 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:52 2010 -0800 iwlagn: Offical name for 6050g2 device Change to offical name for 6050g2 devices: "Intel(R) Centrino(R) Wireless-N 6150" Signed-off-by: Wey-Yi Guy commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570 Author: Johannes Berg Date: Wed Nov 17 11:33:27 2010 -0800 iwlwifi: use mac80211 AC defines Instead of hardcoding the numbers that must match mac80211, use the constants. Not that this means we could change the constants, but at least this way it's clearer. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 6fb5511ab96d9f31be747bab842f96227a5c7aec Author: Johannes Berg Date: Tue Nov 16 11:55:02 2010 -0800 iwlagn: advertise reliable TX status Our hardware has reliable TX status, but we're not currently advertising that to mac80211. Since the packet loss monitoring will depend on it, advertise it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 2e34034e8c9755ff144379d410d5227926e91cce Author: Johannes Berg Date: Tue Nov 16 11:51:38 2010 -0800 iwlagn: fix station powersave accounting for aggregation Since aggregation queues are station-specific, the device will not reject packets in them but rather will stop the appropriate aggregation queues when a station goes to sleep. I forgot to account for this in the driver, so if a station went to sleep that had aggregation enabled, traffic would stop indefinitely. Fix this by only accounting frames queued on the normal AC queues for associated station. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 67158b67cea0c92dba1dda74cde926d149cc1a2e Author: Johannes Berg Date: Tue Nov 16 11:51:04 2010 -0800 iwlagn: remove powersave warning Through races, a packet may be enqueued for transmission to a station while that station is going to sleep, in which case the warning here triggers. Instead of warning, check the condition -- if this packet is not a PS-poll response then we still enqueue it but it will be rejected by the device since the station is marked as asleep. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 Author: Wey-Yi Guy Date: Mon Nov 15 13:43:07 2010 -0800 iwlwifi: use antenna information in EEPROM The valid tx/rx antenna information is part of EEPROM, so use it to configure the device. For few cases, the EEPROM did not reflect the correct antenna, but it is too late to modify the EEPROM, so overwrite with .cfg parameters Signed-off-by: Wey-Yi Guy commit 4b7384f936817489a4172b9c5d946f63f479ca15 Author: Wey-Yi Guy Date: Mon Nov 15 13:56:10 2010 -0800 iwlwifi: remove unused define was not used, remove it Signed-off-by: Wey-Yi Guy commit 2862945bf5262d516583477ce420a2f122306f43 Author: Aaro Koskinen Date: Thu Nov 18 19:59:51 2010 +0200 arm: omap2: timer-gp: delete unused variable Delete a redundant local variable. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 7489ffcea62e0b990d3557746d19a47e83e07042 Author: Aaro Koskinen Date: Thu Nov 18 19:59:50 2010 +0200 arm: omap1: board-ams-delta: fix cast Use IOMEM() macro to get rid of the following sparse warning: arch/arm/mach-omap1/board-ams-delta.c:319:36: warning: incorrect type in initializer (different address spaces) arch/arm/mach-omap1/board-ams-delta.c:319:36: expected void [noderef] *membase arch/arm/mach-omap1/board-ams-delta.c:319:36: got void * Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa Author: Aaro Koskinen Date: Thu Nov 18 19:59:49 2010 +0200 arm: omap1: mbox: delete unused variable Delete unused variable from probe(). Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit dba5e190fcbe2a76b1a867ec6cbe9d7009e43708 Author: Aaro Koskinen Date: Thu Nov 18 19:59:48 2010 +0200 arm: omap1: mbox: make variables static Make some variables static to get rid of the following warnings: arch/arm/mach-omap1/mailbox.c:136:18: warning: symbol 'mbox_dsp_info' was not declared. Should it be static? arch/arm/mach-omap1/mailbox.c:142:18: warning: symbol 'omap1_mboxes' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit e6f168212243452eae7c0d0c20c2f6e213933fc8 Author: Aaro Koskinen Date: Thu Nov 18 19:59:47 2010 +0200 arm: omap1: make some functions static Make some functions static to get rid of the following sparse warnings: arch/arm/mach-omap1/mcbsp.c:177:12: warning: symbol 'omap1_mcbsp_init' was not declared. Should it be static? arch/arm/mach-omap1/mux.c:346:22: warning: symbol 'omap1_cfg_reg' was not declared. Should it be static? arch/arm/plat-omap/dma.c:177:5: warning: symbol 'omap_dma_in_1510_mode' was not declared. Should it be static? arch/arm/plat-omap/sram.c:273:12: warning: symbol 'omap1_sram_init' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 706afddaf53522b67c81a0b1b38bdccd4d4ff00c Author: Aaro Koskinen Date: Thu Nov 18 19:59:46 2010 +0200 arm: omap1: add missing includes Add missing includes to get rid of the following sparse warnings: arch/arm/mach-omap1/devices.c:225:13: warning: symbol 'omap1_camera_init' was not declared. Should it be static? arch/arm/mach-omap1/flash.c:15:6: warning: symbol 'omap1_set_vpp' was not declared. Should it be static? arch/arm/mach-omap1/serial.c:190:6: warning: symbol 'omap_serial_wake_trigger' was not declared. Should it be static? arch/arm/mach-omap1/time.c:252:18: warning: symbol 'omap_timer' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 51cce8a590c4696d62bfacc63378d1036084cef7 Merge: 2fe66ec 4f85593 Author: John W. Linville Date: Wed Nov 24 16:49:20 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 4f8559383c41262b50dc758e2e310f257ce6a14d Author: Felix Fietkau Date: Sat Nov 20 03:08:48 2010 +0100 ath9k_hw: remove ath9k_hw_stoppcurecv It is no longer used anywhere Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:22 2010 +0530 ath9k_htc: Identify devices using driver_info Categorize AR7010 & AR9287 devices based on driver_info of usb_device_id, instead of PIDs. This avoids per-device cases and minimize code changes for new device addition. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:21 2010 +0530 ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB) AR9287 devices (PCI/USB) use different eeprom start location to read nvram. New devices might endup with same devid. So use driver_info to set offset, instead of devid. driver_info is valid for HTC devices alone which is filled in usb_device_id. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 64f121708342afec306ce52920cc9982f4f1008f Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:20 2010 +0530 ath9k_htc: Add driver_info in usb device list Added driver_info to identify AR7010, R9287 HTC devices. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:19 2010 +0530 ath: Add a driver_info bitmask field The driver_info stores the device category information which is used to load appropriate device firmware, select firmware offset and eeprom starting location. The driver_info is accessed across ath9k_htc and ath9k_hw. Hence placed under common structure. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 35162ba75900209755628ccf7357763797037ba6 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:56 2010 -0800 iwlwifi: advance power management support For 6000g2b and up, adding advance power management support for better power consumption Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 1f37daf3233ccda5072f715d6c322d84833cdd92 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:55 2010 -0800 iwlwifi: power management checking for shadow register If shadow register is enable, modify the power management command to inform uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:54 2010 -0800 iwlwifi: consider BT for power management Check the BT PSPoll flag when fill PM command to uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 97badb0eefc9b6f23f864c5348b695be35f05882 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:53 2010 -0800 iwlwifi: add more power management flags Adding additional power management option available for the device. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d Author: Wey-Yi Guy Date: Tue Nov 23 10:58:52 2010 -0800 iwlagn: name change for BT config flag Bit 7 of BT config flag is used to enable/disable PSPoll sync. Make the name to match it. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 99ba2a14283be96a682e04455061c08a46bbf4ec Author: Johannes Berg Date: Wed Nov 24 08:10:06 2010 +0100 mac80211: implement packet loss notification For drivers that have accurate TX status reporting we can report the number of consecutive lost packets to userspace using the new cfg80211 CQM event. The threshold is fixed right now, this may need to be improved in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c063dbf52b998b852122dff07a8b8dd430b38437 Author: Johannes Berg Date: Wed Nov 24 08:10:05 2010 +0100 cfg80211: allow using CQM event to notify packet loss This adds the ability for drivers to use CQM events to notify about packet loss for specific stations (which could be the AP for the managed mode case). Since the threshold might be determined by the driver (it isn't passed in right now) it will be passed out of the driver to userspace in the event. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 79b1c460a0b55e55981c25c56597c4d5d2872de3 Author: Bruno Randolf Date: Wed Nov 24 14:34:41 2010 +0900 cfg80211: Add documentation for antenna ops Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 48124d1a91fb77defc9734b4556350d59671fb2c Author: Luis R. Rodriguez Date: Tue Nov 23 15:05:02 2010 -0800 mac80211: avoid aggregation for VO traffic This should help with latency issues which can happen when using aggregation. Cc: Felix Fietkau Cc: Matt Smith Cc: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c8b576061d87e2a4fb100e70c6a6dae189b3a310 Author: Luis R. Rodriguez Date: Tue Nov 23 15:05:01 2010 -0800 ath9k: avoid aggregation for VO traffic This should help with latency issues which can happen when using aggregation. Cc: Matt Smith Cc: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 72a8a3edd630995662bdc85957206685f376f9c4 Author: Felix Fietkau Date: Tue Nov 23 03:10:32 2010 +0100 mac80211: reduce the number of retries for nullfunc probing Since nullfunc frames are transmitted as unicast frames, they're more reliable than the broadcast probe requests, so we need fewer retries to figure out whether the AP is really gone. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4e5ff37692df35c8826f1291204841b174d3c3ce Author: Felix Fietkau Date: Tue Nov 23 03:10:31 2010 +0100 mac80211: use nullfunc instead of probe request for connection monitoring nullfunc frames are better for connection monitoring, because probe requests are answered even if the AP has already dropped the connection, whereas nullfunc frames from an unassociated station will trigger a disassoc/deauth frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows the station to reconnect immediately instead of waiting until it attempts to transmit the next unicast frame. This only works on hardware with reliable tx ACK reporting, any other hardware needs to fall back to the probe request method. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de Author: Felix Fietkau Date: Mon Nov 22 20:58:24 2010 +0100 cfg80211/mac80211: improve ad-hoc multicast rate handling - store the multicast rate as an index instead of the rate value (reduces cpu overhead in a hotpath) - validate the rate values (must match a bitrate in at least one sband) Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 46090979a55a0dc2cdb3d939f94fa47742108194 Author: Felix Fietkau Date: Tue Nov 23 20:28:03 2010 +0100 mac80211: probe the AP when resuming Check the connection by probing the AP (either using nullfunc or a probe request). If nullfunc probing is supported and the assoc is no longer valid, the AP will send a disassoc/deauth immediately. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7ccc8bd7593634d827e8bc55898a5038e29848b5 Author: Felix Fietkau Date: Fri Nov 19 22:55:38 2010 +0100 mac80211: calculate beacon loss time accurately Instead of using a fixed 2 second timeout, calculate beacon loss interval from the advertised beacon interval and a frame count. With this beacon loss happens after N (default 7) consecutive frames are missed which for a typical setup (100TU beacon interval) is ~700ms (or ~1/3 previous). Signed-off-by: Sam Leffler Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c8a7972c3b3633bf90daf50b135665d8ca4838c4 Author: Felix Fietkau Date: Fri Nov 19 22:55:37 2010 +0100 mac80211: restart beacon miss timer on system resume from suspend Signed-off-by: Paul Stewart Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773 Author: Rafał Miłecki Date: Thu Nov 18 21:11:43 2010 +0100 b43: N-PHY: little cleanups Remove some typos, warnings, initialize some values to follow wl's code path. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a Author: Rafał Miłecki Date: Thu Nov 18 21:11:42 2010 +0100 b43: N-PHY: rev2: save and restore PHY regs on RSSI poll Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit fee613b77df721781b9794945f0f1a8f535456ff Author: Rafał Miłecki Date: Thu Nov 18 21:11:41 2010 +0100 b43: N-PHY: fix BPHY init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bec186452b4cfecff9e2c579bfd4016119d39614 Author: Rafał Miłecki Date: Thu Nov 18 13:28:00 2010 +0100 b43: N-PHY: init BPHY when needed Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb Author: Rafał Miłecki Date: Thu Nov 18 13:27:59 2010 +0100 b43: N-PHY: fix some typos, conditions, set gain_boost Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c0f05b9879a324937f14270e4a14d661d2beca63 Author: Rafał Miłecki Date: Thu Nov 18 13:27:58 2010 +0100 b43: N-PHY: minor fixes to match specs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 69a3229edcf0c354e1cd93a811843fba7b6e1472 Author: Rafał Miłecki Date: Thu Nov 18 13:27:57 2010 +0100 b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio Additional comment by Larry Finger : This change deserves a bit more explanation. You might include something like "These tables came from reverse engineering the 5.10.56.46 version of the Broadcom driver. Trace comparisons between b43 and the current Broadcom driver (5.10.120.0) show byte reversals for the PHY register writes." Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d Author: Joe Perches Date: Tue Nov 16 19:56:49 2010 -0800 net/wireless: Use pr_ and netdev_ No change in output for pr_ prefixes. netdev_ output is different, arguably improved. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit d7a066c92394f3e777351de0c903beeb8a08af76 Merge: ccb1435 e476a5a Author: John W. Linville Date: Wed Nov 24 16:19:24 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit ccb14354017272ddac002e859a2711610b6af174 Author: John W. Linville Date: Wed Nov 24 16:18:36 2010 -0500 Revert "nl80211/mac80211: Report signal average" This reverts commit 86107fd170bc379869250eb7e1bd393a3a70e8ae. This patch inadvertantly changed the userland ABI. Signed-off-by: John W. Linville commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f Author: Tom Herbert Date: Sun Nov 21 13:17:27 2010 +0000 xps: Transmit Packet Steering This patch implements transmit packet steering (XPS) for multiqueue devices. XPS selects a transmit queue during packet transmission based on configuration. This is done by mapping the CPU transmitting the packet to a queue. This is the transmit side analogue to RPS-- where RPS is selecting a CPU based on receive queue, XPS selects a queue based on the CPU (previously there was an XPS patch from Eric Dumazet, but that might more appropriately be called transmit completion steering). Each transmit queue can be associated with a number of CPUs which will use the queue to send packets. This is configured as a CPU mask on a per queue basis in: /sys/class/net/eth/queues/tx-/xps_cpus The mappings are stored per device in an inverted data structure that maps CPUs to queues. In the netdevice structure this is an array of num_possible_cpu structures where each structure holds and array of queue_indexes for queues which that CPU can use. The benefits of XPS are improved locality in the per queue data structures. Also, transmit completions are more likely to be done nearer to the sending thread, so this should promote locality back to the socket on free (e.g. UDP). The benefits of XPS are dependent on cache hierarchy, application load, and other factors. XPS would nominally be configured so that a queue would only be shared by CPUs which are sharing a cache, the degenerative configuration woud be that each CPU has it's own queue. Below are some benchmark results which show the potential benfit of this patch. The netperf test has 500 instances of netperf TCP_RR test with 1 byte req. and resp. bnx2x on 16 core AMD XPS (16 queues, 1 TX queue per CPU) 1234K at 100% CPU No XPS (16 queues) 996K at 100% CPU Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 3853b5841c01a3f492fe137afaad9c209e5162c6 Author: Tom Herbert Date: Sun Nov 21 13:17:29 2010 +0000 xps: Improvements in TX queue selection In dev_pick_tx, don't do work in calculating queue index or setting the index in the sock unless the device has more than one queue. This allows the sock to be set only with a queue index of a multi-queue device which is desirable if device are stacked like in a tunnel. We also allow the mapping of a socket to queue to be changed. To maintain in order packet transmission a flag (ooo_okay) has been added to the sk_buff structure. If a transport layer sets this flag on a packet, the transmit queue can be changed for the socket. Presumably, the transport would set this if there was no possbility of creating OOO packets (for instance, there are no packets in flight for the socket). This patch includes the modification in TCP output for setting this flag. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 22f4fbd9bd283ef85126e511171932a4af703776 Author: Eric Dumazet Date: Wed Nov 24 11:41:56 2010 -0800 infiniband: remove dev_base_lock use dev_base_lock is the legacy way to lock the device list, and is planned to disappear. (writers hold RTNL, readers hold RCU lock) Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking. Signed-off-by: Eric Dumazet Acked-by: Roland Dreier Signed-off-by: David S. Miller commit bba14de98753cb6599a2dae0e520714b2153522d Author: Eric Dumazet Date: Tue Nov 23 14:09:15 2010 +0000 scm: lower SCM_MAX_FD Lower SCM_MAX_FD from 255 to 253 so that allocations for scm_fp_list are halved. (commit f8d570a4 added two pointers in this structure) scm_fp_dup() should not copy whole structure (and trigger kmemcheck warnings), but only the used part. While we are at it, only allocate needed size. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39 Author: Eric Dumazet Date: Tue Nov 23 13:12:15 2010 +0000 ipv6: mcast: RCU conversion ipv6_sk_mc_lock rwlock becomes a spinlock. readers (inet6_mc_check()) now takes rcu_read_lock() instead of read lock. Writers dont need to disable BH anymore. struct ipv6_mc_socklist objects are reclaimed after one RCU grace period. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:17 2010 +0000 stmmac: update the driver version Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 874bd42d24c2a74f5dbd65e81e175982240fecd8 Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:11 2010 +0000 stmmac: convert to dev_pm_ops. This patch updates the PM support using the dev_pm_ops and reviews the hibernation support. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34 Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:05 2010 +0000 stmmac: add init/exit callback in plat_stmmacenet_data struct This patch adds in the plat_stmmacenet_data the init and exit callbacks that can be used for invoking specific platform functions. For example, on ST targets, these call the PAD manager functions to set PIO lines and syscfg registers. The patch removes the stmmac_claim_resource only used on STM Kernels as well. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:37:58 2010 +0000 stmmac: tidy-up stmmac_priv structure This patch tidies-up the stmmac_priv structure that had many fileds alredy defined in the plat_stmmacenet_data structure. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit b340007f79941297c44a7dfba4d3c587ff81590f Author: Vladislav Zolotarov Date: Wed Nov 24 11:09:50 2010 -0800 bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev() Move the interrupt mode configuration and NAPIs adding before a register_netdev() call to prevent netdev->open() from running before these functions are done. Advance a driver version number. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Reported-by: Michael Chan Signed-off-by: David S. Miller commit e1210d127d11fc40d229648c9754aa60776ef796 Author: Eric Dumazet Date: Wed Nov 24 03:45:10 2010 +0000 bnx2x: Disable local BHes to prevent a dead-lock situation According to Eric's suggestion: Disable local BHes to prevent a dead-lock situation between sch_direct_xmit() (Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall context), as both are taking a netif_tx_lock(). Signed-off-by: Eric Dumazet Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754 Author: Matt Carlson Date: Wed Nov 24 08:31:54 2010 +0000 tg3: Remove tg3_config_info definition This structure isn't used anywhere in the driver. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe Author: Matt Carlson Date: Wed Nov 24 08:31:53 2010 +0000 tg3: Enable phy APD for 5717 and later asic revs This patch enables the gphy autopowerdown feature in the phy for all new devices that support it. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed Author: Matt Carlson Date: Wed Nov 24 08:31:52 2010 +0000 tg3: use dma_alloc_coherent() instead of pci_alloc_consistent() Using dma_alloc_coherent() permits to use GFP_KERNEL allocations instead of GFP_ATOMIC ones. Its better when a machine is out of memory, because this allows driver to sleep to get its memory and succeed its init, especially when allocating high order pages. Signed-off-by: Eric Dumazet Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b92b9040f6e4997b895b7b9c655a158354d28964 Author: Matt Carlson Date: Wed Nov 24 08:31:51 2010 +0000 tg3: Reenable TSS for 5719 All TSS bugs have been fixed in the 5719. This patch reenables the feature. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit deabaac8beeccdfee5358c0cd4c63258f28f3a74 Author: Matt Carlson Date: Wed Nov 24 08:31:50 2010 +0000 tg3: Enable mult rd DMA engine on 5719 The multiple DMA read engine bugs have been fixed on the 5719. This patch reenables support for this feature. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d Author: Matt Carlson Date: Wed Nov 24 08:31:49 2010 +0000 tg3: Reorg tg3_napi members This patch reorders and realigns the tg3_napi members for a ~3-4% performance improvement on small packet performance tests. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit cf79003d598b1f82a4caa0564107283b4f560e14 Author: Matt Carlson Date: Wed Nov 24 08:31:48 2010 +0000 tg3: Fix 5719 internal FIFO overflow problem Under load, there an internal FIFO can overflow on the 5719. The fix is to scale back the PCIe maximum read request size based on the current link speed and width. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5 Author: Matt Carlson Date: Wed Nov 24 08:31:47 2010 +0000 tg3: Always turn on APE features in mac_mode reg The APE needs certain bits in the mac_mode register to be enabled for traffic to flow correctly. This patch changes the code to always enable these bits in the presence of the APE. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b75cc0e4c1caac63941d96a73b2214e8007b934b Author: Matt Carlson Date: Wed Nov 24 08:31:46 2010 +0000 tg3: Assign correct tx margin for 5719 Commit d309a46e42542223946d3a9e4e239fdc945cb53e, entitled "tg3: 5719: Prevent tx data corruption", was supposed to contain the tx margin adjustment but it looks like it somehow was omitted. This patch fixes the problem. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 5093eedc8bdfd7d906836a44a248f66a99e27d22 Author: Matt Carlson Date: Wed Nov 24 08:31:45 2010 +0000 tg3: Apply 10Mbps fix to all 57765 revisions Commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008, entitled "tg3: Reduce 57765 core clock when link at 10Mbps" needs to be applied to all revisions of the 57765 asic rev, not just the A0 revision. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b66ff7a2cd411a2245c984793a7eb98ee91771f9 Author: Dinh Nguyen Date: Mon Nov 15 11:30:00 2010 -0600 ARM: imx: Add mx53 support to common msl functions. Add mx53 support to cpu.c and mm.c. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit c0abefd30b2c9db015df4914a95d268ecdb39b00 Author: Dinh Nguyen Date: Mon Nov 15 11:29:59 2010 -0600 ARM: imx: Add core definitions for MX53 Add iomux, clocks, and memory map for Freescale's MX53 SoC. Add cpu_is_mx53 function to common.h. Add 3 more banks of gpio's to mxc_gpio_ports. Add MX53 phys offset address. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 374daa4f9019f75da1addb3f31a22df1966a5baa Author: Fabio Estevam Date: Wed Nov 10 07:00:02 2010 -0800 mx51_babbage: Add SPI flash support MX51 Babbage has an AT45DB321 SPI Flash connected to eCSPI1. Add support for it. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer Acked-by: Uwe Kleine-König commit 76586d35eb31192bf3f395c2e02cef8a57e3558c Author: Sascha Hauer Date: Thu Nov 4 23:09:18 2010 +0100 ARM i.MX27 pm: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit 92fcdc9d1054a630f224657dc675e03bf3bb62ed Author: Sascha Hauer Date: Thu Nov 4 23:08:17 2010 +0100 ARM i.MX51: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit 8bffb77e198df83224a6a258291bd41c05ab84d1 Author: Sascha Hauer Date: Thu Nov 4 23:07:56 2010 +0100 ARM i.MX DMA: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit ec4bb253fcc5c07519b5e701d2c87100aef0d2ba Author: Sascha Hauer Date: Fri Nov 5 09:47:21 2010 +0100 ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option There's no point showing this option to the user. The correct value will be selected anyway. Signed-off-by: Sascha Hauer commit c7259df3af03aee00985e9bb64fb2afa593f703f Author: Sascha Hauer Date: Fri Nov 5 09:37:22 2010 +0100 ARM i.MX irq: Compile avic irq code only on SoCs that need it This patch adds a Kconfig option for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX, irq.c is not appropriate anymore, so rename it to avic.c Signed-off-by: Sascha Hauer commit 7608d7d2b4a146f560436f5b99b1b93d30049e4e Author: Sascha Hauer Date: Thu Nov 4 21:20:43 2010 +0100 ARM i.MX51 boards: Do not use PHYS_OFFSET PHYS_OFFSET may become a variable once the runtime PHYS_OFFSET patch is merged, so use MX51_PHYS_OFFSET for boot_params. Signed-off-by: Sascha Hauer commit db037126656fb75482c09fb8673d97a5b44bcbae Author: Fabio Estevam Date: Wed Nov 3 14:39:13 2010 -0700 mx51_3ds: Add esdhc support Add support for esdhc on mx51_3ds board. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8 Author: Arnaud Patard (Rtp) Date: Wed Nov 3 15:54:36 2010 +0100 imx: fix iomux v3 Commit "ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie" (b705cb4d42e95a4a43a8945571c8613e71526c3d) introduced a typo which was preventing my efikamx to boot. This patch is fixing that. Signed-off-by: Arnaud Patard Tested-by: Fabio Estevam Signed-off-by: Sascha Hauer commit c2932bf47001697fc48e89f1d136532703ed4779 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:55 2010 +0200 efikamx: add reset The efikamx board is using a gpio to reset the board so add support for it Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit c6e34a4cbe8d4e126c3f603d11cce6979952cbb1 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:54 2010 +0200 efikamx: add spi nor support On efikamx, uboot is stored on a nor spi flash. Add support for it Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0dea1c74642fb46cb94282719dafe7c2a7d3068f Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:53 2010 +0200 imx51: fix gpio_4_24 and gpio_4_25 pad configuration s/NO_PAD_CTRL/MX51_GPIO_PAD_CTRL/ Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit fcbd0c5f20918c6db0c72d4e7546880833713f9c Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:52 2010 +0200 efikamx: add support for power key This patch adds support for power key button of the efika mx. It's connected on GPIO 2 31. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 9d2c0ef76f429c038de27e1b734d65a67dbc8088 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:51 2010 +0200 efikamx: add leds support The efika mx a 3 leds (1 blue, 1 red, 1 green) connected on GPIOS 3 13/14/15. Also, some special care is done for default trigger of blue led for mmc as the mmc host used is different between hw revisions Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 82df68ad26c1cb4c31e1a2750c0020038dd77cc6 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:50 2010 +0200 imx51: add gpio mode for csi1 {h,v}sync Add definitions for configuring CSI1_{H,V}SYNC as GPIO Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit a96eb148c74a09bc872b1490141d98811a3c7dbd Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:49 2010 +0200 efikamx: add mmc support The efika mx is using a esdhc host for mmc support. Now that the sdhci has support for it, enable it. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0a7d48712f9a279464d2587e52e60fdc81f9a65a Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:48 2010 +0200 imx51: enhance iomux configuration for esdhc support - add definition to configure pads as ESDHC{1,2} WP and CD Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit db9d42348f6f5b37ae658a506bf80fa935dc1b0a Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:47 2010 +0200 imx51: fix iomux configuration - ALT0 is used to set GPIO mode of GPIO_1_{2,3,4,5,6,7,8,9} but it's ALT1 for GPIO_1_{0,1}. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit f1dd361b679977d449b7d10ddc9b5fcdfa8c0ca9 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:46 2010 +0200 efikamx: read board id read board id value from the GPIO3_16/17/11 Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit bd02a9e5eee6335f23f1fff52a1e5c8e1783c49e Author: Fabio Estevam Date: Wed Oct 27 10:31:06 2010 -0700 mx31_3ds: Add touchscreen support On the mx31_3ds board the touchscreen feature is provided by MC13783 PMIC. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9 Author: Lothar Waßmann Date: Tue Oct 26 14:28:31 2010 +0200 ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie The following patch is a first step to convert the 'struct pad_desc' to a bitmapped cookie to facilitate adding platform specific pullup or drive strength definitions to existing pad definitions without need to rewrite the complete pad def. The patch wraps 'struct pad_desc' in an opaque data type and introduces macros to access the individual members. This patch does not constitute any functional change! Signed-off-by: Lothar Waßmann Signed-off-by: Sascha Hauer commit 2a85927c79634e89b9cd683dd2bae65966d9b216 Merge: 3561d43 124bf94 Author: Sascha Hauer Date: Wed Nov 24 08:24:29 2010 +0100 Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38 commit c4d73e7d75a54451d6e073c118ba2b8d87bd350d Merge: 0421860 fd34f85 421b446 Author: Paul Mundt Date: Wed Nov 24 15:34:46 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest commit fd34f85832550d419e8b70f284ad545cdde0664f Author: Paul Mundt Date: Wed Nov 24 15:22:09 2010 +0900 mailmap: Fix up Takashi YOSHII's attribution. Signed-off-by: Paul Mundt commit aae0f73604ff4bf65d0e4f5d4a10f214a6c98282 Author: Kuninori Morimoto Date: Wed Nov 24 05:03:33 2010 +0000 ARM: mach-shmobile: ag5evm: remove unused define Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 8e67b22a13e53335657b595bc4e4c01a559f8845 Author: Yoshii Takashi Date: Fri Nov 19 13:21:32 2010 +0000 ARM: mach-shmobile: ag5evm i2c_shmobile support. Just add port multiplex settings to enable i2c modules. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit b028f94b76319e1b86103b767ca1c22546a5e7e7 Author: Yoshii Takashi Date: Fri Nov 19 13:20:45 2010 +0000 ARM: mach-shmobile: sh73a0 i2c_shmobile support. Platform device resource/data definition for CPU, and clkdev entries Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 2d22d486601b2eaedd1c8dd5dc1c4602cab896ef Author: Yoshii Takashi Date: Fri Nov 19 13:15:46 2010 +0000 ARM: mach-shmobile: ag5evm: scan keyboard support This consists of platform device resources/data for the board, and simple clvdev entry for MSTP bit for keysc module. This support only 49 of 80 key-switches on the board. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3 Author: Eric Paris Date: Tue Nov 23 06:28:08 2010 +0000 SELinux: indicate fatal error in compat netfilter code The SELinux ip postroute code indicates when policy rejected a packet and passes the error back up the stack. The compat code does not. This patch sends the same kind of error back up the stack in the compat code. Based-on-patch-by: Paul Moore Signed-off-by: Eric Paris Reviewed-by: Paul Moore Signed-off-by: David S. Miller commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738 Author: Eric Paris Date: Tue Nov 23 06:28:02 2010 +0000 SELinux: Only return netlink error when we know the return is fatal Some of the SELinux netlink code returns a fatal error when the error might actually be transient. This patch just silently drops packets on potentially transient errors but continues to return a permanant error indicator when the denial was because of policy. Based-on-comments-by: Paul Moore Signed-off-by: Eric Paris Reviewed-by: Paul Moore Signed-off-by: David S. Miller commit 34a2d313c51f47cae50ccb89f4196462665f2c48 Author: Christoph Hellwig Date: Tue Nov 23 14:38:21 2010 +0100 hfsplus: flush disk caches in sync and fsync Flush the disk cache in fsync and sync to make sure data actually is on disk on completion of these system calls. There is a nobarrier mount option to disable this behaviour. It's slightly misnamed now that barrier actually are gone, but it matches the name used by all major filesystems. Signed-off-by: Christoph Hellwig commit e34947056076ca5467ee8256d2d9cbc594a79b37 Author: Christoph Hellwig Date: Tue Nov 23 14:38:15 2010 +0100 hfsplus: optimize fsync Avoid doing unessecary work in fsync. Do nothing unless the inode was marked dirty, and only write the various metadata inodes out if they contain any dirty state from this inode. This is archived by adding three new dirty bits to the hfsplus-specific inode which are set in the correct places. Signed-off-by: Christoph Hellwig commit b33b7921db14abcd10c30d0ccfc68e364f5ef7fe Author: Christoph Hellwig Date: Tue Nov 23 14:38:13 2010 +0100 hfsplus: split up inode flags Split the flags field in the hfsplus inode into an extent_state flag that is locked by the extent_lock, and a new flags field that uses atomic bitops. The second will grow more flags in the next patch. Signed-off-by: Christoph Hellwig commit eb29d66d4f2dc98a81ae590bbdddc8cfa8964d73 Author: Christoph Hellwig Date: Tue Nov 23 14:38:10 2010 +0100 hfsplus: write up fsync for directories fsync is supposed to not just work on regular files, but also on directories. Fortunately enough hfsplus_file_fsync works just fine for directories, so we can just wire it up. Signed-off-by: Christoph Hellwig commit 281469766bdde2d14bc73e1fec347e6dd7f63319 Author: Christoph Hellwig Date: Tue Nov 23 14:38:06 2010 +0100 hfsplus: simplify fsync Remove lots of code we don't need from fsync, we just need to call ->write_inode on the inode if it's dirty, for which sync_inode_metadata is a lot more efficient than write_inode_now, and we need to write out the various metadata inodes, which we now do explicitly instead of by calling ->sync_fs. Signed-off-by: Christoph Hellwig commit f02e26f8d90f8cde98314c72c2e890bc281a8346 Author: Christoph Hellwig Date: Tue Nov 23 14:38:02 2010 +0100 hfsplus: avoid useless work in hfsplus_sync_fs There is no reason to write out the metadata inodes or volume headers during a non-blocking sync, as we are almost guaranteed to dirty them again during the inode writeouts. Signed-off-by: Christoph Hellwig commit 7dc4f001123f9ebe3b010a6c26acd18698ad205f Author: Christoph Hellwig Date: Tue Nov 23 14:37:57 2010 +0100 hfsplus: make sure sync writes out all metadata hfsplus stores all metadata except for the volume headers in special inodes. While these are marked hashed and periodically written out by the flusher threads, we can't rely on that for sync. For the case of a data integrity sync the VM has life-lock avoidance code that avoids writing inodes again that are redirtied during the sync, which is something that can happen easily for hfsplus. So make sure we explicitly write out the metadata inodes at the beginning of hfsplus_sync_fs. Signed-off-by: Christoph Hellwig commit 358f26d52680cb150907302d4334359de7dd2d59 Author: Christoph Hellwig Date: Tue Nov 23 14:37:51 2010 +0100 hfsplus: use raw bio access for partition tables Switch the hfsplus partition table reding for cdroms to use our bio helpers. Again we don't rely on any caching in the buffer_heads, and this gets rid of the last buffer_head use in hfsplus. Signed-off-by: Christoph Hellwig commit 52399b171dfaea02b6944cd6feba49b624147126 Author: Christoph Hellwig Date: Tue Nov 23 14:37:47 2010 +0100 hfsplus: use raw bio access for the volume headers The hfsplus backup volume header is located two blocks from the end of the device. In case of device sizes that are not 4k aligned this means we can't access it using buffer_heads when using the default 4k block size. Switch to using raw bios to read/write all buffer headers. We were not relying on any caching behaviour of the buffer heads anyway. Additionally always read in the backup volume header during mount to verify that we can actually read it. Signed-off-by: Christoph Hellwig commit 3b5ce8ae31e3c66655207907527476bbd3e5063b Author: Christoph Hellwig Date: Tue Nov 23 14:37:43 2010 +0100 hfsplus: always use hfsplus_sync_fs to write the volume header Remove opencoded writing of the volume header in hfsplus_fill_super and hfsplus_put_super and offload it to hfsplus_sync_fs. In the put_super case this means we only write the superblock once instead of twice. Signed-off-by: Christoph Hellwig commit 6d1bbfc4c0458c514126ccf7d6ce9232d9dbc872 Author: Christoph Hellwig Date: Tue Nov 23 14:37:40 2010 +0100 hfsplus: silence a few debug printks Turn a few noisy debug printks that show up during xfstests into complied out debug print statements. Signed-off-by: Christoph Hellwig commit 5bb6b1ea67a73f0665a41726dd7138977b992c6c Author: Peter Zijlstra Date: Fri Nov 19 21:11:09 2010 +0100 sched: Add some clock info to sched_debug Add more clock information to /proc/sched_debug, Thomas wanted to see the sched_clock_stable state. Requested-by: Thomas Gleixner Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 51a96c77815e7f139892a6e9c8275a50e9baebdf Author: Peter Zijlstra Date: Fri Nov 19 20:37:53 2010 +0100 cpu: Remove incorrect BUG_ON Oleg mentioned that there is no actual guarantee the dying cpu's migration thread is actually finished running when we get there, so replace the BUG_ON() with a spinloop waiting for it. Reported-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 2e01f4740a874b6085da6ebf541e7ffde9a72bf2 Author: Dhaval Giani Date: Thu Nov 18 15:44:54 2010 +0100 cpu: Remove unused variable GCC warns us about: kernel/cpu.c: In function ‘take_cpu_down’: kernel/cpu.c:200:15: warning: unused variable ‘cpu’ This variable is unused since param->hcpu is directly used later on in cpu_notify. Signed-off-by: Dhaval Giani Signed-off-by: Peter Zijlstra LKML-Reference: <1290091494.1145.5.camel@gondor.retis> Signed-off-by: Ingo Molnar commit 70caf8a6c13c2279b35f2ad6b644815533d6c476 Author: Peter Zijlstra Date: Sat Nov 20 00:53:51 2010 +0100 sched: Fix UP build breakage The recent cgroup-scheduling rework caused a UP build problem. Cc: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 28d0686cf7b14e30243096bd874d3f80591ed392 Author: Erik Gilling Date: Fri Nov 19 18:08:51 2010 -0800 sched: Make task dump print all 15 chars of proc comm Signed-off-by: Erik Gilling Signed-off-by: John Stultz Signed-off-by: Peter Zijlstra LKML-Reference: <1290218934-8544-3-git-send-email-john.stultz@linaro.org> Signed-off-by: Ingo Molnar commit 6735329934e9acc1941a991ed6f6ad4be3e082a5 Author: Juuso Oikarinen Date: Thu Nov 18 15:19:02 2010 +0200 wl12xx: Fix kernel crash related to hw recovery and interface shutdown It is possible that the op_remove_interface function is invoked exactly at the same time has hw recovery is started. In this case it is possible for the interface to be already removed in the op_remove_interface call, which currently leads to a kernel warning and a subsequent kernel crash. Fix this by ignoring the op_remove_interface call if the interface is already down at that point. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Signed-off-by: Luciano Coelho commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d Author: Felix Fietkau Date: Mon Nov 22 18:26:51 2010 +0100 ath9k_htc: fix eeprom access wireless-testing commit a05b5d45049d60a06a1b12976150572304a51928 ath9k: add support for reading eeprom from platform data on PCI devices This change moved the initialization of the AH_USE_EEPROM flag from ath9k_hw to ath9k. This needs to be added to ath9k_htc as well Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 02d2ebb2a0aa2cae0446289c8f927067aec06079 Author: Felix Fietkau Date: Mon Nov 22 15:39:39 2010 +0100 ath9k_hw: fix A-MPDU key search issues on AR9003 Under load, a large number of frames can produce decryption errors, even when no key cache update is being done. Performing a key search for every single frame in an A-MPDU improves reliability. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7253965a1cfbd22dd20f92b7a054e831777e284e Author: Joe Perches Date: Sat Nov 20 18:39:03 2010 -0800 zd1211rw: Use const Mark arrays const that are unmodified after initializations. text data bss dec hex filename 19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old 19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit f4e16e41d62ddc75704a0344567a807ebb41a929 Author: Joe Perches Date: Sat Nov 20 18:39:01 2010 -0800 rt2x00: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new 40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old Signed-off-by: Joe Perches Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe Author: Joe Perches Date: Sat Nov 20 18:39:00 2010 -0800 rndis_wlan: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old 41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new Changed functions rndis_set_oid and set_bssid to take const *'s. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit ff273b91ff04e6f232234b70c45101074a0daa27 Author: Joe Perches Date: Sat Nov 20 18:38:59 2010 -0800 ray_cs: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new 42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b Author: Joe Perches Date: Sat Nov 20 18:38:58 2010 -0800 libertas: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new 3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old 27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new 27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd Author: Joe Perches Date: Sat Nov 20 18:38:57 2010 -0800 iwlwifi: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new 48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old 37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new 37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old 37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new 37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old Changed b43_nphy_write_clip_detection to take a const u16 * Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea Author: Joe Perches Date: Sat Nov 20 18:38:56 2010 -0800 b43: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new 5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 3370a895454ad814d0fb5f50352cea4e51d7392f Author: Joe Perches Date: Sat Nov 20 18:38:55 2010 -0800 atmel: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old 42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5653a63d85300dbed71b76ab7ada03808bdfb170 Author: Joe Perches Date: Sat Nov 20 18:38:54 2010 -0800 carl9170: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new 1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed Author: Joe Perches Date: Sat Nov 20 18:38:53 2010 -0800 ath9k: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new 11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old 15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old 15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new 14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old 14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new 10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new 10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old 9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new 9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old 16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new 16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old 18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old 18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new 19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new 20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old 23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old 23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new 24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old 24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new 6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old 6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new 36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new 36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old 9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old 9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new Use ARRAY_SIZE instead of a magic number. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 8b22523b045858042c6700f556f840853de163ea Author: Joe Perches Date: Sat Nov 20 18:38:52 2010 -0800 ath5k: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old 11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4 Author: Joe Perches Date: Sat Nov 20 18:38:51 2010 -0800 ar9170: Use const Mark an array const. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit a9ab21133581580f6907abbc33fd3870e75dc935 Author: Christian Lamparter Date: Sat Nov 20 16:53:26 2010 +0100 carl9170: fix init-self regression The commit: "carl9170: tx path review" introduced a regression. gcc (with -Winit-self): tx.c:1264: warning: ‘super’ is used uninitialized in this function Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209 Author: Huang Weiyi Date: Sat Nov 20 20:06:02 2010 +0800 libertas: remove duplicated #include Remove duplicated #include('s) in drivers/net/wireless/libertas/cfg.c Signed-off-by: Huang Weiyi Signed-off-by: John W. Linville commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75 Author: Felix Fietkau Date: Sat Nov 20 03:08:46 2010 +0100 ath9k: fix recursive locking in the tx flush path Signed-off-by: Felix Fietkau Tested-by: Ben Greear Signed-off-by: John W. Linville commit 33e808c383477e821163f133c2e3e671879c28b6 Author: Dmitry Torokhov Date: Mon Nov 22 12:53:23 2010 -0800 Input: iforce - clean up Makefile Use -y notation to specify list of objects comprising iforce module and conditionally pull in USB and RS232 support. Also remove custom compiler flags and rely on general makefile rules for enabling warnings. Signed-off-by: Dmitry Torokhov commit ebde50d5a49122c164f81958a03993e1c947c0b6 Author: Dmitry Torokhov Date: Mon Nov 22 12:39:28 2010 -0800 Input: clean up Makefile (use input-core-y) The proper way to specify multi-source object is to use -y instead of -obj (which is deprecated) as it allows conditional inclusion of modules in the list. Signed-off-by: Dmitry Torokhov commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc Author: Johannes Berg Date: Thu Nov 18 12:08:10 2010 -0800 iwlwifi: fix modular 3945 only build If only 3945 is selected, and is a module, build fails because iwl-legacy.c won't be compiled. Fix this by adding it to the build correctly. This doesn't happen for 4965 because it is a bool option, not tristate, since it's built into the AGN module. Reported-by: Randy Dunlap Tested-by: Randy Dunlap Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 18890d4b89d8507ad09289f6f57a71591c7e9e83 Author: Helmut Schaa Date: Fri Nov 19 08:11:01 2010 +0100 mac80211: Disable hw crypto for GTKs on AP VLAN interfaces When using AP VLAN interfaces, each VLAN interface should be in its own broadcast domain. Hostapd achieves this by assigning different GTKs to different AP VLAN interfaces. However, mac80211 drivers are not aware of AP VLAN interfaces and as such mac80211 sends the GTK to the driver in the context of the base AP mode interface. This causes problems when multiple AP VLAN interfaces are used since the driver will use the same key slot for the different GTKs (there's no way for the driver to distinguish the different GTKs from different AP VLAN interfaces). Thus, only the clients associated to one AP VLAN interface (the one that was created last) can actually use broadcast traffic. Fix this by not programming any GTKs for AP VLAN interfaces into the hw but fall back to using software crypto. The GTK for the underlying AP interface is still sent to the driver. That means, broadcast traffic to stations associated to an AP VLAN interface is encrypted in software whereas broadcast traffic to stations associated to the non-VLAN AP interface is encrypted in hardware. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit b2e253cf300c5e33f49b7dd8b593bfc722177401 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:09 2010 -0800 cfg80211: Fix regulatory bug with multiple cards and delays When two cards are connected with the same regulatory domain if CRDA had a delayed response then cfg80211's own set regulatory domain would still be the world regulatory domain. There was a bug on cfg80211's logic such that it assumed that once you pegged a request as the last request it was already the currently set regulatory domain. This would mean we would race setting a stale regulatory domain to secondary cards which had the same regulatory domain since the alpha2 would match. We fix this by processing each regulatory request atomically, and only move on to the next one once we get it fully processed. In the case CRDA is not present we will simply world roam. This issue is only present when you have a slow system and the CRDA processing is delayed. Because of this it is not a known regression. Without this fix when a delay is present with CRDA the second card would end up with an intersected regulatory domain and not allow it to use the channels it really is designed for. When two cards with two different regulatory domains were inserted you'd end up rejecting the second card's regulatory domain request. This fails with mac80211_hswim's regtest=2 (two requests, same alpha2) and regtest=3 (two requests, different alpha2) module parameter options. This was reproduced and tested against mac80211_hwsim using this CRDA delayer: #!/bin/bash echo $COUNTRY >> /tmp/log sleep 2 /sbin/crda.orig And these regulatory tests: modprobe mac80211_hwsim regtest=2 modprobe mac80211_hwsim regtest=3 Reported-by: Mark Mentovai Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:08 2010 -0800 cfg80211: move mutex locking to reg_process_pending_hints() This will be required in the next patch and it makes the next patch easier to review. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:07 2010 -0800 cfg80211: move reg_work and reg_todo above These will be used earlier in the next few patches. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit 31e99729ae66d8b74316547c40eed15172f14ea8 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:06 2010 -0800 cfg80211: put core regulatory request into queue This will simplify the synchronization for pending requests. Without this we have a race between the core and when we restore regulatory settings, although this is unlikely its best to just avoid that race altogether. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit 8ce469999552b0c3325350cd9b4be417f2bbfc23 Author: Rafał Miłecki Date: Wed Nov 17 22:14:37 2010 +0100 b43: rfkill: use HI enabled bit for all devices Devices which use LO enabled bit are covered by b43legacy Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 176bfc44417544724e6df0831a7f576f4a56283d Author: Daniel Walker Date: Tue Sep 7 13:33:05 2010 -0700 arm: kconfig: dis-allow hotplug on MSM MSM doesn't support hotplug, so we prevent it from being selected in Kconfig. Signed-off-by: Daniel Walker commit 89c3dedf477da9c8d42d3a63d16875e52f74108b Author: Daniel Walker Date: Mon Nov 22 12:35:41 2010 -0800 arm: kconfig: enable SMP for MSM targets This just adds ARCH_MSM_SCORPIONMP to allow SMP selection for MSM. MSM is unique in that it doesn't enable SCU or TWD. Signed-off-by: Daniel Walker commit 8933f90c777c5728822206a2313c9c1361f5274f Author: Rafał Miłecki Date: Thu Oct 14 22:58:58 2010 +0200 b43: N-PHY: add 2056 radio channels tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff Merge: b84a7d3 9e2e742 Author: John W. Linville Date: Mon Nov 22 15:28:30 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit eb06acdc85585f28864261f28659157848762ee4 Author: Sridhar Samudrala Date: Thu Oct 28 13:10:50 2010 +0000 macvlan: Introduce 'passthru' mode to takeover the underlying device With the current default 'vepa' mode, a KVM guest using virtio with macvtap backend has the following limitations. - cannot change/add a mac address on the guest virtio-net - cannot create a vlan device on the guest virtio-net - cannot enable promiscuous mode on guest virtio-net To address these limitations, this patch introduces a new mode called 'passthru' when creating a macvlan device which allows takeover of the underlying device and passing it to a guest using virtio with macvtap backend. Only one macvlan device is allowed in passthru mode and it inherits the mac address from the underlying device and sets it in promiscuous mode to receive and forward all the packets. Signed-off-by: Sridhar Samudrala ------------------------------------------------------------------------- Signed-off-by: David S. Miller commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04 Author: Tracey Dent Date: Sun Nov 21 15:03:28 2010 +0000 Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit fdb26195f494988fc155c204aab0f0953ba7ec6f Author: Tracey Dent Date: Sun Nov 21 15:03:27 2010 +0000 Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31 Author: Tracey Dent Date: Sun Nov 21 15:03:26 2010 +0000 Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 094f2faaa2c4973e50979158f655a1d31a97ba98 Author: Tracey Dent Date: Sun Nov 21 15:03:25 2010 +0000 Net: rds: Makefile: Remove deprecated items Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. Last but not least, took out if-conditionals. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 927a41f50c83b539fde5c01911f4968d717199bf Author: Tracey Dent Date: Sun Nov 21 15:03:24 2010 +0000 Net: phonet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 64387df8da1e4f178a47d53930288a46a357a479 Author: Tracey Dent Date: Sun Nov 21 15:03:23 2010 +0000 Net: lapb: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5 Author: Tracey Dent Date: Sun Nov 21 15:03:22 2010 +0000 Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit cd30c62024904951392e21a200fe5427a6286736 Author: Tracey Dent Date: Sun Nov 21 15:03:21 2010 +0000 Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e Author: Tracey Dent Date: Sun Nov 21 15:03:20 2010 +0000 Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd Author: Tracey Dent Date: Sun Nov 21 15:03:19 2010 +0000 Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c Author: Tracey Dent Date: Sun Nov 21 15:03:18 2010 +0000 Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit cc0bdac399b1881626cd5512f292e396c9c96685 Author: Tracey Dent Date: Sun Nov 21 15:03:17 2010 +0000 Net: econet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 22674a24b44ac53f244ef6edadd02021a270df5a Author: Tracey Dent Date: Sun Nov 21 15:03:16 2010 +0000 Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f Author: Tracey Dent Date: Sun Nov 21 15:03:15 2010 +0000 Net: ceph: Makefile: remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit bac14e017830bd204b3a1bd55f42b0841c02e995 Author: Tracey Dent Date: Sun Nov 21 15:03:14 2010 +0000 Net: can: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit a3106d032fb17283c96fa041f8285e6926ae074d Author: Tracey Dent Date: Sun Nov 21 15:03:13 2010 +0000 Net: caif: Makefile: Remove deprecated items Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. Last but not least, took out if-conditionals. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 87217502d4f45a9925c5eda5b2179f1220e87537 Author: Tracey Dent Date: Sun Nov 21 15:03:12 2010 +0000 Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4 Author: Juuso Oikarinen Date: Mon Nov 22 12:59:08 2010 +0200 wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc On the disassociation event from the mac80211, the wl12xx driver does not clear the chipset configuration related to the AP - i.e. it does not perform a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not unset the BSSID filter. Often this is not a problem, as the above is performed upon entering idle state. But if a scenario arises where a new association is attempted without cycling through idle state, the new association will fail. Fix this by resetting the firmware state on disassociation. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 68d069c45f73e8aeda0249891daec1f7e2f0e067 Author: Arik Nemtsov Date: Mon Nov 8 10:51:07 2010 +0100 wl1271: add support for HW TX fragmentation Indicate to mac80211 we support HW fragmentation. Support updates of the fragmentation threshold via the set_frag_threshold callback. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit fa97f46b30357a50f3ee193e6f82864f95bc55ec Author: Juuso Oikarinen Date: Wed Nov 10 11:27:20 2010 +0100 Revert "wl1271: Change supported channel order for a more optimal scan" This reverts commit fa21c7a9e4be439e217fe72edbd39b643b643791. The reverted patch caused more harm than benefit. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Tested-by: Tuomas Katila Signed-off-by: Luciano Coelho commit b7417d930afdc214daa24299912d984e7f4f390a Author: Juuso Oikarinen Date: Wed Nov 10 11:27:19 2010 +0100 wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies The wl1271 does not support radar detection. Hence, prevent ad-hoc and active scanning on frequencies requiring DFS. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 91433029e42e58d8536299f32fa55cf589adff35 Author: Gery Kahn Date: Sun Nov 7 10:04:20 2010 +0100 wl1271: cleanup unused code of calibration structures The cleanup unused code for calibration procedures. Signed-off-by: Gery Kahn Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 00d201001bd4e8a46e3d03c970abcb72256c368b Author: Shahar Levi Date: Mon Nov 8 11:20:10 2010 +0000 wl1271: Change wl12xx Files Names All files name prefix removed due to the fact that wl12xx driver supports wl1271 and wl1273. Also the definition in Kconfig and header files changed respectively. Signed-off-by: Shahar Levi Signed-off-by: Luciano Coelho commit 691513f70d3957939a318da970987b876c720861 Author: Lin Ming Date: Mon Nov 22 14:03:28 2010 +0100 x86: Resume trampoline must be executable commit 5bd5a452(x86: Add NX protection for kernel data) marked the trampoline area NX - which unsurprisingly breaks resume and cpu hotplug. Revert the portion of that commit, which touches the trampoline. Originally-from: Lin Ming LKML-Reference: <1290410581.2405.24.camel@minggr.sh.intel.com> Cc: Matthieu Castet Cc: Siarhei Liakh Cc: Xuxian Jiang Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Andi Kleen Tested-by: Peter Zijlstra Signed-off-by: Thomas Gleixner commit f09830ab15bfb7eb4e832e44189b5b5883309811 Author: Axel Lin Date: Sun Nov 21 22:27:13 2010 -0800 Input: ct82c710 - remove a redundant serio_register_port() We already call serio_register_port() in ct82c710_probe(), thus remove a redundant serio_register_port() in ct82c710_init(). Looks like this bug is introduced by 916d83cfe5da1cda454d8b0ae233f06b58bd7f91 "Input: ct82c710 - convert to the new platform device interface" [dtor@mail.ru: also move printk to where we register port] Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit ebcc019926269e7e123d55ec92ff00c2688ca343 Author: Axel Lin Date: Sun Nov 21 22:27:09 2010 -0800 Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit serio_unregister_port() will call put_device() to free the memory. Thus remove kfree(ams_delta_serio) after serio_unregister_port(ams_delta_serio). Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 0e86eb29def648664c2c0fa605f5b5bad84247cb Author: Axel Lin Date: Sun Nov 21 22:23:06 2010 -0800 Input: ps2mult - fix wrong kfree in ps2mult_connect error path Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 551eaff1b384cc107eab6332ba8424b3ca1f304b Author: Eric Dumazet Date: Sun Nov 21 10:26:44 2010 -0800 pktgen: allow faster module unload Unloading pktgen module needs ~6 seconds on a 64 cpus machine, to stop 64 kthreads. Add a pktgen_exiting variable to let kernel threads die faster, so that kthread_stop() doesnt have to wait too long for them. This variable is not tested in fast path. Note : Before exiting from pktgen_thread_worker(), we must make sure kthread_stop() is waiting for this thread to be stopped, like its done in kernel/softirq.c Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f Author: Jan Engelhardt Date: Sat Nov 20 18:07:21 2010 +0000 netns: let net_generic take pointer-to-const args This commit is same in nature as v2.6.37-rc1-755-g3654654; the network namespace itself is not modified when calling net_generic, so the parameter can be const. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309 Author: Eric Dumazet Date: Sat Nov 20 07:31:54 2010 +0000 packet: use vzalloc() alloc_one_pg_vec_page() is supposed to return zeroed memory, so use vzalloc() instead of vmalloc() Signed-off-by: Eric Dumazet Cc: Neil Horman Acked-by: Neil Horman Signed-off-by: David S. Miller commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4 Author: Don Skidmore Date: Sun Nov 21 09:55:10 2010 -0800 ixgbe: update version number for ixgbe This will reflect addition of new X540 hardware Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 39de52104dd92bc0548a20201350111dc9317df9 Author: Jesper Juhl Date: Sat Nov 20 13:36:49 2010 -0800 Input: serio HIL MLC - don't deref null, don't leak and return proper error While reviewing various users of kernel memory allocation functions I came across drivers/input/serio/hil_mlc.c::hil_mlc_register() and noticed that: - it calls kzalloc() but fails to check for a NULL return before use. - it makes several allocations and if one fails it doesn't free the previous ones. - It doesn't return -ENOMEM in the failed memory allocation case (it just crashes). This patch corrects all of the above and also reworks the only caller of this function that I could find (drivers/input/serio/hp_sdc_mlc.c::hp_sdc_mlc_out()) so that it now checks the return value of hil_mlc_register() and properly propagates it on failure and I also restructured the code to remove some labels and goto's to make it, IMHO nicer to read. Signed-off-by: Jesper Juhl Tested-by: Helge Deller Acked-by: Helge Deller Signed-off-by: Dmitry Torokhov commit d9cf837ef9629ab34167bd6fc0141383ddb8813a Author: Corey Ashford Date: Fri Nov 19 17:37:24 2010 -0800 perf stat: Change and clean up sys_perf_event_open error handling This patch makes several changes to "perf stat": - "perf stat" will no longer go ahead and run the application when one or more of the specified events could not be opened. - Use error() and die() instead of pr_err() so that the output is more consistent with "perf top" and "perf record". - Handle permission errors in a more robust way, and in a similar way to "perf record" and "perf top". In addition, the sys_perf_event_open() error handling of "perf top" and "perf record" is made more consistent and adds the following phrase when an event doesn't open (with something ther than an access or permission error): "/bin/dmesg may provide additional information." This is added because kernel code doesn't have a good way of expressing detailed errors to user space, so its only avenue is to use printk's. However, many users may not think of looking at dmesg to find out why an event is being rejected. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Ian Munsie Cc: Michael Ellerman LKML-Reference: <1290217044-26293-1-git-send-email-cjashfor@linux.vnet.ibm.com> Signed-off-by: Corey Ashford Signed-off-by: Arnaldo Carvalho de Melo commit 9cdca869724e766eb48c061967cb777ddb436c76 Author: Thomas Gleixner Date: Sat Nov 20 10:37:05 2010 +0100 x86: platform: Move iris to x86/platform where it belongs Signed-off-by: Thomas Gleixner commit 09c5088e5c5993be217a2c85dca088147ffc9b72 Author: Shreyas Bhatewara Date: Fri Nov 19 10:55:24 2010 +0000 net-next: Add multiqueue support to vmxnet3 driver Add multiqueue support to vmxnet3 driver This change adds multiqueue and thus receive side scaling support to vmxnet3 device driver. Number of rx queues is limited to 1 in cases where MSI is not configured or one MSIx vector is not available per rx queue Signed-off-by: Shreyas Bhatewara Reviewed-by: Bhavesh Davda Signed-off-by: David S. Miller commit 24912420e923d56461b400d83f250a31bed8a964 Merge: 0670b8a 0302b86 Author: David S. Miller Date: Fri Nov 19 13:13:47 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c commit 124bf94a9f9b52341562628cd56b252e7d820ee8 Author: Uwe Kleine-König Date: Fri Nov 19 21:03:33 2010 +0100 ARM: imx: fix name for functions adding sdhci-esdhc-imx devices and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König commit c496fa6bd5324ddce11e5e42670618ffb4d8f58d Author: Uwe Kleine-König Date: Tue Nov 16 23:24:21 2010 +0100 ARM: mx3/mx35_3ds: Add watchdog support This bases on a patch by Fabio Estevam who added the device before it was allocated dynamically. Cc: Fabio Estevam Signed-off-by: Uwe Kleine-König commit d690b4c4778096cde018709efd005dfef9714297 Author: Uwe Kleine-König Date: Tue Nov 16 21:27:33 2010 +0100 ARM: mx3: dynamically allocate imx-keypad devices Signed-off-by: Uwe Kleine-König commit 742269e2d971957c84f364c4e9f5c6439964ef01 Author: Uwe Kleine-König Date: Mon Nov 15 15:28:45 2010 +0100 ARM: mx3: dynamically allocate imx2-wdt devices Signed-off-by: Uwe Kleine-König commit 2d58de2805f93bdb8fa0608d98e1871bb28ec091 Author: Uwe Kleine-König Date: Mon Nov 15 11:57:49 2010 +0100 ARM: mx3: dynamically allocate mxc-ehci devices Signed-off-by: Uwe Kleine-König commit 9e1dde33876ba83ad586c336647fff133d0f5472 Author: Uwe Kleine-König Date: Fri Nov 12 16:40:06 2010 +0100 ARM: mx3: dynamically allocate fsl-usb2-udc devices While adapting the #defines for this I noticed that the offset used for USB HS on i.MX35 differs from the documented offset. I kept the working offset and commented that the documentation differs. Signed-off-by: Uwe Kleine-König commit fed3d35b06bf3f6a3383c2637d054823c563200b Author: Uwe Kleine-König Date: Fri Nov 12 11:49:34 2010 +0100 ARM: mx3: dynamically allocate mxc_rnga devices Signed-off-by: Uwe Kleine-König commit 6a697e3d310d79ea0e385975c57084ce22b04b36 Author: Uwe Kleine-König Date: Fri Nov 12 11:10:55 2010 +0100 ARM: mx3: dynamically register mxc-mmc devices Compared to the static devices the dynamic have a DMA resource. This should be save as it seems unused in the driver. Signed-off-by: Uwe Kleine-König commit a528bc87841d958bbd394abc9266aee9cdf45cb8 Author: Uwe Kleine-König Date: Fri Nov 12 10:11:42 2010 +0100 ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 Additionally convert some known to be good usages to the new names. Signed-off-by: Uwe Kleine-König commit 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9 Author: Uwe Kleine-König Date: Fri Nov 12 08:27:14 2010 +0100 ARM: mx3: use an MX35 constant in imx35 only code ... instead of MX3x Signed-off-by: Uwe Kleine-König commit d7e0951f929513ced7c57882d2f95d49a546e002 Author: Uwe Kleine-König Date: Thu Nov 11 18:50:50 2010 +0100 ARM: mx3: move registration of gpios to plat-mxc/gpio.c Signed-off-by: Uwe Kleine-König commit 972cc48207450ce6aeed416ac176fe4d0482a4a3 Author: Uwe Kleine-König Date: Thu Nov 11 18:35:01 2010 +0100 ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC Some usages of ARCH_MX25 are assuming that if it is defined the other SoCs are undefined. Use SOC_IMX25 for the save places. Signed-off-by: Uwe Kleine-König commit 36a8cac9524bc67df2911cb3fbc349f87bcad37d Author: Uwe Kleine-König Date: Thu Nov 11 18:17:15 2010 +0100 ARM: imx: let the machines select SOC_IMX{21,27} This prepares multi-SoC kernel support. Signed-off-by: Uwe Kleine-König commit fd2fa2e3238197ef10101277dff67da10e68a61b Author: Uwe Kleine-König Date: Thu Nov 11 18:11:29 2010 +0100 ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMX This way FB_IMX can just depend on HAVE_FB_IMX and machines just need to select IMX_HAVE_PLATFORM_IMX_FB without bothering about HAVE_FB_IMX. Signed-off-by: Uwe Kleine-König commit e48ab1c16ff2af83e6a2a1228504710a5d339d08 Author: Uwe Kleine-König Date: Thu Nov 11 18:06:17 2010 +0100 ARM: imx: move mx25 support to mach-imx Signed-off-by: Uwe Kleine-König commit 2a8bd56a382ec0e24249b1adaca4f38bd529e825 Author: Uwe Kleine-König Date: Thu Nov 11 17:30:25 2010 +0100 ARM: mx25: remove now empty devices.h Signed-off-by: Uwe Kleine-König commit bb4c853ff18fe3b0e2aec45053c318479e0c55e3 Author: Uwe Kleine-König Date: Thu Nov 11 17:11:34 2010 +0100 ARM: mx25: dynamically allocate mx2-camera devices Signed-off-by: Uwe Kleine-König commit 00871505dcf15418aebc402db9f124dd2738fa2d Author: Uwe Kleine-König Date: Thu Nov 11 16:58:50 2010 +0100 ARM: mx25: dynamically allocate imx2-wdt devices Signed-off-by: Uwe Kleine-König commit bc95df78c4566327086d44f1bfab984a70dc4d6b Author: Rajeev Kumar Date: Fri Nov 19 12:41:19 2010 -0800 Input: add support for keyboards on ST SPEAr platform Signed-off-by: Rajeev Kumar Signed-off-by: Dmitry Torokhov commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 Author: andrew hendry Date: Thu Nov 18 13:21:35 2010 +0000 X25: remove bkl in routing ioctls Routing doesn't use the socket data and is protected by x25_route_list_lock Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 54aafbd4989a684ca876e49bf3e6eb931654dc02 Author: andrew hendry Date: Thu Nov 18 13:21:28 2010 +0000 X25: remove bkl in inq and outq ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc Author: andrew hendry Date: Thu Nov 18 13:21:20 2010 +0000 X25: remove bkl in timestamp ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 70be998c2b44f942f11383496622500136816acb Author: andrew hendry Date: Thu Nov 18 13:20:57 2010 +0000 X25: pushdown bkl in ioctls Push down the bkl in the ioctls so they can be removed one at a time. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 4aafd3f71a257a3522932944b5204262dfdff147 Author: Arnaldo Carvalho de Melo Date: Fri Nov 19 16:46:26 2010 -0200 perf tools: Change my maintainer address Also remove old snail mail address from CREDITS, moved years ago. LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a71123977eb3c72dd5a8bac723b13faf9cdd2828 Author: Robert Morell Date: Tue Nov 16 14:16:33 2010 -0800 perf tools: Remove hardcoded include paths for elfutils This change removes the use of hardcoded absolute "/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes). Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory. Tested by building perf: - Cross-compiled for ARM on x86_64 - Built natively on x86_64 - Built on x86_64 with /usr/include/elfutils moved to another location and manually included in CFLAGS Acked-by: Masami Hiramatsu Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Masami Hiramatsu LKML-Reference: <1289945793-31441-1-git-send-email-rmorell@nvidia.com> Signed-off-by: Robert Morell Signed-off-by: Arnaldo Carvalho de Melo commit f5b4a9c3ab53d544a540a6f3a5d17184e374d91a Author: Stephane Eranian Date: Tue Nov 16 11:05:01 2010 +0200 perf stat: Add no-aggregation mode to -a This patch adds a new -A option to perf stat. If specified then perf stat does not aggregate counts across all monitored CPUs in system-wide mode, i.e., when using -a. This option is not supported in per-thread mode. Being able to get a per-cpu breakdown is useful to detect imbalances between CPUs when running a uniform workload than spans all monitored CPUs. The second version corrects the missing cpumap[] support, so that it works when the -C option is used. The third version fixes a missing cpumap[] in print_counter() and removes a stray patch in builtin-trace.c. Examples on a 4-way system: # perf stat -a -e cycles,instructions -- sleep 1 Performance counter stats for 'sleep 1': 9592808135 cycles 3490380006 instructions # 0.364 IPC 1.001584632 seconds time elapsed # perf stat -a -A -e cycles,instructions -- sleep 1 Performance counter stats for 'sleep 1': CPU0 2398163767 cycles CPU1 2398180817 cycles CPU2 2398217115 cycles CPU3 2398247483 cycles CPU0 872282046 instructions # 0.364 IPC CPU1 873481776 instructions # 0.364 IPC CPU2 872638127 instructions # 0.364 IPC CPU3 872437789 instructions # 0.364 IPC 1.001556052 seconds time elapsed Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter LKML-Reference: <4ce257b5.1e07e30a.7b6b.3aa9@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit c26aed40f4fd18f86bcc6aba557cab700b129b73 Author: Eric Dumazet Date: Thu Nov 18 22:04:46 2010 +0000 filter: use reciprocal divide At compile time, we can replace the DIV_K instruction (divide by a constant value) by a reciprocal divide. At exec time, the expensive divide is replaced by a multiply, a less expensive operation on most processors. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 8c1592d68bc89248bfd0ee287648f41c1370d826 Author: Eric Dumazet Date: Thu Nov 18 21:56:38 2010 +0000 filter: cleanup codes[] init Starting the translated instruction to 1 instead of 0 allows us to remove one descrement at check time and makes codes[] array init cleaner. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 4916a1083290edfb6cc53aa134f00597447de1ce Author: Pavankumar Kondeti Date: Tue Nov 9 15:41:29 2010 +0530 msm: io: Export __msm_ioremap This is required for modules to use ioremap() Signed-off-by: Pavankumar Kondeti Signed-off-by: Daniel Walker commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686 Author: Eric Dumazet Date: Fri Nov 19 09:49:59 2010 -0800 filter: optimize sk_run_filter Remove pc variable to avoid arithmetic to compute fentry at each filter instruction. Jumps directly manipulate fentry pointer. As the last instruction of filter[] is guaranteed to be a RETURN, and all jumps are before the last instruction, we dont need to check filter bounds (number of instructions in filter array) at each iteration, so we remove it from sk_run_filter() params. On x86_32 remove f_k var introduced in commit 57fe93b374a6b871 (filter: make sure filters dont read uninitialized memory) Note : We could use a CONFIG_ARCH_HAS_{FEW|MANY}_REGISTERS in order to avoid too many ifdefs in this code. This helps compiler to use cpu registers to hold fentry and A accumulator. On x86_32, this saves 401 bytes, and more important, sk_run_filter() runs much faster because less register pressure (One less conditional branch per BPF instruction) # size net/core/filter.o net/core/filter_pre.o text data bss dec hex filename 2948 0 0 2948 b84 net/core/filter.o 3349 0 0 3349 d15 net/core/filter_pre.o on x86_64 : # size net/core/filter.o net/core/filter_pre.o text data bss dec hex filename 5173 0 0 5173 1435 net/core/filter.o 5224 0 0 5224 1468 net/core/filter_pre.o Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 0e341af835fdf553820a1fa98341b93ab32ce466 Author: Rabin Vincent Date: Sat Nov 6 23:03:53 2010 +0530 ARM: ftrace: enable function graph tracer Add the options to enable the function graph tracer on ARM. Function graph tracer support requires frame pointers, so exclude Thumb-2 and also make sure FRAME_POINTER gets enabled when FUNCTION_GRAPH_TRACER is used, since FUNCTION_TRACER doesn't "select FRAME_POINTER" when ARM_UNWIND is used. Therefore, with GCC 4.4.0+, you get plain function tracing without frame pointers, but you'll need them if you want function graph tracing. Acked-by: Catalin Marinas Signed-off-by: Rabin Vincent commit dd686eb13959e49a1112fd608c124ab711050582 Author: Rabin Vincent Date: Sat Nov 6 23:03:21 2010 +0530 ARM: ftrace: graph tracer + dynamic ftrace Support the graph tracer + dynamic ftrace combination on ARM. Signed-off-by: Rabin Vincent commit 376cfa8730c08c0394d0aa1d4a80fd8c9971f323 Author: Tim Bird Date: Sat Oct 9 22:24:38 2010 +0530 ARM: ftrace: function graph tracer support Cc: Tim Bird [rabin@rab.in: rebase on top of latest code, keep code in ftrace.c instead of separate file, check for ftrace_graph_entry also] Signed-off-by: Rabin Vincent commit d3b9dc9dd2b994f396741f7086ffe7a48bacb165 Author: Rabin Vincent Date: Thu Oct 7 17:39:47 2010 +0530 ARM: ftrace: use gas macros to avoid code duplication Use assembler macros to avoid copy/pasting code between the implementations of the two variants of the mcount call. Signed-off-by: Rabin Vincent commit 61b5cb1c3bff8875d2fd289c7b6ac344f95261fa Author: Rabin Vincent Date: Thu Oct 7 20:51:58 2010 +0530 ARM: place C irq handlers in IRQ_ENTRY for ftrace When FUNCTION_GRAPH_TRACER is enabled, place do_IRQ() and friends in the IRQ_ENTRY section so that the irq-related features of the function graph tracer work. Signed-off-by: Rabin Vincent commit ec763f0de879fa1a64b7641098271107f5e32c67 Author: Rabin Vincent Date: Fri Nov 19 21:11:02 2010 +0530 ARM: versatile: ensure sched_clock() is notrace Include sched.h to ensure sched_clock() has the notrace annotation. Signed-off-by: Rabin Vincent commit 042957801626465492b9428860de39a3cb2a8219 Author: Steven Rostedt Date: Fri Nov 12 22:32:11 2010 -0500 tracing/events: Show real number in array fields Currently we have in something like the sched_switch event: field:char prev_comm[TASK_COMM_LEN]; offset:12; size:16; signed:1; When a userspace tool such as perf tries to parse this, the TASK_COMM_LEN is meaningless. This is done because the TRACE_EVENT() macro simply uses a #len to show the string of the length. When the length is an enum, we get a string that means nothing for tools. By adding a static buffer and a mutex to protect it, we can store the string into that buffer with snprintf and show the actual number. Now we get: field:char prev_comm[16]; offset:12; size:16; signed:1; Something much more useful. Signed-off-by: Steven Rostedt commit fe040be2fdc49a4132c5f64359c629aeeb8e4947 Merge: 2006920 6722a40 Author: Paul Mundt Date: Fri Nov 19 17:04:25 2010 +0900 Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 6722a4016d7f5f107a82ad71a3ee1ccec105532f Author: Magnus Damm Date: Wed Nov 17 06:44:54 2010 +0000 fbdev: sh_mipi_dsi: Allow LCDC board callbacks Update the MIPI-DSI driver to make use of the LCD panel callbacks in the LCDC platform data. Without this patch MIPI panels cannot use board specific LCDC callbacks to control power and/or back light. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit deaba190188f1caa2317de4df6c9aaba501f9809 Author: Magnus Damm Date: Wed Nov 17 09:53:25 2010 +0000 fbdev: sh_mipi_dsi: Require two I/O resources V2 This is V2 of the MIPI-DSI two resources patch. The second I/O resource specifies the base address for the link hardware block. The base address for the link hardware block seems to vary with SoC type. Using two I/O resources to describe the MIPI-DSI hardware allows us to support both newer and older SoCs. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5958d58a0e7699c791b9f4c99d76559a14770138 Author: Magnus Damm Date: Wed Nov 17 06:44:35 2010 +0000 ARM: mach-shmobile: Extend AP4EVB MIPI-DSI resources Update the AP4EVB board code to go from a single I/O resource to two I/O resources for the MIPI-DSI driver. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 71b146c815ed6034bc20a0ec265445bdf4bad78c Author: Magnus Damm Date: Wed Nov 17 06:44:25 2010 +0000 fbdev: sh_mipi_dsi: Make use of register names Keep MIPI-DSI registers in one place instead of using magic values together with comments. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2006920a18cc9f499e5cccf9e6f1aa9f6120705e Author: Arnd Hannemann Date: Thu Nov 18 09:45:42 2010 +0000 fbdev: modedb: fix CEA modes Some of the modes were missing the correct sync polarities. This was causing a corrupt or left shifted picture on my TV. Additionally format #35 had a wrong refresh rate and pixel clock. This patch fixes those issues. Signed-off-by: Arnd Hannemann Acked-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 3256c789882281b2eac5978c7d38f6f0bbd16ed6 Author: Takashi YOSHII Date: Fri Nov 19 16:49:38 2010 +0900 ARM: mach-shmobile: ag5evm: use gpio. Ag5evm board now uses gpio api to initialize pins and peripherals. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 1cdf370244d5f0a4cf5ed672967cc2e16235908d Author: Takashi YOSHII Date: Fri Nov 19 16:47:16 2010 +0900 ARM: mach-shmobile: Add sh73a0 pinmux support PFC definitions for sh73a0 to support GPIO and pinmux handling. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 45677454dd6d128608117abe7dcd2bdfdd7cdf72 Author: Wu Zhangjin Date: Thu Oct 28 00:24:34 2010 +0800 ftrace: Speed up recordmcount cmd_record_mcount is used to locate the _mcount symbols in the object files, only the files compiled with -pg has the _mcount symbol, so, it is only needed for such files, but the current cmd_record_mcount is used for all of the object files, so, we need to fix it and speed it up. Since -pg may be removed by the method used in kernel/trace/Makefile: ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) Or may be removed by the method used in arch/x86/kernel/Makefile: CFLAGS_REMOVE_file.o = -pg So, we must check the last variable stores the compiling flags, that is c_flags(Please refer to cmd_cc_o_c and rule_cc_o_c defined in scripts/Makefile.build) and since the CFLAGS_REMOVE_file.o is already filtered in _c_flags(Please refer to scripts/Makefile.lib) and _c_flags has less symbols, therefore, we only need to check _c_flags. --------------- Changes from v1: o Don't touch Makefile for CONFIG_FTRACE_MCOUNT_RECORD is enough o Use _c_flags intead of KBUILD_CFLAGS to cover CONFIG_REMOVE_file.o = -pg (feedback from Steven Rostedt ) Acked-by: Michal Marek Signed-off-by: Wu Zhangjin LKML-Reference: <3dc8cddf022eb7024f9f2cf857529a15bee8999a.1288196498.git.wuzhangjin@gmail.com> [ changed if [ .. == .. ] to if [ .. = .. ] to handle dash environments ] Signed-off-by: Steven Rostedt commit 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd Author: Vasiliy Kulikov Date: Thu Nov 18 21:16:45 2010 +0300 x86, mrst: Check platform_device_register() return code platform_device_register() may fail, if so propagate the return code from mrst_device_create(). Signed-off-by: Vasiliy Kulikov LKML-Reference: <1290104207-31279-1-git-send-email-segoon@openwall.com> Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit 0a80410dc53cf68e56456bef1ca66949b87412f9 Author: Tomoya Date: Wed Nov 17 14:06:25 2010 +0000 can: EG20T PCH: use BIT(X) Replace bit assignment value to BIT(X). For easy to readable/identifiable, replace all bit assigned macros to BIT(X) Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 086b5650dcdaae7c4aa60a5d0724f775e733610e Author: Tomoya Date: Wed Nov 17 01:13:16 2010 +0000 can: EG20T PCH: add prefix to macro For easy to readable/identifiable, add prefix "PCH_" to all of #define macros. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 30dfe2c05037fbc021121c037872c09956938c2f Author: David S. Miller Date: Thu Nov 18 11:49:25 2010 -0800 atm: fore200e: Fix build warning. GCC (rightfully) complains that: drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined This is due to the FORE200E_NEXT_ENTRY macro, which essentially evaluates to: i = ++i % m Make it what's explicitly intended here which is: i = (i + 1) % m and the warning goes away. Signed-off-by: David S. Miller commit a76a574ca9ce7c05791cee42f000f2a42c687837 Author: Rafał Miłecki Date: Wed Nov 17 19:52:13 2010 +0100 ssb: drop BCM4328 hack for SPROM revision This hacks leads to incorrect SPROM parsing for me and reading for example MAC as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not needed anymore. Signed-off-by: Rafał Miłecki Tested-by: Michael Gerdau Signed-off-by: John W. Linville commit aaa13ca2428789b3c8096b5edc175d4d78b5f504 Author: Felix Fietkau Date: Wed Nov 17 04:19:47 2010 +0100 ath9k_hw: support reading calibration data from flash on AR9003 Embedded boards do not have compressed EEPROM data, they use the struct ar9003_eeprom layout, with little endian fields, so copying the raw data to the eeprom buffer is enough. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a05b5d45049d60a06a1b12976150572304a51928 Author: Felix Fietkau Date: Wed Nov 17 04:25:33 2010 +0100 ath9k: add support for reading eeprom from platform data on PCI devices Some embedded boards store platform data for connected PCIe AR92xx chips in the system flash instead of a separate EEPROM chip. Signed-off-by: Gabor Juhos Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 458fafdd579dcb58c8288c55c9cd92d6816ba094 Author: John W. Linville Date: Tue Nov 16 16:49:08 2010 -0500 rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss CC [M] drivers/net/wireless/rndis_wlan.o drivers/net/wireless/rndis_wlan.c: In function ‘rndis_wlan_craft_connected_bss’: drivers/net/wireless/rndis_wlan.c:2542:2: warning: ‘ret’ may be used uninitialized in this function Signed-off-by: John W. Linville Acked-by: Jussi Kivilinna commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0 Author: John W. Linville Date: Tue Nov 16 16:08:56 2010 -0500 iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids CC [M] drivers/net/wireless/iwmc3200wifi/commands.o drivers/net/wireless/iwmc3200wifi/commands.c: In function ‘iwm_scan_ssids’: drivers/net/wireless/iwmc3200wifi/commands.c:911:15: warning: operation on ‘iwm->scan_id’ may be undefined Signed-off-by: John W. Linville commit 86107fd170bc379869250eb7e1bd393a3a70e8ae Author: Bruno Randolf Date: Tue Nov 16 10:58:48 2010 +0900 nl80211/mac80211: Report signal average Extend nl80211 to report an exponential weighted moving average (EWMA) of the signal value. Since the signal value usually fluctuates between different packets, an average can be more useful than the value of the last packet. This uses the recently added generic EWMA library function. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit eef39befaae2a1559efe197d795c376a317af2af Author: Bruno Randolf Date: Tue Nov 16 10:58:43 2010 +0900 ath5k: Use generic EWMA library Remove ath5k's private moving average implementation in favour of the generic library version. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c5485a7e7569ab32eea240c850198519e2a765ef Author: Bruno Randolf Date: Tue Nov 16 10:58:37 2010 +0900 lib: Add generic exponentially weighted moving average (EWMA) function This adds generic functions for calculating Exponentially Weighted Moving Averages (EWMA). This implementation makes use of a structure which keeps the EWMA parameters and a scaled up internal representation to reduce rounding errors. The original idea for this implementation came from the rt2x00 driver (rt2x00link.c). I would like to use it in several places in the mac80211 and ath5k code and I hope it can be useful in many other places in the kernel code. Signed-off-by: Bruno Randolf Reviewed-by: KOSAKI Motohiro Signed-off-by: John W. Linville commit ae51ce9061b1ddc0fde363913c932bee5b9bc5fd Merge: 072b198 423478c Author: Ingo Molnar Date: Thu Nov 18 20:07:12 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a Author: Eric Dumazet Date: Tue Nov 16 20:36:42 2010 +0000 igmp: refine skb allocations IGMP allocates MTU sized skbs. This may fail for large MTU (order-2 allocations), so add a fallback to try lower sizes. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4c3710afbc333c33100739dec10662b4ee64e219 Author: Changli Gao Date: Tue Nov 16 20:28:24 2010 +0000 net: move definitions of BPF_S_* to net/core/filter.c BPF_S_* are used internally, should not be exposed to the others. Signed-off-by: Changli Gao Acked-by: Eric Dumazet Acked-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit cba328fc5ede9091616e7296483840869b615a46 Author: Tetsuo Handa Date: Tue Nov 16 15:19:51 2010 +0000 filter: Optimize instruction revalidation code. Since repeating u16 value to u8 value conversion using switch() clause's case statement is wasteful, this patch introduces u16 to u8 mapping table and removes most of case statements. As a result, the size of net/core/filter.o is reduced by about 29% on x86. Signed-off-by: Tetsuo Handa Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41 Author: John Fastabend Date: Tue Nov 16 19:12:28 2010 +0000 net: add priority field to pktgen Add option to set skb priority to pktgen. Useful for testing QOS features. Also by running pktgen on the vlan device the qdisc on the real device can be tested. Signed-off-by: John Fastabend Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc Author: Gerrit Renker Date: Thu Nov 18 09:37:07 2010 -0800 dccp ccid-2: whitespace fix-up This fixes whitespace noise introduced in commit "dccp ccid-2: Algorithm to update buffer state", 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a, 14 Nov 2010. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd Author: Eric Dumazet Date: Thu Nov 18 09:33:19 2010 -0800 bonding: IGMP handling cleanup Instead of iterating in_dev->mc_list from bonding driver, its better to call a helper function provided by igmp.c Details of implementation (locking) are private to igmp code. ip_mc_rejoin_group(struct ip_mc_list *im) becomes ip_mc_rejoin_groups(struct in_device *in_dev); Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit edd2126aa8aab8a87db7cc480d5047e9280d7acf Author: Jiri Kosina Date: Thu Nov 18 16:28:43 2010 +0100 HID: wacom: make sysfs permissions more strict It's not really dangerous in this driver, but it's against general practice and worth fixing. Wacom uses the attribute for changing the reporting speed of the tablet (and this actually requires poking the device in the background) (still I wouldn't consider it a security issue though). udev is a proper place to handle this. Reported-by: Linus Torvalds Signed-off-by: Jiri Kosina commit c311598b29f09c5092747a2603700f96a7daec2a Author: Jiri Kosina Date: Thu Nov 18 16:27:07 2010 +0100 HID: prodikeys: make sysfs permissions more strict It's not really dangerous in this driver, but it's against general practice and worth fixing. Proper place for handling this correctly is udev. Reported-by: Linus Torvalds Signed-off-by: Jiri Kosina commit f658bcfb2607bf0808966a69cf74135ce98e5c2d Author: Hans Rosenfeld Date: Fri Oct 29 17:14:32 2010 +0200 x86, cacheinfo: Cleanup L3 cache index disable support Adaptions to the changes of the AMD northbridge caching code: instead of a bool in each l3 struct, use a flag in amd_northbridges.flags to indicate L3 cache index disable support; use a pointer to the whole northbridge instead of the misc device in the l3 struct; simplify the initialisation; dynamically generate sysfs attribute array. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit 9653a5c76c8677b05b45b3b999d3b39988d2a064 Author: Hans Rosenfeld Date: Fri Oct 29 17:14:31 2010 +0200 x86, amd-nb: Cleanup AMD northbridge caching code Support more than just the "Misc Control" part of the northbridges. Support more flags by turning "gart_supported" into a single bit flag that is stored in a flags member. Clean up related code by using a set of functions (amd_nb_num(), amd_nb_has_feature() and node_to_amd_nb()) instead of accessing the NB data structures directly. Reorder the initialization code and put the GART flush words caching in a separate function. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89 Author: Hans Rosenfeld Date: Fri Oct 29 17:14:30 2010 +0200 x86, amd-nb: Complete the rename of AMD NB and related code Not only the naming of the files was confusing, it was even more so for the function and variable names. Renamed the K8 NB and NUMA stuff that is also used on other AMD platforms. This also renames the CONFIG_K8_NUMA option to CONFIG_AMD_NUMA and the related file k8topology_64.c to amdtopology_64.c. No functional changes intended. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit 423478cde453eebdfcfebf4b8d378d8f5d49b853 Author: Frederic Weisbecker Date: Thu Nov 18 02:21:26 2010 +0100 tracing: Remove useless syscall ftrace_event_call declaration It is defined right after, which makes the declaration completely useless. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 53cf810b1934f08a68e131aeeb16267a778f43df Author: Frederic Weisbecker Date: Thu Nov 18 02:11:42 2010 +0100 tracing: Allow syscall trace events for non privileged users As for the raw syscalls events, individual syscall events won't leak system wide information on task bound tracing. Allow non privileged users to use them in such workflow. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit fe5542030dce3b951f9eaf3ecb9a7bc5fa7bfed1 Author: Frederic Weisbecker Date: Thu Nov 18 01:52:06 2010 +0100 tracing: Allow raw syscall trace events for non privileged users This allows non privileged users to use the raw syscall trace events for task bound tracing in perf. It is safe because raw syscall trace events don't leak system wide informations. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 1ed0c5971159974185653170543a764cc061c857 Author: Frederic Weisbecker Date: Thu Nov 18 01:46:57 2010 +0100 tracing: New macro to set up initial event flags value This introduces the new TRACE_EVENT_FLAGS() macro in order to set up initial event flags value. This macro must simply follow the definition of a trace event and take the event name and the flag value as parameters: TRACE_EVENT(my_event, ..... .... ); TRACE_EVENT_FLAGS(my_event, 1) This will set up 1 as the initial my_event->flags value. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 61c32659b12c44e62de32fbf99f7e4ca783dc38b Author: Frederic Weisbecker Date: Thu Nov 18 01:39:17 2010 +0100 tracing: New flag to allow non privileged users to use a trace event This adds a new trace event internal flag that allows them to be used in perf by non privileged users in case of task bound tracing. This is desired for syscalls tracepoint because they don't leak global system informations, like some other tracepoints. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 9c0729dc8062bed96189bd14ac6d4920f3958743 Author: Soeren Sandmann Pedersen Date: Fri Nov 5 05:59:39 2010 -0400 x86: Eliminate bp argument from the stack tracing routines The various stack tracing routines take a 'bp' argument in which the caller is supposed to provide the base pointer to use, or 0 if doesn't have one. Since bp is garbage whenever CONFIG_FRAME_POINTER is not defined, this means all callers in principle should either always pass 0, or be conditional on CONFIG_FRAME_POINTER. However, there are only really three use cases for stack tracing: (a) Trace the current task, including IRQ stack if any (b) Trace the current task, but skip IRQ stack (c) Trace some other task In all cases, if CONFIG_FRAME_POINTER is not defined, bp should just be 0. If it _is_ defined, then - in case (a) bp should be gotten directly from the CPU's register, so the caller should pass NULL for regs, - in case (b) the caller should should pass the IRQ registers to dump_trace(), - in case (c) bp should be gotten from the top of the task's stack, so the caller should pass NULL for regs. Hence, the bp argument is not necessary because the combination of task and regs is sufficient to determine an appropriate value for bp. This patch introduces a new inline function stack_frame(task, regs) that computes the desired bp. This function is then called from the two versions of dump_stack(). Signed-off-by: Soren Sandmann Acked-by: Steven Rostedt Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Arjan van de Ven , Cc: Frederic Weisbecker , Cc: Arnaldo Carvalho de Melo , LKML-Reference: > Signed-off-by: Frederic Weisbecker commit 23ce17adb7fc33a4353abe4b57a03f555cced57b Author: Sekhar Nori Date: Tue Oct 12 11:58:02 2010 +0530 spi: davinci: kconfig: add manufacturer name to prompt string Add manufacturer name to the Kconfig prompt string and move the controller name to the begining of the prompt. This helps locate the driver easily among the list of existing drivers. While at it, also add information about being able to build the driver as module. Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 212d4b69652171d4474bc9dfc08e829737264632 Author: Sekhar Nori Date: Mon Oct 11 10:41:39 2010 +0530 spi: davinci: shorten variable names Shorten names of local variables and structure members where possible. Local variables: * 'davinci_spi' is being renamed 'dspi' * 'davinci_spi_dma' is being renamed 'dma' Structure members: * 'dma_{tx|rx}_channel' is being renamed '{tx|rx}_channel' since the structure containing them is already called 'davinci_spi_dma' * 'davinci_spi_dma' in 'davinci_spi' structure is being renamed 'dma' Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 0e0eae4d1cdff5fa6608bcc6f6990774dec2527d Author: Sekhar Nori Date: Fri Oct 8 14:04:22 2010 +0530 spi: davinci: remove unnecessary private data member 'region_size' Remove unnecesary private data member 'region_size' being used to store the size of SPI memory region. Instead, get the memory resource size directly from the platform data. Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 43abb11ba540e21346c6e7ab3211b48928501ea6 Author: Brian Niebuhr Date: Wed Oct 6 18:34:47 2010 +0530 spi: davinci: add EF Johnson Technologies copyright Add copyright for EF Johnson Technologies since the driver has been majorly overhauled by Brian. Signed-off-by: Brian Niebuhr Signed-off-by: Sekhar Nori commit 035540f6ea2394bdd9675552d31e1125cd0e402e Author: Brian Niebuhr Date: Wed Oct 6 18:32:40 2010 +0530 spi: davinci: add additional comments Add comments describing the platform data members and per-chip-select SPI configuration structure. Also, add some comments describing the what happens during the driver probe. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit d8c174cdeb6511aa307e6058468b68a9cc3990e4 Author: Brian Niebuhr Date: Wed Oct 6 18:47:16 2010 +0530 spi: davinci: setup the driver owner Setup the owner member of the platform driver to THIS_MODULE instead of leaving it NULL. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3f27b57c1684efbe11fcc9449df898b1d0feb753 Author: Brian Niebuhr Date: Wed Oct 6 18:25:43 2010 +0530 spi: davinci: enable and power-up SPI only when required Enable SPI only when active transfers are in progress. Keep it in local low power when not in use. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3409e408ab0d7171ae81d198110a1f293852959f Author: Brian Niebuhr Date: Wed Oct 6 18:13:31 2010 +0530 spi: davinci: remove non-useful "clk_internal" platform data The "clk_internal" platform data member which contols the CLKMOD bit in Global Control Register 1 is not useful since CLKMOD needs be set to 1 *always* to ensure master mode operation. Remove this platform data. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 87467bd9052725283b9a9f4b1b310fed8744fb1e Author: Brian Niebuhr Date: Wed Oct 6 17:03:10 2010 +0530 spi: davinci: let DMA operation be specified on per-device basis Let DMA operation be specified on a per-device basis instead of selecting it once during probe. A side effect of this is the need to combine the PIO and DMA buffer txrx_bufs routine. This is good since they anyway share some common functionality. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 6dbd29b27bd2627ba0025a6cff14381e69512cdf Author: Brian Niebuhr Date: Tue Oct 5 15:43:08 2010 +0530 spi: davinci: remove usage of additional completion variables for DMA The DMA code does not use the existing completion variable 'done' which is being used for interrupt mode transfers. Instead it uses two different completion variables specific to DMA mode transfers. Eliminate the usage of new completion variables for DMA mode and use the existing completion variable. [nsekhar@ti.com: To make this process easy, eliminate the two different DMA completion callback functions for tx and rx and use a single callback function instead] Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 9b189fd7584a1d8c68334dd1bc47b363877b314e Author: Brian Niebuhr Date: Tue Oct 5 11:38:41 2010 +0530 spi: davinci: handle DMA completion errors correctly Do not simply clean the DMA channel on a DMA completion error. Instead, use wcount and rcount members of davinci_spi to detecion non-completion of DMA and signal EIO to the application. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 523c37e7006522e778a1fd0aea2746ceb788572f Author: Brian Niebuhr Date: Mon Oct 4 17:35:34 2010 +0530 spi: davinci: fix EDMA CC errors at end of transfers Use a dummy param slot linked to itself to take care of the extra "sync event" that gets sent to EDMA controller after the last byte has been transferred. The dummy PaRAM slot that is linked to the actual DMA PaRAM slot "absorbs" this event and prevents a EDMA CC error to be asserted. Without this provision, the EDMA CC error would be asserted because the channel PaRAM would be empty after the transfer and EDMA would not know what to make out of the extra sync event. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 903ca25b219e28e3513ca4c2ff379fcdf19e057e Author: Sekhar Nori Date: Fri Oct 1 14:51:40 2010 +0530 spi: davinci: do not allocate DMA channels during SPI device setup Do not allocate (and de-allocate) SPI DMA channels during setup (and cleanup) for each SPI device. Instead, allocate the DMA channels once duing probe and use them for the life time of the driver. This makes sense since there are dedicated DMA channels meant for SPI use. This also helps remove the unnecessary DMA "sync_dev" variables being used to store DMA channel information. Also, the "use_dma" platform variable is now eliminated since it is possible to check if the platform supports DMA or not based upon whether DMA resources can be found or not. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit a4f4497b86a689aa8c827d4ebe0d00c4eba66f76 Author: Brian Niebuhr Date: Fri Oct 1 14:00:48 2010 +0530 spi: davinci: fix DMA event generation stoppage Do not stop SPI DMA event generation in either transmit or receive DMA event call back because the single setting affects both transmit and receive event generation. Depending on the order in which the callbacks happen, transmit or receive events can get unintentionally stalled. Instead, disable event generation once after both the transmit and receive DMA completes. While at it, remove the largely under-used function to set or clear DMA event generation. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 49fc3f497d7d409e9b0dc384fe7c173bccd3b1a1 Author: Brian Niebuhr Date: Fri Oct 1 11:22:23 2010 +0530 spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot Currently a series of EDMA API calls are being made to setup various aspects of EDMA PaRAM slots for receive and transmit. Instead setup the PaRAM using a local structure and write once to the hardware using edma_write_slot() Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit e91c659bbcf2f47519260182a75f64ede34df3ca Author: Brian Niebuhr Date: Fri Oct 1 10:29:29 2010 +0530 spi: davinci: always start receive DMA In keeping with the full duplex nature of the SPI bus. Always start receive DMA along with transmit DMA. If there is no receive buffer provided with the transfer, use a temporary buffer to receive the data to be thrown away. [michael.williamson@criticallink.com: receive DMA size should be same as transfer length to avoid hang-up when transfer length is smaller than temporary rx buffer size (rx buffer not provided)] Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit d3f7141cbf4580b2f18f93940df29cf0c15e7ef5 Author: Brian Niebuhr Date: Wed Sep 29 12:31:54 2010 +0530 spi: davinci: do not use temporary buffer if no transmit data provided Remove usage of temporary buffer when no transmit data is provided. Instead, use the transmit register itself as the source of data. By choosing the transmit register itself as the source of data, this patch helps remove unnecessary accesses to memory when no real data is being transmitted. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit c29e3c60e75d1cc1262ac8af379738b6fd851f33 Author: Brian Niebuhr Date: Tue Sep 28 13:59:26 2010 +0530 spi: davinci: always start transmit DMA Due to the full duplex nature of the SPI bus, the SPI master on DaVinci needs transmit to be active even if the tranfer is only meant to collect receive data. The current code achieves this by using a temporary zeroed buffer to provide DMA data in case the transfer does not have a transmit buffer provided. However, the transmit DMA is started only if transmit buffer is provided rendering the temporary buffer unused. Instead the code relies on a write to SPIDAT1 register to trigger transmit operation. This however only sends two bytes of data. Fix this by starting transmit DMA always. This changes exposes a bug on DM355 where the CSHOLD bit in SPIDAT1 needs to be written to in between transfers. Handle that by introducing a "cshold_bug" platform data which is set to true for DM355. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 96fd881f22b44fc14772316a6b9231012393cda8 Author: Brian Niebuhr Date: Mon Sep 27 22:23:23 2010 +0530 spi: davinci: do not store DMA channel information per chip select Do not store DMA channel related information per chip-select since that information does not depend on the chip select. The same DMA channels can be used for transfers on all chip-selects since the transfer happens one-at-a-time. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b23a5d4691043e97bbfde8c2fb5b8fecdc400308 Author: Brian Niebuhr Date: Fri Sep 24 18:53:32 2010 +0530 spi: davinci: remove unnecessary call to davinci_spi_setup_transfer() Remove unnecessary call to davinci_spi_setup_transfer() at the end of davinci_spi_setup(). davinci_spi_setup_transfer() is registered as the setup_transfer callback for the bitbang layer and is called independently by the bitbang layer to setup the transfer before it begins. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit be88471b96cf3a0d7aea72d5ca9c6a95fb54bade Author: Brian Niebuhr Date: Fri Sep 3 12:15:28 2010 +0530 spi: davinci: remove unnecessary function davinci_spi_bufs_prep() The function davinci_spi_bufs_prep() is doing stuff that davinci_spi_setup() is doing. Eliminate it and move the work to davinci_spi_setup() Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit f34bd4cc68fb4548536cac56798d3fad41806724 Author: Brian Niebuhr Date: Fri Sep 3 11:56:35 2010 +0530 spi: davinci: configure the invariable bits in spipc0 only once Configure the data-in, data-out and clock functionality pins in SPIPC0 register only once during probe. No need to set these bits for each transfer. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit e0d205e9914476e96596c5339fa440fb314ef03b Author: Brian Niebuhr Date: Thu Sep 2 16:52:06 2010 +0530 spi: davinci: add support for interrupt mode Add support for SPI interrupt mode operation. Define a per chip-select "io type" variable which specifies if the transfers on this chip-select should happen in interrupt mode or polled mode. Introduce a new function davinci_spi_process_events() to help consolidate the code between interrupt mode processing and polled mode processing. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 839c996ca8dd56f9ea80d7fc0c8b18b01394c82a Author: Brian Niebuhr Date: Mon Aug 23 16:39:19 2010 +0530 spi: davinci: simplify poll mode transfers Use the fact that the get_tx and get_rx can now cope with NULL buffer pointers to simplify the poll mode transfer code. While at it, check for SPI errors every transfer rather than at the end of the whole transfer. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cf90fe73504764cbcc2552c7ea69b1866059db30 Author: Brian Niebuhr Date: Fri Aug 20 17:02:49 2010 +0530 spi: davinci: remove non-useful interrupt mode support The interrupt mode support as it stands is another version of poll mode. Even when interrupt mode is selected, the code tight loops on interrupt status register, rendering it totally useless. A completion variable is initialized, but never used. Remove this fake interrupt mode since users can anyway use poll mode with no functional difference. A usefully implemented interrupt mode support can be added later. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 47f44671c0dc92e2b77ff3dd843f742d12510477 Author: Brian Niebuhr Date: Mon Aug 23 16:34:13 2010 +0530 spi: davinci: remove unnecessary completion variable initialization The completion variable 'done' is unnecessarly initialized by the function davinci_spi_bufs_dma() where as it is not used for DMA transfers at all. Remove the unnecessary initialization. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 134e32b979f3f3987e84dcd5cc42040e21252e53 Author: Sekhar Nori Date: Fri Aug 20 16:27:08 2010 +0530 spi: davinci: do not treat Tx interrupt being set as error In davinci_spi_check_error(), Tx interrupt being set is treated as error. This function is only meant to flag bus error conditions and Tx interrupt being set at that point is not a bus error but rather a driver bug. Stop checking for Tx interrupt and flagging that as an IO error. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit f2bf4e849315c1573f996d082c53c6b686054da7 Author: Brian Niebuhr Date: Fri Aug 20 15:28:23 2010 +0530 spi: davinci: remove unnecessary 'count' variable in driver private data The variable count in DaVinci SPI driver's private data is largely unused and its minor use can easily be eliminated. Remove the variable. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit fab89ea330cabdaf29d82151de6d8f2369cc4da9 Author: Brian Niebuhr Date: Fri Aug 20 14:53:47 2010 +0530 spi: davinci: remove unnecessary disable of SPI In the davinci_spi_bufs_dma() function, SPI is briefly disabled before enabling it immediately back again. Remove this unnecessary disable. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 53d454a170e86594af1d27be820e678a582af751 Author: Brian Niebuhr Date: Thu Aug 19 17:04:25 2010 +0530 spi: davinci: check for NULL buffer pointer before using it In the davinci_spi_{tx|rx}_u{8|16}() functions, check for buffer pointer being valid before using it. While providing for better error checking, this change will help simplify code in the caller. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b7ab24a0da96c8fc6d551ea87e82692299df6ac6 Author: Brian Niebuhr Date: Thu Aug 19 16:42:42 2010 +0530 spi: davinci: simplify calculation of edma acount value The EDMA acount (called data_type in davinci_spi_bufs_dma()) is simply the bytes_per_word obtained in the transfer setup function. The current code calculates the acount value from bytes_per_word in a convoluted manner. Simplify the code. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 6321be60edac6037ea76e9beef375c6ae2961765 Author: Brian Niebuhr Date: Thu Aug 19 16:38:20 2010 +0530 spi: davinci: eliminate unnecessary update of davinci_spi->count The count member of davinci_spi is internal to the driver and is not shared with framework. Eliminate its unnecessary update. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cda987ebb86dfc757320bfa5c7b2afcd9d3ed30f Author: Brian Niebuhr Date: Thu Aug 19 16:16:28 2010 +0530 spi: davinci: eliminate the single member structure davinci_spi_slave The struct davinci_spi_slave has a single member. Eliminate it and store the per-chipselect data in struct davinci_spi directly. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b6c4eeac5bc6a6bf769d7f170c507a1b78fd120a Author: Brian Niebuhr Date: Thu Aug 19 15:41:41 2010 +0530 spi: davinci: remove unused members of davinci_spi_slave Several members of struct davinci_spi_slave are unused in code. Remove such members. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7abbf23c5903e14b0cff1cdeab906eab164be767 Author: Brian Niebuhr Date: Thu Aug 19 15:07:38 2010 +0530 spi: davinci: add support for wait enable timeouts Just enabling WAITENA in SPIFMTn register waits for the enable signal from the slave indefinitely. Allow support for finite waiting by adding support for c2e delay (maximum time for addressed slave to respond) and t2e delay (maximum time for slave to respond after transmit data finished). While at it, modify the T2C and C2T defines by prepending the register name as is the convention followed for other register field elsewhere in the driver. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit fd764463fe28ac53371565f851240e74775fb1aa Author: Brian Niebuhr Date: Thu Aug 19 12:44:31 2010 +0530 spi: davinci: setup chip-select timers values only if timer enabled Setup chip-select timers values only if timer is enabled (timer_disbled in spi configuration is false). As a nice side effect, this patch removes code duplicated in davinci_spi_bufs_pio() and davinci_spi_bufs_dma(). Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 25f33512f6ae7e37d7b3d353d57d4d6d066033ce Author: Brian Niebuhr Date: Thu Aug 19 12:15:22 2010 +0530 spi: davinci: consolidate setup of SPIFMTn in one function Consolidate the setup of SPIFMTn register under davinci_spi_setup_transfer() simplifying the code and avoiding unnecessary reads and writes to the register. The two inline functions {set|clear}_fmt_bits() can be eliminated because of this. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 53a31b07c5aea4001bbb36ddd5ef2addffc7ccbd Author: Brian Niebuhr Date: Mon Aug 16 15:05:51 2010 +0530 spi: davinci: make chip-slect specific parameters really chip-select specific Some chip-select specific paramterers like wdelay, parity, usage of chip-select timers (and the actual timer values) are included in platform data forcing the same behaviour across all chip-selects. Create a new davinci_spi_config data structure which can be passed along using controller_data member of spi_device data structure on a per-device basis. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 472880c73da124b6cb5cbc31a36754aa62935afe Author: Brian Niebuhr Date: Mon Aug 16 10:28:53 2010 +0530 spi: davinci: remove 'wait_enable' platform data member The SPI_READY bit of struct spi_device:mode serves the purpose of letting the SPI master know if the slave can signal if it is ready for transfer or not. The 'wait_enable' platform data was duplicating this functionality. Use the framework provided method of indicating this capability. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7fe0092b1f55f58a749d68ace3a3597e8a2a9163 Author: Brian Niebuhr Date: Fri Aug 13 13:27:23 2010 +0530 spi: davinci: simplify prescalar calculation Simplify pre-scalar calculation and move it into a seprate function. Refuse to correct invalid pre-scalar values silently as this might lead to unexpected bugs and lower performance. Instead an error will force users to dig into the root-cause of the issue. While at it, remove some device specific checks on the maximum SPI frequency. As the driver supports the SPI interface implemented on various devices, it should only take care of core SPI limitations and leave the device specific handling to platform code. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 23853973d9b76eb8b3cf46157689bc6187e141d9 Author: Brian Niebuhr Date: Fri Aug 13 10:57:44 2010 +0530 spi: davinci: enable GPIO lines to be used as chip selects Sometimes, the chip selects provided by SPI module are muxed with other functionality and cannot be used in some designs. In such cases, it becomes convenient to use an available GPIO line as chip select. This patch enables the DaVinci SPI driver to treat specific GPIO lines as chip selects based on information provided in platform data. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cfbc5d1d8fda9d337e912a03502cf77d29870a8e Author: Brian Niebuhr Date: Thu Aug 12 12:27:33 2010 +0530 spi: davinci: remove unnecessary data transmit on CS disable On TI DaVinci's SPI controller, the SPIDAT1 register which controls the chip slect status, also has data transmit register in the lower 16 bits. Writing to the whole 32-bits triggers an additional data transmit every time the chip select is disabled. While most SPI slaves cope-up with this, some cannot. This patch fixes this by doing a 16-bit write on the upper half of the SPIDAT1 register While at it, group the SPIGCR1 register related defines seperately from SPIDAT1 register defines. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7978b8c385a86f0b5b9304e81a1dfb5dcaf21528 Author: Brian Niebuhr Date: Fri Aug 13 10:11:03 2010 +0530 spi: davinci: enable both activation and deactivation of chip-selects Let davinci_spi_chipselect() perform both activation and deactivation of chip selects. This lets spi_bitbang fully control chip select activation, as intended by the SPI API. With this change, the chip select activation code need not be duplicated in davinci_spi_bufs_{pio|dma}(). Also, keeping chip select active control is removed as a platform data and simply controlled using information from spi_bitbang on whether chip slect should be activated or de-activated. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 843a713bc53d04f8fac46ddd8693a2cc0422ca5e Author: Brian Niebuhr Date: Thu Aug 12 12:49:05 2010 +0530 spi: davinci: set chip-select mode in SPIDEF only once Quit writing the same constant value determining the chip-select mode when no transmissions are in progress in davinci_spi_chipelect(). Instead just setup the SPIDEF register once during probe. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 50356dd7c1f6338588af6a745649a718f16fe453 Author: Sekhar Nori Date: Fri Oct 8 15:27:26 2010 +0530 spi: davinci: remove unnecessary typecast The typecasting of SPI base address to davinci_spi_reg is unused. Remove it. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 8e206f1cbd0d1387bf7d5e463ca880b43458e2ea Author: Sekhar Nori Date: Fri Aug 20 16:20:49 2010 +0530 spi: davinci: removed unused #defines Remove unused defines from code which should help in easy reading of code. Also, use the opportuinity to keep the SPIGCR1 register defines together. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit c3c475c2353f6d13a5c77c3b6203c0240339da7d Author: Brian Niebuhr Date: Fri Sep 3 16:19:09 2010 +0530 spi: davinci: remove unused variable 'pdata' The 'pdata' variable is unused in couple of routines. Remove such occurences. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 778e261ed678c3654386fc38bc6c50353ce04cc7 Author: Brian Niebuhr Date: Fri Sep 3 15:15:06 2010 +0530 spi: davinci: whitespace cleanup Cleanup unnecessary white space from various parts of the file. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3b740b10e9424f7ffb9baab1e6a3ff361cbf8ce3 Author: Brian Niebuhr Date: Fri Sep 3 14:50:07 2010 +0530 spi: davinci: fix checkpatch errors Fix the following checkpatch error: WARNING: unnecessary whitespace before a quoted newline + dev_info(&pdev->dev, "Controller at 0x%p \n", davinci_spi->base); Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 84e1c6bb38eb318e456558b610396d9f1afaabf0 Author: matthieu castet Date: Tue Nov 16 22:35:16 2010 +0100 x86: Add RO/NX protection for loadable kernel modules This patch is a logical extension of the protection provided by CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting module_core and module_init into three logical parts each and setting appropriate page access permissions for each individual section: 1. Code: RO+X 2. RO data: RO+NX 3. RW data: RW+NX In order to achieve proper protection, layout_sections() have been modified to align each of the three parts mentioned above onto page boundary. Next, the corresponding page access permissions are set right before successful exit from load_module(). Further, free_module() and sys_init_module have been modified to set module_core and module_init as RW+NX right before calling module_free(). By default, the original section layout and access flags are preserved. When compiled with CONFIG_DEBUG_SET_MODULE_RONX=y, the patch will page-align each group of sections to ensure that each page contains only one type of content and will enforce RO/NX for each group of pages. -v1: Initial proof-of-concept patch. -v2: The patch have been re-written to reduce the number of #ifdefs and to make it architecture-agnostic. Code formatting has also been corrected. -v3: Opportunistic RO/NX protection is now unconditional. Section page-alignment is enabled when CONFIG_DEBUG_RODATA=y. -v4: Removed most macros and improved coding style. -v5: Changed page-alignment and RO/NX section size calculation -v6: Fixed comments. Restricted RO/NX enforcement to x86 only -v7: Introduced CONFIG_DEBUG_SET_MODULE_RONX, added calls to set_all_modules_text_rw() and set_all_modules_text_ro() in ftrace -v8: updated for compatibility with linux 2.6.33-rc5 -v9: coding style fixes -v10: more coding style fixes -v11: minor adjustments for -tip -v12: minor adjustments for v2.6.35-rc2-tip -v13: minor adjustments for v2.6.37-rc1-tip Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Acked-by: Arjan van de Ven Reviewed-by: James Morris Signed-off-by: H. Peter Anvin Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F914.9070106@free.fr> [ minor cleanliness edits, -v14: build failure fix ] Signed-off-by: Ingo Molnar commit 9437178f623a19af5951808d880a8599f66ac150 Author: Paul Turner Date: Mon Nov 15 15:47:10 2010 -0800 sched: Update tg->shares after cpu.shares write Formerly sched_group_set_shares would force a rebalance by overflowing domain share sums. Now that per-cpu averages are maintained we can set the true value by issuing an update_cfs_shares() following a tg->shares update. Also initialize tg se->load to 0 for consistency since we'll now set correct weights on enqueue. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.465521344@google.com> Signed-off-by: Ingo Molnar commit d6b5591829bd348a5fbe1c428d28dea00621cdba Author: Paul Turner Date: Mon Nov 15 15:47:09 2010 -0800 sched: Allow update_cfs_load() to update global load Refactor the global load updates from update_shares_cpu() so that update_cfs_load() can update global load when it is more than ~10% out of sync. The new global_load parameter allows us to force an update, regardless of the error factor so that we can synchronize w/ update_shares(). Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.377473595@google.com> Signed-off-by: Ingo Molnar commit 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37 Author: Paul Turner Date: Mon Nov 15 15:47:08 2010 -0800 sched: Implement demand based update_cfs_load() When the system is busy, dilation of rq->next_balance makes lb->update_shares() insufficiently frequent for threads which don't sleep (no dequeue/enqueue updates). Adjust for this by making demand based updates based on the accumulation of execution time sufficient to wrap our averaging window. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.291159744@google.com> Signed-off-by: Ingo Molnar commit c66eaf619c0c7937e9ded160ae83b5a7a6b19b56 Author: Paul Turner Date: Mon Nov 15 15:47:07 2010 -0800 sched: Update shares on idle_balance Since shares updates are no longer expensive and effectively local, update them at idle_balance(). This allows us to more quickly redistribute shares to another cpu when our load becomes idle. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.204191702@google.com> Signed-off-by: Ingo Molnar commit a7a4f8a752ec734b2eab904fc863d5dc873de338 Author: Paul Turner Date: Mon Nov 15 15:47:06 2010 -0800 sched: Add sysctl_sched_shares_window Introduce a new sysctl for the shares window and disambiguate it from sched_time_avg. A 10ms window appears to be a good compromise between accuracy and performance. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.112173964@google.com> Signed-off-by: Ingo Molnar commit 67e86250f8ea7b8f7da53ac25ea73c6bd71f5cd9 Author: Paul Turner Date: Mon Nov 15 15:47:05 2010 -0800 sched: Introduce hierarchal order on shares update list Avoid duplicate shares update calls by ensuring children always appear before parents in rq->leaf_cfs_rq_list. This allows us to do a single in-order traversal for update_shares(). Since we always enqueue in bottom-up order this reduces to 2 cases: 1) Our parent is already in the list, e.g. root \ b /\ c d* (root->b->c already enqueued) Since d's parent is enqueued we push it to the head of the list, implicitly ahead of b. 2) Our parent does not appear in the list (or we have no parent) In this case we enqueue to the tail of the list, if our parent is subsequently enqueued (bottom-up) it will appear to our right by the same rule. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.022488865@google.com> Signed-off-by: Ingo Molnar commit e33078baa4d30ad1d0e46d1f62b9e5a63a3e6ee3 Author: Paul Turner Date: Mon Nov 15 15:47:04 2010 -0800 sched: Fix update_cfs_load() synchronization Using cfs_rq->nr_running is not sufficient to synchronize update_cfs_load with the put path since nr_running accounting occurs at deactivation. It's also not safe to make the removal decision based on load_avg as this fails with both high periods and low shares. Resolve this by clipping history after 4 periods without activity. Note: the above will always occur from update_shares() since in the last-task-sleep-case that task will still be cfs_rq->curr when update_cfs_load is called. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.933428187@google.com> Signed-off-by: Ingo Molnar commit f0d7442a5924a802b66eef79b3708f77297bfb35 Author: Paul Turner Date: Mon Nov 15 15:47:03 2010 -0800 sched: Fix load corruption from update_cfs_shares() As part of enqueue_entity both a new entity weight and its contribution to the queuing cfs_rq / rq are updated. Since update_cfs_shares will only update the queueing weights when the entity is on_rq (which in this case it is not yet), there's a dependency loop here: update_cfs_shares needs account_entity_enqueue to update cfs_rq->load.weight account_entity_enqueue needs the updated weight for the queuing cfs_rq load[*] Fix this and avoid spurious dequeue/enqueues by issuing update_cfs_shares as if we had accounted the enqueue already. This was also resulting in rq->load corruption previously. [*]: this dependency also exists when using the group cfs_rq w/ update_cfs_shares as the weight of the enqueued entity changes without the load being updated. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.844900206@google.com> Signed-off-by: Ingo Molnar commit 9e3081ca61147b29f52fddb4f7c6b6b82ea5eb7a Author: Peter Zijlstra Date: Mon Nov 15 15:47:02 2010 -0800 sched: Make tg_shares_up() walk on-demand Make tg_shares_up() use the active cgroup list, this means we cannot do a strict bottom-up walk of the hierarchy, but assuming its a very wide tree with a small number of active groups it should be a win. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.754159484@google.com> Signed-off-by: Ingo Molnar commit 3d4b47b4b040c9d77dd68104cfc1055d89a55afd Author: Peter Zijlstra Date: Mon Nov 15 15:47:01 2010 -0800 sched: Implement on-demand (active) cfs_rq list Make certain load-balance actions scale per number of active cgroups instead of the number of existing cgroups. This makes wakeup/sleep paths more expensive, but is a win for systems where the vast majority of existing cgroups are idle. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.666535048@google.com> Signed-off-by: Ingo Molnar commit 2069dd75c7d0f49355939e5586daf5a9ab216db7 Author: Peter Zijlstra Date: Mon Nov 15 15:47:00 2010 -0800 sched: Rewrite tg_shares_up) By tracking a per-cpu load-avg for each cfs_rq and folding it into a global task_group load on each tick we can rework tg_shares_up to be strictly per-cpu. This should improve cpu-cgroup performance for smp systems significantly. [ Paul: changed to use queueing cfs_rq + bug fixes ] Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.580480400@google.com> Signed-off-by: Ingo Molnar commit 48c5ccae88dcd989d9de507e8510313c6cbd352b Author: Peter Zijlstra Date: Sat Nov 13 19:32:29 2010 +0100 sched: Simplify cpu-hot-unplug task migration While discussing the need for sched_idle_next(), Oleg remarked that since try_to_wake_up() ensures sleeping tasks will end up running on a sane cpu, we can do away with migrate_live_tasks(). If we then extend the existing hack of migrating current from CPU_DYING to migrating the full rq worth of tasks from CPU_DYING, the need for the sched_idle_next() abomination disappears as well, since idle will be the only possible thread left after the migration thread stops. This greatly simplifies the hot-unplug task migration path, as can be seen from the resulting code reduction (and about half the new lines are comments). Suggested-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <1289851597.2109.547.camel@laptop> Signed-off-by: Ingo Molnar commit 92fd4d4d67b945c0766416284d4ab236b31542c4 Merge: fe7de49 e53beac Author: Ingo Molnar Date: Thu Nov 18 13:22:14 2010 +0100 Merge commit 'v2.6.37-rc2' into sched/core Merge reason: Move to a .37-rc base. Signed-off-by: Ingo Molnar commit 5bd5a452662bc37c54fb6828db1a3faf87e6511c Author: Matthieu Castet Date: Tue Nov 16 22:31:26 2010 +0100 x86: Add NX protection for kernel data This patch expands functionality of CONFIG_DEBUG_RODATA to set main (static) kernel data area as NX. The following steps are taken to achieve this: 1. Linker script is adjusted so .text always starts and ends on a page bound 2. Linker script is adjusted so .rodata always start and end on a page boundary 3. NX is set for all pages from _etext through _end in mark_rodata_ro. 4. free_init_pages() sets released memory NX in arch/x86/mm/init.c 5. bios rom is set to x when pcibios is used. The results of patch application may be observed in the diff of kernel page table dumps: pcibios: -- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400 ++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400 0x00000000-0xc0000000 3G pmd ---[ Kernel Mapping ]--- -0xc0000000-0xc0100000 1M RW GLB x pte +0xc0000000-0xc00a0000 640K RW GLB NX pte +0xc00a0000-0xc0100000 384K RW GLB x pte -0xc0100000-0xc03d7000 2908K ro GLB x pte +0xc0100000-0xc0318000 2144K ro GLB x pte +0xc0318000-0xc03d7000 764K ro GLB NX pte -0xc03d7000-0xc0600000 2212K RW GLB x pte +0xc03d7000-0xc0600000 2212K RW GLB NX pte 0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd 0xf7a00000-0xf7bfe000 2040K RW GLB NX pte 0xf7bfe000-0xf7c00000 8K pte No pcibios: -- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400 ++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400 0x00000000-0xc0000000 3G pmd ---[ Kernel Mapping ]--- -0xc0000000-0xc0100000 1M RW GLB x pte +0xc0000000-0xc0100000 1M RW GLB NX pte -0xc0100000-0xc03d7000 2908K ro GLB x pte +0xc0100000-0xc0318000 2144K ro GLB x pte +0xc0318000-0xc03d7000 764K ro GLB NX pte -0xc03d7000-0xc0600000 2212K RW GLB x pte +0xc03d7000-0xc0600000 2212K RW GLB NX pte 0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd 0xf7a00000-0xf7bfe000 2040K RW GLB NX pte 0xf7bfe000-0xf7c00000 8K pte The patch has been originally developed for Linux 2.6.34-rc2 x86 by Siarhei Liakh and Xuxian Jiang . -v1: initial patch for 2.6.30 -v2: patch for 2.6.31-rc7 -v3: moved all code into arch/x86, adjusted credits -v4: fixed ifdef, removed credits from CREDITS -v5: fixed an address calculation bug in mark_nxdata_nx() -v6: added acked-by and PT dump diff to commit log -v7: minor adjustments for -tip -v8: rework with the merge of "Set first MB as RW+NX" Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Signed-off-by: Matthieu CASTET Cc: Arjan van de Ven Cc: James Morris Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F82E.60601@free.fr> [ minor cleanliness edits ] Signed-off-by: Ingo Molnar commit 64edc8ed5ffae999d8d413ba006850e9e34166cb Author: matthieu castet Date: Tue Nov 16 22:30:27 2010 +0100 x86: Fix improper large page preservation This patch fixes a bug in try_preserve_large_page() which may result in improper large page preservation and improper application of page attributes to the memory area outside of the original change request. More specifically, the problem manifests itself when set_memory_*() is called for several pages at the beginning of the large page and try_preserve_large_page() erroneously concludes that the change can be applied to whole large page. The fix consists of 3 parts: 1. Addition of "required" protection attributes in static_protections(), so .data and .bss can be guaranteed to stay "RW" 2. static_protections() is now called for every small page within large page to determine compatibility of new protection attributes (instead of just small pages within the requested range). 3. Large page can be preserved only if attribute change is large-page-aligned and covers whole large page. -v1: Try_preserve_large_page() patch for Linux 2.6.34-rc2 -v2: Replaced pfn check with address check for kernel rw-data Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Reviewed-by: Suresh Siddha Cc: Arjan van de Ven Cc: James Morris Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F7F3.8030809@free.fr> Signed-off-by: Ingo Molnar commit e9229faf920aba47dd1ba6940b3ca138024543d3 Author: Tracey Dent Date: Sun Nov 7 09:46:28 2010 -0500 HID: usbhid: Clean up makefile (-y instead of -objs) Changed Makefile to use -y instead of -objs because -objs is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Jiri Kosina commit d47d612459300510215fc54bf1283f81710745df Author: Tracey Dent Date: Thu Nov 18 10:42:30 2010 +0100 HID: Clean up makefile (-y instead of -objs) Changed Makefile to use -y instead of -objs because -objs is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Jiri Kosina commit 82148d1d0b2f369851f2dff5088f7840f9f16abf Author: Shérab Date: Sat Sep 25 06:06:57 2010 +0200 x86/platform: Add Eurobraille/Iris power off support The Iris machines from Eurobraille do not have APM or ACPI support to shut themselves down properly. A special I/O sequence is needed to do so. This modle runs this I/O sequence at kernel shutdown when its force parameter is set to 1. Signed-off-by: Shérab Acked-by: "H. Peter Anvin" [ did minor coding style edits ] Signed-off-by: Ingo Molnar commit 79250af2d5953b69380a6319b493862bf4ece972 Author: Kees Cook Date: Tue Nov 16 10:10:04 2010 -0800 x86: Fix included-by file reference comments Adjust the paths for files that are including verify_cpu.S. Reported-by: Yinghai Lu Signed-off-by: Kees Cook Acked-by: Pekka Enberg Cc: Alan Cox LKML-Reference: <1289931004-16066-1-git-send-email-kees.cook@canonical.com> Signed-off-by: Ingo Molnar commit 0421860a5a75b59a76b7a864a172eb090e3d0785 Merge: cf655c3 89ba4d1 Author: Paul Mundt Date: Thu Nov 18 17:35:56 2010 +0900 Merge branch 'rmobile/ag5' into rmobile-latest commit c44f242064093e640a068741b05ee6acdd49bc22 Author: Dmitry Torokhov Date: Mon Nov 15 01:39:57 2010 -0800 Input: gameport - convert to use common workqueue instead of a thread Instead of creating an exclusive thread to handle gameport events (which happen rarely), let's switch to common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov commit 8ee294cd9def0004887da7f44b80563493b0a097 Author: Dmitry Torokhov Date: Mon Nov 15 01:39:57 2010 -0800 Input: serio - convert to common workqueue instead of a thread Instead of creating an exclusive thread to handle serio events (which happen rarely), let's switch to using common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov commit ce16a474f6305dd631c885ba970d5746e4d5c803 Author: Chris Leech Date: Wed Nov 17 23:59:54 2010 -0800 Input: qt602240_ts - fix wrong sizeof in object table allocation The kcalloc call for the object table is using sizeof(struct qt602240_data) when it should be using sizeof(struct qt6602240_object), resulting in a larger allocation than is required. Signed-off-by: Chris Leech Signed-off-by: Dmitry Torokhov commit 8b5fce06f8795d9a7f8d1f03f743fc8befa66b3b Author: Dmitry Torokhov Date: Thu Nov 18 00:14:03 2010 -0800 Input: qt602240_ts - convert to using dev_pm_ops Signed-off-by: Dmitry Torokhov commit e3f0f0a6c11b049f1be603dcfec82d2a8643f5fd Author: Axel Lin Date: Wed Nov 17 23:59:34 2010 -0800 Input: xpad - ensure xpad->bulk_out is initialized before submitting urb As pointed out by Oliver Neukum: xpad->irq_in is currently submitted before xpad->bulk_out is allocated. That however is a race, because the callback for irq_in can call xpad360w_process_packet(), which will in turn submit the bulk URB. This patch moves initialization for xpad->bulk_out earlier, so we can ensure xpad->bulk_out is initialized before submitting urb. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 072b198a4ad48bd722ec6d203d65422a4698eae7 Author: Don Zickus Date: Fri Nov 12 11:22:24 2010 -0500 x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog Now that the bulk of the old nmi_watchdog is gone, remove all the stub variables and hooks associated with it. This touches lots of files mainly because of how the io_apic nmi_watchdog was implemented. Now that the io_apic nmi_watchdog is forever gone, remove all its fingers. Most of this code was not being exercised by virtue of nmi_watchdog != NMI_IO_APIC, so there shouldn't be anything to risky here. Signed-off-by: Don Zickus Cc: fweisbec@gmail.com Cc: gorcunov@openvz.org LKML-Reference: <1289578944-28564-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a Author: Don Zickus Date: Fri Nov 12 11:22:23 2010 -0500 x86, nmi_watchdog: Remove the old nmi_watchdog Now that we have a new nmi_watchdog that is more generic and sits on top of the perf subsystem, we really do not need the old nmi_watchdog any more. In addition, the old nmi_watchdog doesn't really work if you are using the default clocksource, hpet. The old nmi_watchdog code relied on local apic interrupts to determine if the cpu is still alive. With hpet as the clocksource, these interrupts don't increment any more and the old nmi_watchdog triggers false postives. This piece removes the old nmi_watchdog code and stubs out any variables and functions calls. The stubs are the same ones used by the new nmi_watchdog code, so it should be well tested. Signed-off-by: Don Zickus Cc: fweisbec@gmail.com Cc: gorcunov@openvz.org LKML-Reference: <1289578944-28564-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 89ba4d12fca24d373e1b10fce498d68157bafaf0 Author: Paul Mundt Date: Thu Nov 18 16:47:02 2010 +0900 ARM: mach-shmobile: Add ag5evm defconfig. Signed-off-by: Paul Mundt commit 45bbaae0dcddc275594e23f108cb68869eae7433 Author: Paul Mundt Date: Thu Nov 18 16:07:27 2010 +0900 ARM: mach-shmobile: Split out entry-macros in to GIC and INTC variants. Presently the entry macros are all globbed together, this simply splits them out in to their insular variants. Future work such as the GIC generalization will replace some of these and tidy the abstraction up further. Signed-off-by: Paul Mundt commit 6d9598e24d50a8c72f48a3864327484a30aaee44 Author: Magnus Damm Date: Wed Nov 17 10:59:31 2010 +0000 ARM: mach-shmobile: Initial AG5 and AG5EVM support This patch adds initial support for Renesas SH-Mobile AG5. At this point the AG5 CPU support is limited to the ARM core, SCIF serial and a CMT timer together with L2 cache and the GIC. The AG5EVM board also supports Ethernet. Future patches will add support for GPIO, INTCS, CPGA and platform data / driver updates for devices such as IIC, LCDC, FSI, KEYSC, CEU and SDHI among others. The code in entry-macro.S will be cleaned up when the ARM IRQ demux code improvements have been merged. Depends on the AG5EVM mach-type recently registered but not yet present in arch/arm/tools/mach-types. As the AG5EVM board comes with 512MiB memory it is recommended to turn on HIGHMEM. Many thanks to Yoshii-san for initial bring up. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b2c0710c464ede15e1fc52fb1e7ee9ba54cea186 Author: Paul E. McKenney Date: Thu Sep 9 13:40:39 2010 -0700 rcu: move TINY_RCU from softirq to kthread If RCU priority boosting is to be meaningful, callback invocation must be boosted in addition to preempted RCU readers. Otherwise, in presence of CPU real-time threads, the grace period ends, but the callbacks don't get invoked. If the callbacks don't get invoked, the associated memory doesn't get freed, so the system is still subject to OOM. But it is not reasonable to priority-boost RCU_SOFTIRQ, so this commit moves the callback invocations to a kthread, which can be boosted easily. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 4f6838436915fdc281173bfd5bef6d8ab5cb1a7f Author: Dirk Brandewie Date: Wed Nov 17 07:43:09 2010 -0800 USB: ce4100: Add support for CE4100 EHCI IP block to EHCI driver This patch adds support for the EHCI IP block present on the Intel CE4100. Signed-off-by: Dirk Brandewie CC: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2f15744c1d90ee2e82f8ae5724b44b1cdf31715c Author: Alan Stern Date: Wed Nov 17 10:56:01 2010 -0500 USB: fix leftover references to udev->autosuspend_delay This patch (as1436) takes care of leftover references to udev->autosuspend_delay that didn't get removed during the earlier conversion to the runtime-PM autosuspend API. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit aa02f172ac85f144d0baa248e27e34e165963f94 Author: Michal Nazarewicz Date: Wed Nov 17 17:09:47 2010 +0100 usb: gadget: g_fs: Fix compilation warning This commit fixes warning in f_fs.c introduced by "usb: gadget: f_fs: remove custom printk() wrappers": In file included from drivers/usb/gadget/g_ffs.c:64: drivers/usb/gadget/f_fs.c:30:1: warning: "pr_fmt" redefined Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb Author: Johannes Berg Date: Tue Nov 16 11:50:28 2010 -0800 mac80211: fix powersaving clients races The code to handle powersaving stations has a race: when the powersave flag is lifted from a station, we could transmit a packet that is being processed for TX at the same time right away, even if there are other frames queued for it. This would cause frame reordering. To fix this, lift the flag only under the appropriate lock that blocks TX. Additionally, the code to allow drivers to block a station while frames for it are on the HW queue is never re-enabled the station, so traffic would get stuck indefinitely. Fix this by clearing the flag for this appropriately. Finally, as an optimisation, don't do anything if the driver unblocks an already unblocked station. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10 Author: Johannes Berg Date: Tue Nov 16 11:49:58 2010 -0800 mac80211: defines for AC numbers In many places we've just hardcoded the AC numbers -- which is a relic from the original mac80211 (d80211). Add constants for them so we know what we're talking about. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f Author: Felix Fietkau Date: Tue Nov 16 19:20:28 2010 +0100 ath9k_hw: add support for reading EEPROM data from the internal OTP ROM Some of the new AR9003 cards do not come with an external EEPROM chip anymore. Calibration data on these cards is stored in the OTP ROM on the chip. This patch adds support for reading this data, and also adds support for different EEPROM chip sizes (512 bytes instead of 1K). Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2d42efc44e38d3a8b2bf30e34559036bb6541672 Author: Felix Fietkau Date: Sun Nov 14 15:20:13 2010 +0100 ath9k: store frame information used by aggregation inside the skb tx info Since the pointers after the rates in the tx info cannot be used anymore after frames have been queued, this area can be used to store information that was previously stored in the ath_buf. With these changes, we can delay the ath_buf assignment in the aggregation code until aggregates are formed. That will not only make it possible to simplify DMA descriptor setup to do less rewriting of uncached memory, but will also make it easier to move aggregation out of the core of the ath9k tx path. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435 Author: Felix Fietkau Date: Sun Nov 14 15:20:12 2010 +0100 ath9k: more tx setup cleanups - remove the BUF_HT flag, and instead check for IEEE80211_TX_CTL_AMPDU before calling ath_tx_send_ampdu. - remove a few unused variables - calculate frame length before adding the frame padding - merge the misnamed ath_tx_start_dma function into ath_tx_start - remove an unused argument for assign_aggr_tid_seqno Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 71a3bf3e94b745467fc4c3451a294910f0369555 Author: Felix Fietkau Date: Sun Nov 14 15:20:11 2010 +0100 ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set This makes further tx path cleanups easier Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 28d167086227969fd6586953ee4ac682a3c394ff Author: Felix Fietkau Date: Sun Nov 14 15:20:10 2010 +0100 ath9k: clean up code duplication around ath_tx_start Merge initial processing for the CAB queue and regular tx. Also move ath_tx_cabq() to beacon.c and make it static. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c5992618259598ade82c386aa1595bf105e92d1f Author: Felix Fietkau Date: Sun Nov 14 15:20:09 2010 +0100 ath9k: remove bf_tx_aborted from struct ath_buf Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 76e4522177de81ac89ade01a394aeb3704a66f1b Author: Felix Fietkau Date: Sun Nov 14 15:20:08 2010 +0100 ath9k: remove bfs_frmlen from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b572d0335fcb26e526f6ae087a9a09371b22e739 Author: Felix Fietkau Date: Sun Nov 14 15:20:07 2010 +0100 ath9k: remove bfs_nframes from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f Author: Felix Fietkau Date: Sun Nov 14 15:20:06 2010 +0100 ath9k: remove bfs_al from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 3017047f564d5101009c8318b94bdacd3ca3312e Author: Felix Fietkau Date: Sun Nov 14 15:20:05 2010 +0100 ath9k: remove bfs_keyix from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30 Author: Felix Fietkau Date: Sun Nov 14 15:20:04 2010 +0100 ath9k: remove bfs_paprd_timestamp from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 952cd693718d8ac796d5323fe7876241cf15ecfa Author: Felix Fietkau Date: Sun Nov 14 15:20:03 2010 +0100 ath9k: remove bfs_keytype from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5daefbd061d9509644058b6886abe2b6672ee386 Author: Felix Fietkau Date: Sun Nov 14 15:20:02 2010 +0100 ath9k: remove bfs_tidno from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2d3bcba0827013dfc60f727e7370dea00bc0638a Author: Felix Fietkau Date: Sun Nov 14 15:20:01 2010 +0100 ath9k: remove bfs_seqno from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2 Author: Felix Fietkau Date: Sun Nov 14 00:03:01 2010 +0100 ath9k: fix PA predistortion training frame setup Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c5d0855acfa4d6801c4c45bc02ddddd959262050 Author: Felix Fietkau Date: Sat Nov 13 20:22:41 2010 +0100 ath9k_hw: set default values for radar pulse detection Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 387e68846413f3dcfc5a5afca9841430057e3340 Author: RA-Jay Hung Date: Sat Nov 13 19:13:53 2010 +0100 rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment When send out skb data to mac80211, orignal code will cause mac80211 unaligned access, so modify code to make mac80211 can natural access. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a Author: RA-Jay Hung Date: Sat Nov 13 19:12:54 2010 +0100 rt2x00: Fix header_length in rt2x00lib_txdone Put the assignment of header_length after pull out extra tx headroom Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit b43d63bd69ae5464a52bf1796e84097607917b2f Author: RA-Jay Hung Date: Sat Nov 13 19:11:46 2010 +0100 rt2x00: Fix rt2800 USB TX Path DMA issue rt2800usb chips need to add 1~3 bytes zero padding after each 802.11 header & payload, and at the end need to add 4 bytes zero padding whether doing TX bulk aggregation or not, TXINFO_W0_USB_DMA_TX_PKT_LEN in TXINFO must include 1-3 bytes padding after 802.11 header & payload but do not include 4 bytes end zero padding. In rt2800usb_get_tx_data_len do not consider multiple of the USB packet size case, sometimes this will cause USB DMA problem. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6 Author: Gertjan van Wingerde Date: Sat Nov 13 19:11:22 2010 +0100 rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR. Make the code a bit more portable to architectures that do not support KSEG1ADDR. Signed-off-by: Gertjan van Wingerde Tested-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 72c7296e03e381b49958809915105b18b09fa7a3 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:54 2010 +0100 rt2x00: Remove unneccessary internal Kconfig symbols. CONFIG_RT2800PCI_PCI and CONFIG_RT2800PCI_SOC are strictly not needed as we can check the dependent symbols directly in the rest of Kconfig and the code, so clean up the Kconfig namespace a bit. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:31 2010 +0100 rt2x00: Remove RT30XX Kconfig variables. Enabling of RT30xx devices via Kconfig variables was introduced when these devices weren't properly supported yet. Now that that they are properly supported and functional, we can remove these Kconfig variables for RT30xx devices and simply enable them whenever rt2800pci and/or rt2800usb is enabled. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:10 2010 +0100 rt2x00: Clean up Kconfig for RT2800 devices. General clean up of the Kconfig part for RT28XX devices. Also remove the indications of non functional support for rt27xx/rt28xx/rt30xx devices, as this is no longer true. They just work fine. Finally, remove the experimental indications for rt27xx/rt28xx/rt30xx devices as that is no longer true. Keep the experimental indications for rt33xx/rt35xx devices, though. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039 Author: Gertjan van Wingerde Date: Sat Nov 13 19:09:50 2010 +0100 rt2x00: Add initial support for RT3370/RT3390 devices. Modified from Eddy's patch by adding the RT3370 USB support as well. Signed-off-by: Gertjan van Wingerde Cc: Eddy Tsai Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d Author: Ivo van Doorn Date: Sat Nov 13 19:08:14 2010 +0100 rt2x00: Increase REGISTER_BUSY_COUNT For some hardware the REGISTER_BUSY_COUNT isn't sufficient, increase the REGISTER_BUSY_COUNT to 100 to catch most devices which have more problems with accessing the registers. For normal operating devices nothing would change as they will exit the loop early anyway. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit dda0b38692a7298f433b92b1329867b1ecabb4bb Author: Vasiliy Kulikov Date: Sun Nov 14 07:06:08 2010 +0000 net: ipv4: tcp_probe: cleanup snprintf() use snprintf() returns number of bytes that were copied if there is no overflow. This code uses return value as number of copied bytes. Theoretically format string '%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n' may be expanded up to 163 bytes. In reality tv.tv_sec is just few bytes instead of 20, 2 ports are just 5 bytes each instead of 10, length is 5 bytes instead of 10. The rest is an unstrusted input. Theoretically if tv_sec is big then copy_to_user() would overflow tbuf. tbuf was increased to fit in 163 bytes. snprintf() is used to follow return value semantic. Signed-off-by: Vasiliy Kulikov Signed-off-by: David S. Miller commit 9ea19481db31d614f729f346bdcf28e4e60ff14a Author: John Fastabend Date: Tue Nov 16 06:31:39 2010 +0000 net: zero kobject in rx_queue_release netif_set_real_num_rx_queues() can decrement and increment the number of rx queues. For example ixgbe does this as features and offloads are toggled. Presumably this could also happen across down/up on most devices if the available resources changed (cpu offlined). The kobject needs to be zero'd in this case so that the state is not preserved across kobject_put()/kobject_init_and_add(). This resolves the following error report. ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong. Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169 Call Trace: [] kobject_init+0x3a/0x83 [] kobject_init_and_add+0x23/0x57 [] ? mark_lock+0x21/0x267 [] net_rx_queue_update_kobjects+0x63/0xc6 [] netif_set_real_num_rx_queues+0x5f/0x78 [] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe] [] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe] [] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe] Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 5811662b15db018c740c57d037523683fd3e6123 Author: Changli Gao Date: Fri Nov 12 18:43:55 2010 +0000 net: use the macros defined for the members of flowi Use the macros defined for the members of flowi to clean the code up. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit dd68ad2235b4625e0dc928b2b4c614d265f976d3 Author: Philippe De Muyter Date: Sat Nov 13 08:43:29 2010 +0000 net: more Kconfig whitespace cleanup indentation for TSI108_ETH entry was too big. Signed-off-by: Philippe De Muyter Signed-off-by: David S. Miller commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b Author: Joe Perches Date: Fri Nov 12 11:37:59 2010 +0000 drivers/net/can/sja1000: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit d8ee707114bc3615fd7be90eb942eba2dbe668ed Author: Joe Perches Date: Mon Nov 15 10:13:58 2010 +0000 drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit a31ff3880578c37fd5c71ee863c23897dacfa9f8 Author: Joe Perches Date: Mon Nov 15 10:13:57 2010 +0000 drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 802aa9c058f2046f0a5683f04d7755c362734010 Author: Anirban Chakraborty Date: Tue Nov 16 14:09:06 2010 +0000 qlcnic: Bumped up driver version to 5.0.12 Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 706f23ada68746ed475488e7d2e2ca392fc4f731 Author: Sony Chacko Date: Tue Nov 16 14:08:46 2010 +0000 qlcnic: lro off message log from set rx checsum Log LRO off message while disabling rx checksum only when LRO is already enabled. Signed-off-by: Sony Chacko Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 2679a135e6452359cd807754617db0d05ad404e5 Author: Sritej Velaga Date: Tue Nov 16 14:08:23 2010 +0000 qlcnic: Add description for CN1000Q adapter Add description for CN1000Q adapter Signed-off-by: Sritej Velaga Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit c21fd48c22bd1a9c4a5286963086f246c782e47e Author: Rajesh Borundia Date: Tue Nov 16 14:08:06 2010 +0000 qlcnic: Fix for kdump In case of kdump environment the function may be in unknown state. Reset the function using PCI FLR before initializing it. Signed-off-by: Rajesh Borundia Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 2abea2f0a5ab161facd865356d2e59b23204414e Author: Sucheta Chakraborty Date: Tue Nov 16 14:07:53 2010 +0000 qlcnic: Allow minimum bandwidth of zero Allow minimum bandwidth to be set zero Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit b382b191ea9e9ccefc437433d23befe91f4a8925 Author: Thomas Graf Date: Tue Nov 16 04:33:57 2010 +0000 ipv6: AF_INET6 link address family IPv6 already exposes some address family data via netlink in the IFLA_PROTINFO attribute if RTM_GETLINK request is sent with the address family set to AF_INET6. We take over this format and reuse all the code. Signed-off-by: Thomas Graf Cc: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4 Author: Thomas Graf Date: Tue Nov 16 04:32:48 2010 +0000 ipv4: AF_INET link address family Implements the AF_INET link address family exposing the per device configuration settings via netlink using the attribute IFLA_INET_CONF. The format of IFLA_INET_CONF differs depending on the direction the attribute is sent. The attribute sent by the kernel consists of a u32 array, basically a 1:1 copy of in_device->cnf.data[]. The attribute expected by the kernel must consist of a sequence of nested u32 attributes, each representing a change request, e.g. [IFLA_INET_CONF] = { [IPV4_DEVCONF_FORWARDING] = 1, [IPV4_DEVCONF_NOXFRM] = 0, } libnl userspace API documentation and example available from: http://www.infradead.org/~tgr/libnl/doc-git/group__link__inet.html Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit ca7479ebbd9f7621646bf2792cb7143647f035bb Author: Thomas Graf Date: Tue Nov 16 04:31:20 2010 +0000 inet: Define IPV4_DEVCONF_MAX Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit f8ff182c716c6f11ca3061961f5722f26a14e101 Author: Thomas Graf Date: Tue Nov 16 04:30:14 2010 +0000 rtnetlink: Link address family API Each net_device contains address family specific data such as per device settings and statistics. We already expose this data via procfs/sysfs and partially netlink. The netlink method requires the requester to send one RTM_GETLINK request for each address family it wishes to receive data of and then merge this data itself. This patch implements a new API which combines all address family specific link data in a new netlink attribute IFLA_AF_SPEC. IFLA_AF_SPEC contains a sequence of nested attributes, one for each address family which in turn defines the structure of its own attribute. Example: [IFLA_AF_SPEC] = { [AF_INET] = { [IFLA_INET_CONF] = ..., }, [AF_INET6] = { [IFLA_INET6_FLAGS] = ..., [IFLA_INET6_CONF] = ..., } } The API also allows for address families to implement a function which parses the IFLA_AF_SPEC attribute sent by userspace to implement address family specific link options. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d67ef35fff67845c64d806c033cc7c569ccebfff Author: Jeremy Eder Date: Mon Nov 15 05:41:31 2010 +0000 clarify documentation for net.ipv4.igmp_max_memberships This patch helps clarify documentation for net.ipv4.igmp_max_memberships by providing a formula for calculating the maximum number of multicast groups that can be subscribed to, plus defining the theoretical limit. Signed-off-by: Jiri Pirko Signed-off-by: Jeremy Eder Signed-off-by: David S. Miller commit 9920239c90d5f6dadfb44325abf3568a5e3fd827 Author: Joe Perches Date: Wed Nov 10 18:54:58 2010 +0000 drivers/isdn/hisax: Add printf format/argument verification and fix fallout Add __attribute__((format... to several functins Make formats and arguments match. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1f1aaf82825865a50cef0b4722607abb12aeee52 Author: Eric Paris Date: Tue Nov 16 11:52:57 2010 +0000 SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error The SELinux netfilter hooks just return NF_DROP if they drop a packet. We want to signal that a drop in this hook is a permanant fatal error and is not transient. If we do this the error will be passed back up the stack in some places and applications will get a faster interaction that something went wrong. Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit ee58681195bf243bafc44ca53f3c24429d096cce Author: Eric Paris Date: Tue Nov 16 11:52:49 2010 +0000 network: tcp_connect should return certain errors up the stack The current tcp_connect code completely ignores errors from sending an skb. This makes sense in many situations (like -ENOBUFFS) but I want to be able to immediately fail connections if they are denied by the SELinux netfilter hook. Netfilter does not normally return ECONNREFUSED when it drops a packet so we respect that error code as a final and fatal error that can not be recovered. Based-on-patch-by: Patrick McHardy Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit da6836500414ae734cd9873c2d553db594f831e9 Author: Eric Paris Date: Tue Nov 16 11:52:38 2010 +0000 netfilter: allow hooks to pass error code back up the stack SELinux would like to pass certain fatal errors back up the stack. This patch implements the generic netfilter support for this functionality. Based-on-patch-by: Patrick McHardy Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit 37d668004289d202f71dc5bfdadf6c18b34577a2 Author: Joe Perches Date: Mon Nov 15 11:12:33 2010 +0000 net/atm: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ece49153b601d95bcebd45a6394e370972f0b0a0 Author: Joe Perches Date: Mon Nov 15 11:12:31 2010 +0000 drivers/net: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1 Author: Joe Perches Date: Mon Nov 15 11:12:30 2010 +0000 drivers/net/vxge: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800 Author: Joe Perches Date: Mon Nov 15 11:12:29 2010 +0000 drivers/net/usb: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2 Author: Joe Perches Date: Mon Nov 15 11:12:28 2010 +0000 drivers/net/qlge: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8 Author: Joe Perches Date: Mon Nov 15 11:12:27 2010 +0000 drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a887e220760c12e00b0591d67987e26f6e270d71 Author: Joe Perches Date: Mon Nov 15 11:12:26 2010 +0000 drivers/net/pcmcia: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c04914af6861d62df303aeedbbe554972ce4e736 Author: Joe Perches Date: Mon Nov 15 11:12:25 2010 +0000 drivers/net/bonding: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a17531fa4c951f32ca4f90b04ca42cfb11924098 Author: Joe Perches Date: Mon Nov 15 11:12:24 2010 +0000 drivers/isdn/i4l: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a1082bfe7d2d88d9626f5542dda9c0781394e91f Merge: 9d1e5e4 147b2c8 Author: David S. Miller Date: Wed Nov 17 09:56:04 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit d3e1884bc585a43674d2cb0d3f0aeeb0ae43bc04 Author: Feng Tang Date: Wed Nov 17 12:11:24 2010 +0000 x86, mrst: Add explanation for using 1960 as the year offset for vrtc Explain the reason for the apparently odd choice of year offset so we don't get more questions about it. Signed-off-by: Feng Tang Signed-off-by: Alan Cox LKML-Reference: <20101117121050.9998.89348.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit ad02519a0d27da4a0a50cbc696e810c94e27c28e Author: Randy Dunlap Date: Mon Nov 15 10:14:06 2010 -0800 x86, mrst: Fix dependencies of "select INTEL_SCU_IPC" commit b9fc71f47 (x86, mrst: The shutdown for MRST requires the SCU IPC mechanism) introduced the following warning: warning: (X86_MRST && PCI && PCI_GOANY && X86_32 && X86_EXTENDED_PLATFORM && X86_IO_APIC) selects INTEL_SCU_IPC which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_MRST) which is due to the hierarchical menu structure. Select X86_PLATFORM_DEVICES as well. Originally-from: Randy Dunlap Signed-off-by: Thomas Gleixner LKML-Reference: <20101115101406.77e072ef.randy.dunlap@oracle.com> Cc: Alan Cox commit b9fc71f47dc060c588e5099638242fad44eeecbc Author: Alan Cox Date: Mon Nov 15 17:31:19 2010 +0000 x86, mrst: The shutdown for MRST requires the SCU IPC mechanism Fix the build failure reported by Randy. Reported-by: Randy Dunlap Signed-off-by: Alan Cox LKML-Reference: <20101115173110.6877.83958.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 032a6424aeea7333a8dafc8cc05dd10b09c62680 Author: Dan Murphy Date: Mon Nov 15 09:50:50 2010 -0600 OMAP: mux: Add __func__ macro to pr_xxx macros Removed mux: and added the __func__ macro to make debugging easier. Signed-off-by: Dan Murphy Signed-off-by: Benoit Cousson Cc: Tony Lindgren commit fc63de829bbfa3945ffd6327bd3dc88f4e643642 Author: sricharan Date: Mon Nov 8 19:26:11 2010 +0530 OMAP4: pandaboard: Select CBL & CBS package and initialize mux The mux framework allows the change of pad configuration by drivers when needed. Prior to this the mux framework has to be initialised with all the mux parameters specific to the board. The mux init is already present in the board file for SDP. Adding the mux init for panda boards. Signed-off-by: sricharan Acked-by: Anand Gadiyar Signed-off-by: Benoit Cousson Cc: Santosh Shilimkar commit 6fea7b0a7ad9b79aca09df4c42773927db6934ed Author: Benoit Cousson Date: Mon Sep 27 10:50:33 2010 +0200 OMAP4: sdp4430: Select CBS package for ES2 Select the CBS package if SDP4430 is enabled during config. Use the proper package (CBL or CBS) based on chip revision. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Santosh Shilimkar Cc: Anand Gadiyar commit a7722d8796c3431163943c30af7a90d87c43180a Author: Benoit Cousson Date: Fri Sep 24 16:56:59 2010 +0200 OMAP4: mux: Add CBS package data for OMAP4430 ES2 Please note that the full muxmodes are re-defined for ES2 instead of using the subset. There are 81 differences among 204 pins. The subset fixup will have to iterate over the whole list for each subset entry, which can lead to an important number of iteration. On the other hand, it will take much more memory at boot time. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Santosh Shilimkar Cc: Anand Gadiyar commit fb6bf6320e33af5bd6ac788f27245f9162bc5215 Author: Benoit Cousson Date: Tue Aug 10 17:43:15 2010 +0200 OMAP4: sdp4430: Select CBL package for ES1 and initialize mux Select the CBL package if SDP4430 is enabled during config. Initialize the mux framework during the board init. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit a041a52c4d2b82e25de2267bce5f4dc3d2179b2a Author: Benoit Cousson Date: Tue Aug 10 17:27:48 2010 +0200 OMAP4: mux: Add CBL package data for OMAP4430 ES1 Add data for OMAP4430 generated from HW pinout & register database. The data set is split in two partitions for both core and wkup. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit 112485e9c543b17fc08daea56c7a558b415d06af Author: Benoit Cousson Date: Mon Aug 16 10:55:35 2010 +0200 OMAP: mux: Add support for control module split in several partitions Starting on OMAP4, the pin mux configuration is located in two different partitions of the control module (CODE_PAD and WKUP_PAD). The first one is inside the core power domain whereas the second one is inside the wakeup. - Add the capability to add any number of partition during board init time depending of Soc partitioning. - Add some init flags as well in order to avoid explicit Soc version check inside the mux core code. - Add a comment with mux0 mode on top of omap_mux/board/ if the current mux mode is not the default one. Thanks to Tony Lindgren for the following improvements: - Add omap_mux_get for getting the partition data so platform level device code can use it. - Fix the rx51 board code to use the new API. - Do not store the partition for each mux entry. Look up the partition for debugfs instead. Thanks to Dan Murphy for testing on OMAP4 and reporting a couple of bugs. Thanks to Anand Gadiyar for testing on OMAP3 zoom and bug report. Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren Tested-by: Murphy Dan Cc: Paul Walmsley Cc: Kevin Hilman Cc: Santosh Shilimkar Cc: Anand Gadiyar commit 1cbb3a9a132969ed1ffeaecff2f910619d4470ae Author: Benoit Cousson Date: Tue Aug 10 17:33:01 2010 +0200 OMAP: mux: Replace printk with pr_xxx macros Replace all the printk(KERN_XXX... with pr_xxx macros. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit 194ee8e89cc02d8bea8a0b837271f79ca0c72873 Author: Uwe Kleine-König Date: Thu Nov 11 15:32:21 2010 +0100 ARM: mx25: dynamically allocatate imx-fb devices Signed-off-by: Uwe Kleine-König commit e7c74b343091e0c6b7bb67c12f9f7fb345aa6a50 Author: Uwe Kleine-König Date: Thu Nov 11 11:57:21 2010 +0100 ARM: mx25: dynamically allocate imxdi_rtc devices Signed-off-by: Uwe Kleine-König commit ab9cee4b2167f8bf01d85b537df5b9cbe342c780 Author: Uwe Kleine-König Date: Thu Nov 11 11:35:33 2010 +0100 ARM: mx25: dynamically allocate imx-keypad devices The mxc-keypad device seems to be the result of an early and partial merge of the keypad driver. It's unused and there is no corresponding driver available, so just remove it. Cc: Alberto Panizzo Signed-off-by: Uwe Kleine-König commit d485c7e71675abdd6133128e596b41284c2ee7b5 Author: Uwe Kleine-König Date: Thu Nov 11 10:52:33 2010 +0100 ARM: mx25: move registration of gpios to plat-mxc/gpio.c To use common macros to define the gpio ports for imx{1,21,25,27} the existing ones had to made more general and a few more base address defines were necessary. Signed-off-by: Uwe Kleine-König commit 5f3d1092a949b33d01c95b7f5e5a83672629f131 Author: Uwe Kleine-König Date: Wed Nov 10 22:15:45 2010 +0100 ARM: mx25: dynamically allocate mxc_pwm devices Signed-off-by: Uwe Kleine-König commit 224b8c83641c2f31e3efc9bc5956636cc42cadf7 Author: Uwe Kleine-König Date: Wed Nov 10 21:50:07 2010 +0100 ARM: mx25: dynamically allocate fsl-usb2-udc devices Signed-off-by: Uwe Kleine-König commit 2c20b9f19add2248dc867f1f78dcef1eb0944543 Author: Uwe Kleine-König Date: Wed Nov 10 21:27:55 2010 +0100 ARM: mx25: dynamically allocate mxc-ehci devices According to the reference manual of the i.MX25 the host controller uses an offset of 0x200 not 0x400 as was specified in the resources for mxc_usbh2. Needs-Testing: yes Signed-off-by: Uwe Kleine-König commit e9f0bafb4f3d32d0bc0ea7e946d667a68bae59ce Author: Uwe Kleine-König Date: Wed Nov 10 10:51:38 2010 +0100 ARM: imx: move registration of gpios to plat-mxc/gpio.c This finally gets rid of mach-imx/devices.c. Signed-off-by: Uwe Kleine-König commit 3a6f52a79fc0ce1c8b950c628bcf101f8652e957 Author: Uwe Kleine-König Date: Wed Nov 10 10:22:02 2010 +0100 ARM: imx: remove now empty devices.h Signed-off-by: Uwe Kleine-König commit 9f871469893a6d87c6cddf412f82ebf588fd4eca Author: Uwe Kleine-König Date: Wed Nov 10 10:11:23 2010 +0100 ARM: imx: dynamically allocate imx21-hcd devices Signed-off-by: Uwe Kleine-König commit 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e Author: Uwe Kleine-König Date: Wed Nov 10 09:58:56 2010 +0100 ARM: imx: dynamically allocate imx-keypad devices Signed-off-by: Uwe Kleine-König commit bd455ed36c487b949068182bfee478b785ee090b Author: Uwe Kleine-König Date: Tue Nov 9 17:52:14 2010 +0100 ARM: imx: dynamically allocate fsl-usb2-udc devices Signed-off-by: Uwe Kleine-König commit 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 Author: Uwe Kleine-König Date: Fri Nov 5 18:52:09 2010 +0100 ARM: imx: dynamically allocate mxc-ehci devices Signed-off-by: Uwe Kleine-König commit 9d3d945a8d5be2c915f646e8dff8422486a77030 Author: Uwe Kleine-König Date: Fri Nov 5 17:26:09 2010 +0100 ARM: imx: dynamically register mxc-mmc devices ... plus a trivial simplification of mx21ads_sdhc_init() Signed-off-by: Uwe Kleine-König commit c194daad0e0de94ed5e03aa723eb56b4a3ae9738 Author: Alberto Panizzo Date: Mon Nov 1 18:00:03 2010 +0100 ARM: mx3/mach-pcm037_eet: Fix section mismatch for eet_init_devices() This function should be marked as __init because it is used only in the init phase. This fix the compiler warning: LD arch/arm/mach-mx3/built-in.o WARNING: arch/arm/mach-mx3/built-in.o(.text+0x1328): Section mismatch in reference from the function eet_init_devices() to the (unknown reference) .init.rodata:(unknown) The function eet_init_devices() references the (unknown reference) __initconst (unknown). This is often because eet_init_devices lacks a __initconst annotation or the annotation of (unknown) is wrong. Signed-off-by: Alberto Panizzo Signed-off-by: Uwe Kleine-König commit bf182bcc6e726cce2f02b699bd0fba787734554f Author: Uwe Kleine-König Date: Fri Nov 5 15:01:16 2010 +0100 ARM: imx: dynamically allocate mxc_pwm devices Signed-off-by: Uwe Kleine-König commit c06246576a6e71b72ecc6b4b39a5c8eaf45dc2ed Author: Uwe Kleine-König Date: Fri Nov 5 11:22:37 2010 +0100 ARM: mx3: enable SPI_IMX for better compile coverage SPI_IMX defaults to m for i.MX machines. So enabling SPI is enough. Signed-off-by: Uwe Kleine-König commit ad851bffba6afd6468f96a6180cc4a14e9ebee38 Author: Uwe Kleine-König Date: Thu Nov 4 17:07:48 2010 +0100 ARM: imx: dynamically register imx-fb devices Signed-off-by: Uwe Kleine-König commit fc40d0191943fa995f5359b5c23aa7c3dea69d7b Author: Uwe Kleine-König Date: Thu Nov 4 12:02:35 2010 +0100 ARM: imx: change the way flexcan devices are registered Group soc specific data in a global struct instead of repeating it for each call to imxXX_add_flexcanX. The structs holding the actual data are placed in .init.constdata and so don't do much harm. Compared to the previous approach this reduces code size to call imx_add_flexcan. Signed-off-by: Uwe Kleine-König commit e0a1961df8ad898b661cf0adcf3519254f135a44 Author: Uwe Kleine-König Date: Thu Nov 4 10:09:10 2010 +0100 ARM: imx: dynamically allocate imx2-wdt devices Currently there is no platform data used in the driver. In case this changes and for consistency NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König commit b2997cb12b302ee6d233808e32214d00afdcf128 Author: Uwe Kleine-König Date: Tue Nov 2 17:50:55 2010 +0100 ARM: imx: dynamically allocate mx2-camera device Signed-off-by: Uwe Kleine-König commit 3bde75b5370bd69fd7f07a8e254bef05b1b5b219 Author: Uwe Kleine-König Date: Tue Nov 2 16:42:27 2010 +0100 ARM: imx/gpio: remove some useless casts Signed-off-by: Uwe Kleine-König commit 9bb39b3f600101b09cbb35e0a0deb9d56c4fe67f Author: Uwe Kleine-König Date: Tue Nov 2 11:59:08 2010 +0100 ARM: imx: dynamically allocate mx1-camera device Signed-off-by: Uwe Kleine-König commit 6332c1071811a1d588cfc93330d87a57a7460a1b Author: Uwe Kleine-König Date: Tue Nov 2 11:56:54 2010 +0100 ARM: imx: allow specifying a dma mask when creating a platform device Signed-off-by: Uwe Kleine-König commit e08300043ee4e2df10be551b76e126d6c02f26cc Author: Uwe Kleine-König Date: Tue Nov 2 10:03:51 2010 +0100 ARM: imx: dynamically allocate imx_udc device This is only available for mx1 machines with no in-tree user. Signed-off-by: Uwe Kleine-König commit 300f86da1787c680598ea441aaa602a1664fba86 Author: Uwe Kleine-König Date: Fri Oct 29 11:50:36 2010 +0200 ARM: imx: remove unused devices all these don't have a driver and are not added in any machine file. Signed-off-by: Uwe Kleine-König commit ae71a5622253708aa08df231e6415fe7a1e96b10 Author: Uwe Kleine-König Date: Fri Oct 29 10:56:07 2010 +0200 ARM: imx: dynamically allocate mxc_w1 devices Currently there is no platform data used in the driver. In case this changes NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König commit d96801b2ca47cfeddadede7a1998e1fe0eab095c Author: Uwe Kleine-König Date: Fri Oct 22 09:20:52 2010 +0200 ARM: imx: remove deprecated symbols as all users are gone now Signed-off-by: Uwe Kleine-König commit ac401427c05a6a371950a1cdfaec75f72bffb9b5 Author: Uwe Kleine-König Date: Tue Oct 26 09:42:54 2010 +0200 ARM: imx/debug-macro: rework using the new io mapping macro This gets rid of the last user of IMX_NEEDS_DEPRECATED_SYMBOLS. Signed-off-by: Uwe Kleine-König commit a99631489bbd1b4647b82d0822b6a3942e2dd731 Author: Uwe Kleine-König Date: Mon Oct 25 15:44:25 2010 +0200 ARM: imx: change static io mapping to use a function Now only the virtual addresses [0xf4000000, 0xf5ffffff] are used for static per-SoC mappings. The few mappings of whole chip selects are moved accordingly. The now wrong defines for virtual base addresses are removed. Signed-off-by: Uwe Kleine-König commit cf3a6aba2f8402d4e45f7f263a0e69f779cd1bdc Author: Uwe Kleine-König Date: Mon Oct 25 15:54:58 2010 +0200 ARM: imx: remove last explicit users of virtual base address defines This allows changing the mapping without the need to adapt all users. While at it remove some unneeded casts to void __iomem *, this is already taken care for in the IO_ADDRESS macros Signed-off-by: Uwe Kleine-König commit 08ff97b5214143c3bd47add6ec49097cb848120a Author: Uwe Kleine-König Date: Mon Oct 25 15:38:09 2010 +0200 ARM: imx: use MXxy_IO_P2V macros to setup static mappings This makes less code rely on the virtual constants. To further simplify code and reduce the needed boilerplate when defining the static mappings a new helper macro is defined in mach/hardware.h. Signed-off-by: Uwe Kleine-König commit f5d7a13b18706c3328c6aac3bf782a13cabf255a Author: Uwe Kleine-König Date: Mon Oct 25 11:40:30 2010 +0200 ARM: imx: refactor the io mapping macro This makes it more assembler friendly and allows it to be used in situation that need an unsigned long and not a pointer. Also the naming is clearer. IOMEM is introduced without IMX_ prefix as it is used this way in more than one ARM subarch and it might become globally available soon. Signed-off-by: Uwe Kleine-König commit 9651b7db59893e796dfdd170485543b9863be9d8 Author: Uwe Kleine-König Date: Fri Oct 22 14:49:45 2010 +0200 ARM: mx3: fix the last users of IMX_NEEDS_DEPRECATED_SYMBOLS Signed-off-by: Uwe Kleine-König commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21 Author: Dongdong Deng Date: Tue Nov 16 19:50:15 2010 -0800 e1000e: add netpoll support for MSI/MSI-X IRQ modes With enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode, and netpoll controller didn't deal with those IRQ modes on e1000e. This patch add the handling MSI/MSI-X IRQ modes to netpoll controller, so that netconsole could work with those IRQ modes. Signed-off-by: Dongdong Deng Signed-off-by: Jeff Kirsher commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9 Author: Bruce Allan Date: Tue Nov 16 19:50:14 2010 -0800 e1000e: 82574 intermittently fails to initialize with manageability f/w The driver can fail initializing the hardware when manageability firmware is performing concurrent MDIO operations because the hardware semaphore scheme to prevent concurrent operations between software and firmware is incorrect for 82574/82583. Instead of using the SWSM register, the driver should be using the EXTCNF_CTRL register. A software mutex is also added to prevent simultaneous software threads from performing similar concurrent accesses. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit d478eb44f7a6b53256ae399fa7e597525b4034ee Author: Bruce Allan Date: Tue Nov 16 19:50:13 2010 -0800 e1000e: 82571 SerDes link handle null code word from partner SerDes Link detection on certain 82571 mezzanine cards can fail when the link is forced, the link partner does not recognize forced link and the link partner sends null code words. Detect the null code words and return to auto-negotiation state which causes the link partner to begin responding with valid code words. Within a reasonable interval the link will finally settle as forced by both partners. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher commit b1d670f10e8078485884f0cf7e384d890909aeaa Author: Greg Rose Date: Tue Nov 16 19:41:36 2010 -0800 Remove extra struct page member from the buffer info structure declaration. Reported-by: Andi Kleen Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308 Author: Julian Stecklina Date: Tue Nov 16 19:41:36 2010 -0800 igbvf: Remove some dead code in igbvf Removed unused variable in igbvf. Signed-off-by: Julian Stecklina Acked-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 2c20ebbaed7f3f21506629ee931941a9bba199ab Author: Greg Rose Date: Tue Nov 16 19:41:35 2010 -0800 igbvf: Update version and Copyright Update version string and copyright notice Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42 Author: Greg Rose Date: Tue Nov 16 19:27:19 2010 -0800 ixgbevf: Fix Oops The driver is calling netif_carrier_off and netif_tx_stop_all_queues before the netdevice is registered which causes an Oops. Move call to netif_carrier_off after the netdevice is registered and remove call to netif_tx_stop_all_queues because there aren't any TX queues yet. Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit e2ddeba95c09d0d44719ff005e915dc06ff46571 Author: Eric Dumazet Date: Tue Nov 16 19:27:18 2010 -0800 ixgbe: refactor ixgbe_alloc_queues() I noticed ring variable was initialized before allocations, and that memory node management was a bit ugly. We also leak memory in case of ring allocations error. Signed-off-by: Eric Dumazet Signed-off-by: Jeff Kirsher commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0 Author: Don Skidmore Date: Tue Nov 16 19:27:17 2010 -0800 ixgbe: add support for x540 MAC This patch adds support for the x540 MAC which is the next MAC in the 82598/82599 line. Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher commit fe15e8e1c78521e0b4e375d6ed415b82265419c9 Author: Don Skidmore Date: Tue Nov 16 19:27:16 2010 -0800 ixgbe: add MAC and PHY support for x540 Adds the new x540.c file and Aquantia 1202 PHY for X540 support. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit a391f1d51244b8274920a33c5d11aeebec3aa68f Author: Don Skidmore Date: Tue Nov 16 19:27:15 2010 -0800 ixgbe: make silicon specific functions generic The new MAC type X540 shares much of the same functionality of some silicon specific functions. To reduce duplicate code, made these functions generic. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 9b55bb038468a7b504ccdc1d956952598ae1b85b Author: Yi Zou Date: Tue Nov 16 19:27:14 2010 -0800 ixgbe: make sure FCoE DDP user buffers are really released by the HW When invalidating the DDP context is invalidated, the HW may not be done with the user buffer right away. In which case, we poll the FCBUFF register to check if the buffer valid bit is cleared or not, if not, we wait for max 100us that is guaranteed by the HW. Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b Author: Yi Zou Date: Tue Nov 16 19:27:13 2010 -0800 ixgbe: invalidate FCoE DDP context when no error status is available The hw automatically invalidates the context if DDP is successful or there is error detected. In case there is no error status available from the hw, initializing the per context error status to be 1 allows the DDP context to be still invalidated via the upper layer call to ddp_put(). Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit a41c059741570779c0254a3a1aa4da3baa463d7c Author: Yi Zou Date: Tue Nov 16 19:27:13 2010 -0800 ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING There is no point to allow incoming DDP requests from the upper layer stack if the adapter is going down or being reset. Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c84d324c770dc81acebc1042163da33c8ded2364 Author: John Fastabend Date: Tue Nov 16 19:27:12 2010 -0800 ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs The Tx hang logic has been known to detect false hangs when the device is receiving pause frames or has delayed processing for some other reason. This patch makes the logic more robust and resolves these known issues. The old logic checked to see if the device was paused by querying the HW then the hang logic was aborted if the device was currently paused. This check was racy because the device could have been in the pause state any time up to this check. The other operation of the hang logic is to verify the Tx ring is still advancing the old logic checked the EOP timestamp. This is not sufficient to determine the ring is not advancing but only infers that it may be moving slowly. Here we add logic to track the number of completed Tx descriptors and use the adapter stats to check if any pause frames have been received since the previous Tx hang check. This way we avoid racing with the HW register and do not detect false hangs if the ring is advancing slowly. This patch is primarily the work of Jesse Brandeburg. I clean it up some and fixed the PFC checking. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e Author: Alexander Duyck Date: Tue Nov 16 19:27:11 2010 -0800 ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber This change resolves some null function pointer accesses on 82598 when a multi-speed fiber module is inserted into the adapter. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 2274543f15133165b855b9a4a1503b2c1268c6cf Author: Alexander Duyck Date: Tue Nov 16 19:27:10 2010 -0800 ixgbe: populate the ring->q_vector pointer during ring mapping The q_vector back pointer was not being set in the rings so it would not have been possible to determine the parent q_vector of the ring. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d0759ebb051972f8557a19aa13cf02fc314856e9 Author: Alexander Duyck Date: Tue Nov 16 19:27:09 2010 -0800 ixgbe: cleanup ixgbe_map_rings_to_vectors This change cleans up some of the items in ixgbe_map_rings_to_vectors. Specifically it merges the two for loops and drops the unnecessary vectors parameter. It also moves the vector names into the q_vectors themselves. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 125601bf03a13e24d3785ccbc3a25ad401c92772 Author: Alexander Duyck Date: Tue Nov 16 19:27:08 2010 -0800 ixgbe: simplify math and improve stack use of ixgbe_set_itr functions This change is meant to improve the stack utilization and simplify the math used in ixgbe_set_itr_msix. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit bf29ee6c4819a86ba0209281550b230889b8ebe6 Author: Alexander Duyck Date: Tue Nov 16 19:27:07 2010 -0800 ixgbe: cleanup unclear references to reg_idx There are a number of places where we use the variable j to contain the register index of the ring. Instead of using such a non-descriptive variable name it is better that we name it reg_idx so that it is clear what the variable contains. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8 Author: Alexander Duyck Date: Tue Nov 16 19:27:06 2010 -0800 ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss This change is just to cleanup some confusing logic in ixgbe_cache_ring_rss which can be simplified by adding a conditional with return to the start of the call. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 673ac60461082e07be58b23f237d651c2605ce60 Author: Alexander Duyck Date: Tue Nov 16 19:27:05 2010 -0800 ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c This change address a few whitespace issues in DCB #ifdefs, adds a comment calling out the DCB specific registers, and nests an if statement inline with a number of if statements related to flow control. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 50d6c681d0c38208e494f0c6302ef13d21dababa Author: Alexander Duyck Date: Tue Nov 16 19:27:05 2010 -0800 ixgbe: add WOL support for backplane adapters This change adds support for certain 82599 based Mezzanine adapters. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit e2b4e216b7e9da09175c76887c754489681533b9 Author: Alexander Duyck Date: Tue Nov 16 19:27:04 2010 -0800 ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration This change makes it so that we always disable SCTP regardless of mac type since we shouldn't need to check mac type before disabling a feature that isn't supported on a given piece of hardware. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4 Author: Alexander Duyck Date: Tue Nov 16 19:27:03 2010 -0800 ixgbe: change mac_type if statements to switch statements This change replaces a number of if/elseif/else statements with switch statements to support the addition of future devices to the ixgbe driver. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit aa80175a539a47fd11e2fbf1696a29f7a2652930 Author: Alexander Duyck Date: Tue Nov 16 19:27:02 2010 -0800 ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB This change cleans up the use of rsc_count and changes it to a boolean since the actual numerical value is used nowhere in the Rx cleanup path. I am also moving the skb count into the RSC_CB path since it is much easier to track it there than when it is passed as a parameter to various function calls. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076 Author: Alexander Duyck Date: Tue Nov 16 19:27:01 2010 -0800 ixgbe: cleanup ATR filter setup function This change cleans up the ixgbe_atr filter setup function so that it uses fewer items from the stack. Since the code is only applicable to IPv4 w/ TCP it makes sense to just use the pointers based on the headers themselves instead of copying them to temp variables and then writing those to the filters. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80 Author: Alexander Duyck Date: Tue Nov 16 19:27:00 2010 -0800 ixgbe: cleanup ixgbe_clean_rx_irq The code for ixgbe_clean_rx_irq was much more tangled up than it needed to be in terms of logic statements and unused variables. This change untangles much of that and drops several unused variables such as cleaned which was being returned but never checked. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533 Author: Alexander Duyck Date: Tue Nov 16 19:26:59 2010 -0800 ixgbe: change vector numbering so that queues end up on correct CPUs This changes the numbering scheme slightly. Previously the ordering was coming out like this: Rx-2 Rx-1 Rx-0 TxRx-0 Which would drop two queues on CPU 0. This change makes it so that the ordering is like this: Rx-3 Rx-2 Rx-1 TxRx-0 This means that each CPU will have it's own Rx queue, and only CPU 0 will have the Tx queue. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit b953799ee29075afd30afe4c0fb65f278b088f69 Author: Alexander Duyck Date: Tue Nov 16 19:26:58 2010 -0800 ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm The code as it existed could re-arm the queues when it was requesting a HW reset due to a TX hang. Instead of doing that this change makes it so that we will just exit if the hardware is believed to be hung. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 80fba3f4341b1c98430bee620b507d3f5b7086cd Author: Alexander Duyck Date: Tue Nov 16 19:26:57 2010 -0800 ixgbe: Disable RSC when ITR setting is too high to allow RSC RSC will flush its descriptors every time the interrupt throttle timer expires. In addition there are known issues with RSC when the rx-usecs value is set too low. As such we are forced to clear the RSC_ENABLED bit and reset the adapter when the rx-usecs value is set too low. However we do not need to clear the NETIF_F_LRO flag because it is used to indicate that the user wants to leave the LRO feature enabled, and in fact with this change we will now re-enable RSC as soon as the rx-usecs value is increased and the flag is still set. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93 Author: Alexander Duyck Date: Tue Nov 16 19:26:57 2010 -0800 ixgbe: cleanup race conditions in link setup This change makes it so that we perform link setup with interrupts disabled. If the SFP has not been detected previously we will schedule the SFP detection task to run in order to detect link. By doing this we avoid the possibility of interrupts firing in the middle of our link setup during ixgbe_up_complete. In addition this change makes it so that the multi-speed fiber setup and SFP setup are not mutually exclusive. The addresses issues seen in which a link would only come up at 1G on some multi-speed fiber modules. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d Author: Alexander Duyck Date: Tue Nov 16 19:26:56 2010 -0800 ixgbe: add a state flags to ring This change adds a set of state flags to the rings that allow them to independently function allowing for features like RSC, packet split, and TX hang detection to be done per ring instead of for the entire device. This is accomplished by re-purposing the flow director reinit_state member and making it a global state instead since a long for a single bit flag is a bit wasteful. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1 Author: Alexander Duyck Date: Tue Nov 16 19:26:55 2010 -0800 ixgbe: move CPU variable from ring into q_vector, add ring->q_vector This is the start of work to sort out what belongs in the rings and what belongs in the q_vector. Items like the CPU variable for make much more sense in the q_vector since the CPU is a per-interrupt thing rather than a per ring thing. I also added a back-pointer from the ring to the q_vector. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c60fbb00f0400792adf873dbacd431885653b77d Author: Alexander Duyck Date: Tue Nov 16 19:26:54 2010 -0800 ixgbe: move adapter into pci_dev driver data instead of netdev This change moves an adapter pointer into the private portion of the pci_dev instead of a pointer to the netdev. The reason for this change is because in most cases we just want the adapter anyway. In addition as we start moving toward multiple netdevs per port we may want to move the adapter pointer out of the netdevs entirely. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 01fa7d905fe9a5b045615fbde19e6c0f78063206 Author: Alexander Duyck Date: Tue Nov 16 19:26:53 2010 -0800 ixgbe: remove residual code left over from earlier combining of TXDCTL Missed some code that was left floating around in the DCB configuration for the TXDCTL register. As a result the register was being messed with in two different spots when we only needed to do the change once. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb Author: Alexander Duyck Date: Tue Nov 16 19:26:52 2010 -0800 ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state The main reason for this change is to keep the suspend/resume logic matched up. The clear_interrupt_scheme function will disable MSI-X which will effect the PCIe configuration space. Therefore we will want to do it before we save state to avoid having the interrupt state restored by pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via ixgbe_setup_interrupt_scheme. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f Author: Alexander Duyck Date: Tue Nov 16 19:26:51 2010 -0800 ixgbe: add a netdev pointer to the ring structure This change places a netdev pointer directly into the ring structure. This way we can avoid having to determine which netdev we are supposed to be using and can just access the one on the ring directly. As a result of this change further collapse of the code is possible by dropping the adapter from ixgbe_alloc_rx_buffers, and the netdev pointer from ixgbe_xmit_frame_ring_adv and ixgbe_maybe_stop_tx. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda Author: Alexander Duyck Date: Tue Nov 16 19:26:50 2010 -0800 ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap This change moved some of the RX and TX stats into separate structures and them placed those structures in a union in order to help reduce the size of the ring structure. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit b6ec895ecd32c0070c3b2b17918c030275cd834d Author: Alexander Duyck Date: Tue Nov 16 19:26:49 2010 -0800 ixgbe: move device pointer into the ring structure This change is meant to simplify DMA map/unmap by providing a device pointer. As a result the adapter pointer can be dropped from many of the calls. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 84ea2591e4a24775c2735511a1cc3cf88edd249d Author: Alexander Duyck Date: Tue Nov 16 19:26:49 2010 -0800 ixgbe: drop ring->head, make ring->tail a pointer instead of offset This change drops ring->head since it is not used in any hot-path and can easily be determined using IXGBE_[RT]DH(ring->reg_idx). It also changes ring->tail into a true pointer so we can avoid unnecessary pointer math to find the location of the tail. In addition I also dropped the setting of head and tail in ixgbe_clean_[rx|tx]_ring. The only location that should be setting the head and tail values is ixgbe_configure_[rx|tx]_ring and that is only while the queue is disabled. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d5f398ed73522b9f76861af6553775c5851de0d0 Author: Alexander Duyck Date: Tue Nov 16 19:26:48 2010 -0800 ixgbe: cleanup ixgbe_alloc_rx_buffers This change re-orders alloc_rx_buffers to make better use of the packet split enabled flag. The new setup should require less branching in the code since now we are down to fewer if statements since we either are handling packet split or aren't. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0 Author: Alexander Duyck Date: Tue Nov 16 19:26:47 2010 -0800 ixgbe: move GSO segments and byte count processing into ixgbe_tx_map This change simplifies the work being done by the TX interrupt handler and pushes it into the tx_map call. This allows for fewer cache misses since the TX cleanup now accesses almost none of the skb members. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe Author: Alexander Duyck Date: Tue Nov 16 19:26:46 2010 -0800 ixgbe: remove unnecessary re-init of adapter on Rx-csum change There is no need to reset the adapter when changing the Rx checksum settings. Since the only change is a software flag we can disable it without needing to reset the entire adapter. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 80ab193dce048e7b7afa43c99e69f508167e29ab Author: John Fastabend Date: Tue Nov 16 19:26:45 2010 -0800 ixgbe: DCB: credit max only needs to be gt TSO size for 82598 The maximum credits per traffic class only needs to be greater then the TSO size for 82598 devices. The 82599 devices do not have this requirement so only do this test for 82598 devices. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 16b61beb39f2446460f93c08d4d263dc24f22dd8 Author: John Fastabend Date: Tue Nov 16 19:26:44 2010 -0800 ixgbe: DCB set PFC high and low water marks per data sheet specs Currently the high and low water marks for PFC are being set conservatively for jumbo frames. This means the RX buffers are being underutilized in the default 1500 MTU. This patch fixes this so that the water marks are set as described in the data sheet considering the MTU size. The equation used is, RTT * 1.44 + MTU * 1.44 + MTU Where RTT is the round trip time and MTU is the max frame size in KB. To avoid floating point arithmetic FC_HIGH_WATER is defined ((((RTT + MTU) * 144) + 99) / 100) + MTU This changes how the hardware field fc.low_water and fc.high_water are used. With this change they are no longer storing the actual low water and high water markers but are storing the required head room in the buffer. This simplifies the logic and we do not need to account for the size of the buffer when setting the thresholds. Testing with iperf and 16 threads showed a slight uptick in throughput over a single traffic class .1-.2Gbps and a reduction in pause frames. Without the patch a 30 second run would show ~10-15 pause frames being transmitted with the patch ~2-5 are seen. Test were run back to back with 82599. Note RXPBSIZE is in KB and low and high water marks fields are also in KB. However the FCRT* registers are 32B granularity and right shifted 5 into the register, (((rx_pbsize - water_mark) * 1024) / 32) << 5 is the most explicit conversion here we simplify (rx_pbsize - water_mark) * 32 << 5 = (rx_pbsize - water_mark) << 10 This patch updates the PFC thresholds and legacy FC thresholds. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7 Author: Greg Rose Date: Tue Nov 16 19:26:43 2010 -0800 ixgbevf: Update Version String and Copyright Notice Update version string and copyright notice. Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 1a51502bddca7ac1e921d918b741ffd2bec149ed Author: Eric Dumazet Date: Tue Nov 16 19:26:42 2010 -0800 ixgbe: delay rx_ring freeing "cat /proc/net/dev" uses RCU protection only. Its quite possible we call a driver get_stats() method while device is dismantling and freeing its data structures. So get_stats() methods must be very careful not accessing driver private data without appropriate locking. In ixgbe case, we access rx_ring pointers. These pointers are freed in ixgbe_clear_interrupt_scheme() and set to NULL, this can trigger NULL dereference in ixgbe_get_stats64() A possible fix is to use RCU locking in ixgbe_get_stats64() and defer rx_ring freeing after a grace period in ixgbe_clear_interrupt_scheme() Signed-off-by: Eric Dumazet Reported-by: Tantilov, Emil S Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c08512c761e7b9eaaab0e9167a389393f268e93c Author: Alan Stern Date: Mon Nov 15 15:57:58 2010 -0500 USB: improve uses of usb_mark_last_busy This patch (as1434) cleans up the uses of usb_mark_last_busy() in usbcore. The function will be called when a device is resumed and whenever a usage count is decremented. A call that was missing from the hub driver is added: A hub is used whenever one of its ports gets suspended (this prevents hubs from suspending immediately after their last child). In addition, the call to disable autosuspend support for new devices by default is moved from usb_detect_quirks() (where it doesn't really belong) into usb_new_device() along with all the other runtime-PM initializations. Finally, an extra pm_runtime_get_noresume() is added to prevent new devices from autosuspending while they are being registered. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fcc4a01eb8661226e80632327673f67bf6a5840b Author: Alan Stern Date: Mon Nov 15 15:57:51 2010 -0500 USB: use the runtime-PM autosuspend implementation This patch (as1428) converts USB over to the new runtime-PM core autosuspend framework. One slightly awkward aspect of the conversion is that USB devices will now have two suspend-delay attributes: the old power/autosuspend file and the new power/autosuspend_delay_ms file. One expresses the delay time in seconds and the other in milliseconds, but otherwise they do the same thing. The old attribute can be deprecated and then removed eventually. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6ddf27cdbc218a412d7e993fdc08e30eec2042ce Author: Ming Lei Date: Mon Nov 15 15:57:30 2010 -0500 USB: make usb_mark_last_busy use pm_runtime_mark_last_busy Since the runtime-PM core already defines a .last_busy field in device.power, this patch uses it to replace the .last_busy field defined in usb_device and uses pm_runtime_mark_last_busy to implement usb_mark_last_busy. Signed-off-by: Ming Lei Reviewed-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 045cac6b3b067a9286dabfb789f67ae4f433f88b Author: Alan Stern Date: Mon Nov 15 15:57:07 2010 -0500 USB: use sysfs_merge_group for power attributes This patch (as1426) makes use of the new sysfs_merge_group() and sysfs_unmerge_group() routines to simplify the handling of power attributes for USB devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 63defa73c8c1193c1273474440c30d34c2524597 Author: Ming Lei Date: Mon Nov 15 15:56:54 2010 -0500 USB: use the no_callbacks flag for interfaces Call pm_runtime_no_callbacks to set no_callbacks flag for USB interfaces. Since interfaces cannot be power-managed separately from their parent devices, there's no reason for the runtime-PM core to invoke any callbacks for them. Signed-off-by: Ming Lei Reviewed-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f646cf94520e22cb11eb5d2e9a35b33bfe4bea1b Author: Toshiharu Okada Date: Thu Nov 11 18:27:57 2010 +0900 USB device driver of Topcliff PCH This patch adds the USB device driver of EG20T(Topcliff) PCH. EG20T PCH is the platform controller hub that is going to be used in Intel's upcoming general embedded platform. All IO peripherals in EG20T PCH are actually devices sitting on AMBA bus. EG20T PCH has USB device I/F. Using this I/F, it is able to access system devices connected to USB device. Signed-off-by: Toshiharu Okada Acked-by: Michał Nazarewicz Signed-off-by: Greg Kroah-Hartman commit d8df0b611c66db3b7afd0678213979209616681a Author: Michal Nazarewicz Date: Fri Nov 12 14:29:29 2010 +0100 usb: gadget: f_fs: remove custom printk() wrappers This commit removes custom printk() wrappers from the f_fs.c file. They served little purpose above what pr_*() family of macros provides. Only FVDBG() has been left but renamed to pr_vdebug() to match other uses. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 5ab54cf7acf418573c9204371cf1ab3497c451ee Author: Michal Nazarewicz Date: Fri Nov 12 14:29:28 2010 +0100 usb: gadget: FunctionFS: fix typos and coding style This commit changes FunctionFS as to make it more compliant with coding style as well as fixes several typos. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 7189ba939ea0e74f73d7b30573b849c732835fc5 Author: Joe Perches Date: Fri Nov 12 13:38:02 2010 -0800 drivers/uwb: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit cc7e6056f440796e028629d6d79a26fa20d457e8 Author: Joe Perches Date: Sun Nov 14 19:04:49 2010 -0800 drivers/usb/gadget: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit ce7eb32fc24a7380f55924360fa0c96297aa237e Author: Joe Perches Date: Mon Nov 15 12:14:01 2010 -0800 drivers/usb/host/uhci-hcd.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c8c38de9d8002578599222296b90696745ac0fe3 Author: Deepak Sikri Date: Wed Nov 10 14:33:18 2010 +0530 USB host: Adding USB ehci & ohci support for spear platform This patch adds support for ehci and ohci controller in the SPEAr platform. Changes since V2: added clear_tt_buffer_complete in ehci_spear_hc_driver Signed-off-by: Deepak Sikri Signed-off-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92 Author: Mohammed Shafi Shajakhan Date: Sat Nov 13 20:58:27 2010 +0530 ath9k_htc: Use macro for caldata array size The calibration data variable size is based on the number of channels available in the ath9k driver. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:07 2010 +0100 iwlwifi: kill elapsed_jiffies Subtract of jiffies is fine even if one variable overwrap. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:06 2010 +0100 iwlagn: simplify iwlagn_tx_skb We can simplify length calculation in iwlagn_tx_skb, that function is enough complex, without fuzz it more than necessary. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2cb7865648e44647a976875428c9dfd9d5553221 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:05 2010 +0100 iwl3945: remove unused len_org variable Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8f0729b16ae354f9db89394fc1d2d65003455d56 Author: Felix Fietkau Date: Thu Nov 11 15:07:23 2010 +0100 mac80211: add support for setting the ad-hoc multicast rate Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 885a46d0f7942d76c2f3860acb45f75237d3bb42 Author: Felix Fietkau Date: Thu Nov 11 15:07:22 2010 +0100 cfg80211: add support for setting the ad-hoc multicast rate Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69 Author: Juuso Oikarinen Date: Thu Nov 11 08:50:18 2010 +0200 mac80211: Add function to get probe request template for current AP Chipsets with hardware based connection monitoring need to autonomically send directed probe-request frames to the AP (in the event of beacon loss, for example.) For the hardware to be able to do this, it requires a template for the frame to transmit to the AP, filled in with the BSSID and SSID of the AP, but also the supported rate IE's. This patch adds a function to mac80211, which allows the hardware driver to fetch this template after association, so it can be configured to the hardware. Signed-off-by: Juuso Oikarinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 4e8c14e9587c38f4cce8049c766935629fdb8d46 Author: Felix Fietkau Date: Thu Nov 11 03:18:38 2010 +0100 ath9k_hw: add a private op for configuring radar pulse detection Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 82b873afe83c81d9b1273a816bbdacb266f71a52 Author: Felix Fietkau Date: Thu Nov 11 03:18:37 2010 +0100 ath9k: clean up tx buffer setup Merge ath_tx_send_normal and ath_tx_send_ht_normal. Move the paprd state initialization and sequence number assignment to reduce the number of redundant checks. This not only simplifies buffer allocation error handling, but also removes a small inconsistency in the buffer HT flag. This flag should only be set if the frame is also a QoS data frame. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 61117f01e79f7c0da86c23535bed757370f5885f Author: Felix Fietkau Date: Thu Nov 11 03:18:36 2010 +0100 ath9k: remove the tx info padding byte abuse Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0 Author: Felix Fietkau Date: Thu Nov 11 03:18:35 2010 +0100 ath9k: handle tx underrun in the driver instead of rate control Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a Author: Felix Fietkau Date: Thu Nov 11 03:18:34 2010 +0100 ath9k: remove the unnecessary private xretry tx flag Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48 Author: Ben Greear Date: Wed Nov 10 11:43:51 2010 -0800 ath5k: Cleanup opmode setting logic. An earlier review suggested moving the code in a small method that was only called once inline. This patch accomplishes that. Signed-off-by: Ben Greear Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 6ee63f55c7754462a45315ac93027a1df60667c9 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:16 2010 -0800 ath9k_hw: Fix low throughput issue with AR93xx TX underruns were noticed when RTS/CTS preceded aggregates. This issue was noticed in ar93xx family of chipsets only. The workaround involves padding the RTS or CTS length up to the min packet length of 256 bytes required by the hardware by adding delimiters to the fist descriptor of the aggregate. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:15 2010 -0800 ath9k: Fix bug in delimiter padding computation There is a roundng error in delimiter padding computation which causes severe throughput drop with some of AR9003. signed-off-by: Felix Fietkau Signed-off-by: Vasanthakumar Thiagarajan Cc:stable@kernel.org Signed-off-by: John W. Linville commit bc2068020bfa976efd425f3be590f58a012fd747 Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:14 2010 -0800 ath9k_hw: Add helper function for interpolation Also round off interpolated values this would improve power accuracy by 0.5dB in some cases. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:13 2010 -0800 ath9k_hw: Improve power control accuracy for AR9003 It is done for 5Ghz by adding three temperature slopes. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f4475a6e52fce8d951a96c763f36b835bf89fdec Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:12 2010 -0800 ath9k_hw: Enable strong signal detection for AR9003 Attenuation from eeprom is configured into attenuator control register. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:11 2010 -0800 ath9k_hw: Fix XPABIAS level configuration for AR9003 Improper configuration of 0x16288 and 0x16290 would affect transmission. Cc:stable@kernel.org Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3092354970381fb8b6439fb4def0c34632277ae9 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:10 2010 -0800 ath9k_hw: add eeprom templates for ar9003 family chipsets We are currently using the default eeprom default and it doesn't work properly for all ar9003 family chipsets. So add eeprom templates for different versisons and select the eeprom table based on the template version programmed in the eeprom. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:09 2010 -0800 ath9k_hw: Fix paprd training frame failure. paprd training frame fails in some rates. Fix the rate mask. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ef5a6a7573b7a12ced67dae155be8a909bc245d6 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:08 2010 -0800 ath9k_hw: Initialize 2GHz CTL properly. The last 2GHz CTL was not being initialized, so power was being set to 0 instead of 30dbm. Initialize to 30 like other CTLs. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit b3dd6bc1f052ef3a754fa866743e4fda38522811 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:07 2010 -0800 ath9k_hw: Add new member into the eeprom structure. Add eeprom base extension structures which are needed for AR938x caliberation changes and gain calculation. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789 Author: Senthil Balasubramanian Date: Thu Nov 11 00:40:33 2010 -0800 ath9k_hw: Fix a reset failure on AR9382 (2x2). AR9382 needs to be configured for the correct chain mask before running AGC/TxIQ caliberation. Otherwise reset would fail. Signed-off-by: Senthil Balasubramanian Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5 Author: Bruno Randolf Date: Wed Nov 10 12:51:01 2010 +0900 ath5k: Add support for antenna configuration Support setting the antenna configuration via cfg/mac80211. At the moment only allow the simple pre-defined configurations we already have (fixed antenna A/B or diversity), but more advanced settings are possible to implement. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 15d967532148a5fcda075282b82a271b6595a386 Author: Bruno Randolf Date: Wed Nov 10 12:50:56 2010 +0900 mac80211: Add antenna configuration Allow antenna configuration by calling driver's function for it. We disallow antenna configuration if the wiphy is already running, mainly to make life easier for 802.11n drivers which need to recalculate HT capabilites. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit afe0cbf87500f0585d217deb8c6fd329793a7957 Author: Bruno Randolf Date: Wed Nov 10 12:50:50 2010 +0900 cfg80211: Add nl80211 antenna configuration Allow setting of TX and RX antennas configuration via nl80211. The antenna configuration is defined as a bitmap of allowed antennas to use. This API can be used to mask out antennas which are not attached or should not be used for other reasons like regulatory concerns or special setups. Separate bitmaps are used for RX and TX to allow configuring different antennas for receiving and transmitting. Each bitmap is 32 bit long, each bit representing one antenna, starting with antenna 1 at the first bit. If an antenna bit is set, this means the driver is allowed to use this antenna for RX or TX respectively; if the bit is not set the hardware is not allowed to use this antenna. Using bitmaps has the benefit of allowing for a flexible configuration interface which can support many different configurations and which can be used for 802.11n as well as non-802.11n devices. Instead of relying on some hardware specific assumptions, drivers can use this information to know which antennas are actually attached to the system and derive their capabilities based on that. 802.11n devices should enable or disable chains, based on which antennas are present (If all antennas belonging to a particular chain are disabled, the entire chain should be disabled). HT capabilities (like STBC, TX Beamforming, Antenna selection) should be calculated based on the available chains after applying the antenna masks. Should a 802.11n device have diversity antennas attached to one of their chains, diversity can be enabled or disabled based on the antenna information. Non-802.11n drivers can use the antenna masks to select RX and TX antennas and to enable or disable antenna diversity. While covering chainmasks for 802.11n and the standard "legacy" modes "fixed antenna 1", "fixed antenna 2" and "diversity" this API also allows more rare, but useful configurations as follows: 1) Send on antenna 1, receive on antenna 2 (or vice versa). This can be used to have a low gain antenna for TX in order to keep within the regulatory constraints and a high gain antenna for RX in order to receive weaker signals ("speak softly, but listen harder"). This can be useful for building long-shot outdoor links. Another usage of this setup is having a low-noise pre-amplifier on antenna 1 and a power amplifier on the other antenna. This way transmit noise is mostly kept out of the low noise receive channel. (This would be bitmaps: tx 1 rx 2). 2) Another similar setup is: Use RX diversity on both antennas, but always send on antenna 1. Again that would allow us to benefit from a higher gain RX antenna, while staying within the legal limits. (This would be: tx 0 rx 3). 3) And finally there can be special experimental setups in research and development even with pre 802.11n hardware where more than 2 antennas are available. It's good to keep the API simple, yet flexible. Signed-off-by: Bruno Randolf -- v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing. Signed-off-by: John W. Linville commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db Author: Joe Perches Date: Tue Nov 9 16:35:19 2010 -0800 drivers/net/wireless/b43legacy/main.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1 Author: Joe Perches Date: Tue Nov 9 16:35:18 2010 -0800 drivers/net/wireless/b43/main.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29 Author: Joe Perches Date: Tue Nov 9 16:35:17 2010 -0800 drivers/net/wireless/ath/debug.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52 Author: Jussi Kivilinna Date: Tue Nov 9 19:25:56 2010 +0200 rndis_wlan: workaround poor scanning with BCM4320a BCM4320a devices seem to sometimes do scanning pretty poorly. This can be workaround by issuing new scan every second, while not yet connected. By this new scanning method device catches beacons much faster. Fixes bug #20822. Reported-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit b5257c952dda24df7078c74b7b811b44c6e49206 Author: Jussi Kivilinna Date: Tue Nov 9 19:25:47 2010 +0200 rndis_wlan: workaround device not returning bss for currently connected AP BCM4320a devices do not return bss for currently connected AP in bss-list, althought this is required by NDIS specs. Missing bss leads to warning at net/wireless/sme.c:__cfg80211_connect_result(), WARN_ON(!bss). Workaround this by crafting bss manually with information we can read from device. Workaround is only used when device bss-list does not return current bss, and so is only used with BCM4320a devices and not newer BCM4320b ones. Fixes bug #20152. Reported-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit f23a478075659db8a4fd62fa6e264a8bb052cc5b Author: Arik Nemtsov Date: Mon Nov 8 11:51:06 2010 +0200 mac80211: support hardware TX fragmentation offload The lower driver is notified when the fragmentation threshold changes and upon a reconfig of the interface. If the driver supports hardware TX fragmentation, don't fragment packets in the stack. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit ca4a0831917d6541b45f03542257fcb20dc9cf4a Author: Rafał Miłecki Date: Wed Nov 3 23:28:45 2010 +0100 ssb: return -ENOMEM on alloc fail (instead of CRC check's result) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250 Author: Rafał Miłecki Date: Wed Nov 3 22:06:26 2010 +0100 ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:53 2010 -0800 mwl8k: use const struct fw pointers throughout This eliminates compiler warnings by doing things how the firmware class expects. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 99020471001dbbd6edf61f105368cb6667cc683d Author: Brian Cavagnolo Date: Fri Nov 12 17:23:52 2010 -0800 mwl8k: make initial firmware load asynchronous Introduce a firmware loading state machine to manage the process of loading firmware asynchronously and completing initialization upon success. The state machine attempts to load the preferred firmware image. If that fails, and if an alternative firmware image is available, it will attempt to load that one. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa Author: Brian Cavagnolo Date: Fri Nov 12 17:23:51 2010 -0800 mwl8k: add API version checking for AP firmware The AP firmware specifies an API version in the GET_HW_SPEC command response. Currently, the driver only supports AP firmware for the 8366, and only supports API v1. In the future, if higher API version firmwares emerge (possibly for different chips), different ops can be selected based on the reported API version. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 0863ade8d6bde1d151f75720d999ff27f9fe3533 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:50 2010 -0800 mwl8k: choose proper firmware image as directed by user The mwl8k can operate in AP or STA mode, depending on the firmware image that is loaded. By default, STA firmware is loaded. Allow the user to override this default mode at module load time. This saves an unnecessary firmware reload for users only interested in AP mode. Also, the firmware image can be swapped to meet the user's add_interface request. For example, suppose the STA firmware is loaded, no STA interface has been added, and the user adds an AP interface. In this case, the AP firmware will be loaded to meet the request. Based on contributions from Pradeep Nemavat , Yogesh Powar , and Lennert Buytenhek . Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 3cc7772c0a3cc193fa9873816168bd34d4f16837 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:49 2010 -0800 mwl8k: factor out firmware loading and hw init code This is in preparation for supporting different fw images for different interface types, and for supporting asynchronous firmware loading. Based on a patch from Pradeep Nemavat and Yogesh Powar Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb Author: Nishant Sarmukadam Date: Fri Nov 12 17:23:48 2010 -0800 mwl8k: rf_tx_power cmd not supported by AP firmware APIv1 APIv1 AP firmware does not support the RF_TX_POWER command. It supports the similar TX_POWER command. Signed-off-by: Pradeep Nemavat Signed-off-by: Nishant Sarmukadam Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb Author: Brian Cavagnolo Date: Fri Nov 12 17:23:47 2010 -0800 mwl8k: revert unnecessary modification of tx descriptor This reverts change 783391c443728febc669e40597193308460e7b4f. The stabilized AP v1 firmware uses the same tx descriptor as the STA firmware. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit ae63a33ec9b598b3454cf0d29077fa17b616c42a Author: Deepak Saxena Date: Sun Oct 31 13:40:33 2010 +0000 libertas: EHS_REMOVE_WAKEUP is not always supported Certain firmware versions, particularly the 8388 found on the XO-1, do not support the EHS_REMOVE_WAKEUP command that is used to disable WOL. Sending this command to the card will return a failure that would get propagated up the stack and cause suspend to fail. Instead, fall back to an all-zero wakeup mask. This fixes http://dev.laptop.org/ticket/9967 Signed-off-by: Deepak Saxena Signed-off-by: Daniel Drake [includes fixups by Paul Fox] Signed-off-by: John W. Linville commit cf43298864fdfd687202db8c736473522bfceb98 Author: Daniel Drake Date: Sun Oct 31 13:40:12 2010 +0000 libertas: don't block usb8388 suspend if no wakeup conditions are set This hunk added by commit 66fceb69b72f seems erroneous. We don't want to prevent suspend of the whole system if no wakeup params are set. In the case of the usb8388 we do want to keep the card powered up even if there are no wakeup params. This is because it will continue acting as a mesh node. If the mesh is disabled, it would indeed make more sense to power down the card during suspend, as the equivalent hunk does for the SD interface. But that's a separate task; for now just restore the previous behaviour. Signed-off-by: Daniel Drake Acked-by: Dan Williams Signed-off-by: John W. Linville commit 83abd0d897ad3b7d064c8d8594ec5cc8520d6646 Author: Alan Cox Date: Fri Nov 12 10:46:23 2010 +0000 serial: ifx6x60: Fix missing include for msleep Noted by Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8ddbe5edfb33e2186a5c83925d657914f643e09a Author: Alan Cox Date: Thu Nov 11 22:28:58 2010 +0000 serial: ifx6x60: The IFX requires SPI Correct the KConfig as noted by Greg. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e44dcb6c377529805bbaae505d5b333daab69111 Author: Wolfram Sang Date: Fri Nov 12 19:47:47 2010 +0100 serial: mpc52xx: make printout for type more generic The printout for the type should be just "5xxx", so 512x users won't wonder why they have a mpc52xx-type UART. Signed-off-by: Wolfram Sang Cc: Grant Likely Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 597c606f560cf7ef6029152fa7574bddbfb0252f Author: Jiri Slaby Date: Thu Nov 4 16:20:21 2010 +0100 parisc: cleanup console handling * use newly added for_each_console for iterating consoles * add proper console locking * do not initialize tmp twice * no need to declare console_drivers, it's already done in console.h Signed-off-by: Jiri Slaby Acked-by: Kyle McMartin Cc: Helge Deller Cc: "James E.J. Bottomley" Cc: linux-parisc@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 23308ba54dcdb54481163bfb07dd8aeca76a7a2e Author: Jiri Slaby Date: Thu Nov 4 16:20:24 2010 +0100 console: add /proc/consoles It allows users to see what consoles are currently known to the system and with what flags. It is based on Werner's patch, the part about traversing fds was removed, the code was moved to kernel/printk.c, where consoles are handled and it makes more sense to me. Signed-off-by: Jiri Slaby [cleanups] Signed-off-by: "Dr. Werner Fink" Cc: Al Viro Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 281e66057757ddf32ffe679a08f9634fa9f70a7a Author: Jiri Slaby Date: Thu Nov 4 16:20:22 2010 +0100 VIDEO: xen-fb, switch to for_each_console Use newly added for_each_console for iterating consoles. Signed-off-by: Jiri Slaby Cc: Jeremy Fitzhardinge Cc: Chris Wright Cc: virtualization@lists.osdl.org Cc: xen-devel@lists.xensource.com Cc: linux-fbdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 3dfbd044d0d99cad2fe50e4f6c79845703fa0558 Author: Jiri Slaby Date: Thu Nov 4 16:20:23 2010 +0100 TTY: include termios.h in tty_driver.h We reference termios and termiox in tty_driver.h, but we do not include linux/termios.h where these are defined. Add the #include properly. Otherwise when we include tty_driver.h, we get compile errors. Signed-off-by: Jiri Slaby Cc: Alan Cox Cc: Greg KH Signed-off-by: Greg Kroah-Hartman commit a75d946f42ae1771424a9582129fc5182ff48a1b Author: Jiri Slaby Date: Thu Nov 4 16:20:20 2010 +0100 console: move for_each_console to linux/console.h Move it out of printk.c so that we can use it all over the code. There are some potential users which will be converted to that macro in next patches. Signed-off-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit 44d4a4f784d0e1a50b3f1fc52bd6a661846abdc5 Author: David Brown Date: Fri Nov 12 13:49:53 2010 -0800 msm: make constant unsigned long to correct format warning Define VMALLOC_END as an unsigned long to match expected type. Eliminates a warning: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int' Signed-off-by: David Brown Signed-off-by: Daniel Walker commit d2c5d2145f127fffb7498bee943a480de66910ff Author: David Brown Date: Fri Nov 12 13:49:52 2010 -0800 msm: smd: ifdef adjustment to remove unused variables Put some variables inside of the same ifdef as the code that uses them. arch/arm/mach-msm/smd_debug.c: In function 'smsm_print_sleep_info': arch/arm/mach-msm/smd_debug.c:274: warning: unused variable 'int_info' arch/arm/mach-msm/smd_debug.c:273: warning: unused variable 'gpio' Signed-off-by: David Brown [dwalker@codeaurora.org: changed the commit text a little.] Signed-off-by: Daniel Walker commit 5d1394bb6b781df8148565783b0671f9b11500b7 Author: David Brown Date: Fri Nov 12 13:49:51 2010 -0800 msm: sirc: remove some unused variables Eliminate some unreferenced variables. arch/arm/mach-msm/sirc.c:43: warning: 'save_type' defined but not used arch/arm/mach-msm/sirc.c:44: warning: 'save_polarity' defined but not used Signed-off-by: David Brown [dwalker@codeaurora.org: changed the commit text a little.] Signed-off-by: Daniel Walker commit 9be58f317d79278afc23186d861ada774cf386ea Author: David Brown Date: Fri Nov 12 13:49:27 2010 -0800 msm: smd: Reduce driver log chatter The MSM smd driver logs numerous messages during startup that are useful for debug purposes. Change some of these to pr_debug() to match their purpose, and remove others that aren't really useful. Cc: Brian Swetland Cc: Arve Hjønnevåg Signed-off-by: David Brown Signed-off-by: Daniel Walker commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11 Author: Eric Dumazet Date: Wed Nov 3 05:56:38 2010 +0000 mpc52xx: cleanup locking commit 1e4e0767ecb1 (Fix locking on fec_mpc52xx driver) assumed IRQ are enabled when an IRQ handler is called. It is not the case anymore (IRQF_DISABLED is deprecated), so we can use regular spin_lock(), no need for spin_lock_irqsave(). Signed-off-by: Eric Dumazet Tested-by: Jean-Michel Hautbois Cc: Asier Llano Cc: Grant Likely Signed-off-by: David S. Miller commit b178bb3dfc30d9555bdd2401e95af98e23e83e10 Author: Eric Dumazet Date: Tue Nov 16 05:56:04 2010 +0000 net: reorder struct sock fields Right now, fields in struct sock are not optimally ordered, because each path (RX softirq, TX completion, RX user, TX user) has to touch fields that are contained in many different cache lines. The really critical thing is to shrink number of cache lines that are used at RX softirq time : CPU handling softirqs for a device can receive many frames per second for many sockets. If load is too big, we can drop frames at NIC level. RPS or multiqueue cards can help, but better reduce latency if possible. This patch starts with UDP protocol, then additional patches will try to reduce latencies of other ones as well. At RX softirq time, fields of interest for UDP protocol are : (not counting ones in inet struct for the lookup) Read/Written: sk_refcnt (atomic increment/decrement) sk_rmem_alloc & sk_backlog.len (to check if there is room in queues) sk_receive_queue sk_backlog (if socket locked by user program) sk_rxhash sk_forward_alloc sk_drops Read only: sk_rcvbuf (sk_rcvqueues_full()) sk_filter sk_wq sk_policy[0] sk_flags Additional notes : - sk_backlog has one hole on 64bit arches. We can fill it to save 8 bytes. - sk_backlog is used only if RX sofirq handler finds the socket while locked by user. - sk_rxhash is written only once per flow. - sk_drops is written only if queues are full Final layout : [1] One section grouping all read/write fields, but placing rxhash and sk_backlog at the end of this section. [2] One section grouping all read fields in RX handler (sk_filter, sk_rcv_buf, sk_wq) [3] Section used by other paths I'll post a patch on its own to put sk_refcnt at the end of struct sock_common so that it shares same cache line than section [1] New offsets on 64bit arch : sizeof(struct sock)=0x268 offsetof(struct sock, sk_refcnt) =0x10 offsetof(struct sock, sk_lock) =0x48 offsetof(struct sock, sk_receive_queue)=0x68 offsetof(struct sock, sk_backlog)=0x80 offsetof(struct sock, sk_rmem_alloc)=0x80 offsetof(struct sock, sk_forward_alloc)=0x98 offsetof(struct sock, sk_rxhash)=0x9c offsetof(struct sock, sk_rcvbuf)=0xa4 offsetof(struct sock, sk_drops) =0xa0 offsetof(struct sock, sk_filter)=0xa8 offsetof(struct sock, sk_wq)=0xb0 offsetof(struct sock, sk_policy)=0xd0 offsetof(struct sock, sk_flags) =0xe0 Instead of : sizeof(struct sock)=0x270 offsetof(struct sock, sk_refcnt) =0x10 offsetof(struct sock, sk_lock) =0x50 offsetof(struct sock, sk_receive_queue)=0xc0 offsetof(struct sock, sk_backlog)=0x70 offsetof(struct sock, sk_rmem_alloc)=0xac offsetof(struct sock, sk_forward_alloc)=0x10c offsetof(struct sock, sk_rxhash)=0x128 offsetof(struct sock, sk_rcvbuf)=0x4c offsetof(struct sock, sk_drops) =0x16c offsetof(struct sock, sk_filter)=0x198 offsetof(struct sock, sk_wq)=0x88 offsetof(struct sock, sk_policy)=0x98 offsetof(struct sock, sk_flags) =0x130 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c31504dc0d1dc853dcee509d9999169a9097a717 Author: Eric Dumazet Date: Mon Nov 15 19:58:26 2010 +0000 udp: use atomic_inc_not_zero_hint UDP sockets refcount is usually 2, unless an incoming frame is going to be queued in receive or backlog queue. Using atomic_inc_not_zero_hint() permits to reduce latency, because processor issues less memory transactions. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8 Author: Eric Dumazet Date: Thu Nov 11 09:42:45 2010 +0000 vlan: remove ndo_select_queue() logic Now vlan are lockless, we dont need special ndo_select_queue() logic. dev_pick_tx() will do the multiqueue stuff on the real device transmit. Suggested-by: Jesse Gross Signed-off-by: Eric Dumazet Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 Author: Eric Dumazet Date: Wed Nov 10 23:42:00 2010 +0000 vlan: lockless transmit path vlan is a stacked device, like tunnels. We should use the lockless mechanism we are using in tunnels and loopback. This patch completely removes locking in TX path. tx stat counters are added into existing percpu stat structure, renamed from vlan_rx_stats to vlan_pcpu_stats. Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan device) Signed-off-by: Eric Dumazet Cc: Patrick McHardy Signed-off-by: David S. Miller commit 8ffab51b3dfc54876f145f15b351c41f3f703195 Author: Eric Dumazet Date: Wed Nov 10 21:14:04 2010 +0000 macvlan: lockless tx path macvlan is a stacked device, like tunnels. We should use the lockless mechanism we are using in tunnels and loopback. This patch completely removes locking in TX path. tx stat counters are added into existing percpu stat structure, renamed from rx_stats to pcpu_stats. Note : this reverts commit 2c11455321f37 (macvlan: add multiqueue capability) Note : rx_errors converted to a 32bit counter, like tx_dropped, since they dont need 64bit range. Signed-off-by: Eric Dumazet Cc: Patrick McHardy Cc: Ben Greear Cc: Ben Hutchings Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 Author: Ingo Molnar Date: Tue Nov 16 18:45:39 2010 +0100 perf: Rename 'perf trace' to 'perf script' Free the perf trace name space and rename the trace to 'script' which is a better match for the scripting engine. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 4 of this patch. Change notes: 1) Removed extra memset. Didn't think kcalloc added a GFP_ZERO the way kzalloc did :) Summary: It was shown to me recently that systems under high load were driven very deep into swap when tcpdump was run. The reason this happened was because the AF_PACKET protocol has a SET_RINGBUFFER socket option that allows the user space application to specify how many entries an AF_PACKET socket will have and how large each entry will be. It seems the default setting for tcpdump is to set the ring buffer to 32 entries of 64 Kb each, which implies 32 order 5 allocation. Thats difficult under good circumstances, and horrid under memory pressure. I thought it would be good to make that a bit more usable. I was going to do a simple conversion of the ring buffer from contigous pages to iovecs, but unfortunately, the metadata which AF_PACKET places in these buffers can easily span a page boundary, and given that these buffers get mapped into user space, and the data layout doesn't easily allow for a change to padding between frames to avoid that, a simple iovec change is just going to break user space ABI consistency. So I've done this, I've added a three tiered mechanism to the af_packet set_ring socket option. It attempts to allocate memory in the following order: 1) Using __get_free_pages with GFP_NORETRY set, so as to fail quickly without digging into swap 2) Using vmalloc 3) Using __get_free_pages with GFP_NORETRY clear, causing us to try as hard as needed to get the memory The effect is that we don't disturb the system as much when we're under load, while still being able to conduct tcpdumps effectively. Tested successfully by me. Signed-off-by: Neil Horman Acked-by: Eric Dumazet Acked-by: Maciej Żenczykowski Reported-by: Maciej Żenczykowski Signed-off-by: David S. Miller commit 020f01ebd04f3429c32586d90598c9f59e54ca7d Author: Joe Perches Date: Tue Nov 9 14:35:16 2010 +0000 drivers/isdn/mISDN: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 3654654f7aa79a37dde130afb7409c55b11807e7 Author: Jan Engelhardt Date: Tue Nov 16 09:52:32 2010 -0800 netlink: let nlmsg and nla functions take pointer-to-const args The changed functions do not modify the NL messages and/or attributes at all. They should use const (similar to strchr), so that callers which have a const nlmsg/nlattr around can make use of them without casting. While at it, constify a data array. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46 Author: John Fastabend Date: Mon Nov 15 20:29:21 2010 +0000 ipv6: fix missing in6_ifa_put in addrconf Fix ref count bug introduced by commit 2de795707294972f6c34bae9de713e502c431296 Author: Lorenzo Colitti Date: Wed Oct 27 18:16:49 2010 +0000 ipv6: addrconf: don't remove address state on ifdown if the address is being kept Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr refcnt correctly with in6_ifa_put(). Reported-by: Stephen Hemminger Signed-off-by: John Fastabend Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit b5e4156743c5d42b736936be7a9ee8d72e0e4ac9 Merge: 6b35308 b1d771e Author: David S. Miller Date: Tue Nov 16 09:17:12 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f Author: Wey-Yi Guy Date: Fri Nov 12 13:52:37 2010 -0800 iwlwifi: set STATUS_READY before commit_rxon Have the STATUS_READY bit set before commit_rxon call to avoid fail to send tx power to uCode. Signed-off-by: Wey-Yi Guy commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5 Author: Shanyu Zhao Date: Fri Nov 12 13:48:13 2010 -0800 iwlagn: check change before commit RXON cmd When setting rxon chain and filter, no need to commit RXON when the chain flag is not changed. This reduces the number of RXON commands we send down to uCode. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180 Author: Wey-Yi Guy Date: Wed Nov 10 13:32:59 2010 -0800 iwlagn: use SKU information in the EEPROM EEPROM contain the SKU information for the device, use it. Signed-off-by: Wey-Yi Guy commit f4115d46599464a49a3055d33d499d97ac81fccb Author: Shanyu Zhao Date: Wed Nov 10 18:25:58 2010 -0800 iwlagn: update QoS before commit associated RXON RXON command without association bit can clear the QoS info in the uCode. Therefore, before sending the associated RXON, we need to send the QoS command just in case. Signed-off-by: Shanyu Zhao Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit efe54db8233a4b41e68cbe67ca2e30c48532078a Author: Johannes Berg Date: Wed Nov 10 18:25:49 2010 -0800 iwlagn: fix PAN slot timing wrt. DTIM When the DTIM is not 1, then the slot timing is in some cases required to be calclulated based on the DTIM interval instead of the beacon interval, fix that. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc Author: Johannes Berg Date: Wed Nov 10 18:25:48 2010 -0800 iwlagn: reprogram AP STA after assoc Instead of unconditionally sending unassoc RXON, before any assoc RXON, re-send only the AP STA entry which is required after the BSSID has been programmed into the device to set up internal filters in the microcode properly. This fixes some issues that we correlated with sending a lot of RXON commands to the device. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 893654de3ff41a4f5037397d06a3f853bbbb3484 Author: Johannes Berg Date: Wed Nov 10 18:25:47 2010 -0800 iwlagn: avoid crash if vif is not assigned For reasons that aren't entirely clear to me, we sometimes get here during hardware reset without the interface being set. Don't crash, but keep a warning. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit cfa1da7e9133be9280990b2a64fa7696924c8d9a Author: Johannes Berg Date: Wed Nov 10 18:25:46 2010 -0800 iwlagn: fix PAN queues Currently, when a PAN queue needs to be stopped, we erroneously stop queue number 5 (for example) with mac80211 -- which doesn't even exist! To avoid that problem, recalculate the swq_id for all queues when setting up the queues, and don't use the default identity mapping that is acceptable for devices which don't support PAN. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit ea9b307f8e859186a6791e0d508c5993448ac900 Author: Johannes Berg Date: Wed Nov 10 18:25:45 2010 -0800 iwlwifi: always build swq_id as virtual queue ID Previously, we used the swq_id's mechanism to have AC and HW queue different only for aggregation queues. To be able to fix a bug with iPAN simply always build the swq_id as ac | (hwq << 2) and remove the flag bit. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 549a04e092e5e043df82fd0541f3b67ab488359b Author: Johannes Berg Date: Wed Nov 10 18:25:44 2010 -0800 iwlwifi: pass txq to wake/stop queue Instead of passing the txq->swq_id, pass the txq struct directly to make sure that in the future nobody will pass an invalid number. Only three places actually change from using the txq_id or the skb's queue_mapping to now using txq->swq_id as well. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 4bea9b990205e4a3d432d9d6c29687215618a306 Author: Johannes Berg Date: Wed Nov 10 18:25:43 2010 -0800 iwlagn: remove a bogus AGG_OFF check Even if this check were to happen, using the txq_id here (which is a HW queue) would lead to confusion in mac80211. Luckily, it doesn't seem like this can ever happen. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e Author: Johannes Berg Date: Wed Nov 10 18:25:42 2010 -0800 iwlagn: remove unused variable swq_id Simply remove the unused variable swq_id. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f Author: Johannes Berg Date: Wed Nov 10 18:25:41 2010 -0800 iwlagn: fix some naming regarding FIFOs Some variables are misnamed in the FIFO setup code, fix that. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 564b344c10b694d433cef5b89f8ff8ac5e33898d Author: Wey-Yi Guy Date: Tue Nov 9 09:21:34 2010 -0800 iwlwifi: change default led mode for different devices Set the default led mode for different devices. For the newer devices such as 6000g2a, 6000g2b and newer, the default led mode is On/Off instead of blinking. The led_mode still can be control through module parameter 0: system default 1: On/Off 2: blinking Signed-off-by: Wey-Yi Guy commit 05433df23cf16a9ccbdd35964aba781cdf455034 Author: Wey-Yi Guy Date: Mon Nov 8 12:37:20 2010 -0800 iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex Change the default BT_KILL_ACK_MASK and BT_KILL_CTS_MASK for BT coex Signed-off-by: Wey-Yi Guy commit 66e863a527f9ed3a871797862aaf0d62b0954813 Author: Wey-Yi Guy Date: Mon Nov 8 14:54:37 2010 -0800 iwlagn: support dynamic aggregation for BT coex Use dynamic aggregation threshold if bt traffic load is high to reduce the impact on aggregated frame. Signed-off-by: Wey-Yi Guy commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a Author: Wey-Yi Guy Date: Mon Nov 8 14:55:43 2010 -0800 iwlagn: set dynamic aggregation threshold for BT Setting the max/min/def value for BT dynamic aggregation threshold. Signed-off-by: Wey-Yi Guy commit 8829c9e2ec144baeb3cee599e1e653a396ad521b Author: Wey-Yi Guy Date: Wed Nov 10 11:05:38 2010 -0800 iwlagn: used frame count info in compressed ba packet For newer devices, uCode provide both "number of frames sent" and "number of frames acked" information inside the compressed_ba packet. So instead of figure the success/failure information through the bitmap, use those information which is much betrer approach. Signed-off-by: Wey-Yi Guy commit 27d29dc4be07aafae270992f8d6e400f8912a33d Merge: 936fc42 640dcfa 4232f60 Author: Paul Mundt Date: Tue Nov 16 16:25:35 2010 +0900 Merge branches 'rmobile/fbdev' and 'common/fbdev-edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 936fc42831aa351974b707c00b9e67ac81cd530f Merge: 12ddf37 0ad83f6 Author: Paul Mundt Date: Tue Nov 16 16:25:03 2010 +0900 Merge branch 'fbdev/edid' commit 6d72ad35f1bfaf6e52ca7133cb51ce0e36f17528 Author: Paul Mundt Date: Tue Nov 16 16:10:20 2010 +0900 ARM: mach-shmobile: Tidy up the Kconfig bits. Presently each one of the CPUs manually selects the same feature set, and there's a reasonable expectation that none of these will change for future CPUs in the SH-Mobile / R-Mobile family, so we move those over to the top-level ARCH_SHMOBILE. While we're at it, all of the CPUs support optional GPIOs via the PFC, do not have I/O ports, and expect sparse IRQ, so we bring the configuration in line across the board. This more or less brings the ARM-based parts in sync with their SH counterparts. Signed-off-by: Paul Mundt commit 96f8d864afd646e4a52ea55462b7d83e3b94fd5c Author: Paul Mundt Date: Tue Nov 16 14:00:24 2010 +0900 fbdev: move udlfb out of staging. udlfb has undergone a fair bit of cleanup recently and is effectively at the point where it can be liberated from staging purgatory and promoted to a real driver. The outstanding cleanups are all minor, with some of them dependent on drivers/video headers, so these will be done incrementally from udlfb's new home. Requested-by: Bernie Thompson Signed-off-by: Paul Mundt commit 6b35308850e1679741e8b646cfb7bb3ab5369888 Author: David S. Miller Date: Mon Nov 15 20:15:03 2010 -0800 net: Export netif_get_vlan_features(). ERROR: "netif_get_vlan_features" [drivers/net/xen-netfront.ko] undefined! Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c Author: Vasanthy Kolluri Date: Mon Nov 15 08:09:55 2010 +0000 enic: Fix build warnings Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines. Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit ce5a121304af02d02489e86efb6ae26a67f95e52 Author: Alan Cox Date: Mon Nov 15 07:30:42 2010 +0000 hso: Fix unused variable warning Fallout from the TIOCGICOUNT work Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30 Author: Eric Dumazet Date: Mon Nov 15 06:38:14 2010 +0000 bridge: add RCU annotations to bridge port lookup br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b5ed54e94d324f17c97852296d61a143f01b227a Author: stephen hemminger Date: Mon Nov 15 06:38:13 2010 +0000 bridge: fix RCU races with bridge port The macro br_port_exists() is not enough protection when only RCU is being used. There is a tiny race where other CPU has cleared port handler hook, but is bridge port flag might still be set. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b Author: stephen hemminger Date: Mon Nov 15 06:38:12 2010 +0000 netdev: add rcu annotations to receive handler hook Suggested by Eric's bridge RCU changes. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a386f99025f13b32502fe5dedf223c20d7283826 Author: Eric Dumazet Date: Mon Nov 15 06:38:11 2010 +0000 bridge: add proper RCU annotation to should_route_hook Add br_should_route_hook_t typedef, this is the only way we can get a clean RCU implementation for function pointer. Move route_hook to location where it is used. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e80516880019aa1f7c5c410276edfea9575ec89f Author: Eric Dumazet Date: Mon Nov 15 06:38:10 2010 +0000 bridge: add RCU annotation to bridge multicast table Add modern __rcu annotatations to bridge multicast table. Use newer hlist macros to avoid direct access to hlist internals. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820 Author: Joe Perches Date: Sun Nov 14 17:05:00 2010 +0000 net/ipv6/mcast.c: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031 Author: Joe Perches Date: Sun Nov 14 17:04:58 2010 +0000 include/net/caif/cfctrl.h: Remove unnecessary semicolons Signed-off-by: Joe Perches Acked-by: Sjur Braendeland Signed-off-by: David S. Miller commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147 Author: Joe Perches Date: Sun Nov 14 17:04:57 2010 +0000 include/linux/if_macvlan.h: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80 Author: Joe Perches Date: Sun Nov 14 17:04:37 2010 +0000 drivers/net/cnic.c: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3 Author: Joe Perches Date: Sun Nov 14 17:04:33 2010 +0000 drivers/net/ixgbe: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2 Author: Joe Perches Date: Sun Nov 14 17:04:32 2010 +0000 drivers/net/e1000e: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11 Author: Joe Perches Date: Sun Nov 14 17:04:31 2010 +0000 drivers/net/bnx2x: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ad65ffd12dccf6d1031298eacc060327751084da Author: Joe Perches Date: Sun Nov 14 17:04:26 2010 +0000 drivers/isdn: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6c1b6c6b873d66d353ef47a054156dfde3f4c075 Merge: fe82224 7e87fe8 Author: David S. Miller Date: Mon Nov 15 10:59:49 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit fe8222406c8277a21172479d3a8283d31c209028 Author: Tom Herbert Date: Tue Nov 9 10:47:38 2010 +0000 net: Simplify RX queue allocation This patch move RX queue allocation to alloc_netdev_mq and freeing of the queues to free_netdev (symmetric to TX queue allocation). Each kobject RX queue takes a reference to the queue's device so that the device can't be freed before all the kobjects have been released-- this obviates the need for reference counts specific to RX queues. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit ed9af2e839c06c18f721da2c768fbb444c4a10e5 Author: Tom Herbert Date: Tue Nov 9 10:47:30 2010 +0000 net: Move TX queue allocation to alloc_netdev_mq TX queues are now allocated in alloc_netdev_mq and freed in free_netdev. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52 Author: Timo Teräs Date: Wed Nov 3 04:41:38 2010 +0000 xfrm: use gre key as flow upper protocol info The GRE Key field is intended to be used for identifying an individual traffic flow within a tunnel. It is useful to be able to have XFRM policy selector matches to have different policies for different GRE tunnels. Signed-off-by: Timo Teräs Signed-off-by: David S. Miller commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4 Author: David S. Miller Date: Mon Nov 15 10:37:30 2010 -0800 vlan: Fix build warning in vlandev_seq_show() net/8021q/vlanproc.c: In function 'vlandev_seq_show': net/8021q/vlanproc.c:283:20: warning: unused variable 'fmt' Signed-off-by: David S. Miller commit b1d771ee33c6e4006676002b9d74abf45b71d3d6 Author: Christian Lamparter Date: Fri Oct 29 23:11:23 2010 +0200 carl9170: use generic sign_extend32 This patch replaces the handcrafted sign extension cruft with a generic bitop function. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 7919a57bc608140aa8614c19eac40c6916fb61d2 Author: Andreas Herrmann Date: Mon Aug 30 19:04:01 2010 +0000 bitops: Provide generic sign_extend32 function This patch moves code out from wireless drivers where two different functions are defined in three code locations for the same purpose and provides a common function to sign extend a 32-bit value. Signed-off-by: Andreas Herrmann Signed-off-by: John W. Linville commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1 Author: Grazvydas Ignotas Date: Thu Nov 4 00:13:49 2010 +0200 wl1251: use wl12xx_platform_data to pass data Make use the newly added method to pass platform data for wl1251 too. This allows to eliminate some redundant code. Cc: Ohad Ben-Cohen Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Acked-by: Luciano Coelho Acked-by: Tony Lindgren Signed-off-by: John W. Linville commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080 Author: Grazvydas Ignotas Date: Mon Nov 8 15:29:36 2010 +0200 wl1251: add runtime PM support for SDIO Add runtime PM support, similar to how it's done for wl1271. This allows to power down the card when the driver is loaded but network is not in use. Cc: Ohad Ben-Cohen Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit cb7bbc7a5535ab2333915b83391e1d846a0914df Author: Grazvydas Ignotas Date: Thu Nov 4 00:13:47 2010 +0200 wl1251: add power callback to wl1251_if_operations Call interface specific power callback before calling board specific one. Also allow that callback to fail. This is how it's done for wl1271 and will be used for runtime_pm support. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit f81c1f48384d398dbe8f6c5b10377c7158086791 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:50 2010 -0800 iwlagn: enable shadow register For 6000 series devices and up, enable automatic update MAC's register for better power usage in PSP mode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9 Author: Shanyu Zhao Date: Wed Nov 10 09:56:49 2010 -0800 iwlwifi: disable disconnected antenna for advanced bt coex Disconnected antenna algorithm is used to find out which antennas are disconnected. It should be disabled for devices that support advanced bluetooth coexist. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af Author: Shanyu Zhao Date: Wed Nov 10 09:56:48 2010 -0800 iwlwifi: seperate disconnected antenna function Disconnected antenna algorithm is seperated into its own function from chain noise calibration routine for better code management. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit b2769b84d86a2d29fa131a763d2b23b112834420 Author: Johannes Berg Date: Wed Nov 10 09:56:47 2010 -0800 iwlagn: fix RXON HT When the HT information is changed due to BSS changes (like legacy stations joining) we need to recalculate HT RXON parameters. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8da8e62851680772f0422d0f1c4b467190b268e5 Author: Johannes Berg Date: Wed Nov 10 09:56:46 2010 -0800 iwlagn: re-enable calibration During the RXON rewrite, this code got lost. When we've just associated, we need to enable all calibrations and see if some were already finished. Add back the missing code. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 52d980c01353202332ff4322f3f41db0c49816a5 Author: Johannes Berg Date: Wed Nov 10 09:56:45 2010 -0800 iwlagn: fix RXON issues The RXON rework resulted in a massive loss of throughput because we weren't programming the device completely correctly -- the BSSID has to be programmed into the device before the AP station is uploaded. To fix this, simply always send the unassoc RXON, i.e. even when it was already unassoc so that the BSSID and some other parameters are updated properly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2e1fea43aa170e18beb8378465e595e18cd08f6e Author: Johannes Berg Date: Wed Nov 10 09:56:44 2010 -0800 iwlagn: fix needed chains calculation Garen noticed that this was wrong. Fix the calibration -- default to multiple chains and fall back to single where possible. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 35a6eb36520b938742d8680fd8d821df20982ced Author: Wey-Yi Guy Date: Wed Nov 10 09:56:43 2010 -0800 iwlwifi: resending QoS command when HT changes "mac80211: Fix WMM driver queue configuration" inadvertedly broke iwlwifi, because now mac80211 configures the QoS settings before assoc, and therefore before HT. Thus, iwlwifi no longer told the device about the HT setting, which it needs to -- and thus throughput went down a lot. Fix this by resending the QoS command to the device not only when QoS/WMM settings change, but also when HT changes. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05 Author: Winkler, Tomas Date: Wed Nov 10 09:56:42 2010 -0800 iwlwlifi: update rx write pointer w/o request mac access in the CAM mode In iwl_rx_queue_update_write_ptr function replace iwl_write_direct32 with iwl_write32 when not in power save mode. We don't have to go through grab nic access as the NIC is already awake. Signed-off-by: Tomas Winkler Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 708068db4c09f93937a6a83ac8fff8516f482b0f Author: Wey-Yi Guy Date: Wed Nov 10 09:56:41 2010 -0800 iwlwifi: legacy tx_cmd_protection function Legacy (4965 and 3945) devices has different tx_cmd_protection routine. Move to iwl-legacy.c Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e39fdee1d7856817619326fa114438c146d74510 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:40 2010 -0800 iwlwifi: put all the isr related function under ops There were two type of isr supported by iwlwifi devices. legacy isr - only used by legacy devices (3945 & 4965) ict isr - used by all new generation of iwlwifi devices Move all the isr related functions into ops, the ict type of isr supports only needed for newer devices. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 81baf6ec9c190ae128748cf2a026bff5cb811b70 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:39 2010 -0800 iwlwifi: Legacy isr only used by legacy devices Move iwl_isr_legacy function to iwl_legacy.c since it only used by legacy devices. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ae79d23d0b2c16998e60f49a16dae53521c76a45 Author: Johannes Berg Date: Wed Nov 10 09:56:38 2010 -0800 iwlagn: fix non-5000+ build When building 4965 without 5000+ there were a lot of build errors due to functions being used that weren't even compiled in. To fix this move some code around and only compile the HCMD code for 5000+ series as it's not used for 4965. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e Author: Wey-Yi Guy Date: Wed Nov 10 09:56:37 2010 -0800 iwlagn: update PCI ID for 100 series devices Update the supported PCI ID list for 100 series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit fb30eaf38703d7562606e49a5872745d66366a50 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:36 2010 -0800 iwlagn: update PCI ID for 6000g2a series devices Update the supported PCI ID list for 6000g2a series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:35 2010 -0800 iwlagn: update PCI ID for 6000g2b series devices Update the supported PCI ID list for 6000g2b series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d Author: Ben Greear Date: Mon Nov 8 10:50:03 2010 -0800 ath5k: Print stats as unsigned ints. The debugfs code for ath5k was printing some unsigned int stats with %d instead of %u. This meant that you could see negative numbers instead of a clean wrap. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 8c5765fda4b382acce4ff386e18ec11790dff893 Author: Ivo van Doorn Date: Sat Nov 6 15:49:01 2010 +0100 rt2x00: Add watchdog functions for HW queue Add watchdog functions for managing the Queues inside the hardware. Normally the driver doesn't have much to do with these queues directly, but the Ralink drivers did implement watchdog functions for these. These watchdog functions are not triggered that often, compared to the other watchdog functions, but I have at least seen them trigger once or twice during a long stresstest run. v2: Add extra documentation for register fields Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36 Author: Ivo van Doorn Date: Sat Nov 6 15:48:43 2010 +0100 rt2x00: Remove rt2x00lib_toggle_rx As part of the queue refactoring, the rt2x00lib_toggle_rx can be removed and replaced with the call directly to the set_device_state callback function. We can remove the STATE_RADIO_RX_ON_LINK and STATE_RADIO_RX_OFF_LINK, as it was only used for special behavior inside rt2x00lib rather then the drivers. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 8be4eed0ea7d8ef38692de878043a949e9db16e8 Author: Ivo van Doorn Date: Sat Nov 6 15:48:23 2010 +0100 rt2x00: Fix rt2x00queue_kick_tx_queue arguments The queue_entry argument to rt2x00queue_kick_tx_queue, doesn't make sense due to the function name (it is called kick QUEUE)... But neither do we need the queue_entry, since we need the data_queue. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 813f0339dd739c48607f12dac79ec26c61874226 Author: Ivo van Doorn Date: Sat Nov 6 15:48:05 2010 +0100 rt2x00: Rename queue->lock to queue->index_lock The queue->lock is only used to protect the index numbers. Rename the lock accordingly. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488 Author: Mark Einon Date: Sat Nov 6 15:47:46 2010 +0100 rt2x00: checkpatch.pl error fixes for rt73usb.c rt73usb.c:43: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce Author: Mark Einon Date: Sat Nov 6 15:47:25 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00queue.c rt2x00queue.c:804: ERROR: space prohibited after that open parenthesis '(' rt2x00queue.c:805: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 027e8fd105c82956de9dec232bad21b1628ee7c0 Author: Mark Einon Date: Sat Nov 6 15:47:09 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00link.c rt2x00link.c:70: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b Author: Mark Einon Date: Sat Nov 6 15:46:53 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00lib.h rt2x00lib.h:60: ERROR: space prohibited after that open parenthesis '(' rt2x00lib.h:60: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c2361baec100c6f373107346e3fd98e9b267ac6c Author: Mark Einon Date: Sat Nov 6 15:46:36 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00dev.c rt2x00dev.c:689: ERROR: spaces required around that '=' (ctx:WxV) Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9 Author: Mark Einon Date: Sat Nov 6 15:46:17 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00config.c rt2x00config.c:136: ERROR: space required before the open parenthesis '(' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 87a46caf920515eb269df0109f0a61a958236568 Author: Mark Einon Date: Sat Nov 6 15:45:58 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800usb.h rt2800usb.h:43: ERROR: space prohibited after that open parenthesis '(' rt2800usb.h:43: ERROR: space prohibited before that close parenthesis ')' rt2800usb.h:44: ERROR: space prohibited after that open parenthesis '(' rt2800usb.h:44: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e Author: Mark Einon Date: Sat Nov 6 15:45:41 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800usb.c rt2800usb.c:48: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c6cbadeb3afd9471e539791842877d085f367746 Author: Mark Einon Date: Sat Nov 6 15:45:22 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800pci.h rt2800pci.h:41: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:42: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:43: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:44: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:55: ERROR: space prohibited after that open parenthesis '(' rt2800pci.h:55: ERROR: space prohibited before that close parenthesis ')' rt2800pci.h:56: ERROR: space prohibited after that open parenthesis '(' rt2800pci.h:56: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9 Author: Mark Einon Date: Sat Nov 6 15:45:06 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800lib.c rt2800lib.c:831: ERROR: inline keyword should sit between storage class and type Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a Author: Mark Einon Date: Sat Nov 6 15:44:52 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800.h rt2800.h:1511: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1511: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1513: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1513: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1515: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1515: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1517: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1517: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1519: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1519: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1521: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1521: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1661: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1661: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1662: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1662: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1663: ERROR: space prohibited before that close parenthesis ')' rt2800.h:2013: ERROR: space prohibited after that open parenthesis '(' rt2800.h:2013: ERROR: space prohibited before that close parenthesis ')' rt2800.h:2014: ERROR: space prohibited after that open parenthesis '(' rt2800.h:2014: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af Author: Mark Einon Date: Sat Nov 6 15:44:33 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2500usb.c rt2500usb.c:42: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68 Author: Mark Einon Date: Sat Nov 6 15:44:15 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2500pci.h rt2500pci.h:1091: ERROR: space prohibited after that open parenthesis '(' rt2500pci.h:1091: ERROR: space prohibited before that close parenthesis ')' rt2500pci.h:1092: ERROR: space prohibited after that open parenthesis '(' rt2500pci.h:1092: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 46b9786975a69a75f25b71796f7e36d203fbd4ee Author: Mark Einon Date: Sat Nov 6 15:44:00 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2400pci.h rt2400pci.h:812: ERROR: space prohibited after that open parenthesis '(' rt2400pci.h:812: ERROR: space prohibited before that close parenthesis ')' rt2400pci.h:813: ERROR: space prohibited after that open parenthesis '(' rt2400pci.h:813: ERROR: space prohibited before that close parenthesis ')' rt2400pci.h:950: ERROR: Macros with complex values should be enclosed in parenthesis Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d Author: Christian Lamparter Date: Sat Nov 6 14:07:10 2010 +0100 carl9170: tx path review This patch fixes a few shortcomings in the tx path. * move temp. ampdu_[ack]_len out of txinfo->pad. * fix WARN_ON from tx.c:line 300 when tx_ampdu_queue fails to queue the frame. * In tx_prepare, we already have a local pointer to the station's ieee80211_sta struct. * remove a second !sta check, tx_prepare already takes care of that. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit ffa56e540c3949c4560dcce45eca247819e183c1 Author: Jesper Juhl Date: Thu Nov 4 22:59:56 2010 +0100 mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher() crypto_free_cipher() is a wrapper around crypto_free_tfm() which is a wrapper around crypto_destroy_tfm() and the latter can handle being passed a NULL pointer, so checking for NULL in the ieee80211_aes_key_free()/ieee80211_aes_cmac_key_free() wrappers around crypto_free_cipher() is pointless and just increase object code size needlesly and makes us execute extra test/branch instructions that we don't need. Btw; don't we have to many wrappers around wrappers ad nauseam here? Anyway, this patch removes the redundant conditionals. Signed-off-by: Jesper Juhl Signed-off-by: John W. Linville commit 723fc7af5300dba9eac40cb23dbefa67589e5181 Author: Lalith Suresh Date: Thu Nov 4 20:43:16 2010 +0100 rt2x00: Fix comments in rt73usb.h and rt61pci.h This patch fixes a few comments in rt73usb.h and rt61pci.h. Signed-off-by: Lalith Suresh Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fa8b4b22d543b4052602b0c86065150613ed19e8 Author: Helmut Schaa Date: Thu Nov 4 20:42:36 2010 +0100 rt2x00: Fix hw crypto in AP mode for some devices The BSSID register shouldn't be set in AP mode on some older devices (like rt73usb) as it breaks hw crypto on these. However, rt2800 devices explicitly need the BSSID register set to the same value as our own MAC address (only in AP mode). Hence, don't set the BSSID from rt2x00lib but move it down into rt2800 to avoid problems on older devices. This fixes a regression (at least for rt73usb) and avoids a new regression for rt2800 devices in 2.6.36. Reported-by: Johannes Stezenbach Reported-by: Lee Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 070192dd2975c0e97bbdeac7623b755235c6db7d Author: Ivo van Doorn Date: Thu Nov 4 20:41:05 2010 +0100 rt2x00: Fix crash on USB unplug By not scheduling the TX/RX completion worker threads when Radio is disabled, or hardware has been unplugged, the queues cannot be completely cleaned. This causes crashes when the hardware has been unplugged while the radio is still enabled. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 303c7d6abfd0430e39e84a43361492b4a8c890b6 Author: Ivo van Doorn Date: Thu Nov 4 20:40:46 2010 +0100 rt2x00: Fix MCU_SLEEP arguments Legacy driver uses 0xff as the second argument for the MCU_SLEEP command. It is still unknown what the values actually mean, but this will at least keep the command in-sync with the original driver. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b Author: Ivo van Doorn Date: Thu Nov 4 20:40:11 2010 +0100 rt2x00: Implement flush callback Implement a basic flush callback function, which simply loops over all TX queues and waits until all frames have been transmitted and the status reports have been gathered. At this moment we don't support dropping any frames during the flush, but mac80211 will only send 'false' for this argument anyway, so this is not important at this time. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0 Author: Ivo van Doorn Date: Thu Nov 4 20:39:48 2010 +0100 rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma When the TX status handler failed to clear the queue in rt2x00usb_watchdog_tx_dma() we shouldn't use a failsave to use the rt2x00usb txdone handler. If a driver has overriden the txdone handler it must make sure the txdone handler is capable of cleaning up the queue itself. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 7225ce1ea93d24c0914eea0410dcfc426281f996 Author: Ivo van Doorn Date: Thu Nov 4 20:39:23 2010 +0100 rt2x00: Rename rt2x00queue_timeout Rename rt2x00queue_timeout to rt2x00queue_status_timeout to better describe what is actually timing out (note that we already have a rt2x00queue_dma_timeout). Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104 Author: Helmut Schaa Date: Thu Nov 4 20:38:56 2010 +0100 rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active When rt2x00 is compiled with debugging but frame dumping is currently not active we can avoid the call to do_gettimeofday. Furthermore, frame dumping is not the default case, mark it as unlikely. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0 Author: Helmut Schaa Date: Thu Nov 4 20:38:15 2010 +0100 rt2x00: Reduce tx descriptor size The tx descriptor values qid, cw_min, cw_max and aifs are directly accessible through the tx entry struct. So there's no need to copy them into the tx descriptor and passing them to the indiviual drivers. Instead we can just get the correct value from the tx entry. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 08e5310028359de2daaa39cd10e9ca493c51792b Author: Helmut Schaa Date: Thu Nov 4 20:37:47 2010 +0100 rt2x00: Wait up to one second on rt2800 for WPDMA to be ready At least some devices need such a long time to inititalize WPDMA. This only increases the maximum wait time and shouldn't affect devices that have been working before. Reported-by: Joshua Smith Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit efd2f271e44c7ea011cdb0363d38f40338ab80d2 Author: Helmut Schaa Date: Thu Nov 4 20:37:22 2010 +0100 rt2x00: Sync Tx and RX ring sizes with legacy drivers All rt2x00 devices used the same Tx and Rx ring size (24 entries) till now. Newer devices (like rt2800) can however make use of a larger TX and RX ring due to 11n capabilities (AMPDUs of size 64 for example). Hence, bring rt2x00 in sync with the legacy drivers and use the same TX and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES, BEACON_ENTRIES and ATIM_ENTRIES and use per driver values. That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb, rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 961621abee08fde2328daf6f8000e1059e5205e9 Author: Helmut Schaa Date: Thu Nov 4 20:36:59 2010 +0100 rt2x00: Add TXOP_CTRL_CFG register definition Remove the magic value initialisation of the TXOP_CTRL_CFG register by defining its fields and using them during intialisation. The field RESERVED_TRUN_EN is referred to as reserved, however it is set to 1 by the legacy drivers. Hence, do the same. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 066dae93bdfcc7af5e38a33617773fd5c6457607 Author: Felix Fietkau Date: Sun Nov 7 14:59:39 2010 +0100 ath9k: rework tx queue selection and fix queue stopping/waking The current ath9k tx queue handling code showed a few issues that could lead to locking issues, tx stalls due to stopped queues, and maybe even DMA issues. The main source of these issues is that in some places the queue is selected via skb queue mapping in places where this mapping may no longer be valid. One such place is when data frames are transmitted via the CAB queue (for powersave buffered frames). This is made even worse by a lookup WMM AC values from the assigned tx queue (which is undefined for the CAB queue). This messed up the pending frame counting, which in turn caused issues with queues getting stopped, but not woken again. To fix these issues, this patch removes an unnecessary abstraction separating a driver internal queue number from the skb queue number (not to be confused with the hardware queue number). It seems that this abstraction may have been necessary because of tx queue preinitialization from the initvals. This patch avoids breakage here by pushing the software <-> hardware queue mapping to the function that assigns the tx queues and redefining the WMM AC definitions to match the numbers used by mac80211 (also affects ath9k_htc). To ensure consistency wrt. pending frame count tracking, these counters are moved to the ath_txq struct, updated with the txq lock held, but only where the tx queue selected by the skb queue map actually matches the tx queue used by the driver for the frame. Signed-off-by: Felix Fietkau Reported-by: Björn Smedman Signed-off-by: John W. Linville commit 21e731a1b15bf03927e292af1b4a2c84fc8af817 Author: Rafał Miłecki Date: Wed Nov 3 21:36:12 2010 +0100 b43legacy: rfkill: use status register based on core revision (not PHY's) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d94519c1b0de827d5d142b9333b7f114c0b3a021 Author: maximilian attems Date: Tue Nov 2 23:39:12 2010 +0100 zd1201: Add missing id The Mandriva patch seems to stem from 2.6.14, so much for their upstreaming effort. Didn't find another Linux reference of it, just an omnious "USB\VID_1044&PID_8004" from GigabyteZD1201U.INF for Gigabyte GN-WLBZ101 802.11b USB Adapter, which matches the Mandriva patch comment. Aboves file also lists an "USB\VID_1044&PID_8006", which I have kept appart as this "Gigabyte GN-WBZB-M 802.11b USB Adapter" didn't show up in googling. Signed-off-by: maximilian attems Signed-off-by: John W. Linville commit 8cecc90e4a302ac214c48e362709ce906a96a295 Author: maximilian attems Date: Tue Nov 2 23:10:12 2010 +0100 zd1211rw: add 2 missing usb id's "These USB ID came from Palnex Worked fine." says Mandriva patch for their 2.6.32 and earlier. Web has evidence for both id's to work, so just add them upstream: http://www.mail-archive.com/zd1211-devs@lists.sourceforge.net/msg00507.html http://ubuntuforums.org/showthread.php?t=473046 Signed-off-by: Go Taniguchi Signed-off-by: maximilian attems Signed-off-by: John W. Linville commit daeeb074105a80a34f90a454c24efc14e9a8d3c3 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:39 2010 -0200 rtl8187: restore anaparam registers after reset with 8187B Current 8187B initialization misses anaparam registers restore after 8187 reset. This causes ANAPARAM register to stay zeroed out (ANAPARAM2 kept its value on my tests). To avoid this, call rtl8187_set_anaparam right after chip reset (to be on the safe side, as it makes sure we restore all ANAPARAM registers). Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Cc: seno Signed-off-by: John W. Linville commit 998606cfd75e7a8169ed0d324061a8d6bc60716a Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:38 2010 -0200 rtl8187: remove uneeded setting of anaparam write Usually you set RTL818X_CONFIG3_ANAPARAM_WRITE when you are going to change/write ANAPARAM registers. But in current initialization of RTL8187B there is a place where ANAPARAM_WRITE bit is set without any ANAPARAM register being written, without reason, so remove it. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Cc: seno Signed-off-by: John W. Linville commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:37 2010 -0200 rtl8187: consolidate anaparam on/off write sequences There are repeated calls for anaparam on/off sequence in the code. Consolidate the common code in rtl8187_set_anaparam and use it where needed. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit fe3326903d7aafd7b5602d8e178537c8b0465f6c Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:36 2010 -0200 rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B The GNTSel bit should only concern pci devices by looking at RTL8180 spec, which is not the case of 8187B. Also testing shows that trying to set this bit fails, a subsequent read from the register after trying to set it shows that the bit isn't set, seems the hardware ignores it, which makes sense. This setting was a left over from Realtek sources. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 896cae65fc0489b8e42bb7790f64731d53a2cecf Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:35 2010 -0200 rtl8187: move pll reset at start out of ANAPARAM write On 8187B start, comment about pll reset, and move it out of ANAPARAM write sequence, so that code is more readable. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:34 2010 -0200 rtl8187: avoid redundant write to register FF72 (RFSW_CTRL) The table with misc register initialization was setting it, and later on we would set it again with a explicity call to rtl818x_iowrite16_idx. Remove duplicate initialization from the register table. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 60f589145d76cf834ec5e485c5412ec0994e52d1 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:33 2010 -0200 rtl8187: fix wrong register initialization in 8187B We were using wrong address for BRSR (Basic Rate Set Register) while initializing its value, comparing with Realtek sources, for 8187B case. Also, the same register is initialized in rtl8187b_reg_table, so remove the duplicate initialization from the table. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit f002c25cc13e86762551c0eda29a40c60d6dbf1b Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:32 2010 -0200 rtl8187: remove setting of beacon/atim registers from initialization On 8187B path, we set a initial value for beacon interval and atim window on initialization. But this isn't needed, since same setup is done on rtl8187_config. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 327571ea9927beec2ee2ed9a266c57c1515393b4 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:31 2010 -0200 rtl8187: remove redundant initialization of ARFR This removes redundant write to Auto Rate Fallback Register on RTL8187B. The same value was being written twice in the same function. Avoid this removing the duplicate initialization on rtl8187b_reg_table, and also add comment for this write (information from Realtek source). Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6 Author: Nishant Sarmukadam Date: Mon Nov 1 17:55:48 2010 -0700 mwl8k: force AP mode to use non-AMPDU frames AP firmware uses xmitcontrol to differentiate between AMPDU and non-AMPDU frames. As the support for AMPDU is not yet added, set xmitcontrol to non-AMPDU for all tx frames for AP firmware. This field will be set to indicate ampdu/non-ampdu frames when tx AMPDU support is added. Signed-off-by: Pradeep Nemavat Signed-off-by: Brian Cavagnolo Acked-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 3eedb6f436858f3e864139dc184adc9a51440c92 Author: Christian Lamparter Date: Sat Oct 30 00:36:53 2010 +0200 carl9170: configurable beacon rates Previously, the beacon rate was fixed to either: * 1Mb/s [2.4GHz band] * 6Mb/s [5GHz band] This limitation has been addressed and now the beacon rate is selected by ieee80211_tx_info's rate control info, almost like any ordinary data frame. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 2a6cef513fab525399e484edc9bfb39b6d462f76 Author: Christian Lamparter Date: Fri Oct 29 23:41:16 2010 +0200 carl9170: stop stale uplink BA sessions This patch fixes a possible lengthy stall if the device is operating as an experimental 11n AP and an STA [during heavy txrx action] suddenly signalized to go off-channel (old NetworkManager), or (sleep - which is unlikely, because then it wouldn't be *active* at all!?). Because the driver has to manage the BA Window, the sudden PSM transition can leave active uplink BA sessions to the STA in a bad state and a proper cleanup is needed. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit e4a668c59080f862af3ecc28b359533027cbe434 Author: Christian Lamparter Date: Fri Oct 29 23:26:13 2010 +0200 carl9170: fix spurious restart due to high latency RX Stress tests of unidirectional bulk traffic with bitrates of up to 220Mbit/s have revealed that the fatal-event recovery logic [which was solely triggered by an out-of-rx-buffer situation] is too aggressive. The new method now "pings" the device and then decides - based on the response - whenever a restart is needed or not. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8 Author: Christian Lamparter Date: Fri Oct 29 23:17:38 2010 +0200 carl9170: initialize HW aMPDU parameters properly This patch changes the initial aMPDU density and factor settings to match those of Otus. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3f1240e4f4b249f2388903864bdc766973f76687 Author: Christian Lamparter Date: Fri Oct 29 22:44:59 2010 +0200 carl9170: import hw/fw header updates This patch imports all shared header changes from carl9170fw.git. * add some strategic __aligned(4). This allows the compiler generate optimized code for architectures which can't access (unaligned/packed) data efficiently. ("ath9k_hw: optimize all descriptor access functions") * add a forgotten __CARL9170FW__ ifdef around a private firmware-internal struct. * GET_VAL macro helper Very useful for extracting data out of the bit-packed PHY registers. * cosmetic changes e.g.: _CCA_MINCCA_ to just _CCA_MIN_. * version bump 1.8.8.3 -> 1.9.0. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit bdd7bd16439975133d36bcd7c9c489302a114525 Author: Blaise Gassend Date: Thu Oct 28 02:01:24 2010 -0700 mac80211_hwsim: Incorporate txpower into rssi Up to now mac80211_hwsim has been reporting an rssi of -50. This patch improves the model slightly by returning txpower-50. This makes it easy to stimulate tests that need to see a varying rssi. Signed-off-by: Blaise Gassend Signed-off-by: John W. Linville commit 19999792d2889350611ba9e346d6a2924959dc2d Author: Thadeu Lima de Souza Cascardo Date: Thu Oct 28 20:01:00 2010 -0200 rtl8187b: do not do per packet TX AGC Clearing the per packet TX AGC for the RTL8187B device appears to increase its overall TX power. This allows the device to associate and a connection to be established using APs a little further away. This is in accordance to what is done for RTL8187L devices and also what Realtek drivers do. Tested-by: Thadeu Lima de Souza Cascardo Signed-off-by: Thadeu Lima de Souza Cascardo Cc: linux-wireless@vger.kernel.org Cc: Larry Finger Cc: Rogerio Luz Coelho Cc: Herton Ronaldo Krzesinski Cc: Hin-Tak Leung Cc: seno Tested-by: Herton Ronaldo Krzesinski Signed-off-by: John W. Linville commit e285a5250c0772c5596a9137041a96b2c1f744d6 Author: Eliad Peller Date: Wed Oct 27 14:09:58 2010 +0200 wl1271: add recover testmode command add RECOVER testmode command. this command triggers a recovery sequence (by enqueueing a recovery_work). Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5 Author: Eliad Peller Date: Wed Oct 27 14:09:57 2010 +0200 wl1271: handle HW watchdog interrupt unmask the WL1271_ACX_INTR_WATCHDOG interrupt. when getting it - enqueue a recovery work and bail out. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 03107a4b5923aa7767329e857caf227749087e47 Author: Eliad Peller Date: Wed Oct 27 14:58:30 2010 +0200 wl1271: refactor debugfs function generation code refactor wl1271_debugfs by using a format© function, instead of duplicating the code for each generated function. this change reduces about 3Kb from wl1271.ko Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 71125abdf0c297adc00dc5632f0318b2397286f5 Author: Eliad Peller Date: Thu Oct 28 21:46:43 2010 +0200 wl1271: set wl->vif only if add_interface succeeded. set wl->vif to the newly created interface only after the firmware booted successfully. on the way - make the function flow more clear. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273 Author: Juuso Oikarinen Date: Tue Oct 26 13:24:39 2010 +0200 wl1271: Check interface state in op_* functions Check the state of the interface on op_* function so we don't try to access the hardware in when its off. The mac80211 may call these in some corner cases related, for instance, to the hardware recovery procedure. These accesses cause a kernel crash on at least some SDIO devices, because the bus is not properly claimed in that scenario. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b Author: Juuso Oikarinen Date: Tue Oct 26 13:24:38 2010 +0200 wl1271: Fix scan failure detection In scan_complete_work, because the mutex is released before accessing the scan->failed flag, it is possible for unfounded hardware recovery rounds to be executed. Fix this. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf Author: Juuso Oikarinen Date: Mon Oct 25 11:24:29 2010 +0200 wl1271: Fix RX path stall The wl1271_rx function loops through packets in an aggregated buffer. Each packet in the buffer is handled by a call to wl1271_rx_handle_data, which will fail if skb memory allocation fails or production mode is enabled. These failures currently prevent the rx counters to be incremented, thus causing the rx loop to run forever. Fix this by ignoring error codes reported wl1271_rx_handle_data function. This essentially means that frames will be dropped in production mode, which is the intetion, and frames will be dropped if memory allocation fails, which is a decent way to recover from that situation. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ff6d76fd3d45ed5494287e57d76073739721214b Author: Nicolas Kaiser Date: Mon Oct 25 15:30:03 2010 +0200 wireless/wl1271: remove redundant if-statement v2 wl1271_ps_elp_sleep() is void and cannot return a value. Signed-off-by: Nicolas Kaiser Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36 Author: Luciano Coelho Date: Wed Oct 20 15:15:52 2010 +0300 wl1271: exit ELP mode when setting enabled rates in tx This bug was being triggered by a call to acx_rate_policies in tx_work without calling ps_elp_wakeup first. If we have full PSM enabled, this happens rather often, immediately after association. Reported-by: Tuomas Katila Signed-off-by: Luciano Coelho Tested-by: Tuomas Katila commit 6a2de93b2553c2e9a72997370534993c85c1eee6 Author: Teemu Paasikivi Date: Thu Oct 14 11:00:04 2010 +0200 wl1271: Fix warning about unsupported RX rate While scanning, it is possible that beacon and probe response frames are received on other band than configured to the driver. In rx status handling this has caused "Unsupported RX rate from HW" warnings. This patch changes the wl1271_rate_to_index function to take the band of the received frame as a parameter instead of using value configuret to wl->band. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 18357850b694ba3fa29363c7d86ccd8783f4a065 Author: Shahar Levi Date: Wed Oct 13 16:09:41 2010 +0200 wl1271: 11n Support, functionality and configuration ability Add 11n ability in scan, connection and using MCS rates. The configuration is temporary due to the code incomplete and still in testing process. That plans to be remove in the future. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5 Author: Shahar Levi Date: Wed Oct 13 16:09:40 2010 +0200 wl1271: 11n Support, ACX Commands Added ACX command to the FW for 11n support. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit e8b03a2b8debc6056f6f43d24f98f601097301a1 Author: Shahar Levi Date: Wed Oct 13 16:09:39 2010 +0200 wl1271: 11n Support, Add Definitions Two acx commands: ht_capabilities & ht_information, 11n sta capabilities macro. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 2fe33e8cff354a3f320549544bffebbbab680145 Author: Ido Yariv Date: Tue Oct 12 14:49:12 2010 +0200 wl1271: Fix TX queue low watermark handling The number of entries in the TX queue is compared to the low watermark value each time TX completion interrupts are handled. However, the fact that a TX completion arrived does not necessarily mean there are any less skbs in the TX queue. In addition, a TX completion interrupt does not necessarily mean that there are any new available TX blocks. Thus, queuing TX work when the low watermark is reached might not be needed. Fix this by moving the low watermark handling to the TX work function, and avoid queuing TX work in this case. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e Author: Ido Yariv Date: Tue Oct 12 16:20:06 2010 +0200 wl1271: Allocate TX descriptors more efficiently On each TX descriptor allocation, a free entry is found by traversing the TX descriptors array. Improve this by holding a bitmap of all TX descriptors, and using efficient bit operations to search for free entries. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit a522550a283de31c7cfc30c7a129ce584e38c582 Author: Ido Yariv Date: Tue Oct 12 14:49:10 2010 +0200 wl1271: Fix TX starvation While wl1271_irq_work handles RX directly (by calling wl1271_rx), a different work is scheduled for transmitting packets. The IRQ work might handle more than one interrupt during a single call, including multiple TX completion interrupts. This might starve TX, since no packets are transmitted until all interrupts are handled. Fix this by calling the TX work function directly, instead of deferring it. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 6c6e669ed6282788d6045397ce0f201edc400d9d Author: Ido Yariv Date: Tue Oct 12 14:49:09 2010 +0200 wl1271: TX aggregation optimization In case the aggregation buffer is too small to hold all available packets, the buffer is transferred to the FW and no more packets are aggregated. Although there may be enough available TX blocks, no additional packets will be handled by the current TX work. Fix this by flushing the aggregation buffer when it's full, and continue transferring packets as long as there are enough available TX blocks. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit c8aea565e8f715d9f10064b1cbfbc15bf75df501 Author: Gery Kahn Date: Tue Oct 5 16:09:05 2010 +0200 wl1271: ref_clock cosmetic changes Cosmetic cleanup for ref_clock code while configured by board. Signed-off-by: Gery Kahn Signed-off-by: Luciano Coelho commit 34d59c07e9ad7130813c28f8554ef1298af923b7 Author: Wey-Yi Guy Date: Sat Oct 23 09:15:46 2010 -0700 iwlagn: use 6000g2b uCode for 130 series devices For 130 series device, 6000g2b uCode will be used, no need to have additional defines for 130 devices, so remove those. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 69d826b6c54de113f02a73990b6f6809289b48cc Author: Wey-Yi Guy Date: Sat Oct 23 09:15:45 2010 -0700 iwlwifi: add new devices to Kconfig Adding description to Kconfig to indicate more devices are being supported by iwlagn Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f5682c01eb85fce13d064d232c947322bd7e2631 Author: Wey-Yi Guy Date: Sat Oct 23 09:15:44 2010 -0700 iwlagn: turn dynamic smps on while BT is on While BT is on and doing iscan and/or pscan, BT is in listen mode which will impact WiFi throughput, we need to enable dynamic smps in order to improve the rx throughput. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit d4daaea656e0b5543c2e37c31934cea8f044b31e Author: Johannes Berg Date: Sat Oct 23 09:15:43 2010 -0700 iwlwifi: implement switching iftype while up Implement switching the interface while an interface is up in iwlwifi. Interfaces have to stay on the context they were created on. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690 Author: Johannes Berg Date: Sat Oct 23 09:15:42 2010 -0700 iwlwifi: fix IBSS beaconing My previous patch to clean up all RXON handling inadvertently broke IBSS because it failed to take into account that unlike in AP mode, IBSS requires beacons to be sent only after setting the RXON assoc. Fix this, clean up the code a bit, improve the error checking around this, and also react to beacon changes in IBSS mode from mac80211. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc Author: Johannes Berg Date: Sat Oct 23 09:15:41 2010 -0700 iwlagn: new RXON processing for modern devices In order to simplify the flow, and make new enhancements easier, separate out the RXON processing for modern AGN (5000 and newer) from RXON processing for the older 3945 and 4965 devices. Avoid changing these old ones to avoid regressions and move their code to a new file (iwl-legacy.c). 4965 gets the commit_rxon that used to be common for all AGN devices, but with removed PAN support. The new RXON processing is more central and does more work in committing, so that it is easier to follow. To make it more evident what is split out for legacy, split the necessary operations for that into a new struct iwl_legacy_ops. Those parts that still exist in the new AGN code don't need to be parametrized. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2d4e43c3c6783f956163c11568303b0390725e28 Author: Johannes Berg Date: Sat Oct 23 09:15:40 2010 -0700 iwlagn: don't resend RXON timing Resending RXON timing here caused issues with dual-mode under certain circumstances, so avoid doing it here right now. This effectively reverts b01efe434bd6ea807eb72b and partially 2491fa42d9bdf26075765. The next patch will make all this cleaner for just the devices that need it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit dc21b5453249e7e9b8878fab356fd60b731cf04d Author: Johannes Berg Date: Sat Oct 23 09:15:39 2010 -0700 iwlwifi: make mac80211 ops a device config In the future, 4965 and modern AGN devices will need to have different mac80211 callbacks since they have different capabilities. Prepare for that by making the mac80211 operations a device config. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 07caf9d6c9135ae25a760867f37aab90c1008380 Author: Eliad Peller Date: Wed Oct 27 14:58:29 2010 +0200 mac80211: refactor debugfs function generation code refactor mac80211 debugfs code by using a format© function, instead of duplicating the code for each generated function. this change reduces about 600B from mac80211.ko Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit 6a6733f256f18cbcf4875e13f59eedb593b755a8 Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:25 2010 -0700 ath9k: content DMA start / stop through the PCU lock This helps align resets / RX enable & disable / TX stop / start. Locking around the PCU is important to ensure the hardware doesn't get stale data when working with DMA'able data. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4bdd1e978ede034c1211957eb17eaf50de00d234 Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:24 2010 -0700 ath9k: move the PCU lock to the sc structure The PCU lock should be used to contend TX DMA as well, this will be done next. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9d94674ab754be0e275120a183670ead435f9c0d Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:23 2010 -0700 ath9k: simplify hw reset locking The new PCU lock is better placed so we can just contend against that when trying to reset hardware. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5d4c428254f73bae272be9d296724b1ee09d76ec Author: Mohammed Shafi Shajakhan Date: Tue Oct 26 21:28:57 2010 +0530 ath9k: Properly assign boolean types This takes care that boolean types are properly assigned Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb Author: Rajkumar Manoharan Date: Tue Oct 26 20:11:29 2010 +0530 ath9k_htc: Handle monitor mode properly for HTC devices No need to inform about monitor interface changes to firmware. Set the HW mode to monitor type based on mac80211 indication flag is sufficient. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit f60dc0138aa19769bf8bab9f93b043235428b66f Author: John W. Linville Date: Mon Oct 25 16:12:37 2010 -0400 iwlwifi: Convert to new PCI PM framework Use the new PCI PM and let the PCI core code handle the PCI-specific details of power transitions. Based on similarly titled ath9k patch posted by Rafael J. Wysocki. Signed-off-by: John W. Linville Acked-by: Rafael J. Wysocki Acked-by: Wey-Yi Guy commit b9237578f8d685bb86901ba9ff0d379218e5a3c5 Author: John W. Linville Date: Mon Oct 25 10:33:07 2010 -0400 rt2x00pci: do not use GFP_DMA Signed-off-by: John W. Linville Acked-by: Ivo van Doorn commit 26f94dc264a7ebddcc08d3908e99880703d871e5 Author: John W. Linville Date: Mon Oct 25 10:24:09 2010 -0400 b43: remove extraneous code in free_ringmemory This code seems to have been cut-n-pasted from alloc_ringmemory? Anyway, it is useless. Signed-off-by: John W. Linville commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02 Author: Hauke Mehrtens Date: Sat Oct 23 19:51:32 2010 +0200 carl9170: fix typos Signed-off-by: Hauke Mehrtens Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593 Author: Rafał Miłecki Date: Fri Oct 22 17:43:49 2010 +0200 b43: N-PHY: improve 2055 radio initialization 1) Upload 5 GHz values when needed. 2) Do not upload all values on first init. Follow wl. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b Author: Rafał Miłecki Date: Fri Oct 22 17:43:48 2010 +0200 b43: N-PHY: determine usage of radio regulatory workaround correctly Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb Author: Rafał Miłecki Date: Fri Oct 22 17:43:47 2010 +0200 b43: define known SPROM boardflags2 bits Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1 Author: Rafał Miłecki Date: Fri Oct 22 17:43:46 2010 +0200 b43: N-PHY: fix 2055 radio init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:30 2010 +0200 iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc Currently we are canceling scan when changing BSSID. Behave the same when changing association and beacon enablement, to avoid committing rxon during scan in iwl_set_no_assoc(). Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ac4f5457c7617999967e9740f8903b922714bab4 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:29 2010 +0200 iwlwifi: defer update power mode while scan Do not set power mode when scanning, and defer that when scan finish. We still set power mode in force case i.e. when device is overheated. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5eda74a40587139b1d66cd8197cac92ba36e79f4 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:28 2010 +0200 iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work Avoid sending commands to firmware (including commit_rxon) when scan is pending and we are calling iwlagn_bt_traffic_change_work simultaneously. Also comment some innocent race conditions. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:27 2010 +0200 iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter Almost anywhere in the code we avoid committing rxon while performing scan, and make rxon commit when scan complete. However in some places in the code we do not follow that rule. This patch fix that problem in iwlagn_configure_filter(). Since we do not commit directly in iwl3945_configure_filter, we can also do the same for agn, so I just remove iwlcore_commit_rxon() function and add a comment. Also change comment for iwl3945. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit a25a66ac94db88190653d5725c563e3f8faeee61 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:26 2010 +0200 iwlwifi: fix set_tx_power vs scan According to comment in iwl_bg_scan_completed, setting tx power should be deferred during pending scan, but we are not doing this. This patch change code to really defer setting tx power after scan complete. Additionally refactor iwl_set_tx_power code and call lib->send_tx_power() directly from iwlagn_commit_rxon. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4cbf1b12491cd43032846acc6c6924d9090fa19f Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:25 2010 +0200 iwlwifi: send tx_power_cmd synchronously On 5xxx and 6xxx change to send tx_power_cmd command synchronously, to do not start other commands when setting tx power is pending. We currently do the same for 4956 and 3945. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642 Author: Stanislaw Gruszka Date: Mon Oct 25 10:34:50 2010 +0200 iwlwifi: warn when send tx power settings during scan Add WARN_ONCE when scanning is pending. Use STATUS_SCAN_HW bit since we can have scan canceled or completed but STATUS_SCANNING bit still set. v1 -> v2: replace EIO to EAGAIN Signed-off-by: Stanislaw Gruszka Acked-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c7317e41df30c7e04dca46360e5ebb0cb36dda45 Author: Felix Fietkau Date: Thu Oct 21 02:47:25 2010 +0200 mac80211: minstrel_ht - reduce the overhead of rate sampling - reduce the number of retransmission attempts for sample rates - sample lower rates less often - do not use RTS/CTS for sampling frames - increase the time between sampling attempts Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit ff32d9cd2c4107224a28f39d3c72eec66d566e09 Author: Felix Fietkau Date: Thu Oct 21 02:47:23 2010 +0200 ath9k_hw: fix potential spurious tx error bit interpretation According to documentation, AR_ExcessiveRetries, AR_Filtered and AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear. Not checking this might result in suboptimal FIFO settings, unnecessary retransmissions, or other connectivity issues. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e Author: Luis R. Rodriguez Date: Wed Oct 20 16:07:08 2010 -0700 ath9k: add a debug warning when we cannot stop RX We have seen several DMA races when we race against stopping and starting the PCU. I suspect that when we cannot stop the PCU we may hit some of these same races so warn against them for now but only when debugging (CONFIG_ATH_DEBUG) is enabled. If you run into this warning and are a developer, please fix the cause of the warning. The potential here, although I cannot prove yet, is that the DMA engine can be confused and start writing to a buffer that was already DMA'd before and at least the kernel assumes is not being accessed by hardware anymore. Cc: Ben Greear Cc: Kyungwan Nam Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b87b0128894efd3bbf7272a579f71b3a2bc500d1 Author: Luis R. Rodriguez Date: Thu Oct 21 12:10:11 2010 -0700 ath: add a ATH_DBG_WARN() To be used to throw out warnings only for developers. This can be used by some corner cases that developers already know can be hit but developers want to address so to avoid spewing out a warning this can only be enabled with CONFIG_ATH_DEBUG enabled. Cc: Ben Greear Cc: Kyungwan Nam Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d91e41b690f795c04af4eb6fe28d2cafd3291051 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:59 2010 -0700 cfg80211: prefix REG_DBG_PRINT() with cfg80211 Everyone's doing it, its the cool thing. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e702d3cf29143327679ce2e2a60775eaf829f377 Author: Luis R. Rodriguez Date: Thu Oct 21 19:17:04 2010 +0530 cfg80211: add debug print when processing a channel In the worst case you are seeing really odd things you want more information than what is provided right now, for those that insist and want debug info through CONFIG_CFG80211_REG_DEBUG provide a print of when we are processing a channel and with what regulatory rule. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit a65185367f9f876448f0f12ac09a673d20371efc Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:57 2010 -0700 cfg80211: add debug print when disabling a channel on a custom regd Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 926a0a094d2b9052db3f7f37438c3d305cea4be7 Author: Luis R. Rodriguez Date: Thu Oct 21 19:17:03 2010 +0530 cfg80211: add debug prints for when we ignore regulatory hints This can help with debugging issues. You will only see these with CONFIG_CFG80211_REG_DEBUG enabled. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:55 2010 -0700 cfg80211: fix disabling channels based on hints After a module loads you will have loaded the world roaming regulatory domain or a custom regulatory domain. Further regulatory hints are welcomed and should be respected unless the regulatory hint is coming from a country IE as the IEEE spec allows for a country IE to be a subset of what is allowed by the local regulatory agencies. So disable all channels that do not fit a regulatory domain sent from a unless the hint is from a country IE and the country IE had no information about the band we are currently processing. This fixes a few regulatory issues, for example for drivers that depend on CRDA and had no 5 GHz freqencies allowed were not properly disabling 5 GHz at all, furthermore it also allows users to restrict devices further as was intended. If you recieve a country IE upon association we will also disable the channels that are not allowed if the country IE had at least one channel on the respective band we are procesing. This was the original intention behind this design but it was completely overlooked... Cc: David Quan Cc: Jouni Malinen cc: Easwar Krishnan Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 749b527b21465fb079796c03ffb4302584dc31c1 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:54 2010 -0700 cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY even if we haven't yet recieved regulatory domain hint for the driver if it needed one. Without this Country IEs are not passed on to drivers that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170. This was part of the original design, however it was completely overlooked... Cc: Easwar Krishnan Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:53 2010 -0700 cfg80211: pass the reg hint initiator to helpers This is required later. Cc: Easwar Krishnan Cc: stable@kernel.org signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68 Author: Stephen Hemminger Date: Wed Oct 20 10:16:58 2010 -0700 rfkill: remove dead code The following code is defined but never used. Signed-off-by: Stephen Hemminger Signed-off-by: John W. Linville commit e081685c1bbe8da37c7f61726fdb783ff277f14f Author: Larry Finger Date: Wed Oct 20 09:59:33 2010 -0500 ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices MMIO log traces obtained using the Broadcom wl hybrid driver show that the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared if non-zero. Similar code found in other drivers such as ipw2100 show this operation is needed to keep PCI Tx retries from interfering with C3 CPU state. There are no known cases where omission of this code has caused a problem, but this patch is offered just in case such a situation occurs. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:38 2010 -0700 ath5k: make ath5k_update_bssid_mask_and_opmode() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/base.c:569:6: warning: symbol 'ath5k_update_bssid_mask_and_opmode' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f8c2a0871b8462481a02445b38a7321ad63bfc88 Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:37 2010 -0700 ath: make ath_hw_set_keycache_entry() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/key.c drivers/net/wireless/ath/key.c:110:6: warning: symbol 'ath_hw_set_keycache_entry' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a3685d119dacb07a7080169fea2847ef385b209f Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:36 2010 -0700 ath: make ath_hw_keysetmac() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/key.c drivers/net/wireless/ath/key.c:70:6: warning: symbol 'ath_hw_keysetmac' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit babcbc295fee766ca710235e431686fef744d9a6 Author: Felix Fietkau Date: Wed Oct 20 02:09:46 2010 +0200 ath9k: initialize per-channel tx power limits instead of hardcoding them Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit de40f316c01b1ba9535e6dc99f6a67e7655b07da Author: Felix Fietkau Date: Wed Oct 20 03:08:53 2010 +0200 ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set - causes the rate txpower table and the regulatory limit to be calculated and stored, without changing hardware registers. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6b7b6cf553f881d45bb37a73f5db956afb290a08 Author: Felix Fietkau Date: Wed Oct 20 02:09:44 2010 +0200 ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003 The same is done for the older chip families as well. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2 Author: Paul Mundt Date: Mon Nov 1 09:29:24 2010 +0000 net: sh_eth: Move off of deprecated I/O routines. sh_eth is the last in-tree user of the ctrl_xxx I/O routines. This simply converts them over to regular MMIO accesors. Signed-off-by: Paul Mundt Signed-off-by: David S. Miller commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02 Author: John Fastabend Date: Sat Oct 30 14:22:42 2010 +0000 net: consolidate 8021q tagging Now that VLAN packets are tagged in dev_hard_start_xmit() at the bottom of the stack we no longer need to tag them in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR case). This allows the accel path and non accel paths to be consolidated. Here the vlan_tci in the skb is always set and we allow the stack to add the actual tag in dev_hard_start_xmit(). Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e Author: John Fastabend Date: Sat Oct 30 14:22:37 2010 +0000 net: remove check for headroom in vlan_dev_create It is possible for the headroom to be smaller then the hard_header_len for a short period of time after toggling the vlan offload setting. This is not a hard error and skb_cow_head is called in __vlan_put_tag() to resolve this. Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988 Author: John Fastabend Date: Sat Oct 30 14:22:32 2010 +0000 8021q: set hard_header_len when VLAN offload features are toggled Toggling the vlan tx|rx hw offloads needs to set the hard_header_len as well otherwise we end up using LL_RESERVED_SPACE incorrectly. This results in pskb_expand_head() being used unnecessarily. Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 58e998c6d23988490162cef0784b19ea274d90bb Author: Jesse Gross Date: Fri Oct 29 12:14:55 2010 +0000 offloading: Force software GSO for multiple vlan tags. We currently use vlan_features to check for TSO support if there is a vlan tag. However, it's quite likely that the NIC is not able to do TSO when there is an arbitrary number of tags. Therefore if there is more than one tag (in-band or out-of-band), fall back to software emulation. Signed-off-by: Jesse Gross CC: Ben Hutchings Signed-off-by: David S. Miller commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4 Author: Jesse Gross Date: Fri Oct 29 12:14:54 2010 +0000 offloading: Support multiple vlan tags in GSO. We assume that hardware TSO can't support multiple levels of vlan tags but we allow it to be done. Therefore, enable GSO to parse these tags so we can fallback to software. Signed-off-by: Jesse Gross CC: Ben Hutchings Signed-off-by: David S. Miller commit e1e78db628b33c657944865e3bca01ee59cc5b80 Author: Jesse Gross Date: Fri Oct 29 12:14:53 2010 +0000 offloading: Make scatter/gather more tolerant of vlans. When checking if it is necessary to linearize a packet, we currently use vlan_features if the packet contains either an in-band or out- of-band vlan tag. However, in-band tags aren't special in any way for scatter/gather since they are part of the packet buffer and are simply more data to DMA. Therefore, only use vlan_features for out- of-band tags, which could potentially have some interaction with scatter/gather. Signed-off-by: Jesse Gross CC: Ben Hutchings Reviewed-by: Ben Hutchings Signed-off-by: David S. Miller commit 410989f65151557701ce86875b141e694281dd6c Author: Casey Leedom Date: Thu Nov 11 09:30:43 2010 +0000 cxgb4vf: Advertise NETIF_F_TSO_ECN. Advertise NETIF_F_TSO_ECN. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1 Author: Casey Leedom Date: Thu Nov 11 09:30:42 2010 +0000 cxgb4vf: fix up "Section Mismatch" compiler warning. Fix up "Section Mismatch" compiler warning and mark another routine as __devinit. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30 Author: Casey Leedom Date: Thu Nov 11 09:30:41 2010 +0000 cxgb4vf: add ethtool statistics for GRO. Add ethtool statistics for GRO. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit caedda35c6dba5a283e5d87e77a8d19ee4be3183 Author: Casey Leedom Date: Thu Nov 11 09:30:40 2010 +0000 cxgb4vf: minor comment/symbolic name cleanup. Minor cleanup of comments and symbolic constant names for clarity. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit d9aa93804e53f2153260568024b75ad3d81784f9 Author: David S. Miller Date: Mon Nov 15 08:52:02 2010 -0800 ipv4: Fix build with multicast disabled. net/ipv4/igmp.c: In function 'ip_mc_inc_group': net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl' net/ipv4/igmp.c:1228: error: expected ';' before '{' token net/ipv4/igmp.c: In function 'ip_mc_unmap': net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped' ... Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions outside of multicast ifdef protection. Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 6021afcf19d8c6f5db6d11cadcfb6a22d0c28a48 Author: Edgar (gimli) Hucek Date: Tue Nov 9 17:38:42 2010 +0100 input: bcm5974: Add support for MacBookAir3 This patch adds support for the MacBookAir3,1 and MacBookAir3,2 models. [rydberg@euromail.se: touchpad range calibration] Cc: stable@kernel.org Signed-off-by: Edgar (gimli) Hucek Signed-off-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit 20a4c261ad9cec39942257b1f91765a4b238db05 Author: Paul Fox Date: Mon Nov 15 01:33:24 2010 -0800 Input: hgpk - fix powersave mode Recent testing of this codepath showed that it wasn't working, perhaps due to changes within the input layer. This fixes it. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 34caed2082105a6d9f5aaba1cf4e02760cbee14e Author: Daniel Drake Date: Mon Nov 15 01:33:22 2010 -0800 Input: hgpk - recalibration tweaks Disable the recalibration guard where new recalibrations are triggered if we detect a packet too soon after calibrating - we found that this results in erroneous recalibrations, and if the recalibration failed then the rest of our badness-detection code will request another. Add a module option disabling all of the recalibration code, in case an OLPC deployment thinks all of the workarounds we have are doing more damage than good and wants to experiment with them all disabled. Based on work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 67f56bb0f4997b55291c162077e02e4f29639fc2 Author: Daniel Drake Date: Mon Nov 15 01:28:54 2010 -0800 Input: hgpk - detect simple mode overflows Based on work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d Author: Gerrit Renker Date: Sun Nov 14 17:26:13 2010 +0100 dccp ccid-2: Separate option parsing from CCID processing This patch replaces an almost identical replication of code: large parts of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c. Apart from the duplication, this caused two more problems: 1. CCIDs should not need to be concerned with parsing header options; 2. one can not assume that Ack Vectors appear as a contiguous area within an skb, it is legal to insert other options and/or padding in between. The current code would throw an error and stop reading in such a case. Since Ack Vectors provide CCID-specific information, they are now processed by the CCID directly, separating this functionality from the main DCCP code. Signed-off-by: Gerrit Renker commit 52394eecec4e6fa677a61af26f0bd35de665344e Author: Gerrit Renker Date: Sun Nov 14 17:26:02 2010 +0100 dccp ccid-2: Remove old infrastructure This removes * functions for which updates have been provided in the preceding patches and * the @av_vec_len field - it is no longer necessary since the buffer length is now always computed dynamically. Signed-off-by: Gerrit Renker commit d83447f0944e73d690218d79c07762ffa4ceb9e4 Author: Gerrit Renker Date: Sun Nov 14 17:25:46 2010 +0100 dccp ccid-2: Schedule Sync as out-of-band mechanism The problem with Ack Vectors is that i) their length is variable and can in principle grow quite large, ii) it is hard to predict exactly how large they will be. Due to the second point it seems not a good idea to reduce the MPS; in particular when on average there is enough room for the Ack Vector and an increase in length is momentarily due to some burst loss, after which the Ack Vector returns to its normal/average length. The solution taken by this patch is to subtract a minimum-expected Ack Vector length from the MPS, and to defer any larger Ack Vectors onto a separate Sync - but only if indeed there is no space left on the skb. This patch provides the infrastructure to schedule Sync-packets for transporting (urgent) out-of-band data. Its signalling is quicker than scheduling an Ack, since it does not need to wait for new application data. Signed-off-by: Gerrit Renker commit 18219463c884bfdb7954d298b9edb5194b14d621 Author: Gerrit Renker Date: Sun Nov 14 17:25:36 2010 +0100 dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module This aggregates Ack Vector processing (handling input and clearing old state) into one function, for the following reasons and benefits: * all Ack Vector-specific processing is now in one place; * duplicated code is removed; * ensuring sanity: from an Ack Vector point of view, it is better to clear the old state first before entering new state; * Ack Event handling happens mostly within the CCIDs, not the main DCCP module. Signed-off-by: Gerrit Renker commit 3802408644515e29fb723d51a5317301b212cf3a Author: Gerrit Renker Date: Sun Nov 14 17:25:23 2010 +0100 dccp ccid-2: Update code for the Ack Vector input/registration routine This patch updates the code which registers new packets as received, using the new circular buffer interface. It contributes a new algorithm which * supports both tail/head pointers and buffer wrap-around and * deals with overflow (head/tail move in lock-step). Signed-off-by: Gerrit Renker commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a Author: Gerrit Renker Date: Sun Nov 14 17:25:11 2010 +0100 dccp ccid-2: Algorithm to update buffer state This provides a routine to consistently update the buffer state when the peer acknowledges receipt of Ack Vectors; updating state in the list of Ack Vectors as well as in the circular buffer. While based on RFC 4340, several additional (and necessary) precautions were added to protect the consistency of the buffer state. These additions are essential, since analysis and experience showed that the basic algorithm was insufficient for this task (which lead to problems that were hard to debug). The algorithm now * deals with HC-sender acknowledging to HC-receiver and vice versa, * keeps track of the last unacknowledged but received seqno in tail_ackno, * has special cases to reset the overflow condition when appropriate, * is protected against receiving older information (would mess up buffer state). Signed-off-by: Gerrit Renker commit 4232f60791d12a5156c3e1c9b04ae08b873a2920 Author: Guennadi Liakhovetski Date: Thu Nov 11 14:45:09 2010 +0000 fbdev: sh_mobile_hdmi: add support for E-EDID parsing Many HDMI clients implement enhanced EDID blocks, which often contain additional supported video modes. This patch implements parsing of such E-EDID blocks. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit d8d776f3fb1ff19c37d43b600fc8c128ff172deb Merge: c724d07 0ad83f6 Author: Paul Mundt Date: Mon Nov 15 14:57:49 2010 +0900 Merge branch 'fbdev/edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev-2.6 into common/fbdev-edid commit 0ad83f6882c41df1a7fa387086029e162038c1f2 Author: Guennadi Liakhovetski Date: Thu Nov 11 15:45:04 2010 +0100 fbdev: when parsing E-EDID blocks, also use SVD entries Add parsing of E-EDID SVD entries. In this first version only a few CEA/EIA-861E modes are implemented, more can be added as needed. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e4105119aca9b86b163fa07428df1f615034a03d Author: Guennadi Liakhovetski Date: Thu Nov 11 15:44:52 2010 +0100 fbdev: export fb_edid_add_monspecs() for modules, improve algorithm fb_edid_add_monspecs() should also be exported for use in modules, and it requires a dummy version for the case, when CONFIG_FB_MODE_HELPERS is not selected. This patch also improves the algorithm by removing a redundant memory allocation, adds function documentation, adds data verification and replaces memmove() with memcpy(). Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 9fbbdde93231ad7f35c217aa6bbbc7995133f483 Author: Erik Gilling Date: Thu Nov 11 15:44:43 2010 +0100 video: add fb_edid_add_monspecs for parsing extended edid information Modern monitors/tvs have more extended EDID information blocks which can contain extra detailed modes. This adds a fb_edid_add_monspecs function which drivers can use to parse those additions blocks. Signed-off-by: Erik Gilling Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 Author: Joe Perches Date: Sun Nov 14 19:04:47 2010 -0800 drivers/spi: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Grant Likely commit c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 Merge: 190683a 9457b24 Author: David S. Miller Date: Sun Nov 14 11:57:05 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 190683a9d5457e6d962c232ffbecac3ab158dddd Author: Eric Dumazet Date: Wed Nov 10 10:50:44 2010 +0000 net: net_families __rcu annotations Use modern RCU API / annotations for net_families array. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e85eb11782259dc39502807f3ec903a7b82b1bab Author: Philippe De Muyter Date: Thu Nov 11 12:31:21 2010 +0000 net: Kconfig whitespace cleanup Many lines in Kconfig start withe 8 spaces instead of a TAB, and even sometimes with 7 spaces. Replace 10 or 9 spaces, or TAB + 1 space, by TAB + 2 spaces, and 8 or 7 spaces by TAB. Signed-off-by: Philippe De Muyter Signed-off-by: David S. Miller commit 1d7138de878d1d4210727c1200193e69596f93b3 Author: Eric Dumazet Date: Fri Nov 12 05:46:50 2010 +0000 igmp: RCU conversion of in_dev->mc_list in_dev->mc_list is protected by one rwlock (in_dev->mc_list_lock). This can easily be converted to a RCU protection. Writers hold RTNL, so mc_list_lock is removed, not replaced by a spinlock. Signed-off-by: Eric Dumazet Cc: Cypher Wu Cc: Américo Wang Signed-off-by: David S. Miller commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0 Author: Giuseppe Cavallaro Date: Fri Nov 12 12:43:34 2010 -0800 stmmac: update the driver documentation Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit f92c8dd7a0eb18124521e2b549f88422e17f707b Author: Bob Peterson Date: Fri Nov 12 11:15:20 2010 -0600 dlm: reduce cond_resched during send Calling cond_resched() after every send can unnecessarily degrade performance. Go back to an old method of scheduling after 25 messages. Signed-off-by: Bob Peterson Signed-off-by: David Teigland commit cb2d45da81c86d5191b19d0f67732a854bc0253c Author: David Teigland Date: Fri Nov 12 11:12:55 2010 -0600 dlm: use TCP_NODELAY Nagling doesn't help and can sometimes hurt dlm comms. Signed-off-by: David Teigland commit dcce240ead802d42b1e45ad2fcb2ed4a399cb255 Author: Steven Whitehouse Date: Fri Nov 12 12:12:29 2010 +0000 dlm: Use cmwq for send and receive workqueues So far as I can tell, there is no reason to use a single-threaded send workqueue for dlm, since it may need to send to several sockets concurrently. Both workqueues are set to WQ_MEM_RECLAIM to avoid any possible deadlocks, WQ_HIGHPRI since locking traffic is highly latency sensitive (and to avoid a priority inversion wrt GFS2's glock_workqueue) and WQ_FREEZABLE just in case someone needs to do that (even though with current cluster infrastructure, it doesn't make sense as the node will most likely land up ejected from the cluster) in the future. Signed-off-by: Steven Whitehouse Cc: Tejun Heo Signed-off-by: David Teigland commit 87abb6bbdbcfbced2ce0bcad68dd89ac3ff9464b Author: Dmitry Torokhov Date: Thu Nov 11 22:03:59 2010 -0800 Input: mac mouse emulation - add locking We need to add appropriate locking when toggling mac mouse emulation on and off to ensure that input device and handler are in consistent state. Signed-off-by: Dmitry Torokhov commit a309cdc778b9eece59b34e9e1c26e41476dbbcd6 Author: Daniel Drake Date: Thu Nov 11 22:20:03 2010 -0800 Input: hgpk - extend jumpiness detection In addition to forcing recalibrations upon detection of cursor jumps (and performing them quicker than before), detect and discard errant 'jump' packets caused by a firmware bug, which are then repeated with each one being approximately half the delta of the one previously (as if it is averaging out) Based on original work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit c0dc8342656a1425c31dcc505072f2387f0f0c92 Author: Daniel Drake Date: Thu Nov 11 22:20:02 2010 -0800 Input: hgpk - rework spew detection The old implementation of spew detection simply tracked the overall position delta of the cursor over every 100 packets. We found that this causes occasional false positives in spew detection, and also that the conditions of the spewy packets are perhaps more fixed than we once thought. Rework the spew detection to look for packets of specific small delta, and only recalibrating if the overall movement delta stays within expected bounds. Also discard duplicate packets in the advanced mode, which appear to be very common. If we don't, the spew detection kicks in far too early. If we get a large spew of duplicates, request a recalibration straight up. Based on earlier work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit ca94ec43540ce5d93fd30a3bf88321b6f11ed51a Author: Daniel Drake Date: Thu Nov 11 22:19:57 2010 -0800 Input: hgpk - support GlideSensor and PenTablet modes Add a "hgpk_mode" sysfs attribute that allows selection between 3 options: Mouse (the existing option), GlideSensor and PenTablet. GlideSensor is an enhanced protocol for the regular touchpad mode that additionally reports pressure and uses absolute coordinates. We suspect that it may be more reliable than mouse mode in some environments. PenTablet mode puts the touchpad into resistive mode, you must then use a stylus as an input. We suspect this is the most reliable way to drive the touchpad. The GlideSensor and PenTablet devices expose themselves with the intention of being combined with the synaptics X11 input driver. Based on earlier work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 10ee2ded629b1571cef1182728d6f65dbe4c7f79 Author: Dmitry Torokhov Date: Thu Nov 11 01:03:00 2010 -0800 Input: pcf_keypad - convert to dev_op_ops Signed-off-by: Dmitry Torokhov commit 2a0591596b302adc654a1caf6bd3d0063407ea4b Author: Dmitry Torokhov Date: Thu Nov 11 21:52:18 2010 -0800 Input: xpad - remove useless check in xpad_remove ixpad can never be NULL here; if it is NULL we would not have been bound to the interface and then why would we be called? Signed-off-by: Dmitry Torokhov commit 161feb2417dd0c4324c2e8da24aaebd30a436d45 Author: Axel Lin Date: Thu Nov 11 21:47:42 2010 -0800 Input: xpad - fix resource reclaim in xpad_probe error path Properly free the resources in error path by the reverse order of resource allocation. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 6ff92a6db2083ecd1a8e2742d9397159fd880987 Author: Axel Lin Date: Thu Nov 11 21:43:17 2010 -0800 Input: xpad - fix a memory leak In xpad_led_disconnect(), what we really want is to kfree(xpad_led). In xpad_disconnect(), add a missing kfree(xpad->bdata) to fix the memory leak. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 49cc69b6789b57d2d8ed78843c4219525b433b58 Author: Axel Lin Date: Thu Nov 11 21:39:11 2010 -0800 Input: xpad - return proper error in error path In current implementation, xpad_probe return 0 when usb_alloc_urb failed for xpad->bulk_out and kzalloc failed for xpad->bdata. This patch removes the initialization for error variable, assign the error code at the place the error happens instead. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit c753796769e4fb0cd813b6e5801b3c01f4681d4f Author: David S. Miller Date: Thu Nov 11 17:07:48 2010 -0800 ipv4: Make rt->fl.iif tests lest obscure. When we test rt->fl.iif against zero, we're seeing if it's an output or an input route. Make that explicit with some helper functions. Signed-off-by: David S. Miller commit 37bc9f5078c62bfa73edeb0053edceb3ed5e46a4 Author: Dirk Brandewie Date: Tue Nov 9 12:08:08 2010 -0800 x86: Ce4100: Add reboot_fixup() for CE4100 This patch adds the CE4100 reboot fixup to reboot_fixups_32.c [ tglx: Moved PCI id to reboot_fixups_32.c ] Signed-off-by: Dirk Brandewie LKML-Reference: <5bdcfb4f0206fa721570504e95659a03b815bc5e.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit 91d8037f563e4a86ff8b02c994530989c7936427 Author: Dirk Brandewie Date: Tue Nov 9 12:08:05 2010 -0800 ce4100: Add PCI register emulation for CE4100 This patch provides access methods for PCI registers that mis-behave on the CE4100. Each register can be assigned a private init, read and write routine. The exception to this is the bridge device. The bridge device is the only device on bus zero (0) that requires any fixup so it is a special case. [ tglx: minor coding style cleanups, __init annotation and simplification of ce4100_conf_read/write ] Signed-off-by: Dirk Brandewie LKML-Reference: <40b6751381c2275dc359db5a17989cce22ad8db7.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit c751e17b5371ad86cdde6cf5c0175e06f3ff0347 Author: Thomas Gleixner Date: Tue Nov 9 12:08:04 2010 -0800 x86: Add CE4100 platform support Add CE4100 platform support. CE4100 needs early setup like moorestown. Signed-off-by: Thomas Gleixner Signed-off-by: Dirk Brandewie LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit 2adc2917ce4bfb482a6e3c05ff543cef151c9830 Author: Baurzhan Ismagulov Date: Thu Nov 11 10:54:58 2010 +0100 serial: cpu_uart: Remove unused uart_cpm_port fields AFAICT, these fields are not used anywhere. Signed-off-by: Baurzhan Ismagulov Signed-off-by: Greg Kroah-Hartman commit 5b04ec4ad8e2ffdc9d1f27fd6eb5118e919bc87d Author: Baurzhan Ismagulov Date: Thu Nov 11 10:53:03 2010 +0100 serial: cpm_uat: reducing CPM serial latency Setting Rx FIFO size to 1 reduces reader process wakeup latency up to 20x for baud rates <= 9600. This patch sets the Rx FIFO size to 1 for baud rates <= 9600 or if low latency has been requested for the tty. Signed-off-by: Michael Trimarchi Signed-off-by: Bruno Morelli Signed-off-by: Baurzhan Ismagulov Signed-off-by: Greg Kroah-Hartman commit 63295cb2ff4329f563579f3d20c5855a96a866d5 Author: Claudio Scordino Date: Thu Nov 11 11:22:36 2010 +0100 serial: add Documentation about RS485 serial communications Documentation about RS485 serial communications Signed-off-by: Claudio Scordino Acked-by: Randy Dunlap Acked-by: Russell King Acked-by: Grant Edwards Signed-off-by: Greg Kroah-Hartman commit 5f9a31d63105c3e88bd6d026e7bc53f02a5ac042 Author: Alan Cox Date: Thu Nov 4 15:17:27 2010 +0000 n_gsm: clean up printks [Original From Ken Mills but I redid it using pr_ helpers instead] Also fix up coding style, there are two warnings left but that is where the CodingStyle tools blow up because they cannot handle if (blah) { foo } else switch (x) { case 1: } Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c2f2f0000bb69f067fea12624272e6a58a811702 Author: Alan Cox Date: Thu Nov 4 15:17:03 2010 +0000 n_gsm: Fix support for legacy encoding The mux supports several encoding schemes. Encoding 0 is a "not recommended" mode still sometimes used. This has now been tested with hardware that supports this mode, and found wanting. Fix the FCS handling in this mode and correct the state machine. Signed-off-by: Ken Mills Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 304e12665a4a7b8b25dfe8c64fa4fd56a04a67ea Author: Alexey Charkov Date: Mon Nov 8 20:33:20 2010 +0300 serial: Add support for UART on VIA VT8500 and compatibles This adds a driver for the serial ports found in VIA and WonderMedia Systems-on-Chip. Interrupt-driven FIFO operation is implemented. The hardware also supports pure register-based operation (which is slower) and DMA-based FIFO operation. As the FIFOs are only 16 bytes long, DMA operation is probably not worth the hassle. Signed-off-by: Alexey Charkov Signed-off-by: Greg Kroah-Hartman commit af3b8881f4c9852eefe9c7f1a997b3ecf580561b Author: Russ Gorby Date: Tue Oct 26 14:13:52 2010 +0100 ifx6x60: SPI protocol driver for Infineon 6x60 modem Prototype driver for the IFX6x60 series of SPI attached modems by Jim Stanley and Russ Gorby Signed-off-by: Russ Gorby [Some reworking and a major cleanup] Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b36930dd508e00f0c5083bcd57d25de6d0375c76 Author: David Miller Date: Wed Nov 10 21:56:39 2010 -0800 dlm: Handle application limited situations properly. In the normal regime where an application uses non-blocking I/O writes on a socket, they will handle -EAGAIN and use poll() to wait for send space. They don't actually sleep on the socket I/O write. But kernel level RPC layers that do socket I/O operations directly and key off of -EAGAIN on the write() to "try again later" don't use poll(), they instead have their own sleeping mechanism and rely upon ->sk_write_space() to trigger the wakeup. So they do effectively sleep on the write(), but this mechanism alone does not let the socket layers know what's going on. Therefore they must emulate what would have happened, otherwise TCP cannot possibly see that the connection is application window size limited. Handle this, therefore, like SUNRPC by setting SOCK_NOSPACE and bumping the ->sk_write_count as needed when we hit the send buffer limits. This should make TCP send buffer size auto-tuning and the ->sk_write_space() callback invocations actually happen. Signed-off-by: David S. Miller Signed-off-by: David Teigland commit ed1deb7021b4dfee1d544b91edff4ef92f5c3b54 Merge: 72cdd1d b3d14bf Author: David S. Miller Date: Thu Nov 11 10:43:30 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit 72cdd1d971c0deb1619c5c339270570c43647a78 Author: Eric Dumazet Date: Thu Nov 11 07:14:07 2010 +0000 net: get rid of rtable->idev It seems idev field in struct rtable has no special purpose, but adding extra atomic ops. We hold refcounts on the device itself (using percpu data, so pretty cheap in current kernel). infiniband case is solved using dst.dev instead of idev->dev Removal of this field means routing without route cache is now using shared data, percpu data, and only potential contention is a pair of atomic ops on struct neighbour per forwarded packet. About 5% speedup on routing test. Signed-off-by: Eric Dumazet Cc: Herbert Xu Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: David S. Miller commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86 Author: Eric Dumazet Date: Thu Nov 11 06:57:19 2010 +0000 neigh: reorder struct neighbour It is important to move nud_state outside of the often modified cache line (because of refcnt), to reduce false sharing in neigh_event_send() This is a followup of commit 0ed8ddf4045f (neigh: Protect neigh->ha[] with a seqlock) This gives a 7% speedup on routing test with IP route cache disabled. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c0c04c2a89cf6363da2940da59afd2e30001b991 Author: Jon Mason Date: Thu Nov 11 04:26:04 2010 +0000 vxge: update driver version Update vxge driver version Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 2c91308f449c6705b81bd3370a0ec647e370f35c Author: Jon Mason Date: Thu Nov 11 04:26:03 2010 +0000 vxge: sparse and other clean-ups Correct issues found by running sparse on the vxge driver, as well as other miscellaneous cleanups. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1901d042abf10d08a829961a63fd158f9844587e Author: Jon Mason Date: Thu Nov 11 04:26:02 2010 +0000 vxge: update Kconfig Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO). Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a Author: Jon Mason Date: Thu Nov 11 04:26:01 2010 +0000 vxge: correct multi-function detection The values used to determined if the adapter is running in single or multi-function mode were previously modified to the values necessary when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However, the firmware call was not modified. This had the driver printing out on probe that the adapter was in multi-function mode when in single function mode and vice versa. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit e7935c9669c27c5d530bff634c0c15f7a602d697 Author: Jon Mason Date: Thu Nov 11 04:26:00 2010 +0000 vxge: Titan1A detection Detect if the adapter is Titan or Titan1A, and tune the driver for this hardware. Also, remove unnecessary function __vxge_hw_device_id_get. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit c3150eac9f2e5f770b09d371f7716540219a46f6 Author: Jon Mason Date: Thu Nov 11 04:25:59 2010 +0000 vxge: Handle errors in vxge_hw_vpath_fw_api Propagate the return code of the call to vxge_hw_vpath_fw_api and __vxge_hw_vpath_pci_func_mode_get. This enables the proper handling of error conditions when querying the function mode of the device during probe. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit b81b37338412e3215670641e5025c85146521dea Author: Jon Mason Date: Thu Nov 11 04:25:58 2010 +0000 vxge: add receive hardware timestamping Add support for enable/disabling hardware timestamping on receive packets via ioctl call. When enabled, the hardware timestamp replaces the FCS in the payload. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit e8ac175615b9458a00193c55617b5b8865e67817 Author: Jon Mason Date: Thu Nov 11 04:25:57 2010 +0000 vxge: add support for ethtool firmware flashing Add the ability in the vxge driver to flash firmware via ethtool. Updated to include comments from Ben Hutchings. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 8424e00dfd5282026a93996a165fc4079d382169 Author: Jon Mason Date: Thu Nov 11 04:25:56 2010 +0000 vxge: serialize access to steering control register It is possible for multiple callers to access the firmware interface for the same vpath simultaneously, resulting in uncertain output. Add locks to serialize access. Also, make functions only accessed locally static, thus requiring some movement of code blocks. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit ddd62726e0bc1ffe0ab791b647f4178161ab451b Author: Jon Mason Date: Thu Nov 11 04:25:55 2010 +0000 vxge: cleanup debug printing and asserts Remove all of the unnecessary debug printk indirection and temporary variables for vxge_debug_ll and vxge_assert. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 4d2a5b406c02b224bd3f50992c8b02450c65a730 Author: Jon Mason Date: Thu Nov 11 04:25:54 2010 +0000 vxge: Wait for Rx to become idle before reseting or closing Wait for the receive traffic to become idle before attempting to close or reset the adapter. To enable the processing of packets while Receive Idle, move the clearing of __VXGE_STATE_CARD_UP bit in vxge_close to after it. Also, modify the return value of the ISR when the adapter is down to IRQ_HANDLED. Otherwise there are unhandled interrupts for the device. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 47f01db44b2470d9517848f6b73c75883ef5fda0 Author: Jon Mason Date: Thu Nov 11 04:25:53 2010 +0000 vxge: enable rxhash Enable RSS hashing and add ability to pass up the adapter calculated rx hash up the network stack (if feature is available). Add the ability to enable/disable feature via ethtool, which requires that the adapter is not running at the time. Other miscellaneous cleanups and fixes required to get RSS working. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 6f207e9bb4219d261d9326597ca533f954f31755 Author: Feng Tang Date: Thu Nov 11 15:50:50 2010 +0000 x86: mrst: Set vRTC's IRQ to level trigger type When setting up the mpc_intsrc structure for vRTC's IRQ, we need to set its irqflag to level trigger, otherwise it will be taken as edge triggered and the vRTC IRQ will fire only once, as there is never a EOI issued from the IA core for it. The original code worked in previous kernel. This is because it was configured to level trigger type by luck. It fell into the default PCI trigger category which is level triggered. Signed-off-by: Feng Tang Signed-off-by: Alan Cox LKML-Reference: <20101111155019.12924.569.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 8af27e1dc4e4dd7a7b04c2cd0fc3d419d91d45b0 Author: Eric Dumazet Date: Tue Nov 9 16:29:27 2010 +0100 fixdep: use hash table instead of a single array I noticed fixdep uses ~2% of cpu time in kernel build, in function use_config() fixdep spends a lot of cpu cycles in linear searches in its internal string array. With about 400 stored strings per dep file, this begins to be noticeable. Convert fixdep to use a hash table. kbuild results on my x86_64 allmodconfig Before patch : real 10m30.414s user 61m51.456s sys 8m28.200s real 10m12.334s user 61m50.236s sys 8m30.448s real 10m42.947s user 61m50.028s sys 8m32.380s After: real 10m8.180s user 61m22.506s sys 8m32.384s real 10m35.039s user 61m21.654s sys 8m32.212s real 10m14.487s user 61m23.498s sys 8m32.312s Signed-off-by: Eric Dumazet Signed-off-by: Michal Marek commit e86c2412c88fbe4676920c40348d3c547c9edb0d Author: maximilian attems Date: Fri Oct 29 15:55:50 2010 +0200 kbuild, deb-pkg: Fix build with paranoid umask umask 077 make deb-pkg dpkg-deb: building package `linux-image-2.6.36+' in `../linux-image-2.6.36+_2.6.36+-4_amd64.deb'. dpkg-deb: control directory has bad permissions 700 (must be >=0755 and <=0775) make[1]: *** [deb-pkg] Error 2 Reported-by: Bastian Blank Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit ad78acafeed26f62c9e644f96eecb7c19bd78bb4 Author: Alexey Charkov Date: Sun Nov 7 19:28:55 2010 +0300 usb: Add support for VIA VT8500 and compatibles in EHCI HCD VIA and WonderMedia Systems-on-Chip feature a standard EHCI host controller. This adds necessary glue to use the standard driver with these systems. Signed-off-by: Alexey Charkov Signed-off-by: Greg Kroah-Hartman commit 8be8a9d3d16a25645b7869e4544a9d0ec386966a Author: Tatyana Brokhman Date: Mon Nov 1 17:38:05 2010 +0200 usb: dummy_hcd code simplification Take handling of the control requests out from dummy_timer to a different function. Signed-off-by: Tatyana Brokhman Signed-off-by: Greg Kroah-Hartman commit 0eadcc09203349b11ca477ec367079b23d32ab91 Author: Tatyana Brokhman Date: Mon Nov 1 18:18:24 2010 +0200 usb: USB3.0 ch11 definitions Adding hub SuperSpeed usb definitions as defined by ch10 of the USB3.0 spec. Signed-off-by: Tatyana Brokhman Signed-off-by: Greg Kroah-Hartman commit b73af61e3283068f680e58e091ceafcb88d74b22 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:23 2010 +0200 USB: gadget: f_mass_storage: code style clean ups This commit is purely style clean ups. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 00cb636ed87a65b512012ea4236348af19daef1e Author: Michal Nazarewicz Date: Thu Oct 28 17:31:22 2010 +0200 USB: gadget: f_mass_storage: remove needless complete() This commit removes call to the complete() function done in fsg_unbind() which was never needed there but was a leftover form file_storage.c. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit fe52f7922c446b2f604ef609153f1cef0ea17278 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:21 2010 +0200 USB: gadget: f_mass_storage: drop START_TRANSFER() macro This commit drops START_TRANSFER_OR() and START_TRANSFER() macros with a pair of nice inline functions which are actually more readable and easier to use. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 1ccd7923fe521273d63d936129754e71a33ebe51 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:20 2010 +0200 USB: gadget: f_mass_storage: use ?: instead of a macro This commit removes an "OR" macro defined in Mass Storage Function in favour of a two argument version of "?:" operator (which is a GCC extension). Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 17a936117c587c23aafafdb9cd6d433a90daa83d Author: Rahul Ruikar Date: Thu Oct 28 17:31:19 2010 +0200 USB: gadget: f_mass_storage: put_device() in error recovery This commit fixes an issue with error recovery after device_register() fails in Mass Storage Function. The device needs to be put to avoid resource leakage. Signed-off-by: Rahul Ruikar [mina86@mina86.com: updated commit message] Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit d9385b6352da7fed50981f375c2ccb60354039a6 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:18 2010 +0200 USB: gadget: file_storage: put_device() in error recovery This commit fixes some issues with File-backed Storage Gadget error recovery when registering LUN's devices. First of all, when device_register() fails the device still needs to be put. However, because lun_release() decreases fsg->ref reference counter the counter must be incremented beforehand. Second of all, after any of the device_create_file()s fails, device_unregister() is called which in turn (indirectly) calls lun_release() which decrements fsg->ref. So, again, the reference counter must be incremented beforehand. Lastly, if the first or the second device_create_file() succeeds, the files are never removed. To fix it, device_remove_file() needs to be called. This is done by simply marking LUN as registered prior to creating files so that fsg_unbind() can handle removing files. Signed-off-by: Michal Nazarewicz Reported-by: Rahul Ruikar Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 78bff3c65df33da47e93736bd8847b694084e5a9 Author: Marek Belisko Date: Wed Oct 27 10:19:01 2010 +0200 USB: gadget: composite: Typo fix. Signed-off-by: Marek Belisko Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8b455561d28bcfac17d6910e64c616cf684da07f Author: Julia Lawall Date: Tue Oct 26 12:25:31 2010 +0200 USB: gadget: amd5536udc.c: delete double assignment Delete successive assignments to the same location. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression i; @@ *i = ...; i = ...; // Signed-off-by: Julia Lawall Acked-by: Thomas Dahlmann Signed-off-by: Greg Kroah-Hartman commit 06c3859fc9bd62edb7211b241eadd0cdc8ecbecd Author: Uwe Kleine-König Date: Mon Oct 25 16:30:12 2010 +0200 usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0 Since v2.6.34-rc2~66^2~5^2~47 USBD_INT0 is deprecated in favour of MX1_USBD_INT0. So use the new name. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit f7043ecbb3f7b8632a6d6470f8f95160ac868d0f Author: Bill Pemberton Date: Thu Oct 21 14:43:05 2010 -0400 USB: ssu100: remove max_packet_size calculation The max_packet_size logic is taken from ftdi_sio, but it's not needed for this device. This also makes proces_read_urb simpler. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 86071535f845fd054753122e564cee9406c84e70 Author: Vinod Koul Date: Wed Nov 10 17:40:48 2010 +0000 x86: mrst: Add audio driver bindings This patch adds the sound card bindings for Moorestown (pmic_audio) and the Medfield platform (msic_audio) as IPC devices. This ensures they will be created at the right time. Signed-off-by: Vinod Koul Signed-off-by: Alan Cox LKML-Reference: <20101110174044.11340.78008.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 0146f26145af75d53e12dbf23a36996aff373680 Author: Feng Tang Date: Wed Nov 10 17:29:17 2010 +0000 rtc: Add drivers/rtc/rtc-mrst.c Provide the standard kernel rtc driver interface on top of the vrtc layer added in the previous patch. Signed-off-by: Feng Tang LKML-Reference: <20101110172911.3311.20593.stgit@localhost.localdomain> [Fixed swapped arguments on IPC] Signed-off-by: Arjan van de Ven [Cleaned up and the device creation moved to arch/x86/platform] Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit 7309282c90d251cde77fe3b520a8276e25315c49 Author: Feng Tang Date: Wed Nov 10 17:29:00 2010 +0000 x86: mrst: Add vrtc driver which serves as a wall clock device Moorestown platform doesn't have a m146818 RTC device like traditional x86 PC, but a firmware emulated virtual RTC device(vrtc), which provides some basic RTC functions like get/set time. vrtc serves as the only wall clock device on Moorestown platform. [ tglx: Changed the exports to _GPL ] Signed-off-by: Feng Tang Signed-off-by: Jacob Pan Signed-off-by: Alan Cox LKML-Reference: <20101110172837.3311.40483.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit cfb505a7ebd4c84206b4cc7d9f966d864a2ac05a Author: Alek Du Date: Wed Nov 10 16:50:08 2010 +0000 x86: mrst: Add Moorestown specific reboot/shutdown support Moorestowns needs to use a special IPC command to reboot or shutdown the platform. Signed-off-by: Alek Du Signed-off-by: Alan Cox LKML-Reference: <20101110164928.6365.94243.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 6036f373ea03687d355634fa70fb04baa95ab75e Author: Kees Cook Date: Wed Nov 10 10:35:54 2010 -0800 x86, cpu: Only CPU features determine NX capabilities Fix the NX feature boot warning when NX is missing to correctly reflect that BIOSes cannot disable NX now. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit ebba638ae723d8a8fc2f7abce5ec18b688b791d7 Author: Kees Cook Date: Wed Nov 10 10:35:53 2010 -0800 x86, cpu: Call verify_cpu during 32bit CPU startup The XD_DISABLE-clearing side-effect needs to happen for both 32bit and 64bit, but the 32bit init routines were not calling verify_cpu() yet. This adds that call to gain the side-effect. The longmode/SSE tests being performed in verify_cpu() need to happen very early for 64bit but not for 32bit. Instead of including it in two places for 32bit, we can just include it once in arch/x86/kernel/head_32.S. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-4-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit ae84739c27b6b3725993202fe02ff35ab86468e1 Author: Kees Cook Date: Wed Nov 10 10:35:52 2010 -0800 x86, cpu: Clear XD_DISABLED flag on Intel to regain NX Intel CPUs have an additional MSR bit to indicate if the BIOS was configured to disable the NX cpu feature. This bit was traditionally used for operating systems that did not understand how to handle the NX bit. Since Linux understands this, this BIOS flag should be ignored by default. In a review[1] of reported hardware being used by Ubuntu bug reporters, almost 10% of systems had an incorrectly configured BIOS, leaving their systems unable to use the NX features of their CPU. This change will clear the MSR_IA32_MISC_ENABLE_XD_DISABLE bit so that NX cannot be inappropriately controlled by the BIOS on Intel CPUs. If, under very strange hardware configurations, NX actually needs to be disabled, "noexec=off" can be used to restore the prior behavior. [1] http://www.outflux.net/blog/archives/2010/02/18/data-mining-for-nx-bit/ Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-3-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit c5cbac69422a9bffe7c7fd9a115130e272b547f5 Author: Kees Cook Date: Wed Nov 10 10:35:51 2010 -0800 x86, cpu: Rename verify_cpu_64.S to verify_cpu.S The code is 32bit already, and can be used in 32bit routines. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-2-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4 Author: Gerrit Renker Date: Wed Nov 10 21:21:35 2010 +0100 dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling This completes the implementation of a circular buffer for Ack Vectors, by extending the current (linear array-based) implementation. The changes are: (a) An `overflow' flag to deal with the case of overflow. As before, dynamic growth of the buffer will not be supported; but code will be added to deal robustly with overflowing Ack Vector buffers. (b) A `tail_seqno' field. When naively implementing the algorithm of Appendix A in RFC 4340, problems arise whenever subsequent Ack Vector records overlap, which can bring the entire run length calculation completely out of synch. (This is documented on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/\ ack_vectors/tracking_tail_ackno/ .) (c) The buffer length is now computed dynamically (i.e. current fill level), as the span between head to tail. As a result, dccp_ackvec_pending() is now simpler - the #ifdef is no longer necessary since buf_empty is always true when IP_DCCP_ACKVEC is not configured. Signed-off-by: Gerrit Renker commit 7d870936602533836bba821bd5c679c62c52a95f Author: Gerrit Renker Date: Wed Nov 10 21:21:02 2010 +0100 dccp ccid-2: Separate internals of Ack Vectors from option-parsing code This patch * separates Ack Vector housekeeping code from option-insertion code; * shifts option-specific code from ackvec.c into options.c; * introduces a dedicated routine to take care of the Ack Vector records; * simplifies the dccp_ackvec_insert_avr() routine: the BUG_ON was redundant, since the list is automatically arranged in descending order of ack_seqno. Signed-off-by: Gerrit Renker commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110 Author: Gerrit Renker Date: Wed Nov 10 21:20:07 2010 +0100 dccp ccid-2: Ack Vector interface clean-up This patch brings the Ack Vector interface up to date. Its main purpose is to lay the basis for the subsequent patches of this set, which will use the new data structure fields and routines. There are no real algorithmic changes, rather an adaptation: (1) Replaced the static Ack Vector size (2) with a #define so that it can be adapted (with low loss / Ack Ratio, a value of 1 works, so 2 seems to be sufficient for the moment) and added a solution so that computing the ECN nonce will continue to work - even with larger Ack Vectors. (2) Replaced the #defines for Ack Vector states with a complete enum. (3) Replaced #defines to compute Ack Vector length and state with general purpose routines (inlines), and updated code to use these. (4) Added a `tail' field (conversion to circular buffer in subsequent patch). (5) Updated the (outdated) documentation for Ack Vector struct. (6) All sequence number containers now trimmed to 48 bits. (7) Removal of unused bits: * removed dccpav_ack_nonce from struct dccp_ackvec, since this is already redundantly stored in the `dccpavr_ack_nonce' (of Ack Vector record); * removed Elapsed Time for Ack Vectors (it was nowhere used); * replaced semantics of dccpavr_sent_len with dccpavr_ack_runlen, since the code needs to be able to remember the old run length; * reduced the de-/allocation routines (redundant / duplicate tests). Signed-off-by: Gerrit Renker commit 0c6202b3278b417444a59cecc59e6e5af04db7fd Author: Ron Mercer Date: Wed Nov 10 09:29:46 2010 +0000 qlge: Version change to v1.00.00.27 Signed-off-by: Jitendra Kalsaria Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf Author: Ron Mercer Date: Wed Nov 10 09:29:45 2010 +0000 qlge: Add firmware info to ethtool get regs. By default we add firmware information to ethtool get regs. Optionally firmware info can instead be sent to log. Signed-off-by: Jitendra Kalsaria Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 5bdb05f91b27b9361c4f348a4e05999f597df72e Author: Darren Hart Date: Mon Nov 8 13:40:28 2010 -0800 futex: Add futex_q static initializer The futex_q struct has grown considerably over the last couple years. I believe it now merits a static initializer to avoid uninitialized data errors (having spent more time than I care to admit debugging an uninitialized q.bitset in an experimental new op code). With the key initializer built in, several of the FUTEX_KEY_INIT calls can be removed. V2: use a static variable instead of an init macro. use a C99 initializer and don't rely on variable ordering in the struct. V3: make futex_q_init const Signed-off-by: Darren Hart Cc: Peter Zijlstra Cc: Eric Dumazet Cc: John Kacur Cc: Ingo Molnar LKML-Reference: <1289252428-18383-1-git-send-email-dvhart@linux.intel.com> Signed-off-by: Thomas Gleixner commit b41277dc7a18ee332d9e8078e978bacdf6e76157 Author: Darren Hart Date: Mon Nov 8 13:10:09 2010 -0800 futex: Replace fshared and clockrt with combined flags In the early days we passed the mmap sem around. That became the "int fshared" with the fast gup improvements. Then we added "int clockrt" in places. This patch unifies these options as "flags". [ tglx: Split out the stale fshared cleanup ] Signed-off-by: Darren Hart Cc: Peter Zijlstra Cc: Eric Dumazet Cc: John Kacur Cc: Ingo Molnar LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com> Signed-off-by: Thomas Gleixner commit ae791a2d2e382adc69990a144a7f1a6c4bc24f1e Author: Thomas Gleixner Date: Wed Nov 10 13:30:36 2010 +0100 futex: Cleanup stale fshared flag interfaces The fast GUP changes stopped using the fshared flag in put_futex_keys(), but we kept the interface the same. Cleanup all stale users. This patch is split out from Darren Harts combo patch which also combines various flags. This way the changes are clearly separated. Signed-off-by: Thomas Gleixner Cc: Darren Hart LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com> commit c7657ac0c3e4d4ab569296911164b7a2b0ff871a Author: Borislav Petkov Date: Mon Nov 1 23:36:53 2010 +0100 x86, microcode, AMD: Cleanup code a bit get_ucode_data is a memcpy() wrapper which always returns 0. Move it into the header and make it an inline. Remove all code checking its return value and turn it into a void. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov commit 1ea6be212eea5ce1e8fabadacb0c639ad87b2f00 Author: Jesper Juhl Date: Mon Nov 1 22:44:34 2010 +0100 x86, microcode, AMD: Replace vmalloc+memset with vzalloc We don't have to do memset() ourselves after vmalloc() when we have vzalloc(), so change that in arch/x86/kernel/microcode_amd.c::get_next_ucode(). Signed-off-by: Jesper Juhl Signed-off-by: Borislav Petkov commit 7decaa557a20f48aabef35f817ec16ef563567b0 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:35:54 2010 +0100 ARM: 6454/1: sa1100: Fix for a nasty initialization bug in the RTSR. This patch fixes a nasty initialization condition on the RTSR register. Sometimes, bit 1 will wake up set, sometimes not. This can be seen by checking the value of the RTSR by typing '$ cat /proc/driver/rtc', which has been provided by the previous patch. If this bit is set, the command '$ cat /dev/rtc0' will lock the system in an endless interrupt routine calling loop. This patch fixes the issue both at sa1100_rtc_probe(), where it avoids a spurious interrupt from happening, and at sa1100_rtc_interrupt(), which is the robust solution, though it does not avoid the first spurious interrupt. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit fd3ee6d3421bc05ce42ee7f48071aee72051af28 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:34:47 2010 +0100 ARM: 6453/1: sa1100: Print the value of RTSR on /proc/drivers/rtc. This patch adds a line to the output of /proc/drivers/rtc to show the value of the RTSR register. It will be used to demonstrate a nasty initialization bug that will be fixed in the sequence. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit a404ad1ff593589bdd34c48ebecddada9edbfaf3 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:33:53 2010 +0100 ARM: 6452/1: Fix checkpatch.pl issues in drivers/rtc/rtc-sa1100.c. This patch fixes checkpatch.pl issues in drivers/rtc/rtc-sa1100.c, which I will later modify. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit d03f322c41890a86bf64d00314f0ec72738a7f21 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:31:26 2010 +0100 ARM: 6450/1: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. This patch fixes checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 34177802001894e064c857cac2759f68119550cd Author: Linus Walleij Date: Tue Oct 19 12:43:58 2010 +0100 ARM: 6438/2: mmci: add SDIO support for ST Variants This adds some minor variant data and trickery to enable SDIO on the ST Micro variants of MMCI/PL180. Signed-off-by: Marcin Mielczarczyk Signed-off-by: Linus Walleij Signed-off-by: Russell King commit f20f8f21e0402c785c342547f7e49eafc42cfb52 Author: Linus Walleij Date: Tue Oct 19 13:41:24 2010 +0100 ARM: 6399/3: mmci: handle broken MCI_DATABLOCKEND hardware On the U300 the MCI_DATAEND and MCI_DATABLOCKEND IRQs can arrive out-of-order. Replace an ugly #ifdef hack with a proper runtime solution which models what is really happening. In the U300 DMA mode and on all Ux500 models, the MCI_DATABLOCKEND flag isn't properly cleared in hardware following and ACK leading to all kind of weird behaviour when the flag is still up in subsequent interrupts, so we add two flags indicating the error and handle this runtime. Cc: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 2686b4b408c25349aee7b35558722d5730d67224 Author: Linus Walleij Date: Tue Oct 19 12:39:48 2010 +0100 ARM: 6311/2: mmci: work with only one irq The DBx500 variants have only one IRQ line hooked up. Allow these (and any other implementations which choose to use only one irq) to work by directing the PIO interrupts also to the first IRQ line. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 5e4f083f78d03e9f8d2e327daccde16976f9bb00 Author: Yong Zhang Date: Sun Oct 24 11:50:53 2010 +0800 hrtimer: Remove stale comment on curr_timer curr_timer doesn't resident in struct hrtimer_cpu_base anymore. Signed-off-by: Yong Zhang LKML-Reference: <1287892253-2587-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Thomas Gleixner commit 12ddf37444eaaf67b147561141150e10a56d7742 Merge: dc7c0b6 c724d07 Author: Paul Mundt Date: Wed Nov 10 18:34:49 2010 +0900 Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit da1d39e3903bc35be2b5e8d2116fdd5d337244d4 Author: Simon Horman Date: Tue Nov 9 17:47:02 2010 +0900 mmc, sh: Move constants to sh_mmcif.h This moves some constants from sh_mmcif.c to sh_mmcif.h so that they can be used in sh_mmcif_boot_init(). It also alters the definition of SOFT_RST_OFF from (0 << 31) to ~SOFT_RST_ON (= ~(1 << 31)). The former seems bogus. The latter is consistent with the code in sh_mmcif_boot_init(). Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 3cf9b85b474e656a0856b88290c7a289ac5ea247 Author: Joe Perches Date: Fri Nov 5 16:12:38 2010 -0700 locking, lockdep: Convert sprintf_symbol to %pS Signed-off-by: Joe Perches Cc: Peter Zijlstra Cc: Jiri Kosina LKML-Reference: <1288998760-11775-6-git-send-email-joe@perches.com> Signed-off-by: Ingo Molnar commit f6cd24777513fcc673d432cc29ef59881d3e4df1 Author: Eric Dumazet Date: Thu Nov 4 11:13:48 2010 +0100 irq: Better struct irqaction layout We currently use kmalloc-96 slab for struct irqaction allocations on 64bit arches. This is unfortunate because of possible false sharing and two cache lines accesses. Move 'name' and 'dir' fields at the end of the structure, and force a suitable alignement. Hot path fields now use one cache line on x86_64. Signed-off-by: Eric Dumazet Reviewed-by: Andi Kleen Cc: Peter Zijlstra LKML-Reference: <1288865628.2659.69.camel@edumazet-laptop> Signed-off-by: Thomas Gleixner commit 640dcfa0ff49ea1fcddad39e7c468683d9f00342 Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:34 2010 +0000 ARM: mach-shmobile: optimize PLLC2 frequency for HDMI On ap4evb PLLC2 is only used as a parent of the HDMI clock, therefore it can be reconfigured freely to improve HDMI clock precision. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c724d07a56e60e91b0aa75193f86fb000545ffe4 Author: Paul Mundt Date: Wed Nov 10 17:54:20 2010 +0900 fbdev: sh_mobile_hdmi: fix up compiler warnings. CC drivers/video/sh_mobile_hdmi.o drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_avi_infoframe_setup': drivers/video/sh_mobile_hdmi.c:539: warning: unused variable 'var' drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_clk_configure': drivers/video/sh_mobile_hdmi.c:1021: warning: unused variable 'pdata' Signed-off-by: Paul Mundt commit 830539d14379d0f5cb07832a3e4466418011f843 Author: Paul Mundt Date: Wed Nov 10 17:51:44 2010 +0900 fbdev: sh_mobile_lcdcfb: fix up compiler warnings. CC drivers/video/sh_mobile_lcdcfb.o drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_check_var': drivers/video/sh_mobile_lcdcfb.c:922: warning: format '%u' expects type 'unsigned int', but argument 11 has type 'long unsigned int' Signed-off-by: Paul Mundt commit 0ea2af1c15b730dba9ce741420352d298bcd7862 Author: Guennadi Liakhovetski Date: Thu Nov 4 11:06:17 2010 +0000 fbdev: sh_mobile_hdmi: add support for 1080p modes Add support for 3 more preprogrammed video modes: 1080p at 24, 50, and 60Hz. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit d2ecbab5960d9814a269d36723647d6ef391ba8f Author: Guennadi Liakhovetski Date: Thu Nov 4 11:06:06 2010 +0000 fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p LCDC hardware can support 1920x1080 formats, adjust the driver to cover them. Besides, instead of guessing some "reasonable" validity checks, only verify values in .fb_check_var(), that we are sure, we cannot support. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 8c183ecee23991dd6c0476a537c6bae8afd2567e Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:20 2010 +0000 fbdev: sh_mobile_hdmi: improve support for more video modes Configure pre-programmed VIC modes for VGA (640x480@60) and 720x576@50 modes, change PHY mode selection to be based on pixel clock frequency. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c36940e678fc30779c99246c034deca1fed61ae4 Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:16 2010 +0000 fbdev: sh_mobile_hdmi: add support for more precise HDMI clock configuration The HDMI clock has to be reconfigured for different video modes. However, the precision of the supplying SoC clock on SH-Mobile systems is often insufficient. This patch allows to additionally reconfigure the parent clock to achieve the optimal HDMI clock frequency, in case this is supported by the platform. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit eae6cb31d890e2860f9ce1b8ba73c27b6005af68 Author: Grant Likely Date: Thu Oct 14 09:32:53 2010 -0600 spi/xilinx: merge OF support code into main driver Now that the of_platform_bus_type has been merged with the platform bus type, a single platform driver can handle both OF and non-OF use cases. This patch merges the OF support into the platform driver. Signed-off-by: Grant Likely Tested-by: Michal Simek commit 8fd8821b62397f8ddb7bfb23c3246a22770ab2ee Author: Grant Likely Date: Thu Oct 14 09:04:29 2010 -0600 spi/xilinx: fold platform_driver support into main body This patch merges the platform driver support into the main body of xilinx_spi.c in preparation for merging the OF and non-OF support code. Signed-off-by: Grant Likely Tested-by: Michal Simek commit 91565c4068042b3d8e37e64e393ca105476419bd Author: Grant Likely Date: Thu Oct 14 08:54:55 2010 -0600 spi/xilinx: Eliminate pdata references from common code. The current code has the OF binding modifying the platform_data pointer which it must not do, and the common code doesn't really need to use a pdata pointer. This patch eliminates the platform_data references from the common part of the driver in preparation for merging the OF and non-OF versions. Signed-off-by: Grant Likely Tested-by: Michal Simek commit dc7c0b6a6d28b0de231728de963ed53a9cee85cf Merge: d6ff7d0 b884a94 Author: Paul Mundt Date: Wed Nov 10 12:04:41 2010 +0900 Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 commit 074e61ec3751da9ab88ee66d3818574556c03489 Author: James Morris Date: Wed Nov 10 09:01:31 2010 +1100 kernel: add roundup() code comment from akpm Add roundup() code comment from akpm. Signed-off-by: Andrew Morton Signed-off-by: James Morris commit edb40a23c8dc5b5be219bf4561074b6233bba65f Author: Bruno Randolf Date: Tue Oct 19 16:56:54 2010 +0900 ath5k: Add channel time to survey data Include the channel utilization (busy, rx, tx) in the survey results. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42 Author: Bruno Randolf Date: Tue Oct 19 16:56:48 2010 +0900 ath5k: Optimize descriptor alignment Similar to Felix Fietkau "ath9k_hw: optimize all descriptor access functions" (13db2a80244908833502189a24de82a856668b8a). Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a Author: Mohammed Shafi Shajakhan Date: Mon Oct 18 11:37:17 2010 +0530 ath9k: Remove the median function in rate control With the current rate control selection method the median function is nowhere used, so remove it. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871 Author: Felix Fietkau Date: Sat Oct 16 01:01:48 2010 +0200 ath9k_hw: optimize all descriptor access functions Because all of the descriptor data structures are marked as __packed, GCC assumes the worst case wrt. alignment and generates unaligned load/store instructions on MIPS for access to all fields. Since descriptors always have to be 4-byte-aligned, we can just mark the data structures with __aligned(4), which allows GCC to generate much more efficient code. Verified through disassembly and OProfile comparisons. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4 Author: Rafael J. Wysocki Date: Sat Oct 16 00:36:17 2010 +0200 ath9k: Convert to new PCI PM framework The ath9k driver uses the legacy PCI power management (suspend and resume) callbacks that apparently cause intermittent problems to happen (the adapter sometimes doesn't resume correctly on my Acer Ferrari One). Make it use the new PCI PM and let the PCI core code handle the PCI-specific details of power transitions. Signed-off-by: Rafael J. Wysocki Signed-off-by: John W. Linville commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba Author: Luis R. Rodriguez Date: Fri Oct 15 13:27:49 2010 -0700 ath9k: fix sparse complaint on aphy for debugfs This fixes this sparse complaint: CHECK drivers/net/wireless/ath/ath9k/debug.c drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 744bcb42a1ff1b9200e82dd074468877e31ff161 Author: Felix Fietkau Date: Fri Oct 15 20:03:33 2010 +0200 ath9k_hw: make ath9k_hw_gettsf32 static It is now only used in hw.c Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54 Author: Felix Fietkau Date: Fri Oct 15 20:03:32 2010 +0200 ath9k: remove a redundant call to ath9k_hw_gettsf32 When the timer_next argument to ath9k_gen_timer_start is behind the tsf value, tsf + timer_period is used, which is what ath_btcoex_period_timer was setting it to. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9fa23e1741404207c414fad69212a8763c138bf0 Author: Felix Fietkau Date: Fri Oct 15 20:03:31 2010 +0200 ath9k: optimize/fix ANI RSSI processing ANI needs the RSSI average only in station mode, and only for tracking the signal strength of beacons of the AP that it is connected to. Adjust the code to track on the beacon RSSI, and store the average of that in the ath_wiphy struct. With these changes, we can get rid of this extra station lookup in the rx path, which saves precious CPU cycles. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c Author: Felix Fietkau Date: Fri Oct 15 20:03:30 2010 +0200 ath9k_hw: optimize tx status descriptor processing Disassembly shows, that at least on MIPS, the compiler generates a lot of memory accesses to the same location in the descriptor field parsing. Since it is operating on uncached memory, this can be quite expensive in this hot path. Change the code a bit to help the compiler optimize it properly, and get rid of some unused fields in the ath_tx_status struct. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 45684c75f9aa80eb477465bddcf79c9ad95206c7 Author: Felix Fietkau Date: Fri Oct 15 20:03:29 2010 +0200 ath9k_hw: small optimization in ar9002_hw_get_isr ah->config.rx_intr_mitigation does not need to be checked before checking the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those interrupts will be masked out if rx interrupt mitigation is disabled. Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4df3071ebd92ef7115b409da64d0eb405d24a631 Author: Felix Fietkau Date: Mon Nov 8 20:54:47 2010 +0100 ath9k_hw: optimize interrupt mask changes OProfile showed that ath9k was spending way too much time in ath9k_hw_set_interrupts. Since most of the interrupt mask changes only need to globally enable/disable interrupts, it makes sense to split this part into separate functions, replacing all calls to ath9k_hw_set_interrupts(ah, 0) with ath9k_hw_disable_interrupts(ah). ath9k_hw_set_interrupts(ah, ah->imask) only gets changed to ath9k_hw_enable_interrupts(ah), whenever ah->imask was not changed since the point where interrupts were disabled. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 790a11f268373b60069bc1371dc05143107c607c Author: Rafał Miłecki Date: Thu Oct 14 23:04:40 2010 +0200 b43: N-PHY: define registers names for 2056 radio Signed-off-by: Rafał Miłecki Cc: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: John W. Linville commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7 Author: Rafał Miłecki Date: Sun Oct 17 15:38:51 2010 +0200 b43: N-PHY: define registers names for 2056 radio Signed-off-by: Rafał Miłecki Cc: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: John W. Linville commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543 Author: Rafał Miłecki Date: Thu Oct 14 23:01:02 2010 +0200 b43: N-PHY: define channel table struct for rev3+ devices Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 27b1fec2caa668c162cd1a862c69e087df277fae Author: Rajendra Nayak Date: Tue Sep 28 21:02:58 2010 +0530 OMAP: I2C: Convert i2c driver to use PM runtime api's This patch converts the i2c driver to use PM runtime apis Signed-off-by: Rajendra Nayak Cc: Paul Walmsley Cc: Jean Delvare Acked-by: Ben Dooks Signed-off-by: Kevin Hilman commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 Author: Paul Walmsley Date: Tue Sep 21 19:37:15 2010 +0530 OMAP: I2C: split device registration and convert OMAP2+ to omap_device Split the OMAP1 and OMAP2+ platform_device build and register code. Convert the OMAP2+ variant to use omap_device. This patch was developed in collaboration with Rajendra Nayak . Signed-off-by: Paul Walmsley Signed-off-by: Rajendra Nayak Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit f776471f620a07be234f40288a1fd9932d039e26 Author: Benoit Cousson Date: Tue Sep 21 19:37:14 2010 +0530 OMAP4: hwmod: add I2C hwmods for OMAP4430 Add hwmod structures for I2C controllers on OMAP4430. Signed-off-by: Benoit Cousson Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman commit 4fe20e97c8b1082d16b38e9f4c53feeed143ab98 Author: Rajendra Nayak Date: Tue Sep 21 19:37:13 2010 +0530 OMAP3: hwmod: add I2C hwmods for OMAP3430 Add hwmod structures for I2C controllers on OMAP3430. This patch was developed in collaboration with Paul Walmsley . OMAP3 fixes for correct IDLEST bit monitoring from G, Manjunath Kondaiah Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: G, Manjunath Kondaiah Signed-off-by: Kevin Hilman commit 2004290f55f03c52e22044a5843928cf0f6cc56a Author: Paul Walmsley Date: Thu Sep 30 02:40:12 2010 +0530 OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430 Add hwmod structures for I2C controllers on OMAP2420/2430. NOTE: I2C module on OMAP2420 has 16bit registers and causes imprecise aborts if 32bits are read/written to it. Use the HWMOD_16BIT_REG flag to notify the hmwod framework of this hard requirement so that __raw_writew/readw is used to read /write the mdoule registers. Signed-off-by: Paul Walmsley Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43 Author: Joe Perches Date: Sat Oct 30 11:08:53 2010 +0000 net/ipv4/tcp.c: Update WARN uses Coalesce long formats. Align arguments. Remove KERN_. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b194a3674fba6d9f9e470084d192c7cb99194a62 Author: Joe Perches Date: Sat Oct 30 11:08:52 2010 +0000 net/core/dev.c: Update WARN uses Coalesce long formats. Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9c413ed55d5b52159e85a3937cda7f210a318048 Author: Joe Perches Date: Sat Oct 30 11:08:34 2010 +0000 drivers/net/usb: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c389ff80d4b598f57d56aa807d396d4351cac8a4 Author: Joe Perches Date: Sat Oct 30 11:08:33 2010 +0000 drivers/net/can: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7 Author: Eric Dumazet Date: Wed Nov 3 22:49:35 2010 +0000 drivers/net: normalize TX_TIMEOUT Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of old kernels. Convert these definitions to include HZ, since HZ can be 1000 these days. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 Author: Daniel Drake Date: Tue Sep 21 16:37:26 2010 +0100 viafb: Add OLPC XO-1.5 port configs The OLPC XO-1.5 does not use the standard port wiring suggested in the viafb driver. This is required for the upcoming OLPC DCON and via-camera drivers, to be submitted soon. Signed-off-by: Daniel Drake [fts: removed useless ifdef's and corrected comment] Signed-off-by: Florian Tobias Schandinat commit 67eb6f9617a24dfb033b584d6b1b42b39cc9297a Author: Jonathan Corbet Date: Thu Oct 28 18:23:21 2010 +0100 viafb: suspend/resume for GPIOs Be sure to re-enable GPIO lines on resume. Users still have to be sure to set them properly. Signed-off-by: Jonathan Corbet Signed-off-by: Daniel Drake Signed-off-by: Florian Tobias Schandinat commit 751305d9b2fd3e03eaab7808e976241d85ca4353 Author: Daniel Drake Date: Thu Oct 28 18:23:01 2010 +0100 viafb: General power management infrastructure Multiple devices need S/R hooks (framebuffer, GPIO, camera). Add infrastructure and convert existing framebuffer code to the new model. This patch should create no functional change. Based on earlier work by Jonathan Corbet. Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Florian Tobias Schandinat commit 7f05dec3dd70f086870fdc1d40dbe30db1fe0994 Author: Jacob Pan Date: Tue Nov 9 11:28:43 2010 +0000 x86: mrst: Parse SFI timer table for all timer configs Penwell has APB timer based watchdog timers, it requires platform code to parse SFI MTMR tables in order to claim its timer. This patch will always parse SFI MTMR regardless of system timer configuration choices. Otherwise, SFI MTMR table may not get parsed if running on Medfield with always-on local APIC timers and constant TSC. Watchdog timer driver will then not get a timer to use. Signed-off-by: Jacob Pan Signed-off-by: Alan Cox LKML-Reference: <20101109112800.20591.10802.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 1da4b1c6a4dfb5a13d7147a27c1ac53fed09befd Author: Feng Tang Date: Tue Nov 9 11:22:58 2010 +0000 x86/mrst: Add SFI platform device parsing code SFI provides a series of tables. These describe the platform devices present including SPI and I²C devices, as well as various sensors, keypads and other glue as well as interfaces provided via the SCU IPC mechanism (intel_scu_ipc.c) This patch is a merge of the core elements and relevant fixes from the Intel development code by Feng, Alek, myself into a single coherent patch for upstream submission. It provides the needed infrastructure to register I2C, SPI and platform devices described by the tables, as well as handlers for some of the hardware already supported in kernel. The 0.8 firmware also provides GPIO tables. Devices are created at boot time or if they are SCU dependant at the point an SCU is discovered. The existing Linux device mechanisms will then handle the device binding. At an abstract level this is an SFI to Linux device translator. Device/platform specific setup/glue is in this file. This is done so that the drivers for the generic I²C and SPI bus devices remain cross platform as they should. (Updated from RFC version to correct the emc1403 name used by the firmware and a wrongly used #define) Signed-off-by: Alek Du LKML-Reference: <20101109112158.20013.6158.stgit@localhost.localdomain> [Clean ups, removal of 0.7 support] Signed-off-by: Feng Tang [Clean ups] Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit d6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf Author: Alexey Charkov Date: Tue Nov 9 02:42:39 2010 +0300 ARM: Add support for the display controllers in VT8500 and WM8505 This adds drivers for the LCD controller found in VIA VT8500 SoC, GOVR display controller found in WonderMedia WM8505 SoC and for the Graphics Engine present in both of them that provides hardware accelerated raster operations (used for copyarea and fillrect). Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit cf655c36fad7b6488a56f18ab56f7d608ca6552b Merge: a7bcf21 2e351ec Author: Paul Mundt Date: Tue Nov 9 16:53:33 2010 +0900 Merge branch 'rmobile/core' into rmobile-latest commit 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 Merge: a9b27bc 37b7a97 99870bd Author: Paul Mundt Date: Tue Nov 9 16:51:46 2010 +0900 Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest commit a9b27bcc6acf2491609f51aa592ec67311d4518d Author: Paul Mundt Date: Mon Nov 1 12:44:25 2010 -0400 sh: Break out cpuinfo_op procfs bits. Presently this is all inlined in setup.c, which is not really the place for it. Follow the x86 example and split it out into its own file. Signed-off-by: Paul Mundt commit f020c92de48246510623162fb22d60d91810cc56 Author: Paul Mundt Date: Mon Nov 1 12:24:48 2010 -0400 sh: Enable optional gpiolib for all CPUs with pinmux tables. All of the CPUs with pinmux tables support gpiolib. At present the boards that depend on it for initialization manually select gpiolib as needed, but there is no reason why it can't be exposed generically to the user regardless. Signed-off-by: Paul Mundt commit 16b259203c513ed28bd31cc9a981e0d3ad517943 Author: Paul Mundt Date: Mon Nov 1 12:18:48 2010 -0400 sh: migrate SH_CLK_MD to mode pin API. This kills off the hardcoded SH_CLK_MD introduced by the SH-2 boards and converts over to the mode pin API. Signed-off-by: Paul Mundt commit 973a34aa8593dbfe84386343c694f5beecb51d8a Author: Eric Dumazet Date: Sun Oct 31 05:38:25 2010 +0000 af_unix: optimize unix_dgram_poll() unix_dgram_poll() is pretty expensive to check POLLOUT status, because it has to lock the socket to get its peer, take a reference on the peer to check its receive queue status, and queue another poll_wait on peer_wait. This all can be avoided if the process calling unix_dgram_poll() is not interested in POLLOUT status. It makes unix_dgram_recvmsg() faster by not queueing irrelevant pollers in peer_wait. On a test program provided by Alan Crequy : Before: real 0m0.211s user 0m0.000s sys 0m0.208s After: real 0m0.044s user 0m0.000s sys 0m0.040s Suggested-by: Davide Libenzi Reported-by: Alban Crequy Acked-by: Davide Libenzi Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5456f09aaf88731e16dbcea7522cb330b6846415 Author: Eric Dumazet Date: Sun Oct 31 05:36:23 2010 +0000 af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event Alban Crequy reported a problem with connected dgram af_unix sockets and provided a test program. epoll() would miss to send an EPOLLOUT event when a thread unqueues a packet from the other peer, making its receive queue not full. This is because unix_dgram_poll() fails to call sock_poll_wait(file, &unix_sk(other)->peer_wait, wait); if the socket is not writeable at the time epoll_ctl(ADD) is called. We must call sock_poll_wait(), regardless of 'writable' status, so that epoll can be notified later of states changes. Misc: avoids testing twice (sk->sk_shutdown & RCV_SHUTDOWN) Reported-by: Alban Crequy Cc: Davide Libenzi Signed-off-by: Eric Dumazet Acked-by: Davide Libenzi Signed-off-by: David S. Miller commit 67426b756c4d52c511c4b22b269accea171692a8 Author: Eric Dumazet Date: Fri Oct 29 20:44:44 2010 +0000 af_unix: use keyed wakeups Instead of wakeup all sleepers, use wake_up_interruptible_sync_poll() to wakeup only ones interested into writing the socket. This patch is a specialization of commit 37e5540b3c9d (epoll keyed wakeups: make sockets use keyed wakeups). On a test program provided by Alan Crequy : Before: real 0m3.101s user 0m0.000s sys 0m6.104s After: real 0m0.211s user 0m0.000s sys 0m0.208s Reported-by: Alban Crequy Signed-off-by: Eric Dumazet Cc: Davide Libenzi Signed-off-by: David S. Miller commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0 Author: Eric Dumazet Date: Fri Oct 29 03:09:24 2010 +0000 decnet: RCU conversion and get rid of dev_base_lock While tracking dev_base_lock users, I found decnet used it in dnet_select_source(), but for a wrong purpose: Writers only hold RTNL, not dev_base_lock, so readers must use RCU if they cannot use RTNL. Adds an rcu_head in struct dn_ifaddr and handle proper RCU management. Adds __rcu annotation in dn_route as well. Signed-off-by: Eric Dumazet Acked-by: Steven Whitehouse Signed-off-by: David S. Miller commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a Author: Eric Dumazet Date: Fri Oct 29 01:52:46 2010 +0000 bonding: remove dev_base_lock use bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure device doesn’t disappear. Same goal can be achieved using RCU. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 840a185dddfd098b78b96a30da4cad722a7aef18 Author: Eric Dumazet Date: Fri Oct 29 01:15:29 2010 +0000 aoe: remove dev_base_lock use from aoecmd_cfg_pkts() dev_base_lock is the legacy way to lock the device list, and is planned to disappear. (writers hold RTNL, readers hold RCU lock) Convert aoecmd_cfg_pkts() to RCU locking. Signed-off-by: Eric Dumazet Cc: "Ed L. Cashin" Signed-off-by: David S. Miller commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c Author: Arce, Abraham Date: Thu Oct 28 18:57:20 2010 +0000 ks8851: suspend resume support Add suspend/resume support using default open/stop interface methods to do hardware dependant operations. On suspend, same low power state (soft power mode) will be kept, the following blocks will be disabled: - Internal PLL Clock - Tx/Rx PHY - MAC - SPI Interface Signed-off-by: Abraham Arce Signed-off-by: David S. Miller commit d0eaeec8e8dfdc31815941054802dcccd7c3fe1d Merge: a7bcf21 aa58163 Author: David S. Miller Date: Mon Nov 8 12:38:28 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 6f80dfe55fcbde1e588bc2cfa1273403b710872d Author: Christoph Hellwig Date: Sun Nov 7 23:01:17 2010 +0100 hfsplus: fix option parsing during remount hfsplus only actually uses the force option during remount, but it uses the full option parser with a fake superblock to do so. This means remount will fail if any nls option is set (which happens frequently with older mount tools), even if it is the same. Fix this by adding a simpler version of the parser that only parses the force option for remount. Signed-off-by: Christoph Hellwig commit 98072e4d977aabe6a39abb95951cd8bf2c2202d5 Author: Pavel Emelyanov Date: Thu Oct 28 13:50:37 2010 +0400 slub: Fix slub_lock down/up imbalance There are two places, that do not release the slub_lock. Respective bugs were introduced by sysfs changes ab4d5ed5 (slub: Enable sysfs support for !CONFIG_SLUB_DEBUG) and 2bce6485 ( slub: Allow removal of slab caches during boot). Acked-by: Christoph Lameter Signed-off-by: Pavel Emelyanov Signed-off-by: Pekka Enberg commit 716ce5d4a6f81653507c21b152eb7629d150ce7a Author: Pekka Enberg Date: Wed Oct 27 18:17:38 2010 +0300 slub: Fix build breakage in Documentation/vm This patch fixes a build breakage introduced by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move slabinfo.c to tools/slub/slabinfo.c") that was repoted by Stephen: After merging the slab tree, today's linux-next build (x86_64 allmodconfig) failed like this: gcc: /scratch/sfr/next/Documentation/vm/slabinfo.c: No such file or directory gcc: no input files Caused by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move slabinfo.c to tools/slub/slabinfo.c"). Missing update to Documentation/vm/Makefile? Reported-by: Stephen Rothwell Signed-off-by: Pekka Enberg commit 4a92379bdfb48680a5e6775dd53a586df7b6b0b1 Author: Richard Kennedy Date: Thu Oct 21 10:29:19 2010 +0100 slub tracing: move trace calls out of always inlined functions to reduce kernel code size Having the trace calls defined in the always inlined kmalloc functions in include/linux/slub_def.h causes a lot of code duplication as the trace functions get instantiated for each kamalloc call site. This can simply be removed by pushing the trace calls down into the functions in slub.c. On my x86_64 built this patch shrinks the code size of the kernel by approx 36K and also shrinks the code size of many modules -- too many to list here ;) size vmlinux (2.6.36) reports text data bss dec hex filename 5410611 743172 828928 6982711 6a8c37 vmlinux 5373738 744244 828928 6946910 6a005e vmlinux + patch The resulting kernel has had some testing & kmalloc trace still seems to work. This patch - moves trace_kmalloc out of the inlined kmalloc() and pushes it down into kmem_cache_alloc_trace() so this it only get instantiated once. - rename kmem_cache_alloc_notrace() to kmem_cache_alloc_trace() to indicate that now is does have tracing. (maybe this would better being called something like kmalloc_kmem_cache ?) - adds a new function kmalloc_order() to handle allocation and tracing of large allocations of page order. - removes tracing from the inlined kmalloc_large() replacing them with a call to kmalloc_order(); - move tracing out of inlined kmalloc_node() and pushing it down into kmem_cache_alloc_node_trace - rename kmem_cache_alloc_node_notrace() to kmem_cache_alloc_node_trace() - removes the include of trace/events/kmem.h from slub_def.h. v2 - keep kmalloc_order_trace inline when !CONFIG_TRACE Signed-off-by: Richard Kennedy Signed-off-by: Pekka Enberg commit 0d24db337e6d81c0c620ab65cc6947bd6553f742 Author: Christoph Lameter Date: Thu Oct 21 13:01:56 2010 -0500 slub: move slabinfo.c to tools/slub/slabinfo.c We now have a tools directory for these things. Reviewed-by: KOSAKI Motohiro Acked-by: David Rientjes Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 62d69e6a57c5b5d52a607b1ce73ff6af65c992eb Author: Enric Balletbo i Serra Date: Sat Oct 23 16:48:58 2010 +0000 omap3: IGEP v2: Remove onenand_setup no-op function Set onenand_setup to NULL instead of adding a no-op function. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b Author: Rob Herring Date: Wed Oct 6 16:18:08 2010 +0100 ARM: 6432/1: move timer-sp.c from versatile to common From: Rob Herring The timer-sp h/w used on versatile platforms can also be used for other platforms, so move it to a common location. Signed-off-by: Rob Herring Signed-off-by: Russell King commit 64d2dc384e41e2b7acead6804593ddaaf8aad8e1 Author: Leif Lindholm Date: Thu Sep 16 18:00:47 2010 +0100 ARM: 6396/1: Add SWP/SWPB emulation for ARMv7 processors The SWP instruction was deprecated in the ARMv6 architecture, superseded by the LDREX/STREX family of instructions for load-linked/store-conditional operations. The ARMv7 multiprocessing extensions mandate that SWP/SWPB instructions are treated as undefined from reset, with the ability to enable them through the System Control Register SW bit. This patch adds the alternative solution to emulate the SWP and SWPB instructions using LDREX/STREX sequences, and log statistics to /proc/cpu/swp_emulation. To correctly deal with copy-on-write, it also modifies cpu_v7_set_pte_ext to change the mappings to priviliged RO when user RO. Signed-off-by: Leif Lindholm Acked-by: Catalin Marinas Acked-by: Kirill A. Shutemov Signed-off-by: Russell King commit 247055aa21ffef1c49dd64710d5e94c2aee19b58 Author: Catalin Marinas Date: Mon Sep 13 16:03:21 2010 +0100 ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs This patch removes the domain switching functionality via the set_fs and __switch_to functions on cores that have a TLS register. Currently, the ioremap and vmalloc areas share the same level 1 page tables and therefore have the same domain (DOMAIN_KERNEL). When the kernel domain is modified from Client to Manager (via the __set_fs or in the __switch_to function), the XN (eXecute Never) bit is overridden and newer CPUs can speculatively prefetch the ioremap'ed memory. Linux performs the kernel domain switching to allow user-specific functions (copy_to/from_user, get/put_user etc.) to access kernel memory. In order for these functions to work with the kernel domain set to Client, the patch modifies the LDRT/STRT and related instructions to the LDR/STR ones. The user pages access rights are also modified for kernel read-only access rather than read/write so that the copy-on-write mechanism still works. CPU_USE_DOMAINS gets disabled only if the hardware has a TLS register (CPU_32v6K is defined) since writing the TLS value to the high vectors page isn't possible. The user addresses passed to the kernel are checked by the access_ok() function so that they do not point to the kernel space. Tested-by: Anton Vorontsov Cc: Tony Lindgren Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 8b7347aab6865ae8a2e5a8b0f1deea12da3d3aff Author: Michael S. Tsirkin Date: Sun Sep 19 15:56:30 2010 +0200 vhost: get/put_user -> __get/__put_user We do access_ok checks on all ring values on an ioctl, so we don't need to redo them on each access. Signed-off-by: Michael S. Tsirkin commit dfe5ac5b18be5b10d01a17e734a9905c0def6088 Author: Michael S. Tsirkin Date: Tue Sep 21 14:18:01 2010 +0200 vhost: copy_to_user -> __copy_to_user We do access_ok checks at setup time, so we don't need to redo them on each access. Signed-off-by: Michael S. Tsirkin commit 64e1c80748afca3b4818ebb232a9668bf529886d Author: Michael S. Tsirkin Date: Wed Oct 6 15:34:45 2010 +0200 vhost-net: batch use/unuse mm Move use/unuse mm to vhost.c which makes it possible to batch these operations. Signed-off-by: Michael S. Tsirkin commit 533a19b4b88fcf81da3106b94f0ac4ac8b33a248 Author: Michael S. Tsirkin Date: Wed Oct 6 15:34:38 2010 +0200 vhost: put mm after thread stop makes it possible to batch use/unuse mm Signed-off-by: Michael S. Tsirkin commit a4bc6926d05b60bf70aab2db2c6715e15118cbdc Author: Jiri Kosina Date: Wed Nov 3 10:42:02 2010 -0400 HID: make translation table selection more clear Reshuffle the code a little bit so that the translation table selection is more obvious and there is only one place performing the actual translation using the selected table. Signed-off-by: Jiri Kosina commit 99b9f758bbc904f22faffcf4d83205f4a5e7bc0c Author: Edgar (gimli) Hucek Date: Wed Nov 3 10:36:18 2010 -0400 HID: add MacBookAir 3,1 and 3,2 support This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the hid driver. Signed-off-by: Edgar (gimli) Hucek Signed-off-by: Jiri Kosina commit 8b32a92b600e2728c5c438a748a4dc3132c98ef3 Author: Paul Mundt Date: Mon Nov 1 17:05:30 2010 -0400 sh: Add EHCI support for SH7786. This adds in the platform device for SH7786 USB EHCI. Signed-off-by: Paul Mundt commit 63c845522263b2da08f70deba760ed0ab51e841d Author: Paul Mundt Date: Mon Nov 1 17:03:27 2010 -0400 usb: ehci-hcd: Add support for SuperH EHCI. This adds a trivial stub for supporting EHCI mode of the on-chip SH USB host controllers. Signed-off-by: Paul Mundt commit 9cc563968066b55b067bcff132e4d566b020687d Author: Paul Mundt Date: Mon Nov 1 17:01:27 2010 -0400 usb: ohci-sh: Set IRQ as shared. The SH USB interface has both OHCI and EHCI modes that share the same interrupt. Flag the OHCI IRQ as shared in preparation for EHCI support. Signed-off-by: Paul Mundt commit 04561c5aa243c98cae93cde27e05740df787e692 Author: Ignaz Forster Date: Mon Nov 1 15:13:37 2010 -0400 HID: Add Force Feedback support for EMS Trio Linker Plus II The device has connections for GameCube, PlayStation 2 and Dreamcast controllers, however Force Feedback is only supported for PS2 and GC controllers. When using a PS2 controller it may be necessary to press the "Analog" button to enable support for both motors (this behavior is identical to the Windows driver, I have found no way to avoid that). Signed-off-by: Ignaz Forster Signed-off-by: Jiri Kosina commit 37b7a97884ba64bf7d403351ac2a9476ab4f1bba Author: Paul Mundt Date: Mon Nov 1 09:49:04 2010 -0400 sh: machvec IO death. This takes a bit of a sledgehammer to the machvec I/O routines. The iomem case requires no special casing and so can just be dropped outright. This only leaves the ioport casing for PCI and SuperIO mangling. With the SuperIO case going through the standard ioport mapping, it's possible to replace everything with generic routines. With this done the standard I/O routines are tidied up and NO_IOPORT now gets default-enabled for the vast majority of boards. Signed-off-by: Paul Mundt commit 4b6ba8aacbb3185703b797286547d0f8f3859b02 Author: David Daney Date: Tue Oct 26 15:07:13 2010 -0700 of/net: Move of_get_mac_address() to a common source file. There are two identical implementations of of_get_mac_address(), one each in arch/powerpc/kernel/prom_parse.c and arch/microblaze/kernel/prom_parse.c. Move this function to a new common file of_net.{c,h} and adjust all the callers to include the new header. Signed-off-by: David Daney [grant.likely@secretlab.ca: protect header with #ifdef] Signed-off-by: Grant Likely commit 3fcedec752108de5d99b9f0373ff880756a1e87d Author: Julia Lawall Date: Tue Oct 26 12:25:32 2010 +0200 drivers/vhost/vhost.c: delete double assignment Delete successive assignments to the same location. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression i; @@ *i = ...; i = ...; // Signed-off-by: Julia Lawall Signed-off-by: Michael S. Tsirkin commit eb48c9cb2053e7bb5f7f8f0371cb578a0d439450 Author: Robert Richter Date: Mon Oct 25 16:03:39 2010 +0200 apic, amd: Make firmware bug messages more meaningful This improves error messages in case the BIOS was setting up wrong LVT offsets. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-6-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 0a17941e71f089b128514f7b5b486e20072ca7dc Author: Robert Richter Date: Mon Oct 25 16:03:38 2010 +0200 mce, amd: Remove goto in threshold_create_device() Removing the goto in threshold_create_device(). Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-5-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit bbaff08dca3c34d0fb6b4c4051354184e33e3df8 Author: Robert Richter Date: Mon Oct 25 16:03:37 2010 +0200 mce, amd: Add helper functions to setup APIC This patch reworks and cleans up mce_amd_feature_init() by introducing helper functions to setup and check the LVT offset. It also fixes line endings in pr_err() calls. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-4-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 7203a0494084541575bac6dfc4e153f9e28869b8 Author: Robert Richter Date: Mon Oct 25 16:03:36 2010 +0200 mce, amd: Shorten local variables mci_misc_{hi,lo} Shorten this variables to make later changes more readable. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-3-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 9c37c9d89773ee9da9f6af28ee37d931bd045711 Author: Robert Richter Date: Mon Oct 25 16:03:35 2010 +0200 mce, amd: Implement mce_threshold_block_init() helper function This patch adds a helper function for the initial setup of an mce threshold block. The LVT offset is passed as argument. Also making variable threshold_defaults local as it is only used in function mce_amd_feature_init(). Function threshold_restart_bank() is extended to setup the LVT offset, the change is backward compatible. Thus, now there is only a single wrmsrl() to setup the block. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 7fb2b870d6a3b92f6750ac2b72858fd098dc9e3f Author: Thomas Gleixner Date: Sun Oct 24 11:11:22 2010 +0200 x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage Stupid me forgot to change the function name for the CONFIG_X86_IO_APIC=n case in commit 23f9b2671 (x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()) Signed-off-by: Thomas Gleixner commit fe7de49f9d4e53f24ec9ef762a503f70b562341c Author: KOSAKI Motohiro Date: Wed Oct 20 16:01:12 2010 -0700 sched: Make sched_param argument static in sched_setscheduler() callers Andrew Morton pointed out almost all sched_setscheduler() callers are using fixed parameters and can be converted to static. It reduces runtime memory use a little. Signed-off-by: KOSAKI Motohiro Reported-by: Andrew Morton Acked-by: James Morris Cc: Ingo Molnar Cc: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 Author: Thomas Gleixner Date: Fri Oct 15 15:38:50 2010 -0700 x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings() probe_br_irqs_gsi() is called right after ioapic_init_mappings() and there are no other users. Move it into ioapic_init_mappings() so the declaration can disappear and the function can become static. Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that change. Signed-off-by: Thomas Gleixner LKML-Reference: <1287510389-8388-2-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Dirk Brandewie commit 5a7ae78fd478624df3059cb6f55056b85d074acc Author: Thomas Gleixner Date: Tue Oct 19 10:46:28 2010 -0700 x86: Allow platforms to force enable apic Some embedded x86 platforms don't setup the APIC in the BIOS/bootloader and would be forced to add "lapic" on the kernel command line. That's a bit akward. Split out the force enable code from detect_init_APIC() and allow platform code to call it from the platform setup. That avoids the command line parameter and possible replication of the MSR dance in the force enable code. Signed-off-by: Thomas Gleixner LKML-Reference: <1287510389-8388-1-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Dirk Brandewie commit fd35fbcdd1b2579a6e00a1545f7124e4005d0474 Author: H. Peter Anvin Date: Fri Oct 22 15:33:38 2010 -0700 x86-64, asm: Use fxsaveq/fxrestorq in more places Checkin d7acb92fea932ad2e7846480aeacddc2c03c8485 made use of fxsaveq in fpu_fxsave() if the assembler supports it; this adds fxsaveq/fxrstorq to fxrstor_checking() and fxsave_user() as well. Reported-by: Linus Torvalds LKML-Reference: Signed-off-by: H. Peter Anvin commit 466bd3030973910118ca601da8072be97a1e2209 Author: Yong Zhang Date: Wed Oct 20 15:57:33 2010 -0700 timer: Warn when del_timer_sync() is called in hardirq context Add explict warning when del_timer_sync() is called in hardirq context. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Acked-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 1118e2cd33d47254854e1ba3ba8e32802ff14fdf Author: Yong Zhang Date: Wed Oct 20 15:57:32 2010 -0700 timer: Del_timer_sync() can be used in softirq context Actually we have used del_timer_sync() in softirq context for a long time, e.g. in __dst_free()::cancel_delayed_work(). So change the comments of it to warn on hardirq context only, and make lockdep know about this change. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 6f1bc451e6a79470b122a37ee1fc6bbca450f444 Author: Yong Zhang Date: Wed Oct 20 15:57:31 2010 -0700 timer: Make try_to_del_timer_sync() the same on SMP and UP On UP try_to_del_timer_sync() is mapped to del_timer() which does not take the running timer callback into account, so it has different semantics. Remove the SMP dependency of try_to_del_timer_sync() by using base->running_timer in the UP case as well. [ tglx: Removed set_running_timer() inline and tweaked the changelog ] Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Acked-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 20f33a03f0cf87e51165f7084f697acfb68e865b Author: Namhyung Kim Date: Wed Oct 20 15:57:34 2010 -0700 posix-timers: Annotate lock_timer() lock_timer() conditionally grabs it_lock in case of returning non-NULL but unlock_timer() releases it unconditionally. This leads sparse to complain about the lock context imbalance. Rename and wrap lock_timer using __cond_lock() macro to make sparse happy. Signed-off-by: Namhyung Kim Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit dd6414b50fa2b1cd247a8aa8f8bd42414b7453e1 Author: Phil Carmody Date: Wed Oct 20 15:57:33 2010 -0700 timer: Permit statically-declared work with deferrable timers Currently, you have to just define a delayed_work uninitialised, and then initialise it before first use. That's a tad clumsy. At risk of playing mind-games with the compiler, fooling it into doing pointer arithmetic with compile-time-constants, this lets clients properly initialise delayed work with deferrable timers statically. This patch was inspired by the issues which lead Artem Bityutskiy to commit 8eab945c5616fc984 ("sunrpc: make the cache cleaner workqueue deferrable"). Signed-off-by: Phil Carmody Acked-by: Artem Bityutskiy Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 2bf1c05e3c406925e498d06da66b4828f0209ea6 Author: Nikitas Angelinas Date: Wed Oct 20 15:57:31 2010 -0700 time: Use ARRAY_SIZE macro in timecompare.c Replace sizeof(buffer)/sizeof(buffer[0]) with ARRAY_SIZE(buffer) in kernel/time/timecompare.c Signed-off-by: Nikitas Angelinas Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit aaabe31c25a439b92cc281b14ca18b85bae7e7a6 Author: Changli Gao Date: Wed Oct 20 15:57:30 2010 -0700 timer: Initialize the field slack of timer_list TIMER_INITIALIZER() should initialize the field slack of timer_list as __init_timer() does. Signed-off-by: Changli Gao Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd Author: Richard Kennedy Date: Wed Oct 20 15:57:30 2010 -0700 timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS Reorder struct timer_list to remove 8 bytes of alignment padding on 64 bit builds when CONFIG_TIMER_STATS is selected. timer_list is widely used across the kernel so many structures will benefit and shrink in size. For example, with my config on x86_64 per_cpu_dm_data shrinks from 136 to 128 bytes and ahci_port_priv shrinks from 1032 to 968 bytes. Signed-off-by: Richard Kennedy Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit a386b5af8edda1c742ce9f77891e112eefffc005 Author: Kasper Pedersen Date: Wed Oct 20 15:55:15 2010 -0700 time: Compensate for rounding on odd-frequency clocksources When the clocksource is not a multiple of HZ, the clock will be off. For acpi_pm, HZ=1000 the error is 127.111 ppm: The rounding of cycle_interval ends up generating a false error term in ntp_error accumulation since xtime_interval is not exactly 1/HZ. So, we subtract out the error caused by the rounding. This has been visible since 2.6.32-rc2 commit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601 time: Implement logarithmic time accumulation That commit raised NTP_INTERVAL_FREQ and exposed the rounding error. testing tool: http://n1.taur.dk/permanent/testpmt.c Also tested with ntpd and a frequency counter. Signed-off-by: Kasper Pedersen Acked-by: john stultz Cc: John Kacur Cc: Clark Williams Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 8e8be45e8e55daa381028aec339829929ddb53a5 Author: Paul E. McKenney Date: Thu Sep 2 16:16:14 2010 -0700 rcu: add priority-inversion testing to rcutorture Add an optional test to force long-term preemption of RCU read-side critical sections, controlled by new test_boost, test_boost_interval, and test_boost_duration module parameters. This is to be used to test RCU priority boosting. Signed-off-by: Paul E. McKenney commit d3b8f889a220aed825accc28eb64ce283a0d51ac Author: john stultz Date: Mon Aug 17 16:40:47 2009 -0700 x86: Make tsc=reliable override boot time stability checks This patch makes the tsc=reliable option disable the boot time stability checks. Currently the option only disables the runtime watchdog checks. This change allows folks who want to override the boot time TSC stability checks and use the TSC when the system would otherwise disqualify it. There still are some situations that the TSC will be disqualified, such as cpufreq scaling. But these are situations where the box will hang if allowed. Patch also includes a fix for an issue found by Thomas Gleixner, where the TSC disqualification message wouldn't be printed after a call to unsynchronized_tsc(). Signed-off-by: John Stultz Cc: Andrew Morton Cc: akataria@vmware.com Cc: Stephen Hemminger LKML-Reference: <1250552447.7212.92.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner