|
git+ssh://master.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
commit 80efa21e18e3e64386f08e7f98282cb0cf925646
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Dec 2 13:56:13 2010 +1100
Add linux-next specific files for 20101202
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
commit 704db184c41e65b4cabb08c3fc4863b768ebbf65
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Dec 2 13:00:06 2010 +1100
Revert "perf, arch: Cleanup perf-pmu init vs lockup-detector"
This reverts commit 004417a6d468e24399e383645c068b498eed84ad.
commit 8c7c55b5590e06626ac4d31c625a2c1b68d02cf0
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Dec 2 12:59:44 2010 +1100
Revert "x86, nmi_watchdog: Remove the old nmi_watchdog"
This reverts commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a.
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
commit 3cdecc6a523140436643a0e0123bd788c8666f50
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Dec 2 12:59:15 2010 +1100
Revert "x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog"
This reverts commit 072b198a4ad48bd722ec6d203d65422a4698eae7.
Conflicts:
arch/x86/kernel/smpboot.c
commit 31c16d186b0e4f472e7824795794f5e4bc0c77f6
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Thu Dec 2 10:45:50 2010 +1100
docum-kernel-docs-update12
Fixed typos, and removed duplicated entries.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
commit 4df3d8ad8448e95a1cee20844e5f325858d566c4
Author: Michael Prokop <mika@grml.org>
Date: Thu Dec 2 10:45:50 2010 +1100
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 <mika@grml.org>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
commit 6e4e37ddd4aa0b141c0328c747ebd2146efe251f
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:29 2010 +1100
hwmon: (w83627hf) Document W83627THF voltage pin mapping
I had to look it up for one user, so we might as well store it in the
driver documentation.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 396b612204f77fca91e571a13e768eb63344fad3
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:29 2010 +1100
hwmon: (w83793) Drop useless mutex
This is the same case as fschmd, from which the code was copied as far
as I can see. So the same clean-up applies:
The WDIOC_GETSUPPORT ioctl only needs a mutex because it operates on a
static variable. There is no good reason to keep this variable static,
so let's just make it non-static and drop the now useless mutex
altogether.
See the discussion at:
http://marc.info/?l=lm-sensors&m=125563869402323&w=2
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
commit a2a36515b8f67350cafa20c15ad8c9c7f4676337
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:29 2010 +1100
hwmon: (fschmd) Drop useless mutex
As discussed one year ago, the WDIOC_GETSUPPORT ioctl only needs a
mutex because it operates on a static variable. There is no good
reason to keep this variable static, so let's just make it non-static
and drop the now useless mutex altogether.
See the discussion at:
http://marc.info/?l=lm-sensors&m=125563869402323&w=2
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
commit 922061922101358121ba237611432213509df8ec
Author: Joe Perches <joe@perches.com>
Date: Thu Dec 2 10:45:29 2010 +1100
hwmon: (w83781d) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
[JD: Optimize repeated debug messages]
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit df6cdf68c51a3d6418669bc566c6e378ab0c4807
Author: Joe Perches <joe@perches.com>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: (pc87427) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit dc6d8a14ca7032fb0c09e5dd6b817772b925c0ac
Author: Joe Perches <joe@perches.com>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: (pc87360) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
[JD: Also convert debug messages]
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit f89155c98dbc10e4231be1925d62fada480ce809
Author: Joe Perches <joe@perches.com>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: (lm78) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit 11160168bc93d01d0e01b0b6111c0e28b699829e
Author: Joe Perches <joe@perches.com>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: (it87) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit e6a42bc5e463cd3eed2361d0785252be60ccc1f4
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: Schedule the removal of the old intrusion detection interfaces
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit e2e8e9b141ea7da1570b43a1f8c876182d62124b
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:28 2010 +1100
hwmon: (w83793) Implement the standard intrusion detection interface
We have a standard intrusion detection interface now, drivers should
implement it. I've left the old interface in place for the time being,
with a deprecation warning, it will be removed later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit a6040ba96367257a8c543c4d6b0a0dd57d31ef77
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:26 2010 +1100
hwmon: (w83792d) Implement the standard intrusion detection interface
We have a standard intrusion detection interface now, drivers should
implement it. I've left the old interface in place for the time being,
with a deprecation warning, it will be removed later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 5dab3b04e8e49643bfbba86616dd38d78bd8ed21
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:26 2010 +1100
hwmon: (adm9240) Implement the standard intrusion detection interface
We have a standard intrusion detection interface now, drivers should
implement it. I've left the old interface in place for the time being,
with a deprecation warning, it will be removed later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 52bfb15018f33f2cbdadb2f017a91e1f6956b8d4
Author: Gabriele Gorla <gorlik@penguintown.net>
Date: Thu Dec 2 10:45:26 2010 +1100
hwmon: (adm1026) Allow 1 as a valid divider value
Allow 1 as a valid div value as specified in the ADM1026 datasheet.
Signed-off-by: Gabriele Gorla <gorlik@penguintown.net>
Cc: stable@kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit 2222b250aa01813e013b911bb7af02e4f3c621a4
Author: Gabriele Gorla <gorlik@penguintown.net>
Date: Thu Dec 2 10:45:26 2010 +1100
hwmon: (adm1026) Fix setting fan_div
Prevent setting fan_div from stomping on other fans that share the
same I2C register.
Signed-off-by: Gabriele Gorla <gorlik@penguintown.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit ee485a1128da1c4cc99b5ced48671ca2834e5180
Author: Jean Delvare <khali@linux-fr.org>
Date: Thu Dec 2 10:45:26 2010 +1100
hwmon: (it87) Fix manual fan speed control on IT8721F
The manual fan speed control logic of the IT8721F is much different
from what older devices had. Update the code to properly support that.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 1a24c8e06b15c1b372c435158c329bbba992b941
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 22 12:31:51 2010 -0200
[media] timblogiw: Fix a merge conflict with v4l2_i2c_new_subdev_board changes
v4l2_i2c_new_subdev_board() doesn't need the module name anymore.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2cb22a7a5624603b9db3571fc65489f5389b512c
Author: Roland Vossen <rvossen@broadcom.com>
Date: Wed Dec 1 21:37:34 2010 +0100
staging: brcm80211: replaced typedef struct wl_info_t by struct wl_info.
Part of the code cleanup effort. CodingStyle doc advises to restrict the usage
of typedefs. Also moved several function declarations from .c to .h file
because this typedef replace operation induced checkpatch.pl warnings.
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 01d11441fd7ede922e10008986ecdb0a84256bc5
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed Dec 1 11:16:35 2010 -0800
staging: brcm80211 needs lots of delay.h
Fix lots of errors like:
drivers/staging/brcm80211/phy/wlc_phy_n.c:17613: error: implicit declaration of function 'mdelay'
drivers/staging/brcm80211/util/nicpci.c:246: error: implicit declaration of function 'udelay'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Dowan Kim <dowan@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a043b26646444eba28e5010965dbf61bc3ba5277
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 20:32:51 2010 -0800
staging: brcm80211: bcmp => memcmp
s/bcmp/memcmp/
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ef5bf8d67983faca883f85f14f3e98861b35a6e3
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 22 11:51:28 2010 -0200
[media] Fix some merge conflicts with rc-core renames and technisat usb2
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9249ede9d4d9dbf41ab6545a7a43fd5f6e5aa620
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 20:09:49 2010 -0800
staging: brcm80211: bzero => memset
s/bzero/memset/g
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c10407ac459577f6b58f3db0777b6d0d53a3be9f
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 17:35:09 2010 -0800
staging: brcm80211: remove OSL_SYSUPTIME_SUPPORT
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c53d201371bf45cdb5b843ade52edd8903bb72f6
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 15:22:15 2010 -0800
staging: brcm80211: Remove bogus gcc version checking
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f5343314f62ba392ec069210ae342bc32c4ce367
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 15:22:14 2010 -0800
staging: brcm80211: Remove unused PKTFREESETCB
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 30 15:22:13 2010 -0800
staging: brcm80211: Remove OSL_DMADDRWIDTH
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b834517572d19d34c9cd9adb878aec3138db9224
Author: David Chosrova <david.chosrova@libertysurf.fr>
Date: Wed Dec 1 13:42:16 2010 +0100
Staging: rtl8192u: check return code kmalloc.
This patch checks the return code of kmalloc when trying to allocate
memory for priv->rx_urb in rtl8192_usb_initendpoints(), return -ENOMEM
when failed.
Signed-off-by: David Chosrova <david.chosrova@libertysurf.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8c66be9203d891ea37346a78925f0e6534b98bd3
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Wed Dec 1 17:34:39 2010 +0100
staging: iio: dds: ad9832: Fix kconfig description
The AD9832 driver doesn't support the AD9833 and AD9834
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0e7a3e7a746b5dc6ccf9896e882441c4fdbfd09a
Author: David Chosrova <dada2372@gmail.com>
Date: Mon Nov 29 21:50:48 2010 +0100
Staging: rtl8192u: remove dead code to disable dot11d
This patch removes all the ENABLE_DOT11D ifdefs.
It is always defined for driver. DOT11D has to do with regulatory domains.
What prompted this patch was a warning message in Sparse.
drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr"
redefined in file included from drivers/staging/rtl8192u/:81:81:
drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location
of the previous definition
Now there are no ifdefs around dot11d.h it made no sense to have this
second definition, so I removed that macro as well. ( Thanks Dan ;-) ).
Acked-by. Dan Carpenter <error27@gmail.com>
Signed-off-by: David Chosrova <dada2372@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8878ca1fb36791125b714e00fc9a766efa8f8c9e
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 22 10:04:45 2010 -0200
[media] linux-next: Fix technisat-usb2 compilation
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2894c6cd0ea84c30fc028ba92f8e61fbe7971e65
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:08 2010 +0200
Staging: w35und: Kill struct wb_usb
This patch kills struct wb_usb which now only contains a pointer to struct
usb_device.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9be98819d31c4e105ad028ee092d27a46a9e298a
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:07 2010 +0200
Staging: w35und: Remove unused fields from struct wb_usb
This patch removes two unused fields from struct wb_usb:
- DetectCount which is always zero
- IsUsb20 which is a write-only struct member
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4398954e5f91e340f5a2db53d219b6562e3e1bf0
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:06 2010 +0200
Staging: w35und: Kill wblinux_f.h header
The wblinux_f.h header file doesn't contain anything that's actually used. Kill
it.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 01b5ceeca5aa45735a987420c83228a9778a791f
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:05 2010 +0200
Staging: w35und: Merge mlmetxrx.c to mds.c
This patch merges mlmetxrx.c to mds.c because it's small and the functions are
only used in mto.c.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 37b0544a4a455609cbf25fa56441a6f1221dec85
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:04 2010 +0200
Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_
This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never
defined.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9618386a4e58e0459932846d9b07fa81225840d3
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:03 2010 +0200
Staging: w35und: Kill write-only ->TxToggle
This patch removes ->TxToggle from struct wb35_mds because it's a write only struct member.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9255650cbf997762bd667896b0b86661cd81c9b4
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:02 2010 +0200
Staging: w35und: Kill Vendor2 ifdef from hal_init_hardware
The Vendor2 macro is never defined so remove the ifdef'd block from
hal_init_hardware().
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:01 2010 +0200
Staging: w35und: Remove empty sysdef.h header
The sysdef.h header is empty now so kill it.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2855bb79d75ad1419b1f54008f861a39517acfd5
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 23:00:00 2010 +0200
Staging: w35und: Use pr_debug() for debugging
Use pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would
be even better to use dev_dbg() but unfortunately looking up struct device in
the current code structure makes things very ugly.
Please note that I dropped the DataDmp() calls from
RFSynthesizer_SwitchingChannel() because that function doesn't exist.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a4170e3dddc5eb88d23dd5f6e7c9cdefc244001e
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 22:59:59 2010 +0200
Staging: w35und: Kill unused code in mac_structures.h
This patch kills tons of unused macros and struct definitions from
mac_structures.h.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c84fa49f61798b6248cef56876f1643db3b7b2f3
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 22:59:58 2010 +0200
Staging: w35und: Kill WPA2 definitions
The _WPA2_ macro is always defined but the data structures that are wrapped by
it are never used. Kill them.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 22:59:57 2010 +0200
Staging: w35und: Kill _USE_FALLBACK_RATE_ macro
The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only
used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined
because the reg.c file includes sysdef.h at the top. It's therefore safe to
remove the _USE_FALLBACK_RATE_ macro.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ac5435b9800f313bdcd6a43444ceb1d89f241a5e
Author: Pekka Enberg <penberg@kernel.org>
Date: Sun Nov 28 22:59:56 2010 +0200
Staging: w35und: Remove unused defines from sysdef.h
This patch removes all the defines in sysdef.h that are not used at all.
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6bca481b3badcf0299c18987a713ca80586f978f
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue Nov 9 22:31:40 2010 -0200
[media] technisat-usb2: CodingStyle cleanups
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 7fa009cd06adcc1865906cacfcfd0eaf004f2fa2
Author: Patrick Boettcher <pboettcher@kernellabs.com>
Date: Sun Oct 31 16:24:19 2010 -0300
[media] technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver
This patch is adding support for Technisat's new USB2.0 DVB-S/S2 receiver
device. The development was sponsored by Technisat.
The Green led is toggle depending on the frontend-state. The Red LED is turned
on all the time.
The MAC address reading from the EEPROM along with the
LRC-method to check whether its valid.
Support for the IR-receiver of the Technisat USB2 box. The keys of
small, black remote-control are built-in, repeated key behaviour are
simulated.
The i2c-mutex of the dvb-usb-structure is used as a general mutex for
USB requests, as there are 3 threads racing for atomic requests
consisting of multiple usb-requests.
A module option is there which disables the toggling of LEDs by the
driver on certain triggers. Useful when being used in a "dark"
environment.
Signed-off-by: Martin Wilks <m.wilks@technisat.com>
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1e65b9ee5f38af85a6384124e4a3704de9d4ad24
Author: Patrick Boettcher <pboettcher@kernellabs.com>
Date: Sat Oct 9 10:12:34 2010 -0300
[media] stv090x: add tei-field to config-structure
Some backends want to receive the full transport stream including
uncorrected packets. To have that feature this patchs add a field to
the config-structure called TEI (transport stream error indicator).
[mchehab@redhat.com: a couple CodingStyle fixes]
Cc: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Martin Wilks <m.wilks@technisat.com>
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 195c54d82328fb4a72e3ecd928eaaad17b8872b0
Author: Patrick Boettcher <pboettcher@kernellabs.com>
Date: Sun Oct 10 13:45:54 2010 -0300
[media] stv090x: added function to control GPIOs from the outside
This patch STV090X adds and exports a function to control the GPIOs of
the stv090x-devices.
Cc: Manu Abraham <abraham.manu@gmail.com>
Signed-off-by: Martin Wilks <m.wilks@technisat.com>
Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 673eb9ff33e26ee6f4278cdab06749aef1bbef5b
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun Nov 21 16:54:56 2010 -0300
[media] uvcvideo: Convert to unlocked_ioctl
The uvcvideo driver now locks all ioctls correctly on its own, the BKL
isn't needed anymore.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6947756dfcecc493062a46e77f6bf51dddb5be75
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun Nov 21 13:36:34 2010 -0300
[media] uvcvideo: Lock stream mutex when accessing format-related information
The stream mutex protects access to the struct uvc_streaming ctrl,
cur_format and cur_frame fields as well as to the hardware probe
control. Lock it appropriately.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 4aa275975beee41fd542a0f6df8cd0fee06089bf
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun Nov 21 15:18:08 2010 -0300
[media] uvcvideo: Move mmap() handler to uvc_queue.c
The mmap() implementation belongs to the video buffers queue, move it
there.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 8e815e1763b8d4e5adf0dc14bde8c55329cf95a8
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun Nov 21 14:46:44 2010 -0300
[media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffers
Callers outside uvc_queue.c should not be forced to lock/unlock the
queue mutex manually. Move the mutex operations inside
uvc_free_buffers().
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 23d9f3ef23f0dc4bb20ccd5540b9a91ff08da08f
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun Nov 21 07:58:54 2010 -0300
[media] uvcvideo: Lock controls mutex when querying menus
uvc_find_control() must be called with the controls mutex locked. Fix
uvc_query_v4l2_menu() accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ca9afe6f87b569cdf8e797395381f18ae23a2905
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri Nov 26 06:54:53 2010 -0300
[media] v4l2-dev: fix race condition
The unregister function had a race condition with the v4l2_open
function. Ensure that both functions test and clear the REGISTER
flag from within a critical section.
Thanks to Laurent Pinchart for finding this race.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 879aa24d6394aa04b690a600a41ff500441ad384
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri Nov 26 06:47:28 2010 -0300
[media] V4L: improve the BKL replacement heuristic
The BKL replacement mutex had some serious performance side-effects on
V4L drivers. It is replaced by a better heuristic that works around the
worst of the side-effects.
Read the v4l2-dev.c comments for the whole sorry story. This is a
temporary measure only until we can convert all v4l drivers to use
unlocked_ioctl.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2877842de8cbf6272b0a851cb12587b7dd8c2afb
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri Nov 26 06:43:51 2010 -0300
[media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lock
Where reasonable use mutex_lock_interruptible instead of mutex_lock.
Also fix the poll, read and write error codes when called with an unregistered
device (e.g. after a USB device was disconnected). Poll must return
POLLERR|POLLHUP and read/write must return -ENODEV.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 78b055be2710b63cb196fc37669f3b662fecc9e4
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri Nov 19 17:04:31 2010 -0300
[media] cx18: convert to unlocked_ioctl
Also added locking around snd_cx18_pcm_ioctl as a precaution
as requested by Andy Walls.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 4f68775b7dfc6115169f689a42535486bf10977e
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue Nov 16 18:13:06 2010 -0300
[media] radio-timb: convert to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Acked-by: Richard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 697566939dc60048fca6e6dd69c7e089aaeb7ff8
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue Nov 16 18:12:16 2010 -0300
[media] sh_vou: convert to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 20aa5bb9dc4b5aba1b4d0f15aa92c4e83721a343
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 13:09:21 2010 -0300
[media] cafe_ccic: replace ioctl by unlocked_ioctl
Trivial change, approved by Jonathan Corbet <corbet@lwn.net>.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ca2621963de3934613f8aa63e19c03b1751707ae
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 11:17:00 2010 -0300
[media] et61x251_core: trivial conversion to unlocked_ioctl
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit feecf93d6b16887bf7e12fcc604bfba9048b2fa5
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 11:13:39 2010 -0300
[media] sn9c102: convert to unlocked_ioctl
Trivial conversion, this driver used a mutex already.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 61df3c9b3fe6a7e47d25b27ae4df0ecdb07b8fbd
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 10:09:38 2010 -0300
[media] BKL: trivial ioctl -> unlocked_ioctl video driver conversions
These drivers could be trivially converted to unlocked_ioctl since they
already did locking.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d2c998f7453af7ad416bc38d09ae9d453d2fac5e
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 09:49:34 2010 -0300
[media] typhoon: convert to unlocked_ioctl
Convert the typhoon driver from ioctl to unlocked_ioctl.
When doing this I noticed a bug where curfreq was not initialized correctly
to mutefreq (it wasn't multiplied by 16).
The initialization is now also done before the device node is created.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 09:48:24 2010 -0300
[media] si4713: convert to unlocked_ioctl
Convert ioctl to unlocked_ioctl. Note that for this driver the locking
is done inside the sub-device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ee71e42321cced11fecb989d743ad9cdb0c384ea
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 09:46:23 2010 -0300
[media] tea5764: convert to unlocked_ioctl
Convert from ioctl to unlocked_ioctl using the v4l2 core lock.
Also removed the 'exclusive access' limitation. There was no need for it
and it violates the v4l2 spec as well.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1cccee0b84e3445a142d0e9edcbf66b677b2e7e5
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 09:43:52 2010 -0300
[media] cadet: use unlocked_ioctl
Converted from ioctl to unlocked_ioctl.
This driver already used an internal lock, but it was missing in cadet_open and
cadet_release and it was not used correctly in cadet_read.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 32958fdd1663aeaa23b5edbfbb0db684ffd4e20e
Author: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun Nov 14 09:36:23 2010 -0300
[media] BKL: trivial BKL removal from V4L2 radio drivers
The patch converts a bunch of V4L2 radio drivers to unlocked_ioctl.
These are all simple conversions: most already had a lock and so the ioctl
fop could simply be replaced by unlocked_ioctl.
radio-miropcm20.c was converted to use the new V4L2 core lock.
While doing this work I noticed that many of these drivers initialized
some more fields or muted audio or something like that *after* creating
the device node. This should be done before the device node is created
to prevent problems. Especially hal tends to grab a device node as soon
as it is created.
In one or two cases the mutex_init was even done after the device creation!
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6dcdd1b3694a4fa2b85167a9c860c7613a7553c7
Author: David McCullough <david_mccullough@mcafee.com>
Date: Mon Nov 29 19:32:34 2010 +0000
net/ipv6/sit.c: return unhandled skb to tunnel4_rcv
I found a problem using an IPv6 over IPv4 tunnel. When CONFIG_IPV6_SIT
was enabled, the packets would be rejected as net/ipv6/sit.c was catching
all IPPROTO_IPV6 packets and returning an ICMP port unreachable error.
I think this patch fixes the problem cleanly. I believe the code in
net/ipv4/tunnel4.c:tunnel4_rcv takes care of it properly if none of the
handlers claim the skb.
Signed-off-by: David McCullough <david_mccullough@mcafee.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0793f83f0ec2142d06abe53570417c8d95e0310a
Author: Dmitry Kravkov <dmitry@broadcom.com>
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 <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d13a2cb63d06fe2e3067c7d40f9a5946abd614c8
Author: David Strand <dpstrand@gmail.com>
Date: Wed Dec 1 11:43:08 2010 -0800
bonding: check for assigned mac before adopting the slaves mac address
Restore the check for an unassigned mac address before adopting the
first slaves as it's own. The change in behavior was introduced by:
commit c20811a79e671a6a1fe86a8c1afe04aca8a7f085
Author: Jiri Pirko <jpirko@redhat.com>
bonding: move dev_addr cpy to bond_enslave
Signed-off-by: David Strand <dpstrand@gmail.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6c08af030212d1a34593397bb01f262ff31c3629
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat Nov 27 06:47:43 2010 +0000
b44: fix workarround for wap54g10
The code for the b44_wap54g10_workaround was never included, because
the config option was wrong. The nvram_get function was never in
mainline kernel, only in external OpenWrt patches.
The code should be compiled in when CONFIG_BCM47XX is selected and not
when CONFIG_SSB_DRIVER_MIPS is selected, because nvram_getenv is only
available on bcm47xx platforms and now in the mainline kernel code.
Using an include is better than a second function declaration, to fix
this when the function signature changes.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 381601e5bbae78d7c18d946fe874a63957edea13
Author: Anders Franzen <Anders.Franzen@ericsson.com>
Date: Wed Nov 24 05:47:18 2010 +0000
Make the ip6_tunnel reflect the true mtu.
The ip6_tunnel always assumes it consumes 40 bytes (ip6 hdr) of the mtu of the
underlaying device. So for a normal ethernet bearer, the mtu of the ip6_tunnel is
1460.
However, when creating a tunnel the encap limit option is enabled by default, and it
consumes 8 bytes more, so the true mtu shall be 1452.
I dont really know if this breaks some statement in some RFC, so this is a request for
comments.
Signed-off-by: Anders Franzen <anders.franzen@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9e50a3c8d1ead3f580d22c89d554e59f5c80cc9c
Author: Tony Lindgren <tony@atomide.com>
Date: Wed Dec 1 10:49:35 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 <tony@atomide.com>
commit 2322fad1b910ae9d07db0443b142d005c1176832
Author: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Wed Dec 1 10:49:35 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 <shubhrajyoti@ti.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 9667122ca03545c7b462fbf7d7555278b2b95ba8
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Wed Dec 1 10:49:35 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 <jhnikula@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit f16d10ae294cb4ceb00a64d8c5bd4b84025e4af3
Author: Evgeny Kuznetsov <ext-eugeny.kuznetsov@nokia.com>
Date: Wed Dec 1 10:49:35 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 <EXT-Eugeny.Kuznetsov@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 734b4c7398642caf6951293b4854cecebd107991
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:15 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 <charu@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Reviewed-by: Basak, Partha <p-basak2@ti.com>
[tony@atomide.com: updated for bank specific revision and updated boards]
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 0a02aab82f8752cf7e6f2cebad0c44493ea9cb93
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:15 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 <charu@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
Reviewed-by: Basak, Partha <p-basak2@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 6ebe06bb6abac804030962c3edd598c4e2ec52cd
Author: Benoit Cousson <b-cousson@ti.com>
Date: Wed Dec 1 10:18:15 2010 -0800
OMAP4: hwmod data: Add GPIO
Add GPIO hwmod data for OMAP4
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Charulatha V <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit cf0d94e1c2c1d0243ea2cb7991dc1b66a7533c59
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:15 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 <charu@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 424c8daf4a89ef66da10a99a8aed084bde40ee3b
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:15 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 <charu@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 06644804f600d2e24675c7c3be9ea9cf6846dc94
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:14 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 <charu@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit fb8ce24007e066728624289b78757b540522e419
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:14 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 <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit bb6b95af2d90e9dd5340a0fea18d15198ab4650d
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:14 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 <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit f51828e678b138a81d8ebd0a71510f48962eafeb
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:14 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 <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 4040d39ac5bd33e8187f2b62663524e7b6933331
Author: Tony Lindgren <tony@atomide.com>
Date: Wed Dec 1 10:18:13 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.
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit d15d34f0f7eea1440be2d59cffbe7d41e7679548
Author: Varadarajan, Charulatha <charu@ti.com>
Date: Wed Dec 1 10:18:13 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 <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit fc8de3c9379ffef6779acaad6d7151ae4d0c9894
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue Nov 30 20:36:57 2010 -0500
NFS: Fix a memory leak in nfs_readdir
We need to ensure that the entries in the nfs_cache_array get cleared
when the page is removed from the page cache. To do so, we use the
releasepage address_space operation (which also requires us to set
the Pg_private flag).
Change nfs_readdir_clear_array to use kmap_atomic(), so that the
function can be safely called from all direct reclaim contexts.
Finally, modify the cache_page_release helper to call
nfs_readdir_clear_array directly, when dealing with an anonymous
page from 'uncached_readdir'.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
commit 2134fb64b2dc13c7cb7903eb189806b66fdcf78b
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue Nov 30 21:01:14 2010 -0500
NFS: lock the readdir page while it is in use
Before we can fix the memory leak due to not freeing up the contents
of the nfs_cache_array when clearing the page cache, we need to
ensure that shrink_page_list can't just lock the page and
call try_to_release_page() while we're accessing the array.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
commit 0aded708d125a3ff7e5abaea9c2d9c6d7ebbfdcd
Author: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue Nov 30 21:56:32 2010 -0500
NFS: Ensure we use the correct cookie in nfs_readdir_xdr_filler
We need to use the cookie from the previous array entry, not the
actual cookie that we are searching for (except for the case of
uncached_readdir).
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
commit 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575
Author: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Date: Mon Nov 29 14:38:50 2010 -0800
initramfs: Really fix build break on symbol-prefixed archs
Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
of symbol-prefixed architectures, for example, blackfin.
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>,
Cc: Michal Marek <mmarek@suse.cz>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[mmarek: leave out Makefile change, since d63f6d1 already takes care of the
SYMBOL_PREFIX define]
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit cca67a3668392857641e9440ca6dc16a48b12e37
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Dec 1 17:22:34 2010 +0800
ASoC: ak4535: Improve readability for setting mute
The mute/unmute is controled by SMUTE (Soft Mute Control bit):
0: Normal Operation (Default)
1: DAC outputs soft-muted
I think this change improves readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 806bfedfb124b85d2e2b8ecdb8a451b23abed386
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Wed Dec 1 15:50:52 2010 +0900
ASoC: sh: fsi-ak4642: midify card name
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 437f6a2b25becc0a2c2cfe02ce78d65a4957e5d8
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Wed Dec 1 15:50:42 2010 +0900
ASoC: sh: fsi-ak4642: tidyup unnecessary variables
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 131d81061eba5ffd436b5d132530ac5205b16892
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Nov 30 17:03:39 2010 +0000
ASoC: Allow user-specified WM8958 multiband compressor configurations
The paramters of the WM8958 multiband compressor can be tuned by the
user for their system using a graphical configuration tool on the host.
Allow the user to specify a set of such paramters in platform data and
select between them at runtime.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit b2822a8c22d13bc8c441e1c0492baa40ae974b51
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Nov 30 16:59:29 2010 +0000
ASoC: Correct event flags for WM8958 AIF DACs
We need a post notification as we need to shut down the MBC after the
data stops flowing rather than before.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 06c6f4d34a23f7c9c783f1a875bb492b15fa23ac
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Wed Dec 1 09:10:47 2010 +0200
ASoC: Fix build failure in soc-core.c
Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs"
causes a build failure in soc-core.c: soc_probe_aux_dev since code tries to
access non-existing struct snd_soc_dapm_context and struct snd_soc_card
members.
Root cause for this was a double accident. Author sent the RFC patch from
top of another patch set and the RFC got committed. Fix the build failure
by removing the code line that depends on that another patch set.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 2062ea522bb58bb2aeee86d051b37136491ccd65
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Wed Dec 1 09:38:55 2010 +0000
ASoC: WM8731: Fix incorrect mask for bypass path disable
According to the datasheet the bypass path enable/disable is
bit 3 therefore we need 0x8 and not 0x4.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 28b26e15533e60970a014582d812d471ad63bcd0
Author: Florian Faber <faberman@linuxproaudio.org>
Date: Wed Dec 1 12:14:47 2010 +0100
ALSA: hdsp - Add support for RPM io box
Add support for the RME HDSP RPM IO box. Changes have been made in the identification of the IO box and the neccessary controls have been added.
Signed-off-by: Florian Faber <faberman@linuxproaudio.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 50005a8deb38e5e6456ebd94e57adb321d4589de
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 8931360eb9c6ec8bd30efef579cef81917a2fcf3
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 16cdd4336fdca9b50f991b591005b5f6416f82c4
Author: Daniel Drake <dsd@laptop.org>
Date: Tue Nov 30 20:34:52 2010 +0000
lxfb: Maintain video processor palette through suspend/resume
The Geode X driver uses both of the LX's palettes, one for gamma
correction and one for colormaps.
The kernel driver currently only backs up the one used for colormaps
during suspend/resume. If you mess with gamma settings and do a
suspend/resume, colors go funny.
Fix this by backing up the video proc palette during suspend/resume,
alongside the display controller one which is already handled.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 93c176f39fedaeff854ccb7681d626d65bdffe52
Author: Caglar Akyuz <caglar@bilkon-kontrol.com.tr>
Date: Tue Nov 30 20:04:14 2010 +0000
video: da8xx: Register IRQ as last thing in driver probing.
Following commit exposed a bug in driver:
"fbdev: da8xx/omap-l1xx: implement double buffering"
Bug is, if interrupt handler is called before initialization is
finished, raster controller is enabled and following register
modifications causes hardware to stay in a broken state.
By looking at this one may say that proper locking is missing in
this driver, and a more proper fix should be prepared. However,
aformentioned commit causes a regression in the driver and some
fix to current one should be applied first.
Signed-off-by: Caglar Akyuz <caglar@bilkon-kontrol.com.tr>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 13a3d832d916ad0a93e6b297ab4ba27619cd0a9d
Author: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Wed Dec 1 10:08:53 2010 +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 <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 83682e90b15381c69ed07ff0a1a6c6fe1f9f3f3c
Author: Felix Beck <felix.beck@de.ibm.com>
Date: Wed Dec 1 10:08:52 2010 +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 <felix.beck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 3f9eadcef8792d88f2438d3fa0e6777e0f6fc70f
Author: Felix Beck <felix.beck@de.ibm.com>
Date: Wed Dec 1 10:08:51 2010 +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 <felix.beck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 9818c1114ebae461c21065be2ed2a0654e8209b1
Author: Felix Beck <felix.beck@de.ibm.com>
Date: Wed Dec 1 10:08:50 2010 +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 <felix.beck@de.ibm.com>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 16e59d11f1077cce165d5e19f39b5b1910f88ecb
Author: Felix Beck <felix.beck@de.ibm.com>
Date: Wed Dec 1 10:08:49 2010 +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 <felix.beck@de.ibm.com>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 4e2a6252bf2a08d7308c9b240f359d3c8c8abcf6
Author: Felix Beck <felix.beck@de.ibm.com>
Date: Wed Dec 1 10:08:48 2010 +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 <felix.beck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 80f47ed77352595a2530d262e87ad00ac9cab21d
Author: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date: Wed Dec 1 10:08:47 2010 +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 <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 378f7567d16838bfeacc4265af8d673f16233dae
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:46 2010 +0100
[S390] current_thread_info optimization
Use thread_info lowcore field for current_thread_info(), saves
an unnecessary calculation.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 407c95e6898b668cd85ff919c6f1f8117cec7690
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:45 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 367ff6ccafbe0988af1ad4afbf456e2da7434f03
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:44 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 99a9de3a10ced149f18617cf256889d01133c444
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:43 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit d8868a4aadd0a139f9228c75f6b927e2593df728
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:42 2010 +0100
[S390] dasd: add support for irq statistics
Add support for DASD I/O interrupt statistics in /proc/interrupts.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit f234140bc9ea085f75198f4d1af58c217956125e
Author: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Wed Dec 1 10:08:41 2010 +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 <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 67717acd4e76d29f7f31230158d6f831b53053fe
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:40 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 2e0e98b270c5788ec219ceec59d4e89a745fb3b6
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:39 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 2e5955a638fe54b4abb1073d5121b9f8e6c031b4
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:38 2010 +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 <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 0c813f3c2305e66457fe9deb23e73b505eac9e01
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:37 2010 +0100
[S390] kprobes: coding style
Correct some minor coding style issues.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit e4ee80cd1541fceee177c1433bb165736095bafc
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:36 2010 +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 <schwidefsky@de.ibm.com>
commit 2e574ca045e09e17f6e5b28b620a8c481a741dd5
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:35 2010 +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 <schwidefsky@de.ibm.com>
commit 2535b0c17c7ebbed42afd13e97d16b6c07f7c405
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:34 2010 +0100
[S390] kprobes: insn slots
The s390 architecture can executed code on kmalloc/vmalloc memory.
No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 4d82756f82947ca21410a07f21315e2eed926e7a
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:33 2010 +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 <schwidefsky@de.ibm.com>
commit e5a8e54908d0613bdbc78aae04e4d374573a3da7
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:32 2010 +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 <schwidefsky@de.ibm.com>
commit ef84d769f26060ce965c8df46b2d96fe1faa1ba1
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:31 2010 +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 <schwidefsky@de.ibm.com>
commit 0ea86c9d4e8bf08c851cabe06faf35617f57574d
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:30 2010 +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 <schwidefsky@de.ibm.com>
commit 9115d6019ca4573e9817e33df269f2e7d1e474b1
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:29 2010 +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 <schwidefsky@de.ibm.com>
commit 56921167820dee0d0fe20ad132346049af6532f3
Author: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Wed Dec 1 10:08:28 2010 +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 <schwidefsky@de.ibm.com>
commit 8d7bfb4a891d606d52e1a99cf7231b4417b935dc
Author: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Wed Dec 1 10:08:02 2010 +0100
[S390] css: fix rsid evaluation for 2nd crw
Use correct bit positions of rsid field.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 398812159e328478ae49b4bd01f0d71efea96c39
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Dec 1 10:08:01 2010 +0100
[S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus
This fixes the same problem as described in the patch "nohz: fix
printk_needs_cpu() return value on offline cpus" for the arch_needs_cpu()
primitive:
arch_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
offlined it schedules the idle process which, before killing its own cpu,
will call tick_nohz_stop_sched_tick().
That function in turn will call arch_needs_cpu() in order to check if the
local tick can be disabled. On offline cpus this function should naturally
return 0 since regardless if the tick gets disabled or not the cpu will be
dead short after. That is besides the fact that __cpu_disable() should already
have made sure that no interrupts on the offlined cpu will be delivered anyway.
In this case it prevents tick_nohz_stop_sched_tick() to call
select_nohz_load_balancer(). No idea if that really is a problem. However what
made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
used within __mod_timer() to select a cpu on which a timer gets enqueued.
If arch_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
updated when a cpu gets offlined. It may contain the cpu number of an offline
cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
they never expire and cause system hangs.
This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
get_nohz_timer_target() which doesn't have that problem. However there might
be other problems because of the too early exit tick_nohz_stop_sched_tick()
in case a cpu goes offline.
This specific bug was indrocuded with 3c5d92a0 "nohz: Introduce
arch_needs_cpu".
In this case a cpu hotplug notifier is used to fix the issue in order to keep
the normal/fast path small. All we need to do is to clear the condition that
makes arch_needs_cpu() return 1 since it is just a performance improvement
which is supposed to keep the local tick running for a short period if a cpu
goes idle. Nothing special needs to be done except for clearing the condition.
Cc: stable@kernel.org
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
commit 3bfa321e662edf90fb8123a02c987c2965fa50bb
Author: Yan Li <yan.i.li@intel.com>
Date: Tue Nov 30 23:51:03 2010 -0800
Input: synaptics - fix handling of 2-button ClickPads
Lenovo S10-3t's ClickPad is a 2-button ClickPad that reports BTN_LEFT
and BTN_RIGHT as normal touchpad, unlike the 1-button ClickPad used in
HP mini 210 that reports solely BTN_MIDDLE.
In 0xc0-cap response, the 1-button ClickPad has the 20-bit set while
2-button ClickPad has the 8-bit set.
This patch makes the kernel only handle 1-button ClickPad specially,
and treat 2-button ClickPad in the same fashion as regular touchpads.
This fixes kernel bug #18122 and MeeGo bug #4807.
Signed-off-by: Yan Li <yan.i.li@intel.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit a318e6b1a04c9d8882712508eb9c8a061796c06b
Author: David Foley <favux.is@gmail.com>
Date: Tue Nov 30 23:45:46 2010 -0800
Input: wacom - add IDs for two new Bamboo PTs
Add two new Bamboo Pen & Touch models:
Bamboo Comic Medium (CTH661/S1; Product ID = 0xd8)
Bamboo P & T Special Edition Small (CTH461/L; Product ID = 0xdA)
Tested-by: IRIE Shinsuke <irieshinsuke@yahoo.co.jp>
Tested-by: Andrea Cadeddu <mrernia@gmail.com>
Signed-off-by: David Foley <favux.is@gmail.com>
Reviewed-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 86b17f76f462db460d6d916e105a4c44cb353e36
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon Nov 29 23:33:04 2010 -0800
Input: document struct input_absinfo
Add documentation for struct input_absinfo that is used in EVIOCGABS
and EVIOCSABS ioctl and specify units of measure used for reporting
resolution for an axis.
Acked-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 0417596f66dd6621f4fd46563c7c56a95311dbe8
Author: Bastien Nocera <hadess@hadess.net>
Date: Mon Nov 29 23:33:05 2010 -0800
Input: add keycodes for touchpad on/off keys
Some laptops will have a "touchpad toggle" soft button, which expects
user-space to turn off the touchpad themselves, some other devices will
do this in hardware, but send key events telling us that the touchpad
has been turned off/on.
KEY_TOUCHPAD_ON/KEY_TOUCHPAD_OFF will be used by user-space to show a
popup with the status of the touchpad.
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit da0c490115de026618a7fdcd886602da44392a50
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 29 23:33:07 2010 -0800
Input: use pr_fmt and pr_<level>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 4eb3c30b2e034b673df3e8f21b497e39f3911a02
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 29 23:33:07 2010 -0800
Input: i8042 - use pr_<level>, 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_<level>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit b029ffafe89cf4b97cf39e0225a5205cbbf9e02f
Author: Hemanth V <hemanthv@ti.com>
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 <hemanthv@ti.com>
Reviewed-by: Jonathan Cameron <jic23@cam.ac.uk>
Reviewed-by: Sergio Aguirre <saaguirre@ti.com>
Reviewed-by: Shubhrajyoti <Shubhrajyoti@ti.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 55661fc1f105ed75852e937bf8ea408270eb0cca
Author: Paul Mundt <lethal@linux-sh.org>
Date: Wed Dec 1 15:39:51 2010 +0900
sh: Assume new page cache pages have dirty dcache lines.
This follows the ARM change c01778001a4f5ad9c62d882776235f3f31922fdd
("ARM: 6379/1: Assume new page cache pages have dirty D-cache") for the
same rationale:
There are places in Linux where writes to newly allocated page
cache pages happen without a subsequent call to flush_dcache_page()
(several PIO drivers including USB HCD). This patch changes the
meaning of PG_arch_1 to be PG_dcache_clean and always flush the
D-cache for a newly mapped page in update_mmu_cache().
This addresses issues seen with executing binaries from MMC, in
addition to some of the other HCDs that don't explicitly do cache
management for their pipe-in buffers.
Requested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit a5880a9e5bb40fbae55de60051d69a29091053c3
Author: Feng Tang <feng.tang@intel.com>
Date: Fri Nov 19 11:01:48 2010 +0800
serial: mfd: adjust the baud rate setting
Previous baud rate setting code only has been tested with 3.5M/9600/
115200/230400/460800 bps, and recently we got a 3M bps device to test,
which needs to modify current MUL register setting, and with this
patch 2.5M/2M/1.5M/1M/0.5M should also work as they just use a MUL
value scale down from 3M's.
Also got some reference register setting from silicon guys for
different baud rates, which tries to keep the pre-scalar register value
to 16.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2
Author: Daniel Walker <dwalker@codeaurora.org>
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 <tony@atomide.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit de6f86ce51341559dc3c9c9f5c562da12fcfcb31
Author: Yegor Yefremov <yegor_sub1@visionsystems.de>
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 <yegorslists@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a4fb0b228e284107b9bdf44769bbdc80efd660e1
Author: Vasiliy Kulikov <segoon@openwall.com>
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 <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit badb9533abbbba70df099765afe4ae432b442430
Author: Vasiliy Kulikov <segoon@openwall.com>
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 <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3c6a483275f47a2ef7119309ad3d791c10cf30da
Author: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
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 <tomoya-linux@dsn.okisemi.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 095e24b0ea75b2bdc532b39b04530993442f237f
Author: Dirk Brandewie <dirk.brandewie@gmail.com>
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 <dirk.brandewie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e7cddda48c7f892a3fb5c10a6f41a4395f46c0c2
Author: cxie4 <cxie4@marvell.com>
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 <chao.xie@marvell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b48d7f50e6f16478304170eaf5c2d1a540ba5e31
Author: Paul Mundt <lethal@linux-sh.org>
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 <stern@rowland.harvard.edu>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7fc56f0d9908fe140a01387d59954e3d0a2e7744
Author: Luo Andy <yifei.luo@intel.com>
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 <hang.yuan@intel.com>
Signed-off-by: Andy Luo <yifei.luo@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b23f2f94136884ebeb1b5e2196f4a53086444afa
Author: Hao Wu <hao.wu@intel.com>
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 <hao.wu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c3d6450e741da08c3bc2e2ba06d743c27540abac
Author: Jarkko Nikula <jhnikula@gmail.com>
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 <jhnikula@gmail.com>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 02303f73373aa1da19dbec510ec5a4e2576f9610
Author: Dan Williams <dcbw@redhat.com>
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 <dcbw@redhat.com>
commit 73f35c60d5c4a98061fc0f94505bf26fd4bb1a1c
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
commit b17ea167c5fb50dcd5dce5b874a467f04eec886d
Author: Pete Zaitcev <zaitcev@redhat.com>
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 <zaitcev@redhat.com>
Signed-off-by: Márton Németh <nm127@freemail.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 33069739d1c2f03734d5b5b003593e9552d412c1
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 100832c9b6adb3d63407416931caeba3f3b9a777
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 08bd6839783319085ee0db4c888534e626225774
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 0ab84745ef65043a616b36b26bec58e1cb62a742
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 00d4b2bb03b9ed27f28336b0a68f2bd7f67caa40
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 2607b0a26094b2d2d174c3e27b2ecc9c49d86f40
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 05dece686b4e9d20b66b6cff29023e7ee4b91ccb
Author: Peter Korsgaard <peter.korsgaard@barco.com>
Date: Wed Dec 1 10:17:54 2010 +1100
i2c: Add generic I2C multiplexer using GPIO API
Add an i2c mux driver providing access to i2c bus segments using a
hardware MUX sitting on a master bus and controlled through gpio pins.
E.G. something like:
---------- ---------- Bus segment 1 - - - - -
| | SCL/SDA | |-------------- | |
| |------------| |
| | | | Bus segment 2 | |
| Linux | GPIO 1..N | MUX |--------------- Devices
| |------------| | | |
| | | | Bus segment M
| | | |---------------| |
---------- ---------- - - - - -
SCL/SDA of the master I2C bus is multiplexed to bus segment 1..M
according to the settings of the GPIO pins 1..N.
Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit 09c117c52882abaab29259b677616d5b2fba28cc
Author: Joe Perches <joe@perches.com>
Date: Wed Dec 1 10:17:54 2010 +1100
i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
commit 2a581dc8c577650bc3363f7c8fe97f0bff90b8a5
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 28539c4639f357be08333ca5c096e2e78613cecb
Author: Alan Stern <stern@rowland.harvard.edu>
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 <stern@rowland.harvard.edu>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit ad9c2b048b605fbc8d50526e330b88abdd631ab2
Author: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
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 <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>
commit 662b083a87a3489f3f19c6e0651c1b99b0de5df0
Author: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
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 <andrei.emeltchenko@nokia.com>
Acked-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 498cb95175c29ed96bf32f30df2d11ec1c7f3879
Author: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
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 <andrei.emeltchenko@nokia.com>
Acked-by: G, Manjunath Kondaiah <manjugk@ti.com>
Acked-by: Govindraj.R <govindraj.raja@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit f6f41eb9ccc0e6fad0ccba4c5e0a97de935db734
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 516cbc793eb4be5123289d067b54dfcdabeddb25
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit e8952e3b32701817705b216b492a9be4fa5cbefc
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit ff25ff842ea6afd58ccc2e3f386ee5ac540b6a63
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit a5fcd5f59a2658a579533d6774e871aea7ab5e92
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
[dwalker@codeaurora.org: updated commit text]
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 12943325cda3be10819e047cd8b5032a4fef6080
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit c4bd2eebee37b885b47ec48961923b671148703f
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 23513c3b39207c569da2c8afdced62ec43b4a272
Author: Stepan Moskovchenko <stepanm@codeaurora.org>
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 <stepanm@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 70cc2c00d7471f21120befeb7fc107c856e3985b
Author: Gregory Bean <gbean@codeaurora.org>
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 <gbean@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582
Author: Gregory Bean <gbean@codeaurora.org>
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 <baruch@tkos.co.il>
Cc: Pavan Kondeti <pkondeti@codeaurora.org>
Signed-off-by: Gregory Bean <gbean@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9
Author: Srinath <srinath@mistralsolutions.com>
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 <srinath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 9632f9890e76aa7a78f719b0b3b572f65e3e968b
Author: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
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 <jkrzyszt@tis.icnet.pl>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit c6c4dea4011278f03ab8a3c8329fba9098d2a892
Author: Felipe Balbi <balbi@ti.com>
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 <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 20826853853aa1e1ba219ea65f1e6ba3bd662495
Author: Felipe Balbi <balbi@ti.com>
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 <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 235228ba21e34ba732b413c12259bac386f83283
Author: Enric Balletbo i Serra <eballetbo@gmail.com>
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 <eballetbo@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit ae3e033362430f2684bb3519456c88d14e182f01
Author: Enric Balletbo i Serra <eballetbo@gmail.com>
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 <eballetbo@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4
Author: Keshava Munegowda <keshava_mgowda@ti.com>
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 <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit 56976b6ac4047ec456e2ba7e516ed2e9d96c3acf
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit becf0737cf25bd0084ed85ccb1ab6c902e600a3c
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit 811406c2e69281b0e498d25a42902817299b6b3d
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit 4792a15bf0f388838c3e16636f961c99bc2f3572
Author: Anand Gadiyar <gadiyar@ti.com>
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 <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
commit 1ed85659a29287bda958a9429461f4a1b0a033be
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit a42ccdc14de388a35ad0e8057543369351395eb9
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
commit c5dff5545c97ab33bdb2a529a2375966ceb0700c
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
commit 5467e16d891090d54d036044e66f94b89b1c3683
Author: Anand Gadiyar <gadiyar@ti.com>
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 <gadiyar@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Tony Lindgren <tony@atomide.com>
commit 7f124f4b353672bc150af959910cfc2a9778260a
Author: Keshava Munegowda <keshava_mgowda@ti.com>
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 <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
commit c072604115ab50d023eb5c33d4f3229400e441f4
Author: Keshava Munegowda <keshava_mgowda@ti.com>
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 <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
commit 6dba39e278b81665a838f37a75fe37b89f3ce610
Author: Keshava Munegowda <keshava_mgowda@ti.com>
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 <keshava_mgowda@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
commit 3f419d2d487821093ee46e898b5f8747f9edc9cd
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit b3419363808f2481b24a817f491878e1795db4c7
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 672f007d65f50468a4a1e55825fe58e5b035324d
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 026630450244b8f8d1baf54548be0800aa1823ed
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 582a72da9a41be9227dc931d728ae2906880a589
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 61790c5f3c5f158821821a00797d94504531839f
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 08ca944eb240b2299e743c76b43fbc7c2dd251de
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <helmut.schaa@googlemail.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4
Author: Johannes Stezenbach <js@sig21.net>
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 <js@sig21.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <micklfemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit acb091d67c5c9649cf5d25055ef6fd64239a6762
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 73a06a683455f472cc09ad249064c66a41e29e39
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3bb17654605965226e5b322dbc22ece5ff354ac5
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b02f5d1a17c652a74098f2a04db7fb8e6220057e
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4c57581d939fd0f8f244b9730812069f4dac308a
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a2677fe4298c61f0e93c063e59815bf21c530c4a
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b2b4c69f682a2868411899a77842061dd745884f
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 473cae27620c27377e278a6f92aaa483060e3c19
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit eeb8832b3181d6ca8593051b68c466e5d2653bb3
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 25ddfa195735934256fda55bb4f2d749c19386ff
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 325089ab5847f5c1e43f42bb90d32f981867c4c1
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c297560206adf0cda8ce38ef9b20b0a025754c4d
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fa3d2feeff4723cce8d4722902492d60b7f75fcc
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 14fae2d4b61b890cea58d63091406b86ec9bafcd
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f7317ba2d669c1b54fb31ed7834361a700a79217
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b3a28e68d5c8d788a4e538a119a5d326545add8a
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 80dac9eecbdb95f61b9b3c7081e02412155982b7
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e088f23be166635b3938571c00c686094efa7cc4
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit d41174fabdae348c6583cf05aeb329da232c342c
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 9320b5c4a7260d9593102f378201d17e3f030739
Author: Nick Kossifidis <mickflemm@gmail.com>
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 <mickflemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ea066d5a91f2610116dcd27054f749e4f07799d8
Author: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
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 <paul.shaw@atheros.com>
Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Tested-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 916448e77f6bcaaa7f13c3de0c3851783ae2bfd0
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date: Tue Nov 30 20:15:39 2010 +0530
ath9k: Fix STA disconnect issue due to received MIC failed bcast frames
AR_RxKeyIdxValid will not be set for bcast/mcast frames and so relying
this status for MIC failed frames is buggy.
Due to this, MIC failure events for broadcast frames are not sent to
supplicant resulted in AP disconnecting the STA.
Able to pass Wifi Test case 5.2.18 with this fix.
Cc: Stable <stable@kernel.org> (2.6.36+)
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8e26d5ad2f9c038609d42eebc676cd1107709eef
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
Date: Tue Nov 30 20:15:38 2010 +0530
mac80211: Fix STA disconnect due to MIC failure
Th commit titled "mac80211: clean up rx handling wrt. found_sta"
removed found_sta variable which caused a MIC failure event
to be reported twice for a single failure to supplicant resulted
in STA disconnect.
This should fix WPA specific countermeasures WiFi test case (5.2.17)
issues with mac80211 based drivers which report MIC failure events in
rx status.
Cc: Stable <stable@kernel.org> (2.6.37)
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit abf03184a31a3286fc0ab30f838ddee8ba9f9b7b
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Mon Nov 29 10:17:22 2010 -0500
USB: fix autosuspend bug in usb-serial
This patch (as1437) fixes a bug in the usb-serial autosuspend
handling. Since the usb-serial core now has autosuspend support, it
must set the .supports_autosuspend member in every serial driver it
registers. Otherwise the usb_autopm_get_interface() call won't work.
This fixes Bugzilla #23012.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: stable@kernel.org
Reported-by: Kevin Smith <thirdwiggin@gmail.com>
Reported-and-tested-by: Simon Gerber <gesimu@gmail.com>
Reported-and-tested-by: Matteo Croce <matteo@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a85b4e7f4481c5a1ca89fa63c9c871151965075e
Author: Brian J. Tarricone <brian@tarricone.org>
Date: Sun Nov 21 21:15:52 2010 -0800
USB: ehci: disable LPM and PPCD for nVidia MCP89 chips
Tested on MacBookAir3,1. Without this, we get EPROTO errors when
fetching device config descriptors.
Signed-off-by: Brian Tarricone <brian@tarricone.org>
Reported-by: Benoit Gschwind <gschwind@gnu-log.net>
Tested-by: Edgar Hucek <gimli@dark-green.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6fdbad8021151a9e93af8159a6232c8f26415c09
Author: Jacques Viviers <jacques.viviers@gmail.com>
Date: Wed Nov 24 11:56:38 2010 +0200
USB: serial: ftdi_sio: Vardaan USB RS422/485 converter PID added
Add the PID for the Vardaan Enterprises VEUSB422R3 USB to RS422/485
converter. It uses the same chip as the FTDI_8U232AM_PID 0x6001.
This should also work with the stable branches for:
2.6.31, 2.6.32, 2.6.33, 2.6.34, 2.6.35, 2.6.36
Signed-off-by: Jacques Viviers <jacques.viviers@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 46383f8d1971c8a3bb0b86e64f27d86156a09901
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue Nov 30 18:24:57 2010 +0000
ARM: 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 <rmk+kernel@arm.linux.org.uk>
commit 27f485b5b27926878ffc8f528bdefeb25e6bd3d3
Author: Tomoki Sekiyama <tomoki.sekiyama@gmail.com>
Date: Mon Nov 22 19:29:23 2010 +0900
USB: yurex: add .llseek fop to file_operations
Default llseek operation behavior was changed by the patch named
"vfs: make no_llseek the default" after the yurex driver had been merged,
so the llseek to yurex is now ignored.
This patch add llseek fop with default_llseek to yurex driver
to catch up to the change.
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 28942bb6a9dd4e2ed793675e515cfb8297ed355b
Author: Michael Stuermer <ms@mallorn.de>
Date: Thu Nov 18 00:45:43 2010 +0100
USB: ftdi_sio: Add ID for RT Systems USB-29B radio cable
Another variant of the RT Systems programming cable for ham radios.
Signed-off-by: Michael Stuermer <ms@mallorn.de>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2c31333a8fde7e26936a9f5371d02ff12c490993
Author: Christian Lamparter <chunkeey@googlemail.com>
Date: Mon Nov 29 20:53:23 2010 +0100
mac80211: ignore non-bcast mcast deauth/disassoc franes
This patch fixes an curious issue due to insufficient
rx frame filtering.
Saqeb Akhter reported frequent disconnects while streaming
videos over samba: <http://marc.info/?m=128600031109136>
> [ 1166.512087] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [ 1526.059997] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [ 2125.324356] wlan1: deauthenticated from 30:46:9a:10:49:f7 (Reason: 7)
> [...]
The reason is that the device generates frames with slightly
bogus SA/TA addresses.
e.g.:
[ 2314.402316] Ignore 9f:1f:31:f8:64:ff
[ 2314.402321] Ignore 9f:1f:31:f8:64:ff
[ 2352.453804] Ignore 0d:1f:31:f8:64:ff
[ 2352.453808] Ignore 0d:1f:31:f8:64:ff
^^ the group-address flag is set!
(the correct SA/TA would be: 00:1f:31:f8:64:ff)
Since the AP does not know from where the frames come, it
generates a DEAUTH response for the (invalid) mcast address.
This mcast deauth frame then passes through all filters and
tricks the stack into thinking that the AP brutally kicked
us!
This patch fixes the problem by simply ignoring
non-broadcast, group-addressed deauth/disassoc frames.
Cc: Jouni Malinen <j@w1.fi>
Cc: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Saqeb Akhter <saqeb.akhter@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit cf63495d0dbe435b475a44672f5dee150da6471b
Author: David Kilroy <kilroyd@gmail.com>
Date: Wed Nov 24 20:33:02 2010 +0000
orinoco: abort scan on interface down
This fixes the problem causing the following trace:
------------[ cut here ]------------
WARNING: at linux-2.6.34/net/wireless/core.c:633 wdev_cleanup_work+0xb7/0xe0 [cfg80211]()
Hardware name: Latitude C840
Pid: 707, comm: cfg80211 Not tainted 2.6.34.7-0.5-desktop #1
Call Trace:
[<c02065c3>] try_stack_unwind+0x173/0x190
[<c02051cf>] dump_trace+0x3f/0xe0
[<c020662b>] show_trace_log_lvl+0x4b/0x60
[<c0206658>] show_trace+0x18/0x20
[<c064e0b3>] dump_stack+0x6d/0x72
[<c02443ae>] warn_slowpath_common+0x6e/0xb0
[<c0244403>] warn_slowpath_null+0x13/0x20
[<e2db5497>] wdev_cleanup_work+0xb7/0xe0 [cfg80211]
[<c025cfa9>] run_workqueue+0x79/0x170
[<c025d123>] worker_thread+0x83/0xe0
[<c025fef4>] kthread+0x74/0x80
[<c0203826>] kernel_thread_helper+0x6/0x10
---[ end trace 3f0348b3b0c6f4ff ]---
Reported by: Giacomo Comes <comes@naic.edu>
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6c2d794d4ec5137c5d487d8ac1b181420abedea3
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit e24328ce5fef45f0879ed7c49bb2b24263a54074
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 05a09bdf9b837881692f79d3b9860f5214a4de0c
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 47a25380e37f44db7202093ca92e4af569c34f55
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
Cc: Bob Peterson <rpeterso@redhat.com>
commit e06dfc492870e1d380f02722cde084b724dc197b
Author: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue Nov 30 15:46:02 2010 +0000
GFS2: Fix uninitialised error value in previous patch
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit 086d8334cf73b3bb695b82dd864a7a8b00d96b7e
Author: Benjamin Marzinski <bmarzins@redhat.com>
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 <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit 29afce7d56e0d33a8de61482b9483d8a8c8b75c7
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:28 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" <ccmail111@yahoo.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Tejun Heo <tj@kernel.org>
commit fbb1bfafab1d59e853e2752cdbf8b2ad7674f992
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:28 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 <terje.malmedal@usit.uio.no>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
commit 68b94144af6041b387799712b3ef966467d439d1
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:28 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 <terje.malmedal@usit.uio.no>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
commit 93a09129111f358972f49ad3e59069b4a579f822
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:27 2010 +0100
fuse: ioctl cleanup
Get rid of unnecessary page_address()-es.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Tejun Heo <tj@kernel.org>
commit 7572777eef78ebdee1ecb7c258c0ef94d35bad16
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:27 2010 +0100
fuse: verify ioctl retries
Verify that the total length of the iovec returned in FUSE_IOCTL_RETRY
doesn't overflow iov_length().
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Tejun Heo <tj@kernel.org>
CC: <stable@kernel.org> [2.6.31+]
commit d9d318d39dd5cb686660504a3565aac453709ccc
Author: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue Nov 30 16:39:27 2010 +0100
fuse: fix ioctl when server is 32bit
If a 32bit CUSE server is run on 64bit this results in EIO being
returned to the caller.
The reason is that FUSE_IOCTL_RETRY reply was defined to use 'struct
iovec', which is different on 32bit and 64bit archs.
Work around this by looking at the size of the reply to determine
which struct was used. This is only needed if CONFIG_COMPAT is
defined.
A more permanent fix for the interface will be to use the same struct
on both 32bit and 64bit.
Reported-by: "ccmail111" <ccmail111@yahoo.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: Tejun Heo <tj@kernel.org>
CC: <stable@kernel.org> [2.6.31+]
commit 0489b3f5eba735413ccedd425651cf41d6b1f7c5
Author: Benjamin Marzinski <bmarzins@redhat.com>
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 <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit 0b1246e6776c79719ff4a3afd9c38fba99b99d5a
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
commit 5bb641db1fd6aa16d4ac6d12c82aacb0878512bb
Author: Joe Perches <joe@perches.com>
Date: Tue Nov 30 05:53:48 2010 -0800
regulator: Add and use rdev_<level> macros
On Tue, 2010-11-30 at 10:52 +0000, Mark Brown wrote:
> On Mon, Nov 29, 2010 at 05:12:56PM -0800, Joe Perches wrote:
> > Just to please broonie...
> > Signed-off-by: Joe Perches <joe@perches.com>
> As usual when fixing review issues please revise your original patch
> rather than posting a fresh patch.
Here's an earlier comment:
On Thu, 2010-11-18 at 13:30 +0000, Mark Brown wrote:
> This looks reasonable, please rebase on top of Daniel's patches and
> submit it properly (with changelog and so on).
Sometimes it's simpler for an upstream maintainer to do
something like:
git am -s <patch1.mbox>
patch -p1 < patch2.mbox
git commit --amend file
instead of back and forthing.
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 264454063189a51741b8c47cddf46d7133a71aa0
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon Nov 29 15:57:48 2010 +0000
regulator: Remove duplicate consts from mc13873 driver voltage tables
They're not needed and sparse is verbosely upset about them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 3c57bdc5e34b35c375c5db2351b497af492a6285
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon Nov 29 15:55:17 2010 +0000
regulator: Copy constraints from regulators when initialising them
Currently the regulator API uses the constraints structure passed in to
the core throughout the lifetime of the object. This means that it is not
possible to mark the constraints as __initdata so if the kernel supports
many boards the constraints for all of them are kept around throughout the
lifetime of the system, consuming memory needlessly. By copying constraints
that are actually used we allow the use of __initdata, saving memory when
multiple boards are supported.
This also means the constraints can be const.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 2eea392d0a28a0a07d36a9da544eb40f81bf4cb6
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Thu Nov 25 17:47:38 2010 +0200
ASoC: Add support for optional auxiliary dailess codecs
This makes possible to register auxiliary dailess codecs in a machine
driver. Term dailess is used here for amplifiers and codecs without DAI or
DAI being unused.
Dailess auxiliary codecs are kept in struct snd_soc_aux_dev and those codecs
are probed after initializing the DAI links. There are no major differences
between DAI link codecs and dailess codecs in ASoC core point of view. DAPM
handles them equally and sysfs and debugfs directories for dailess codecs
are similar except the pmdown_time node is not created.
Only suspend and resume functions are modified to traverse all probed codecs
instead of DAI link codecs.
Example below shows a dailess codec registration.
struct snd_soc_aux_dev foo_aux_dev[] = {
{
.name = "Amp",
.codec_name = "codec.2",
.init = foo_init2,
},
};
static struct snd_soc_card card = {
...
.aux_dev = foo_aux_dev,
.num_aux_devs = ARRAY_SIZE(foo_aux_dev),
};
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit ed7c84d54837b182c5f56f821ef213c8ca817a91
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:29 2010 +0100
ARM: 6505/1: kprobes: Don't HAVE_KPROBES when CONFIG_THUMB2_KERNEL is selected
Currently, the kprobes implementation for ARM only supports the ARM
instruction set, so it only works if CONFIG_THUMB2_KERNEL is not
enabled.
Until kprobes is updated to work with Thumb-2, turning it on will
cause horrible things to happen, so this patch disables it for now.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 618d9c8f9e554b5eaaca3f8e55a28e1a928a8571
Author: Dave Martin <dave.martin@linaro.org>
Date: Tue Nov 30 13:05:10 2010 +0100
ARM: 6508/1: vexpress: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a
result, using these directives in code sections can result in
misaligned data words when building a Thumb-2 kernel
(CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to
assume that fundamental types of word size or above are word-
aligned when accessing them from C. If the data is not really
word-aligned, this can cause impaired performance and stray
alignment faults in some circumstances.
In general, the following rules should be applied when using
data word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 725ca4adaea07460accd4622d44bcc7eaa34da09
Author: Dave Martin <dave.martin@linaro.org>
Date: Tue Nov 30 13:04:36 2010 +0100
ARM: 6507/1: RealView: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned data
words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume that
fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned, this
can cause impaired performance and stray alignment faults in some
circumstances.
In general, the following rules should be applied when using data word
declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a75e5248c51af1eaeed936be6bd3497b93f09685
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:28 2010 +0100
ARM: 6504/1: Thumb-2: Fix long-distance conditional branches in head.S for Thumb-2.
The 32-bit conditional branches in Thumb-2 have a shorter range
(+/-512K) than their ARM counterparts (+/-32MB). The linker does
not currently generate trampolines to extend the range of these
Thumb-2 conditional branches, resulting in link errors when vmlinux
is sufficiently large, e.g.:
head.o:(.text+0x464): relocation truncated to fit: R_ARM_THM_JUMP19
This patch forces the longer-range, unconditional branch encoding
by use of an explicit IT instruction. The resulting branches are
triggered on the same conditions as before.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 26e5ca93dda9425f8ff78ccb2f9b193328087e45
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:27 2010 +0100
ARM: 6503/1: Thumb-2: Restore sensible zImage header layout for CONFIG_THUMB2_KERNEL
The code which makes up the zImage header intends to leave a
32-byte gap followed by a branch to the real entry point, a magic
number, and a word containing the absolute entry point address.
This gets messed up with with CONFIG_THUMB2_KERNEL, because the
size of the initial padding NOPs changes.
Instead, the header can be made fully compatible by restoring it to
ARM.
In the Thumb-2 case, we can replace the initial NOPs with a
sequence which switches to Thumb and jumps to the real entry point.
As a consequence, the zImage entry point is now always ARM, so no
special magic is needed any more for the uImage rules in the
Thumb-2 case.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit bfa64c4ab1235b732542f11f4e0005e1774f779a
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:26 2010 +0100
ARM: 6502/1: Thumb-2: Fix CONFIG_THUMB2_KERNEL breakage in compressed/head.S
Some instruction operand combinations are used here which are nor
permitted in Thumb-2.
In particular, most uses of pc as an operand are disallowed in
Thumb-2, and deprecated in ARM from ARMv7 onwards.
The modified code introduced by this patch should be compatible
with all architecture versions >= v3, with or without
CONFIG_THUMB2_KERNEL.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6323875db20fd8ca8c8fbbd608bc377f2d4c8cf5
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:25 2010 +0100
ARM: 6501/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in mm/proc-v7.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
In this specific case, we can achieve the desired alignment by
forcing a 32-bit branch instruction using the W() macro, since the
assembler location counter is already 32-bit aligned in this case.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 4f79a5dd7c3e316e2230dc0ee665c40a39023a81
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:24 2010 +0100
ARM: 6500/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in kernel/head.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 077248fcce5edabb1b77ba3269e6c72341769d94
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:23 2010 +0100
ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7eb25ebee894ba2f8a591a83e45accc091ced19f
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:22 2010 +0100
ARM: 6498/1: vfp: Correct data alignment for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit bc8b57f08c53344d13e3b5e644c56c0355899b47
Author: Dave Martin <dave.martin@linaro.org>
Date: Mon Nov 29 19:43:21 2010 +0100
ARM: 6497/1: kexec: Correct data alignment for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a result,
using these directives in code sections can result in misaligned
data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to assume
that fundamental types of word size or above are word- aligned when
accessing them from C. If the data is not really word-aligned,
this can cause impaired performance and stray alignment faults in
some circumstances.
In general, the following rules should be applied when using data
word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Reviewed-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e6afec9b6808eff6dc392ac07c1552e87aebcdf7
Author: Pawel Moll <pawel.moll@arm.com>
Date: Fri Nov 26 13:45:43 2010 +0100
ARM: 6496/1: GIC: Do not try to register more then NR_IRQS interrupts
This change limits number of GIC-originating interrupts to the
platform maximum (defined by NR_IRQS) while still initialising
all distributor registers.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 09c74a9d0b0bedff16d0881db8cc0054a5e34f47
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Mon Nov 29 11:43:33 2010 +0000
ASoC: soc-cache: Fix memory overflow in LZO initialization
The bitmap_zero() nbits argument was improperly set to reg_size
but the underlying buffer was bmp_size long. This caused the memset
to zero past the end of the allocated buffer and into the kernel heap
causing strange kernel crashes sometimes by overwriting critical
kernel structures.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 551102762ebe8bc0aa867d28960d9be97bbe17c1
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 30 15:34:11 2010 +0800
ASoC: Simplify pm860x_probe error handling
Simplify pm860x_probe error handling and return actual error code we got.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit c8d6bf9a7b282255cd155b676ff91b08266b8529
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue Nov 30 11:32:04 2010 +0900
ASoC: sh: fsi-ak4642: Add FSI port and ak464x selection
Current FSI-Ak4642 device had niche settings which were
FSI2-A-AK4643 and FSI-A-AK4642.
This patch add platform_device_id which can control
FSI/FSI2, PortA/PortB, AK4642/AK4643 from platform data.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b76fb39d49f67a484a6adc8f041d9ad833f6860e
Author: Daniel Glöckner <daniel-gl@gmx.net>
Date: Tue Nov 30 01:00:18 2010 +0100
s6105-ipcam: fix compilation
When the s6105-ipcam ASoC driver had been converted to the
multi-component API, a single reference to a former structure
element remained, blocking successful compilation.
Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 9e4ea718d3c53f9f2a65ddddf95ffd7743be458e
Author: Daniel Glöckner <daniel-gl@gmx.net>
Date: Tue Nov 30 01:00:17 2010 +0100
s6000-pcm: fix compilation
s6000_soc_platform has lost its forward declaration and there no
longer is a name element in it, so use a string constant when
calling request_irq.
Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b1d36b1c3573fd5adecbd313d30a8bdc8d7fbc5e
Author: Daniel Glöckner <daniel-gl@gmx.net>
Date: Tue Nov 30 01:00:16 2010 +0100
s6000-i2s: fix compilation
A semicolon was missing.
Signed-off-by: Daniel Glöckner <daniel-gl@gmx.net>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 4c8ed1b9e75c49e15aca5192d93c36e8115a19a1
Author: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
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 <konishi.ryusuke@lab.ntt.co.jp>
commit 585755dad570e40c2d9ba63e2a8a9e3b09d18e65
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
commit 4cedd7ad1f2997e0f976e223d586111386bc85e1
Author: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
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 <konishi.ryusuke@lab.ntt.co.jp>
commit 3f1af9d26fb02a99a60a045b8ae93ccc6fe50b97
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 17:42:47 2010 +0800
ASoC: Fix missing spin_unlock_irqrestore
In nuc900_dma_hw_params(), if snd_pcm_lib_malloc_pages failed
it returns without calling spin_unlock_irqrestore().
Since snd_pcm_lib_malloc_pages() does not touch struct nuc900_audio,
we don't need to hold the lock while calling snd_pcm_lib_malloc_pages().
Fix it by moving spin_lock_irqsave() down to after snd_pcm_lib_malloc_pages().
In nuc900_dma_prepare(), spin_unlock_irqrestore() is missing in the error path.
Fix it by removing the return in default case.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 921169ca2f7c8a0a2ccda2ce33c465dfe3ae30ef
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
commit 802ec9b6682349d9d9c92a9e55f44324d2954f41
Author: Abhijith Das <adas@redhat.com>
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 <adas@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit edc221d00bd5c6da0e5c67701f3782b72796619f
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit 5e69069c1afb655b5f1a154856ccdb4bb7327b81
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit 2ae51ed7b548c1d943d080da617515e801ea5c3e
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
commit 9e55cd53728719ac3a3234a6618259ab8e203a10
Author: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue Nov 9 14:09:53 2010 +0000
GFS2: Remove unreachable calls to vmtruncate
Suggested-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit cc18152eb7c27653199546bd14e991a451ab8d1b
Author: Joe Perches <joe@perches.com>
Date: Fri Nov 5 16:12:36 2010 -0700
GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
commit d2115778c7ea0df2201f1ad9aab948c49ffa1078
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
commit 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue Nov 30 08:14:30 2010 -0200
i7core_edac: return -ENODEV if no MC is found
Nehalem-EX uses a different memory controller. However, as the
memory controller is not visible on some Nehalem/Nehalem-EP, we
need to indirectly probe via a X58 PCI device. The same devices
are found on (some) Nehalem-EX. So, on those machines, the
probe routine needs to return -ENODEV, as the actual Memory
Controller registers won't be detected.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 125331c753c42bc3f74a723a14a40f723740e493
Author: Andres Salomon <dilinger@queued.net>
Date: Mon Nov 29 20:44:10 2010 -0800
mfd: Fix cs5535 warning on x86-64
ARRAY_SIZE() returns unsigned long on x86-64 (rather than unsigned int);
cast it to the desired type to shut gcc up.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 822bc180a7f7a7bc5fcaaea195f41b487cc8cae8
Author: Paul Turner <pjt@google.com>
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 <sfr@canb.auug.org.au>
Signed-off-by: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <20101130005740.080828123@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit fb248bed2adf00e924a9ffb045f7d496c9c4652a
Author: Rabin Vincent <rabin.vincent@stericsson.com>
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 <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
commit 44001af3eebab93bf022fd24137b8b5eabbf0419
Author: Linus Walleij <linus.walleij@stericsson.com>
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 <linus.walleij@stericsson.com>
commit 14a61d607d4e54e49ff7530b891398dfd0e0e325
Author: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Mon Aug 9 19:18:17 2010 +0530
ux500: mop500: add TC35892 and MicroSD slot support
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
commit 60686aa0086a14f8b15c83a09f3df1eebe3aab3c
Author: Takashi Iwai <tiwai@suse.de>
Date: Tue Nov 30 08:14:21 2010 +0100
ALSA: Fix SNDCTL_DSP_RESET ioctl for OSS emulation
In OSS emulation, SNDCTL_DSP_RESET ioctl needs the reset of the internal
buffer state in addition to drop of the running streams. Otherwise the
succeeding access becomes inconsistent.
Tested-by: Amit Nagal <helloin.amit@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 793f392807ace4b7631b5e7a2bf699cbedab7c34
Author: Philip Rakity <prakity@marvell.com>
Date: Tue Nov 30 00:55:23 2010 -0500
mmc: sdhci: print SD Command and CAPABILITY_1 when dumping registers
More information should be shown when sdhci_dumpregs is called.
Knowing the command is useful for debugging, and Capability 1
is useful for SD v3.
Signed-off-by: Philip Rakity <prakity@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit cc3e2a3a8c7164f9e7c5b615cb1ac9e62dfe0a22
Author: Linus Walleij <linus.walleij@stericsson.com>
Date: Tue Nov 16 17:57:00 2010 +0100
mmc: protect some clock-gating variables
This adds some more picky variable protection to the state holders for
the clock gating code. This is particularly important when ordinary
.set_ios() calls would race with the .set_ios() call resulting from a
delayed gate operation.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 7334b630edb355868854fa1c77aab5036c480cc5
Author: Linus Walleij <linus.walleij@stericsson.com>
Date: Tue Nov 16 17:56:52 2010 +0100
mmc: protect against clock-gating races
This adds a mutex to protect from races between gate and ungate
calls colliding.
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 122fa5e36421d230b5ad25fc9b791af63a49a000
Author: Linus Walleij <linus.walleij@stericsson.com>
Date: Tue Nov 16 17:56:42 2010 +0100
mmc: clean up clock-gating code
This rids the unused boolean clk_pending_gate from the code and renames
the clk_disable_work to clk_gate_work in analogy with the other names
used for gating code.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit c427067db265f06b70c7094c3d30839c8dcd18aa
Author: Linus Walleij <linus.walleij@stericsson.com>
Date: Mon Nov 8 21:36:50 2010 -0500
mmc: Aggressive clock gating framework
This patch modifies the MMC core code to optionally call the set_ios()
operation on the driver with the clock frequency set to 0 (gate) after
a grace period of at least 8 MCLK cycles, then restore it (ungate)
before any new request. This gives the driver the option to shut down
the MCI clock to the MMC/SD card when the clock frequency is 0, i.e.
the core has stated that the MCI clock does not need to be generated.
It is inspired by existing clock gating code found in the OMAP and
Atmel drivers and brings this up to the host abstraction. Gating is
performed before and after any MMC request.
This patchset implements this for the MMCI/PL180 MMC/SD host controller,
but it should be simple to switch OMAP/Atmel over to using this instead.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
[cjb: fix compile error, minor stylistic fixes]
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 1e271d7856443394fc268014645f4304bd79c68a
Author: Jennifer Li <Jennifer.li@o2micro.com>
Date: Wed Nov 17 23:01:59 2010 -0500
mmc: sdhci: Disable ADMA on some O2Micro SD/MMC parts.
This patch disables the broken ADMA on selected O2Micro devices.
Signed-off-by: Jennifer Li <Jennifer.li@o2micro.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 635c7d3ece81fa9d176f620e5f66217252f1624c
Author: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Date: Tue Nov 9 11:35:37 2010 +0100
mmc: mxcmmc: update the regulator support code to the latest API
This also fixes the build problem introduced by my previous patch
due to unhandled API changes introduced by commit:
99fc513101 (mmc: Move regulator handling closer to core)
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit bfb27bebca2713c5fb4609dfe30d86b1eaddfc7d
Author: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Date: Tue Nov 2 01:05:37 2010 +0100
mmc: mxcmmc: Allow binding a regulator to manage the MMC card voltage
This implementation is based on the pxamci.c driver and it will
be used to support the mx31_3ds machine.
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit b33e128d00182c1cb484278292e4613086208e10
Author: Mike Rapoport <mike@compulab.co.il>
Date: Thu Oct 28 21:23:53 2010 +0200
ARM: dove: Switch SDHCI devices over to "sdhci-dove" driver
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
CC: Saeed Bishara <saeed@marvell.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 8214aebba21746d001ce215a7a2719eb955158b8
Author: Mike Rapoport <mike@compulab.co.il>
Date: Sun Nov 7 16:57:12 2010 -0500
mmc: Add support for the Marvell Dove SDHCI controller
Implement an sdhci-pltfm driver for the controller found in the
Marvell Dove SoC.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
CC: Saeed Bishara <saeed@marvell.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
commit 25338f2e09fcbaa0470841c928bf0e718ca13382
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Tue Nov 30 04:37:33 2010 +0000
ARM: mach-shmobile: mackerel: Add USB1(Host) support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 122eb61e3366e00f63ba742c6b44ee0dd3200b4c
Author: Lutz Ballaschke <vegan.grindcore@googlemail.com>
Date: Sun Sep 26 16:25:35 2010 +0200
watchdog: add f71862fg support
Watchdog support for Fintek F71862fg Super-I/O added.
Two different hardware reset pins of the F71862fg chip can be configured
by an additional module parameter.
Signed-off-by: Lutz Ballaschke <vegan.grindcore@googlemail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
commit de5ed07f89bc14c4b3713558545a8e9053b7b90e
Author: Lutz Ballaschke <vegan.grindcore@googlemail.com>
Date: Sun Sep 26 16:38:20 2010 +0200
watchdog: clean-up f71808e_wdt.c
Cleaned up and replaced some magic numbers by constants.
Signed-off-by: Lutz Ballaschke <vegan.grindcore@googlemail.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
commit acfa747baf73922021a047f2d87a2d866f5dbab5
Author: Jiri Slaby <jslaby@suse.cz>
Date: Mon Nov 29 10:16:54 2010 +0100
TTY: open/hangup race fixup
Like in the "TTY: don't allow reopen when ldisc is changing" patch,
this one fixes a TTY WARNING as described in the option 1) there:
1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
section tty_lock is held. However tty_lock is temporarily dropped in
the middle of the function by tty_ldisc_hangup.
The fix is to introduce a new flag which we set during the unlocked
window and check it in tty_reopen too. The flag is TTY_HUPPING and is
cleared after TTY_HUPPED is set.
While at it, remove duplicate TTY_HUPPED set_bit. The one after
calling ops->hangup seems to be more correct. But anyway, we hold
tty_lock, so there should be no difference.
Also document the function it does that kind of crap.
Nicely reproducible with two forked children:
static void do_work(const char *tty)
{
if (signal(SIGHUP, SIG_IGN) == SIG_ERR) exit(1);
setsid();
while (1) {
int fd = open(tty, O_RDWR|O_NOCTTY);
if (fd < 0) continue;
if (ioctl(fd, TIOCSCTTY)) continue;
if (vhangup()) continue;
close(fd);
}
exit(0);
}
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: <Valdis.Kletnieks@vt.edu>
Reported-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e2efafbf139d2bfdfe96f2901f03189fecd172e4
Author: Jiri Slaby <jslaby@suse.cz>
Date: Mon Nov 29 10:16:53 2010 +0100
TTY: don't allow reopen when ldisc is changing
There are many WARNINGs like the following reported nowadays:
WARNING: at drivers/tty/tty_io.c:1331 tty_open+0x2a2/0x49a()
Hardware name: Latitude E6500
Modules linked in:
Pid: 1207, comm: plymouthd Not tainted 2.6.37-rc3-mmotm1123 #3
Call Trace:
[<ffffffff8103b189>] warn_slowpath_common+0x80/0x98
[<ffffffff8103b1b6>] warn_slowpath_null+0x15/0x17
[<ffffffff8128a3ab>] tty_open+0x2a2/0x49a
[<ffffffff810fd53f>] chrdev_open+0x11d/0x146
...
This means tty_reopen is called without TTY_LDISC set. For further
considerations, note tty_lock is held in tty_open. TTY_LDISC is cleared in:
1) __tty_hangup from tty_ldisc_hangup to tty_ldisc_enable. During this
section tty_lock is held. However tty_lock is temporarily dropped in
the middle of the function by tty_ldisc_hangup.
2) tty_release via tty_ldisc_release till the end of tty existence. If
tty->count <= 1, tty_lock is taken, TTY_CLOSING bit set and then
tty_ldisc_release called. tty_reopen checks TTY_CLOSING before checking
TTY_LDISC.
3) tty_set_ldisc from tty_ldisc_halt to tty_ldisc_enable. We:
* take tty_lock, set TTY_LDISC_CHANGING, put tty_lock
* call tty_ldisc_halt (clear TTY_LDISC), tty_lock is _not_ held
* do some other work
* take tty_lock, call tty_ldisc_enable (set TTY_LDISC), put
tty_lock
I cannot see how 2) can be a problem, as there I see no race. OTOH, 1)
and 3) can happen without problems. This patch the case 3) by checking
TTY_LDISC_CHANGING along with TTY_CLOSING in tty_reopen. 1) will be
fixed in the following patch.
Nicely reproducible with two processes:
while (1) {
fd = open("/dev/ttyS1", O_RDWR);
if (fd < 0) {
warn("open");
continue;
}
close(fd);
}
--------
while (1) {
fd = open("/dev/ttyS1", O_RDWR);
ld1 = 0; ld2 = 2;
while (1) {
ioctl(fd, TIOCSETD, &ld1);
ioctl(fd, TIOCSETD, &ld2);
}
close(fd);
}
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reported-by: <Valdis.Kletnieks@vt.edu>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6a20bd45fda271bd57e3ba41b3de3009797f4b5e
Author: Jiri Slaby <jslaby@suse.cz>
Date: Thu Nov 25 00:27:55 2010 +0100
NET: wan/x25, fix ldisc->open retval
We should never return positive values from ldisc->open, tty layer
doesn't (and never did) expect that.
If we do that, weird things like warnings in tty_ldisc_close happen.
Not sure if dev->base_addr is used somehow now.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Andrew Hendry <andrew.hendry@gmail.com>
Cc: linux-x25@vger.kernel.org
Tested-by: Sergey Lapin <slapin@ossfans.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7f90cfc505d613f4faf096e0d84ffe99208057d9
Author: Jiri Slaby <jslaby@suse.cz>
Date: Thu Nov 25 00:27:54 2010 +0100
TTY: ldisc, fix open flag handling
When a concrete ldisc open fails in tty_ldisc_open, we forget to clear
TTY_LDISC_OPEN. This causes a false warning on the next ldisc open:
WARNING: at drivers/char/tty_ldisc.c:445 tty_ldisc_open+0x26/0x38()
Hardware name: System Product Name
Modules linked in: ...
Pid: 5251, comm: a.out Tainted: G W 2.6.32-5-686 #1
Call Trace:
[<c1030321>] ? warn_slowpath_common+0x5e/0x8a
[<c1030357>] ? warn_slowpath_null+0xa/0xc
[<c119311c>] ? tty_ldisc_open+0x26/0x38
[<c11936c5>] ? tty_set_ldisc+0x218/0x304
...
So clear the bit when failing...
Introduced in c65c9bc3efa (tty: rewrite the ldisc locking) back in
2.6.31-rc1.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Reported-by: Sergey Lapin <slapin@ossfans.org>
Tested-by: Sergey Lapin <slapin@ossfans.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ecc798a459e1c4f170dddab532ed1b2a07c6b399
Author: Wim Van Sebroeck <wim@iguana.be>
Date: Sat Oct 23 20:59:42 2010 +0000
watchdog: bcm63xx_wdt: improve platform part.
* fix devinit and devexit sections
* fix platform removal code so that the iounmap happens after the removal of the timer.
* changes the reboot_notifier by a platform shutdown method.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
commit 8d403d18c7adf6f2d4e5e6122e0d6d229e51fd4c
Author: Seth Heasley <seth.heasley@intel.com>
Date: Wed Nov 17 12:15:08 2010 -0700
watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCH
This patch adds an additional LPC Controller DeviceID for the Intel Patsburg PCH for TCO Watchdog.
Signed-off-by: Seth Heasley <seth.heasley@intel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
commit 93ae86e759299718c611bc543b9b1633bf32905a
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <sfr@canb.auug.org.au>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Tested-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit c6c0ac664c86ff6408fadbed4913938c8a732e26
Author: Michael Ellerman <michael@ellerman.id.au>
Date: Thu Nov 25 09:44:07 2010 +1100
driver core: Document that device_rename() is only for networking
Document that device_rename() is not to be used by anything
other than the network core.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7cfcd3823029585e9d7949ac9bcafb34a383df97
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Cc: Amit Kucheria <amit.kucheria@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 6c4face5a3ecd23da6acc52805a5dba220aa808d
Author: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri Nov 26 12:25:59 2010 -0200
ARM: mx5: dynamically allocate imx2-wdt devices
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit aac50fa5368af94deccce04c20eb25d3b845e240
Author: Fabio Estevam <fabio.estevam@freescale.com>
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 <fabio.estevam@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 8bb1b374190c7e1bf0cd97f21119f7670abc0f81
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit edaf70fca24d740e80d5e10788df612729aac439
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit f9ca81f55becf990ab6bac83cbdeb81d9ef13df0
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit 7dc589247d77d803481815adbec6ec70020a0200
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit 4a7f6b35c81ff5f47586a9ded7b5b6eda61952e5
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
commit 9f71741c75e5206e1fea72ddf2adf5661105444d
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Wed Nov 24 18:26:04 2010 +0100
fanotify: Dont try to open a file descriptor for the overflow event
We should not try to open a file descriptor for the overflow event since this
will always fail.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 300d64b618dbb3e3fd8985e5d181e783aa47d307
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Wed Nov 24 18:22:09 2010 +0100
fanotify: Introduce FAN_NOFD
FAN_NOFD is used in fanotify events that do not provide an open file
descriptor (like the overflow_event).
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit dd318575ff0aae91ac4cbcc5b60c184e59267212
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Date: Fri Nov 26 06:10:07 2010 -0800
ath9k: Remove code which enables btcoex based on subsys id
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e030d58e8860f1c87b17631dbdd70747cbe1fb5b
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Mon Nov 15 15:46:07 2010 -0500
sysfs: remove useless test from sysfs_merge_group
Dan Carpenter pointed out that the new sysfs_merge_group() and
sysfs_unmerge_group() routines requires their grp argument to be
non-NULL, because they dereference grp to obtain the list of
attributes. Hence it's pointless for the routines to include a test
and special-case handling for when grp is NULL. This patch (as1433)
removes the unneeded tests.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit cf3c7679a3611e6cbf16b48dc43467429a894221
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Tue Nov 23 17:26:17 2010 -0500
fanotify: remove dead code in prepare_for_access_response
Remove the unnecessary check for the bypass_perm flag in
prepare_for_access_response(), since this function can't be called after
fanotify_release() is called we know the flag cannot ever be set.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 2d5df30dfa3cbb7515a2ee7e2037d941d1d76d6f
Author: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Date: Mon Nov 15 19:33:27 2010 +0000
nfs: Don't generate duplicated events
The events are already generated by vfs_readv and vfs_writev.
splice does not seem to generate the events, but that's an
other bug.
The patch also removes a couple of unneeded fsnotify.h
inclusions from fs/cachefiles/.
Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 50bcd0e8a64089f4f0406bc3c661c9c90a3ad17a
Author: Eric Paris <eparis@redhat.com>
Date: Wed Nov 10 18:56:59 2010 -0500
Revert "fanotify: Do check against max_marks and increase number of group marks atomically"
This reverts commit 5876b30fc2c91d67386f91da62b14f159d7bb41f.
This was reverted due to:
Hi Eric,
After merging the fsnotify tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/notify/mark.c: In function 'fsnotify_add_mark':
fs/notify/mark.c:230: error: 'struct fsnotify_group' has no member named
'fanotify_data'
Caused by commit 0ed64ab6b338e4269c9f25de83781619ecd624f1 ("fsnotify:
code and error path cleanup in fsnotify_add_mark"). This build has
CONFIG_FANOTIFY not set.
I have used the fsnotify tree from next-20101109 for today.
Conflicts:
fs/notify/mark.c
commit 66394404f412fad831430a4f7d82e5a48417d290
Author: Eric Paris <eparis@redhat.com>
Date: Tue Nov 9 14:57:45 2010 -0500
fsnotify: code and error path cleanup in fsnotify_add_mark
fsnotify_add_mark had some extra goto's we didn't really need and some
extra conditionals which could be cleaned up. Functionally it should be
the exact same.
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 8fbb184a725f5462c9ae159ee2d1f0e36dfcde99
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Tue Nov 9 19:19:04 2010 +0100
fanotify: Do check against max_marks and increase number of group marks atomically
The number of group marks is checked against max_marks and increased afterwards
in a non atomic way. This may result in 2 or more processes passing the check
at the same time and increasing the number of group marks above the max_marks
limit afterwards.
With this patch the check against max_marks is done in fsnotify_add_mark(),
after the group lock has been aquired to ensure that concurrent processes
cant exceed the group marks limit.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 9cb68f37a7754ddcb282d1c2ca3451f6dc4a56f7
Author: Eric Paris <eparis@redhat.com>
Date: Tue Nov 9 11:48:30 2010 -0500
fanotify: reorder event on child checking for ease of readability
The check to return false if a parent did not request to receive events
about it's children happens in the middle of a big if statement which is
easier to read if we just do the check later. So move it.
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 67e1a98b2251ed9de8f332524cb020f7ad257cc2
Author: Eric Paris <eparis@redhat.com>
Date: Tue Nov 9 11:45:15 2010 -0500
fanotify: remove code duplication in mask tests
The generic code in send_to_group() checks if a given mask is
appropriate for the given group. There is no need to duplicate this
code in fanotify.
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit d852c6baf825631e2560893acd5e04028cce0871
Author: Eric Paris <eparis@redhat.com>
Date: Mon Nov 8 19:36:41 2010 -0500
fanotify: calculate the correct file flags up front
fanotify does and |= FMODE_NONOTIFY every single time it opens a file
for the listeners. Instead just calculate that once during
sys_fanotify_init() and use it when needed. Just a minor perf win.
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 546304f845657858244e72f98e853b145756c041
Author: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Date: Mon Nov 8 19:32:57 2010 -0500
fanotify: retry open RO if RW failes
When a listener has requested read-write access to files, but such open
failed, also try to open them read-only if requested.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 620be5ffd5760365677d22453e5c3fe1b149854f
Author: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Date: Mon Nov 8 18:15:08 2010 -0500
fsnotify: inline mark refcnt functions
Inline trivial mark put and get helpers.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit a1bcea69f8762229a06245640bf1c09d8e4dca56
Author: Eric Paris <eparis@redhat.com>
Date: Tue Nov 23 23:48:26 2010 -0500
fanotify: do not leak user reference on allocation failure
If fanotify_init is unable to allocate a new fsnotify group it will
return but will not drop its reference on the associated user struct.
Drop that reference on error.
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 251d380034c6c34efe75ffb89d863558ba68ec6a
Author: John Tapsell <johnflux@gmail.com>
Date: Thu Mar 25 13:30:45 2010 +0000
Staging: rt2870: Add USB ID for Buffalo Airstation WLI-UC-GN
BugLink: http://bugs.launchpad.net/bugs/441990
This was tested to successfully enable the hardware.
Signed-off-by: John Tapsell <johnflux@gmail.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
CC: stable@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4960b8fe1b0602195e2170bb94d50edc47d36d73
Author: Marek Belisko <marek.belisko@open-nandra.com>
Date: Wed Nov 24 10:42:39 2010 +0100
staging: ft1000: Fix goto error logic.
Fix goto error logic which could lead to kernel panics
because kthread_stop() is called in not correct error
conditions. Seen it sometimes when dsp_reload() fails
then I got kernel panic.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c20ec76157747434652e721cdd4dccd8654ad370
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ef46ffbc2841dddebe521764c06673474ca5d041
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 29 07:42:00 2010 +0000
forcedeth: Convert dev_printk(<level> to dev_<level>(
Use vsprintf extension %pM for a mac address in one instance.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cd66328bdab782ee40d17b573a3067a591cb7b4f
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c41d41e1687dcf344f55dd15c7121532e5c195d4
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1d397f3698ec438c3c14abf45bfac88cca1882d9
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 29 07:41:57 2010 +0000
forcedeth: Convert pr_<level> to netdev_<level>
Use netdev_<level> when a struct net_device * is available.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 294a554e274f961ac33c7d739d5b912bd0005f5b
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 29 07:41:56 2010 +0000
forcedeth: Use pr_fmt and pr_<level>
Convert printks to pr_<level>.
Remove "forcedeth: " from some calls as it's now added by pr_fmt.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e8652ca4f29b011ded297847e361f26ddb5f2725
Author: Eric Paris <eparis@redhat.com>
Date: Tue Nov 23 18:18:37 2010 -0500
inotify: stop kernel memory leak on file creation failure
If inotify_init is unable to allocate a new file for the new inotify
group we leak the new group. This patch drops the reference on the
group on file allocation failure.
Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
cc: stable@kernel.org
Signed-off-by: Eric Paris <eparis@redhat.com>
commit e999fb057436c2167d5ee3f5c82753e953981525
Author: Marek Belisko <marek.belisko@open-nandra.com>
Date: Tue Nov 23 13:29:28 2010 +0100
staging: ft1000: Remove functions which create devices in kernel space.
Remove exec_mknod() and rm_mknod() helpers which was used for
device nodes creating/removing in kernel space.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5c5e138b590a748c57d54b39634cda974ab9af1d
Author: Christian Lamparter <chunkeey@googlemail.com>
Date: Fri Nov 26 23:29:23 2010 +0100
carl9170: fix carl9170_tx_prepare typo
commit: "carl9170: revamp carl9170_tx_prepare"
introduced a peculiar bug that would only show
up if the the module parameter noht is set to 1.
Then all outbound voice, video and background
frames would each invoke a (bogus) RTS/CTS
handshake.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7dff3125534c1d035a910052335a3a39fbb31aa7
Author: Jouni Malinen <jouni.malinen@atheros.com>
Date: Fri Nov 26 20:41:55 2010 +0200
mac80211: Fix frame injection using non-AP vif
In order for frame injection to work properly for some use cases
(e.g., finding the station entry and keys for encryption), mac80211
needs to find the correct sdata entry. This works when the main vif
is in AP mode, but commit a2c1e3dad516618cb0fbfb1a62c36d0b0744573a
broke this particular use case for station main vif. While this type of
injection is quite unusual operation, it has some uses and we should fix
it. Do this by changing the monitor vif sdata selection to allow station
vif to be selected instead of limiting it to just AP vifs. We still need
to skip some iftypes to avoid selecting unsuitable vif for injection.
Signed-off-by: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 46047784b8cdcfc916f6c1cccee0c18dd1223dfd
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
Date: Fri Nov 26 23:24:31 2010 +0530
ath9k: Disable SWBA interrupt on remove_interface
while removing beaconing mode interface, SWBA interrupt
was never disabled when there are no other beaconing interfaces.
Cc: stable@kernel.org
Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c426ee247e40a70490f3d67d3c9c7d1aba54516f
Author: Johannes Berg <johannes.berg@intel.com>
Date: Fri Nov 26 11:38:04 2010 +0100
ath9k/carl9170: advertise P2P
With some upcoming changes we'd like to use
the interface types for P2P capability tests.
Enable them now so that when we add those
tests in wpa_supplicant, nothing will break.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 98c316e348bedffa730e6f1e4baeb8a3c3e0f28b
Author: Gabor Juhos <juhosg@openwrt.org>
Date: Thu Nov 25 18:26:07 2010 +0100
ath9k: use per-device struct for pm_qos_* operations
The ath9k driver uses a shared pm_qos_request_list structure for all
devices. This causes the following warning if more than one device is
present in the system:
WARNING: at kernel/pm_qos_params.c:234 ath9k_init_device+0x5e8/0x6b0()
pm_qos_add_request() called for already added request
Modules linked in:
Call Trace:
[<802b1cdc>] dump_stack+0x8/0x34
[<8007dd90>] warn_slowpath_common+0x78/0xa4
[<8007de44>] warn_slowpath_fmt+0x2c/0x38
[<801b0828>] ath9k_init_device+0x5e8/0x6b0
[<801bc508>] ath_pci_probe+0x2dc/0x39c
[<80176254>] pci_device_probe+0x64/0xa4
[<8019471c>] driver_probe_device+0xbc/0x188
[<80194854>] __driver_attach+0x6c/0xa4
[<80193e20>] bus_for_each_dev+0x60/0xb0
[<80193580>] bus_add_driver+0xcc/0x268
[<80194c08>] driver_register+0xe0/0x198
[<801764e0>] __pci_register_driver+0x50/0xe0
[<80365f48>] ath9k_init+0x3c/0x6c
[<8006050c>] do_one_initcall+0xfc/0x1d8
[<80355340>] kernel_init+0xd4/0x174
[<800639a4>] kernel_thread_helper+0x10/0x18
---[ end trace 5345fc6f870564a6 ]---
This patch fixes that warning by using a separate pm_qos_request_list
sructure for each device.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 16ccdf0dbc84b11bc8b7fdbad66804d06a683554
Author: Sven Neumann <s.neumann@raumfeld.com>
Date: Wed Nov 24 16:02:00 2010 +0000
libertas: fix invalid access
card->priv must not be accessed after lbs_remove_card() was called
as lbs_remove_card() frees card->priv via free_netdev().
For libertas_sdio this is a regression introduced by 23b149c1890f9.
The correct fix to the issue described there is simply to remove the
assignment. This flag is set at the appropriate time inside
lbs_remove_card anyway.
Reported-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 517ff43146b17a0d067125f098f675d1e0ac2d82
Author: Daniel Drake <dsd@laptop.org>
Date: Wed Nov 24 16:00:49 2010 +0000
libertas: fix memory corruption in lbs_remove_card()
"priv" is stored at the end of the wiphy structure, which is freed
during the call to lbs_cfg_free(). It must not be touched afterwards.
Remove the unnecessary NULL assignment causing this memory corruption.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6efe04ee4109a9d3fc0d419667f54861628b0d45
Author: Al Cho <acho@novell.com>
Date: Fri Nov 26 19:07:27 2010 +0800
staging: keucr: fix keucr init other coding style
fix keucr init.c other coding style but not from checkpatch.pl.
replace ternary conditional "?:" with if/else.
Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e93192acff4eaf7024c2450d91f3de69258f1f12
Author: Al Cho <acho@novell.com>
Date: Fri Nov 26 19:06:39 2010 +0800
staging: keucr: fix keucr init coding style
fix keucr init.c init.h coding style.
only fix coding style check by checkpatch.pl.
Signed-off-by: Al Cho <acho@novell.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 280740a9016db986758db811bbc998acc79e5551
Author: Vasiliy Kulikov <segoon@openwall.com>
Date: Fri Nov 26 20:06:53 2010 +0300
staging: msm: tvenc: fix error handling
Driver init() function should return error code.
Also fix tvenc_clk leak.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8956110dbbb75773d851854e6e11cd8428fce71a
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed Nov 24 11:46:09 2010 -0800
staging: fix intel_sst/intelmid sound build
SND_INTELMID selects 3 SND_* kconfig symbols, but that is useless
if the SOUND & SND symbols in their hierarchy are not enabled,
so make this symbol depend on SOUND & SND.
ERROR: "snd_pcm_period_elapsed" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_create" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_hw_constraint_integer" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_device_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_set_ops" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_jack_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_free_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_ioctl" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_malloc_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_ctl_new1" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_lib_preallocate_pages_for_all" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_free" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_card_register" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_jack_report" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_pcm_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
ERROR: "snd_ctl_add" [drivers/staging/intel_sst/snd-intelmid.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fa7a1db200ecb7a5912722a563646935700765a8
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 23 15:30:02 2010 -0800
staging: brcm80211: Remove BUSTYPE macro
BUSTYPE isn't used in this configuration.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c95e66e1fae810110410b59f411110ca671ffb28
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 22:20:31 2010 +0100
staging: brcm80211: remove unused dhd_ops_virt variable definition
The variable dhd_ops_virt was used before although its use was rather
limited as can be found in previous commit:
| commit 4fd68ae1a558043a2cc4ea2faf7235e71c3241aa
| Author: Julia Lawall <julia@diku.dk>
| Date: Tue Oct 26 12:25:33 2010 +0200
|
| drivers/staging/brcm80211/brcmfmac/dhd_linux.c: delete double assignment
|
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3be727c8f076cafaf26a1ceda4cad85f5166c8a3
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 22:20:30 2010 +0100
staging: brcm80211: remove some more packet related macros
macros PKTHEADROOM and PKTTAILROOM have been replaced by native
skbuff functions and macros PKTALLOCED and PKTUNALLOC have been
removed.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 54991ad6d05186bd0324dbdc9c64c5b7952e74c4
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 14:06:24 2010 +0100
staging: brcm80211: removed packet macros for accessing sk_buff fields
With the packet storage type changed from void pointer to struct sk_buff
pointer there is no need for macros for accessing these fields through
casting. These can now be accessed directly.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c26b1378a71de617fb5ba7da8b6fdc882caed0e8
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 14:06:23 2010 +0100
staging: brcm80211: change packet buffer type to native struct sk_buff
The packet queues now store struct sk_buff pointer and subsequently
all driver code handling packets now use struct sk_buff as package
storage type. Next step will be getting rid of packet macros.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b6eb5c0f71af22f7b44353a01241fff9a02997af
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 14:06:22 2010 +0100
staging: brcm80211: remove unneccessary packets funtion prototype
The prototype for function pktsegcnt in bmcutils.h is not defined
nor used anywhere in the driver so it can be removed.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7c8bc0147f54ecb43f48d9e898ad7f85cb934db7
Author: Arend van Spriel <arend@broadcom.com>
Date: Tue Nov 23 08:04:29 2010 +0100
staging: brcm80211: add include file for using semaphore related definitions
Source wl_iw.c uses semaphore definitions and as such should include
<linux/semaphore.h>.
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 57d8cd23c2a0d261bdc959201dd4a33a2080bdfb
Author: Brett Rudley <brudley@broadcom.com>
Date: Mon Nov 22 16:58:52 2010 -0800
staging: brcm80211: OSL shrink: Remove OSL_PCI_READ/WRITE_CONFIG
Replace OSL layer PCI READ/WRITE macros with native calls.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 857cf1d1e623467622eff3a6b0edc720dcafdd52
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Nov 29 11:18:08 2010 -0800
Staging: sep: do not select the driver by default
The Kconfig file should not have 'y' as the default, especially
as the driver will crash a machine if it is loaded and the hardware
is not present.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Allyn <mark.a.allyn@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3b93ff030204ca36fb1e9917743bbf22a423e527
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon Nov 29 11:18:08 2010 -0800
Staging: sep: do not select the driver by default
The Kconfig file should not have 'y' as the default, especially
as the driver will crash a machine if it is loaded and the hardware
is not present.
Cc: Mark Allyn <mark.a.allyn@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit da3f825bc71b420e129b6344be0e3e863ebf8a42
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:39:20 2010 +0000
Staging: sep: Fix crash if a device is not found
The existing code works mostly by luck. The PCI probe is done by the
register and completes before the register returns thus allowing the other
init code to run in time. Without a SEP or if unlucky this doesn't occur
and you get an OOPS which for some reason causes grumpiness.
As the season of good b^Hcheer is supposed to be approaching we should
probably fix it.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6f89be93ce6e718a51215336845c70ada06627ba
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:39:07 2010 +0000
Staging: sep: clean up a couple of spots missed in pass one
Another copy_user case and some formatting of dbg
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2bb3af58d0f712c728cf1230539044d94c9a3be0
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:38:54 2010 +0000
Staging: sep: cant is an angular inclination
So use can't instead.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6eb44c531763ff50325822bac749e92938782795
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:38:39 2010 +0000
Staging: sep: Make SEP consistent
SEP is initials so make it consistent in the driver, ditto DMA and DCB
Consistent capitalisation of comment leads
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7c9eb69123a634c8551e8887bda03c2e549da233
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:38:21 2010 +0000
Staging: sep: Use kzalloc when needed
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit da14e55130785db243a98523b57ddf56d6c6320a
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:38:02 2010 +0000
Staging: sep: clean up some of the obvious sillies
Various assignments are done but not used
dev_dbg formatting is a bit weird and wraps when not needed
Take out some of the blank lines and reformat a bit to reduce view size
Remove some comments that are obvious
Fix else formatting
Remove some user triggerable dev_warns
Fix copy_from_user error return cases (-EFAULT not bytes copied)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d1bb83213d5b7b3a4e3db59179917a433f82762c
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:34:52 2010 +0000
Staging: sep: Fix the kernel-doc in SEP
The long blurb goes at the end
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4c8e2a1f3d5e6b63ebfd26f324a2b24194af37fa
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:34:25 2010 +0000
Staging: sep: clean up caller_id function
This is called on a kmalloc/memset object. Remove everything that isn't a
set to zero
Oh look 8)
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8d80e4e2da31be71b8c1a5def986e10831d2aada
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:34:08 2010 +0000
Staging: sep: netlink - what netlink
Kill unused stuff
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 266aa856f2c3aeddadd2fcf186d119af10539c3e
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:33:55 2010 +0000
Staging: sep: handle the memrar stuff in the headers
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 62a8c3a32e4143812ed8e0f3783ef1ea40dc87e4
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:33:43 2010 +0000
Staging: sep: handle the rar definition stuff in the header
SEP isn't the only driver that may need to handle both cases easily
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit de92e3a3b25dd0cda00a07b30c325785b5c2d939
Author: Alan Cox <alan@linux.intel.com>
Date: Wed Nov 24 19:33:26 2010 +0000
Staging: sep: minimal fix for wrong include
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 62877913ba55b3f2e5ac34dbc1a2975868ea8d25
Author: Vinod Koul <vinod.koul@intel.com>
Date: Mon Nov 22 10:33:51 2010 +0000
Staging: sst: add ioctls for post processing algorithm interface
This patch adds two new ioctls to intel_sst_ctrl device.
This i/f can be used by application to send algorithm parameters
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
[This will need further discussion in the context of the final ALSA interface
but is fine for staging, ie anyone who relies on it should expect changes
Also fixed a missing kmalloc fail check]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 79a35ad57300f78c7250eeeca57b602e06ff402a
Author: Vinod Koul <vinod.koul@intel.com>
Date: Mon Nov 22 10:33:40 2010 +0000
Staging: sst: Construct fw string name runtime
The firmware name for each platform is appended by PCI id of device.
This patch makes use of pci id to construct the string rather than
hardcode the string.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 964c6975e8a4314c451d420f1cb54880ab535433
Author: Vinod Koul <vinod.koul@intel.com>
Date: Mon Nov 22 10:33:28 2010 +0000
Staging: sst: Add runtime PM support
This adds runtime PM support for audio driver.
This also fixes LPA audio mode for moorestown platform
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 951c44e0dbfaa580d5b4fb13427ab93ee252636a
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:56:07 2010 +0100
Staging: batman-adv: Use kernel functions to identify broadcasts
linux/etherdevice.h already provides functions to classify different
ethernet addresses. These inlineable functions should be used instead of
custom functions.
The check for multicast together with multicast can also be replaced
with a single test for multicast because for every ethernet address x
following is always true:
is_broadcast_ether_addr(x) => is_multicast_ether_addr(x)
or when looking more at the implementation:
(FF:FF:FF:FF:FF:FF == x) => [(01:00:00:00:00:00 & x) != 00:00:00:00:00:00]
Reported-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8cab2fbe6dacfdd3b122c450d2fffde6ac06a8b6
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:56:06 2010 +0100
Staging: batman-adv: Use kernel version min macro
The kernel headers already provide different versions of a min/max macro
which should be used by all modules according to
Documentation/CodingStyle.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 003db3b2ad61c2964d624b0786cf8202e9a92c8e
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:56:05 2010 +0100
Staging: batman-adv: add gateway IPv6 support by filtering DHCPv6 messages
Some additional checks will be needed in case of extension headers
like the fragmentation or hop-by-hop (for jumbo frames for example)
headers or ipsec stuff. But this patch should do for most people
for now, the rest can be added with a later one.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Acked-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c9c556b63b19c8b52de5c5ea6f47ab16fc540e47
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:56:04 2010 +0100
Staging: batman-adv: best gw DHCP filter 802.1Q support
The DHCP filter inspects packets to determine whether or not to send
them via ethernet unicast. This patch adds 802.1Q (vlan) support for
this check.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
[sven.eckelmann@gmx.de: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6c3a42db6ca46204b35f0cdb8abfa9e4771641ef
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:56:03 2010 +0100
Staging: batman-adv: send DHCP requests directly to the chosen gw
If the gateway client mode is active batman-adv will send the
broadcasted DHCP requests via unicast to the currently selected best
gateway. Therefore attached clients can profit from batman's knowledge
about the network topology.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
[sven.eckelmann@gmx.de: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit dfaf9dd3459cac02411cebf418e8469aa0d8ca5d
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:56:02 2010 +0100
Staging: batman-adv: adding gateway functionality
Via the /sys filesystem you can change the gateway mode of a node using
gw_mode. Adjustments to it can be done using gw_bandwidth for server
mode and gw_sel_class for client mode.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
[sven.eckelmann@gmx.de: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7a18deb7b03e4112af5add8498889f9b2b36d59f
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:56:01 2010 +0100
Staging: batman-adv: Limit spin_locks to spin_lock_bh
spin_lock_irqsave disables the IRQs and stores them inside the flags
provided by the caller. This is needed to protect a bottom half handler
or a user context critical section from being interrupted by an
interrupt handler which also tries to acquire the spinlock and locks
forever.
The linux device drivers will receive the packets inside an interrupt
handler and the network infrastructure will process them inside bottom
half. Thus batman-adv will only run in user context and bottom half
handlers. We can conclude that batman-adv doesn't share its own
spinlocks with real interrupt handlers.
This makes it possible to exchange the quite complex spin_lock_irqsave
with spin_lock_bh which only stops bottom halves from running on the
current cpu, but allows interrupt handlers to take over to keep the
interrupt latency low.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit bd204952cf161404eae0aa6478fb1b4c586ac678
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:56:00 2010 +0100
Staging: batman-adv: Rewrite hash using hlist_*
The hash implementation is a complete implementation of a hash using
buckets as hash entries and overflow buckets attached to them.
The kernel already provides datastructures hlist_head and hlist_node
which can be used to implement an hash using lists as hash buckets. So
it is better to implement heavily used functionality on top of those
instead of providing a full hash implementation.
The rewrite changes the behavior of some functions slightly:
* hash_add add elements to the front instead of the tail
* hash_iterate doesn't provide pointer to access bucket->data directly,
but it can be accessed using hlist_entry
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a3238c3b379146a2d480dfee4c7f76c4692d7466
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:59 2010 +0100
Staging: batman-adv: Make hash_iterate inlineable
hash_iterate is next to the function pointers the most called function
related to hashes which benefits from inlining as it is uses in loops.
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 60eb502436910fb8118639e2ce4d7a4f732b6754
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:58 2010 +0100
Staging: batman-adv: Move hash callback related function to header
To enable inlining of the function pointers hashdata_choose_cb,
hashdata_choose_cb and hashdata_free_cb, also the hash functions which
uses them must be inlined by the called function.
This should increase the performance, but also increases the size of the
generated machine code slightly.
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6d5e654240dc14ded3d74aa5df6857572ba9f5e3
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:57 2010 +0100
Staging: batman-adv: Remove hashdata_choose_cb from hash
Function pointers cannot be inlined by a compiler and thus always has
the overhead of an call. hashdata_choose_cb's are one of the most often
called function pointers and its overhead must kept relative low.
As first step, every function which uses this function pointer takes it
as parameter instead of storing it inside the hash abstraction
structure.
This not generate any performance gain right now. The called functions
must also be able to be inlined by the calling functions to enable
inlining of the function pointer.
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 51f3d8a27c1a1ac6aced25ea93fc5c0520e9256c
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:56 2010 +0100
Staging: batman-adv: Remove hashdata_compare_cb from hash
Function pointers cannot be inlined by a compiler and thus always has
the overhead of an call. hashdata_compare_cb's are one of the most often
called function pointers and its overhead must kept relative low.
As first step, every function which uses this function pointer takes it
as parameter instead of storing it inside the hash abstraction
structure.
This not generate any performance gain right now. The called functions
must also be able to be inlined by the calling functions to enable
inlining of the function pointer.
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1341a00ad356dfb21978ce4e5e979024558042d2
Author: Linus Lüssing <linus.luessing@ascom.ch>
Date: Mon Nov 22 00:55:55 2010 +0100
Staging: batman-adv: Make hop_penalty configurable via sysfs
When having a mixed topology of both very mobile and rather static
nodes, you are usually best advised to set the originator interval on
all nodes to a level best suited for the most mobile node.
However, if most of the nodes are rather static, this can create a lot
of undesired overhead as a trade-off then. If setting the interval too
low on the static nodes, a mobile node might be chosen as a router for
too long, not switching away from it fast enough because of its
mobility and the low frequency of ogms of static nodes.
Exposing the hop_penalty is especially useful for the stated scenario: A
static node can keep the default originator interval, a mobile node can
select a quicker one resulting in faster route updates towards this
mobile node. Additionally, such a mobile node could select a higher hop
penalty (or even set it to 255 to disable acting as a router for other
nodes) to make it less desirable, letting other nodes avoid selecting
this mobile node as a router.
Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1623948f879069b33d07986aa95e3b9969322ff4
Author: Linus Lüssing <linus.luessing@web.de>
Date: Mon Nov 22 00:55:54 2010 +0100
Staging: batman-adv: Ommit storing struct device in sysfs functions
We actually do not need an extra struct device variable, therefore
replacing them with defines that directly get the bat_priv or
net_device. This further reduces the code size in bat_sysfs.c and
especially shortens some macros.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit add9e1722755072f40d79104db04e350b25624d9
Author: Linus Lüssing <linus.luessing@web.de>
Date: Mon Nov 22 00:55:53 2010 +0100
Staging: batman-adv: Wrapper functions for sysfs storing
Sysfs configuration options that just took a boolean value
(enable(d)/disable(d)/0/1) and integer setting basically all had the same
structure.
To avoid even more copy and pasting in the future and to make introducing
new configuration parameters for batman-adv simpler, more generic
wrapper functions are being introduced with this commit. They can deal with
boolean and unsigned integer parameters, storing them in the specified
atomic_t variables.
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 641ee3f8f4375bde4e216aacd26d286a34efed61
Author: Linus Lüssing <linus.luessing@web.de>
Date: Mon Nov 22 00:55:52 2010 +0100
Staging: batman-adv: Unify sysfs file names with their bat_priv atomics
Both sysfs entries and variable names shall be as descriptive as
possible while not exceeding a certain length. This patch renames
bat_priv atomics to be equally descriptive with their according sysfs
entries.
Unifying sysfs and bat_priv atomic names also makes it easier to find
each others pendant.
The reduced ("type"-)information which was previously indicated with a
_enabled for booleans got substituted by a comment in bat_priv.
This patch has also been done in regards for the future BAT_ATTR_*
macros (they only need one name argument instead of a file and variable
name).
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 420193573f1191b22e08f85ead41c090d283dd05
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:55:51 2010 +0100
Staging: batman-adv: softif bridge loop avoidance
By connecting multiple batman-adv mesh nodes to the same ethernet
segment a loop can be created when the soft-interface is bridged
into that ethernet segment. A simple visualization of the loop
involving the most common case - a LAN as ethernet segment:
node1 <-- LAN --> node2
| |
wifi <-- mesh --> wifi
Packets from the LAN (e.g. ARP broadcasts) will circle forever from
node1 or node2 over the mesh back into the LAN.
This patch adds the functionality to detect other batman-adv nodes
connected to the LAN and select a 'gateway' to talk to the
non-batman-adv devices on this LAN. All traffic from and to the mesh
will be handled by this gateway to avoid the loop. OGMs received via
the soft-interface are interpreted as 'port announcements' to locate
potential batman-adv nodes. The patch can also deal with vlans on
top of batX and offers a list of LAN neighbors via debugfs.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
[sven.eckelmann@gmx.de: Rework on top of current version]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 225f7b0b950d141819a8d9694141571b349e563d
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:50 2010 +0100
Staging: batman-adv: reassemble fragmented skb if mtu allows it
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9061109ab18352c73b5dda426043dbb6d5e2dae7
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:49 2010 +0100
Staging: batman-adv: fragment forwarded packets
If a packet is too big to be forwarded over an interface it will be
fragmented on-the-fly (if fragmentation is enabled).
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b8cd75445e842b11a0a8ff1e763303a575c21c77
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:48 2010 +0100
Staging: batman-adv: remove redundant is_my_mac() check in route_unicast_packet
Callers should check the if the received packet is for us before it
calls route_unicast_packet.
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f3cc7595d242a22a9ffba91979d2cd4e4e815424
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:47 2010 +0100
Staging: batman-adv: move skb reassembly of fragmented packets into dedicated function
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8bbde32cf5bd9dbe2f53d562f563b465c0829b23
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:46 2010 +0100
Staging: batman-adv: add frag_ prefix to all fragmentation related functions
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 49b588e79f7c85aec05008a945fdf17d281e83f9
Author: Andreas Langer <an.langer@gmx.de>
Date: Mon Nov 22 00:55:45 2010 +0100
Staging: batman-adv: restructure fragmentation to handle batman unicast packets
The unicast_frag_send_skb() function expected 'raw' packets (without any
batman-adv header) to fragment them. This needs to be changed, so that
this function is able to fragment packets that already traveled inside
the mesh but need to be fragmented now.
Signed-off-by: Andreas Langer <an.langer@gmx.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3f427604d669031343af8e6ecd8d1cc7a6408ab2
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:55:44 2010 +0100
Staging: batman-adv: use rcu callbacks when freeing batman_if
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b4abfcd4c79ec12340b4c68e3a211badd3c90e20
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:55:43 2010 +0100
Staging: batman-adv: convert batman_if custom refcounting to kref functions
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit bd27509f49ab841bc10fd604ccd9e7f9914b7120
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:42 2010 +0100
Staging: batman-adv: Don't remove interface with spinlock held
We call a lot of the netdevice code when holding if_list_lock which will
spin the whole time. This is not necessary because we only want to
protect the access to the list to be serialized. An extra queue can be
used which hold all interfaces which should be removed and then use that
queue without any locks for netdevice cleanup.
Reported-by: Rafal Lesniak <lesniak@eresi-project.org>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 43fc987224a45dc53ccc302df5889230d9587921
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:41 2010 +0100
Staging: batman-adv: Add new sysfs files to README
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2f1646788f4d3cd2ce5cb24d13096afbd8782665
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 00:55:40 2010 +0100
Staging: batman-adv: ensure that eth_type_trans gets linear memory
eth_type_trans tries to pull data with the length of the ethernet header
from the skb. We only ensured that enough data for the first ethernet
header and the batman header is available in non-paged memory of the skb
and not for the ethernet after the batman header.
eth_type_trans would fail sometimes with drivers which don't ensure that
all there data is perfectly linearised.
Reported-by: Rafal Lesniak <lesniak@eresi-project.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4f26559156eae1b616ef2d0d168bd25f493e02f4
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 00:55:39 2010 +0100
Staging: batman-adv: Replace Andrew Lunn as Staging maintainer
Andrew Lunn didn't submit patches to staging since a while and may not
be the right person for new patches.
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4f76548299196e0fd880469a39552ccde797474b
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Tue Nov 23 11:40:13 2010 +0100
staging: iio: dac: ad5446: Remove unused sign member from chip specific information structure
Remove unused sign member from chip specific information structure
Fix typos
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d846263da4c6032b7a9440d335794ef8d3e76dfb
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Tue Nov 23 11:14:16 2010 +0100
staging: iio: dac: ad5446: Enable driver support for AD5620/AD5640/AD5660 DA converters
Initial support for single channel, 12-/14-/16-Bit nanoDAC with On-Chip Reference
staging: iio: dac: ad5446: Fix according to review feedback
Review feedback by Jonathan Cameron:
Use kernel doc style to document headers.
Turn data into a union
Add some comments for clarity
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f386caa3cd74231cd86c813fe4453e3d6e39876c
Author: Jonathan Cameron <jic23@cam.ac.uk>
Date: Mon Nov 22 23:31:16 2010 +0000
staging: iio: documentation rewrite and cleanup of sysfs documetation
Change to capital syntax for documetation e.g. 'inX-inY_raw'
Use multiple 'What:' entries rather than wild cards or options so
as to make the documentation clearer and easier to search.
Some trivial spelling fixes.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fe34604844c151668579cb6ad52f75a5c651bed9
Author: Jonathan Cameron <jic23@cam.ac.uk>
Date: Mon Nov 22 23:09:48 2010 +0000
staging: iio: adis16260 add suppport for adis16255 and adis16250.
Unusual element is addition of 'negate' and 'axis' platform data
to ensure we support all the functionality of the adis16255 driver
currently in staging.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Matthias Brugger <mensch0815@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a9672951a5c4e57e048895d868a2172962ef7ffd
Author: Jonathan Cameron <jic23@cam.ac.uk>
Date: Mon Nov 22 23:09:47 2010 +0000
staging: iio: adis16260 add id table support
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2b4756aa36909a94596752db341a0a2c8bb8c6ea
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Mon Nov 22 14:35:32 2010 +0100
staging: iio: adc: Enable driver support for ad7887 AD converter
Enable support for AD7887: SPI Micropower, 2-Channel, 125 kSPS, 12-Bit ADC
staging: iio: adc: Fix according to review feedback
Review feedback by Jonathan Cameron:
Combine statements.
Document struct members.
Remove redundant variable initialization.
Simplify multichannel scan from ring logic.
Fix coding style.
[v2]
staging: iio: adc: ad7887: Fix typos
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b5a49481754a5cbfdc47bd701208f77c5c9010c6
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Mon Nov 22 11:15:23 2010 +0100
staging: iio: dac: Enable driver support for AD5444 and AD5446 DA converters
Enable support for AD5444 and AD5446: 12-/14-Bit High Bandwidth
Multiplying DACs with Serial Interface.
staging: iio: dac: Add support for AD5541A, AD5512A digital to analog convertors
staging: iio: dac: Fix according to review feedback
Review feedback by Jonathan Cameron:
Remove spurious new line.
Document struct members.
Remove redundant variable initialization.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 378b310cccca9dcf2f2703aa67ae3698a599bd65
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Fri Nov 19 10:58:07 2010 +0100
fanotify: on group destroy allow all waiters to bypass permission check
When fanotify_release() is called, there may still be processes waiting for
access permission. Currently only processes for which an event has already been
queued into the groups access list will be woken up. Processes for which no
event has been queued will continue to sleep and thus cause a deadlock when
fsnotify_put_group() is called.
Furthermore there is a race allowing further processes to be waiting on the
access wait queue after wake_up (if they arrive before clear_marks_by_group()
is called).
This patch corrects this by setting a flag to inform processes that the group
is about to be destroyed and thus not to wait for access permission.
[additional changelog from eparis]
Lets think about the 4 relevant code paths from the PoV of the
'operator' 'listener' 'responder' and 'closer'. Where operator is the
process doing an action (like open/read) which could require permission.
Listener is the task (or in this case thread) slated with reading from
the fanotify file descriptor. The 'responder' is the thread responsible
for responding to access requests. 'Closer' is the thread attempting to
close the fanotify file descriptor.
The 'operator' is going to end up in:
fanotify_handle_event()
get_response_from_access()
(THIS BLOCKS WAITING ON USERSPACE)
The 'listener' interesting code path
fanotify_read()
copy_event_to_user()
prepare_for_access_response()
(THIS CREATES AN fanotify_response_event)
The 'responder' code path:
fanotify_write()
process_access_response()
(REMOVE A fanotify_response_event, SET RESPONSE, WAKE UP 'operator')
The 'closer':
fanotify_release()
(SUPPOSED TO CLEAN UP THE REST OF THIS MESS)
What we have today is that in the closer we remove all of the
fanotify_response_events and set a bit so no more response events are
ever created in prepare_for_access_response().
The bug is that we never wake all of the operators up and tell them to
move along. You fix that in fanotify_get_response_from_access(). You
also fix other operators which haven't gotten there yet. So I agree
that's a good fix.
[/additional changelog from eparis]
[remove additional changes to minimize patch size]
[move initialization so it was inside CONFIG_FANOTIFY_PERMISSION]
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit c11d501fffd56e3d63d4af5a14add2d77e91d36b
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Mon Nov 22 18:46:33 2010 +0100
fanotify: Dont allow a mask of 0 if setting or removing a mark
In mark_remove_from_mask() we destroy marks that have their event mask cleared.
Thus we should not allow the creation of those marks in the first place.
With this patch we check if the mask given from user is 0 in case of FAN_MARK_ADD.
If so we return an error. Same for FAN_MARK_REMOVE since this does not have any
effect.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 405390cd16e53fc1b23a5896648ec413d5fdd98c
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Tue Nov 9 18:18:16 2010 +0100
fanotify: correct broken ref counting in case adding a mark failed
If adding a mount or inode mark failed fanotify_free_mark() is called explicitly.
But at this time the mark has already been put into the destroy list of the
fsnotify_mark kernel thread. If the thread is too slow it will try to decrease
the reference of a mark, that has already been freed by fanotify_free_mark().
(If its fast enough it will only decrease the marks ref counter from 2 to 1 - note
that the counter has been increased to 2 in add_mark() - which has practically no
effect.)
This patch fixes the ref counting by not calling free_mark() explicitly, but
decreasing the ref counter and rely on the fsnotify_mark thread to cleanup in
case adding the mark has failed.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit f5bd95f5ed6560faac8abb5c354dcf477654833a
Author: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Date: Fri Nov 5 17:05:27 2010 +0100
fanotify: if set by user unset FMODE_NONOTIFY before fsnotify_perm() is called
Unsetting FMODE_NONOTIFY in fsnotify_open() is too late, since fsnotify_perm()
is called before. If FMODE_NONOTIFY is set fsnotify_perm() will skip permission
checks, so a user can still disable permission checks by setting this flag
in an open() call.
This patch corrects this by unsetting the flag before fsnotify_perm is called.
Signed-off-by: Lino Sanfilippo <LinoSanfilippo@gmx.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 8a4f1145c627c8a8e4c9d7c13d961a3304e9b6bb
Author: Eric Paris <eparis@redhat.com>
Date: Mon Nov 8 18:19:22 2010 -0500
fanotify: remove packed from access response message
Since fanotify has decided to be careful about alignment and packing
rather than rely on __attribute__((packed)) for multiarch support.
Since this attribute isn't doing anything on fanotify_response we just
drop it. This does not break API/ABI.
Suggested-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 517281342bed8527575dcec4d44126ba31d098e0
Author: Eric Paris <eparis@redhat.com>
Date: Mon Nov 8 18:08:14 2010 -0500
fanotify: deny permissions when no event was sent
If no event was sent to userspace we cannot expect userspace to respond to
permissions requests. Today such requests just hang forever. This patch will
deny any permissions event which was unable to be sent to userspace.
Reported-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
commit 95bd48578bbe66fa5d16029c59dfbe95749a5f0b
Author: Huang Weiyi <weiyi.huang@gmail.com>
Date: Sat Nov 20 20:06:18 2010 +0800
staging: brcm80211: remove duplicated #include
Remove duplicated #include('s) in
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 72f9fc7c8150873d51c61cfb885dc7fbb075d62a
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon Nov 22 12:12:37 2010 -0800
staging: easycap needs smp_lock.h, fixes build error
Add header file to fix build error:
drivers/staging/easycap/easycap_main.c:4251: error: implicit declaration of function 'lock_kernel'
drivers/staging/easycap/easycap_main.c:4254: error: implicit declaration of function 'unlock_kernel'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b6faaae1a15a352d68b3e3cd8b840e56709820bf
Author: Marek Lindner <lindner_marek@yahoo.de>
Date: Mon Nov 22 12:34:49 2010 +0100
Staging: batman-adv: ensure that eth_type_trans gets linear memory
eth_type_trans tries to pull data with the length of the ethernet header
from the skb. We only ensured that enough data for the first ethernet
header and the batman header is available in non-paged memory of the skb
and not for the ethernet after the batman header.
eth_type_trans would fail sometimes with drivers which don't ensure that
all there data is perfectly linearised.
The failure was noticed through a kernel bug Oops generated by the
skb_pull inside eth_type_trans.
Reported-by: Rafal Lesniak <lesniak@eresi-project.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9ee898739b7e4d292abed911008b3f91b442118a
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Nov 22 12:34:50 2010 +0100
Staging: batman-adv: Don't remove interface with spinlock held
We call a lot of the netdevice code when holding if_list_lock which will
spin the whole time. This is not necessary because we only want to
protect the access to the list to be serialized. An extra queue can be
used which hold all interfaces which should be removed and then use that
queue without any locks for netdevice cleanup.
We create a "scheduling while atomic" Oops when calling different
netdevice related functions inside a spinlock protected area on a
preemtible kernel.
Reported-by: Rafal Lesniak <lesniak@eresi-project.org>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6df78338e7af7960b67fa00aa2a5c63986a23d3c
Author: Arend van Spriel <arend@broadcom.com>
Date: Sat Nov 20 12:07:16 2010 +0100
staging: brcm80211: updated maintainers contact information
Open-source development team extended so contacts updated.
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 39a545559f8d5f13e8a4a7dfddcaad0e2ba9bcfb
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 14:55:58 2010 +0800
ASoC: Add missing dev_set_drvdata in p1022_ds_probe
Otherwise, calling dev_get_drvdata in p1022_ds_remove returns NULL.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 67bd489aa309a680b1462ad635df29e8825152d2
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 14:54:58 2010 +0800
ASoC: Add missing dev_set_drvdata in mpc8610_hpcd_probe
Otherwise, calling dev_get_drvdata in mpc8610_hpcd_remove returns NULL.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3f90e5028a03be4496a04e4599b16f4420ff1304
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 17:43:39 2010 +0800
ASoC: Remove unneeded !! operations while checking return value of nuc900_checkready
I think this unneededd !! operations just reduce the readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit a7a9820bae19775df1d6cc70d2571ee26e099413
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 17:40:53 2010 +0800
ASoC: Fix compile error for nuc900-pcm.c
This patch fixes below error:
CC sound/soc/nuc900/nuc900-pcm.o
sound/soc/nuc900/nuc900-pcm.c: In function 'nuc900_dma_open':
sound/soc/nuc900/nuc900-pcm.c:267: error: 'nuc900_ac97_data' undeclared (first use in this function)
sound/soc/nuc900/nuc900-pcm.c:267: error: (Each undeclared identifier is reported only once
sound/soc/nuc900/nuc900-pcm.c:267: error: for each function it appears in.)
sound/soc/nuc900/nuc900-pcm.c: At top level:
sound/soc/nuc900/nuc900-pcm.c:337: error: expected ',' or ';' before 'static'
sound/soc/nuc900/nuc900-pcm.c:354: error: 'nuc900_soc_platform_probe' undeclared here (not in a function)
make[3]: *** [sound/soc/nuc900/nuc900-pcm.o] Error 1
make[2]: *** [sound/soc/nuc900] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit e3edefbd4a9071daf388978355f69c37fbeae261
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 17:40:05 2010 +0800
ASoC: Fix prototype for nuc900_ac97_probe and nuc900_ac97_remove
This patch fixes below compile warning:
CC sound/soc/nuc900/nuc900-ac97.o
sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 5a8f1d4701a50bc2a1e112f6c8e7d30f63597eae
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 29 17:39:10 2010 +0800
ASoC: Fix compile error for nuc900-ac97.c
Fix below compile error by add a missing ';'.
CC sound/soc/nuc900/nuc900-ac97.o
sound/soc/nuc900/nuc900-ac97.c:300: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:301: warning: initialization from incompatible pointer type
sound/soc/nuc900/nuc900-ac97.c:318: error: expected ',' or ';' before 'static'
sound/soc/nuc900/nuc900-ac97.c:405: error: 'nuc900_ac97_drvprobe' undeclared here (not in a function)
make[3]: *** [sound/soc/nuc900/nuc900-ac97.o] Error 1
make[2]: *** [sound/soc/nuc900] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b02038a17b271e0f70616c54e4eccb5cc33d1b74
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 49b4a6546fac02f58784f0744e0f99a6562ccc03
Author: Shan Wei <shanwei@cn.fujitsu.com>
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 <shemminger@linux-foundation.org>
Date: Wed Oct 10 17:30:18 2007 -0700
[SCTP]: port randomization
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d65c3768afb47fb93c43fbfcafef53502edaaa85
Author: Simon Wood <simon@mungewell.org>
Date: Mon Nov 29 17:41:23 2010 +0100
HID: add support for F430 Force Feedback Wheel
This patch adds USB IDs to enable force feedback on the Thrustmaster
F430 wheel.
Antonio did the work, I just converted to git patch to include in Kernel.
Reported-by: Antonio Orefice <aorefice77@gmail.com>
Signed-off-by: Simon Wood <simon@mungewell.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651
Author: Victor Gallardo <vgallardo@apm.com>
Date: Fri Oct 8 10:25:44 2010 +0000
powerpc/4xx: Add Canyonlands suspend and idle support
- Add Clock Power Management (CPM) node to dts tree
- Add idle-doze entry in CPM node
- Add standby entry in CPM node
- Add PM and SUSPEND support by default in defconfig
- Remove UART2 and UART3 as they are unused, this will
allow CPM to put unused-units (UART2 and UART3) to sleep.
Signed-off-by: Victor Gallardo <vgallardo@apm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
commit 05ed60874e7fc958707183b71ea47260c1dab358
Author: Victor Gallardo <vgallardo@apm.com>
Date: Fri Oct 8 10:26:13 2010 +0000
powerpc/4xx: Add Kilauea suspend and idle support
- Add Clock Power Management (CPM) node to dts tree
- Add idle-doze entry in CPM node
- Add standby entry in CPM node
- Add PM and SUSPEND support by default in defconfig
- Add NO_HZ and CONFIG_HIGH_RES_TIMERS support by
default in defconfig
Signed-off-by: Victor Gallardo <vgallardo@apm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
commit d164f6d4f9108126f69ba2963cf6fb7ef4ba9232
Author: Victor Gallardo <vgallardo@apm.com>
Date: Fri Oct 8 10:25:27 2010 +0000
powerpc/4xx: Add suspend and idle support
Add suspend/resume support for 4xx compatible CPUs.
See /sys/power/state for available power states configured in.
Add two different idle states (idle-wait and idle-doze) controlled via sysfs.
Default is idle-wait.
cat /sys/devices/system/cpu/cpu0/idle
[wait] doze
To save additional power, use idle-doze.
echo doze > /sys/devices/system/cpu/cpu0/idle
cat /sys/devices/system/cpu/cpu0/idle
wait [doze]
Signed-off-by: Victor Gallardo <vgallardo@apm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
commit 7451708f39db19a8303bb7fb95f00aca9f673cb5
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon Nov 29 22:56:03 2010 +0800
crypto: af_alg - Add dependency on NET
Add missing dependency on NET since we require sockets for our
interface.
Should really be a select but kconfig doesn't like that:
net/Kconfig:6:error: found recursive dependency: NET -> NETWORK_FILESYSTEMS -> AFS_FS -> AF_RXRPC -> CRYPTO -> CRYPTO_USER_API_HASH -> CRYPTO_USER_API -> NET
Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit f1e1ebb8e2297c6e328fc920946da43529c5e92e
Author: Borislav Petkov <borislav.petkov@amd.com>
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 GH does so disable
the error injection interface for it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit 63ea2f71c2de5d1e12114349a0ccacafcdeb1556
Author: Borislav Petkov <borislav.petkov@amd.com>
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 succeded 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 <borislav.petkov@amd.com>
commit 11a167c79d9a4a96a86cc95527d514e243574525
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit ab60dbc4e751729d36932f950a61223cf90bdc32
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 4052a4cd666a1a425f4fa38d5a1822b90a854fe2
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit a77876ce9ac0fa6943704a7257afcaa3dd3f28d9
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 9d132a3866a6e4edf48c04da2109688154eeaa6d
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 2d2a6849870001b9960b7484a5e3a358e241e687
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 756818446155162e3a25362b582888183b18efe9
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit f5930462844266e16719773151596d4ee62b3fe5
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 56599293eb0a78f5dfa9cc42ec52ff27060c2d92
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 2666462604f74be3c83be4a069e34d192da286de
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit f55a0dd369f441a259c1fe751db6038d1fa63521
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 7878f389b450e58feefb41977397e6c35f27741f
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit afa1e01ddc8e41c9e4f361bd615a225a0021dfaf
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit df97e045b5399150ac16b71d4066550936ea688e
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit df0701bb8660107e811bddba6e4933385f697a21
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Mon Nov 29 10:54:28 2010 +0000
ASoC: soc-cache: Ensure consistent cache naming
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 7a33d4ce8231f789548ce6e25f75894a6c8508a5
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Mon Nov 29 10:24:54 2010 +0000
ASoC: soc-cache: Add error checking in the *_cache_sync functions
Ensure that we report any errors encountered during reads/writes
in the cache syncing functions.
Remove redundant newline in the source code.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit d482337eaba627348ffb8b7c0752d65e16667cd9
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 26 14:54:42 2010 +0800
ASoC: Fix resource leak in smdk_spdif.c
Properly free allocated resources in smdk_init() error path.
Add missing platform_device_unregister() in smdk_exit().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3790f205465f5c47a3629129af875c94f61f1fd3
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 26 14:53:38 2010 +0800
ASoC: Add missing gpio_free(S3C64XX_GPK(12)) in smartq_exit()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b6a11f497369fff39e8eb91c83b531d41a73986d
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 26 14:52:47 2010 +0800
ASoC: Fix resource leak in neo1973_gta02_init() error path
Properly free allocated resources in neo1973_gta02_init() error path.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 853dc30274878d14b7abef8313c801f5559b4c47
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 26 14:51:56 2010 +0800
ASoC: Fix resource leak in goni_wm8994.c
Properly free allocated resources in goni_init() error path.
Add missing snd_soc_unregister_dai() in goni_exit().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 6880444e3aed4c8c52d502f70c4275a63edba601
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 29 08:46:13 2010 -0200
[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 <mchehab@redhat.com>
commit f6b99b614603c48ffb718acf60f6ba1deb451f8a
Author: Dave Martin <dave.martin@linaro.org>
Date: Tue Nov 16 13:13:37 2010 +0000
ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL
Directives such as .long and .word do not magically cause the
assembler location counter to become aligned in gas. As a
result, using these directives in code sections can result in
misaligned data words when building a Thumb-2 kernel
(CONFIG_THUMB2_KERNEL).
This is a Bad Thing, since the ABI permits the compiler to
assume that fundamental types of word size or above are word-
aligned when accessing them from C. If the data is not really
word-aligned, this can cause impaired performance and stray
alignment faults in some circumstances.
In general, the following rules should be applied when using
data word declaration directives inside code sections:
* .quad and .double:
.align 3
* .long, .word, .single, .float:
.align (or .align 2)
* .short:
No explicit alignment required, since Thumb-2
instructions are always 2 or 4 bytes in size.
immediately after an instruction.
Applies cleanly on v2.6.37-rc1.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 2e4361974d0ac62ecb4e2d7d4e59a5aa19978cf5
Author: Vasiliy Kulikov <segoon@openwall.com>
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 <segoon@openwall.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit a303ac7e4854f3f01f70f7699483830ff909efa4
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 730d92d68a5329578819dcd04ca656d54a20ff1c
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <jaume@fqingenieria.es>
Cc: Michael Trimarchi <trimarchi@gandalf.sssup.it>
Cc: Shawn Guo <shawn.gsc@gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit ff46c78a23f69099849f325a188acbc94e684e0d
Author: Eric Bénard <eric@eukrea.com>
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 <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit dc427170750f7be9ddedf16ca049b5cb827bd880
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Nov 29 07:42:59 2010 +0100
ALSA: hda - Remove dead md2 quirk code
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit ac70eb1305d5a81efd1e32327d7e79be15a63a5a
Author: Daniel T Chen <crimsun@ubuntu.com>
Date: Sat Nov 27 13:58:04 2010 -0500
ALSA: hda: Use BIOS auto-parsing instead of existing model quirk for MEDION MD2
BugLink: https://launchpad.net/bugs/682199
A 2.6.35 (Ubuntu Maverick) user, burningphantom1, reported a regression
in audio: playback was inaudible through both speakers and headphones.
In commit 272a527c04 of sound-2.6.git, a new model was added with this
machine's PCI SSID. Fortunately, it is now sufficient to use the auto
model for BIOS auto-parsing instead of the existing quirk.
Playback, capture, and jack sense were verified working for both
2.6.35 and the alsa-driver snapshot from 2010-11-27 when model=auto is
used.
Reported-and-tested-by: burningphantom1
Cc: <stable@kernel.org> [2.6.35+]
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit eb87e6770a9b1ad54b13fcfe80a1346d0c257536
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 46f5221049bb46b0188aad6b6dfab5dbc778be22
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Nov 18 15:06:17 2010 +0000
powerpc: Remove second definition of STACK_FRAME_OVERHEAD
Since STACK_FRAME_OVERHEAD is defined in asm/ptrace.h and that
is ASSEMBER safe, we can just include that instead of going via
asm-offsets.h.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 0b97fee0ef9b0a0445520f90980410f905c6f9da
Author: Michael Neuling <mikey@neuling.org>
Date: Wed Nov 17 18:52:45 2010 +0000
powerpc/mm: Avoid avoidable void* pointer
Change pgdir from a void to real type. Having this as a void is
stupid and has already caused 1 bug.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 6f08cb3be6345bc354e48131f7466766db4d355a
Author: Michael Neuling <mikey@neuling.org>
Date: Wed Nov 17 18:52:44 2010 +0000
powerpc: Add POWER7+ cputable entry
This adds the POWER7+ cputable entry for the PVR 0x004a0000. Rest is
the same as vanilla POWER7.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 1d32bb1827da3ebb413f6cb492990a42ab030559
Author: Michael Neuling <mikey@neuling.org>
Date: Wed Nov 17 18:52:43 2010 +0000
powerpc: Remove POWER6 oprofile workarounds for POWER7
These are not needed on POWER7 so remove them.
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 93fe56e99fb946fcd4244741bfc7af6638f1cac7
Author: Michael Neuling <mikey@neuling.org>
Date: Wed Nov 17 18:52:42 2010 +0000
powerpc: Remove unneeded cpu_setup/restore from POWER7 cputable entry
These are not needed so just remove them
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 36f567b42932a81866bf723779703ecc84cf714b
Author: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
Date: Tue Nov 9 13:24:48 2010 +0000
powerpc: Add VPHN firmware feature
This simple patch adds the firmware feature for VPHN to the firmware
features bitmask.
Signed-off-by: Jesse Larrew <jlarrew@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 698193d85aa8aba003bacd09e40bbd78474fb00f
Author: Michael Ellerman <michael@ellerman.id.au>
Date: Mon Nov 8 17:31:36 2010 +0000
powerpc: Consolidate obj-y assignments
No need to have three of them.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit f7dec88781dd3ad62ebd4acc515c8938c15353ac
Author: Jesper Juhl <jj@chaosbits.net>
Date: Thu Nov 4 13:29:40 2010 +0000
powerpc/iseries: Remove unused mf_getSrcHistory function and caller.
On Tue, 2 Nov 2010, Michael Ellerman wrote:
> On Mon, 2010-11-01 at 22:20 +0100, Jesper Juhl wrote:
> > Hi Stephen,
> >
> > On Tue, 2 Nov 2010, Stephen Rothwell wrote:
> >
> > > On Mon, 1 Nov 2010 21:06:23 +0100 (CET) Jesper Juhl <jj@chaosbits.net> wrote:
> > > >
> > > > Remove unused function 'mf_getSrcHistory' (that will never be used ever
> > > > according to Stephen Rothwell).
> > > >
> > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > >
> > > Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > >
> >
> > Ok, so if you are the (unofficial) iSeries maintainer and you don't merge
> > the patch somewhere that'll eventually go up-stream, but just ACK it
> > (thank you for that btw), then where do I send it to get it merged?
>
> Here. ie. linuxppc-dev.
>
> But, while you're removing it you should remove the #if 0'ed callsite as
> well, see mf_src_proc_show() in that file. :)
>
Done. See patch below.
Remove unused function 'mf_getSrcHistory' (that will never be used
ever according to Stephen Rothwell) and also remove most of (under 'if
0') code from mf_src_proc_show() where the function was called.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 467d93a7ee64a5c8f675589d658ce3b8b502d288
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sat Oct 30 08:10:41 2010 +0000
powerpc/cell: Use vzalloc rather than vmalloc and memset in spu_alloc_lscsa_std
Hi,
We can get rid of a memset in
arch/powerpc/platforms/cell/spufs/lscsa_alloc.c::spu_alloc_lscsa_std() by
using vzalloc() rather than vmalloc()+memset().
Completely untested patch below since I have no hardware nor tools to
compile this.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit cd34206e949b66d3c5fa3e4d2905aa4af29d1b85
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Tue Oct 26 17:35:12 2010 +0000
powerpc: Add memory_hotplug_max()
Add a function to get the maximum address that can be hotplug added.
This is needed to calculate the size of the tce table needed to cover
all memory in 1:1 mode.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit f6aedd8606ae673f8e1f4d972fc86c451fbc8ba7
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Tue Oct 26 17:35:11 2010 +0000
powerpc/macio: Ensure all dma routines get copied over
Also add a comment to dev_archdata, indicating that changes there need
to be verified against the driver code.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit a8daac8a517dacfea951424f67c1f07e1f76b2ad
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Oct 18 07:27:03 2010 +0000
powerpc/pseries: iommu cleanup
No need to initialize per-cpu pointer to NULL, it is the default.
Direct dma ops and no setup are the defaults, no need to set for
iommu-off.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 34c4d012554ed8c99b3fb25baea9bab3507e9f76
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Oct 18 07:27:02 2010 +0000
powerpc/dart: iommu table cleanup
No need to set the device tree device_node pci node iommu pointer, its
only used for dlpar remove.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 741d204cee6d62bbe0f74ab57ef31702b7d90f62
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Oct 18 07:27:01 2010 +0000
powerpc/cell: Beat dma ops cleanup
direct_dma_ops is the default pci dma ops.
No need to call a function to get the pci dma ops, we know they are the
dma_direct_ops.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 2f9c9be2ff31670c942572cf96eb6c696362b584
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Oct 18 07:27:00 2010 +0000
powerpc/pasemi: Clean up pasemi iommu table initializations
No need for empty helpers with iommu off, the ppc_md hooks are optional.
The direct_dma_ops are the default pci_dma_ops, so no need to set in the
them iommu off case.
No need to set the device tree device_node pci node iommu pointer, its
only used for dlpar remove.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 6d283d782f9fbafee5c672bfdaff4c10f6fdc788
Author: Nishanth Aravamudan <nacc@us.ibm.com>
Date: Mon Oct 18 07:26:59 2010 +0000
powerpc/vio: Use dma ops helpers
Use the set_dma_ops helper. Instead of modifying vio_dma_mapping_ops,
just create a trivial wrapper for dma_supported.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 72b962d3bba19657abaa6cc8806661ecbde5ee92
Author: Tracey Dent <tdent48227@gmail.com>
Date: Fri Oct 15 17:30:48 2010 +0000
powerpc/ps3: Replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 8cb7c71bda16e2d67a332642661e0b4219641a23
Author: Srikanth Krishnakar <skrishna@mvista.com>
Date: Thu Oct 14 04:03:35 2010 +0000
rtc-cmos.c : Fix warning on PowerPC
The following warning is seen while compilation of PowerPC kernel:
CC drivers/rtc/rtc-cmos.o
drivers/rtc/rtc-cmos.c:697:2: warning: #warning Assuming 128 bytes
of RTC+NVRAM address space, not 64 bytes.
Fix it by adding defined(__powerpc__).
Signed-off-by: Srikanth Krishnakar <skrishna@mvista.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 5742bd859524793b857110a13db349d95070d2dc
Author: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Date: Wed Oct 6 08:37:09 2010 +0000
powerpc: Add support for new hcall H_BEST_ENERGY
Create sysfs interface to export data from H_BEST_ENERGY hcall
that can be used by administrative tools on supported pseries
platforms for energy management optimizations.
sys/device/system/cpu/pseries_(de)activate_hint_list and
sys/device/system/cpu/cpuN/pseries_(de)activate_hint will provide
hints for activation and deactivation of cpus respectively.
These hints are abstract number given by the hypervisor based
on the extended knowledge the hypervisor has regarding the
system topology and resource mappings.
The activate and the deactivate sysfs entry is for the two
distinct operations that we could do for energy savings. When
we have more capacity than required, we could deactivate few
core to save energy. The choice of the core to deactivate
will be based on /sys/devices/system/cpu/deactivate_hint_list.
The comma separated list of cpus (cores) will be the preferred
choice. If we have to activate some of the deactivated cores,
then /sys/devices/system/cpu/activate_hint_list will be used.
The per-cpu file
/sys/device/system/cpu/cpuN/pseries_(de)activate_hint further
provide more fine grain information by exporting the value of
the hint itself.
Added new driver module
arch/powerpc/platforms/pseries/pseries_energy.c
under new config option CONFIG_PSERIES_ENERGY
Signed-off-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 99d86705253dcf728dbbec4d694a6764b6edb70c
Author: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Date: Wed Oct 6 08:36:59 2010 +0000
powerpc: Cleanup APIs for cpu/thread/core mappings
These APIs take logical cpu number as input
Change cpu_first_thread_in_core() to cpu_first_thread_sibling()
Change cpu_last_thread_in_core() to cpu_last_thread_sibling()
These APIs convert core number (index) to logical cpu/thread numbers
Add cpu_first_thread_of_core(int core)
Changed cpu_thread_to_core() to cpu_core_index_of_thread(int cpu)
The goal is to make 'threads_per_core' accessible to the
pseries_energy module. Instead of making an API to read
threads_per_core, this is a higher level wrapper function to
convert from logical cpu number to core number.
The current APIs cpu_first_thread_in_core() and
cpu_last_thread_in_core() returns logical CPU number while
cpu_thread_to_core() returns core number or index which is
not a logical CPU number. The new APIs are now clearly named to
distinguish 'core number' versus first and last 'logical cpu
number' in that core.
The new APIs cpu_{first,last}_thread_sibling() work on
logical cpu numbers. While cpu_first_thread_of_core() and
cpu_core_index_of_thread() work on core index.
Example usage: (4 threads per core system)
cpu_first_thread_sibling(5) = 4
cpu_last_thread_sibling(5) = 7
cpu_core_index_of_thread(5) = 1
cpu_first_thread_of_core(1) = 4
cpu_core_index_of_thread() is used in cpu_to_drc_index() in the
module and cpu_first_thread_of_core() is used in
drc_index_to_cpu() in the module.
Make API changes to few callers. Export symbols for use in modules.
Signed-off-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 787d44caa5bca249d8781d21b626c417f1e3cfc4
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Fri Oct 1 11:12:54 2010 +0000
powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 4e89a2d8e2d5ab33d73b76f16c10fdf515faabef
Author: Will Schmidt <will_schmidt@vnet.ibm.com>
Date: Tue Sep 28 15:33:12 2010 +0000
powerpc/pseries: Add kernel parameter to disable batched hcalls
This introduces a pair of kernel parameters that can be used to disable
the MULTITCE and BULK_REMOVE h-calls.
By default, those hcalls are enabled, active, and good for throughput
and performance. The ability to disable them will be useful for some of
the PREEMPT_RT related investigation and work occurring on Power.
Signed-off-by: Will Schmidt <will_schmidt@vnet.ibm.com>
cc: Olof Johansson <olof@lixom.net>
cc: Anton Blanchard <anton@samba.org>
cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 475fc7c011ace79258c07d981d348a15614e0573
Author: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Tue Sep 21 23:22:40 2010 +0000
powerpc: Fix two typos in Documentation/powerpc/booting-without-of.txt
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 5a71c61b7724ad0acedff254e07dc1a7dd05ee76
Author: Joe Perches <joe@perches.com>
Date: Mon Sep 13 09:47:42 2010 +0000
drivers/char/hvc_vio: Use static const char arrays
Signed-off-by: Joe Perches <joe@perches.com>
Reviewed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 56e640de12c4d9902493cd819c63cacf66515686
Author: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Date: Mon Sep 6 04:36:12 2010 +0000
powerpc: Removing undead ifdef __KERNEL__
The __KERNEL__ ifdef isn't necessary at this point, because it is
checked in an outer ifdef level already and has no effect here.
Signed-off-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit d72e063bb32c06c6c1cec14f6857b7c37ba62d7a
Author: Anton Blanchard <anton@samba.org>
Date: Tue Aug 24 14:23:44 2010 +0000
powerpc/kdump: Override crash_free_reserved_phys_range to avoid freeing RTAS
The crashkernel region will almost always overlap RTAS. If we free the
crashkernel region via "echo 0 > /sys/kernel/kexec_crash_size" then we will
free RTAS and the machine will crash in confusing and exciting ways.
Override crash_free_reserved_phys_range and check for overlap with RTAS.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit 64ff31287693c1f325cb9cb049569c1611438ef1
Author: Anton Blanchard <anton@samba.org>
Date: Thu Aug 12 16:28:09 2010 +0000
powerpc: Add support for popcnt instructions
POWER5 added popcntb, and POWER7 added popcntw and popcntd. As a first step
this patch does all the work out of line, but it would be nice to implement
them as inlines with an out of line fallback.
The performance issue with hweight was noticed when disabling SMT on a large
(192 thread) POWER7 box. The patch improves that testcase by about 8%.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
commit f4f0c135de9d359e22172adfb1d30ddcb38c00a7
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 13:25:22 2010 +0900
ARM: mach-shmobile: mackerel: Add mackerel defconfig
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 4b82b68925d19ab32159ba94b30768f705812e0f
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 02:21:48 2010 +0000
ARM: mach-shmobile: mackerel: document switch and pin modes.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 11fee467a119afac02d336bf41dcd9c4db2b6106
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 02:21:43 2010 +0000
ARM: mach-shmobile: mackerel: Add LCDC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 2264c151efa632fa8aab7377d13d9aa1476547bf
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 02:21:37 2010 +0000
ARM: mach-shmobile: mackerel: Add SMSC support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 920adc75d51d23fe3e8a7ce2c946b2b24e6f7742
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 02:21:21 2010 +0000
ARM: mach-shmobile: Add mackerel board support
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 208c7dc2727ec0fbc678da5e749bcc178c08463d
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon Nov 29 02:10:08 2010 +0000
ARM: mach-shmobile: ag5evm: Add FSI resources
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 193006f7e3b1abd42d7a3677b54fa2996461a842
Author: Vasiliy Kulikov <segoon@openwall.com>
Date: Fri Nov 26 17:06:28 2010 +0000
sh: boards: mach-se: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 4bd5d259e451d35380de2fcd1a3510ae22d000a3
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Fri Nov 26 09:40:22 2010 +0000
sh: Add div6_reparent_clks to clock framework for FSI
Current clk_ops doesn't support .init which
is used to select external clock on ecovec
without CONFIG_SH_CLK_CPG_LEGACY.
To solve this problem, this patch add div6_reparent_clks
to clock-sh7724.
This patch solve compile error too.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 22efa0fee32d9e7f6f6fbc396a872b5708d86048
Author: Simon Horman <horms@verge.net.au>
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 <yusuke.goda.sx@renesas.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 1ae0affedce1d3e401991fbe7f2674753f0a7641
Author: Simon Horman <horms@verge.net.au>
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 <yusuke.goda.sx@renesas.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 7211a1bae6eac26539eb2d77a26fcd1bccef8137
Author: Simon Horman <horms@verge.net.au>
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 <yusuke.goda.sx@renesas.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd
Author: Scott J. Goldman <scottjg@vmware.com>
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 <scottjg@vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bf26414510103448ad3dc069c7422462f03ea3d7
Author: Tom Herbert <therbert@google.com>
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 <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8fa9208e305e24978b897d6ea057604444ce77e1
Author: Frank Blaschka <frank.blaschka@de.ibm.com>
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 <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf
Author: Ursula Braun <ursula.braun@de.ibm.com>
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 <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cdac082e051136a021f28d0f63c56e916b541253
Author: Joe Perches <joe@perches.com>
Date: Fri Nov 26 02:41:18 2010 +0000
drivers/s390/net: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f3aa3136d9c15ff693198eb34701a74bb0b6b969
Author: Sachin Sant <sachinp@in.ibm.com>
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 <sachinp@in.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5
Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
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 <vlad.lungu@windriver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit de855b992d75e49816eb09231764e7a63a4f555d
Author: Szymon Janc <szymon@janc.net.pl>
Date: Sat Nov 27 08:39:48 2010 +0000
forcedeth: use usleep_range not msleep for small sleeps
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f
Author: Szymon Janc <szymon@janc.net.pl>
Date: Sat Nov 27 08:39:46 2010 +0000
forcedeth: do not use assignment in if conditions
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5504e1397cc860e61fbb68c56e7a10db613275fd
Author: Szymon Janc <szymon@janc.net.pl>
Date: Sat Nov 27 08:39:45 2010 +0000
forcedeth: include <linux/io.h> and <linux/uaccess.h> instead of <asm/io.h> and <asm/uaccess.h> as suggested by checkpatch
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9b03b06b65856f70564c53654d44053f3072379e
Author: Szymon Janc <szymon@janc.net.pl>
Date: Sat Nov 27 08:39:44 2010 +0000
forcedeth: remove unnecessary checks before kfree
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9
Author: Szymon Janc <szymon@janc.net.pl>
Date: Sat Nov 27 08:39:43 2010 +0000
forcedeth: fix multiple code style issues
Signed-off-by: Szymon Janc <szymon@janc.net.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 47c05314328d9c40f6006783dc4c1e3080bd2914
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 28 00:02:59 2010 +0000
zd1211rw: document need for kmalloc cast
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6
Author: Joe Perches <joe@perches.com>
Date: Sat Nov 27 23:05:45 2010 +0000
vxge: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f3167460144cd2c24b964a32d40d32f851b5d5f4
Author: Joe Perches <joe@perches.com>
Date: Sat Nov 27 23:05:44 2010 +0000
qlcnic: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0acdf68f495793143802dd4f3e47918dddcceed7
Author: Joe Perches <joe@perches.com>
Date: Sat Nov 27 23:05:43 2010 +0000
netxen: remove unnecessary [kv][mcz]alloc casts
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 559ad0ff1368baea14dbc3207d55b02bd69bda4b
Author: Mathias Krause <minipli@googlemail.com>
Date: Mon Nov 29 08:35:39 2010 +0800
crypto: aesni-intel - Fixed build error on x86-32
Exclude AES-GCM code for x86-32 due to heavy usage of 64-bit registers
not available on x86-32.
While at it, fixed unregister order in aesni_exit().
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit fa9f90be745d3b600a9d97a063be404c5e5d9071
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sun Nov 28 21:39:34 2010 +0100
Kill off a bunch of warning: ‘inline’ is not at beginning of declaration
These warnings are spewed during a build of a 'allnoconfig' kernel
(especially the ones from u64_stats_sync.h show up a lot) when building
with -Wextra (which I often do)..
They are
a) annoying
b) easy to get rid of.
This patch kills them off.
include/linux/u64_stats_sync.h:70:1: warning: ‘inline’ is not at beginning of declaration
include/linux/u64_stats_sync.h:77:1: warning: ‘inline’ is not at beginning of declaration
include/linux/u64_stats_sync.h:84:1: warning: ‘inline’ is not at beginning of declaration
include/linux/u64_stats_sync.h:96:1: warning: ‘inline’ is not at beginning of declaration
include/linux/u64_stats_sync.h:115:1: warning: ‘inline’ is not at beginning of declaration
include/linux/u64_stats_sync.h:127:1: warning: ‘inline’ is not at beginning of declaration
kernel/time.c:241:1: warning: ‘inline’ is not at beginning of declaration
kernel/time.c:257:1: warning: ‘inline’ is not at beginning of declaration
kernel/perf_event.c:4513:1: warning: ‘inline’ is not at beginning of declaration
mm/page_alloc.c:4012:1: warning: ‘inline’ is not at beginning of declaration
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90
Author: Casey Schaufler <casey@schaufler-ca.com>
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 <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit 7e70cb4978507cf31d76b90e4cfb4c28cad87f0c
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <zohar@us.ibm.com>
Signed-off-by: David Safford <safford@watson.ibm.com>
Reviewed-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: James Morris <jmorris@namei.org>
commit d00a1c72f7f4661212299e6cb132dfa58030bcdb
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <safford@watson.ibm.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit c749ba912e87ccebd674ae24b97462176c63732e
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <safford@watson.ibm.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit a0e39349d80d8b5deeb264fb190bd064f7063252
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <zohar@us.ibm.com>
Signed-off-by: David Safford <safford@watson.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit dc88e46029486ed475c71fe1bb696d39511ac8fe
Author: Mimi Zohar <zohar@linux.vnet.ibm.com>
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 <zohar@us.ibm.com>
Acked-by: Serge E. Hallyn <serge@hallyn.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
commit ce6ada35bdf710d16582cc4869c26722547e6f11
Author: Serge E. Hallyn <serge@hallyn.com>
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 <serge.hallyn@ubuntu.com>
Acked-by: Andrew G. Morgan <morgan@kernel.org>
Acked-By: Kees Cook <kees.cook@canonical.com>
Cc: James Morris <jmorris@namei.org>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: "Christopher J. PeBenito" <cpebenito@tresys.com>
Cc: Eric Paris <eparis@parisplace.org>
Signed-off-by: James Morris <jmorris@namei.org>
commit c661c4a2b0d64c33afc9018a406162b1f8ac5617
Author: Breno Leitao <leitao@linux.vnet.ibm.com>
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 <leitao@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 82a39eb6b3829a02e235656feddb4542517fcabc
Author: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
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 <kadlec@blackhole.kfki.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit aa285b1740f5b13e5a2606a927f3129954583d78
Author: Timo Teräs <timo.teras@iki.fi>
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 <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6a632625c7da7594d059b88dae0e9c591af147ba
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 7438a5455734d109fdf18d97147dc57a6dbe5a44
Author: Adam Edvardsson <adam.edvardsson@orsoc.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit eac0d3ff5a92de410964fdf0d072314821ca39fc
Author: Jonas Bonn <jonas@southpole.se>
Date: Thu Nov 25 02:30:26 2010 +0000
ethoc: remove unused spinlock
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e0f4258be2515afce8ef1e6fb22312525c281798
Author: Jonas Bonn <jonas@southpole.se>
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 <jonas@southpole.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 85beb5869a4f6abb52a7cf8e01de6fa57e9ee47d
Author: Steven Rostedt <srostedt@redhat.com>
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.*<trace_kmalloc' |wc -l
213
objdump -dr vmlinux.slab.patched| grep 'jmpq.*<trace_kmalloc' |wc -l
1
This also has a nice impact on size.
text data bss dec hex filename
7023060 2121564 2482432 11627056 b16a30 vmlinux.slab
6970579 2109772 2482432 11562783 b06f1f vmlinux.slab.patched
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 25 02:18:45 2010 +0000
X25 remove bkl in call user data length ioctl
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 25 02:18:43 2010 +0000
X25 remove bkl from causediag ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5b7958dfa5db758e36e92e1790075b470b4947f8
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 25 02:18:40 2010 +0000
X25 remove bkl from calluserdata ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f90de660678cf553f63c387945830a2e4d26dd3e
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 25 02:18:35 2010 +0000
X25 remove bkl in facility ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 25 02:18:15 2010 +0000
X25 remove bkl in subscription ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3
Author: Vladislav Zolotarov <vladz@broadcom.com>
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 <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b36d42c6f569991dd50da1ac676d026f40a2d460
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit fe6b46ee79c99ea22afd5a82dd9516310d16257f
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit 9ab4650f718a0e1cb8792bab4ef97efca4ac75c2
Author: Dinh Nguyen <Dinh.Nguyen@freescale.com>
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 <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5
Author: Michael Chan <mchan@broadcom.com>
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 <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a5dac108d57072eec4d6745f32c162524509f2cb
Author: Eddie Wai <waie@broadcom.com>
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 <waie@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897
Author: John Fastabend <john.r.fastabend@intel.com>
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:
[<ffffffff813fd6e8>] ? fib_rules_event+0x28/0x1b0
[<ffffffff814ad2b5>] notifier_call_chain+0x55/0x80
[<ffffffff81089156>] raw_notifier_call_chain+0x16/0x20
[<ffffffff813e5af7>] call_netdevice_notifiers+0x37/0x70
[<ffffffff813e6756>] netdev_features_change+0x16/0x20
[<ffffffffa02995be>] ixgbe_fcoe_enable+0xae/0x100 [ixgbe]
[<ffffffffa01da06a>] vlan_dev_fcoe_enable+0x2a/0x30 [8021q]
[<ffffffffa02d08c3>] fcoe_create+0x163/0x630 [fcoe]
[<ffffffff811244d5>] ? mmap_region+0x255/0x5a0
[<ffffffff81080ef0>] param_attr_store+0x50/0x80
[<ffffffff810809b6>] module_attr_store+0x26/0x30
[<ffffffff811b9db2>] sysfs_write_file+0xf2/0x180
[<ffffffff8114fc88>] vfs_write+0xc8/0x190
[<ffffffff81150621>] sys_write+0x51/0x90
[<ffffffff8100c0b2>] system_call_fastpath+0x16/0x1b
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5a0d2268d259886f0c87131639d19eb4a67b4532
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd
Author: Shan Wei <shanwei@cn.fujitsu.com>
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 <adobriyan@sw.ru>
Date: Tue Nov 6 05:27:11 2007 -0800
[IPV6]: Convert /proc/net/ipv6_route to seq_file interface
Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a40c9f88b5e3da500ddab9440e5ddac170c12281
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66
Author: Rajesh Borundia <rajesh.borundia@qlogic.com>
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 <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b0044bcfa95ddf2e317863fb29121c284b6725ca
Author: Rajesh Borundia <rajesh.borundia@qlogic.com>
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 <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6
Author: Shan Wei <shanwei@cn.fujitsu.com>
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 <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ce06b9d6d33fd2ed799b6e825d68fe95077da354
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit a0c1695489580e6872e0b7c50cc08eba4fab0bb0
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun Nov 28 12:48:26 2010 -0200
[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 <mchehab@redhat.com>
commit b567d07b3c96b5db317846e2e76124bcddf49679
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun Nov 28 13:41:57 2010 +0100
Revert "firewire: ohci: fix reception of 4k sized asynchronous packets"
This reverts commit eaa7d0ae9c3b952ed30224a048bb6b9feef6ea4b.
Clemens Ladisch submitted a wholesale rewrite of AR DMA which fixes this issue too but
does not risk regressions with controllers that don't like descriptors crossing page
boundaries.
commit e7a3481c0246c8e45e79c629efd63b168e91fcda
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Mon Oct 25 16:53:46 2010 -0700
x86/pvclock: Zero last_value on resume
If the guest domain has been suspend/resumed or migrated, then the
system clock backing the pvclock clocksource may revert to a smaller
value (ie, can be non-monotonic across the migration/save-restore).
Make sure we zero last_value in that case so that the domain
continues to see clock updates.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit c762be637503b833012457087133c1292fd6056d
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun Nov 28 16:28:01 2010 +0800
crypto: algif_skcipher - Pass on error from af_alg_make_sg
The error returned from af_alg_make_sg is currently lost and we
always pass on -EINVAL. This patch pases on the underlying error.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f
Author: Thomas Graf <tgraf@infradead.org>
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 <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 89bf67f1f080c947c92f8773482d9e57767ca292
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17
Author: Sathya Perla <sathya.perla@emulex.com>
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 <padmanabh.ratnakar@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 39fb51a123c125e36e9bcb67686b3e2945784250
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:23:43 2010 +0000
ASoC: Implement runtime PM for WM8994/58
This allows us to communicate our power management state back to the
parent device, allowing it to do a full power down when the device is
idle.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 2e19b0c8c21cb06eb5b902588c30ae0529ce8ec3
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:23:42 2010 +0000
ASoC: Enable rbtree compression for WM8994/58 register cache
The WM8994 and WM8958 register map is relatively sparse so benefits
from compression. The rbtree compression gives better results than
LZO for both memory and CPU consumption on a map as sparse as this.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ca9aef50727dec76ab12513ba833a1cf5e9d7e83
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:23:41 2010 +0000
ASoC: Convert WM8994 to use soc-cache.c cache functions
In the process we convert the driver to read registers one at a time
when initialising the cache. This has the effect of working around
limitations in the sizes of I2C transactions which can be done by some
CPUs. Due to the sparseness of the register map the overhead from this
should be minimual unless I2C transactions are very expensive to start.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 821edd2fb5b289b84d715fb744106019fa2e1920
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 15:21:09 2010 +0000
ASoC: Add WM8958 microphone detection support
The WM8958 contains an advanced accessory detection feature which allows
detection of up to seven different impedence levels on the microphone
bias output, including detection of video outputs. Since some of the
more involved accessory interfaces may involve noticable interactions
with external components a simple detection scheme is provided by
default with the option to provide custom handling of accessory detect.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit d6addcc9d88aeac4a0cc63a06d36baef04f5dc3b
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 15:21:08 2010 +0000
ASoC: Add WM8958 Multi-band compressor support
The WM8958 features a multi-band compressor which can be enabled on
any of the AIF inputs. The MBC allows different gains to be applied to
differnt audio bands, providing an improvement in perceived loudness
of the signal by avoiding overdriving the output transducers. This
patch enables support for the MBC.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit c4431df050ff124cae7716e301cead1e8f33c575
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 15:21:07 2010 +0000
ASoC: Implement support for enhanced AIF3 on WM8958
Additional audio routing options are available on the WM8958 audio
interface 3. Add support for these.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 3a42315740fa80bb4579eb25fedec9d09ff154e7
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 15:21:06 2010 +0000
ASoC: Initial WM8958 audio configuration
The WM8958 is a WM8994 derivative. This patch merely ensures that some
revision specific configuration for WM8994 is not enabled on WM8994,
additional patches will add support for the new features introduced on
the WM8958.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 11cef5f07ba0e925af432fc3229fb87585ccccf0
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:23:44 2010 +0000
ASoC: Use DC servo startup mode when not doing DCS correction
Devices which do not have a DCS correction applied can use the explicit
DC servo startup mode for optimal startup performance. This most
immediately affects the WM8958.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 887c883eea9867535059f3c8414c8cfc952ccff1
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:29 2010 +0200
crypto: omap-sham - zero-copy scatterlist handling
If scatterlist have more than one entry, current driver uses
aligned buffer to copy data to to accelerator to tackle possible
issues with DMA and SHA buffer alignment.
This commit adds more intelligence to verify SG alignment and
possibility to use DMA directly on the data without using copy
buffer.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit a55b290b0e41e02d1969589c5d77d966ac2b7ec8
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:28 2010 +0200
crypto: omap-sham - FLAGS_FIRST is redundant and removed
bufcnt is 0 if it was no update requests before,
which is exact meaning of FLAGS_FIRST.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 3c8d758ab528317ecd6d91f8651170ffd2331899
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:27 2010 +0200
crypto: omap-sham - hash-in-progress is stored in hw format
Hash-in-progress is now stored in hw format.
Only on final call, hash is converted to correct format.
Speedup copy procedure and will allow to use OMAP burst mode.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 798eed5d9204b01862985ba0643ce5cf84114072
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:26 2010 +0200
crypto: omap-sham - crypto_ahash_final() now not need to be called.
According to the Herbert Xu, client may not always call
crypto_ahash_final().
In the case of error in hash calculation resources will be
automatically cleaned up.
But if no hash calculation error happens and client will not call
crypto_ahash_final() at all, then internal buffer will not be freed,
and clocks will not be disabled.
This patch provides support for atomic crypto_ahash_update() call.
Clocks are now enabled and disabled per update request.
Data buffer is now allocated as a part of request context.
Client is obligated to free it with crypto_free_ahash().
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit a5d87237bb15eed8449e5a30c0bbe626e0e7f43d
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:25 2010 +0200
crypto: omap-sham - removed redundunt locking
Locking for queuing and dequeuing is combined.
test_and_set_bit() is also replaced with checking under dd->lock.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 3e133c8bf6a6723377d94bc97aa52596e49a4090
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:24 2010 +0200
crypto: omap-sham - error handling improved
Introduces DMA error handling.
DMA error is returned as a result code of the hash request.
Clients needs to handle error codes and may repeat hash calculation attempt.
Also in the case of DMA error, SHAM module is set to be re-initialized again.
It significantly improves stability against possible HW failures.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit c8eb54041acc4dedeaf0d9da34b91b8658386751
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:23 2010 +0200
crypto: omap-sham - DMA initialization fixes for off mode
DMA parameters for constant data were initialized during driver probe().
It seems that those settings sometimes are lost when devices goes to off mode.
This patch makes DMA initialization just before use.
It solves off mode problems.
Fixes: NB#202786 - Aegis & SHA1 block off mode changes
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 0c3cf4cc9abd854dcc6488719348a75b8f328c54
Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Date: Fri Nov 19 16:04:22 2010 +0200
crypto: omap-sham - uses digest buffer in request context
Currently driver storred digest results in req->results
provided by the client. But some clients do not set it
until final() call. It leads to crash.
Changed to use internal buffer to store temporary digest results.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 0d258efb6a58fe047197c3b9cff8746bb176d58a
Author: Mathias Krause <minipli@googlemail.com>
Date: Sat Nov 27 16:34:46 2010 +0800
crypto: aesni-intel - Ported implementation to x86-32
The AES-NI instructions are also available in legacy mode so the 32-bit
architecture may profit from those, too.
To illustrate the performance gain here's a short summary of a dm-crypt
speed test on a Core i7 M620 running at 2.67GHz comparing both assembler
implementations:
x86: i568 aes-ni delta
ECB, 256 bit: 93.8 MB/s 123.3 MB/s +31.4%
CBC, 256 bit: 84.8 MB/s 262.3 MB/s +209.3%
LRW, 256 bit: 108.6 MB/s 222.1 MB/s +104.5%
XTS, 256 bit: 105.0 MB/s 205.5 MB/s +95.7%
Additionally, due to some minor optimizations, the 64-bit version also
got a minor performance gain as seen below:
x86-64: old impl. new impl. delta
ECB, 256 bit: 121.1 MB/s 123.0 MB/s +1.5%
CBC, 256 bit: 285.3 MB/s 290.8 MB/s +1.9%
LRW, 256 bit: 263.7 MB/s 265.3 MB/s +0.6%
XTS, 256 bit: 251.1 MB/s 255.3 MB/s +1.7%
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Reviewed-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 21ea28abcf825729f9698afd7357dfbf7040d4f8
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sat Nov 27 16:32:57 2010 +0800
crypto: Makefile clean up
Changed Makefile to use <modules>-y instead of <modules>-objs.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit c8484594aeafe889269bd01232049b184140de3f
Author: Joe Perches <joe@perches.com>
Date: Sat Nov 27 16:30:39 2010 +0800
crypto: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 068ffaa8bfb67c2ddb3ecaf38cc90f94a1a92fe3
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <tglx@linutronix.de>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 008f29d3865828bb27e35d6d3fa889d0853b469f
Author: Shawn Bohrer <sbohrer@rgmadvisors.com>
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 <schwab@linux-m68k.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290355779-3276-1-git-send-email-sbohrer@rgmadvisors.com>
Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 9d1faba5fe410558099f13cfada2eab03186769d
Author: Ian Munsie <imunsie@au1.ibm.com>
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 <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290658375-10342-1-git-send-email-imunsie@au1.ibm.com>
Signed-off-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 7caa20bff0f9065d462c90b21b1de36ba7d34563
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:19:35 2010 +0000
mfd: Implement runtime PM for WM8994 core driver
Allow the WM8994 to completely power off, including disabling the LDOs
if they are software controlled, when it goes idle. The CODEC subdevice
controls activity for the MFD as a whole.
If the GPIOs need to be used while the device is active runtime PM
should be disabled for the device by machine specific code.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit c9ef7c3a8c8abf79b4dde4f00c41cd9a96e0ef05
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 17:19:34 2010 +0000
mfd: Provide pm_runtime_no_callbacks flag in cell data
Allow MFD cells to have pm_runtime_no_callbacks() called on them during
registration. This causes the runtime PM framework to ignore them,
allowing use of runtime PM to suspend the device as a whole even if
not all drivers for the MFD can usefully implement runtime PM. For
example, RTCs are likely to run continuously regardless of the power
state of the system.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit bb40328262881d7409a63e31ba0bf2b7aa0715bc
Author: MyungJoo Ham <myungjoo.ham@samsung.com>
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 <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 51ce16f6636e261c73943da49c1b906869157b36
Author: MyungJoo Ham <myungjoo.ham@samsung.com>
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 <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit b5b6849dd04777173ec6fe541a3f37b84326dcf5
Author: Tejun Heo <tj@kernel.org>
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 <tj@kernel.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 37982ba0a0630066a6a0844a66aedaf91c66db84
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <tglx@linutronix.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
CC: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit baa2f6cedbfae962f04281a31f08ec29667d31a0
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <tglx@linutronix.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 329bcc8861d23ed5c083b24cb606390da3ae3d41
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun Nov 21 16:37:42 2010 +0000
ARM: pgtable: switch to use pgtable-nopud.h
Nick Piggin noted upon introducing 4level-fixup.h:
| Add a temporary "fallback" header so architectures can run with
| the 4level pagetables patch without modification. All architectures
| should be converted to use the folding headers (include/asm-generic/
| pgtable-nop?d.h) as soon as possible, and the fallback header removed.
This makes ARM compliant with this statement.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 9e638fcc79589cdf6107f5964b0a2b729f2b9ff6
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun Nov 21 16:27:49 2010 +0000
ARM: pgtable: add pud-level code
This is in preparation for using pgtable-nopud.h rather than
4level-fixup.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit abd271f3abbcc13feefdb57221e20d5a5dd7c949
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 0c97593ce3607889e0f46a63934528eae9cfcb9b
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 4224b4a60606b4ada7e16ad49196985fa35af9c9
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit d55f04e2ca14390f2fc403d27b3b34e7bf7f9092
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 46a4bda79ef3a9f1bf2be17463de3c4e097c9e3f
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit e9c893cf794a52051fdb1f265f977d39d1791f92
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit aa64b72e95752d6369dffe1fc83e60b2834ca116
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit f6e3354d02aa1f30672e3671098c12cb49c7da25
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 97092e0c56830457af0639f6bd904537a150ea4a
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 6e4beb5e682953212da48ebb9e5c90408b8d38ae
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit b0d03745b18c39b8e86e70f7778f2093d2cd4ed7
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 69529c0eb76469168f1dd5851f363dbab17ce8fd
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit b510b049b549500816280f7ceaa087cfefdec581
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri Nov 26 20:35:25 2010 +0000
ARM: pgtable: group pte functions together
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a287789447cecc7a82ffc4451cbaf16a5c1dccc0
Author: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon Nov 22 07:21:27 2010 -0300
[media] [FOR, 2.6.37] Revert "V4L/DVB: v4l2-dev: remove unnecessary lock around atomic clear_bit"
Removing the mutex_lock/unlock around clear_bit allowed
device_unregister() to race with v4l2_open(). The device can be
unregistered between the video_devdata() and video_get() calls.
Revert the patch to fix the problem.
This reverts commit dd0daf2a6fb6bec436a3ef68bd585ea09a2a54b7.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit f5db33f919667efae47f51a56eccc653c9fba944
Author: Dan Carpenter <error27@gmail.com>
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 <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit fa1280e6bdce97986e81de32e7559962270bcd8e
Author: Paul Bender <pebender@gmail.com>
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 <pebender@gmail.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 4eec4b1396ac6a6a602b4521d40e9cf596ab776d
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri Nov 26 20:12:12 2010 +0000
ARM: pgtable: group pgd functions and data together
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7eb9db3d20f9375ffd343c2c031486d8eb6b0665
Author: Jarod Wilson <jarod@redhat.com>
Date: Wed Nov 17 12:25:45 2010 -0300
[media] streamzap: merge timeout space with trailing space
There are cases where we get an ending space, and our trailing timeout
space then gets sent right after it, which breaks repeat, at least for
lirc userspace decoding. Merge the two spaces by way of using
ir_raw_event_store_filter, set a timeout value, and we're back to good.
Successfully tested with streamzap and windows mce remotes.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1213a3c80ac9d87624cd70fdabf3346f951837e9
Author: Nicolas Kaiser <nikai@nikai.net>
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 <nikai@nikai.net>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6621dffca52aaa76a37d084b6ec2baadbfdabf4c
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ef8cee31a22405f8fb2f9471900265bb75850bce
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 00:04:28 2010 -0300
[media] drivers/media/video: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0a326c73a48503fa29879cdf4bb973a8981a471b
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 <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit eb9b2b69d3bdfe9cd98cd9b2c5715346a0f0140d
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 0045700b983fa8fa469d2582cc6febe577574482
Author: Baruch Siach <baruch@tkos.co.il>
Date: Wed Oct 27 04:03:52 2010 -0300
[media] mx2_camera: fix pixel clock polarity configuration
When SOCAM_PCLK_SAMPLE_FALLING, just leave CSICR1_REDGE unset, otherwise we get
the inverted behaviour.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0c6831c70acb7b29c40a32b65e3ecaf49920bd8a
Author: Mattias Wallin <mattias.wallin@stericsson.com>
Date: Fri Nov 26 13:06:39 2010 +0100
mfd: Fix ab8500-debug indentation errors
Replace spaces with proper tabs.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 4b666729010cbf315c9099b956b193df8edc6753
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Sep 1 10:47:16 2010 +0100
gpiolib: Add WM8958 support to the WM8994 driver
Several of the GPIOs on the WM8994 are fixed function on the WM8958 so
error out if the user tries to request them with gpiolib.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 559e0df6b3ffbc218a11bb9dada5320a217cb7a6
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Aug 31 19:25:12 2010 +0100
mfd: Add initial WM8958 support
The WM8958 is a derivative of the WM8994 which is register compatible
with the addition of some extra features, mostly in the CODEC side.
The major change visible at the MFD level is that rather than a single
DBVDD supply we now have three separate DBVDDs so we must request and
enable a different set of supplies.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ccf1fa403e44c4107ef4d73f73cafe81b5148d40
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 26 11:50:03 2010 +0000
ASoC: Remove redundant hw_write initialisation in WM8737
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 73d8c34f3d78ccf90a431c221df10377affce650
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Mon Nov 15 16:03:04 2010 -0500
SCSI: improve two error messages
This trivial patch (as1338) makes two uninformative error messages in
scsi_sysfs_add_sdev() more explicit.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit af86da5318136eb49c0453c2e2be3280ee5d18d9
Author: Cyrill Gorcunov <gorcunov@openvz.org>
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 <gorcunov@openvz.org>
Reviewed-by: Stephane Eranian <eranian@google.com>
Cc: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 004417a6d468e24399e383645c068b498eed84ad
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <paulus@samba.org>
Cc: davem <davem@davemloft.net>
Cc: Michael Cree <mcree@orcon.net.nz>
Cc: Deng-Cheng Zhu <dengcheng.zhu@gmail.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290707759.2145.119.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 5ef428c4b5950dddce7311e84321abb3aff7ebb0
Author: Andi Kleen <ak@linux.intel.com>
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 <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290077254-12165-2-git-send-email-andi@firstfloor.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 963988262c3c8f4234f64a0dde59446a295e07bb
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <francis.moro@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 5d508e820a23d9b6e8a149dfaa8ba5cbedf3d95c
Author: Franck Bui-Huu <fbuihuu@gmail.com>
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 <fbuihuu@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290525705-6265-3-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 2e939d1da9b5628642314c1e68b4319e61263c94
Author: Franck Bui-Huu <fbuihuu@gmail.com>
Date: Tue Nov 23 16:21:44 2010 +0100
perf: Limit event refresh to sampling event
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290525705-6265-2-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 6c7e550f13f8ad82efb6a5653ae628c2543c1768
Author: Franck Bui-Huu <fbuihuu@gmail.com>
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 <fbuihuu@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290525705-6265-1-git-send-email-fbuihuu@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 35d3778a8fe3c8b4a7513565e34d3bde00ce43ec
Author: Peter Zijlstra <peterz@infradead.org>
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 <a.p.zijlstra@chello.nl>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
LKML-Reference: <1290591835.2072.438.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 67720a48311474f861483bad0a736c6974aca6dc
Author: Florian Fainelli <florian@openwrt.org>
Date: Fri Nov 26 10:39:55 2010 +0100
watchdog: Fix null pointer dereference while accessing rdc321x platform_data
rdc321x-wdt currently fetches its driver specific data by using the platform_
device->platform_data pointer, this is wrong because the mfd device which
registers our platform_device has been added using mfd_add_device() which sets
the platform_device->driver_data pointer instead.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
CC: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit af8651f4537f5ba8881bb5c8261c6c486674a362
Author: Florian Fainelli <florian@openwrt.org>
Date: Fri Nov 26 10:39:54 2010 +0100
gpio: Fix null pointer dereference while accessing rdc321x platform_data
rdc321x-gpio currently fetches its driver specific data by using the platform_
device->platform_data pointer, this is wrong because the mfd device which
registers our platform_device has been added using mfd_add_device() which sets
the platform_device->driver_data pointer instead.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
CC: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 69b6edc2c1d5e8605c30e3e4c171a5e0868411c9
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:45 2010 +0000
mfd: Add initial WM8958 support
The WM8958 is a derivative of the WM8994 which is register compatible
with the addition of some extra features, mostly in the CODEC side.
The major change visible at the MFD level is that rather than a single
DBVDD supply we now have three separate DBVDDs so we must request and
enable a different set of supplies.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 2b6de384229ee48112db090174ce410601c912ab
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:44 2010 +0000
mfd: Convert WM8994 to new irq_ interrupt methods
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data
rather than an irq number. Convert over to these as they will become
mandatory in future.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit a04b7b542f6f453c8d5220a6f49772a4b2bf72de
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:43 2010 +0000
mfd: Convert WM835x to new irq_ interrupt methods
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data
rather than an irq number. Convert over to these as they will become
mandatory in future.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 72d2e687263710db4804aa994c72fc144201d732
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:42 2010 +0000
mfd: Convert WM831x to new irq_ interrupt methods
Kernel 2.6.37 adds new interrupt methods which take a struct irq_data
rather than an irq number. Convert over to these as they will become
mandatory in future.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit f5b0b11d159bcc865b54d84bcf231a298077cf9f
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:41 2010 +0000
mfd: Add WM8326 support
The WM8326 is a high performance variant of the WM832x series with
no software visible differences.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 0da07e4f3d97cf5a4ccb2866c953668cd39514b6
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:40 2010 +0000
mfd: Simplify WM832x subdevice instantiation
All the current WM832x devices have the same set of subdevices so can
just use multiple case statements with a single body.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 47dd38bddd01381f065cd57f517b106cec7bcfc1
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 18:01:39 2010 +0000
mfd: Supply IRQ base for WM832x devices
Without this the IRQ base will not be correctly configured for the
subdevices.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 797f70424fee36aafa939a157678f705739cdd1c
Author: Joe Perches <joe@perches.com>
Date: Fri Nov 12 13:37:56 2010 -0800
mfd: Use printf extension %pR for struct resource
Using %pR standardizes the struct resource output.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit a0d4503a044e67ac46adfe8f42eddefd2b60f85e
Author: Andres Salomon <dilinger@queued.net>
Date: Fri Nov 26 11:52:35 2010 +0100
mfd: Add cs5535-mfd driver for AMD Geode's CS5535/CS5536 support
Add an MFD driver to handle the ISA device on CS5535 and CS5536
southbridges. This ISA bridge is actually multiple devices: GPIOs,
MFGPTs, etc.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 6031c56b7d6f91b0dcd38b4876f26c4663ec6733
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 16:47:50 2010 +0100
mfd: Don't open-code mc13xxx_unlock
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 384d96a7bf083362ecb00d62fb3598b904219340
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Nov 10 15:49:41 2010 +0800
mfd: Include <linux/gpio.h> instead of <asm/gpio.h>
As warned by checkpatch.pl, use #include <linux/gpio.h> instead
of <asm/gpio.h>.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit 03b5035f781d8ff67ba2c57c88574f1d1d5d28d3
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Nov 10 15:47:51 2010 +0800
mfd: Include <linux/io.h> instead of <asm/io.h>
As warned by checkpatch.pl, use #include <linux/io.h> instead of <asm/io.h>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit ddc9fa4a841979d57ce779a0236cc59fba8e6e21
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 14:08:32 2010 -0700
mfd: Update WARN uses
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
commit b7a2b39d9b7703ccf068f549c8dc3465fc41d015
Author: Nikanth Karthikesan <knikanth@suse.de>
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 <knikanth@suse.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <201011261237.09187.knikanth@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 335d7afbfb71faac833734a94240c1e07cf0ead8
Author: Gerald Schaefer <gerald.schaefer@de.ibm.com>
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 <gerald.schaefer@de.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290437256.7455.4.camel@thinkpad>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 61ab25447ad6334a74e32f60efb135a3467223f8
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri Nov 26 13:00:59 2010 +0100
nohz: Fix printk_needs_cpu() return value on offline cpus
This patch fixes a hang observed with 2.6.32 kernels where timers got enqueued
on offline cpus.
printk_needs_cpu() may return 1 if called on offline cpus. When a cpu gets
offlined it schedules the idle process which, before killing its own cpu, will
call tick_nohz_stop_sched_tick(). That function in turn will call
printk_needs_cpu() in order to check if the local tick can be disabled. On
offline cpus this function should naturally return 0 since regardless if the
tick gets disabled or not the cpu will be dead short after. That is besides the
fact that __cpu_disable() should already have made sure that no interrupts on
the offlined cpu will be delivered anyway.
In this case it prevents tick_nohz_stop_sched_tick() to call
select_nohz_load_balancer(). No idea if that really is a problem. However what
made me debug this is that on 2.6.32 the function get_nohz_load_balancer() is
used within __mod_timer() to select a cpu on which a timer gets enqueued. If
printk_needs_cpu() returns 1 then the nohz_load_balancer cpu doesn't get
updated when a cpu gets offlined. It may contain the cpu number of an offline
cpu. In turn timers get enqueued on an offline cpu and not very surprisingly
they never expire and cause system hangs.
This has been observed 2.6.32 kernels. On current kernels __mod_timer() uses
get_nohz_timer_target() which doesn't have that problem. However there might be
other problems because of the too early exit tick_nohz_stop_sched_tick() in
case a cpu goes offline.
Easiest way to fix this is just to test if the current cpu is offline and call
printk_tick() directly which clears the condition.
Alternatively I tried a cpu hotplug notifier which would clear the condition,
however between calling the notifier function and printk_needs_cpu() something
could have called printk() again and the problem is back again. This seems to
be the safest fix.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: stable@kernel.org
LKML-Reference: <20101126120235.406766476@de.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 49f4138346b3cec2706adff02658fe27ceb1e46f
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri Nov 26 13:42:47 2010 +0100
printk: Fix wake_up_klogd() vs cpu hotplug
wake_up_klogd() may get called from preemptible context but uses
__raw_get_cpu_var() to write to a per cpu variable. If it gets preempted
between getting the address and writing to it, the cpu in question could be
offline if the process gets scheduled back and hence writes to the per cpu data
of an offline cpu.
This buggy behaviour was introduced with fa33507a "printk: robustify
printk, fix #2" which was supposed to fix a "using smp_processor_id() in
preemptible" warning.
Let's use this_cpu_write() instead which disables preemption and makes sure
that the outlined scenario cannot happen.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101126124247.GC7023@osiris.boeblingen.de.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 8ff590903d5fc7f5a0a988c38267a3d08e6393a2
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Oct 19 21:31:55 2010 +0800
crypto: algif_skcipher - User-space interface for skcipher operations
This patch adds the af_alg plugin for symmetric key ciphers,
corresponding to the ablkcipher kernel operation type.
Keys can optionally be set through the setsockopt interface.
Once a sendmsg call occurs without MSG_MORE no further writes
may be made to the socket until all previous data has been read.
IVs and and whether encryption/decryption is performed can be
set through the setsockopt interface or as a control message
to sendmsg.
The interface is completely synchronous, all operations are
carried out in recvmsg(2) and will complete prior to the system
call returning.
The splice(2) interface support reading the user-space data directly
without copying (except that the Crypto API itself may copy the data
if alignment is off).
The recvmsg(2) interface supports directly writing to user-space
without additional copying, i.e., the kernel crypto interface will
receive the user-space address as its output SG list.
Thakns to Miloslav Trmac for reviewing this and contributing
fixes and improvements.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
commit dd836ecdeda2459d0c5ce942345c144855d5c4f3
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 17:30:27 2010 -0400
i2c/algos: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 5b63b60e472606c12c83ffc131c0205eac9dc758
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 17:30:26 2010 -0400
media/video: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 29c6c21b39a4e3a3d3c64d5410ad595bf2486f92
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 17:30:25 2010 -0400
Revert "i2c: Fix Kconfig dependencies"
This reverts commit 0a57274ea026c2b7670683947b6cc08b195148cf.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 04c4876b3a2000f284e9434a4d15aad47494f38c
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 17:30:24 2010 -0400
kconfig: regen parser
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit eb889dc95f4e6b84af8ab0603bfba80c45b95b07
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 17:30:23 2010 -0400
kconfig: add an option to determine a menu's visibility
This option is aimed to add the possibility to control a menu's visibility
without adding dependency to the expression to all the submenu.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 65500fa94aaeb3475e39c0c5180f188014164ca4
Author: Linus Walleij <linus.walleij@stericsson.com>
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 <rabin.vincent@stericsson.com>
Cc: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Cc: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 283a1b92e25fe3a62c766a042f96dad2eefa7d17
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 6d803ba736abb5e122dede70a4720e4843dd6df4
Author: Jean-Christop PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
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 <plagnioj@jcrosoft.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit ea7872b9d6a81101f6ba0ec141544a62fea35876
Author: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
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 <mitake@dcl.info.waseda.ac.jp>
Cc: h.mitake@gmail.com
Cc: Miao Xie <miaox@cn.fujitsu.com>
Cc: Ma Ling <ling.ma@intel.com>
Cc: Zhao Yakui <yakui.zhao@intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <1290668693-27068-2-git-send-email-mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 49ce8fc651794878189fd5f273228832cdfb5be9
Author: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
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 <mitake@dcl.info.waseda.ac.jp>
Cc: h.mitake@gmail.com
Cc: Miao Xie <miaox@cn.fujitsu.com>
Cc: Ma Ling <ling.ma@intel.com>
Cc: Zhao Yakui <yakui.zhao@intel.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <1290668693-27068-1-git-send-email-mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit cffd9348a3ae87ac98a4b3c03a5359e28ad50b93
Author: Michael Hennerich <michael.hennerich@analog.com>
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 <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit dbcc465a3c8d81da132cc1dd4e5fbf731172477f
Author: Michael Hennerich <michael.hennerich@analog.com>
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 <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 22a95949d03548cb346d81d71ce6c64dc273f421
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri Nov 26 05:20:25 2010 +0000
framebuffer: fix fbcmap.c kernel-doc warning
Fix kernel-doc warning in fbcmap.c:
Warning(drivers/video/fbcmap.c:92): No description found for parameter 'flags'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit fca6e90ea179197899f2171065ae4c11e4c5ac94
Author: Changhwan Youn <chaos.youn@samsung.com>
Date: Fri Nov 26 13:21:53 2010 +0900
ARM: S5PV310: Set bit 22 in the PL310 (cache controller) AuxCtlr register
This patch is applied according to the commit 1a8e41cd672f894bbd74874eac601e6cedf838fb
(ARM: 6395/1: VExpress: Set bit 22 in the PL310 (cache controller) AuxCtlr register).
Actually, S5PV310 has same cache controller(PL310).
Following is from Catalin Marinas' commit.
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: Changhwan Youn <chaos.youn@samsung.com>
Cc: <stable@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 102f3e6c4fc3676fb5536ab90c558aee7781c89a
Author: Thomas Abraham <thomas.ab@samsung.com>
Date: Fri Nov 26 13:19:49 2010 +0900
ARM: S5PV210: Add frame buffer display support for SMDKV210
Enable frame buffer display support for SMDKV210 board.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Reviewed-by: Jonghun Han <jonghun.han@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 54b7944cdee5d965730df1c144d9c312c1c45f32
Author: Randy Dunlap <randy.dunlap@oracle.com>
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 <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 10872bbe4ae922bcd2bcb8222304e6e2eb415ee5
Author: Bojan Smojver <bojan@rexursive.com>
Date: Thu Nov 25 23:41:39 2010 +0100
PM / Hibernate: Use async I/O when reading compressed hibernation image
This is a fix for reading LZO compressed image using async I/O.
Essentially, instead of having just one page into which we keep
reading blocks from swap, we allocate enough of them to cover the
largest compressed size and then let block I/O pick them all up. Once
we have them all (and here we wait), we decompress them, as usual.
Obviously, the very first block we still pick up synchronously,
because we need to know the size of the lot before we pick up the
rest.
Also fixed the copyright line, which I've forgotten before.
Signed-off-by: Bojan Smojver <bojan@rexursive.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 079fe50e294f08fa7dc19b8f623bbb39758a4653
Author: Tracey Dent <tdent48227@gmail.com>
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 <tdent48227@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 94770e00e406f211ba2917da7a6bcce31dd94405
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
commit 43eab87828fee65f89f4088736b2b7a187390a2f
Author: Will Deacon <will.deacon@arm.com>
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 <j-pihet@ti.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
commit 629948310e4270e9b32c37b4a65a8cd5d6ebf38a
Author: Will Deacon <will.deacon@arm.com>
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 <jamie@jamieiles.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
commit 3cb314bae2191b432a7e898abf865db880f6d07d
Author: Will Deacon <will.deacon@arm.com>
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 <jamie@jamieiles.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
commit 59a98a1e56edea4d7d9c5f4ce9d50e271a04993c
Author: Will Deacon <will.deacon@arm.com>
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 <jamie.iles@jamieiles.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
commit 84fee97a026ca085f08381054513f9e24689a303
Author: Will Deacon <will.deacon@arm.com>
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 <jamie.iles@jamieiles.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
commit 01660dfc37933c92dbb7c5718aea61f88025d71f
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Mon Nov 8 18:31:53 2010 -0500
scripts/genksyms: fix header usage
FreeBSD does not like <malloc.h> when __STDC__ is defined, use the standard
<stdlib.h> instead.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit ee3850c440a61b521e2e63e9a13db712bead70ae
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit b9e4b1e0cd401e915e3ba97afc152946f78f9f0b
Author: Dennis Kügler <dennis.kuegler@gmx.de>
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 <dennis.kuegler@gmx.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 45f53cc90e8f0e46ab024d0bc1de49ebee0dc583
Author: Andi Kleen <ak@linux.intel.com>
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 <ak@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 6e5b86924a633f5b6eefb051404339a5a7bb005e
Author: Américo Wang <xiyou.wangcong@gmail.com>
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 <xiyou.wangcong@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 10f26fa64200095af0e5d80a980e47877865e4b7
Author: Asbjoern Sloth Toennesen <asbjorn@asbjorn.biz>
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 <asbjorn@asbjorn.biz>
Acked-by: maximilian attems <max@stro.at>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 84ca5266a24f6d211c59c7bfbac7cabd9b41a644
Author: Randy Dunlap <randy.dunlap@oracle.com>
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 <randy.dunlap@oracle.com>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: bluesmoke-devel@lists.sourceforge.net
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit c92c0c7a762d87f51be8027a9fc963195d888a70
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 459503e7cb82cc87d864748d1449374ac7be34e2
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 14ead8d1847c33fa4b2ba80755913c9903dcd494
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 165a53d5e2d1b8e8f68a94ec763252bf6c46361e
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 4c867fe5c8fc7918470b407ffbdfc258160ed0c6
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 66a51f14b2b6ed935c2087bc9a116f51a834f9c7
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit b914828f02138f446990b6d795b74ee6afab8058
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 727184be6f80ec8b9042752cbab3fde077c25dd4
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 0cbf39d8c61a768694ce4391d0ea109720e2b239
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit b679bf0e4c48b1eccd85c330dc9102d71b9e4faf
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit c88463b77e6fd0a1b92a5cc3112e55c03c8c7cde
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 12376b1639e2735c719d89167b958b068741c8a8
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit db6857c6e700111e2787b8e08ef1a7ceae363e03
Author: Simon Horman <horms@verge.net.au>
Date: Thu Nov 25 10:30:12 2010 +0900
kdump: update kexec-tools URL and Vivek's email
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 77c667d1365e19c2848d37bf408e2f0b086b63d9
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 15:48:01 2010 +0000
ARM: Samsung: Make sure ASoC DMA device is prototyped
Ensure that the prototype agrees with the definition and stop sparse
complaining when building the file.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit fcd02e261bb3b1ae14830d33da5401c6c4ee9bcc
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 16:27:08 2010 +0000
ASoC: Add WM8737 ALC support
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 7a93941975a95dd3be319128552fea71867724d7
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 17:20:27 2010 +0000
ASoC: Update MAINTAINERS for Samsung driver move
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 38533698dc14e739eefb22cf66c048e3c9264313
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 24 17:18:45 2010 +0000
ASoC: Make SMDK WM8580 driver unloadable
Supply a module exit function so that the driver can be unloaded.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit b26bb71f610f9b346203bff407e4278d98f9fe80
Author: Axel Lin <axel.lin@gmail.com>
Date: Thu Nov 25 15:11:45 2010 +0800
ASoC: smdk_wm9713: fix resource leak in smdk_init error path
Fix the error path to properly free allocated resources.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f
Author: Axel Lin <axel.lin@gmail.com>
Date: Thu Nov 25 13:43:49 2010 +0800
ASoC: Fix compile error for smartq_wm8987.c
Fix below compile error:
CC sound/soc/samsung/smartq_wm8987.o
sound/soc/samsung/smartq_wm8987.c: In function 'smartq_hifi_hw_params':
sound/soc/samsung/smartq_wm8987.c:42: error: 'struct snd_soc_pcm_runtime' has no member named 'dai'
sound/soc/samsung/smartq_wm8987.c:43: error: 'struct snd_soc_pcm_runtime' has no member named 'dai'
sound/soc/samsung/smartq_wm8987.c: In function 'smartq_wm8987_init':
sound/soc/samsung/smartq_wm8987.c:192: warning: passing argument 1 of 'snd_soc_jack_new' from incompatible pointer type
sound/soc/samsung/smartq_wm8987.c: At top level:
sound/soc/samsung/smartq_wm8987.c:216: warning: initialization from incompatible pointer type
make[3]: *** [sound/soc/samsung/smartq_wm8987.o] Error 1
make[2]: *** [sound/soc/samsung] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 8ce28bfcf25527b228b8dff1d38480e3643a94d1
Author: Axel Lin <axel.lin@gmail.com>
Date: Thu Nov 25 16:50:56 2010 +0800
ASoC: neo1973_gta02_wm8753: fix wrong parameter for snd_soc_register_dai and snd_soc_unregister_dai
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit e5843341e3ad8ff00332376cd0745026e4b5d45f
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed Nov 24 09:48:10 2010 +0000
dma: shdma: add a MODULE_ALIAS() to allow module autoloading
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 696d6e178a95d95dbb222d89e5e91a6fa9911440
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit df73af86b6e737f357aae85e0b5e621516117780
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit a782d688e9c6f9ca9a7a9a28e8e2876969ddef53
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit e47bf32aa8de06ec72e18b4fbbd880caeedb0088
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 6d11dc14e608d637b09277c7b499f2f46b29cc35
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit aa0787a90c70587db6934547bb7687efc30062c7
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 7a1390f6c1e89bdc556709485ceb66c9a1d7f7e3
Author: Jan Kara <jack@suse.cz>
Date: Thu Nov 25 03:56:24 2010 +0100
udf: Fix directory corruption after extent merging
If udf_bread() called from udf_add_entry() managed to merge created extent to
an already existing one (or if previous extents could be merged), the code
truncating the last extent to proper size would just overwrite the freshly
allocated extent with an extent that used to be in that place. This obviously
results in a directory corruption. Fix the problem by properly reloading the
last extent.
Signed-off-by: Jan Kara <jack@suse.cz>
commit eadbb02fdc8ec3811c2ea5347b89e1a4aeccfa75
Author: Jan Kara <jack@suse.cz>
Date: Tue Nov 16 14:33:48 2010 +0100
udf: Protect udf_file_aio_write from possible races
Code doing conversion from INICB file to a normal file in udf_file_aio_write()
is not protected by any lock from other code modifying the inode. Use
i_alloc_sem for that.
Reported-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 89b123bb35bc81005554fb4bd53ae0c5981e2dbf
Author: Alessio Igor Bogani <abogani@texware.it>
Date: Tue Nov 16 18:40:49 2010 +0100
udf: Remove unnecessary bkl usages
The udf_readdir(), udf_lookup(), udf_create(), udf_mknod(), udf_mkdir(),
udf_rmdir(), udf_link(), udf_get_parent() and udf_unlink() seems already
adequately protected by i_mutex held by VFS invoking calls. The udf_rename()
instead should be already protected by lock_rename again by VFS. The
udf_ioctl(), udf_fill_super() and udf_evict_inode() don't requires any further
protection.
This work was supported by a hardware donation from the CE Linux Forum.
Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 2f9406c149792477756bb4276298b5ea28bfd1a2
Author: Alessio Igor Bogani <abogani@texware.it>
Date: Tue Nov 16 18:40:48 2010 +0100
udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
This work was supported by a hardware donation from the CE Linux Forum.
Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 8b00649797061b5d8d249909290e874622286a2d
Author: Alessio Igor Bogani <abogani@texware.it>
Date: Tue Nov 16 18:40:47 2010 +0100
udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
Replace bkl with the UDF_I(inode)->i_data_sem rw semaphore in
udf_release_file(), udf_symlink(), udf_symlink_filler(), udf_get_block(),
udf_block_map(), and udf_setattr(). The rule now is that any operation
on regular file's or symlink's extents (or generally allocation information
including goal block) needs to hold i_data_sem.
This work was supported by a hardware donation from the CE Linux Forum.
Signed-off-by: Alessio Igor Bogani <abogani@texware.it>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 628841fb42154ba76d893cfd9604c020e466e9d7
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 23:24:12 2010 +0200
udf: Remove BKL from free space counting functions
udf_count_free_bitmap() does not need BKL because bitmaps are in a fixed
place on disk and so we can count set bits without serialization.
udf_count_free_table() is now protected by s_alloc_mutex instead of BKL
to get a consistent view of free space extents.
Signed-off-by: Jan Kara <jack@suse.cz>
commit d0d87fec5abd5074a47c00a06bccf51b83a15f21
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 22:32:02 2010 +0200
udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
There's no need to call udf_add_free_space() for one block at a time. It saves
us noticeable amount of work and yields different result from the original
code only if the filesystem is corrupted and bitmap bit is already cleared.
In such case counter of free blocks is probably wrong anyways so the change
does not matter.
Signed-off-by: Jan Kara <jack@suse.cz>
commit 83e707a894a3a6e9ed01ffb95e3b2f93129dddbe
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 22:22:57 2010 +0200
udf: Remove BKL from udf_put_super() and udf_remount_fs()
udf_put_super() does not need BKL because the filesystem is shut down so
there's nothing to race with. The credential changes in udf_remount_fs()
and LVID changes are now protected by dedicated locks so we can remove BKL
from this function as well.
Signed-off-by: Jan Kara <jack@suse.cz>
commit 3c1ee78c3e46250c7073c139f3f4a4da12544949
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 22:17:28 2010 +0200
udf: Protect default inode credentials by rwlock
Superblock carries credentials (uid, gid, etc.) which are used as default
values in __udf_read_inode() when media does not provide these. These
credentials can change during remount so we protect them by a rwlock so that
each inode gets a consistent set of credentials.
Signed-off-by: Jan Kara <jack@suse.cz>
commit ebde4a31a178419ec0a606eb84660452092f0e12
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 18:49:20 2010 +0200
udf: Protect all modifications of LVID with s_alloc_mutex
udf_open_lvid() and udf_close_lvid() were modifying LVID without
s_alloc_mutex. Since they can be called from remount, the modification
could race with other filesystem modifications of LVID so protect them
by s_alloc_mutex just to be sure.
Signed-off-by: Jan Kara <jack@suse.cz>
commit c9d2875c70188efc09a5b627be612a6296bf6afc
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 18:28:46 2010 +0200
udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
uniqueID handling has been duplicated in three places. Move it into a common
helper. Since we modify an LVID buffer with uniqueID update, we take
sbi->s_alloc_mutex to protect agaist other modifications of the structure.
Signed-off-by: Jan Kara <jack@suse.cz>
commit b9392d22c7300c63f59c801dafbb9ac9a0af1ae5
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 17:42:44 2010 +0200
udf: Remove BKL from udf_update_inode
udf_update_inode() does not need BKL since on-disk inode modifications are
protected by the buffer lock and reading of values of in-memory inode is
safe without any lock. In some cases we can write inconsistent inode state
to disk but in that case inode will be marked dirty and overwritten later.
Also make unnecessarily global udf_sync_inode() static.
Signed-off-by: Jan Kara <jack@suse.cz>
commit 5592f6c1d18de9fb02d828d2820d16bf9c3621e4
Author: Jan Kara <jack@suse.cz>
Date: Wed Oct 20 17:25:59 2010 +0200
udf: Convert UDF_SB(sb)->s_flags to use bitops
Use atomic bitops to manipulate with sb flags to make manipulation safe
without any locking.
Signed-off-by: Jan Kara <jack@suse.cz>
commit dad4b510eec547fee48661d0af1d2d1c579be335
Author: Joe Perches <joe@perches.com>
Date: Wed Nov 10 15:46:18 2010 -0800
fs/udf: Add printf format/argument verification
Add __attribute__((format... to udf_warning.
All arguments matched formats, no other changes necessary.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 5cba0fcde5e84fc87446cf501d69e3d0da468633
Author: Joe Perches <joe@perches.com>
Date: Thu Nov 4 20:08:04 2010 -0700
fs/udf: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jan Kara <jack@suse.cz>
commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 638514ff5d5845c6eba8c266ea04325be6e7d106
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit d2eceef02e717751d4f6a01eddea6f241d63c213
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 55017ab87831b3ca449b81b83b180baac2895666
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit f9dc6467223319acaea64d95ff208409e4e48d07
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 6fb5511ab96d9f31be747bab842f96227a5c7aec
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 2e34034e8c9755ff144379d410d5227926e91cce
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 67158b67cea0c92dba1dda74cde926d149cc1a2e
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 4b7384f936817489a4172b9c5d946f63f479ca15
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Mon Nov 15 13:56:10 2010 -0800
iwlwifi: remove unused define
was not used, remove it
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 2862945bf5262d516583477ce420a2f122306f43
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 7489ffcea62e0b990d3557746d19a47e83e07042
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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] <asn:2>*membase
arch/arm/mach-omap1/board-ams-delta.c:319:36: got void *<noident>
Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit dba5e190fcbe2a76b1a867ec6cbe9d7009e43708
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit e6f168212243452eae7c0d0c20c2f6e213933fc8
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 706afddaf53522b67c81a0b1b38bdccd4d4ff00c
Author: Aaro Koskinen <aaro.koskinen@nokia.com>
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 <aaro.koskinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 4f8559383c41262b50dc758e2e310f257ce6a14d
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 64f121708342afec306ce52920cc9982f4f1008f
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 35162ba75900209755628ccf7357763797037ba6
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 1f37daf3233ccda5072f715d6c322d84833cdd92
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 97badb0eefc9b6f23f864c5348b695be35f05882
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 99ba2a14283be96a682e04455061c08a46bbf4ec
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c063dbf52b998b852122dff07a8b8dd430b38437
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 79b1c460a0b55e55981c25c56597c4d5d2872de3
Author: Bruno Randolf <br1@einfach.org>
Date: Wed Nov 24 14:34:41 2010 +0900
cfg80211: Add documentation for antenna ops
Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 48124d1a91fb77defc9734b4556350d59671fb2c
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <nbd@openwrt.org>
Cc: Matt Smith <matt.smith@atheros.com>
Cc: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c8b576061d87e2a4fb100e70c6a6dae189b3a310
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <matt.smith@atheros.com>
Cc: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 72a8a3edd630995662bdc85957206685f376f9c4
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4e5ff37692df35c8826f1291204841b174d3c3ce
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 46090979a55a0dc2cdb3d939f94fa47742108194
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7ccc8bd7593634d827e8bc55898a5038e29848b5
Author: Felix Fietkau <nbd@openwrt.org>
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 <sleffler@chromium.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c8a7972c3b3633bf90daf50b135665d8ca4838c4
Author: Felix Fietkau <nbd@openwrt.org>
Date: Fri Nov 19 22:55:37 2010 +0100
mac80211: restart beacon miss timer on system resume from suspend
Signed-off-by: Paul Stewart <pstew@google.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fee613b77df721781b9794945f0f1a8f535456ff
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Thu Nov 18 21:11:41 2010 +0100
b43: N-PHY: fix BPHY init
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bec186452b4cfecff9e2c579bfd4016119d39614
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Thu Nov 18 13:28:00 2010 +0100
b43: N-PHY: init BPHY when needed
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c0f05b9879a324937f14270e4a14d661d2beca63
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Thu Nov 18 13:27:58 2010 +0100
b43: N-PHY: minor fixes to match specs
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 69a3229edcf0c354e1cd93a811843fba7b6e1472
Author: Rafał Miłecki <zajec5@gmail.com>
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 <Larry.Finger@lwfinger.net>:
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d
Author: Joe Perches <joe@perches.com>
Date: Tue Nov 16 19:56:49 2010 -0800
net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes.
netdev_<level> output is different, arguably improved.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ccb14354017272ddac002e859a2711610b6af174
Author: John W. Linville <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f
Author: Tom Herbert <therbert@google.com>
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<n>/queues/tx-<n>/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 <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 3853b5841c01a3f492fe137afaad9c209e5162c6
Author: Tom Herbert <therbert@google.com>
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 <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 22f4fbd9bd283ef85126e511171932a4af703776
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bba14de98753cb6599a2dae0e520714b2153522d
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Wed Nov 24 02:38:17 2010 +0000
stmmac: update the driver version
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 874bd42d24c2a74f5dbd65e81e175982240fecd8
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
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 <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
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 <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce
Author: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
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 <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b340007f79941297c44a7dfba4d3c587ff81590f
Author: Vladislav Zolotarov <vladz@broadcom.com>
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 <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Reported-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1210d127d11fc40d229648c9754aa60776ef796
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed
Author: Matt Carlson <mcarlson@broadcom.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b92b9040f6e4997b895b7b9c655a158354d28964
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit deabaac8beeccdfee5358c0cd4c63258f28f3a74
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cf79003d598b1f82a4caa0564107283b4f560e14
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b75cc0e4c1caac63941d96a73b2214e8007b934b
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5093eedc8bdfd7d906836a44a248f66a99e27d22
Author: Matt Carlson <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 42078305f8a6b2ef0e8e6c55b4e3f3170ee51e50
Author: Colin King <colin.king@canonical.com>
Date: Fri Nov 19 15:40:02 2010 +0000
WMI: Cater for multiple events with same GUID
WMI data blocks can contain WMI events with the same GUID but with
different notifiy_ids, for example volume up/down hotkeys.
This patch enables a single event handler to be registered and
unregistered against all events with same GUID but different
notify_ids. Since an event handler is passed the notify_id of
an event it can can differentiate between the different events.
The patch also ensures we only register and unregister a device per
unique GUID.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 18a9cbb914c6fc5ddef8c1ef3f694a8add6421cd
Author: Zeng Zhaoming <zengzm.kernel@gmail.com>
Date: Fri Nov 19 00:46:19 2010 +0800
ACPI, hp-wmi: Fix memory leak in acpi query
Free acpi return memory after query.
Signed-off-by: Zeng Zhaoming <zengzm.kernel@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 11f64377110dc831912c981e1628c294b3a67426
Author: Anisse Astier <anisse@astier.eu>
Date: Thu Nov 18 13:00:54 2010 +0100
msi-wmi: fix semantically incorrect use of keycode instead of scancode
I didn't know the difference between the two when I wrote this code in
commit c30116c6f0d26cd6e46dfa578163d573ef4730b2.
Signed-off-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 0e901c2cdfdcdc5fb151398d8767480a10d6239c
Author: Anisse Astier <anisse@astier.eu>
Date: Thu Nov 18 13:00:53 2010 +0100
msi-wmi: Add mute key support
Add new MUTE key seen on Medion Akoya AIO PC P4010D using MSI motherboard
(Product Name: MS-7621)
Reported-and-tested-by: Mark Huijgen <mark.sf.net@huijgen.tk>
Signed-off-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit dc6079c1c5797f172648cc3ad4efa0bc4eeebc02
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 19:04:38 2010 -0800
drivers/platform/x86: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 030121d3fd1ec87cfe254b9623e7025aba707c2d
Author: Corentin Chary <corentincj@iksaif.net>
Date: Sun Nov 14 17:40:12 2010 +0100
asus-laptop: add wimax and wwan support
Asus UL30A has a 3G chip, but the radio is disabled by default.
The DSDT also reference a WIMAX device, which is not present on this model.
This patch adds two new files: wwan and wimax to control WWAN and
WIMAX devices. It does not use rfkill, because like WLED and BLED,
we don't know yet that the two ACPI functions will always control the
radio, they may control only the leds on some hardware.
We may add rfkill switchs later.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 519306107b58e9a0cd72edece945c97a256d2951
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Wed Nov 3 11:14:01 2010 -0700
eeepc-wmi: fix compiler warning
This fixes the following:
CC [M] drivers/platform/x86/eeepc-wmi.o
drivers/platform/x86/eeepc-wmi.c:322: warning: initialization from incompatible pointer type
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 196777254356450db7388ca397a1b374b66c6954
Author: Vernon Mauery <vernux@us.ibm.com>
Date: Tue Nov 2 13:08:11 2010 -0700
ibm_rtl: _RTL_ is not available in UEFI mode
Some of the IBM servers that are supported by ibm_rtl
can run in both Legacy mode (BIOS) and in UEFI mode.
When running in UEFI mode, it is possible that the
EBDA table exists but cannot be mapped and reports
errors. We need to make sure that by default we don't
try to probe the machines if they are running in UEFI
mode.
Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit d175b11ff7b548e20ec78b13e1e050d889a62415
Author: Vernon Mauery <vernux@us.ibm.com>
Date: Tue Nov 2 13:08:10 2010 -0700
ibm_rtl: Loosen the DMI criteria to all IBM machines
Allow all IBM machines to pass the DMI check so that we
don't have to add them one by one to the driver. Any IBM
machine that has the _RTL_ table in the EBDA will work.
Signed-off-by: Vernon Mauery <vernux@us.ibm.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 3f6144b571f2f3131ebe67b02065dadbe0cab6fc
Author: Julia Lawall <julia@diku.dk>
Date: Tue Oct 26 12:25:37 2010 +0200
drivers/platform/x86/thinkpad_acpi.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/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit c876cdfcb0f036ea2d92ec347ba91fc0c4cbf148
Author: Chris Bagwell <chris@cnpbagwell.com>
Date: Mon Oct 25 21:08:39 2010 -0500
eeepc-wmi: add cpufv sysfs documentation
Based on cpufv text from sysfs-platform-eeepc-laptop that
has almost same behavior.
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Corentin Chary <corentincj@iksaif.net>
commit 9c447204ce9c321204101a7fe4e83311885a6ffe
Author: Jon Dowland <jmtd@debian.org>
Date: Wed Oct 27 00:24:59 2010 +0100
toshiba_acpi.c: Add key_entry for a lone FN keypress
A lone FN key press on a Toshiba Portégé R700 without another key in
conjunction results in an ACPI event and a spurious error message on
the console.
Add a key entry to map this event to a KEY_FN keypress. This prevents
the console message.
Signed-off-by: Jon Dowland <jmtd@debian.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 6ac827e00b3ff15f6bfba3b17883df370453ff0c
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri Oct 22 16:18:47 2010 -0700
ibm_rtl: fix printk format warning
Fix printk format warning:
drivers/platform/x86/ibm_rtl.c:305:warning: format '%#llx' expects type 'long long unsigned int', but argument 2 has type 'phys_addr_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Keith Mannthey <kmannth@us.ibm.com>
Cc: Vernon Mauery <vernux@us.ibm.com>
Cc: platform-driver-x86@vger.kernel.org
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 9726c95cd9743e0f4889637e194901f733ed9ce3
Author: Sreedhara DS <sreedhara.ds@intel.com>
Date: Fri Oct 22 15:43:55 2010 +0100
intel_scu_ipc: Utility driver for intel scu ipc
This driver implements ioctl and interfaces with intel scu ipc driver. It
is used to access pmic/msic registers from user space and firmware update
utility.
Signed-off-by: Sreedhara DS <sreedhara.ds@intel.com>
[Extensive clean up and debug]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
commit 2a9ae13a2641373d06e24f866c7427644c39bfea
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Nov 23 19:31:18 2010 +0000
ASoC: Add initial WM8737 driver
The WM8737 is a low power, flexible stereo ADC designed for portable
applications. This driver supports most of the functionality of the
WM8737, though some features such as the ALC are not yet implemented.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b66ff7a2cd411a2245c984793a7eb98ee91771f9
Author: Dinh Nguyen <Dinh.Nguyen@freescale.com>
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 <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit c0abefd30b2c9db015df4914a95d268ecdb39b00
Author: Dinh Nguyen <Dinh.Nguyen@freescale.com>
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 <Dinh.Nguyen@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 374daa4f9019f75da1addb3f31a22df1966a5baa
Author: Fabio Estevam <fabioestevam@yahoo.com>
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 <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 76586d35eb31192bf3f395c2e02cef8a57e3558c
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit 92fcdc9d1054a630f224657dc675e03bf3bb62ed
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit 8bffb77e198df83224a6a258291bd41c05ab84d1
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit ec4bb253fcc5c07519b5e701d2c87100aef0d2ba
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit c7259df3af03aee00985e9bb64fb2afa593f703f
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit 7608d7d2b4a146f560436f5b99b1b93d30049e4e
Author: Sascha Hauer <s.hauer@pengutronix.de>
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 <s.hauer@pengutronix.de>
commit db037126656fb75482c09fb8673d97a5b44bcbae
Author: Fabio Estevam <fabioestevam@yahoo.com>
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 <fabio.estevam@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Tested-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit c2932bf47001697fc48e89f1d136532703ed4779
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit c6e34a4cbe8d4e126c3f603d11cce6979952cbb1
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 0dea1c74642fb46cb94282719dafe7c2a7d3068f
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit fcbd0c5f20918c6db0c72d4e7546880833713f9c
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 9d2c0ef76f429c038de27e1b734d65a67dbc8088
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 82df68ad26c1cb4c31e1a2750c0020038dd77cc6
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit a96eb148c74a09bc872b1490141d98811a3c7dbd
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 0a7d48712f9a279464d2587e52e60fdc81f9a65a
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit db9d42348f6f5b37ae658a506bf80fa935dc1b0a
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit f1dd361b679977d449b7d10ddc9b5fcdfa8c0ca9
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
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 <arnaud.patard@rtp-net.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit bd02a9e5eee6335f23f1fff52a1e5c8e1783c49e
Author: Fabio Estevam <fabioestevam@yahoo.com>
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 <fabio.estevam@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9
Author: Lothar Waßmann <LW@KARO-electronics.de>
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 <LW@KARO-electronics.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
commit 4939c1a1e052291e6df220c0c68d452fd5e6a87f
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Oct 27 10:06:32 2010 -0400
Blackfin: bf561: update one more SIC_SYSCR rename
Looks like I missed a spot when renaming the SICA macros.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit f31e7e4cc4d4f25bcca12c516e42942117c6047f
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Oct 27 00:08:46 2010 -0400
Blackfin: drop asm/irq.h include from mach headers
These were only included because of the irq handling of the PLL funcs,
and those PLL funcs have been moved out into their own header now.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit c2d6d371ab2767527ef8f465ebd5be8e2c70a1a0
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 23:56:12 2010 -0400
Blackfin: bf51x/bf52x: drop redundant "base" def/cdef header
The defBF512.h header exists only to include defBF51x_base.h, and it is
the only place where defBF51x_base.h is included. So move the contents
of the defBF51x_base.h header into the defBF512.h header.
Same situation for the other def/cdef pairs.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit e2e4c863ec7dd7295b641e815e5f2bc707a5965e
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 23:46:22 2010 -0400
Blackfin: clean up mach header includes
The main asm/blackfin.h header will pull in mach/blackfin.h to get
all the fun Blackfin defines. So having any of the sub-mach headers
trying to include asm/blackfin.h makes no sense -- punt it.
The mach/blackfin.h header takes care of including the part-specific
def headers which in turn will include any other needed def file.
Similarly, it takes care of pulling in the part-specific cdef header.
So move this logic out of the blackfin.h when necessary.
Further, make sure the cdef headers do not waste time including the
def headers again.
Since all parts need the common def/cdef headers, move this logic
out of the part-specific headers and into the mach/blackfin.h file.
Finally, we need to split the BF539 def header since the BF538 does
not have MXVR and we don't want to expose those MMRs.
So now all parts should have the same behavior:
mach/blackfin.h
asm/def_LPBlackfin.h
part-specific def.h
if ! asm
asm/cdef_LPBlackfin.h
part-specific cdef.h
And the sub def/cdef headers only tail into what they need.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit f07b47341d176c85c3cd1df03b2c94801ed1cd40
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 22:55:28 2010 -0400
Blackfin: bf533: merge fio_flag back into normal mach headers
We don't want the BF533 to be different in terms of its MMR headers, so
merge the FIO_FLAG helpers back into the normal place. To avoid circular
dependencies with headers, turn the inline C funcs into CPP defines. Not
like there will be any code size differences.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit d58f0967377b3cf33c4412a76a2c78c7b129c00c
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 21:40:31 2010 -0400
Blackfin: bf561-ezkit: add SMP defconfig
Since the SMP code paths tend to compile fail a lot, start a SMP defconfig
so our nightly build tools will automatically test it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 8116f362b98014993584e2c4600a2d2f02323be3
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 21:30:29 2010 -0400
Blackfin: bf533: convert boards to gpio framework
We don't want people banging on MMRs directly. As for the ip0x board,
it shouldn't need to muck with the CS pin directly as the Blackfin SPI
bus master driver takes care of driving this.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 0b916c49fce9a94d3af047cc5592d22278899c60
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Oct 25 21:11:10 2010 -0400
Blackfin: push gpio (port) defines into common headers
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit dc01aba08aa1964bd00ffd193914e86b00034fdd
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Oct 25 21:10:43 2010 -0400
Blackfin: bf54x: drop unused legacy MMR names
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 12a3c899bcb14526299f8746a7822102f6fb0a44
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Oct 25 18:11:09 2010 +0000
Blackfin: dma: constify MMR pointer array
The array of pointers is never written, so constify it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 1ea3c4a1cc9d29695ed020f80158586267f49ac6
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Oct 25 08:04:44 2010 +0000
Blackfin: standardize DMAC traffic control MMRs & MDMA MMRs
Use the same naming convention for DMA traffic MMRs (most were legacy
anyways) so we can avoid useless ifdef trees.
Same goes for MDMA names -- this actually allows us to undo a bunch of
ifdef redirects that existed for this purpose alone.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit d0cdbc24edee4c35715dc2bfda634ecfcc6dedb1
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Oct 25 08:02:30 2010 +0000
Blackfin: bfin_dma.h: start a header for DMA MMR layout
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit c4970ebbf8835a37b60345965bd1871187dbf72e
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Feb 16 04:03:18 2010 -0500
Blackfin: switch to asm-generic/io.h
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 2f2b9bc297280f571725b5ff43f97180364cbcc6
Author: Mike Frysinger <vapier@gentoo.org>
Date: Tue Oct 26 21:52:59 2010 -0400
asm-generic/io.h: add reads[bwl]/writes[bwl] helpers
A bunch of arches define reads[bwl]/writes[bwl] helpers for accessing
memory mapped registers. Since the Blackfin ones aren't specific to
Blackfin code, move them to the common asm-generic/io.h for people.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 2aff7be03910f6cda25881995cbbedad99133701
Author: Mike Frysinger <vapier@gentoo.org>
Date: Mon Sep 28 03:16:01 2009 +0000
Blackfin: bfin_serial.h: unify heavily duplicated serial code
Each Blackfin port has been duplicating UART structures and defines when
there really is no need for it. So start a new bfin_serial.h header to
unify all these pieces and give ourselves a fresh start.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 0791bb2ed2cb389f28c42690dcc0c22fcb974b34
Author: Mike Frysinger <vapier@gentoo.org>
Date: Thu Oct 28 15:43:50 2010 -0400
net/irda: bfin_sir: pull in serial headers for defines
We're in the process of cleaning up the global Blackfin namespace, so the
bfin_sir driver needs to pull in the serial header explicitly now.
Note: needs a little tweaking ...
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit 2e8a394c8f3aa4964e87c8ba562d468af653dd05
Author: Bob Liu <lliubbo@gmail.com>
Date: Fri Sep 17 11:09:57 2010 +0000
Blackfin: musb-boards: push clkin value to platform resources
In order to not touch the driver file for different xtal usage,
push the clkin value to board file and calculate the register
value instead of hardcoding it.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
commit fd34f85832550d419e8b70f284ad545cdde0664f
Author: Paul Mundt <lethal@linux-sh.org>
Date: Wed Nov 24 15:22:09 2010 +0900
mailmap: Fix up Takashi YOSHII's attribution.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit aae0f73604ff4bf65d0e4f5d4a10f214a6c98282
Author: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Wed Nov 24 05:03:33 2010 +0000
ARM: mach-shmobile: ag5evm: remove unused define
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 8e67b22a13e53335657b595bc4e4c01a559f8845
Author: Yoshii Takashi <takashi.yoshii.zj@renesas.com>
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 <takashi.yoshii.zj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit b028f94b76319e1b86103b767ca1c22546a5e7e7
Author: Yoshii Takashi <takashi.yoshii.zj@renesas.com>
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 <takashi.yoshii.zj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 2d22d486601b2eaedd1c8dd5dc1c4602cab896ef
Author: Yoshii Takashi <takashi.yoshii.zj@renesas.com>
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 <takashi.yoshii.zj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 03cfe6f57dc5c13ccdd235c23c80e3fa170f03d1
Author: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue Nov 23 17:43:19 2010 +0100
ALSA: support module on-demand loading for seq and timer
If CONFIG_SND_DYNAMIC_MINORS is used, assign /dev/snd/seq and
/dev/snd/timer the usual static minors, and export specific
module aliases to generate udev module on-demand loading
instructions:
$ cat /lib/modules/2.6.33.4-smp/modules.devname
# Device nodes to trigger on-demand module loading.
microcode cpu/microcode c10:184
fuse fuse c10:229
ppp_generic ppp c108:0
tun net/tun c10:200
uinput uinput c10:223
dm_mod mapper/control c10:236
snd_timer snd/timer c116:33
snd_seq snd/seq c116:1
The last two lines instruct udev to create device nodes, even
when the modules are not loaded at that time.
As soon as userspace accesses any of these nodes, the in-kernel
module-loader will load the module, and the device can be used.
The header file minor calculation needed to be simplified to
make __stringify() (supports only two indirections) in
the MODULE_ALIAS macro work.
This is part of systemd's effort to get rid of unconditional
module load instructions and needless init scripts.
Cc: Lennart Poettering <lennart@poettering.net>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 62bfdfa1de1361b2fb8201c72def1bbca5e7a395
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 19:04:23 2010 -0800
[CPUFREQ] drivers/cpufreq: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Dave Jones <davej@redhat.com>
commit 948e1f8f08692e35255aea6e417dc62e347a63c7
Author: Dave Jones <davej@redhat.com>
Date: Tue Nov 23 21:29:31 2010 -0500
[CPUFREQ] Fix another notifier leak in powernow-k8.
Do the notifier registration later, so we don't have to worry
about freeing it if we fail the msr allocation.
Signed-off-by: Dave Jones <davej@redhat.com>
commit f7800d9e03c5be78c7dde3c040e8715f0cbbd918
Author: Neil Brown <neilb@suse.de>
Date: Wed Nov 24 11:28:01 2010 +1100
[CPUFREQ] Missing "unregister_cpu_notifier" in powernow-k8.c
It appears that when powernow-k8 finds that
No compatible ACPI _PSS objects found.
and suggests
Try again with latest BIOS.
it fails the module load, but does not unregister the cpu_notifier that was
registered in powernowk8_init
This ends up leaving freed memory on the cpu notifier list for some other
poor module (e.g. md/raid5) to come along and trip over.
The following might be a partial fix, but I suspect there is probably other
clean-up that is needed.
( https://bugzilla.novell.com/show_bug.cgi?id=655215 has full dmesg traces).
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Neil Brown <neilb@suse.de>
commit b8696d44f20b4a3d892002fad5b3b849a2e5b14a
Author: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Date: Tue Nov 9 13:25:22 2010 +0900
i2c-eg20t: add driver for Intel EG20T
I2C driver for Intel EG20T PCH
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Reviewed-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Qi Wang <qi.wang@intel.com>
[ben-linux@fluff.org: reworded commit message]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3
Author: Eric Paris <eparis@redhat.com>
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 <paul.moore@hp.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738
Author: Eric Paris <eparis@redhat.com>
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 <paul.moore@hp.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Reviewed-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f55e15be9146d74e3de3b0d137c59fcc8579f8c0
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit 61ff0d7bff314dc27aa6f3021955dc5bcae118b2
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit 18abaeaf1cfe32222fad90637134625e5d0bbfbe
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit 44dd296627f5914e1e5f99aacfce88302bef831b
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
commit c232d82568977bc1238257134b86e2125f5c2131
Author: Ben Gardiner <bengardiner@nanometrics.ca>
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 <bengardiner@nanometrics.ca>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit df24258d6c61a4bf0e2c3e75c97c3aeeeb70bf59
Author: Ben Gardiner <bengardiner@nanometrics.ca>
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 <bengardiner@nanometrics.ca>
CC: Sergei Shtylyov <sshtylyov@mvista.com>
CC: Nori, Sekhar <nsekhar@ti.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 7bf0776f2b65f28c9c6b1e7ce29e32453315decb
Author: Ben Gardiner <bengardiner@nanometrics.ca>
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:
[<c002c6ac>] (unwind_backtrace+0x0/0xf8) from [<c003b48c>] (warn_slowpath_common+0x4c/0x64)
[<c003b48c>] (warn_slowpath_common+0x4c/0x64) from [<c003b4c0>] (warn_slowpath_null+0x1c/0x24)
[<c003b4c0>] (warn_slowpath_null+0x1c/0x24) from [<c01aed60>] (__gpio_set_value+0x4c/0x5c)
[<c01aed60>] (__gpio_set_value+0x4c/0x5c) from [<c0033bd4>] (da850_evm_ui_expander_setup+0x1e4/0x2
44)
[<c0033bd4>] (da850_evm_ui_expander_setup+0x1e4/0x244) from [<c02e2e1c>] (pca953x_probe+0x1f8/0x29
0)
<snip>
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 <bengardiner@nanometrics.ca>
Reviewed-by: Chris Cordahi <christophercordahi@nanometrics.ca>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit c9dd116caf7fc9fbd84f57b4ae79735b8976ea43
Author: Nicolas Kaiser <nikai@nikai.net>
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 <nikai@nikai.net>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 234b75e6245f8b66d811c1c0a4572672bb09010a
Author: Nicolas Kaiser <nikai@nikai.net>
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 <nikai@nikai.net>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 99e6c55abff7fd5cb1642ca4d7cb2929eeaeeab5
Author: Cyril Chemparathy <cyril@ti.com>
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 <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 92bf453d022bf575915e4803e72dd837f2e0bc61
Author: Cyril Chemparathy <cyril@ti.com>
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 <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 6a25a09043af76df38393dc60b38f3b0f4a75f43
Author: Andreas Gaeer <Andreas.Gaer@baslerweb.com>
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 <Andreas.Gaer@baslerweb.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 5033f43c66754296dfb0ac5c895208e4a7f93aac
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:25 2010 +0900
ASoC: Samsung: Rename from s3c24xx to samsung
Finally, move the 's3c24xx' directory to 'samsung'
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit a964f34d8b516633d471191156963bae0d1bf730
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:22 2010 +0900
ASoC: Samsung: Generalize Kconfig symbols
Move prefixes to repesent the nature of Samsung ASoC suitably.
SND_S3C24XX_SOC -> ASOC_SAMSUNG
SND_S3C_SOC_PCM -> SND_SAMSUNG_PCM
SND_S3C_SOC_AC97 -> SND_SAMSUNG_AC97
SND_S5P_SOC_SPDIF -> SND_SAMSUNG_SPDIF
SND_S3C24XX_SOC_I2S -> SND_S3C24XX_I2S
SND_S3C64XX_SOC_SMARTQ -> ASOC_SMARTQ
SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF
SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580
SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713
SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b0f39c25a1bf6b4c81c183dfd0920e76f8e43488
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:19 2010 +0900
ASoC: SMDK_WM8580: Enable for SMDKC100
Enable the ASoC Machine driver to run on SMDKC100 as well.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit d98ce6cf0303dc8edc9fdc18f84e4d7dafbb61a2
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:16 2010 +0900
ASoC: SMDK64XX: Rename for other platforms
We plan to use the same ASoC Machine driver for most of
latest SMDK platforms. So rename the 64XX specific driver
to generic named.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 03e6a88897f923ae2608569e66afba4766e1abf7
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:13 2010 +0900
ASoC: S3C64XX: Remove obsoleted I2S drivers
Now that we have better I2S CPU drivers and no need for the old
ones, discard them.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 0fff21a86c1ada9e9eba0d11fb91797bf2c73d46
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:07 2010 +0900
ASoC: SMDK64XX: Move to use new I2S driver
Modify the smdk64xx_wm8580.c to use new i2s controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit fcd8c742b92d834dee804b2a394cc575dd3a4084
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:04 2010 +0900
ASoC: GONI: Move to use new I2S driver
Modify the goni_wm8994.c to use new i2s controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit b9493d6c3308b6bd0867d7175df03b111cda1afc
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:37:02 2010 +0900
ASoC: SMARTQ: Move to use new I2S driver
Modify the smartq_wm8987.c to use new i2s controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:59 2010 +0900
ASoC: Samsung: Add common I2S driver
The I2S controllers since S3C64XX are incremental revisions, with
a new feature added to the last one. The programming i/f doesn't
conflict between these revisions, so it is possible to have one
common driver that could manage various versions of I2S (v3, 4 & 5)
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 0068402c58d5f3e21b863de881508248f29b464f
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:54 2010 +0900
ASoC: Samsung: Rename s3c64xx I2S device
Since the I2S of S3C64XX and newer SoCs are incremental
versions of each other with changes managable in a single
driver, rename the 's3c64xx-iis' -> 'samsung-i2s'
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit c3f2028b5b15c6799d84b29a07fb92934b10a4d2
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:50 2010 +0900
ASoC: Samsung: Generalize DMA driver namespace
Remove S3C,s3c from static defines.
s3c_dma_ -> dma_
s3c24xx_runtime_ -> runtime_
s3c24xx_audio_ -> audio_
s3c_preallocate_ -> preallocate_
s3c24xx_soc_platform -> samsung_asoc_platform
s3c24xx_pcm_driver -> asoc_dma_driver
snd_s3c24xx_pcm_ -> samsung_asoc_
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 158a782843f9b0716c9fecf14a0563b07cf84da4
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:44 2010 +0900
ASoC: Samsung: Rename PCM driver
Rename Samsung PCM Controller driver
s3c-pcm.[c/h] -> pcm.[c/h]
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 99ce3a3f3748f39ab6447c246b675f182ee761da
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:03 2010 +0900
ASoC: Samsung: Rename AC97 driver
Rename Samsung AC97 driver
s3c-ac97.[c/h] -> ac97.[c/h]
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit e6104673d28823e33bfc3dfb046a117f2575c9a8
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:36:00 2010 +0900
ASoC: Samsung: Rename AC97 platform device
Call the AC97 controller devices found in S3C, S5P and newer
SoCs as 'samsung-ac97' rather than 's3c-ac97'.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 4b640cf309e517f1ea5ab308fc7b24352612f535
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:35:57 2010 +0900
ASoC: Samsung: Rename ASoC DMA driver
Rename Samsung ASoC DMA driver
s3c-dma.[c/h] -> dma.[c/h]
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 83e37b8e400ca51cc97946815b3055daacd92fa8
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:35:53 2010 +0900
ARM: Samsung: Define common audio-dma device
The ASoC uses common DMA driver for Audio devices. So it makes
sense to a common audio-dma device shared across all platforms.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 58bb4072132c54d832082cc6eac396a6db009cbd
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:35:50 2010 +0900
ASoC: Samsung: Rename DMA device
Some Samsung SoCs have a PCM(DSP) controller. So the name
s3c24xx-pcm-audio for DMA driver is not very appropraite.
This patch moves :-
s3c24xx-pcm-audio -> samsung-audio
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3a56d0ca72f8fc47240849b83acacd1c92283b99
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Mon Nov 22 15:35:36 2010 +0900
ASoC: Samsung: Remove redundant AQUILA driver
AQUILA and GONI are essentially the same h/w w.r.t ASoC.
They only differ by the fact that GONI has stereo speaker-out
whereas AQUILA has mono.
The difference can easily be handled in the same MACHINE driver
by making machine-specific runtime changes.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 34a2d313c51f47cae50ccb89f4196462665f2c48
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit e34947056076ca5467ee8256d2d9cbc594a79b37
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit b33b7921db14abcd10c30d0ccfc68e364f5ef7fe
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit eb29d66d4f2dc98a81ae590bbdddc8cfa8964d73
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 281469766bdde2d14bc73e1fec347e6dd7f63319
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit f02e26f8d90f8cde98314c72c2e890bc281a8346
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 7dc4f001123f9ebe3b010a6c26acd18698ad205f
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 358f26d52680cb150907302d4334359de7dd2d59
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 52399b171dfaea02b6944cd6feba49b624147126
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 3b5ce8ae31e3c66655207907527476bbd3e5063b
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 6d1bbfc4c0458c514126ccf7d6ce9232d9dbc872
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit 5bb6b1ea67a73f0665a41726dd7138977b992c6c
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 51a96c77815e7f139892a6e9c8275a50e9baebdf
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 2e01f4740a874b6085da6ebf541e7ffde9a72bf2
Author: Dhaval Giani <dhaval.giani@gmail.com>
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 <dhaval_giani@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290091494.1145.5.camel@gondor.retis>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 70caf8a6c13c2279b35f2ad6b644815533d6c476
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 28d0686cf7b14e30243096bd874d3f80591ed392
Author: Erik Gilling <konkers@android.com>
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 <konkers@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1290218934-8544-3-git-send-email-john.stultz@linaro.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 439bd6cde45d0bff4f97513b01b976b9f72ae1f0
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:31 2010 -0500
drm/radeon/kms: add Ontario APU ucode loading support
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 11fa1618e327af7f08085e134b3325de9caf7a94
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:37 2010 -0500
drm/radeon/kms: add Ontario Fusion APU pci ids
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bbbf9b7b02e0090d91c422398089c9f22361dc94
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:36 2010 -0500
drm/radeon/kms: enable MSIs on fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b0e664140a170382531a8c8b5396bf7e6903d5e3
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:35 2010 -0500
drm/radeon/kms: add power table parsing support for Ontario fusion APUs
The vbios power tables on my inagua board seem a bit funky...
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 560154e9a27f2f260fcb2dd18c488203246f257e
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:34 2010 -0500
drm/radeon/kms: refactor atombios power state fetching
The function was getting too large. Rework it to share
more state better handle new power table formats.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e719ebd916c2ecee072affc9e7f0b92aa33c2f94
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:33 2010 -0500
drm/radeon/kms: add bo blit support for Ontario fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit e33df25fecd31be889a878bc75313817bc292bac
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:32 2010 -0500
drm/radeon/kms: add thermal sensor support for fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d5e455e48b095df7f5381dff028f8523aaf565a9
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:29 2010 -0500
drm/radeon/kms: fill in GPU init for AMD Ontario Fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 958261d1e8755d1423beb0951ed0b9552c96f638
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:30 2010 -0500
drm/radeon/kms: add radeon_asic struct for AMD Ontario fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 180074010c6a8d1948638b4a136d2bd8111f4459
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:28 2010 -0500
drm/radeon/kms: evergreen.c updates for fusion
fusion chips only have 2 crtcs.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6eb18f8b6006b0e869a8484b1daaa63adce1b73e
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:27 2010 -0500
drm/radeon/kms: MC setup changes for fusion APUs
- CONFIG_MEMSIZE is in bytes on fusion.
- FB_BASE and FB_TOP are finer grained.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 0ef0c1f7349e782f6c79cb7e4bf8a4c3ce3371c6
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:26 2010 -0500
drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function
MC_VM_FB_LOCATION is at a different offset between r6xx and r7xx/evergreen.
The location is needed for vram setup on fusion chips.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4339c442c0736db42329b68602308e95bcc75a30
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:25 2010 -0500
drm/radeon/kms: add support for ss overrides on Fusion APUs
System specific spread spectrum overrides can be specified in
the integrated system info table for Fusion APUs. This adds
support for using those overrides.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bf982ebf22d5d84dd4a2a8d8f1a11f75920020a7
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:24 2010 -0500
drm/radeon/kms: Add support for external encoders on fusion APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 4e8c65a1f9ee1a976d95c1d5d2027761aba2f1c3
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:23 2010 -0500
drm/radeon/kms: atom changes for DCE4.1 devices
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2f062fda4f83932b87b3b6c903eeade43422245a
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:22 2010 -0500
drm/radeon/kms: add new family id for AMD Ontario APUs
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 603a9da37b83c2b4cc4495ecab7916f45cf5837e
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:21 2010 -0500
drm/radeon/kms: upstream power table updates
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 1422ef52efa2b9abcf8e9d4d641f3a12579f1027
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:20 2010 -0500
drm/radeon/kms: upstream atombios.h updates
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5d68e501bf000b8b1696875455c7a556ce2e9c43
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:19 2010 -0500
drm/radeon/kms: upstream ObjectID.h updates
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 9535ab7323351bacf02d82af79921df1d6594969
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Mon Nov 22 17:56:18 2010 -0500
drm/radeon/kms: setup mc chremap properly on r7xx/evergreen
Should improve performance slightly and possibly fix some
issues.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 02d2ebb2a0aa2cae0446289c8f927067aec06079
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7253965a1cfbd22dd20f92b7a054e831777e284e
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f4e16e41d62ddc75704a0344567a807ebb41a929
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ff273b91ff04e6f232234b70c45101074a0daa27
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3370a895454ad814d0fb5f50352cea4e51d7392f
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5653a63d85300dbed71b76ab7ada03808bdfb170
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8b22523b045858042c6700f556f840853de163ea
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4
Author: Joe Perches <joe@perches.com>
Date: Sat Nov 20 18:38:51 2010 -0800
ar9170: Use const
Mark an array const.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a9ab21133581580f6907abbc33fd3870e75dc935
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209
Author: Huang Weiyi <weiyi.huang@gmail.com>
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 <weiyi.huang@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sat Nov 20 03:08:46 2010 +0100
ath9k: fix recursive locking in the tx flush path
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Tested-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 33e808c383477e821163f133c2e3e671879c28b6
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Mon Nov 22 12:53:23 2010 -0800
Input: iforce - clean up Makefile
Use <module>-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 <dtor@mail.ru>
commit ebde50d5a49122c164f81958a03993e1c947c0b6
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <name>-y instead
of <name>-obj (which is deprecated) as it allows conditional inclusion
of modules in the list.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc
Author: Johannes Berg <johannes.berg@intel.com>
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 <randy.dunlap@oracle.com>
Tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 18890d4b89d8507ad09289f6f57a71591c7e9e83
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <johannes@sipsolutions.net>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b2e253cf300c5e33f49b7dd8b593bfc722177401
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <mark@moxienet.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Tested-by: Mark Mentovai <mark@moxienet.com>
Tested-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Tested-by: Mark Mentovai <mark@moxienet.com>
Tested-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Tested-by: Mark Mentovai <mark@moxienet.com>
Tested-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 31e99729ae66d8b74316547c40eed15172f14ea8
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Tested-by: Mark Mentovai <mark@moxienet.com>
Tested-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8ce469999552b0c3325350cd9b4be417f2bbfc23
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 176bfc44417544724e6df0831a7f576f4a56283d
Author: Daniel Walker <dwalker@codeaurora.org>
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 <dwalker@codeaurora.org>
commit 89c3dedf477da9c8d42d3a63d16875e52f74108b
Author: Daniel Walker <dwalker@codeaurora.org>
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 <dwalker@codeaurora.org>
commit 4878c55f4bdd4c2150bf63d5a99897f56423e916
Author: Gustavo F. Padovan <padovan@profusion.mobi>
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 <padovan@profusion.mobi>
commit 1db2983966c069ea589f98f48eca7c318c251428
Author: Gustavo F. Padovan <padovan@profusion.mobi>
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 <padovan@profusion.mobi>
commit 9d3b032992216856090c52a7246c6fc4a9066410
Author: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
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 <andrei.emeltchenko@nokia.com>
Acked-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 7a4fdc01fce9221b0c85d5ce6fbfeb712fb2dc3c
Author: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
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 <andrei.emeltchenko@nokia.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 1e84a45ac6f7cef7ccc6f6bdfbb3846cd4d33b42
Author: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
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] [<bf266be0>] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [<c02f2cc8>] (sock_sendmsg+0xb8/0xd8)
[ 694.537292] [<c02f2c10>] (sock_sendmsg+0x0/0xd8) from [<c02f3044>] (kernel_sendmsg+0x48/0x80)
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 4d9bbbcb975d7e2ceb67cdb8a76b40fba0e1fff9
Author: Vasiliy Kulikov <segooon@gmail.com>
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 <segooon@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit c16e0f31a417e7eff0a098a35bb97c34018d4dc3
Author: Vasiliy Kulikov <segooon@gmail.com>
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 <segooon@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 8ba6bfe56a15388cbd09523c7bfcdc719992599c
Author: Vasiliy Kulikov <segooon@gmail.com>
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 <segooon@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 995f9759d64bea5811698f5f6e1c9b8aee8b49cf
Author: Johan Hedberg <johan.hedberg@nokia.com>
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 <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit fe2ad53d13e7e850d73f109ab5e26475caff3911
Author: Johan Hedberg <johan.hedberg@nokia.com>
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 <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 4e9d04d8a6bd7b72b48d5e400fb928fee2ba2093
Author: Johan Hedberg <johan.hedberg@nokia.com>
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 <johan.hedberg@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 8933f90c777c5728822206a2313c9c1361f5274f
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Thu Oct 14 22:58:58 2010 +0200
b43: N-PHY: add 2056 radio channels tables
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c7b642911ea0fa9168425757752f094a1255209a
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Nov 22 08:34:07 2010 +0800
ASoC: Fix a memory leak in alc5623_i2c_probe error path
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3c87c879c64cda87a0a57e72b08c05969b4a0f3c
Author: Davide Rizzo <elpa.rizzo@gmail.com>
Date: Thu Nov 18 07:23:00 2010 -0800
hwmom: (lm95241) Rewrite to avoid using macros
Signed-off-by: Davide Rizzo <elpa.rizzo@gmail.com>
[guenter.roeck@ericsson.com: Formatting changes]
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 3b54c54d50bf84e31b335e5ae5cf4480fd8eb652
Author: Guenter Roeck <guenter.roeck@ericsson.com>
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 <guenter.roeck@ericsson.com>
Acked-by: Henrik Rydberg <rydberg@euromail.se>
commit bd8fbe89ec3765e6acf52c9e4545675be4a137df
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 68c751c9a6e8e4ba513bc0aed94687282993372f
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 762fe187267334a882e6701707d6cd3de743e069
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 3d5c6f9257cca1468d268908ddd0837c68297b1f
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit c4ec41cefd08a6d056a43204519246c87ff2a81c
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 3ecf6090310a32a638a9d417af5ecd68b5fafe05
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 25159c5c7adc3edea916e64294072cf1f8d5994e
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 3f8fb22fd0b5d6d827cdff8e647f92685ac1b34b
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
[guenter.roeck@ericsson.com: Added value range check to key_at_index_store()]
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit cf5928ff27036730240b6851480dcf79b3ef69a9
Author: Joe Perches <joe@perches.com>
Date: Tue Nov 9 15:15:03 2010 +0000
hwmon: (applesmc) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit c60c39f0a99843dda83453dafd8e695d034b8b35
Author: Henrik Rydberg <rydberg@euromail.se>
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 <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 177cfe2e4ea214120376325000c39bce06a955ef
Author: Edgar Hucek <gimli@dark-green.com>
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 <gimli@dark-green.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit d634867df4d18e00d18d8e8544a8ef3f21074520
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:55 2010 +0000
hwmon: (w83627hf) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 41419f9468a0a2184a04cbbc12e16fdf0eb2aa21
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:54 2010 +0000
hwmon: (w83627ehf) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 7de74494d43e753282235e80e7ff9136709b953c
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:53 2010 +0000
hwmon: (vt8231) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 2bb3e3f5250e8485e112169b5ecd6931e4bdd6b9
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:52 2010 +0000
hwmon: (vt1211) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 0e8422fc80cac59e7942afd9ea60338adcb45ef6
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:51 2010 +0000
hwmon: (via686a) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 6add289bae01e89a937ad7189add2f848501cd1e
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:50 2010 +0000
hwmon: (via-cputemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 96a3e1091d047dfcd0672e9ca3e9e526549c86eb
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:49 2010 +0000
hwmon: (smsc47m1) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 992722e1dc9f39197942dc4db2f6f2491229df46
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:48 2010 +0000
hwmon: (smsc47b397) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 2fddaccc181896882264fbaa792a27375d80642e
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:47 2010 +0000
hwmon: (sis5595) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit a54035928a92df4c5ae443390784bf41bddcbd4d
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:46 2010 +0000
hwmon: (pkgtemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit cb8160901b489ee0c29952de69dd79ba812f4ea0
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:45 2010 +0000
hwmon: (pcf8591) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit cc5adc20efac43aaf2d6a6c808c6faaea8db0ceb
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:41 2010 +0000
hwmon: (lm70) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit a4fe6695ae7be64e457fb26265acbe0cc595488e
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:40 2010 +0000
hwmon: (lis3lv02d) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 1d4f6fec08f76d608e9d0598a0b2445af70efd03
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:38 2010 +0000
hwmon: (ibmaem) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 8544c079509bb6b948d51be28fc5448df091d3d1
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:37 2010 +0000
hwmon: (core) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 3e20b1397dea271eedd4c0d45701c41cb11b8f75
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:36 2010 +0000
hwmon: (hwmon-vid) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit c43bd5de85b91fed9e25b0799f5307f17018f363
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:35 2010 +0000
hwmon: (hp_accel) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit c70de622fab2577f01d03614ada940a1d70a8407
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:34 2010 +0000
hwmon: (f71882fg) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit afc9b7d5ab101ad83d6b987b9d8fdfb8ca839ad9
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:33 2010 +0000
hwmon: (f71805f) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 5cf4497883cce164330107f129a081a988ea576c
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:32 2010 +0000
hwmon: (dme1737) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 2e7c4ec0afb00cd9dcaddc82368d1c8fc14bdd60
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:31 2010 +0000
hwmon: (coretemp) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit bead276efd75b77e9634dfc4c66ef9f2debd5bb5
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:30 2010 +0000
hwmon: (asus_atk0110) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 7bca7cd836974bd888f2ce7a0f5a732a96da4212
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:29 2010 +0000
hwmon: (asb1000) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 79f36d8bfe317250e546371817f3d34c9b7bec57
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:27 2010 +0000
hwmon: (adt7470) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit 4516df690079742c8d269e2fae85e90bee3a165e
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:26 2010 +0000
hwmon: (abituguru3) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Added a few static strings to standardize logging messages.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit b932dbf026a55b7aa5575c1d6e8d4d74dab28bec
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 06:51:25 2010 +0000
hwmon: (abituguru) Use pr_fmt and pr_<level>
Added #define pr_fmt KBUILD_MODNAME ": " fmt
Converted printks to pr_<level>
Coalesced any long formats
Removed prefixes from formats
Added a few static strings to standardize logging messages.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
commit c89ad7372232b69fd37edf90d6f5d2a8d6381214
Author: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Mon Nov 1 19:08:50 2010 +0000
Bluetooth: Fix not returning proper error in SCO
Return 0 in that situation could lead to errors in the caller.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
commit 09910509ebc74643e94fe6f3feb4c23b019aeb34
Author: Glenn Sommer <gsommer@datanordisk.dk>
Date: Mon Nov 22 12:00:05 2010 -0800
Input: usbtouchscreen - add support for LG Flatron T1710B
I've recently got my hands on a LG Flatron T1710B touchscreen.
As other LG products, this seems to use the ITM panel.
Signed-off-by: Glenn Sommer <gsommer@datanordisk.dk>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit f45b98893f24671ff476ae3751c8535f0ab89f19
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 22 16:50:51 2010 -0200
[media] Fix parameter description for disable_ir
It seems that a wrong cut-and-paste error were done here.
Reported-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 7659cb0ad0b5dd4f758d6b3828f1fd29fa131a41
Author: Mariusz Białończyk <manio@skyboo.net>
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 <manio@skyboo.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 794bf99d14e26d02b71678a2fa261df5db3f8355
Author: Dan Carpenter <error27@gmail.com>
Date: Wed Nov 17 02:20:15 2010 -0300
[media] lirc_dev: fixes in lirc_dev_fop_read()
This makes several changes but they're in one function and sort of
related:
"buf" was leaked on error. The leak if we try to read an invalid
length is the main concern because it could be triggered over and
over.
If the copy_to_user() failed, then the original code returned the
number of bytes remaining. read() is supposed to be the opposite way,
where we return the number of bytes copied. I changed it to just return
-EFAULT on errors.
Also I changed the debug output from "-EFAULT" to just "<fail>" because
it isn't -EFAULT necessarily. And since we go though that path if the
length is invalid now, there was another debug print that I removed.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 485e0d0baea2394fe4f59df6ef62e25ae47e9fea
Author: Dan Carpenter <error27@gmail.com>
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] *<noident> )( ... )
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 57efde1c9df0535a5e8acf342cffcf17fcc38da3
Author: Dan Carpenter <error27@gmail.com>
Date: Wed Nov 17 02:12:23 2010 -0300
[media] lirc_dev: stray unlock in lirc_dev_fop_poll()
We shouldn't unlock here. I think this was a cut and paste error.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 395ae90d2e80f602fe07761db5cea9796f5dc395
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ed6ff10ea4e8748adad312c758ff12099cec6930
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 67c0671e4a2a79cc786f4b2331d87b3afbc1596d
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit f65d8f1e39fe0a40e1ecfe17eb613aa7cddc63b7
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0bcbeff202d49eb6d758112519dd88cf128f6513
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 29e66ff392d09cdd39b07139f97982ecb7a602ae
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6b73c409a647224a0866bf582fe2be9b0cb1e5ff
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d633f886cabea29d51014477d3c7c325042fafff
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2ba436f097dfefb65db76f68f4ea944ac45a0f46
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 49696bcefc9f39a55eda3536652ef459806f53f9
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit eb06acdc85585f28864261f28659157848762ee4
Author: Sridhar Samudrala <sri@us.ibm.com>
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 <sri@us.ibm.com>
-------------------------------------------------------------------------
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d17cd2074f98c857d14ae423a854a3259e5ab7c8
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Nov 22 14:22:37 2010 -0200
[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 <mchehab@redhat.com>
commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:28 2010 +0000
Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fdb26195f494988fc155c204aab0f0953ba7ec6f
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:27 2010 +0000
Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:26 2010 +0000
Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 094f2faaa2c4973e50979158f655a1d31a97ba98
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:25 2010 +0000
Net: rds: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-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 <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 927a41f50c83b539fde5c01911f4968d717199bf
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:24 2010 +0000
Net: phonet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 64387df8da1e4f178a47d53930288a46a357a479
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:23 2010 +0000
Net: lapb: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:22 2010 +0000
Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cd30c62024904951392e21a200fe5427a6286736
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:21 2010 +0000
Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:20 2010 +0000
Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:19 2010 +0000
Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:18 2010 +0000
Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cc0bdac399b1881626cd5512f292e396c9c96685
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:17 2010 +0000
Net: econet: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 22674a24b44ac53f244ef6edadd02021a270df5a
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:16 2010 +0000
Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:15 2010 +0000
Net: ceph: Makefile: remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bac14e017830bd204b3a1bd55f42b0841c02e995
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:14 2010 +0000
Net: can: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a3106d032fb17283c96fa041f8285e6926ae074d
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:13 2010 +0000
Net: caif: Makefile: Remove deprecated items
Changed Makefile to use <modules>-y instead of <modules>-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 <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 87217502d4f45a9925c5eda5b2179f1220e87537
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 21 15:03:12 2010 +0000
Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions
Changed Makefile to use <modules>-y instead of <modules>-objs
because -objs is deprecated and not mentioned in
Documentation/kbuild/makefiles.txt.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 68d069c45f73e8aeda0249891daec1f7e2f0e067
Author: Arik Nemtsov <arik@wizery.com>
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 <arik@wizery.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit fa97f46b30357a50f3ee193e6f82864f95bc55ec
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit b7417d930afdc214daa24299912d984e7f4f390a
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 91433029e42e58d8536299f32fa55cf589adff35
Author: Gery Kahn <geryk@ti.com>
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 <geryk@ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 00d201001bd4e8a46e3d03c970abcb72256c368b
Author: Shahar Levi <shahar_levi@ti.com>
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 <shahar_levi@ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 651b02233b5599e53732f282d87163e108456f34
Author: Jason Wessel <jason.wessel@windriver.com>
Date: Mon Nov 22 08:38:04 2010 -0600
kgdb,x86_64: fix compile warning found with sparse
Fix sparse warning:
arch/x86/kernel/kgdb.c:123:9: warning: switch with no cases
Reported-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
commit ae125a636a13c182ca56592ec25da6de5b02b96f
Author: Jovi Zhang <bookjovi@gmail.com>
Date: Wed Nov 10 07:22:18 2010 -0600
kdb: code cleanup to use macro instead of value
It's better to use macro KDB_BASE_CMD_MAX instead of 50
Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
commit ea73df32b0df5d168c3e7735b900e91e889c29be
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 19 12:07:44 2010 +0000
regulator: Fix prototype for MAX8998 buck set_voltage()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit bb3dbdcbd8e65234df2124d31fb2d8b9f3d7dc2e
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon Nov 22 13:51:19 2010 +0000
regulator: Remove regulator core version announcement
The version hasn't been updated since the regulator API was merged in
2.6.27 so just remove it - now we're in mainline the kernel version is
much more useful.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ea6dcdffa5d93ce12dfcb9b29aa92f57173ad534
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon Nov 22 13:51:18 2010 +0000
regulator: Fix obfuscated log messages
Don't use %s to format fixed static strings into log messages, it just
makes searching for and reading the message in the kernel source
needlessly hard.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 851cad5aa11a0692c4c92ebbfa94d06564034dcc
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Sun Nov 21 19:48:47 2010 +0200
ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h
There is no need anymore to include soc.h in soc-dapm.h and soc-dai.h as
drivers are converted to include only soc.h.
Thanks to Lars-Peter Clausen <lars@metafoo.de> for pointing out the issue.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 0d911baebf983931cb37e25b36c3371d9e4b5196
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Sun Nov 21 19:48:46 2010 +0200
ASoC: Do not include soc-dai.h
There is no need to include soc-dai.h since soc.h includes it. Convert
drivers to include only soc.h.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 505fb824e754efcc9702ce68d3911e7b86d3c690
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Sun Nov 21 19:48:45 2010 +0200
ASoC: Do not include soc-dapm.h
There is no need to include soc-dapm.h since soc.h includes it.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 1c8f2c4287bcc1eb596149b2b36be5c809598926
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Sun Nov 21 19:48:44 2010 +0200
ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c
Commit ce6120c require that soc-dapm.h cannot be included before soc.h but
these two drivers were not checked. Fix them by including only soc.h as it
includes soc-dapm.h.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 691513f70d3957939a318da970987b876c720861
Author: Lin Ming <ming.m.lin@intel.com>
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 <ming.m.lin@intel.com>
LKML-Reference: <1290410581.2405.24.camel@minggr.sh.intel.com>
Cc: Matthieu Castet <castet.matthieu@free.fr>
Cc: Siarhei Liakh <sliakh.lkml@gmail.com>
Cc: Xuxian Jiang <jiang@cs.ncsu.edu>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Andi Kleen <andi@firstfloor.org>
Tested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 9b4320b77bab4031649c484da1c595f39c2e43cd
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue Nov 9 14:29:05 2010 -0300
[media] Fix Kconfig errors due to two visible menus
Use the new visible Kconfig keyword to avoid producing error for two menus
that are visible only if Tuner/frontend customise options are enabled.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c38bd4ffc7f24a99a14f9c776276e816f5de2509
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 18:30:27 2010 -0300
i2c/algos: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 37e3273ee52fb995c1f531fa1d98d190cc35e1bc
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 18:30:26 2010 -0300
media/video: convert Kconfig to use the menu's `visible' keyword
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit dfc518dd6b5c5e00f98906eaa5c7d716d856c098
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 18:30:25 2010 -0300
Revert "i2c: Fix Kconfig dependencies"
This reverts commit 0a57274ea026c2b7670683947b6cc08b195148cf.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 09899c93b183870b122c94317f63344df43368e9
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 18:30:24 2010 -0300
kconfig: regen parser
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 86e187ff9bce9fbed7bfed92ae34f491cf1af50f
Author: Arnaud Lacombe <lacombar@gmail.com>
Date: Sat Nov 6 18:30:23 2010 -0300
kconfig: add an option to determine a menu's visibility
This option is aimed to add the possibility to control a menu's visibility
without adding dependency to the expression to all the submenu.
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9d57883f08d3c0c111b50bf185dfee9731a12c76
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Nov 22 13:29:19 2010 +0100
ALSA: hda - Add a generic fixup callback for Realtek codecs
Add a generic callback function for fixup elements. This can be used
to do some unusual things like overriding the AMP cache, etc.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 95a1e3f04839f00aebb8620151f4de2dadb84fe4
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <rmk+kernel@arm.linux.org.uk>
commit 07a8cdd2bb17a4da68136d963b8bc71959bd31a5
Author: Anand Gadiyar <gadiyar@ti.com>
Date: Thu Nov 18 18:54:17 2010 +0530
usb: musb: do not use dma for control transfers
The Inventra DMA engine used with the MUSB controller in many
SoCs cannot use DMA for control transfers on EP0, but can use
DMA for all other transfers.
The USB core maps urbs for DMA if hcd->self.uses_dma is true.
(hcd->self.uses_dma is true for MUSB as well).
Split the uses_dma flag into two - one that says if the
controller needs to use PIO for control transfers, and
another which says if the controller uses DMA (for all
other transfers).
Also, populate this flag for all MUSB by default.
(Tested on OMAP3 and OMAP4 boards, with EHCI and MUSB HCDs
simultaneously in use).
Signed-off-by: Maulik Mankad <x0082077@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
Cc: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
commit bb324b08165d5656d221af013ed9994a54e455be
Author: Ajay Kumar Gupta <ajay.gupta@ti.com>
Date: Mon Nov 22 14:22:41 2010 +0530
usb: musb: gadget: fix compilation warning
Fixes below compilation warning when musb driver is compiled for
PIO mode:
drivers/usb/musb/musb_gadget.c: In function 'musb_g_rx':
drivers/usb/musb/musb_gadget.c:840:
warning: label 'exit' defined but not used
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
commit e75df37165c639b06213ec88b4763c3e50a7f079
Author: Ming Lei <tom.leiming@gmail.com>
Date: Tue Nov 16 23:37:37 2010 +0800
usb: musb: clear RXCSR_AUTOCLEAR before PIO read
If RXCSR_AUTOCLEAR flag is not cleard before PIO reading, one packet
may be recieved by musb fifo, but no chance to notify
software, so cause packet loss, follows the detailed process:
- PIO read one packet
- musb fifo auto clear the MUSB_RXCSR_RXPKTRDY
- musb continue to recieve the next packet, and MUSB_RXCSR_RXPKTRDY
is set
- software clear the MUSB_RXCSR_RXPKTRDY, so there is no chance for
musb to notify software that the 2nd recieved packet.
The patch does fix the g_ether issue below:
- use fifo_mode 3 to enable double buffer
- 'ping -s 1024 IP_OF_BEAGLE_XM'
- one usb packet of 512 byte is lost, so ping failed,
which can be observed by wireshark
note:
Beagle xm takes musb rtl1.8 and may fallback to pio mode
for unaligned buffer.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
commit 92d2711f5dc15bf956546923a5718e74853f9912
Author: Hema Kalliguddi <hemahk@ti.com>
Date: Mon Nov 15 04:24:01 2010 -0600
usb: musb: unmap dma buffer when switching to PIO
Buffer is mapped to dma when dma channel is
allocated. If, for some reason, dma channel
programming fails, musb code will fallback
to PIO mode to transfer that request. In
that case, we need to unmap the buffer
back to CPU.
MUSB RTL1.8 and above cannot handle buffers
which are not 32bit aligned. That happens to
every request sent by g_ether gadget
driver. Since the buffer sent was unaligned,
we need to fallback to PIO.
Because of that, g_ether was failing due
to missing buffer unmapping.
With this patch and [1] g_ether works fine
with all MUSB revisions.
Verified with OMAP3630 board, which has
MUSB RTL1.8 using g_ether and g_zero.
[1] http://www.spinics.net/lists/linux-usb/msg38400.html
Signed-off-by: Hema HK <hemahk@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
commit 5449c236ed58215a74bda0eb8692494ff539fb03
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Nov 22 11:02:03 2010 +0100
Revert "ALSA: HDA: Create mixers on ALC887"
This reverts commit 03b7a1ab557efe34e8f79b78660e514bd7374248.
commit e61aabdb7608fd63d9705ab8bbf16f5145acead2
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Nov 22 08:58:13 2010 +0100
ALSA: atmel - Fix the return value in error path
In the commit 5ad57d20c91bdaf743bd8e3015df5a388314df8d
ALSA: snd-atmel-abdac: test wrong variable
the return value via PTR_ERR() had to be fixed as well.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 109fef9edcc100952eec980acbc2e1295627fbab
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Thu Nov 18 09:53:54 2010 +0100
ALSA: timer: automatically load the high-resolution timer
Increase the default timer limit so that snd-hrtimer.ko can be
automatically loaded when needed, e.g., when used as the default
sequencer timer. This replaces the check for the obsolete
CONFIG_SND_HPET.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 47228e48aecdbec423a1275a5e27697d47f1f912
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Thu Nov 18 09:53:07 2010 +0100
ALSA: pcm: optimize xrun detection in no-period-wakeup mode
Add a lightweight condition on top of the xrun checking so that we can
avoid the division when the application is calling the update function
often enough.
Suggested-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 59ff878ffb26bc0be812ca8295799164f413ae88
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Thu Nov 18 09:43:52 2010 +0100
ALSA: pcm: detect xruns in no-period-wakeup mode
When period wakeups are disabled, successive calls to the pointer update
function do not have a maximum allowed distance, so xruns cannot be
detected with the pointer value only.
To detect xruns, compare the actually elapsed time with the time that
should have theoretically elapsed since the last update. When the
hardware pointer has wrapped around due to an xrun, the actually elapsed
time will be too big by about hw_ptr_buffer_jiffies.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 075140ea8bf1405057c072a84ccf4e0d3f2c76f5
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Nov 15 10:50:37 2010 +0100
ALSA: oxygen: support for period wakeup disabling
Allow disabling period wakeup interrupts for all PCM streams.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 7bb8fb70c491bd6f5ec99728db8d1b5f43b95471
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Nov 15 10:49:47 2010 +0100
ALSA: hda-intel: support for period wakeup disabling
Allow disabling period wakeup interrupts for HDA PCM streams.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit ab69a4904b5dd4d7cd6996587ba066bca8d13838
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Mon Nov 15 10:46:23 2010 +0100
ALSA: pcm: support for period wakeup disabling
This patch allows to disable period interrupts which are
not needed when the application relies on a system timer
to wake-up and refill the ring buffer. The behavior of
the driver is left unchanged, and interrupts are only
disabled if the application requests this configuration.
The behavior in case of underruns is slightly different,
instead of being detected during the period interrupts the
underruns are detected when the application calls
snd_pcm_update_avail, which in turns forces a refresh of the
hw pointer and shows the buffer is empty.
More specifically this patch makes a lot of sense when
PulseAudio relies on timer-based scheduling to access audio
devices such as HDAudio or Intel SST. Disabling interrupts
removes two unwanted wake-ups due to period elapsed events
in low-power playback modes. It also simplifies PulseAudio
voice modules used for speech calls.
To quote Lennart "This patch looks very interesting and
desirable. This is something have long been waiting for."
Support for this in hardware drivers is optional.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@intel.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit a1d71a2c91239ecc1c1f9c97a081d71ebd30bfe5
Author: Daniel T Chen <crimsun@ubuntu.com>
Date: Sun Nov 21 14:01:14 2010 -0500
ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J
BugLink: https://launchpad.net/bugs/677652
The original reporter states that, in 2.6.35, headphones do not appear
to work, nor does inserting them mute the A52J's onboard speakers. Upon
inspecting the codec dump, it appears that the newly committed hp-laptop
quirk will suffice to enable this basic functionality. Testing was done
with an alsa-driver build from 2010-11-21.
Reported-and-tested-by: Joan Creus
Cc: <stable@kernel.org> [2.6.35+]
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 5ad57d20c91bdaf743bd8e3015df5a388314df8d
Author: Vasiliy Kulikov <segoon@openwall.com>
Date: Sun Nov 21 20:40:07 2010 +0300
ALSA: snd-atmel-abdac: test wrong variable
After clk_get() pclk is checked second time instead of sample_clk check.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 7974150c8524423f878e8269010e911c3cc7ddb8
Author: Andreas Mohr <andi@lisas.de>
Date: Sun Nov 21 12:09:32 2010 +0100
ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer
. Fix PulseAudio "ALSA driver bug" issue
(if we have two alternated areas within a 64k DMA buffer, then max
period size should obviously be 32k only).
Back references:
http://pulseaudio.org/wiki/AlsaIssues
http://fedoraproject.org/wiki/Features/GlitchFreeAudio
. In stop timer function, need to supply ACK in the timer control byte.
. Minor log output correction
When I did my first PA testing recently, the period size bug resulted
in quite precisely observeable half-period-based playback distortion.
PA-based operation is quite a bit more underrun-prone (despite its
zero-copy optimizations etc.) than raw ALSA with this rather spartan
sound hardware implementation on my puny Athlon.
Note that even with this patch, azt3328 still doesn't work for both
cases yet, PA tsched=0 and tsched
(on tsched=0 it will playback tiny fragments of periods, leading to tiny
stuttering sounds with some pauses in between, whereas with
timer-scheduled operation playback works fine - minus some quite increased
underrun trouble on PA vs. ALSA, that is).
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 86cbbad2b6712fbd25c07a17e86b4345cee82c6d
Author: Daniel T Chen <crimsun@ubuntu.com>
Date: Sat Nov 20 10:20:35 2010 -0500
ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup
BugLink: https://launchpad.net/bugs/677830
The original reporter states that the subwoofer does not mute when
inserting headphones. We need an entry for his machine's SSID in the
subwoofer pin fixup list, so add it there (verified using hda_analyzer).
Reported-and-tested-by: i-NoD
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 03b7a1ab557efe34e8f79b78660e514bd7374248
Author: David Henningsson <david.henningsson@canonical.com>
Date: Tue Nov 9 14:35:30 2010 +0100
ALSA: HDA: Create mixers on ALC887
BugLink: http://launchpad.net/bugs/669092
ALC887 does not have any volume control ability on the mixer NIDs,
so put the volume controls on the dac NIDs instead. Without this
patch, ALC887 users cannot use alsamixer at all.
Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit f09830ab15bfb7eb4e832e44189b5b5883309811
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit ebcc019926269e7e123d55ec92ff00c2688ca343
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 0e86eb29def648664c2c0fa605f5b5bad84247cb
Author: Axel Lin <axel.lin@gmail.com>
Date: Sun Nov 21 22:23:06 2010 -0800
Input: ps2mult - fix wrong kfree in ps2mult_connect error path
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 147666fb3b93b8c484f562da33a37f886ddff768
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:38:32 2010 +0000
drm/radeon: Use the ttm execbuf utilities
Rather than re-implementing in the Radeon driver,
Use the execbuf / cs / pushbuf utilities that comes with TTM.
This comes with an even greater benefit now that many spinlocks have been
optimized away...
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit eba67093f535322cb4f1c4b737319c0907a0c81d
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu Nov 11 09:41:57 2010 +0100
drm/ttm: Fix up io_mem_reserve / io_mem_free calling
This patch attempts to fix up shortcomings with the current calling
sequences.
1) There's a fastpath where no locking occurs and only io_mem_reserved is
called to obtain needed info for mapping. The fastpath is set per
memory type manager.
2) If the fastpath is disabled, io_mem_reserve and io_mem_free will be exactly
balanced and not called recursively for the same struct ttm_mem_reg.
3) Optionally the driver can choose to enable a per memory type manager LRU
eviction mechanism that, when io_mem_reserve returns -EAGAIN will attempt
to kill user-space mappings of memory in that manager to free up needed
resources
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 65705962025df490d13df59ec57c5329d1bd0a16
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:28:31 2010 +0000
drm/ttm/vmwgfx: Have TTM manage the validation sequence.
Rather than having the driver supply the validation sequence, leave that
responsibility to TTM. This saves some confusion and a function argument.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 95762c2b34069bf4adb7929969f1f5f5fc8a38df
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:28:30 2010 +0000
drm/ttm: Improved fencing of buffer object lists
Drastically reduce the number of spin lock / unlock operations by performing
unreserving and fencing under global locks.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jerome Glisse <j.glisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 702adba22433c175e8429a47760f35ca16caf1cd
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:28:29 2010 +0000
drm/ttm/radeon/nouveau: Kill the bo lock in favour of a bo device fence_lock
The bo lock used only to protect the bo sync object members, and since it
is a per bo lock, fencing a buffer list will see a lot of locks and unlocks.
Replace it with a per-device lock that protects the sync object members on
*all* bos. Reading and setting these members will always be very quick, so
the risc of heavy lock contention is microscopic. Note that waiting for
sync objects will always take place outside of this lock.
The bo device fence lock will eventually be replaced with a seqlock /
rcu mechanism so we can determine that a bo is idle under a
rcu / read seqlock.
However this change will allow us to batch fencing and unreserving of
buffers with a minimal amount of locking.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jerome Glisse <j.glisse@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 96726fe50feae74812a2ccf5d5da23cb01c0a413
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:28:28 2010 +0000
drm/ttm: Don't deadlock on recursive multi-bo reservations
Add an aid for the driver to detect deadlocks on multi-bo reservations
Update documentation.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jerome Glisse <j.glisse@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 68c4fa31aa52765314b4285a7835368ea35b509c
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Wed Nov 17 12:28:27 2010 +0000
drm/ttm: Optimize ttm_eu_backoff_reservation
Avoid the ttm_bo_unreserve() spinlocks by calling
ttm_eu_backoff_reservation_locked under the lru spinlock.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jerome Glisse <j.glisse@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 2357cbe5f4ca8a52329c2c2a26b68839870d5d43
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Nov 16 15:21:08 2010 +0100
drm/ttm: Use kref_sub instead of repeatedly calling kref_put
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ecf7ace9a8450303a987aa8364e53860cd50e554
Author: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue Nov 16 15:21:07 2010 +0100
kref: Add a kref_sub function
Makes it possible to optimize batched multiple unrefs.
Initial user will be drivers/gpu/ttm which accumulates unrefs to be
processed outside of atomic code.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d6ea88865d3e5b0c62040531310c1f2c6a994f46
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Nov 22 13:24:40 2010 +1000
drm/ttm: Add a bo list reserve fastpath (v2)
Makes it possible to reserve a list of buffer objects with a single
spin lock / unlock if there is no contention.
Should improve cpu usage on SMP kernels.
v2: Initialize private list members on reserve and don't call
ttm_bo_list_ref_sub() with zero put_count.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit b6724405bc67ef3ae1318002085cde382b12345f
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Nov 21 10:59:03 2010 -0500
drm/kms/radeon: Use high precision timestamps for pageflip completion events.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3e4ea7421f45966c93c8cbe81569e8dc93a58b87
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sun Nov 21 10:59:02 2010 -0500
drm/kms/radeon: Reorder vblank and pageflip interrupt handling.
In the vblank irq handler, calls to actual vblank handling,
or at least drm_handle_vblank(), need to happen before
calls to radeon_crtc_handle_flip().
Reason: The high precision pageflip timestamping
and some other pageflip optimizations will need the updated
vblank count and timestamps for the current vblank interval.
These are calculated in drm_handle_vblank(), therefore it
must go first.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6f34be50bd1bdd2ff3c955940e033a80d05f248a
Author: Alex Deucher <alexdeucher@gmail.com>
Date: Sun Nov 21 10:59:01 2010 -0500
drm/radeon/kms: add pageflip ioctl support (v3)
This adds support for dri2 pageflipping.
v2: precision updates from Mario Kleiner.
v3: Multihead fixes from Mario Kleiner; missing crtc offset
add note about update pending bit on pre-avivo chips
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f5a8020903932624cf020dc72455a10a3e005087
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sat Oct 23 04:42:17 2010 +0200
drm/kms/radeon: Add support for precise vblank timestamping.
This patch adds new functions for use by the drm core:
.get_vblank_timestamp() provides a precise timestamp
for the end of the most recent (or current) vblank
interval of a given crtc, as needed for the DRI2
implementation of the OML_sync_control extension.
It is a thin wrapper around the drm function
drm_calc_vbltimestamp_from_scanoutpos() which does
almost all the work and is shared across drivers.
.get_scanout_position() provides the current horizontal
and vertical video scanout position and "in vblank"
status of a given crtc, as needed by the drm for use by
drm_calc_vbltimestamp_from_scanoutpos().
The function is also used by the dynamic gpu reclocking
code to determine when it is safe to reclock inside vblank.
For that purpose radeon_pm_in_vbl() is modified to
accomodate a small change in the function prototype of
the radeon_get_crtc_scanoutpos() which is hooked up to
.get_scanout_position().
This code has been tested on AVIVO hardware, a RV530
(ATI Mobility Radeon X1600) in a Intel Core-2 Duo MacBookPro
and some R600 variant (FireGL V7600) in a single cpu
AMD Athlon 64 PC.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 27641c3f003e7f3b6585c01d8a788883603eb262
Author: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Date: Sat Oct 23 04:20:23 2010 +0200
drm/vblank: Add support for precise vblank timestamping.
The DRI2 swap & sync implementation needs precise
vblank counts and precise timestamps corresponding
to those vblank counts. For conformance to the OpenML
OML_sync_control extension specification the DRM
timestamp associated with a vblank count should
correspond to the start of video scanout of the first
scanline of the video frame following the vblank
interval for that vblank count.
Therefore we need to carry around precise timestamps
for vblanks. Currently the DRM and KMS drivers generate
timestamps ad-hoc via do_gettimeofday() in some
places. The resulting timestamps are sometimes not
very precise due to interrupt handling delays, they
don't conform to OML_sync_control and some are wrong,
as they aren't taken synchronized to the vblank.
This patch implements support inside the drm core
for precise and robust timestamping. It consists
of the following interrelated pieces.
1. Vblank timestamp caching:
A per-crtc ringbuffer stores the most recent vblank
timestamps corresponding to vblank counts.
The ringbuffer can be read out lock-free via the
accessor function:
struct timeval timestamp;
vblankcount = drm_vblank_count_and_time(dev, crtcid, ×tamp).
The function returns the current vblank count and
the corresponding timestamp for start of video
scanout following the vblank interval. It can be
used anywhere between enclosing drm_vblank_get(dev, crtcid)
and drm_vblank_put(dev,crtcid) statements. It is used
inside the drmWaitVblank ioctl and in the vblank event
queueing and handling. It should be used by kms drivers for
timestamping of bufferswap completion.
The timestamp ringbuffer is reinitialized each time
vblank irq's get reenabled in drm_vblank_get()/
drm_update_vblank_count(). It is invalidated when
vblank irq's get disabled.
The ringbuffer is updated inside drm_handle_vblank()
at each vblank irq.
2. Calculation of precise vblank timestamps:
drm_get_last_vbltimestamp() is used to compute the
timestamp for the end of the most recent vblank (if
inside active scanout), or the expected end of the
current vblank interval (if called inside a vblank
interval). The function calls into a new optional kms
driver entry point dev->driver->get_vblank_timestamp()
which is supposed to provide the precise timestamp.
If a kms driver doesn't implement the entry point or
if the call fails, a simple do_gettimeofday() timestamp
is returned as crude approximation of the true vblank time.
A new drm module parameter drm.timestamp_precision_usec
allows to disable high precision timestamps (if set to
zero) or to specify the maximum acceptable error in
the timestamps in microseconds.
Kms drivers could implement their get_vblank_timestamp()
function in a gpu specific way, as long as returned
timestamps conform to OML_sync_control, e.g., by use
of gpu specific hardware timestamps.
Optionally, kms drivers can simply wrap and use the new
utility function drm_calc_vbltimestamp_from_scanoutpos().
This function calls a new optional kms driver function
dev->driver->get_scanout_position() which returns the
current horizontal and vertical video scanout position
of the crtc. The scanout position together with the
drm_display_timing of the current video mode is used
to calculate elapsed time relative to start of active scanout
for the current video frame. This elapsed time is subtracted
from the current do_gettimeofday() time to get the timestamp
corresponding to start of video scanout. Currently
non-interlaced, non-doublescan video modes, with or
without panel scaling are handled correctly. Interlaced/
doublescan modes are tbd in a future patch.
3. Filtering of redundant vblank irq's and removal of
some race-conditions in the vblank irq enable/disable path:
Some gpu's (e.g., Radeon R500/R600) send spurious vblank
irq's outside the vblank if vblank irq's get reenabled.
These get detected by use of the vblank timestamps and
filtered out to avoid miscounting of vblanks.
Some race-conditions between the vblank irq enable/disable
functions, the vblank irq handler and the gpu itself (updating
its hardware vblank counter in the "wrong" moment) are
fixed inside vblank_disable_and_save() and
drm_update_vblank_count() by use of the vblank timestamps and
a new spinlock dev->vblank_time_lock.
The time until vblank irq disable is now configurable via
a new drm module parameter drm.vblankoffdelay to allow
experimentation with timeouts that are much shorter than
the current 5 seconds and should allow longer vblank off
periods for better power savings.
Followup patches will use these new functions to
implement precise timestamping for the intel and radeon
kms drivers.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit bbc9715061bf501e01f385d7b9b7e949ac3dd2f8
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 01:07:19 2010 +0100
ARM: 6481/1: Use shared GIC entry macros on OMAP
From: Tony Lindgren <tony@atomide.com>
Common GIC entry macro for omap
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 779db0ab774d4261bb39b27807bfe8c3ca9c6e2f
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 01:03:34 2010 +0100
ARM: 6480/1: Use shared GIC entry macros on Vexpress
From: Magnus Damm <damm@opensource.se>
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Versatile Express subarchitecture.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a2ba85ceecc77af40f4f5bfeb854a9400480fe91
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 01:02:06 2010 +0100
ARM: 6479/1: Use shared GIC entry macros on UX500
From: Magnus Damm <damm@opensource.se>
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the UX500 subarchitecture.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b79cbecb990906d3d6664b9e519512cf559e74b9
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 01:00:40 2010 +0100
ARM: 6478/1: Use shared GIC entry macros on Tegra
From: Magnus Damm <damm@opensource.se>
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Tegra subarchitecture.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7987043ca045003f878c85121b7c0abbcf630628
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 00:58:43 2010 +0100
ARM: 6477/1: Use shared GIC entry macros on Realview
From: Magnus Damm <damm@opensource.se>
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the Realview subarchitecture.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6434e62322642b8c297d98968746058ef63ed1c3
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 00:54:55 2010 +0100
ARM: 6476/1: Use shared GIC entry macros on CNS3XXX
From: Magnus Damm <damm@opensource.se>
Use the GIC demux code in asm/hardware/entry-macro-gic.S
on the CNS3XXX subarchitecture.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b845e8a1a810bdbdd02c027f7fcad9594c70f358
Author: Magnus Damm <magnus.damm@gmail.com>
Date: Tue Nov 16 00:48:07 2010 +0100
ARM: 6475/1: Introduce asm/hardware/entry-macro-gic.S
From: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Acked-by: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 551eaff1b384cc107eab6332ba8424b3ca1f304b
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f
Author: Jan Engelhardt <jengelh@medozas.de>
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 <jengelh@medozas.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4
Author: Don Skidmore <donald.c.skidmore@intel.com>
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 <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit dca25ebdd09c7aa877f00c2bdbd58c74a909c6f8
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date: Sun Nov 21 08:15:01 2010 -0500
Fix "forcably" comment typo
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 699bbe452950704ef52d5294def9275ddcbec31f
Author: Avi Kivity <avi@redhat.com>
Date: Wed Nov 17 15:28:22 2010 +0200
KVM: x86 emulator: do not perform address calculations on linear addresses
Linear addresses are supposed to already have segment checks performed on them;
if we play with these addresses the checks become invalid.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 8fa76a230d2fc19cf0c6f46bc97d7675f5fc8770
Author: Avi Kivity <avi@redhat.com>
Date: Wed Nov 17 15:28:21 2010 +0200
KVM: x86 emulator: preserve an operand's segment identity
Currently the x86 emulator converts the segment register associated with
an operand into a segment base which is added into the operand address.
This loss of information results in us not doing segment limit checks properly.
Replace struct operand's addr.mem field by a segmented_address structure
which holds both the effetive address and segment. This will allow us to
do the limit check at the point of access.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 70aa4f1918259184dcc4135c93bdbc57c61222e1
Author: Avi Kivity <avi@redhat.com>
Date: Wed Nov 17 13:40:51 2010 +0200
KVM: x86 emulator: drop DPRINTF()
Failed emulation is reported via a tracepoint; the cmps printk is pointless.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 84f57166faec0641c5c1caa3526d4d325f98b73c
Author: Avi Kivity <avi@redhat.com>
Date: Wed Nov 17 13:40:50 2010 +0200
KVM: x86 emulator: drop unused #ifndef __KERNEL__
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 919cc78f495344957dba2395354a6c6e60ef7452
Author: Shane Wang <shane.wang@intel.com>
Date: Wed Nov 17 11:40:17 2010 +0800
KVM: VMX: Inform user about INTEL_TXT dependency
Inform user to either disable TXT in the BIOS or do TXT launch
with tboot before enabling KVM since some BIOSes do not set
FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX bit when TXT is enabled.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 96a56fdde1e2d96d4f906e06a48173a44ff4c265
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Tue Nov 16 17:37:41 2010 +0900
KVM: rename hardware_[dis|en]able() to *_nolock() and add locking wrappers
The naming convension of hardware_[dis|en]able family is little bit confusing
because only hardware_[dis|en]able_all are using _nolock suffix.
Renaming current hardware_[dis|en]able() to *_nolock() and using
hardware_[dis|en]able() as wrapper functions which take kvm_lock for them
reduces extra confusion.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 05a21475bd8ed35ace671cdcceeeb2865dfe22ec
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Tue Nov 16 17:35:02 2010 +0900
KVM: take kvm_lock for hardware_disable() during cpu hotplug
In kvm_cpu_hotplug(), only CPU_STARTING case is protected by kvm_lock.
This patch adds missing protection for CPU_DYING case.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 1f434913a640650c2e95d1cb727266ce4f432600
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Wed Nov 17 12:11:41 2010 +0800
KVM: MMU: don't mark spte notrap if reserved bit set
If reserved bit is set, we need inject the #PF with PFEC.RSVD=1,
but shadow_notrap_nonpresent_pte injects #PF with PFEC.RSVD=0 only
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 0d10cc2e2a097764c31c61ee00b900e5f8bac18c
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:07 2010 +0100
KVM: Document device assigment API
Adds API documentation for KVM_[DE]ASSIGN_PCI_DEVICE,
KVM_[DE]ASSIGN_DEV_IRQ, KVM_SET_GSI_ROUTING, KVM_ASSIGN_SET_MSIX_NR, and
KVM_ASSIGN_SET_MSIX_ENTRY.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 80ca963309f9020d3f039100f4fabb7390b773f0
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:06 2010 +0100
KVM: Clean up kvm_vm_ioctl_assigned_device
Any arch not supporting device assigment will also not build
assigned-dev.c. So testing for KVM_CAP_DEVICE_DEASSIGNMENT is pointless.
KVM_CAP_ASSIGN_DEV_IRQ is unconditinally set. Moreover, add a default
case for dispatching the ioctl.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 837eeac384868d805a5cc927cdc000de942500f8
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:05 2010 +0100
KVM: Save/restore state of assigned PCI device
The guest may change states that pci_reset_function does not touch. So
we better save/restore the assigned device across guest usage.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit c7b305a1154664f29314cff1147842ba42ad668a
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:04 2010 +0100
KVM: Refactor IRQ names of assigned devices
Cosmetic change, but it helps to correlate IRQs with PCI devices.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 2226999988a96d55da58b475826220cc44344ecf
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:03 2010 +0100
KVM: Switch assigned device IRQ forwarding to threaded handler
This improves the IRQ forwarding for assigned devices: By using the
kernel's threaded IRQ scheme, we can get rid of the latency-prone work
queue and simplify the code in the same run.
Moreover, we no longer have to hold assigned_dev_lock while raising the
guest IRQ, which can be a lenghty operation as we may have to iterate
over all VCPUs. The lock is now only used for synchronizing masking vs.
unmasking of INTx-type IRQs, thus is renames to intx_lock.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit c3cd56e1afb904a96aa0cfd87662b5c3c96a4ee4
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 16 22:30:02 2010 +0100
KVM: Clear assigned guest IRQ on release
When we deassign a guest IRQ, clear the potentially asserted guest line.
There might be no chance for the guest to do this, specifically if we
switch from INTx to MSI mode.
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 71739eef9bd3cebb0d44f5306a37e4bc16075ee9
Author: Avi Kivity <avi@redhat.com>
Date: Tue Nov 9 16:15:43 2010 +0200
KVM: Mask KVM_GET_SUPPORTED_CPUID data with Linux cpuid info
This allows Linux to mask cpuid bits if, for example, nx is enabled on only
some cpus.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 8ab2e035cdee710c783ab13480a1e2781a7d12c8
Author: Avi Kivity <avi@redhat.com>
Date: Tue Nov 9 16:15:42 2010 +0200
KVM: SVM: Replace svm_has() by standard Linux cpuid accessors
Instead of querying cpuid directly, use the Linux accessors (boot_cpu_has,
etc.). This allows the things like the clearcpuid kernel command line to
work (when it's fixed wrt scattered cpuid bits).
Acked-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit ed16f8be750bdd029070c17b4595577e5dc401d7
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri Nov 12 14:49:55 2010 +0800
KVM: MMU: fix apf prefault if nested guest is enabled
If apf is generated in L2 guest and is completed in L1 guest, it will
prefault this apf in L1 guest's mmu context.
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 24e7330c781782e2c1c68db8b8ea1f20968a47fa
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri Nov 12 14:49:11 2010 +0800
KVM: MMU: support apf for nonpaing guest
Let's support apf for nonpaing guest
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit e07d81dea212dd65de2cf92cdf6457aa7493ee22
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri Nov 12 14:47:01 2010 +0800
KVM: MMU: clear apfs if page state is changed
If CR0.PG is changed, the page fault cann't be avoid when the prefault address
is accessed later
And it also fix a bug: it can retry a page enabled #PF in page disabled context
if mmu is shadow page
This idear is from Gleb Natapov
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit f3b9672b50fec2d26e101188ce8d58a945005b52
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Fri Nov 12 14:46:08 2010 +0800
KVM: MMU: fix missing post sync audit
Add AUDIT_POST_SYNC audit for long mode shadow page
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 4ec7770a32bd147b0cb2020c01a65659317bcafd
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 9 17:02:49 2010 +0100
KVM: Clean up vm creation and release
IA64 support forces us to abstract the allocation of the kvm structure.
But instead of mixing this up with arch-specific initialization and
doing the same on destruction, split both steps. This allows to move
generic destruction calls into generic code.
It also fixes error clean-up on failures of kvm_create_vm for IA64.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit e0880d3372c55d0806a05e514286b1b47363892c
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sat Nov 6 14:52:58 2010 -0400
KVM: x86: Makefile clean up
Changed makefile to use the ccflags-y option instead of EXTRA_CFLAGS.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit fe75e3e226fed9f845ff52205c447e4fa01bc340
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Thu Nov 4 18:29:42 2010 +0800
KVM: remove unused function declaration
Remove the declaration of kvm_mmu_set_base_ptes()
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit cb67fad59fc58872ec2cd1a2066c508043c6136a
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue Nov 9 12:42:12 2010 +0100
KVM: Refactor srcu struct release on early errors
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 8f228732eaa201dc7d64dabc955bcb82df2d130f
Author: Avi Kivity <avi@redhat.com>
Date: Mon Nov 1 23:20:48 2010 +0200
KVM: VMX: Disallow NMI while blocked by STI
While not mandated by the spec, Linux relies on NMI being blocked by an
IF-enabling STI. VMX also refuses to enter a guest in this state, at
least on some implementations.
Disallow NMI while blocked by STI by checking for the condition, and
requesting an interrupt window exit if it occurs.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 5d134c0fc71c5672751fcb0fe87756e703068b7a
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Mon Nov 1 17:03:44 2010 +0800
KVM: fix the race while wakeup all pv guest
In kvm_async_pf_wakeup_all(), we add a dummy apf to vcpu->async_pf.done
without holding vcpu->async_pf.lock, it will break if we are handling apfs
at this time.
Also use 'list_empty_careful()' instead of 'list_empty()'
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 0223f046d0108f759d57f2b32bff16f1687576cd
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Tue Nov 2 17:35:35 2010 +0800
KVM: handle more completed apfs if possible
If it's no need to inject async #PF to PV guest we can handle
more completed apfs at one time, so we can retry guest #PF
as early as possible
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 123c420f31d82caa4614294defc3b9766fd0a6a8
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Mon Nov 1 17:01:28 2010 +0800
KVM: avoid unnecessary wait for a async pf
In current code, it checks async pf completion out of the wait context,
like this:
if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE &&
!vcpu->arch.apf.halted)
r = vcpu_enter_guest(vcpu);
else {
......
kvm_vcpu_block(vcpu)
^- waiting until 'async_pf.done' is not empty
}
kvm_check_async_pf_completion(vcpu)
^- delete list from async_pf.done
So, if we check aysnc pf completion first, it can be blocked at
kvm_vcpu_block
Fixed by mark the vcpu is unhalted in kvm_check_async_pf_completion()
path
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit ba2beb2fe43ff3fadc0a1dfacc20ef7da2585d69
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Mon Nov 1 17:00:30 2010 +0800
KVM: fix searching async gfn in kvm_async_pf_gfn_slot
Don't search later slots if the slot is empty
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit e3a931fc4f956e4cd33a8968a216800734a7ae04
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Mon Nov 1 16:59:39 2010 +0800
KVM: cleanup async_pf tracepoints
Use 'DECLARE_EVENT_CLASS' to cleanup async_pf tracepoints
Acked-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 5d7cfed1a034f93782cf047f8defdf2c63355e02
Author: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Date: Mon Nov 1 16:58:43 2010 +0800
KVM: fix tracing kvm_try_async_get_page
Tracing 'async' and *pfn is useless, since 'async' is always true,
and '*pfn' is always "fault_pfn'
We can trace 'gva' and 'gfn' instead, it can help us to see the
life-cycle of an async_pf
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 1f4f59958229cb307f951f691f1ac0bef4f51f3a
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Tue Nov 2 10:49:34 2010 +0900
KVM: replace vmalloc and memset with vzalloc
Let's use newly introduced vzalloc().
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit b97c39cde7df6b8841b17bc15e6d7aa4b87392a3
Author: Gleb Natapov <gleb@redhat.com>
Date: Mon Nov 1 15:35:01 2010 +0200
KVM: handle exit due to INVD in VMX
Currently the exit is unhandled, so guest halts with error if it tries
to execute INVD instruction. Call into emulator when INVD instruction
is executed by a guest instead. This instruction is not needed by ordinary
guests, but firmware (like OpenBIOS) use it and fail.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 5d47290117715523f120af6439e9055011fb04cd
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon Nov 1 14:01:29 2010 +0100
KVM: x86: Avoid issuing wbinvd twice
Micro optimization to avoid calling wbinvd twice on the CPU that has to
emulate it. As we might be preempted between smp_call_function_many and
the local wbinvd, the cache might be filled again so that real work
could be done uselessly.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit bb19d85c625c58bcf1adda732e6914e62462f7aa
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Oct 27 17:22:10 2010 +0200
KVM: get rid of warning within kvm_dev_ioctl_create_vm
Fixes this:
CC arch/s390/kvm/../../../virt/kvm/kvm_main.o
arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_dev_ioctl_create_vm':
arch/s390/kvm/../../../virt/kvm/kvm_main.c:1828:10: warning: unused variable 'r'
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit d91b371a5acbb1d1eae10301aeefc42969908db6
Author: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Wed Oct 27 17:21:21 2010 +0200
KVM: add cast within kvm_clear_guest_page to fix warning
Fixes this:
CC arch/s390/kvm/../../../virt/kvm/kvm_main.o
arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_clear_guest_page':
arch/s390/kvm/../../../virt/kvm/kvm_main.c:1224:2: warning: passing argument 3 of 'kvm_write_guest_page' makes pointer from integer without a cast
arch/s390/kvm/../../../virt/kvm/kvm_main.c:1185:5: note: expected 'const void *' but argument is of type 'long unsigned int'
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 4c359a1b832f210c2f96df63c6a5924b9e616ef9
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Mon Nov 1 14:36:09 2010 +0900
KVM: use kmalloc() for small dirty bitmaps
Currently we are using vmalloc() for all dirty bitmaps even if
they are small enough, say less than K bytes.
We use kmalloc() if dirty bitmap size is less than or equal to
PAGE_SIZE so that we can avoid vmalloc area usage for VGA.
This will also make the logging start/stop faster.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit f7aac8a5c47e7ef770b2bdd760ec4489cc4a9714
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Wed Oct 27 18:23:54 2010 +0900
KVM: pre-allocate one more dirty bitmap to avoid vmalloc()
Currently x86's kvm_vm_ioctl_get_dirty_log() needs to allocate a bitmap by
vmalloc() which will be used in the next logging and this has been causing
bad effect to VGA and live-migration: vmalloc() consumes extra systime,
triggers tlb flush, etc.
This patch resolves this issue by pre-allocating one more bitmap and switching
between two bitmaps during dirty logging.
Performance improvement:
I measured performance for the case of VGA update by trace-cmd.
The result was 1.5 times faster than the original one.
In the case of live migration, the improvement ratio depends on the workload
and the guest memory size. In general, the larger the memory size is the more
benefits we get.
Note:
This does not change other architectures's logic but the allocation size
becomes twice. This will increase the actual memory consumption only when
the new size changes the number of pages allocated by vmalloc().
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 0cd8f35b7ee99b67d3b7f23fa9b399d6a34284ae
Author: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Wed Oct 27 18:22:19 2010 +0900
KVM: introduce wrapper functions for creating/destroying dirty bitmaps
This makes it easy to change the way of allocating/freeing dirty bitmaps.
Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit db2cc31e36991e164ed0797390d0059d1ad54b56
Author: Gleb Natapov <gleb@redhat.com>
Date: Sun Oct 24 16:49:08 2010 +0200
KVM: x86: trace "exit to userspace" event
Add tracepoint for userspace exit.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 5dbf59cbae781921143e6bca3d03467b1fd82367
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri Oct 22 14:18:18 2010 -0200
KVM: propagate fault r/w information to gup(), allow read-only memory
As suggested by Andrea, pass r/w error code to gup(), upgrading read fault
to writable if host pte allows it.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 9c5b202010d920bee15a3fdfba215f59fd2f2086
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri Oct 22 14:18:17 2010 -0200
KVM: MMU: flush TLBs on writable -> read-only spte overwrite
This can happen in the following scenario:
vcpu0 vcpu1
read fault
gup(.write=0)
gup(.write=1)
reuse swap cache, no COW
set writable spte
use writable spte
set read-only spte
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 7b9411acd46cbc091d63655f0dfdfc0fc19a79d6
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri Oct 22 14:18:16 2010 -0200
KVM: MMU: remove kvm_mmu_set_base_ptes
Unused.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 8db1d67961199e68d13f0f2e75b49048c6447998
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri Oct 22 14:18:15 2010 -0200
KVM: VMX: remove setting of shadow_base_ptes for EPT
The EPT present/writable bits use the same position as normal
pagetable bits.
Since direct_map passes ACC_ALL to mmu_set_spte, thus always setting
the writable bit on sptes, use the generic PT_PRESENT shadow_base_pte.
Also pass present/writable error code information from EPT violation
to generic pagefault handler.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit e6929f45bb0202225d7edfe434516ed9bb6377eb
Author: Avi Kivity <avi@redhat.com>
Date: Mon Oct 25 15:23:55 2010 +0200
KVM: Avoid double interrupt injection with vapic
After an interrupt injection, the PPR changes, and we have to reflect that
into the vapic. This causes a KVM_REQ_EVENT to be set, which causes the
whole interrupt injection routine to be run again (harmlessly).
Optimize by only setting KVM_REQ_EVENT if the ppr was lowered; otherwise
there is no chance that a new injection is needed.
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 29471e8b87057305f55a8e9c7bdadd9510e55e2d
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun Oct 24 11:13:12 2010 +0200
KVM: SVM: Fix copy&paste mistake in 32-bit host GS loading
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 0d41db513d8b5526676727f169c180b19056dddd
Author: Avi Kivity <avi@redhat.com>
Date: Thu Oct 21 12:20:34 2010 +0200
KVM: SVM: Fold save_host_msrs() and load_host_msrs() into their callers
This abstraction only serves to obfuscate. Remove.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit bf63b7466f62019e64fcd629b5b5a84232db8d7c
Author: Avi Kivity <avi@redhat.com>
Date: Thu Oct 21 12:20:33 2010 +0200
KVM: SVM: Move fs/gs/ldt save/restore to heavyweight exit path
ldt is never used in the kernel context; same goes for fs (x86_64) and gs
(i386). So save/restore them in the heavyweight exit path instead
of the lightweight path.
By itself, this doesn't buy us much, but it paves the way for moving vmload
and vmsave to the heavyweight exit path, since they modify the same registers.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 5990be290399e4a532ac8238dafac4c5ddb5eb62
Author: Avi Kivity <avi@redhat.com>
Date: Thu Oct 21 12:20:32 2010 +0200
KVM: SVM: Move svm->host_gs_base into a separate structure
More members will join it soon.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 14847f4b04b987afc5db05ceea7a7d81cf54620e
Author: Avi Kivity <avi@redhat.com>
Date: Thu Oct 21 12:20:31 2010 +0200
KVM: SVM: Move guest register save out of interrupts disabled section
Saving guest registers is just a memory copy, and does not need to be in the
critical section. Move outside the critical section to improve latency a
bit.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 4e417e896dfe2779d4afa5e4eea5e3dabff75ca3
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed Oct 20 18:34:54 2010 +0200
KVM: x86: Add missing inline tag to kvm_read_and_reset_pf_reason
May otherwise generates build warnings about unused
kvm_read_and_reset_pf_reason if included without CONFIG_KVM_GUEST
enabled.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit e9ff886a785d1d000cf19f5a1583ab8a66877042
Author: Andi Kleen <ak@linux.intel.com>
Date: Wed Oct 20 17:56:17 2010 +0200
KVM: Move KVM context switch into own function
gcc 4.5 with some special options is able to duplicate the VMX
context switch asm in vmx_vcpu_run(). This results in a compile error
because the inline asm sequence uses an on local label. The non local
label is needed because other code wants to set up the return address.
This patch moves the asm code into an own function and marks
that explicitely noinline to avoid this problem.
Better would be probably to just move it into an .S file.
The diff looks worse than the change really is, it's all just
code movement and no logic change.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit f9307eaf1579b7699cf6af76fe02fe97d42eed3f
Author: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed Oct 20 15:18:02 2010 +0200
KVM: x86: Mark kvm_arch_setup_async_pf static
It has no user outside mmu.c and also no prototype.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit d92e50a7bf2b938cd8adfc30d930ed08f9b4320b
Author: Gleb Natapov <gleb@redhat.com>
Date: Tue Oct 19 18:13:41 2010 +0200
KVM: improve hva_to_pfn() readability
Improve vma handling code readability in hva_to_pfn() and fix
async pf handling code to properly check vma returned by find_vma().
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 38be5a88ae602b6f06d3d8a1a36c9be380d5b0aa
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:56 2010 +0200
KVM: Send async PF when guest is not in userspace too.
If guest indicates that it can handle async pf in kernel mode too send
it, but only if interrupts are enabled.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit def54772dce1009c8903e329ac2d991a14dc19ad
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:55 2010 +0200
KVM: Let host know whether the guest can handle async PF in non-userspace context.
If guest can detect that it runs in non-preemptable context it can
handle async PFs at any time, so let host know that it can send async
PF even if guest cpu is not in userspace.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 1f7925042aabf46c7eae813f70f0416470a04eea
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:54 2010 +0200
KVM paravirt: Handle async PF in non preemptable context
If async page fault is received by idle task or when preemp_count is
not zero guest cannot reschedule, so do sti; hlt and wait for page to be
ready. vcpu can still process interrupts while it waits for the page to
be ready.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 2359ec58bbb5b77e45bddbb516276ba2efd97192
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:53 2010 +0200
KVM: Inject asynchronous page fault into a PV guest if page is swapped out.
Send async page fault to a PV guest if it accesses swapped out memory.
Guest will choose another task to run upon receiving the fault.
Allow async page fault injection only when guest is in user mode since
otherwise guest may be in non-sleepable context and will not be able
to reschedule.
Vcpu will be halted if guest will fault on the same page again or if
vcpu executes kernel code.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 1b9ae3ac761e7d68400f7ff1d93491e3551cb2ab
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:52 2010 +0200
KVM: Handle async PF in a guest.
When async PF capability is detected hook up special page fault handler
that will handle async page fault events and bypass other page faults to
regular page fault handler. Also add async PF handling to nested SVM
emulation. Async PF always generates exit to L1 where vcpu thread will
be scheduled out until page is available.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit e342abf2665941e9f2ba645a6b5989f134ce4b7d
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:51 2010 +0200
KVM paravirt: Add async PF initialization to PV guest.
Enable async PF in a guest if async PF capability is discovered.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit a0495048c788defa9f99a4ec212faa57b0183142
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:50 2010 +0200
KVM: Add PV MSR to enable asynchronous page faults delivery.
Guest enables async PF vcpu functionality using this MSR.
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit bc4c5a07de1fb2fd0b10e66ddf81c829271b14ae
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:49 2010 +0200
KVM paravirt: Move kvm_smp_prepare_boot_cpu() from kvmclock.c to kvm.c.
Async PF also needs to hook into smp_prepare_boot_cpu so move the hook
into generic code.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 7ede72c16a42c0dcdbdc3ba65c4f3ec8b36b5d30
Author: Gleb Natapov <gleb@redhat.com>
Date: Mon Oct 18 15:22:23 2010 +0200
KVM: Add memory slot versioning and use it to provide fast guest write interface
Keep track of memslots changes by keeping generation number in memslots
structure. Provide kvm_write_guest_cached() function that skips
gfn_to_hva() translation if memslots was not changed since previous
invocation.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 0213a3abf7e28ed4f46e97ab5b5f873dbb926273
Author: Gleb Natapov <gleb@redhat.com>
Date: Sun Oct 17 18:13:42 2010 +0200
KVM: Retry fault before vmentry
When page is swapped in it is mapped into guest memory only after guest
tries to access it again and generate another fault. To save this fault
we can map it immediately since we know that guest is going to access
the page. Do it only when tdp is enabled for now. Shadow paging case is
more complicated. CR[034] and EFER registers should be switched before
doing mapping and then switched back.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 77652f9de1bb9c4b0a125c678f24eef815a4ea4f
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:46 2010 +0200
KVM: Halt vcpu if page it tries to access is swapped out.
If a guest accesses swapped out memory do not swap it in from vcpu thread
context. Schedule work to do swapping and put vcpu into halted state
instead.
Interrupts will still be delivered to the guest and if interrupt will
cause reschedule guest will continue to run another task.
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 0401c6f65037210f662f787062d50aa3e0d2b386
Author: Gleb Natapov <gleb@redhat.com>
Date: Thu Oct 14 11:22:45 2010 +0200
Add get_user_pages() variant that fails if major fault is required.
This patch add get_user_pages() variant that only succeeds if getting
a reference to a page doesn't require major fault.
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
commit 85854587cc94cefd1cc9daffff2def6ca2aea40c
Author: Avi Kivity <avi@redhat.com>
Date: Mon Oct 11 14:23:39 2010 +0200
KVM: Don't reset mmu context unnecessarily when updating EFER
The only bit of EFER that affects the mmu is NX, and this is already
accounted for (LME only takes effect when changing cr0).
Based on a patch by Hillf Danton.
Signed-off-by: Avi Kivity <avi@redhat.com>
commit 39de52104dd92bc0548a20201350111dc9317df9
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit d9cf837ef9629ab34167bd6fc0141383ddb8813a
Author: Corey Ashford <cjashfor@linux.vnet.ibm.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <fweisbec@gmail.com>
Cc: Ian Munsie <ianmunsi@au1.ibm.com>
Cc: Michael Ellerman <michaele@au1.ibm.com>
LKML-Reference: <1290217044-26293-1-git-send-email-cjashfor@linux.vnet.ibm.com>
Signed-off-by: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 9cdca869724e766eb48c061967cb777ddb436c76
Author: Thomas Gleixner <tglx@linutronix.de>
Date: Sat Nov 20 10:37:05 2010 +0100
x86: platform: Move iris to x86/platform where it belongs
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 63ac4f51f0c9c0f2d4c52c3eb238e9ebe299056f
Author: Richard Weinberger <richard@nod.at>
Date: Thu Nov 11 01:15:51 2010 +0100
ACPI: ENODEV needs errno.h
This patch fixes a build error when neither CONFIG_ACPI_VIDEO
nor CONFIG_ACPI_VIDEO_MODULE are enabled.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Len Brown <len.brown@intel.com>
commit b21bded7c006a29ccda0b8515c4ae3b49e3b599b
Author: Vinod Koul <vinod.koul@intel.com>
Date: Fri Nov 19 15:10:39 2010 +0000
sst: log error returned by scu ipc read/write
scu ipc driver fails sometimes to read/write. This add logs with register
addr and ret code when these errors occur.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 90abe60b32a4762fff9bef33295e08bc9bb355af
Author: Vinod Koul <vinod.koul@intel.com>
Date: Fri Nov 19 15:09:50 2010 +0000
sst: Firmware error codes force number values
To avoid mismatch in driver and firmware error codes assign specfic values
to each enum.
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6f6ffec188b5416642b20ef14034d40cfeb3256e
Author: Vinod Koul <vinod.koul@intel.com>
Date: Fri Nov 19 15:06:31 2010 +0000
sst: Change the SST driver PCM interface
The PCM interface in SST driver is cmds only, this patch changes the interface to open, close and cmd interface.
This allows SST driver to keep easy track of handles open
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4856ab33eb5c33bdf17a5a1bd8d720bffe5f6110
Author: Mark Allyn <mark.a.allyn@intel.com>
Date: Wed Nov 17 15:45:36 2010 -0800
Staging: sep: Introduce sep driver
This driver is for the Security Processor, a dedicated encryption
and decryption driver that is used on the Intel mobile platform.
This has been checked with checkpatch and there are four
warnings for lines over 80 charactors.
There is one compile warning. This is for a function that is
only used if the rar register driver is needed. There is an
ifdef in a header file that stubs out the rar register driver
if the rar register is not configured.
This driver does add a configuration, which is CONFIG_DX_SEP.
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d948d5f96a4b5923599a7a657dbbd8660b0f9fa5
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed Nov 17 15:38:46 2010 -0800
staging: clearpad_tm1217 depends on INPUT
clearpad_tm1217 driver uses many input_() interfaces, so it should
depend on INPUT.
clearpad_tm1217.c:(.text+0xf19ac): undefined reference to `input_unregister_device'
clearpad_tm1217.c:(.text+0xf1b19): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1b31): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1bb4): undefined reference to `input_event'
clearpad_tm1217.c:(.text+0xf1bf2): undefined reference to `input_event'
drivers/built-in.o:clearpad_tm1217.c:(.text+0xf1c08): more undefined references to `input_event' follow
clearpad_tm1217.c:(.text+0xf1df3): undefined reference to `input_allocate_device'
clearpad_tm1217.c:(.text+0xf1eac): undefined reference to `input_set_abs_params'
clearpad_tm1217.c:(.text+0xf1ed1): undefined reference to `input_set_abs_params'
clearpad_tm1217.c:(.text+0xf1ed8): undefined reference to `input_register_device'
clearpad_tm1217.c:(.text+0xf2040): undefined reference to `input_unregister_device'
clearpad_tm1217.c:(.text+0xf204b): undefined reference to `input_free_device'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Ramesh Agarwal <ramesh.agarwal@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7716090be5603f1ad4df1379652b8d107c207f5c
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Thu Nov 18 09:49:09 2010 +0100
staging: ft1000: Fix compilation warning.
This patch fix following warning:
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:67:22:
warning: ‘pft1000info’ may be used uninitialized in this function
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 24d6050b352aa76364bd344c41b3e3e0f51466cc
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri Nov 19 15:16:46 2010 +0100
staging: iio: dac: Cleanup style - no functional changes
Stick to the 80 character line limit at least for code
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ece30c15921f94c1d58c494507f528c9482db409
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri Nov 19 15:16:45 2010 +0100
staging: iio: dac: Use spi_device_id
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit df9cd1052079e5d0f88ed230276a17a49cc41045
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri Nov 19 15:16:44 2010 +0100
staging: iio: dac: Use spi_write() and handle return value
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 51f8ad36022e880019e79a9dea2351cc47c739d7
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri Nov 19 15:16:43 2010 +0100
staging: iio: dac: Update drivers to use new attribute naming
Remove depreciated macro from header
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5a7f4fddae8a50d076b5714f47936ea78e0c0858
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Fri Nov 19 13:32:38 2010 +0100
staging: iio: dac: more consistent DAC sysfs attributes naming
Align DAC sysfs attributes naming with the convention used by ADC
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 861f67031899b8ab909d672eaea85070317855c9
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:58 2010 -0800
staging: brcm80211: stragglers not handled by unifdef
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f9ec972793fb61f6ec612ecee5b1cc6efeacfbd6
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:57 2010 -0800
staging: brcm80211: unifdef -UBCMSDIO
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c73b9d6759993f521e3b0cb24abf74c4527469e3
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:56 2010 -0800
staging: brcm80211: remove bmac-only header files
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f3ce1ef2f80627c2b6339bfc96ee5c1b189cac06
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:55 2010 -0800
staging: brcm80211: unifdef -UWLC_SPLIT
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 501c09346ce74ec688113d5c6b8a321514935228
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:54 2010 -0800
staging: brcm80211: unifdef -DWLC_LOW
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 02db6b4769e2465b872a6cd87465a3e20d4573ce
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:53 2010 -0800
staging: brcm80211: unifdef -UWLC_LOW_ONLY
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 29efb1a9f450450e764d9901b434557349c3af53
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 19 14:30:52 2010 -0800
staging: brcm80211: unifdef -UWLC_HIGH_ONLY
Part of BMAC removal.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2cb8ada64f209c5c033f1821bbbc0e8d388cbf7f
Author: Arend van Spriel <arend@broadcom.com>
Date: Thu Nov 18 20:46:44 2010 +0100
staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim call
- removed PKTSETLEN macro and used __skb_trim call instead.
- removed unused macros PKTSETPOOL and PKTPOOL
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c303ecbda8b7c86975c4ba23f56b8cbe297cd060
Author: Arend van Spriel <arend@broadcom.com>
Date: Thu Nov 18 20:46:43 2010 +0100
staging: brcm80211: replace PKTPUSH and PKTPULL macros with native skbuff calls
Replacing PKTPUSH by skb_push() call and PKTPULL by skb_pull() call to make
it obvious what the operation is doing with the packet.
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 26361116d7c94984a5fbdc1b6a11555a9dc33cf0
Author: Mike Rapoport <mike.rapoport@gmail.com>
Date: Wed Nov 17 10:00:00 2010 +0200
staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)register
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5dc177da85a813ff73c35f2d9edfb0bc2fe8271c
Author: Mike Rapoport <mike.rapoport@gmail.com>
Date: Wed Nov 17 09:58:46 2010 +0200
staging: brcm80211: brcmfmac: remove PCI SDIO controller binding
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6dd0a3a7e0793dbeae1b951f091025d8cf896cb4
Author: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Tue Nov 16 15:58:52 2010 -0800
xhci: Don't let the USB core disable SuperSpeed ports.
Disabling SuperSpeed ports is a Very Bad Thing (TM). It disables
SuperSpeed terminations, which means that devices will never connect at
SuperSpeed on that port. For USB 2.0/1.1 ports, disabling the port meant
that the USB core could always get a connect status change later. That's
not true with USB 3.0 ports.
Do not let the USB core disable SuperSpeed ports. We can't rely on the
device speed in the port status registers, since that isn't valid until
there's a USB device connected to the port. Instead, we use the port
speed array that's created from the Extended Capabilities registers.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Tested-by: Don Zickus <dzickus@redhat.com>
Cc: stable@kernel.org
commit da6699ce4a889c3795624ccdcfe7181cc89f18e8
Author: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Tue Oct 26 16:47:13 2010 -0700
xhci: Setup array of USB 2.0 and USB 3.0 ports.
An xHCI host controller contains USB 2.0 and USB 3.0 ports, which can
occur in any order in the PORTSC registers. We cannot read the port speed
bits in the PORTSC registers at init time to determine the port speed,
since those bits are only valid when a USB device is plugged into the
port.
Instead, we read the "Supported Protocol Capability" registers in the xHC
Extended Capabilities space. Those describe the protocol, port offset in
the PORTSC registers, and port count. We use those registers to create
two arrays of pointers to the PORTSC registers, one for USB 3.0 ports, and
another for USB 2.0 ports. A third array keeps track of the port protocol
major revision, and is indexed with the internal xHCI port number.
This commit is a bit big, but it should be queued for stable because the "Don't
let the USB core disable SuperSpeed ports" patch depends on it. There is no
other way to determine which ports are SuperSpeed ports without this patch.
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Tested-by: Don Zickus <dzickus@redhat.com>
Cc: stable@kernel.org
commit 7a3783efffc7bc2e702d774e47fad5b8e37e9ad1
Author: Paul Zimmerman <Paul.Zimmerman@synopsys.com>
Date: Wed Nov 17 16:26:50 2010 -0800
xhci: Fix reset-device and configure-endpoint commands
We have been having problems with the USB-IF Gold Tree tests when plugging
and unplugging devices from the tree. I have seen that the reset-device
and configure-endpoint commands, which are invoked from
xhci_discover_or_reset_device() and xhci_configure_endpoint(), will sometimes
time out.
After much debugging, I determined that the commands themselves do not actually
time out, but rather their completion events do not get delivered to the right
place.
This happens when the command ring has just wrapped around, and it's enqueue
pointer is left pointing to the link TRB. xhci_discover_or_reset_device() and
xhci_configure_endpoint() use the enqueue pointer directly as their command
TRB pointer, without checking whether it's pointing to the link TRB.
When the completion event arrives, if the command TRB is pointing to the link
TRB, the check against the command ring dequeue pointer in
handle_cmd_in_cmd_wait_list() fails, so the completion inside the command does
not get signaled.
The patch below fixes the timeout problem for me.
This should be queued for the 2.6.35 and 2.6.36 stable trees.
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable@kernel.org
commit 1205065764f2eda3216ebe213143f69891ee3460
Author: Mi Jinlong <mijinlong@cn.fujitsu.com>
Date: Thu Nov 11 18:03:40 2010 +0800
NFS4.1: Fix bug server don't reply the right fore_channel to client at create_session
At the latest kernel(2.6.37-rc1), server just initialize the forechannel
at init_forechannel_attrs, but don't reflect it to reply.
After initialize the session success, we should copy the forechannel info
to nfsd4_create_session struct.
Reviewed-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit ced6dfe9fc7128995c6d60627938944b430d82c8
Author: Mi Jinlong <mijinlong@cn.fujitsu.com>
Date: Thu Nov 11 18:03:50 2010 +0800
NFS4.1: server gets drc mem fail should reply error at create_session
When server gets drc mem fail, it should reply error to client.
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 044bc1d4324bfb34761cb361e404cb8d39c68777
Author: J. Bruce Fields <bfields@redhat.com>
Date: Fri Nov 12 14:36:06 2010 -0500
nfsd4: return serverfault on request for ssv
We're refusing to support a mandatory features of 4.1, so serverfault
seems the better error; see e.g.:
http://www.ietf.org/mail-archive/web/nfsv4/current/msg07638.html
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 5afa040b307952bb804eba34b21646da2842e14d
Author: Mi Jinlong <mijinlong@cn.fujitsu.com>
Date: Tue Nov 9 09:39:23 2010 +0800
NFSv4.1: Make sure nfsd can decode SP4_SSV correctly at exchange_id
According to RFC, the argument of ssv_sp_parms4 is:
struct ssv_sp_parms4 {
state_protect_ops4 ssp_ops;
sec_oid4 ssp_hash_algs<>;
sec_oid4 ssp_encr_algs<>;
uint32_t ssp_window;
uint32_t ssp_num_gss_handles;
};
If client send a exchange_id with SP4_SSV, server cann't decode
the SP4_SSV's ssp_hash_algs and ssp_encr_algs arguments correctly.
Because the kernel treat the two arguments as a signal
sec_oid4 struct, but should be a set of sec_oid4 struct.
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 9c335c0b8daf56b9f73479d00b1dd726e1fcca09
Author: J. Bruce Fields <bfields@redhat.com>
Date: Tue Oct 26 11:32:03 2010 -0400
svcrpc: fix wspace-checking race
We call svc_xprt_enqueue() after something happens which we think may
require handling from a server thread. To avoid such events being lost,
svc_xprt_enqueue() must guarantee that there will be a svc_serv() call
from a server thread following any such event. It does that by either
waking up a server thread itself, or checking that XPT_BUSY is set (in
which case somebody else is doing it).
But the check of XPT_BUSY could occur just as someone finishes
processing some other event, and just before they clear XPT_BUSY.
Therefore it's important not to clear XPT_BUSY without subsequently
doing another svc_export_enqueue() to check whether the xprt should be
requeued.
The xpo_wspace() check in svc_xprt_enqueue() breaks this rule, allowing
an event to be missed in situations like:
data arrives
call svc_tcp_data_ready():
call svc_xprt_enqueue():
set BUSY
find no write space
svc_reserve():
free up write space
call svc_enqueue():
test BUSY
clear BUSY
So, instead, check wspace in the same places that the state flags are
checked: before taking BUSY, and in svc_receive().
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit b176331627fccc726d28f4fc4a357d1f3c19dbf0
Author: J. Bruce Fields <bfields@redhat.com>
Date: Mon Oct 25 20:24:48 2010 -0400
svcrpc: svc_close_xprt comment
Neil Brown had to explain to me why we do this here; record the answer
for posterity.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit f8c0d226fef05226ff1a85055c8ed663022f40c1
Author: J. Bruce Fields <bfields@redhat.com>
Date: Mon Oct 25 18:11:21 2010 -0400
svcrpc: simplify svc_close_all
There's no need to be fooling with XPT_BUSY now that all the threads
are gone.
The list_del_init() here could execute at the same time as the
svc_xprt_enqueue()'s list_add_tail(), with undefined results. We don't
really care at this point, but it might result in a spurious
list-corruption warning or something.
And svc_close() isn't adding any value; just call svc_delete_xprt()
directly.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit ca7896cd83456082b1e78816cdf7e41658ef7bcd
Author: J. Bruce Fields <bfields@redhat.com>
Date: Mon Oct 25 14:12:40 2010 -0400
nfsd4: centralize more calls to svc_xprt_received
Follow up on b48fa6b99100dc7772af3cd276035fcec9719ceb by moving all the
svc_xprt_received() calls for the main xprt to one place. The clearing
of XPT_BUSY here is critical to the correctness of the server, so I'd
prefer it to be obvious where we do it.
The only substantive result is moving svc_xprt_received() after
svc_receive_deferred(). Other than a (likely insignificant) delay
waking up the next thread, that should be harmless.
Also reshuffle the exit code a little to skip a few other steps that we
don't care about the in the svc_delete_xprt() case.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 62bac4af3d778f6d06d351c0442008967c512588
Author: J. Bruce Fields <bfields@redhat.com>
Date: Mon Oct 25 12:50:15 2010 -0400
svcrpc: don't set then immediately clear XPT_DEFERRED
There's no harm to doing this, since the only caller will immediately
call svc_enqueue() afterwards, ensuring we don't miss the remaining
deferred requests just because XPT_DEFERRED was briefly cleared.
But why not just do this the simple way?
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 43b0178eda1e7e5d1e205bbfd076ab5d6ecacc02
Author: Dan Carpenter <error27@gmail.com>
Date: Wed Oct 27 23:19:04 2010 +0200
nfsd: fix NULL dereference in setattr()
The original code would oops if this were called from nfsd4_setattr()
because "filpp" is NULL.
(Note this case is currently impossible, as long as we only give out
read delegations.)
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
commit 09c5088e5c5993be217a2c85dca088147ffc9b72
Author: Shreyas Bhatewara <sbhatewara@vmware.com>
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 <sbhatewara@vmware.com>
Reviewed-by: Bhavesh Davda <bhavesh@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 124bf94a9f9b52341562628cd56b252e7d820ee8
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit c496fa6bd5324ddce11e5e42670618ffb4d8f58d
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <fabio.estevam@freescale.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit d690b4c4778096cde018709efd005dfef9714297
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Nov 16 21:27:33 2010 +0100
ARM: mx3: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 742269e2d971957c84f364c4e9f5c6439964ef01
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Mon Nov 15 15:28:45 2010 +0100
ARM: mx3: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 2d58de2805f93bdb8fa0608d98e1871bb28ec091
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Mon Nov 15 11:57:49 2010 +0100
ARM: mx3: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 9e1dde33876ba83ad586c336647fff133d0f5472
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit fed3d35b06bf3f6a3383c2637d054823c563200b
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri Nov 12 11:49:34 2010 +0100
ARM: mx3: dynamically allocate mxc_rnga devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 6a697e3d310d79ea0e385975c57084ce22b04b36
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit a528bc87841d958bbd394abc9266aee9cdf45cb8
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit d7e0951f929513ced7c57882d2f95d49a546e002
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 972cc48207450ce6aeed416ac176fe4d0482a4a3
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 36a8cac9524bc67df2911cb3fbc349f87bcad37d
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit fd2fa2e3238197ef10101277dff67da10e68a61b
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit e48ab1c16ff2af83e6a2a1228504710a5d339d08
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 18:06:17 2010 +0100
ARM: imx: move mx25 support to mach-imx
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 2a8bd56a382ec0e24249b1adaca4f38bd529e825
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 17:30:25 2010 +0100
ARM: mx25: remove now empty devices.h
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit bb4c853ff18fe3b0e2aec45053c318479e0c55e3
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 17:11:34 2010 +0100
ARM: mx25: dynamically allocate mx2-camera devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 00871505dcf15418aebc402db9f124dd2738fa2d
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 16:58:50 2010 +0100
ARM: mx25: dynamically allocate imx2-wdt devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit bc95df78c4566327086d44f1bfab984a70dc4d6b
Author: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Date: Fri Nov 19 12:41:19 2010 -0800
Input: add support for keyboards on ST SPEAr platform
Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92
Author: andrew hendry <andrew.hendry@gmail.com>
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 <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 54aafbd4989a684ca876e49bf3e6eb931654dc02
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 18 13:21:28 2010 +0000
X25: remove bkl in inq and outq ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc
Author: andrew hendry <andrew.hendry@gmail.com>
Date: Thu Nov 18 13:21:20 2010 +0000
X25: remove bkl in timestamp ioctls
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 70be998c2b44f942f11383496622500136816acb
Author: andrew hendry <andrew.hendry@gmail.com>
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 <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4aafd3f71a257a3522932944b5204262dfdff147
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
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: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit a71123977eb3c72dd5a8bac723b13faf9cdd2828
Author: Robert Morell <rmorell@nvidia.com>
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 <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1289945793-31441-1-git-send-email-rmorell@nvidia.com>
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit cb6d5b42c897373c6f0584184ffa36e2f4f32b92
Author: Jeff Garzik <jeff@garzik.org>
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 <jgarzik@redhat.com>
commit 9889dcd7d2a81a3ecc3508151e011904ee7b7628
Author: David Milburn <dmilburn@redhat.com>
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 <dmilburn@redhat.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
commit f5b4a9c3ab53d544a540a6f3a5d17184e374d91a
Author: Stephane Eranian <eranian@google.com>
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 <davem@davemloft.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
LKML-Reference: <4ce257b5.1e07e30a.7b6b.3aa9@mx.google.com>
Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
commit 412dc7f368bf10a8049a8a4c41abbfd0108742e7
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri Nov 19 09:30:18 2010 -0800
staging: fix winbond build, needs delay.h
winbond drivers use msleep() and delay(), so include linux/delay.h
in a common header file to prevent build errors.
drivers/staging/winbond/phy_calibration.c:987: error: implicit declaration of function 'msleep'
drivers/staging/winbond/phy_calibration.c:1556: error: implicit declaration of function 'udelay'
drivers/staging/winbond/reg.c:894: error: implicit declaration of function 'msleep'
drivers/staging/winbond/reg.c:1178: error: implicit declaration of function 'udelay'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c26aed40f4fd18f86bcc6aba557cab700b129b73
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8c1592d68bc89248bfd0ee287648f41c1370d826
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4916a1083290edfb6cc53aa134f00597447de1ce
Author: Pavankumar Kondeti <pkondeti@codeaurora.org>
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 <pkondeti@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 428ff7d9ce1f7e35b0dcf65c4ec0b429cbc2240b
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri Nov 19 11:27:09 2010 -0500
xen/events: Use PIRQ instead of GSI value when unmapping MSI/MSI-X irqs.
When we allocate a vector for MSI/MSI-X we save away the PIRQ, and the
vector value. When we unmap (de-allocate) the MSI/MSI-X vector(s) we
need to provide the PIRQ and the vector value. What we did instead
was to provide the GSI (which was zero) and the vector value, and we
got these unhappy error messages:
(XEN) irq.c:1575: dom0: pirq 0 not mapped
[ 7.733415] unmap irq failed -22
This patches fixes this and we use the PIRQ value instead of the GSI
value.
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
commit 0e341af835fdf553820a1fa98341b93ab32ce466
Author: Rabin Vincent <rabin@rab.in>
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 <catalin.marinas@arm.com>
Signed-off-by: Rabin Vincent <rabin@rab.in>
commit dd686eb13959e49a1112fd608c124ab711050582
Author: Rabin Vincent <rabin@rab.in>
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 <rabin@rab.in>
commit 376cfa8730c08c0394d0aa1d4a80fd8c9971f323
Author: Tim Bird <tim.bird@am.sony.com>
Date: Sat Oct 9 22:24:38 2010 +0530
ARM: ftrace: function graph tracer support
Cc: Tim Bird <tim.bird@am.sony.com>
[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 <rabin@rab.in>
commit d3b9dc9dd2b994f396741f7086ffe7a48bacb165
Author: Rabin Vincent <rabin@rab.in>
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 <rabin@rab.in>
commit 61b5cb1c3bff8875d2fd289c7b6ac344f95261fa
Author: Rabin Vincent <rabin@rab.in>
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 <rabin@rab.in>
commit 4d23033dfdbb0409dfebaf748ba37ac00ef39825
Author: Jiri Kosina <jkosina@suse.cz>
Date: Fri Nov 19 17:06:41 2010 +0100
Don't touch blackfin with printk typo fixes
This is a partial revert of b595076a ("tree-wide: fix comment/printk
typos"), as blackfin tree is going to have completely different
version of the code.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit ec763f0de879fa1a64b7641098271107f5e32c67
Author: Rabin Vincent <rabin@rab.in>
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 <rabin@rab.in>
commit 5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 19 17:31:08 2010 +0800
ASoC: Move kfree(twl4030) to twl4030_soc_remove()
As we allocate memory for twl4030 in twl4030_codec_probe(),
twl4030_codec_remove() is a better place to free the memory.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 7b306dae22ca377ea0020261ef13aea85b8f5f3f
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Nov 16 20:11:40 2010 +0000
ASoC: Move WM8994 read/write access data into separate file
Makes the WM8994 driver file itself substantially smaller.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 4daf63342fa2424dfcb86ebc338e5d326338f100
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu Nov 18 15:02:26 2010 -0800
regulator: fix kernel-doc for set_consumer_device_supply
Fix kernel-doc warning for set_consumer_device_supply():
Warning(drivers/regulator/core.c:912): missing initial short description on line:
* set_consumer_device_supply: Bind a regulator to a symbolic supply
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 96b101efae0ab68b6510fdbb30384849d211da2c
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu Nov 18 15:49:38 2010 +0000
ASoC: Provide ADC left/right channel source selection on WM8994
Allow the application to choose if the ADC data presented on the left
and right channels is sourced from the internal left or right channel.
This allows a mono recording to be presented as stereo on the external
bus.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit e76941148707a4c7edea23bda65b46b44ae113bd
Author: Daniel Walker <dwalker@codeaurora.org>
Date: Wed Nov 17 15:30:28 2010 -0800
drivers: regulator: core: convert to using pr_ macros
The regulator framework uses a lot of printks with a
specific formatting using __func__. This converts them
to use pr_ calls with a central format string.
Cc: bleong@codeaurora.org
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 963cc4bd7f91cc490f8e199798b50387df29a023
Author: Daniel Walker <dwalker@codeaurora.org>
Date: Wed Nov 17 15:30:27 2010 -0800
drivers: regulator: core: use pr_fmt
This adds a pr_fmt line which uses the __func__ macro. I also
convert the current pr_ lines to remove their __func__ usage.
Cc: bleong@codeaurora.org
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit fe869cdb89c95d060c77eea20204d6c91f233b53
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Oct 19 21:23:00 2010 +0800
crypto: algif_hash - User-space interface for hash operations
This patch adds the af_alg plugin for hash, corresponding to
the ahash kernel operation type.
Keys can optionally be set through the setsockopt interface.
Each sendmsg call will finalise the hash unless sent with a MSG_MORE
flag.
Partial hash states can be cloned using accept(2).
The interface is completely synchronous, all operations will
complete prior to the system call returning.
Both sendmsg(2) and splice(2) support reading the user-space
data directly without copying (except that the Crypto API itself
may copy the data if alignment is off).
For now only the splice(2) interface supports performing digest
instead of init/update/final. In future the sendmsg(2) interface
will also be modified to use digest/finup where possible so that
hardware that cannot return a partial hash state can still benefit
from this interface.
Thakns to Miloslav Trmac for reviewing this and contributing
fixes and improvements.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Martin Willi <martin@strongswan.org>
commit 03c8efc1ffeb6b82a22c1af8dd908af349563314
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Oct 19 21:12:39 2010 +0800
crypto: af_alg - User-space interface for Crypto API
This patch creates the backbone of the user-space interface for
the Crypto API, through a new socket family AF_ALG.
Each session corresponds to one or more connections obtained from
that socket. The number depends on the number of inputs/outputs
of that particular type of operation. For most types there will
be a s ingle connection/file descriptor that is used for both input
and output. AEAD is one of the few that require two inputs.
Each algorithm type will provide its own implementation that plugs
into af_alg. They're keyed using a string such as "skcipher" or
"hash".
IOW this patch only contains the boring bits that is required
to hold everything together.
Thakns to Miloslav Trmac for reviewing this and contributing
fixes and improvements.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Tested-by: Martin Willi <martin@strongswan.org>
commit 6722a4016d7f5f107a82ad71a3ee1ccec105532f
Author: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit deaba190188f1caa2317de4df6c9aaba501f9809
Author: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 5958d58a0e7699c791b9f4c99d76559a14770138
Author: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 71b146c815ed6034bc20a0ec265445bdf4bad78c
Author: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 2006920a18cc9f499e5cccf9e6f1aa9f6120705e
Author: Arnd Hannemann <arnd@arndnet.de>
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 <arnd@arndnet.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 3256c789882281b2eac5978c7d38f6f0bbd16ed6
Author: Takashi YOSHII <takashi.yoshii.zj@renesas.com>
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 <takashi.yoshii.zj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 1cdf370244d5f0a4cf5ed672967cc2e16235908d
Author: Takashi YOSHII <takashi.yoshii.zj@renesas.com>
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 <takashi.yoshii.zj@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit c2f9bff5ace07fbea03a53c6c3253f6c3a81e9f9
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue Oct 19 21:04:42 2010 +0800
net - Add AF_ALG macros
This patch adds the socket family/level macros for the yet-to-be-born
AF_ALG family. The AF_ALG family provides the user-space interface
for the kernel crypto API.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
commit 460ed699f4c943e1ec4a8458869eb532fe31fd16
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S5PV310: Add audio platform devices
Define platform devices for all audio devices found on S5PV310
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 9aa2570e9be4bc43a0ea6abb637d525088ed22b9
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S5PV210: Upgrade platform device for I2S
Add more information to I2S platform_devices in order
to prepare them for new controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 651cba5d17564e684584e544ff9111a3cb409c94
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S5PC100: Upgrade platform device for I2S
Add more information to I2S platform_devices in order to
prepare them for new controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 4f2e4e124c91bb5105b8ecc8928e5fc0f2b2af0f
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S5P6442: Upgrade platform device for I2S
Add more information to I2S platform_devices in order
to prepare them for new controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit d9a93c345a5503668ca2b3a75be0eba1131c90e4
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S5P64X0: Upgrade platform device for I2S
Add more information to I2S platform_devices in order
to prepare them for new controller driver.
Also, discard duplicated gpio-cfg.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 6a62bee2105250ac02bf3c96b7f35e28dac36888
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: S3C64XX: Upgrade platform device for I2S
Add more information to I2S platform_devices in order to
prepare them for new controller driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 498c08805fdbfc0d8a3538bf288475fa3a064fb7
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:44 2010 +0900
ARM: SAMSUNG: Prepare audio header for new I2S driver
Add new defined and data structures in order to prepare for
new I2S driver.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit daea9b4f4416384dfcd0021a9461717974ed4354
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:43 2010 +0900
ARM: SAMSUNG: Rename s3c64xx I2S platform device
Since the I2S of S3C64XX and newer SoCs are incremental
versions of each other with changes managable in a single
driver, rename the 's3c64xx-iis' -> 'samsung-i2s'
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 8b0ae0b719d4ea9aee4ed3a7a09d5ff76557fadf
Author: Jassi Brar <jassi.brar@samsung.com>
Date: Fri Nov 19 08:49:43 2010 +0900
ARM: S5PV310: Add platform devices for PL330 DMACs
Samsung's Soc S5PV310 has three PL330 DMACs. First is dedicated for
Memory->Memory data transfer while the other two meant for data
transfer with peripherals.
Define and add latter two PL330 DMACs as platform devices on the
S5PV310 platform.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
commit 226291aa4641fa13cb5dec3bcb3379faa83009e2
Author: dann frazier <dann.frazier@canonical.com>
Date: Thu Nov 18 15:03:09 2010 -0700
ocfs2_connection_find() returns pointer to bad structure
If ocfs2_live_connection_list is empty, ocfs2_connection_find() will return
a pointer to the LIST_HEAD, cast as a ocfs2_live_connection. This can cause
an oops when ocfs2_control_send_down() dereferences c->oc_conn:
Call Trace:
[<ffffffffa00c2a3c>] ocfs2_control_message+0x28c/0x2b0 [ocfs2_stack_user]
[<ffffffffa00c2a95>] ocfs2_control_write+0x35/0xb0 [ocfs2_stack_user]
[<ffffffff81143a88>] vfs_write+0xb8/0x1a0
[<ffffffff8155cc13>] ? do_page_fault+0x153/0x3b0
[<ffffffff811442f1>] sys_write+0x51/0x80
[<ffffffff810121b2>] system_call_fastpath+0x16/0x1b
Fix by explicitly returning NULL if no match is found.
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
commit a2a2f55291918f6cf9287d7beaecc7bc007a9f1c
Author: Milton Miller <miltonm@bga.com>
Date: Wed Nov 17 22:20:11 2010 -0600
ocfs2: char is not always signed
Commit 1c66b360fe262 (Change some lock status member in ocfs2_lock_res
to char.) states that these fields need to be signed due to comparision
to -1, but only changed the type from unsigned char to char. However, it
is a compiler option if char is a signed or unsigned type. Change these
fields to signed char so the code will work with all compilers.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
commit 1989a80a60d2f620bad99196d6c1801c2afd7c71
Author: Tristan Ye <tristan.ye@oracle.com>
Date: Mon Nov 15 21:39:09 2010 +0800
Ocfs2: Stop tracking a negative dentry after dentry_iput().
I suddenly hit the problem during 2.6.37-rc1 regression test, which was
introduced by commit '5e98d492406818e6a94c0ba54c61f59d40cefa4a'(Track
negative entries v3), following scenario reproduces the issue easily:
Node A Node B
================ ============
$touch testfile
$ls testfile
$rm -rf testfile
$touch testfile
$ls testfile
ls: cannot access testfile: No such file or directory
This patch stops tracking the dentry which was negativated by a inode deletion,
so as to force the revaliation in next lookup, in case we'll touch the inode
again in the same node.
It didn't hurt the performance of multiple lookup for none-existed files anyway,
while regresses a bit in the first try after a file deletion.
Signed-off-by: Tristan Ye <tristan.ye@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
commit 1cf257f511918ba5b2eabd64d9acd40f1d7866ef
Author: Jiri Slaby <jslaby@suse.cz>
Date: Sat Nov 6 10:06:52 2010 +0100
ocfs2: fix memory leak
Stanse found that o2hb_heartbeat_group_make_item leaks some memory on
fail paths. Fix the paths by adding a new label and jump there.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: ocfs2-devel@oss.oracle.com
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Joel Becker <joel.becker@oracle.com>
commit a48a982a6bd3896274dd643397c72da9258411e2
Author: David Sterba <dsterba@suse.cz>
Date: Tue Nov 2 23:36:02 2010 +0100
fs/ocfs2/dlm: Use GFP_ATOMIC under spin_lock
coccinelle check scripts/coccinelle/locks/call_kern.cocci found that
in fs/ocfs2/dlm/dlmdomain.c an allocation with GFP_KERNEL is done
with locks held:
dlm_query_region_handler
spin_lock(dlm_domain_lock)
dlm_match_regions
kmalloc(GFP_KERNEL)
Change it to GFP_ATOMIC.
Signed-off-by: David Sterba <dsterba@suse.cz>
CC: Joel Becker <joel.becker@oracle.com>
CC: Mark Fasheh <mfasheh@suse.com>
CC: ocfs2-devel@oss.oracle.com
--
Exists in v2.6.37-rc1 and current linux-next.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
commit 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd
Author: Vasiliy Kulikov <segoon@openwall.com>
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 <segoon@openwall.com>
LKML-Reference: <1290104207-31279-1-git-send-email-segoon@openwall.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
commit 0a80410dc53cf68e56456bef1ca66949b87412f9
Author: Tomoya <tomoya-linux@dsn.okisemi.com>
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 <tomoya-linux@dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 086b5650dcdaae7c4aa60a5d0724f775e733610e
Author: Tomoya <tomoya-linux@dsn.okisemi.com>
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 <tomoya-linux@dsn.okisemi.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 30dfe2c05037fbc021121c037872c09956938c2f
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit a3a972a053010bfd61c13cfa4ce688d4eebd9a19
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: line6: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a3d13107012ea614184d3c58bb7b579905d5da11
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: zram: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 926c11151e3b82e4facbf2bd2bea15f0ca0ac6f9
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: udlfb: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Bernie Thompson <bernie@plugable.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4d7bc388b44e42a1feafa35e50eef4f24d6ca59d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: samsung-laptop: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c9e51d9e4bee3da47623622884f4828e079a0581
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: iio: adis16220: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Barry Song <Barry.Song@analog.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2a767fda5d0d8dcff465724dfad6ee131489b3f2
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: frontier: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: David Taht <d@teklibre.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 515b4987ccd097cdf5416530b05fdf9e01afe95a
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Nov 18 11:21:04 2010 -0800
Staging: asus_oled: fix up my fixup for some sysfs attribute permissions
They should be writable by root, not readable.
Doh, stupid me with the wrong flags.
Reported-by: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Jakub Schmidtke <sjakub@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a76a574ca9ce7c05791cee42f000f2a42c687837
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Tested-by: Michael Gerdau <mgd@qata.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit aaa13ca2428789b3c8096b5edc175d4d78b5f504
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a05b5d45049d60a06a1b12976150572304a51928
Author: Felix Fietkau <nbd@openwrt.org>
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 <juhosg@openwrt.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 458fafdd579dcb58c8288c55c9cd92d6816ba094
Author: John W. Linville <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
Acked-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0
Author: John W. Linville <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
commit 86107fd170bc379869250eb7e1bd393a3a70e8ae
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit eef39befaae2a1559efe197d795c376a317af2af
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c5485a7e7569ab32eea240c850198519e2a765ef
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4c3710afbc333c33100739dec10662b4ee64e219
Author: Changli Gao <xiaosuo@gmail.com>
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 <xiaosuo@gmail.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Hagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cba328fc5ede9091616e7296483840869b615a46
Author: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
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 <penguin-kernel@I-love.SAKURA.ne.jp>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit edd2126aa8aab8a87db7cc480d5047e9280d7acf
Author: Jiri Kosina <jkosina@suse.cz>
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 <torvalds@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit c311598b29f09c5092747a2603700f96a7daec2a
Author: Jiri Kosina <jkosina@suse.cz>
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 <torvalds@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit f658bcfb2607bf0808966a69cf74135ce98e5c2d
Author: Hans Rosenfeld <hans.rosenfeld@amd.com>
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 <hans.rosenfeld@amd.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit 9653a5c76c8677b05b45b3b999d3b39988d2a064
Author: Hans Rosenfeld <hans.rosenfeld@amd.com>
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 <hans.rosenfeld@amd.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89
Author: Hans Rosenfeld <hans.rosenfeld@amd.com>
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 <hans.rosenfeld@amd.com>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit 8477cedb49c69ce64b603d76c7776811eec0f9d7
Author: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu Nov 11 19:00:53 2010 +0100
jz4740-battery: Check if platform_data is supplied
Currently platform_data is dereferenced without checking whether it
is actually set, which can lead to kernel crashes.
This patch adds a check which will abort the drivers probe function
gracefully if no platform_data is supplied.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit e1a85694e08d03efae9e08fdb292dfd4870837bc
Author: Heikki Krogerus <heikki.krogerus@nokia.com>
Date: Mon Nov 8 12:22:40 2010 +0200
isp1704_charger: Detect charger after probe
If the device is booted up with cable connected, or the
module is loaded after plugging in the cable, the
notification has come and gone, so not relying on it at
probe time. Instead this checks the VBUS level manually
after probe.
Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit a4607d9f5cbae1aad7f86e8204b57d66c0e14e36
Author: Heikki Krogerus <heikki.krogerus@nokia.com>
Date: Thu Nov 4 16:31:48 2010 +0200
isp1704_charger: Set isp->dev before anything needs it
isp1704_test_ulpi() is the first place that needs isp->dev
member, so it must be set before calling the function.
Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit bac43b20501058ab0728246acce3bb85f2e72648
Author: Heikki Krogerus <heikki.krogerus@nokia.com>
Date: Thu Nov 4 16:31:47 2010 +0200
isp1704_charger: Detect HUB/Host chargers
To avoid breaking high speed chirp handshaking with CDP
chargers, no more then 500mA should be drawn. To make sure
of this, utilizing current_max property. After the device
has enumerated, it's safe to draw the maximum 1800mA as
defined in the Battery Charging Specification. This can be
also used with normal USB connection if the controller sends
ENUMERATED notification with the milliamps as data.
From now on the online property indicates VBUS, present
property if there is a charger and current_max the milliamps
possible to draw from VBUS.
Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit 746d8fb8c6933337c927f40c9ef90dcbddcfd39e
Author: Ameya Palande <ameya.palande@nokia.com>
Date: Thu Nov 4 16:31:46 2010 +0200
isp1704_charger: Correct length for storing model
Model should have room to accommodate the trailing null byte,
"isp170[4|7]\0".
Signed-off-by: Ameya Palande <ameya.palande@nokia.com>
Acked-by: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit 5070437cd99511f69ae561f2ab417142a47a85ec
Author: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu Oct 21 17:55:01 2010 +0200
power_supply: Add gpio charger driver
This patch adds a simple driver for chargers indicating their online
status through a GPIO pin.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit 8ec98fe0b4ffdedce4c1caa9fb3d550f52ad1c6b
Author: Lars-Peter Clausen <lars@metafoo.de>
Date: Thu Nov 11 19:00:52 2010 +0100
jz4740-battery: Protect against concurrent battery readings
We can not handle more then one ADC request at a time to the battery.
The patch adds a mutex around the ADC read code to ensure this.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: stable@kernel.org
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit 86af95039b69a90db15294eb1f9c147f1df0a8ea
Author: Sven Neumann <s.neumann@raumfeld.com>
Date: Fri Nov 12 11:36:22 2010 +0100
ds2760_battery: Fix calculation of time_to_empty_now
A check against division by zero was modified in commit b0525b48.
Since this change time_to_empty_now is always reported as zero
while the battery is discharging and as a negative value while
the battery is charging. This is because current is negative while
the battery is discharging.
Fix the check introduced by commit b0525b48 so that time_to_empty_now
is reported correctly during discharge and as zero while charging.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Cc: stable@kernel.org [2.6.32..2.6.36]
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
commit 423478cde453eebdfcfebf4b8d378d8f5d49b853
Author: Frederic Weisbecker <fweisbec@gmail.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Jason Baron <jbaron@redhat.com>
commit 53cf810b1934f08a68e131aeeb16267a778f43df
Author: Frederic Weisbecker <fweisbec@gmail.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Jason Baron <jbaron@redhat.com>
commit fe5542030dce3b951f9eaf3ecb9a7bc5fa7bfed1
Author: Frederic Weisbecker <fweisbec@gmail.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Jason Baron <jbaron@redhat.com>
commit 1ed0c5971159974185653170543a764cc061c857
Author: Frederic Weisbecker <fweisbec@gmail.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Jason Baron <jbaron@redhat.com>
commit 61c32659b12c44e62de32fbf99f7e4ca783dc38b
Author: Frederic Weisbecker <fweisbec@gmail.com>
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Jason Baron <jbaron@redhat.com>
commit 9c0729dc8062bed96189bd14ac6d4920f3958743
Author: Soeren Sandmann Pedersen <sandmann@redhat.com>
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 <ssp@redhat.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arjan van de Ven <arjan@infradead.org>,
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>,
LKML-Reference: <m3oc9rop28.fsf@dhcp-100-3-82.bos.redhat.com>>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
commit 84e1c6bb38eb318e456558b610396d9f1afaabf0
Author: matthieu castet <castet.matthieu@free.fr>
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 <sliakh.lkml@gmail.com>
Signed-off-by: Xuxian Jiang <jiang@cs.ncsu.edu>
Acked-by: Arjan van de Ven <arjan@linux.intel.com>
Reviewed-by: James Morris <jmorris@namei.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <ak@muc.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Jones <davej@redhat.com>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <4CE2F914.9070106@free.fr>
[ minor cleanliness edits, -v14: build failure fix ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 9437178f623a19af5951808d880a8599f66ac150
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com?>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.465521344@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d6b5591829bd348a5fbe1c428d28dea00621cdba
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.377473595@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.291159744@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit c66eaf619c0c7937e9ded160ae83b5a7a6b19b56
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.204191702@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit a7a4f8a752ec734b2eab904fc863d5dc873de338
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.112173964@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 67e86250f8ea7b8f7da53ac25ea73c6bd71f5cd9
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234938.022488865@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e33078baa4d30ad1d0e46d1f62b9e5a63a3e6ee3
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234937.933428187@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit f0d7442a5924a802b66eef79b3708f77297bfb35
Author: Paul Turner <pjt@google.com>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234937.844900206@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 9e3081ca61147b29f52fddb4f7c6b6b82ea5eb7a
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234937.754159484@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 3d4b47b4b040c9d77dd68104cfc1055d89a55afd
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234937.666535048@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 2069dd75c7d0f49355939e5586daf5a9ab216db7
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <pjt@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20101115234937.580480400@google.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 48c5ccae88dcd989d9de507e8510313c6cbd352b
Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
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 <oleg@redhat.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1289851597.2109.547.camel@laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 8cb473da3fe634fb30c1e5be8840b00f499103a8
Author: Michal Simek <monstr@monstr.eu>
Date: Tue Nov 2 18:04:04 2010 +0100
microblaze: Fix initramfs
Patch: initramfs: generalize initramfs_data.xxx.S variants
(sha1 6ae64e428f74e7bacab898ef9665dda719ea6fde)
requires hooks in linker script.
Signed-off-by: Michal Simek <monstr@monstr.eu>
commit 5bd5a452662bc37c54fb6828db1a3faf87e6511c
Author: Matthieu Castet <castet.matthieu@free.fr>
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 <sliakh.lkml@gmail.com> and Xuxian Jiang <jiang@cs.ncsu.edu>.
-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 <sliakh.lkml@gmail.com>
Signed-off-by: Xuxian Jiang <jiang@cs.ncsu.edu>
Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: James Morris <jmorris@namei.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Jones <davej@redhat.com>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <4CE2F82E.60601@free.fr>
[ minor cleanliness edits ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 64edc8ed5ffae999d8d413ba006850e9e34166cb
Author: matthieu castet <castet.matthieu@free.fr>
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 <sliakh.lkml@gmail.com>
Signed-off-by: Xuxian Jiang <jiang@cs.ncsu.edu>
Reviewed-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: James Morris <jmorris@namei.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dave Jones <davej@redhat.com>
Cc: Kees Cook <kees.cook@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <4CE2F7F3.8030809@free.fr>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit e9229faf920aba47dd1ba6940b3ca138024543d3
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sun Nov 7 09:46:28 2010 -0500
HID: usbhid: Clean up makefile (-y instead of -objs)
Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit d47d612459300510215fc54bf1283f81710745df
Author: Tracey Dent <tdent48227@gmail.com>
Date: Thu Nov 18 10:42:30 2010 +0100
HID: Clean up makefile (-y instead of -objs)
Changed Makefile to use <modules>-y instead of <modules>-objs because -objs is
deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt).
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 82148d1d0b2f369851f2dff5088f7840f9f16abf
Author: Shérab <Sebastien.Hinderer@ens-lyon.org>
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 <Sebastien.Hinderer@ens-lyon.org>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
[ did minor coding style edits ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 79250af2d5953b69380a6319b493862bf4ece972
Author: Kees Cook <kees.cook@canonical.com>
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 <yinghai@kernel.org>
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
LKML-Reference: <1289931004-16066-1-git-send-email-kees.cook@canonical.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit c44f242064093e640a068741b05ee6acdd49bc22
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <dtor@mail.ru>
commit 8ee294cd9def0004887da7f44b80563493b0a097
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <dtor@mail.ru>
commit ce16a474f6305dd631c885ba970d5746e4d5c803
Author: Chris Leech <christopher.leech@linux.intel.com>
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 <christopher.leech@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 8b5fce06f8795d9a7f8d1f03f743fc8befa66b3b
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu Nov 18 00:14:03 2010 -0800
Input: qt602240_ts - convert to using dev_pm_ops
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit e3f0f0a6c11b049f1be603dcfec82d2a8643f5fd
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 072b198a4ad48bd722ec6d203d65422a4698eae7
Author: Don Zickus <dzickus@redhat.com>
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 <dzickus@redhat.com>
Cc: fweisbec@gmail.com
Cc: gorcunov@openvz.org
LKML-Reference: <1289578944-28564-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a
Author: Don Zickus <dzickus@redhat.com>
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 <dzickus@redhat.com>
Cc: fweisbec@gmail.com
Cc: gorcunov@openvz.org
LKML-Reference: <1289578944-28564-2-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 89ba4d12fca24d373e1b10fce498d68157bafaf0
Author: Paul Mundt <lethal@linux-sh.org>
Date: Thu Nov 18 16:47:02 2010 +0900
ARM: mach-shmobile: Add ag5evm defconfig.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 45bbaae0dcddc275594e23f108cb68869eae7433
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 6d9598e24d50a8c72f48a3864327484a30aaee44
Author: Magnus Damm <damm@opensource.se>
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 <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 8b182b783fe0ec6600632a2dad0187e5986a7d92
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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 <avi@redhat.com>
Reported-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 6a0cc49ed85d5acf87144e241ceae6c8f249465d
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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 <tj@kernel.org>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 16f3fee8c172fe0a4933a1372e7fd83bb17696d4
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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 <paulmck@linux.vnet.ibm.com>
commit 23be2832250e3a5f2c2cf57e0fc672c6dc851fc8
Author: Lai Jiangshan <laijs@cn.fujitsu.com>
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 <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 442bdd718a1655c8580cd89307ea38caf3380cb1
Author: Lai Jiangshan <laijs@cn.fujitsu.com>
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 <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 091f9619f4db8760a5bd5950b156afc8718febd6
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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 <paulmck@linux.vnet.ibm.com>
commit 4713dac4c1394bf82e8b10c30e0251dea2098ec6
Author: Paul E. McKenney <paul.mckenney@linaro.org>
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 <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit fd7a3759ad6a9ba1d5c9da804a34600a28944678
Author: Paul E. McKenney <paul.mckenney@linaro.org>
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 <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 4441da00f9dc58f99da62b381d9a4a8c816ac7af
Author: Paul E. McKenney <paul.mckenney@linaro.org>
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 <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 546c95d7d407ff7a21938b2b42bbd6620c80f0ad
Author: Paul E. McKenney <paul.mckenney@linaro.org>
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 <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit b2c0710c464ede15e1fc52fb1e7ee9ba54cea186
Author: Paul E. McKenney <paul.mckenney@linaro.org>
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 <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
commit 6b6e39a6a8da7234c538d14c43d3583da8875f9c
Author: Kay Sievers <kay.sievers@vrfy.org>
Date: Mon Nov 15 23:13:18 2010 +0100
driver-core: merge private parts of class and bus
As classes and busses are pretty much the same thing, and we want to
merge them together into a 'subsystem' in the future, let us share the
same private data parts to make that merge easier.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4f6838436915fdc281173bfd5bef6d8ab5cb1a7f
Author: Dirk Brandewie <dirk.brandewie@gmail.com>
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 <dirk.brandewie@gmail.com>
CC: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2f15744c1d90ee2e82f8ae5724b44b1cdf31715c
Author: Alan Stern <stern@rowland.harvard.edu>
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit aa02f172ac85f144d0baa248e27e34e165963f94
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2d42efc44e38d3a8b2bf30e34559036bb6541672
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 71a3bf3e94b745467fc4c3451a294910f0369555
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 28d167086227969fd6586953ee4ac682a3c394ff
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c5992618259598ade82c386aa1595bf105e92d1f
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:09 2010 +0100
ath9k: remove bf_tx_aborted from struct ath_buf
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 76e4522177de81ac89ade01a394aeb3704a66f1b
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:08 2010 +0100
ath9k: remove bfs_frmlen from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b572d0335fcb26e526f6ae087a9a09371b22e739
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:07 2010 +0100
ath9k: remove bfs_nframes from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:06 2010 +0100
ath9k: remove bfs_al from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3017047f564d5101009c8318b94bdacd3ca3312e
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:05 2010 +0100
ath9k: remove bfs_keyix from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:04 2010 +0100
ath9k: remove bfs_paprd_timestamp from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 952cd693718d8ac796d5323fe7876241cf15ecfa
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:03 2010 +0100
ath9k: remove bfs_keytype from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5daefbd061d9509644058b6886abe2b6672ee386
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:02 2010 +0100
ath9k: remove bfs_tidno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2d3bcba0827013dfc60f727e7370dea00bc0638a
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 15:20:01 2010 +0100
ath9k: remove bfs_seqno from struct ath_buf_state
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sun Nov 14 00:03:01 2010 +0100
ath9k: fix PA predistortion training frame setup
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c5d0855acfa4d6801c4c45bc02ddddd959262050
Author: Felix Fietkau <nbd@openwrt.org>
Date: Sat Nov 13 20:22:41 2010 +0100
ath9k_hw: set default values for radar pulse detection
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 387e68846413f3dcfc5a5afca9841430057e3340
Author: RA-Jay Hung <Jay_Hung@ralinktech.com>
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 <jay_hung@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a
Author: RA-Jay Hung <Jay_Hung@ralinktech.com>
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 <jay_hung@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b43d63bd69ae5464a52bf1796e84097607917b2f
Author: RA-Jay Hung <Jay_Hung@ralinktech.com>
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 <jay_hung@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6
Author: Gertjan van Wingerde <gwingerde@gmail.com>
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 <gwingerde@gmail.com>
Tested-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 72c7296e03e381b49958809915105b18b09fa7a3
Author: Gertjan van Wingerde <gwingerde@gmail.com>
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 <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5
Author: Gertjan van Wingerde <gwingerde@gmail.com>
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 <gwingerde@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0
Author: Gertjan van Wingerde <gwingerde@gmail.com>
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 <gwingerde@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039
Author: Gertjan van Wingerde <gwingerde@gmail.com>
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 <gwingerde@gmail.com>
Cc: Eddy Tsai <Eddy_Tsai@ralinktech.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d
Author: Ivo van Doorn <ivdoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 24aee93c37fe7fa2aa2381d3017be478e9c55c47
Author: Vinod Koul <vinod.koul@intel.com>
Date: Wed Nov 17 15:57:57 2010 +0000
sst: remove rest of aava bits and aava related code
This removes the remaining bit of aava dependent and related bits from driver
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 63fcf10db218a89cbd1e34c47540c3e28706cff1
Author: Yong Wang <yong.y.wang@linux.intel.com>
Date: Wed Nov 17 22:09:54 2010 +0800
staging: spectra: asynchronous init
The spectra nand driver takes quite some time to initialize because
it needs to scan the whole nand disk to find the latest block table.
This patch initializes the spectra nand driver asynchronously so that
other things in the kernel can initialize in parallel to the scanning
operation.
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6f5a416216fe2c39171326897e074d417df1082b
Author: Yong Wang <yong.y.wang@linux.intel.com>
Date: Wed Nov 17 22:08:28 2010 +0800
staging: spectra: move all init logic into nand_pci_probe
Currently there are some driver initialization logic that
is not part of nand_pci_probe function. This will result in
that part of driver initialization code executing even on
platforms without the corresponding hardware which is always
dangerous.
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 237a1a1aef91ab654988cb459d783ac0ee09d2ea
Author: Dan Carpenter <error27@gmail.com>
Date: Wed Nov 17 11:54:35 2010 +0300
Staging: ft1000-usb: freeing uninitialized pointer
GCC complains that if (info->CardReady) is false we kfree() an
uninitialized pointer.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 93760716840a3feada381786f2defbd47a8099de
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 16 17:41:15 2010 -0800
staging: brcm80211: nicpci.c: replace osl based PCI calls with native linux pci calls
Get rid of the private PCI access routines and replace with standard calls from linux/pci.h in nicpci.c
(The private versions are still used in siutils.c... for now)
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e69284f24320e2589dbd78bf531ffa18d097ae4c
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 16 15:45:48 2010 -0800
staging: brcm80211: s/osl_t/struct osl_info/g
Do the substitution (and then fix all the dang lines that were pushed past 80 columns.)
Some of the touched lines triggered checkpatch warnings for completely unrelated
reasons that were already there. Those will have to be addressed later.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e6a12a07d0b06f8e614a212e26002e62071242e8
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 16 13:16:59 2010 -0800
staging: brcm80211: completely remove osl_pubinfo_t typedef
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1070137de3e3b0f3fdfedc420a06a43d05a6e705
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Nov 16 13:16:58 2010 -0800
staging: brcm80211: expose osl contents and start combining osl and pub_osl.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit dda0b38692a7298f433b92b1329867b1ecabb4bb
Author: Vasiliy Kulikov <segoon@openwall.com>
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 <segoon@openwall.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9ea19481db31d614f729f346bdcf28e4e60ff14a
Author: John Fastabend <john.r.fastabend@intel.com>
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:
[<ffffffff8121c940>] kobject_init+0x3a/0x83
[<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
[<ffffffff8107b800>] ? mark_lock+0x21/0x267
[<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
[<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
[<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
[<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
[<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5811662b15db018c740c57d037523683fd3e6123
Author: Changli Gao <xiaosuo@gmail.com>
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 <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit dd68ad2235b4625e0dc928b2b4c614d265f976d3
Author: Philippe De Muyter <phdm@macqel.be>
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 <phdm@macqel.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d8ee707114bc3615fd7be90eb942eba2dbe668ed
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a31ff3880578c37fd5c71ee863c23897dacfa9f8
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 73e1cc4a4a02cfd2d520355de56ce1dafa11dd59
Author: Yong Wang <yong.y.wang@linux.intel.com>
Date: Wed Nov 17 21:02:13 2010 +0800
staging: spectra: fix build error
blk_queue_ordered() has been deprecated and replaced with
blk_queue_flush() by Tejun. However, use of blk_queue_ordered()
in spectra nand driver has not been converted yet and thus results
in the following build error.
drivers/staging/spectra/ffsport.c: In function SBD_setup_device:
drivers/staging/spectra/ffsport.c:659: error: implicit declaration of function blk_queue_ordered
drivers/staging/spectra/ffsport.c:659: error: QUEUE_ORDERED_DRAIN_FLUSH undeclared (first use in this function)
drivers/staging/spectra/ffsport.c:659: error: (Each undeclared identifier is reported only once
drivers/staging/spectra/ffsport.c:659: error: for each function it appears in.)
Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 802aa9c058f2046f0a5683f04d7755c362734010
Author: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Date: Tue Nov 16 14:09:06 2010 +0000
qlcnic: Bumped up driver version to 5.0.12
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 706f23ada68746ed475488e7d2e2ca392fc4f731
Author: Sony Chacko <sony.chacko@qlogic.com>
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 <sony.chacko@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2679a135e6452359cd807754617db0d05ad404e5
Author: Sritej Velaga <sritej.velaga@qlogic.com>
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 <sritej.velaga@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c21fd48c22bd1a9c4a5286963086f246c782e47e
Author: Rajesh Borundia <rajesh.borundia@qlogic.com>
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 <rajesh.borundia@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2abea2f0a5ab161facd865356d2e59b23204414e
Author: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
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 <sucheta.chakraborty@qlogic.com>
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b382b191ea9e9ccefc437433d23befe91f4a8925
Author: Thomas Graf <tgraf@infradead.org>
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 <tgraf@infradead.org>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4
Author: Thomas Graf <tgraf@infradead.org>
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 <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ca7479ebbd9f7621646bf2792cb7143647f035bb
Author: Thomas Graf <tgraf@infradead.org>
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 <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f8ff182c716c6f11ca3061961f5722f26a14e101
Author: Thomas Graf <tgraf@infradead.org>
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 <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d67ef35fff67845c64d806c033cc7c569ccebfff
Author: Jeremy Eder <jeder@redhat.com>
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 <jpirko@redhat.com>
Signed-off-by: Jeremy Eder <jeder@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6906d94013a9c69fc5dfad319c8c508a7a04381d
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 17:05:05 2010 -0200
[media] rc: Rename IR raw interface to ir-raw.c
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9920239c90d5f6dadfb44325abf3568a5e3fd827
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1e84e2dedb313a6ed2d2968e24775789d79ee9ca
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 16:56:53 2010 -0200
[media] rc: use rc_map_ prefix for all rc map tables
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1f1aaf82825865a50cef0b4722607abb12aeee52
Author: Eric Paris <eparis@redhat.com>
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 <eparis@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ee58681195bf243bafc44ca53f3c24429d096cce
Author: Eric Paris <eparis@redhat.com>
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 <kaber@trash.net>
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit da6836500414ae734cd9873c2d553db594f831e9
Author: Eric Paris <eparis@redhat.com>
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 <kaber@trash.net>
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f14ad978888ba63aa796e58ca501dc2f79af1b17
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 16:46:09 2010 -0200
[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 <mchehab@redhat.com>
commit 37d668004289d202f71dc5bfdadf6c18b34577a2
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:33 2010 +0000
net/atm: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ece49153b601d95bcebd45a6394e370972f0b0a0
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:31 2010 +0000
drivers/net: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:30 2010 +0000
drivers/net/vxge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:29 2010 +0000
drivers/net/usb: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:28 2010 +0000
drivers/net/qlge: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:27 2010 +0000
drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a887e220760c12e00b0591d67987e26f6e270d71
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:26 2010 +0000
drivers/net/pcmcia: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c04914af6861d62df303aeedbbe554972ce4e736
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:25 2010 +0000
drivers/net/bonding: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a17531fa4c951f32ca4f90b04ca42cfb11924098
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 11:12:24 2010 +0000
drivers/isdn/i4l: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 80bab1fc7a0e0c54fe46bc7e5e4dad3ec313d43a
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 15:28:27 2010 -0200
[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 <mchehab@redhat.com>
commit c61020602b27833971057d263d3def201267d6db
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 7f71cea586090ea4f58f921da1519178e028e33a
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 8faab8a0eddb3a2378d3dc7c2e64b4f4a57d5e2e
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit cb8eb2981e75433f8dba655ca3b130bda004f41b
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit b3deb424694285b10c5acbdf60470aaacda4933b
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit f0184a31560297272aedb8ea2f80ce6a9c323d1b
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon Nov 15 13:38:06 2010 +0000
ARM: include local timer irq stats only when local timers configured
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e4c18220e14cb07a74b5b9ace0df03a568b1c79f
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit cc77b6f1acd87377f89549adf6bfd4091b3d8cec
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 6fb1f61bdf9ff9f3dd796d5dbc26447baf3dd0c6
Author: Russell King <rmk+kernel@arm.linux.org.uk>
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 <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e58462f45e39e01799d8b1ebab4816bd0ca68ddc
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 15:20:52 2010 -0200
[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 <mchehab@redhat.com>
commit 9489b7834e261a7260ec10aba8d08073a9ee6a75
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 15:12:46 2010 -0200
[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 <mchehab@redhat.com>
commit 0185f5939c10884a519dcad0c3e8c56015839796
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Thu Sep 30 12:37:26 2010 +0100
xen: implement XENMEM_machphys_mapping
This hypercall allows Xen to specify a non-default location for the
machine to physical mapping. This capability is used when running a 32
bit domain 0 on a 64 bit hypervisor to shrink the hypervisor hole to
exactly the size required.
[ Impact: add Xen hypercall definitions ]
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
commit 48107aaf2644ee0ffec92d7fa2a0f6d64e2588ec
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 14:53:11 2010 -0200
[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 <mchehab@redhat.com>
commit 6054b776779dec80345a71e856317a63156a2171
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 14:28:38 2010 -0200
[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 <mchehab@redhat.com>
commit 8fe2b8bc164b523eb858d6b073a4640e682d5622
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 11:05:29 2010 -0200
[media] rc: Remove ir-common.h
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 07b6dc07b83a15f852bc12a9e9ed46e4293c3bcc
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 17 10:58:09 2010 -0200
[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 <mchehab@redhat.com>
commit a3ba01b63468c925518da2da0ac3be11358f60cb
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Nov 16 00:07:48 2010 +0100
BKL: move CONFIG_BKL to staging
Instead of moving the actual code to staging for stuff that
depends on CONFIG_BKL, this moves just the configuration
option it depends on.
As a consequence, the remaining non-staging drivers that use
the BKL (i830, appletalk, ipx, x25, adfs, hpfs and ufs)
implicitly depend on staging until they get fixed.
This sets 2.6.39 as the arbitrary date when we actually remove
the option along with its last users.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit 69baedf9d18ea86cc3b9916f5eeac9d089d3a117
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Nov 16 00:05:57 2010 +0100
BKL: mark lock_kernel as deprecated
No new code should use the big kernel lock, so
we should really emit compiler warnings to make
people building out of mainline code aware of
this.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit 6585b93f25247fe064d245b1068dc3235b7d4800
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Nov 16 00:03:04 2010 +0100
BKL: disable by default
As discussed at the kernel summit, this change disables
the big kernel lock by default. It is still possible to
enable it in order to build the modules that use it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit bb2d384ab8184eb7f7146897e47fa5b38583112c
Author: Arnd Bergmann <arnd@arndb.de>
Date: Mon Nov 15 23:51:25 2010 +0100
BKL: remove references to lock_kernel from comments
Lock_kernel is gone from the code, so the comments
should be updated, too. nfsd now uses lock_flocks
instead of lock_kernel to protect against posix
file locks.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit 73562ba374103847a9c4f9587ecbc7ae99e19c23
Author: Arnd Bergmann <arnd@arndb.de>
Date: Mon Nov 15 23:47:11 2010 +0100
BKL: remove extraneous #include <smp_lock.h>
The big kernel lock has been removed from all these
files at some point, leaving only the #include.
Remove this too as a cleanup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit e91e7a24e102c0e2c422b5eeff663b54d77cab9e
Author: Arnd Bergmann <arnd@arndb.de>
Date: Mon Nov 15 11:03:10 2010 +0100
drm/i810: remove the BKL
SMP i810 systems were practically nonexistent and the configuration
was not officially supported by Intel at the time when Pentium-III
was common.
With this change, it is still possible to build a distribution kernel
that has support for SMP and includes the i810 driver without the BKL.
As a precaution, check for the theoretical SMP case at run time and
refuse to load the driver.
We also need to disable CONFIG_PREEMPT builds for this driver.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Dave Airlie <airlied@linux.ie>
commit f2fed18d2a61afa5592b3002407e432c689c33f4
Author: Arnd Bergmann <arnd@arndb.de>
Date: Mon Nov 15 23:34:06 2010 +0100
staging/stradis: mark as "depends on BKL"
The stradis driver is on its way out, but it
should still be marked correctly as depending
on the big kernel lock. It could easily be
changed to not require it if someone decides
to revive the driver and port it to v4l2 in
the process.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
commit d3e1884bc585a43674d2cb0d3f0aeeb0ae43bc04
Author: Feng Tang <feng.tang@intel.com>
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 <feng.tang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101117121050.9998.89348.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit ad02519a0d27da4a0a50cbc696e810c94e27c28e
Author: Randy Dunlap <randy.dunlap@oracle.com>
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 <randy.dunlap@oracle.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <20101115101406.77e072ef.randy.dunlap@oracle.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
commit b9fc71f47dc060c588e5099638242fad44eeecbc
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
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 <randy.dunlap@oracle.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101115173110.6877.83958.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 032a6424aeea7333a8dafc8cc05dd10b09c62680
Author: Dan Murphy <dmurphy@ti.com>
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 <dmurphy@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
commit fc63de829bbfa3945ffd6327bd3dc88f4e643642
Author: sricharan <r.sricharan@ti.com>
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 <r.sricharan@ti.com>
Acked-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
commit 6fea7b0a7ad9b79aca09df4c42773927db6934ed
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
commit a7722d8796c3431163943c30af7a90d87c43180a
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
commit fb6bf6320e33af5bd6ac788f27245f9162bc5215
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
commit a041a52c4d2b82e25de2267bce5f4dc3d2179b2a
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
commit 112485e9c543b17fc08daea56c7a558b415d06af
Author: Benoit Cousson <b-cousson@ti.com>
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/<partition>
if the current mux mode is not the default one.
Thanks to Tony Lindgren <tony@atomide.com> 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 <dmurphy@ti.com> for testing on OMAP4 and reporting
a couple of bugs.
Thanks to Anand Gadiyar <gadiyar@ti.com> for testing on OMAP3 zoom and
bug report.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Murphy Dan <dmurphy@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
commit 1cbb3a9a132969ed1ffeaecff2f910619d4470ae
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
commit 194ee8e89cc02d8bea8a0b837271f79ca0c72873
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 15:32:21 2010 +0100
ARM: mx25: dynamically allocatate imx-fb devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit e7c74b343091e0c6b7bb67c12f9f7fb345aa6a50
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 11 11:57:21 2010 +0100
ARM: mx25: dynamically allocate imxdi_rtc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit ab9cee4b2167f8bf01d85b537df5b9cbe342c780
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <maramaopercheseimorto@gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit d485c7e71675abdd6133128e596b41284c2ee7b5
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 5f3d1092a949b33d01c95b7f5e5a83672629f131
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed Nov 10 22:15:45 2010 +0100
ARM: mx25: dynamically allocate mxc_pwm devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 224b8c83641c2f31e3efc9bc5956636cc42cadf7
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed Nov 10 21:50:07 2010 +0100
ARM: mx25: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 2c20b9f19add2248dc867f1f78dcef1eb0944543
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit e9f0bafb4f3d32d0bc0ea7e946d667a68bae59ce
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 3a6f52a79fc0ce1c8b950c628bcf101f8652e957
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed Nov 10 10:22:02 2010 +0100
ARM: imx: remove now empty devices.h
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 9f871469893a6d87c6cddf412f82ebf588fd4eca
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed Nov 10 10:11:23 2010 +0100
ARM: imx: dynamically allocate imx21-hcd devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Wed Nov 10 09:58:56 2010 +0100
ARM: imx: dynamically allocate imx-keypad devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit bd455ed36c487b949068182bfee478b785ee090b
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Nov 9 17:52:14 2010 +0100
ARM: imx: dynamically allocate fsl-usb2-udc devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 2eb42d5c287f5e883a4b3ebe668ba880caa351e5
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri Nov 5 18:52:09 2010 +0100
ARM: imx: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 9d3d945a8d5be2c915f646e8dff8422486a77030
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit c194daad0e0de94ed5e03aa723eb56b4a3ae9738
Author: Alberto Panizzo <maramaopercheseimorto@gmail.com>
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 <maramaopercheseimorto@gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit bf182bcc6e726cce2f02b699bd0fba787734554f
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Fri Nov 5 15:01:16 2010 +0100
ARM: imx: dynamically allocate mxc_pwm devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit c06246576a6e71b72ecc6b4b39a5c8eaf45dc2ed
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit ad851bffba6afd6468f96a6180cc4a14e9ebee38
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Thu Nov 4 17:07:48 2010 +0100
ARM: imx: dynamically register imx-fb devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit fc40d0191943fa995f5359b5c23aa7c3dea69d7b
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit e0a1961df8ad898b661cf0adcf3519254f135a44
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit b2997cb12b302ee6d233808e32214d00afdcf128
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Nov 2 17:50:55 2010 +0100
ARM: imx: dynamically allocate mx2-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 3bde75b5370bd69fd7f07a8e254bef05b1b5b219
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Nov 2 16:42:27 2010 +0100
ARM: imx/gpio: remove some useless casts
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 9bb39b3f600101b09cbb35e0a0deb9d56c4fe67f
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Nov 2 11:59:08 2010 +0100
ARM: imx: dynamically allocate mx1-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
commit 6332c1071811a1d588cfc93330d87a57a7460a1b
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit e08300043ee4e2df10be551b76e126d6c02f26cc
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 300f86da1787c680598ea441aaa602a1664fba86
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit ae71a5622253708aa08df231e6415fe7a1e96b10
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit d96801b2ca47cfeddadede7a1998e1fe0eab095c
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit ac401427c05a6a371950a1cdfaec75f72bffb9b5
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit a99631489bbd1b4647b82d0822b6a3942e2dd731
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit cf3a6aba2f8402d4e45f7f263a0e69f779cd1bdc
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 08ff97b5214143c3bd47add6ec49097cb848120a
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit f5d7a13b18706c3328c6aac3bf782a13cabf255a
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 9651b7db59893e796dfdd170485543b9863be9d8
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21
Author: Dongdong Deng <dongdong.deng@windriver.com>
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 <dongdong.deng@windriver.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9
Author: Bruce Allan <bruce.w.allan@intel.com>
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 <bruce.w.allan@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit d478eb44f7a6b53256ae399fa7e597525b4034ee
Author: Bruce Allan <bruce.w.allan@intel.com>
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 <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit b1d670f10e8078485884f0cf7e384d890909aeaa
Author: Greg Rose <gregory.v.rose@intel.com>
Date: Tue Nov 16 19:41:36 2010 -0800
Remove extra struct page member from the buffer info structure
declaration.
Reported-by: Andi Kleen <andi@firstfloor.org>
Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308
Author: Julian Stecklina <jsteckli@os.inf.tu-dresden.de>
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 <jsteckli@os.inf.tu-dresden.de>
Acked-by: Greg Rose <greg.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 2c20ebbaed7f3f21506629ee931941a9bba199ab
Author: Greg Rose <gregory.v.rose@intel.com>
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 <gregory.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42
Author: Greg Rose <gregory.v.rose@intel.com>
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 <gregory.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit e2ddeba95c09d0d44719ff005e915dc06ff46571
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0
Author: Don Skidmore <donald.c.skidmore@intel.com>
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 <donald.c.skidmore@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit fe15e8e1c78521e0b4e375d6ed415b82265419c9
Author: Don Skidmore <donald.c.skidmore@intel.com>
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 <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit a391f1d51244b8274920a33c5d11aeebec3aa68f
Author: Don Skidmore <donald.c.skidmore@intel.com>
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 <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 9b55bb038468a7b504ccdc1d956952598ae1b85b
Author: Yi Zou <yi.zou@intel.com>
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 <yi.zou@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b
Author: Yi Zou <yi.zou@intel.com>
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 <yi.zou@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit a41c059741570779c0254a3a1aa4da3baa463d7c
Author: Yi Zou <yi.zou@intel.com>
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 <yi.zou@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit c84d324c770dc81acebc1042163da33c8ded2364
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 2274543f15133165b855b9a4a1503b2c1268c6cf
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit d0759ebb051972f8557a19aa13cf02fc314856e9
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 125601bf03a13e24d3785ccbc3a25ad401c92772
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit bf29ee6c4819a86ba0209281550b230889b8ebe6
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 673ac60461082e07be58b23f237d651c2605ce60
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 50d6c681d0c38208e494f0c6302ef13d21dababa
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit e2b4e216b7e9da09175c76887c754489681533b9
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit aa80175a539a47fd11e2fbf1696a29f7a2652930
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit b953799ee29075afd30afe4c0fb65f278b088f69
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 80fba3f4341b1c98430bee620b507d3f5b7086cd
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit c60fbb00f0400792adf873dbacd431885653b77d
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 01fa7d905fe9a5b045615fbde19e6c0f78063206
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit b6ec895ecd32c0070c3b2b17918c030275cd834d
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 84ea2591e4a24775c2735511a1cc3cf88edd249d
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit d5f398ed73522b9f76861af6553775c5851de0d0
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe
Author: Alexander Duyck <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 80ab193dce048e7b7afa43c99e69f508167e29ab
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 16b61beb39f2446460f93c08d4d263dc24f22dd8
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7
Author: Greg Rose <gregory.v.rose@intel.com>
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 <gregory.v.rose@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit 1a51502bddca7ac1e921d918b741ffd2bec149ed
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Reported-by: Tantilov, Emil S <emil.s.tantilov@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
commit fc94fb6d2dfc3c41e99a742e95512f3f8bb24277
Author: Manu Abraham <abraham.manu@gmail.com>
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 <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1e850f0632bca0a0fd829256c44e7fc99a873d81
Author: Manu Abraham <abraham.manu@gmail.com>
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 <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d28a8045ea0aab9e278d2f7da90202db978cda1f
Author: Ben Hutchings <ben@decadent.org.uk>
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 <ben@decadent.org.uk>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit a98571ea4dc028bc48cb5f3266fbf4b78c00e49e
Author: Bjørn Mork <bjorn@mork.no>
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 <bjorn@mork.no>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6b141651d1f0fda6baf8ca4cbbdb6b18e82e3ea3
Author: Marko Ristola <marko.ristola@kolumbus.fi>
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 <marko.ristola@kolumbus.fi>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit cba1a66d511d46c426ea02c322293b48f3b88cf2
Author: Sage Weil <sage@newdream.net>
Date: Tue Nov 16 11:17:50 2010 -0800
ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS
This implements the DIRLAYOUTHASH protocol feature, which passes the dir
layout over the wire from the MDS. This gives the client knowledge
of the correct hash function to use for mapping dentries among dir
fragments.
Note that if this feature is _not_ present on the client but is on the
MDS, the client may misdirect requests. This will result in a forward
and degrade performance. It may also result in inaccurate NFS filehandle
generation, which will prevent fh resolution when the inode is not present
in the client cache and the parent directories have been fragmented.
Signed-off-by: Sage Weil <sage@newdream.net>
commit e8d12d408c6e6be40668bf201073a998344407ab
Author: Sage Weil <sage@newdream.net>
Date: Tue Nov 16 11:14:34 2010 -0800
ceph: add dir_layout to inode
Add a ceph_dir_layout to the inode, and calculate dentry hash values based
on the parent directory's specified dir_hash function. This is needed
because the old default Linux dcache hash function is extremely week and
leads to a poor distribution of files among dir fragments.
Signed-off-by: Sage Weil <sage@newdream.net>
commit eaa7d0ae9c3b952ed30224a048bb6b9feef6ea4b
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat Nov 13 21:35:49 2010 +0100
firewire: ohci: fix reception of 4k sized asynchronous packets
At S800, packets may be up to 4096 bytes + headers (+ OHCI trailer)
large. This was not handled by firewire-ohci until now.
As Maxim Levitsky points out, 8k buffer segments instead of 4k ones let
us easily fix the bug that async packets with 4096 bytes payload cannot
be received. Plus, this is a quick and easy way to reduce ack-busy-*
events without having to change the ar_context_tasklet to deal with more
than two segments. (In my testing, firewire-net is still able to
saturate some controllers even with its current low transmitter queue
depth of <= 8 datagrams at default MTU of 1500 bytes. FTP over fw-net
throughput from a XIO2213A to an FW323 is only improved by about 4% by
this change, and even less in the other direction.)
Clemens Ladisch found that rather about 20k are required to converge to
optimum performance, but for now I do not dare to rely on slab
allocations larger than 8k (times two per context, for two contexts).
Better defer that to a code change for more than two AR buffer segments.
Also,
- since "firewire: ohci: avoid reallocation of AR buffers",
ar_context_add_page is only used by ar_context_init/ pci_probe and
therefore can allocate with GFP_KERNEL,
- add WARN_ON(allocation failure) as a lame way of error handling.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
commit c08512c761e7b9eaaab0e9167a389393f268e93c
Author: Alan Stern <stern@rowland.harvard.edu>
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fcc4a01eb8661226e80632327673f67bf6a5840b
Author: Alan Stern <stern@rowland.harvard.edu>
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6ddf27cdbc218a412d7e993fdc08e30eec2042ce
Author: Ming Lei <tom.leiming@gmail.com>
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 <tom.leiming@gmail.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 045cac6b3b067a9286dabfb789f67ae4f433f88b
Author: Alan Stern <stern@rowland.harvard.edu>
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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 63defa73c8c1193c1273474440c30d34c2524597
Author: Ming Lei <tom.leiming@gmail.com>
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 <tom.leiming@gmail.com>
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f646cf94520e22cb11eb5d2e9a35b33bfe4bea1b
Author: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
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 <toshiharu-linux@dsn.okisemi.com>
Acked-by: Michał Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d8df0b611c66db3b7afd0678213979209616681a
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5ab54cf7acf418573c9204371cf1ab3497c451ee
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7189ba939ea0e74f73d7b30573b849c732835fc5
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit cc7e6056f440796e028629d6d79a26fa20d457e8
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 19:04:49 2010 -0800
drivers/usb/gadget: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ce7eb32fc24a7380f55924360fa0c96297aa237e
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c8c38de9d8002578599222296b90696745ac0fe3
Author: Deepak Sikri <deepak.sikri@st.com>
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 <deepak.sikri@st.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92
Author: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
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 <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2cb7865648e44647a976875428c9dfd9d5553221
Author: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Fri Nov 12 08:47:05 2010 +0100
iwl3945: remove unused len_org variable
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8f0729b16ae354f9db89394fc1d2d65003455d56
Author: Felix Fietkau <nbd@openwrt.org>
Date: Thu Nov 11 15:07:23 2010 +0100
mac80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 885a46d0f7942d76c2f3860acb45f75237d3bb42
Author: Felix Fietkau <nbd@openwrt.org>
Date: Thu Nov 11 15:07:22 2010 +0100
cfg80211: add support for setting the ad-hoc multicast rate
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4e8c14e9587c38f4cce8049c766935629fdb8d46
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 82b873afe83c81d9b1273a816bbdacb266f71a52
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 61117f01e79f7c0da86c23535bed757370f5885f
Author: Felix Fietkau <nbd@openwrt.org>
Date: Thu Nov 11 03:18:36 2010 +0100
ath9k: remove the tx info padding byte abuse
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a
Author: Felix Fietkau <nbd@openwrt.org>
Date: Thu Nov 11 03:18:34 2010 +0100
ath9k: remove the unnecessary private xretry tx flag
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48
Author: Ben Greear <greearb@candelatech.com>
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 <greearb@candelatech.com>
Acked-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6ee63f55c7754462a45315ac93027a1df60667c9
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <nbd@openwrt.org>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Cc:stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bc2068020bfa976efd425f3be590f58a012fd747
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f4475a6e52fce8d951a96c763f36b835bf89fdec
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d
Author: Vasanthakumar Thiagarajan <vasanth@atheros.com>
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 <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3092354970381fb8b6439fb4def0c34632277ae9
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ef5a6a7573b7a12ced67dae155be8a909bc245d6
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b3dd6bc1f052ef3a754fa866743e4fda38522811
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789
Author: Senthil Balasubramanian <senthilkumar@atheros.com>
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 <senthilkumar@atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 15d967532148a5fcda075282b82a271b6595a386
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit afe0cbf87500f0585d217deb8c6fd329793a7957
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
--
v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52
Author: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
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 <Pitxyoki@gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b5257c952dda24df7078c74b7b811b44c6e49206
Author: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
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 <Pitxyoki@gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f23a478075659db8a4fd62fa6e264a8bb052cc5b
Author: Arik Nemtsov <arik@wizery.com>
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 <arik@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ca4a0831917d6541b45f03542257fcb20dc9cf4a
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1
Author: Brian Cavagnolo <brian@cozybit.com>
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 <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 99020471001dbbd6edf61f105368cb6667cc683d
Author: Brian Cavagnolo <brian@cozybit.com>
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 <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa
Author: Brian Cavagnolo <brian@cozybit.com>
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 <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 0863ade8d6bde1d151f75720d999ff27f9fe3533
Author: Brian Cavagnolo <brian@cozybit.com>
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 <pnemavat@marvell.com>,
Yogesh Powar <yogeshp@marvell.com>, and
Lennert Buytenhek <buytenh@wantstofly.org>.
Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3cc7772c0a3cc193fa9873816168bd34d4f16837
Author: Brian Cavagnolo <brian@cozybit.com>
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 <pnemavat@marvell.com>
and Yogesh Powar <yogeshp@marvell.com>
Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb
Author: Nishant Sarmukadam <nishants@marvell.com>
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 <pnemavat@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb
Author: Brian Cavagnolo <brian@cozybit.com>
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 <brian@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ae63a33ec9b598b3454cf0d29077fa17b616c42a
Author: Deepak Saxena <dsaxena@laptop.org>
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 <dsaxena@laptop.org>
Signed-off-by: Daniel Drake <dsd@laptop.org>
[includes fixups by Paul Fox]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit cf43298864fdfd687202db8c736473522bfceb98
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a80c49dbb6cd389fd5b0d79f850b56322475d00b
Author: Peter Zijlstra <peterz@infradead.org>
Date: Mon Nov 15 21:11:12 2010 +0100
serial8250: Mark console as CON_ANYTIME
While trying to debug a cpu-hotplug issue I noticed printk() stopped
working once the cpu got marked offline, since the 8250 serial console
doesn't have any per-cpu resources the CON_ANYTIME bit is the safe and
documented way to make it work again.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 83abd0d897ad3b7d064c8d8594ec5cc8520d6646
Author: Alan Cox <alan@linux.intel.com>
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 <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8ddbe5edfb33e2186a5c83925d657914f643e09a
Author: Alan Cox <alan@linux.intel.com>
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 <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e44dcb6c377529805bbaae505d5b333daab69111
Author: Wolfram Sang <w.sang@pengutronix.de>
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 <w.sang@pengutronix.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 597c606f560cf7ef6029152fa7574bddbfb0252f
Author: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
Acked-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: linux-parisc@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 23308ba54dcdb54481163bfb07dd8aeca76a7a2e
Author: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz> [cleanups]
Signed-off-by: "Dr. Werner Fink" <werner@suse.de>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 281e66057757ddf32ffe679a08f9634fa9f70a7a
Author: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: virtualization@lists.osdl.org
Cc: xen-devel@lists.xensource.com
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3dfbd044d0d99cad2fe50e4f6c79845703fa0558
Author: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a75d946f42ae1771424a9582129fc5182ff48a1b
Author: Jiri Slaby <jslaby@suse.cz>
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 <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2e3161390130f50fdbb4b989c667f42e5008107f
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Nov 13 11:24:22 2010 +0300
Staging: bcm: signedness bug in InitCardAndDownloadFirmware()
status is used to store negative error codes throughout. The only place
where this is a runtime bug is if create_worker_threads() fails.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f05321cca53da7c7abad4bc726699e9f27bf4922
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Nov 13 07:37:49 2010 +0300
Staging: bcm: signedness bug in StoreSFParam()
wrm() returns negative error codes so "ret" needs to be signed here.
There was place where wrm() returned positive EACCES instead of
negative -EACCES so I fixed that as well. Also a few checkpatch.pl
issues.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0ebce2696305c3f49f54f3af25cb966ef1b24f71
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Sat Nov 13 08:44:35 2010 -0800
staging: fix iio/gyro typos, build errors
Typo causes build errors. Did anyone even build this driver?
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 59a126418b96e9f5337d431e6024a8d50bbd6e4e
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Nov 13 12:05:32 2010 +0300
Staging: iio/dds: double locking bugs
This is a static checker patch and I don't have this hardware.
This code is unusual because while I've often seen a double lock, this
is the first time I've seen code that takes a lock 11 times in a row. I
feel like I must have missed something. But I've looked very carefully
I don't see any way the original code is correct. Does spi_sync()
somehow release the lock in a way that I can't see? Even if it does,
the locking would still be wrong.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a1a26e492c4a90466cb3e064ccf69db4dd66d63a
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Nov 13 11:34:16 2010 +0300
Staging: cptm1217: move free under dereference
We dereference "ts" in the printk so move the kfree() down a line.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 62af33ec6e73d658720ea1190861c8c0609a94b3
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu Nov 11 10:44:22 2010 -0800
staging/easycap: make module params private/static, fix build
The easycap driver has module parameters (bars, gain, & debug)
with global scope that intrude on the kernel namespace and cause
build problems. Change the names of them to be driver-specific
and make 2 of them static.
drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug'
ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a65e659d97bc652b2e14a63beaf9efbf5d4e18b2
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Fri Nov 12 14:47:02 2010 -0800
staging: fix ste_rmi4 build, depends on INPUT
The synaptics_i2c_rmi4 driver uses input_*() interfaces,
so it should depend on INPUT to fix its build errors:
ERROR: "input_event" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_free_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_register_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_set_abs_params" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_allocate_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
ERROR: "input_unregister_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: naveen.gaddipati@stericsson.com, js.ha@stericsson.com
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 44d4a4f784d0e1a50b3f1fc52bd6a661846abdc5
Author: David Brown <davidb@codeaurora.org>
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 <davidb@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 3251627c943f1cfc5bfad7c38d4e8d85cf44c6d8
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Nov 13 11:58:26 2010 +0300
Staging: intel_sst: fix memory leak
The original code set "str_info->decode_ibuf" to NULL so the kfree() is
no-op.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Harsha Priya <priya.harsha@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 832855354b5863d141ecfc563e78063978c6f29f
Author: Dan Carpenter <error27@gmail.com>
Date: Fri Nov 12 08:11:13 2010 +0300
Staging: rtl8712: signedness bug in init
PollingCnt is 20 and that means we loop 20 times and then run the
timeout code. After the end of the loop PollingCnt should be -1 but
because it's an unsigned char, it's actually 255 and the timeout
code never runs.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f36d83a8cb7224f45fdfa1129a616dff56479a09
Author: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sat Nov 13 13:01:56 2010 -0600
staging: rtl8187se: Change panic to warn when RF switch turned off
This driver issues a kernel panic over conditions that do not
justify such drastic action. Change these to log entries with
a stack dump.
This patch fixes the system crash reported in
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/674285.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reported-and-Tested-by: Robie Basik <rb-oss-3@justgohome.co.uk>
Cc: Stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 61838261edaf621d1e8ee4ea9d7c052f7d783ca4
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sat Nov 13 19:46:50 2010 +0100
staging: comedi: fix memory leak
Instead of freeing outBuffer, inBuffer gets freed twice.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ebba26f4a8d0c137a2d365b6bded2a0d7fcd1d06
Author: Dan Carpenter <error27@gmail.com>
Date: Fri Nov 12 08:04:43 2010 +0300
Staging: quickstart: free after input_unregister_device()
input_unregister_device() releases "quickstart_input" so the
input_free_device() is a double free. Also I noticed that there is a
memory leak if the call to input_register_device() fails.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5fb5d38fc268b8285125b213b9b2ded9322a371c
Author: Dan Carpenter <error27@gmail.com>
Date: Fri Nov 12 08:08:35 2010 +0300
Staging: speakup: free after input_unregister_device()
input_unregister_device() frees the device so the call to
input_free_device() is a double free.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d2c5d2145f127fffb7498bee943a480de66910ff
Author: David Brown <davidb@codeaurora.org>
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 <davidb@codeaurora.org>
[dwalker@codeaurora.org: changed the commit text a little.]
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 5d1394bb6b781df8148565783b0671f9b11500b7
Author: David Brown <davidb@codeaurora.org>
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 <davidb@codeaurora.org>
[dwalker@codeaurora.org: changed the commit text a little.]
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit 9be58f317d79278afc23186d861ada774cf386ea
Author: David Brown <davidb@codeaurora.org>
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 <swetland@google.com>
Cc: Arve Hjønnevåg <arve@android.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
commit defc19cebc7f700cb05226f0c4496b9d50c84643
Author: Tushar Mehta <tushariiitb@gmail.com>
Date: Tue Nov 16 12:13:50 2010 +0530
Staging: autofs: fix coding style issue in dirhash.c
This is a patch to the dirhash.c file that fixes up a number of issues
found by the checkpatch.pl tool
Signed-off-by: Tushar Mehta <tushariiitb@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0ff36f69bd3e7846557880fe934dd0cdeee6a29e
Author: Brandon Philips <brandon@ifup.org>
Date: Mon Nov 15 11:55:33 2010 -0800
staging: hv: add explanation of no-op set_multicast_list
I was going to remove netvsc_set_multicast_list() so I think it is worth
adding a comment since it isn't immediately clear why you would want
this.
Signed-off-by: Brandon Philips <brandon@ifup.org>
Acked-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e33196e108197e4a1f1a5331dc7740ad9263f4f5
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 13:12:32 2010 -0800
drivers/staging: Remove unnecessary casts of netdev_priv
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 345594d6ef696b8ad4b96cffe462c6cde2f27292
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 12:14:00 2010 -0800
drivers/staging: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 859171ca92f2865453b4b2e17bf679c67044a833
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 19:04:48 2010 -0800
drivers/staging: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ae0d9ebaffe47ed553e715ab5243660c33b6338c
Author: Mike Rapoport <mike.rapoport@gmail.com>
Date: Sun Nov 14 13:36:23 2010 +0200
staging: brcm80211: brcmfmac: remove PXA SDIO controller binding
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5b93a8b8e0514ebacb49a50c67a8846139bcd1bd
Author: Mike Rapoport <mike.rapoport@gmail.com>
Date: Sun Nov 14 13:36:21 2010 +0200
staging: brcm80211: remove unused osl_pkt{get,free}_static
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a1dc08b7d95817faea5e6a358e22c6185b84163a
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 12 18:10:17 2010 -0800
staging: brcm80211: get rid of last bit of pci configspace workaround.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit baebc160c12ba88baf201d35ecc22f1e250aad3f
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 12 15:28:30 2010 -0800
staging: brcm80211: simplify pci_config_read/write osl routines.
Start simplifying osl with goal of purging it entirely.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f96c377ead5ed308f0cf18b9156f86fdf207a288
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sat Nov 13 19:43:27 2010 +0100
staging: comedi: fix typo in error message
Fix typo in error message of dux commands allocation.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e08e02faff68d33c938fd0322c0f8318a25ddb39
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:54 2010 +0000
staging: vme: ca91cx42: mark the registers' base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e20cbcf199e2c3e4a4822e890726c49b70a4d280
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:47 2010 +0000
staging: vme: tsi148: mark the registers' base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0599726793d6dca6bd171cd4e497f9aac21e8f0c
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:40 2010 +0000
staging: vme: mark struct vme_master_resource's base address pointer as __iomem
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1a85f2073d99080ea70962f767edca479c768b6e
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:34 2010 +0000
staging: vme_user: mark user-space buffers with __user
Signed-off-by: Emilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0a81a0f768e5bb0c32db6e44440c5b7c1b4658e7
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:27 2010 +0000
staging: vme_user: remove __iomem marking from kern_buf and derivates
kern_buf is not iomem; it comes from kmalloc and is directly
dereferenced.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c949231838006d7de4ad38be38d9e112826862da
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:21 2010 +0000
staging: vme_user: use an unsigned int for counting the number of kparams
unsigned int is what struct kparam_array internally uses.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b9cc293486e27f4d29a9813da6ebcb8574071dfa
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:14 2010 +0000
staging: vme_user: declare private variables as static
Signed-off-by: Emilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit efbb979d1b31638a95d76b5acf65cf00a3213fe4
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:07 2010 +0000
staging: vme: ca91cx42: declare static functions as such
Signed-off-by: Emilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5ade6c4d79377efc371ac89db07e4f6594d1286a
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:15:00 2010 +0000
staging: vme: tsi148: declare static functions as such
Signed-off-by: Emilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 84295e0b243cba070fcfe8be825c39827ea022e6
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:54 2010 +0000
staging: vme: tsi148: remove unreachable line
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a82ad05ecd9dbd909509a332d3aa5f4ac439a054
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:47 2010 +0000
staging: vme: tsi148: fix warning in free_irq
The cookie passed to request_irq isn't the same as the one passed
to free_irq, which results in the following warning:
[ 63.243533] WARNING: at kernel/irq/manage.c:899 __free_irq+0x9b/0x17d()
[ 63.243533] Hardware name:
[ 63.243533] Trying to free already-free IRQ 17
[ 63.243533] Modules linked in: vme_tsi148(-) vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: scsi_wait_scan]
[ 63.243533] Pid: 2013, comm: rmmod Not tainted 2.6.35 #2
[ 63.243533] Call Trace:
[ 63.243533] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98
[ 63.243533] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43
[ 63.243533] [<ffffffff810678c4>] __free_irq+0x9b/0x17d
[ 63.243533] [<ffffffff810679d9>] free_irq+0x33/0x4e
[ 63.243533] [<ffffffffa004a897>] tsi148_irq_exit+0x6b/0x70 [vme_tsi148]
[...]
[ 63.243533] ---[ end trace bbf92311d969efb4 ]---
Fix it by passing the same cookie to both functions.
Signed-off-by: Emilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b12ef0b1f5d0358bc13cc716155d6e9b5584af48
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:40 2010 +0000
staging: vme: tsi148: remove double freeing of the IRQ in .remove
tsi148_irq_exit is called twice in .remove, which causes an oops.
Remove the second call, which apart from being redundant cannot
possibly work; the CR/CSR space has been already unmapped.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b558ba2f356c28269de179c4f7f6f179a4fa6a1d
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:34 2010 +0000
staging: vme: tsi148: use list_for_each_safe when deleting resources in .remove
This fixes an oops when removing the module.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit db6d8fc5596ef866e64e9a7eef96bacdc6e51e11
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:27 2010 +0000
staging: vme: fix bogus clearing of the bus number in vme_free_bus_num
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c0779fd01df76b3097cc77e3a404e8bb067e5628
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:20 2010 +0000
staging: vme_user: remove unreachable line
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 55db50205adaf14db1bda07d0931b647b794de2f
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:14 2010 +0000
staging: vme_user: return the appropriate error code when module_init fails
When init_module fails, 0 is returned anyway; the module is then installed
and oopses when we try to remove it:
[ 3236.368009] WARNING: at drivers/base/driver.c:262 driver_unregister+0x36/0x6f()
[ 3236.368012] Hardware name:
[ 3236.368014] Unexpected driver unregister!
[ 3236.368016] Modules linked in: vme_user(-) vme_tsi148 vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: vme]
[ 3236.368027] Pid: 16162, comm: rmmod Not tainted 2.6.35 #2
[ 3236.368029] Call Trace:
[ 3236.368037] [<ffffffff81036ea3>] warn_slowpath_common+0x80/0x98
[ 3236.368044] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58
[ 3236.368049] [<ffffffff81036f4f>] warn_slowpath_fmt+0x41/0x43
[ 3236.368054] [<ffffffff81060a65>] ? __try_stop_module+0x0/0x58
[ 3236.368059] [<ffffffff811e8f78>] driver_unregister+0x36/0x6f
[ 3236.368066] [<ffffffffa004aa44>] vme_unregister_driver+0xd/0xf [vme]
[ 3236.368072] [<ffffffffa00616c8>] vme_user_exit+0x10/0x1e [vme_user]
[ 3236.368076] [<ffffffff810612c1>] sys_delete_module+0x1ba/0x226
[ 3236.368082] [<ffffffff812d6e14>] ? do_page_fault+0x25d/0x28a
[ 3236.368088] [<ffffffff8100202b>] system_call_fastpath+0x16/0x1b
[ 3236.368092] ---[ end trace cab6d88ebc44c1de ]---
The appended fixes it by returning the appropriate error code in module_init
whenever something goes wrong, thus cancelling the insertion of the module.
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 886953e9b70bcb6913716b49bdf21b69450a7cd6
Author: Emilio G. Cota <cota@braap.org>
Date: Fri Nov 12 11:14:07 2010 +0000
staging: vme: style: convert '&(foo)' to '&foo'
done with
find . -name '*.c' | xargs perl -p -i -e 's/&\(([^()]+)\)/&$1/g'
Signed-off-by: Emilio G. Cota <cota@braap.org>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Tested-by: Jean-Michel Hautbois <jhautbois@gmail.com>
Cc: Asier Llano <a.llano@ziv.es>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 7f55f13c2ca82f6d998502df70f24deb550e5e0c
Author: Steven Rostedt <rostedt@goodmis.org>
Date: Thu Nov 11 11:29:25 2010 -0500
staging: ft1000: Copy from user into correct data
While doing a ktest.pl I used a MIN_CONFIG that had STAGING enabled, and
a randconfig with CONFIG_DEBUG_STRICT_USER_COPY_CHECKS enabled caught
the following bug:
In file included from /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess.h:571:0,
from /home/rostedt/work/autotest/nobackup/linux-test.git/include/linux/poll.h:14,
from /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:32:
In function 'copy_from_user',
inlined from 'ft1000_ChIoctl' at /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:702:36:
/home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess_32.h:212:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct
Looking at the code it was obvious what the problem was. The pointer
dpram_data was being allocated but the address was being written to.
Looking at the comment above the code shows that it use to write into an
element of that pointer where the '&' is appropriate. But now that it
writes to the pointer itself, we need to remove the '&' otherwise we
write over the pointer and not into the data it points to.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e72115bce326dc893bc1db96db72059a6a08148c
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Fri Nov 12 10:27:44 2010 +0100
staging: ft1000: Fix error goto statements.
With commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 there
was intruduced error which lead to stopping uninitialized
kthread which leads to kernel panics.
This patch fix problems with common entry point in correct
way.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2018845b6a169f75341f8e68ad1089cb6697cf24
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:23:33 2010 -0800
Staging: line6: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Markus Grabner <grabner@icg.tugraz.at>
Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0281b490dd7b96990724f4a15842c55657699aed
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:22:43 2010 -0800
Staging: zram: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit cc9ca9dfddda46b1802d325891a69d7efdbe1f1e
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:21:36 2010 -0800
Staging: udlfb: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Bernie Thompson <bernie@plugable.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 90c05b97fdec8d2196e420d98f774bab731af7aa
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:21:03 2010 -0800
Staging: samsung-laptop: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1d904e8950c86e670ace237eaea1d48cd81e94df
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:19:53 2010 -0800
Staging: iio: adis16220: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Cc: Barry Song <Barry.Song@analog.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3bad28ec006ad6ab2bca4e5103860b75391e3c9d
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:18:33 2010 -0800
Staging: frontier: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Taht <d@teklibre.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b178bb3dfc30d9555bdd2401e95af98e23e83e10
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c31504dc0d1dc853dcee509d9999169a9097a717
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <jesse@nicira.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 590b0b9754bd8928926bae7194b6da7ead9bda3b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 16 11:17:01 2010 -0800
Staging: asus_oled: fix up some sysfs attribute permissions
They should not be writable by any user
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jakub Schmidtke <sjakub@gmail.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8ffab51b3dfc54876f145f15b351c41f3f703195
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Ben Greear <greearb@candelatech.com>
Cc: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0e3125c755445664f00ad036e4fc2cd32fd52877
Author: Neil Horman <nhorman@tuxdriver.com>
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 <nhorman@tuxdriver.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Maciej Żenczykowski <zenczykowski@gmail.com>
Reported-by: Maciej Żenczykowski <zenczykowski@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 020f01ebd04f3429c32586d90598c9f59e54ca7d
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 648bfff41c7a5571adf61ec5febf02b16c16eb4e
Author: Manu Abraham <abraham.manu@gmail.com>
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 <ozan@pardus.org.tr> for pointing it out
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 3654654f7aa79a37dde130afb7409c55b11807e7
Author: Jan Engelhardt <jengelh@medozas.de>
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 <jengelh@medozas.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46
Author: John Fastabend <john.r.fastabend@intel.com>
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 <lorenzo@google.com>
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 <shemminger@vyatta.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 723ee043b152e4ed7d901fb791a513bc60bb9a9c
Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue Nov 16 12:09:59 2010 -0500
xen: set IO permission early (before early_cpu_init())
This patch is based off "xen dom0: Set up basic IO permissions for dom0."
by Juan Quintela <quintela@redhat.com>.
On AMD machines when we boot the kernel as Domain 0 we get this nasty:
mapping kernel into physical memory
Xen: setup ISA identity maps
about to get started...
(XEN) traps.c:475:d0 Unhandled general protection fault fault/trap [#13] on VCPU 0 [ec=0000]
(XEN) domain_crash_sync called from entry.S
(XEN) Domain 0 (vcpu#0) crashed on cpu#0:
(XEN) ----[ Xen-4.1-101116 x86_64 debug=y Not tainted ]----
(XEN) CPU: 0
(XEN) RIP: e033:[<ffffffff8130271b>]
(XEN) RFLAGS: 0000000000000282 EM: 1 CONTEXT: pv guest
(XEN) rax: 000000008000c068 rbx: ffffffff8186c680 rcx: 0000000000000068
(XEN) rdx: 0000000000000cf8 rsi: 000000000000c000 rdi: 0000000000000000
(XEN) rbp: ffffffff81801e98 rsp: ffffffff81801e50 r8: ffffffff81801eac
(XEN) r9: ffffffff81801ea8 r10: ffffffff81801eb4 r11: 00000000ffffffff
(XEN) r12: ffffffff8186c694 r13: ffffffff81801f90 r14: ffffffffffffffff
(XEN) r15: 0000000000000000 cr0: 000000008005003b cr4: 00000000000006f0
(XEN) cr3: 0000000221803000 cr2: 0000000000000000
(XEN) ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: e02b cs: e033
(XEN) Guest stack trace from rsp=ffffffff81801e50:
RIP points to read_pci_config() function.
The issue is that we don't set IO permissions for the Linux kernel early enough.
The call sequence used to be:
xen_start_kernel()
x86_init.oem.arch_setup = xen_setup_arch;
setup_arch:
- early_cpu_init
- early_init_amd
- read_pci_config
- x86_init.oem.arch_setup [ xen_arch_setup ]
- set IO permissions.
We need to set the IO permissions earlier on, which this patch does.
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5
Author: Shanyu Zhao <shanyu.zhao@intel.com>
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 <shanyu.zhao@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit f4115d46599464a49a3055d33d499d97ac81fccb
Author: Shanyu Zhao <shanyu.zhao@intel.com>
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 <shanyu.zhao@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit efe54db8233a4b41e68cbe67ca2e30c48532078a
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 893654de3ff41a4f5037397d06a3f853bbbb3484
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit cfa1da7e9133be9280990b2a64fa7696924c8d9a
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit ea9b307f8e859186a6791e0d508c5993448ac900
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 610f018db11a21d33932f488942c7995a52b7e29
Author: Jarod Wilson <jarod@redhat.com>
Date: Fri Nov 12 19:49:04 2010 -0300
[media] mceusb: fix keybouce issue after parser simplification
Something I failed to notice while testing the mceusb RLE buffer
decoding simplification patches was that we were getting an extra event
from the previously pressed key.
As was pointed out to me on irc by Maxim, this is actually due to using
ir_raw_event_store_with_filter without having set up a timeout value.
The hardware has a timeout value we're now reading and storing, which
properly enables the transition to idle in the raw event storage
process, and makes IR decode behave correctly w/o keybounce.
Also remove no-longer-used ir_raw_event struct from mceusb_dev struct
and add as-yet-unused enable flags for carrier reports and learning
mode, which I'll hopefully start wiring up sooner than later. While
looking into that, found evidence that 0x9f 0x15 responses are only
non-zero when the short-range learning sensor is used, so correct the
debug spew message, and then suppress it when using the standard
long-range sensor.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 549a04e092e5e043df82fd0541f3b67ab488359b
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 4bea9b990205e4a3d432d9d6c29687215618a306
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit 564b344c10b694d433cef5b89f8ff8ac5e33898d
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 05433df23cf16a9ccbdd35964aba781cdf455034
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 66e863a527f9ed3a871797862aaf0d62b0954813
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit 8829c9e2ec144baeb3cee599e1e653a396ad521b
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
commit a8e5fcaa0c2270f3fb580d786dfe3fb15bb39201
Author: Wolfram Sang <w.sang@pengutronix.de>
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 <w.sang@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit dff6bd5f53f4d87df5e04e760c778c77485f1b4d
Author: Wolfram Sang <w.sang@pengutronix.de>
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 <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit b8da8d2134b5fbf06336131bd5b5d8681d75a33c
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 552faf8580766b6fc944cb966f690ed0624a5564
Author: Richard Röjfors <richard.rojfors@pelagicore.com>
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 <richard.rojfors@pelagicore.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ef6ce9acc5f87e253c97dfd5301f8036f937f595
Author: Richard Röjfors <richard.rojfors@pelagicore.com>
Date: Mon Nov 8 10:45:44 2010 -0300
[media] [1/2,v4] 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 <richard.rojfors@pelagicore.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit a1e540f3b722d89e0722b8838f32689f7c2469b6
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 7 17:48:21 2010 -0300
[media] drivers/staging/cx25821: Use pr_fmt and pr_<level>
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_<level> prefixes via pr_<level> to printks.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit b920de1db6f6775bcd020fffe9b2a0ea0b2debfc
Author: Matthias Schwarzott <zzam@gentoo.org>
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 <tvboxspy@gmail.com>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 058ec34ce62917d20ede4caf3ab633aa0f61e220
Author: Jean Delvare <khali@linux-fr.org>
Date: Sun Nov 7 12:54:39 2010 -0300
[media] TM6000: Drop unused macro
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michel Ludwig <michel.ludwig@gmail.com>
Cc: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ef289e709d49685b82741619c7cd94b6a0c606d5
Author: Jean Delvare <khali@linux-fr.org>
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 <khali@linux-fr.org>
Cc: Michel Ludwig <michel.ludwig@gmail.com>
Cc: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2f55ac072f5344519348c0c94b3d2f4cca46847b
Author: Lionel Debroux <lionel_debroux@yahoo.fr>
Date: Tue Nov 16 14:14:02 2010 +0100
suspend: constify platform_suspend_ops
While at it, fix two checkpatch errors.
Several non-const struct instances constified by this patch were added after
the introduction of platform_suspend_ops in checkpatch.pl's list of "should
be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73).
Patch against mainline.
Inspired by hunks of the grsecurity patch, updated for newer kernels.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit acc2472ed33fc5e72482cc3b3b846077d97c2f8b
Author: Lionel Debroux <lionel_debroux@yahoo.fr>
Date: Tue Nov 16 14:14:02 2010 +0100
backlight: constify backlight_ops
backlight_device_register has been expecting a const "ops" argument, and using
it as such, since 9905a43b2d563e6f89e4c63c4278ada03f2ebb14. Let's make the
remaining backlight_ops instances const.
Inspired by hunks of the grsecurity patch, updated for newer kernels.
Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 073ef1f6e508688392580e4f35dcad9aabd1e100
Author: Lionel Debroux <lionel_debroux@yahoo.fr>
Date: Tue Nov 9 21:48:49 2010 +0100
hibernation: constify platform_hibernation_ops
Patch against mainline.
Changes since v1: added one hunk; no longer adding "const" qualifier to
pointers in platform_hibernation_ops after seeing
b4144e4f6e3b448d322095ca08af393682a69e33.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 740069e6e043403199dbe2b42256722fb814f6ae
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat Nov 13 17:49:10 2010 -0200
[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 <hermann-pitton@arcor.de>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 34895b12fc03c8e61c798e2ca5bf562c19c4d32e
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat Nov 13 17:19:54 2010 -0200
[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 <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit bd4ccdfc4b8d901a8c318a93edeca0576fdb4ee2
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat Nov 13 17:23:06 2010 -0200
[media] saa7134: use rc-core raw decoders for Encore FM 5.3
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 84dab5671bff4516781c14f4fba5a1e2be13be1e
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Nov 12 15:28:42 2010 +0000
ASoC: Use DAPM context rather than CODEC when constructing sequences
DAPM widgets may be associated with non-CODEC devices so compare based
on the DAPM context rather than the CODEC pointer.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ce0df3d79a1b305cb39ea15a07235b5a6c3435b6
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 16 16:11:37 2010 +0800
ASoC: Fix incorrect kfree in wm8962_probe error path
We allocated memory for wm8962 in wm8962_i2c_probe,
and will free the memory in either wm8962_i2c_probe error path
or wm8962_i2c_remove.
Thus we should not call kfree(wm8962) in wm8962_probe, otherwise
we have double free of wm8962.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 01cbea3293929acecef6785b7ea5be547dc039bc
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 16 16:10:41 2010 +0800
ASoC: Fix incorrect kfree in wm8731_probe error path
We allocated memory for wm8731 in wm8731_spi_probe / wm8731_i2c_probe,
and will free the memory in either wm8731_spi_probe / wm8731_i2c_probe
error path or wm8731_spi_remove / wm8731_i2c_remove.
Thus we should not call kfree(wm8731) in wm8731_probe, otherwise
we have double free of wm8731.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 4ab867d276b83582f15c61270de1cc178df95659
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 16 16:09:41 2010 +0800
ASoC: Fix incorrect kfree in aic3x_probe error path
We allocated memory for aic3x in aic3x_i2c_probe,
and will free the memory in either aic3x_i2c_probe error path or
aic3x_i2c_remove.
Thus we should not call kfree(aic3x) in aic3x_probe, otherwise
we have double free of aic3x.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 16 16:08:51 2010 +0800
ASoC: Fix incorrect kfree in ad193x_probe error path
We allocated memory for ad193x in ad193x_spi_probe,
and will free the memory in either ad193x_spi_probe error path or
ad193x_spi_remove.
Thus we should not call kfree(ad193x) in ad193x_probe, otherwise
we have double free of ad193x.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit af353d8a134d6147e29a3371015d2eef8d7f0657
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 16 16:08:00 2010 +0800
ASoC: Fix incorrect kfree in ad1836_probe error path
We allocated memory for ad1836 in ad1836_spi_probe,
and will free the memory in either ad1836_spi_probe error path or
ad1836_spi_remove.
Thus we should not call kfree(ad1836) in ad1836_probe, otherwise
we have double free of ad1836.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 6d72ad35f1bfaf6e52ca7133cb51ce0e36f17528
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 86d1e7fef650aff4156386883b7ad6e1d7b235b1
Author: Greg Ungerer <gerg@uclinux.org>
Date: Wed Nov 10 15:22:19 2010 +1000
m68knommu: create optimal separate instruction and data cache for ColdFire
Create separate functions to deal with instruction and data cache flushing.
This way we can optimize them for the vairous cache types and arrangements
used across the ColdFire family.
For example the unified caches in the version 3 cores means we don't
need to flush the instruction cache. For the version 2 cores that do
not do data cacheing (or where we choose instruction cache only) we
don't need to do any data flushing.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 60b3f78e130d6c29da5c95ed24495f47bee4c7cc
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 16:00:17 2010 +1000
m68knommu: support ColdFire caches that do copyback and write-through
The version 3 and version 4 ColdFire cache controllers support both
write-through and copy-back modes on the data cache. Allow for Kconfig
time configuration of this, and set the cache mode appropriately.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 83b6291d5c1aa277881943c04af84e4fa76e8dce
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 15:31:08 2010 +1000
m68knommu: support version 2 ColdFire split cache
The newer version 2 ColdFire CPU cores support a configurable cache
arrangement. The cache memory can be used as all instruction cache, all
data cache, or split in half for both instruction and data caching.
Support this setup via a Kconfig time menu that allows a kernel builder
to choose the arrangement they want to use.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 922f4daed9b84fed0e15425b9aeb9a9bc87f9dfd
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 14:27:50 2010 +1000
m68knommu: make cache push code ColdFire generic
Currently the code to push cache lines is only available to version 4
cores. Version 3 cores may also need to use this if we support copy-
back caches on them. Move this code to make it more generic, and
useful for all version ColdFire cores.
With this in place we can now have a single cache_flush_all() code
path that does all the right things on all version cores.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 558c4c6d86479415e80bdd255a16344af43557b4
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 13:35:55 2010 +1000
m68knommu: clean up ColdFire cache control code
The cache control code for the ColdFire CPU's is a big ugly mess
of "#ifdef"ery liberally coated with bit constants. Clean it up.
The cache controllers in the various ColdFire parts are actually quite
similar. Just differing in some bit flags and options supported. Using
the header defines now in place it is pretty easy to factor out the
small differences and use common setup and flush/invalidate code.
I have preserved the cache setups as they where in the old code
(except where obviously wrong - like in the case of the 5249). Following
from this it should be easy now to extend the possible setups used on
the CACHE controllers that support split cacheing or copy-back or
write through options.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 7c56bc94f2086b4ae7ac609283a0aabbbefd0fc2
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 10:40:44 2010 +1000
m68knommu: move inclusion of ColdFire v4 cache registers
Move the inclusion of the version 4 cache controller registers so that
it is with all the other register bit flag definitions. This makes it
consistent with the other version core inclusion points, and means we
don't need "#ifdef"ery in odd-ball places for these definitions.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 3775f79b2cb4717ae7c50050a23edd06ddee7a80
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 10:19:45 2010 +1000
m68knommu: merge bit definitions for version 3 ColdFire cache controller
All version 3 based ColdFire CPU cores have a similar cache controller.
Merge all the exitsing definitions into a single file, and make them
similar in style and naming to the existing version 2 and version 4
cache controller definitions.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 90fc2cc8aa101f1ba8934b4ef46ce912ab4dadc0
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 9 10:12:29 2010 +1000
m68knommu: create bit definitions for the version 2 ColdFire cache controller
The version 2 ColdFire CPU based cores all contain a similar cache
controller unit. Create a set of bit flag definitions for the supporting
registers.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 500edfb6005cd3c93bb142185d354fdad02d2f95
Author: Philippe De Muyter <phdm@macqel.be>
Date: Thu Nov 11 23:57:56 2010 +0100
m68knommu: arch/m68knommu/Kconfig whitespace cleanup
Replace 8 spaces, or even 7, by TAB at begin of lines.
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 0592ade660e35e6b194428bcc9ffbd29e7ed1ac1
Author: Greg Ungerer <gerg@uclinux.org>
Date: Thu Nov 4 16:17:43 2010 +1000
m68knommu: remove empty __iounmap() it is no used
The empty __iounmap() function is not used on m68knommu at all.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 83ef461d7dd40dfa781ddd375c5ee1240844457a
Author: Greg Ungerer <gerg@uclinux.org>
Date: Thu Nov 4 16:06:02 2010 +1000
m68knommu: remove kernel_map() code, it is not used
The kernel_map() functions is not used anywhere, remove it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit eddb3fb19903f3c3b166313ad31b584ba253a43e
Author: Greg Ungerer <gerg@uclinux.org>
Date: Thu Nov 4 16:00:44 2010 +1000
m68knommu: remove do_page_fault(), it is not used
The non-MMU m68k does not use the do_page_fault() code, so remove it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 1106815caaa8a62a75046f016eaac98e1ca02384
Author: Greg Ungerer <gerg@uclinux.org>
Date: Thu Nov 4 13:53:26 2010 +1000
m68knommu: use user stack pointer hardware on some ColdFire cores
The more modern ColdFire parts (even if based on older version cores)
have separate user and supervisor stack pointers (a7 register).
Modify the ColdFire CPU setup and exception code to enable and use
this on parts that have it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 087a0a12f30df1e49d6f4c0d6172b867228ed704
Author: Greg Ungerer <gerg@uclinux.org>
Date: Wed Nov 3 16:22:50 2010 +1000
m68knommu: remove command line printing DEBUG
There is no need for the DEBUG based command line printing in here.
The kernel will print out the command line in the banner later in
the boot up. So remove it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 3ddd06d81680c4a2cee8e029b8e8e23825f0344d
Author: Greg Ungerer <gerg@uclinux.org>
Date: Wed Nov 3 16:21:05 2010 +1000
m68knommu: remove fasthandler interrupt code
There are no users of the old "fasthandler" interrupt entry code.
So remove it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit b1ef6c57427feac199d1dd9ef81b07b556531d6d
Author: Greg Ungerer <gerg@uclinux.org>
Date: Wed Nov 3 12:50:30 2010 +1000
m68knommu: move UART addressing to part specific includes
The ColdFire UART base addresses varies between the different ColdFire
family members. Instead of keeping the base addresses with the UART
definitions keep them with the other addresses definitions for each
ColdFire part.
The motivation for this move is so that when we add new ColdFire
part definitions, they are all in a single file (and we shouldn't
normally need to modify the UART definitions in mcfuart.h at all).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 3139530c3486549b57aae9697bb89863f6031b30
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 2 17:40:37 2010 +1000
m68knommu: fix clock rate value reported for ColdFire 54xx parts
The instruction timings of the ColdFire 54xx family parts are
different to other version 4 parts (or version 2 or 3 parts for
that matter too).
Move the instruction timing setting into the ColdFire part
specific headers, and set the 54xx value appropriately.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit ebd90050432469be400683f512f96a052b06be5e
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 2 17:13:27 2010 +1000
m68knommu: move ColdFire CPU names into their headers
Move the ColdFire CPU names out of setup.c and into their repsective
headers. That way when we add new ones we won't need to modify
setup.c any more.
Add the missing 548x CPU name.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 715ee48d41de1c2de054c1ac5b338c65f23117f9
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 2 12:13:34 2010 +1000
m68knommu: add support for the ColdFire 547x family of processors
The Freescale M547x family of ColdFire processors is very similar
to the M548x series. We use all the same support for it. Initially
all we need is a high level configuration option for it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 6d5eec792e1fc52fabb96e6910a5a84f4c428014
Author: Greg Ungerer <gerg@uclinux.org>
Date: Tue Nov 2 12:05:29 2010 +1000
m68knommu: make Coldfire 548x support more generic
The ColdFire 547x family of processors is very similar to the ColdFire
548x series. Almost all of the support for them is the same. Make the
code supporting the 548x more gneric, so it will be capable of
supporting both families.
For the most part this is a renaming excerise to make the support
code more obviously apply to both families.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 0c51c8cea91673dbaf2fc1f856effd54db4a5205
Author: Philippe De Muyter <phdm@macqel.be>
Date: Wed Oct 27 14:57:49 2010 +0200
m68knommu: Use symbolic constants for cache operations on M54xx
Now that we have meaningfull symbolic constants for bit definitions
of the cache registers of m5407 and m548x chips, use them to
improve readability, portability and efficiency of the cache operations.
This also fixes __flush_cache_all for m548x chips : implicit
DCACHE_SIZE was exact for m5407, but wrong for m548x.
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 2d415421fbb040f25b10d14abab6421ca7163509
Author: Philippe De Muyter <phdm@macqel.be>
Date: Wed Oct 27 14:57:48 2010 +0200
m68knommu: Move __flush_cache_all definition for m54xx in m54xxacr.h
__flush_cache_all for m54xx is intrinsically related to the bit
definitions in m54xxacr.h. Move it there from cacheflush_no.h,
for easier maintenance.
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 1831a9f5b93c4593c52ec7f90c217a7c684296a4
Author: Philippe De Muyter <phdm@macqel.be>
Date: Wed Oct 27 14:57:47 2010 +0200
m68knommu: Create new m54xxacr.h from m5407sim.h subpart
The MCF548x have the same cache control registers as the MCF5407.
Extract the bit definitions for the ACR and CACR registers from m5407sim.h
and move them to a new file m54xxacr.h. Those definitions are not used
anywhere yet, so no other file is involved. This is a preparation for
m54xx cache support cleanup.
Signed-off-by: Philippe De Muyter <phdm@macqel.be>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
commit 6b35308850e1679741e8b646cfb7bb3ab5369888
Author: David S. Miller <davem@davemloft.net>
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 <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 66a595a5c4a0f7a4ea78fbeddfe4002c036b96f1
Author: Frank Swiderski <fes@chromium.org>
Date: Mon Nov 15 10:43:22 2010 -0800
ecryptfs: remove unnecessary decrypt when extending a file
Removes an unecessary page decrypt from ecryptfs_begin_write when the
page is beyond the current file size. Previously, the call to
ecryptfs_decrypt_page would result in a read of 0 bytes, but still
attempt to decrypt an entire page. This patch detects that case and
merely zeros the page before marking it up-to-date.
Signed-off-by: Frank Swiderski <fes@chromium.org>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit d1fbc23049e13980f22897b0e657345a9c7bcd50
Author: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Date: Mon Nov 15 17:36:38 2010 -0600
ecryptfs: Fix ecryptfs_printk() size_t warnings
Commit cb55d21f6fa19d8c6c2680d90317ce88c1f57269 revealed a number of
missing 'z' length modifiers in calls to ecryptfs_printk() when
printing variables of type size_t. This patch fixes those compiler
warnings.
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit cb55d21f6fa19d8c6c2680d90317ce88c1f57269
Author: Joe Perches <joe@perches.com>
Date: Wed Nov 10 15:46:16 2010 -0800
fs/ecryptfs: Add printf format/argument verification and fix fallout
Add __attribute__((format... to __ecryptfs_printk
Make formats and arguments match.
Add casts to (unsigned long long) for %llu.
Signed-off-by: Joe Perches <joe@perches.com>
[tyhicks: 80 columns cleanup and fixed typo]
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit c996d8b9a8f37bd1b4dd7823abc42780b20998f8
Author: Michael Witten <mfwitten@gmail.com>
Date: Mon Nov 15 19:55:34 2010 +0000
Docs/Kconfig: Update: osdl.org -> linuxfoundation.org
Some of the documentation refers to web pages under
the domain `osdl.org'. However, `osdl.org' now
redirects to `linuxfoundation.org'.
Rather than rely on redirections, this patch updates
the addresses appropriately; for the most part, only
documentation that is meant to be current has been
updated.
The patch should be pretty quick to scan and check;
each new web-page url was gotten by trying out the
original URL in a browser and then simply copying the
the redirected URL (formatting as necessary).
There is some conflict as to which one of these domain
names is preferred:
linuxfoundation.org
linux-foundation.org
So, I wrote:
info@linuxfoundation.org
and got this reply:
Message-ID: <4CE17EE6.9040807@linuxfoundation.org>
Date: Mon, 15 Nov 2010 10:41:42 -0800
From: David Ames <david@linuxfoundation.org>
...
linuxfoundation.org is preferred. The canonical name for our web site is
www.linuxfoundation.org. Our list site is actually
lists.linux-foundation.org.
Regarding email linuxfoundation.org is preferred there are a few people
who choose to use linux-foundation.org for their own reasons.
Consequently, I used `linuxfoundation.org' for web pages and
`lists.linux-foundation.org' for mailing-list web pages and email addresses;
the only personal email address I updated from `@osdl.org' was that of
Andrew Morton, who prefers `linux-foundation.org' according `git log'.
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c
Author: Vasanthy Kolluri <vkolluri@cisco.com>
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 <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ce5a121304af02d02489e86efb6ae26a67f95e52
Author: Alan Cox <alan@linux.intel.com>
Date: Mon Nov 15 07:30:42 2010 +0000
hso: Fix unused variable warning
Fallout from the TIOCGICOUNT work
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b5ed54e94d324f17c97852296d61a143f01b227a
Author: stephen hemminger <shemminger@vyatta.com>
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 <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b
Author: stephen hemminger <shemminger@vyatta.com>
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 <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a386f99025f13b32502fe5dedf223c20d7283826
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e80516880019aa1f7c5c410276edfea9575ec89f
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:05:00 2010 +0000
net/ipv6/mcast.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:58 2010 +0000
include/net/caif/cfctrl.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Sjur Braendeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:57 2010 +0000
include/linux/if_macvlan.h: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:37 2010 +0000
drivers/net/cnic.c: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:33 2010 +0000
drivers/net/ixgbe: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:32 2010 +0000
drivers/net/e1000e: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:31 2010 +0000
drivers/net/bnx2x: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ad65ffd12dccf6d1031298eacc060327751084da
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 17:04:26 2010 +0000
drivers/isdn: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fe8222406c8277a21172479d3a8283d31c209028
Author: Tom Herbert <therbert@google.com>
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 <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ed9af2e839c06c18f721da2c768fbb444c4a10e5
Author: Tom Herbert <therbert@google.com>
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 <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52
Author: Timo Teräs <timo.teras@iki.fi>
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 <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit b1d771ee33c6e4006676002b9d74abf45b71d3d6
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7919a57bc608140aa8614c19eac40c6916fb61d2
Author: Andreas Herrmann <andreas.herrmann3@amd.com>
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 <andreas.herrmann3@amd.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1
Author: Grazvydas Ignotas <notasas@gmail.com>
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 <ohad@wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Acked-by: Luciano Coelho <luciano.coelho@nokia.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080
Author: Grazvydas Ignotas <notasas@gmail.com>
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 <ohad@wizery.com>
Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit cb7bbc7a5535ab2333915b83391e1d846a0914df
Author: Grazvydas Ignotas <notasas@gmail.com>
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 <notasas@gmail.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f81c1f48384d398dbe8f6c5b10377c7158086791
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9
Author: Shanyu Zhao <shanyu.zhao@intel.com>
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 <shanyu.zhao@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af
Author: Shanyu Zhao <shanyu.zhao@intel.com>
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 <shanyu.zhao@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b2769b84d86a2d29fa131a763d2b23b112834420
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8da8e62851680772f0422d0f1c4b467190b268e5
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 52d980c01353202332ff4322f3f41db0c49816a5
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2e1fea43aa170e18beb8378465e595e18cd08f6e
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 35a6eb36520b938742d8680fd8d821df20982ced
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05
Author: Winkler, Tomas <tomas.winkler@intel.com>
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 <tomas.winkler@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 708068db4c09f93937a6a83ac8fff8516f482b0f
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e39fdee1d7856817619326fa114438c146d74510
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 81baf6ec9c190ae128748cf2a026bff5cb811b70
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ae79d23d0b2c16998e60f49a16dae53521c76a45
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fb30eaf38703d7562606e49a5872745d66366a50
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d
Author: Ben Greear <greearb@candelatech.com>
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 <greearb@candelatech.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8c5765fda4b382acce4ff386e18ec11790dff893
Author: Ivo van Doorn <IvDoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36
Author: Ivo van Doorn <IvDoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8be4eed0ea7d8ef38692de878043a949e9db16e8
Author: Ivo van Doorn <IvDoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 813f0339dd739c48607f12dac79ec26c61874226
Author: Ivo van Doorn <IvDoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 027e8fd105c82956de9dec232bad21b1628ee7c0
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c2361baec100c6f373107346e3fd98e9b267ac6c
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 87a46caf920515eb269df0109f0a61a958236568
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c6cbadeb3afd9471e539791842877d085f367746
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 46b9786975a69a75f25b71796f7e36d203fbd4ee
Author: Mark Einon <mark.einon@gmail.com>
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 <mark.einon@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ffa56e540c3949c4560dcce45eca247819e183c1
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 723fc7af5300dba9eac40cb23dbefa67589e5181
Author: Lalith Suresh <suresh.lalith@gmail.com>
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 <suresh.lalith@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fa8b4b22d543b4052602b0c86065150613ed19e8
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <js@sig21.net>
Reported-by: Lee <lee-in-berlin@web.de>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 070192dd2975c0e97bbdeac7623b755235c6db7d
Author: Ivo van Doorn <ivdoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 303c7d6abfd0430e39e84a43361492b4a8c890b6
Author: Ivo van Doorn <ivdoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b
Author: Ivo van Doorn <ivdoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0
Author: Ivo van Doorn <IvDoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7225ce1ea93d24c0914eea0410dcfc426281f996
Author: Ivo van Doorn <ivdoorn@gmail.com>
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 <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 08e5310028359de2daaa39cd10e9ca493c51792b
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <jesmith@kaon.com>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit efd2f271e44c7ea011cdb0363d38f40338ab80d2
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 961621abee08fde2328daf6f8000e1059e5205e9
Author: Helmut Schaa <helmut.schaa@googlemail.com>
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 <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 066dae93bdfcc7af5e38a33617773fd5c6457607
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Reported-by: Björn Smedman <bjorn.smedman@venatech.se>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 21e731a1b15bf03927e292af1b4a2c84fc8af817
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit d94519c1b0de827d5d142b9333b7f114c0b3a021
Author: maximilian attems <max@stro.at>
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 <max@stro.at>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8cecc90e4a302ac214c48e362709ce906a96a295
Author: maximilian attems <max@stro.at>
Date: Tue Nov 2 23:10:12 2010 +0100
zd1211rw: add 2 missing usb id's
"These USB ID came from Palnex <http://www.planex.co.jp/>
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 <go@turbolinux.co.jp>
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit daeeb074105a80a34f90a454c24efc14e9a8d3c3
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: seno <senada@t-online.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 998606cfd75e7a8169ed0d324061a8d6bc60716a
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: seno <senada@t-online.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit fe3326903d7aafd7b5602d8e178537c8b0465f6c
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 896cae65fc0489b8e42bb7790f64731d53a2cecf
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 60f589145d76cf834ec5e485c5412ec0994e52d1
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f002c25cc13e86762551c0eda29a40c60d6dbf1b
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 327571ea9927beec2ee2ed9a266c57c1515393b4
Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
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 <herton@mandriva.com.br>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6
Author: Nishant Sarmukadam <nishants@marvell.com>
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 <pnemavat@marvell.com>
Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3eedb6f436858f3e864139dc184adc9a51440c92
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2a6cef513fab525399e484edc9bfb39b6d462f76
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e4a668c59080f862af3ecc28b359533027cbe434
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3f1240e4f4b249f2388903864bdc766973f76687
Author: Christian Lamparter <chunkeey@googlemail.com>
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 <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bdd7bd16439975133d36bcd7c9c489302a114525
Author: Blaise Gassend <blaise@willowgarage.com>
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 <blaise@willowgarage.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 19999792d2889350611ba9e346d6a2924959dc2d
Author: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
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 <cascardo@holoscopio.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: linux-wireless@vger.kernel.org
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Rogerio Luz Coelho <rogluz.news@gmail.com>
Cc: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Cc: Hin-Tak Leung <hintak.leung@gmail.com>
Cc: seno <senada@t-online.de>
Tested-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e285a5250c0772c5596a9137041a96b2c1f744d6
Author: Eliad Peller <eliad@wizery.com>
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 <eliad@wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5
Author: Eliad Peller <eliad@wizery.com>
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 <eliad@wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 03107a4b5923aa7767329e857caf227749087e47
Author: Eliad Peller <eliad@wizery.com>
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 <eliad@wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 71125abdf0c297adc00dc5632f0318b2397286f5
Author: Eliad Peller <eliad@wizery.com>
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 <eliad@wizery.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf
Author: Juuso Oikarinen <juuso.oikarinen@nokia.com>
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 <juuso.oikarinen@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit ff6d76fd3d45ed5494287e57d76073739721214b
Author: Nicolas Kaiser <nikai@nikai.net>
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 <nikai@nikai.net>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36
Author: Luciano Coelho <luciano.coelho@nokia.com>
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 <ext-tuomas.2.katila@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
commit 6a2de93b2553c2e9a72997370534993c85c1eee6
Author: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
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 <ext-teemu.3.paasikivi@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 18357850b694ba3fa29363c7d86ccd8783f4a065
Author: Shahar Levi <shahar_levi@ti.com>
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 <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5
Author: Shahar Levi <shahar_levi@ti.com>
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 <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit e8b03a2b8debc6056f6f43d24f98f601097301a1
Author: Shahar Levi <shahar_levi@ti.com>
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 <shahar_levi@ti.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 2fe33e8cff354a3f320549544bffebbbab680145
Author: Ido Yariv <ido@wizery.com>
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 <ido@wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e
Author: Ido Yariv <ido@wizery.com>
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 <ido@wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit a522550a283de31c7cfc30c7a129ce584e38c582
Author: Ido Yariv <ido@wizery.com>
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 <ido@wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 6c6e669ed6282788d6045397ce0f201edc400d9d
Author: Ido Yariv <ido@wizery.com>
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 <ido@wizery.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit c8aea565e8f715d9f10064b1cbfbc15bf75df501
Author: Gery Kahn <geryk@ti.com>
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 <geryk@ti.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
commit 34d59c07e9ad7130813c28f8554ef1298af923b7
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 69d826b6c54de113f02a73990b6f6809289b48cc
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f5682c01eb85fce13d064d232c947322bd7e2631
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
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 <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit d4daaea656e0b5543c2e37c31934cea8f044b31e
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2d4e43c3c6783f956163c11568303b0390725e28
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit dc21b5453249e7e9b8878fab356fd60b731cf04d
Author: Johannes Berg <johannes.berg@intel.com>
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 <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 07caf9d6c9135ae25a760867f37aab90c1008380
Author: Eliad Peller <eliad@wizery.com>
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 <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6a6733f256f18cbcf4875e13f59eedb593b755a8
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4bdd1e978ede034c1211957eb17eaf50de00d234
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 9d94674ab754be0e275120a183670ead435f9c0d
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5d4c428254f73bae272be9d296724b1ee09d76ec
Author: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
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 <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb
Author: Rajkumar Manoharan <rmanoharan@atheros.com>
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 <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f60dc0138aa19769bf8bab9f93b043235428b66f
Author: John W. Linville <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
commit b9237578f8d685bb86901ba9ff0d379218e5a3c5
Author: John W. Linville <linville@tuxdriver.com>
Date: Mon Oct 25 10:33:07 2010 -0400
rt2x00pci: do not use GFP_DMA
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
commit 26f94dc264a7ebddcc08d3908e99880703d871e5
Author: John W. Linville <linville@tuxdriver.com>
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 <linville@tuxdriver.com>
commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02
Author: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat Oct 23 19:51:32 2010 +0200
carl9170: fix typos
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Fri Oct 22 17:43:47 2010 +0200
b43: define known SPROM boardflags2 bits
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Fri Oct 22 17:43:46 2010 +0200
b43: N-PHY: fix 2055 radio init
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ac4f5457c7617999967e9740f8903b922714bab4
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 5eda74a40587139b1d66cd8197cac92ba36e79f4
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a25a66ac94db88190653d5725c563e3f8faeee61
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4cbf1b12491cd43032846acc6c6924d9090fa19f
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642
Author: Stanislaw Gruszka <sgruszka@redhat.com>
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 <sgruszka@redhat.com>
Acked-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit c7317e41df30c7e04dca46360e5ebb0cb36dda45
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ff32d9cd2c4107224a28f39d3c72eec66d566e09
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit b87b0128894efd3bbf7272a579f71b3a2bc500d1
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <greearb@candelatech.com>
Cc: Kyungwan Nam <kyungwan.nam@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit d91e41b690f795c04af4eb6fe28d2cafd3291051
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e702d3cf29143327679ce2e2a60775eaf829f377
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a65185367f9f876448f0f12ac09a673d20371efc
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Wed Oct 20 10:18:57 2010 -0700
cfg80211: add debug print when disabling a channel on a custom regd
Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 926a0a094d2b9052db3f7f37438c3d305cea4be7
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <easwar.krishnan@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: Senthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <david.quan@atheros.com>
Cc: Jouni Malinen <jouni.malinen@atheros.com>
cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 749b527b21465fb079796c03ffb4302584dc31c1
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date: Wed Oct 20 10:18:53 2010 -0700
cfg80211: pass the reg hint initiator to helpers
This is required later.
Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68
Author: Stephen Hemminger <shemminger@vyatta.com>
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 <shemminger@vyatta.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e081685c1bbe8da37c7f61726fdb783ff277f14f
Author: Larry Finger <Larry.Finger@lwfinger.net>
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 <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f8c2a0871b8462481a02445b38a7321ad63bfc88
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit a3685d119dacb07a7080169fea2847ef385b209f
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit babcbc295fee766ca710235e431686fef744d9a6
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit de40f316c01b1ba9535e6dc99f6a67e7655b07da
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 6b7b6cf553f881d45bb37a73f5db956afb290a08
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988
Author: John Fastabend <john.r.fastabend@intel.com>
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 <john.r.fastabend@intel.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 58e998c6d23988490162cef0784b19ea274d90bb
Author: Jesse Gross <jesse@nicira.com>
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 <jesse@nicira.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4
Author: Jesse Gross <jesse@nicira.com>
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 <jesse@nicira.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e1e78db628b33c657944865e3bca01ee59cc5b80
Author: Jesse Gross <jesse@nicira.com>
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 <jesse@nicira.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ef995e3a91e290684f24696e1d2e8767a2a2ebb6
Author: Joe Perches <joe@perches.com>
Date: Mon Nov 15 09:09:17 2010 -0800
ASoC: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 410989f65151557701ce86875b141e694281dd6c
Author: Casey Leedom <leedom@chelsio.com>
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 <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1
Author: Casey Leedom <leedom@chelsio.com>
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 <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30
Author: Casey Leedom <leedom@chelsio.com>
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 <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit caedda35c6dba5a283e5d87e77a8d19ee4be3183
Author: Casey Leedom <leedom@chelsio.com>
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 <leedom@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit d9aa93804e53f2153260568024b75ad3d81784f9
Author: David S. Miller <davem@davemloft.net>
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 <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ead9b9199c09653dd9b889933c7af75f020c7286
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Sat Nov 13 20:40:44 2010 +0200
ASoC: Add optional name_prefix for codec kcontrol, widget and route names
There is a need to prefix codec kcontrol, widget and internal route names in
an ASoC machine that has multiple codecs with conflicting names. The name
collision would occur when codec drivers try to registering kcontrols with
the same name or when building audio paths.
This patch introduces optional prefix_map into struct snd_soc_card. With it
machine drivers can specify a unique name prefix to each codec that have
conflicting names with anothers. Prefix to codec is matched with codec
name.
Following example illustrates a machine that has two same codec instances.
Name collision from kcontrol registration is avoided by specifying a name
prefix "foo" for the second codec. As the codec widget names are prefixed
then second audio map for that codec shows a prefixed widget name.
static const struct snd_soc_dapm_route map0[] = {
{"Spk", NULL, "MONO"},
};
static const struct snd_soc_dapm_route map1[] = {
{"Vibra", NULL, "foo MONO"},
};
static struct snd_soc_prefix_map codec_prefix[] = {
{
.dev_name = "codec.2",
.name_prefix = "foo",
},
};
static struct snd_soc_card card = {
...
.prefix_map = codec_prefix,
.num_prefixes = ARRAY_SIZE(codec_prefix),
};
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit e987fa357a4c585e4f43fc3e0ab15ba9e908e233
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sun Nov 7 23:24:44 2010 +0100
infiniband: Only include mutex.h once in drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Only include the header linux/mutex.h once inside
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit b7bedd804333f13248c0fee57eeef764edfcbc9b
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sun Nov 7 23:15:41 2010 +0100
ARM, mm: Don't include smp_plat.h twice in flush.c
It's enough to include the asm/smp_plat.h once in arch/arm/mm/flush.c
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 6021afcf19d8c6f5db6d11cadcfb6a22d0c28a48
Author: Edgar (gimli) Hucek <gimli@dark-green.com>
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 <gimli@dark-green.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 380cf090f4f531545b558b04a3dd90d09df52ee9
Author: Wu Fengguang <fengguang.wu@intel.com>
Date: Thu Nov 11 19:23:29 2010 +0800
ext4: fix redirty_page_for_writepage() typo in comment
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 149d730fac715e077a8bcceb4b27f3523b314558
Author: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Date: Tue Nov 9 23:20:26 2010 +0100
spelling fix in drivers/misc/Kconfig
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 3c9e28e751cf9969c2cb2e57b5573cab86cf521a
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Date: Sat Nov 13 18:51:53 2010 +0100
ASoC: Add support for OpenRD Ultimate
OpenRD Ultimate & Client are similar machines so enable OpenRD client sound
support on Ultimate too
Tested-by: Robas Teodor <teodor.robas@gmail.com>
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit f9a67059d43a8f12446356ed42d7694afc34bb92
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun Nov 14 19:25:09 2010 +0000
ASoC: Prevent system suspend while debouncing wakeup capable GPIO jacks
If the device associated with a GPIO jack is wakeup capable then disable
suspend while we're debouncing the jack so that we skip suspends that race
with the jack.
Note that currently the GPIO based jack has a CODEC associated with it
which we're using right now. These jacks should be reparented against the
card itself and this code adjusted.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 20a4c261ad9cec39942257b1f91765a4b238db05
Author: Paul Fox <pgf@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 34caed2082105a6d9f5aaba1cf4e02760cbee14e
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 67f56bb0f4997b55291c162077e02e4f29639fc2
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 473ff6609c0778c5939164c5c57676b74164be71
Author: Joe Perches <joe@perches.com>
Date: Sun Nov 14 19:04:21 2010 -0800
arch/microblaze: Remove unnecessary semicolons
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>
commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 52394eecec4e6fa677a61af26f0bd35de665344e
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit d83447f0944e73d690218d79c07762ffa4ceb9e4
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 18219463c884bfdb7954d298b9edb5194b14d621
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 3802408644515e29fb723d51a5317301b212cf3a
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 4232f60791d12a5156c3e1c9b04ae08b873a2920
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 0ad83f6882c41df1a7fa387086029e162038c1f2
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit e4105119aca9b86b163fa07428df1f615034a03d
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 9fbbdde93231ad7f35c217aa6bbbc7995133f483
Author: Erik Gilling <konkers@android.com>
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 <konkers@android.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit f58b91d22b16d48f0b4910b835ee0dba7987b263
Author: Philip Sanderson <philip.k.sanderson@gmail.com>
Date: Mon Nov 15 09:58:01 2010 +1100
lguest: document --rng in example Launcher
Rusty Russell wrote:
> Ah, it will appear as /dev/hwrng. It's a weirdness of Linux that our actual
> hardware number generators are not wired up to /dev/random...
Reflected this in the documentation, thanks :-)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit 9b22599bb6ddceac3d8f926afa1d43f1506de2c6
Author: Philip Sanderson <philip.k.sanderson@gmail.com>
Date: Mon Nov 15 09:58:01 2010 +1100
lguest: --username and --chroot options
I've attached a patch which implements dropping to privileges
and chrooting to a directory.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit c07a50800754f277b3a6db207bd009ba59b30099
Author: Philip Sanderson <philip.k.sanderson@gmail.com>
Date: Mon Nov 15 09:58:01 2010 +1100
lguest: example launcher to use guard pages, drop PROT_EXEC, fix limit logic
PROT_EXEC seems to be completely unnecessary (as the lguest binary
never executes there), and will allow it to work with SELinux (and
more importantly, PaX :-) as they can/do forbid writable and
executable mappings.
Also, map PROT_NONE guard pages at start and end of guest memory for extra
paranoia.
I changed the length check to addr + size > guest_limit because >= is wrong
(addr of 0, size of getpagesize() with a guest_limit of getpagesize() would
false positive).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit 882c943feafb9951d94a51d797aa610908752e49
Author: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue Nov 9 22:20:29 2010 -0800
virtio: fix format of sysfs driver/vendor files
The sysfs files for virtio produce the wrong format and are missing
the required newline. The output for virtio bus vendor/device should
have the same format as the corresponding entries for PCI devices.
Although this technically changes the ABI for sysfs, these files were
broken to start with!
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit c37e4e600df3a83fda15c6eadd7ff8b13087fdbe
Author: Jiri Slaby <jslaby@suse.cz>
Date: Sat Nov 6 10:06:50 2010 +0100
Char: virtio_console, fix memory leak
Stanse found that in init_vqs, memory is leaked under certain
circumstanses (the fail path order is incorrect). Fix that by checking
allocations in one turn and free all of them at once if some fails
(some may be NULL, but this is OK).
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Amit Shah <amit.shah@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit 4590901a148fefaa259449ff7ad3a9494cb769b2
Author: Michael S. Tsirkin <mst@redhat.com>
Date: Thu Nov 4 14:24:24 2010 +0200
virtio: return correct capacity to users
We can't rely on indirect buffers for capacity
calculations because they need a memory allocation
which might fail. In particular, virtio_net can get
into this situation under stress, and it drops packets
and performs badly.
So return the number of buffers we can guarantee users.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reported-By: Krishna Kumar2 <krkumar2@in.ibm.com>
commit 693fe30673ef79cad999683f09ffaafe58a6dcc5
Author: Anders Kaseorg <andersk@ksplice.com>
Date: Mon Nov 15 09:58:00 2010 +1100
module: Update prototype for ref_module (formerly use_module)
Commit 9bea7f23952d5948f8e5dfdff4de09bb9981fb5f renamed use_module to
ref_module (and changed its return value), but forgot to update this
prototype in module.h.
Signed-off-by: Anders Kaseorg <andersk@ksplice.com>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
commit e135c7ca36db94688ce323ba41f81e25f6a3424b
Author: Stefan Ringel <stefan.ringel@arcor.de>
Date: Tue Nov 9 13:50:28 2010 -0300
[media] tm6000: add revision check
adding chip revision check
Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 839c607d575fa8e35e6aa914c521a9c6a3397468
Author: Joe Perches <joe@perches.com>
Date: Fri Nov 5 00:07:39 2010 -0300
[media] drivers/media: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 72b67a327235a80d11f6003bba37e2fca0159680
Author: Jean-François Moine <moinejf@free.fr>
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 <anca.emanuel@gmail.com>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 60accca3695886a56354075455c7bdef0324bfd7
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit cfa286319fd5ad6246e2ca4a2a981afb3508bb6f
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Nov 12 16:13:17 2010 -0300
[media] gspca - ov519: Initialize the ov519 snapshot register
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 62da9cc0bb5867bc35006cbd638c322384a381cf
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6c855a1cf8e8deb2346d29df3df7b1f317ffa726
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Nov 12 15:07:35 2010 -0300
[media] gspca - ov519: Simplify the LED control functions
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 71aac1ac9c0b99502447a186bc5cefe1188c9a63
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6db74e0a8c07120373ac5b2bf7ceb39a74c80d94
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Nov 12 13:53:10 2010 -0300
[media] gspca - ov519: Clearer debug and error messages
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6a7dd0f3f706458fa5ebc358b0f2bf61e06c677f
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Nov 12 07:54:02 2010 -0300
[media] gspca - ov519: Propagate errors to higher level
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 02ba87ff42f4ae93b4a50eac9ef86a65f3c6d27c
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9f99a438bc89e8bc333384aec8d19d4c695f8630
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c85f3e291fa6e9e07a811c6b38bfe616b41363ed
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 5bee793dbbc4a0d7cb054d186d05fcc539dabc70
Author: Nicolas Kaiser <nikai@nikai.net>
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 <nikai@nikai.net>
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 8dcaa66b0d2465b1f9e7589be4398a0aa66660b9
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit e05875a5eb4bc7983c1d63af6eae9c4d63df6497
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit f097cc4bc5d2b1ec9c8fd3e35b08c0e630a47b2b
Author: Jean-François Moine <moinejf@free.fr>
Date: Thu Nov 11 08:04:06 2010 -0300
[media] gspca - ov519: Change types '__xx' to 'xx'
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 225ba5762974e0b62afe9d14649f1f54ecbb293c
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2d1072fe0ec9092ad624d0e935a55bbfb91ad4d3
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 71799b46cf8b5496e0d0e98d3b378f552e9d5eed
Author: Hans de Goede <hdegoede@redhat.com>
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 <lee.jones@canonical.com>
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 329ebc2b94e2774942646c5c921547dd4feca1ca
Author: Steven Toth <stoth@kernellabs.com>
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 <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 5b82d3be2a6713fc5ad90ca0e951299dcf7acf2d
Author: Dan Carpenter <error27@gmail.com>
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 <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 679bb3ee55a69c859c268a6e71c61436ddd6e8f4
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 033770721b060d0aac982c8c7fb5a45ddf3a6912
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 18:08:31 2010 -0300
[media] drivers/media/video: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2fa7bee52ccd9ec32920c07aff0de77aba669a73
Author: VDR User <user.vdr@gmail.com>
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 <user.vdr@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 69435b94d01f49197b287eb5902fb8c5cee8fe1d
Author: Adrian Hoban <adrian.hoban@intel.com>
Date: Thu Nov 4 15:02:04 2010 -0400
crypto: rfc4106 - Extending the RC4106 AES-GCM test vectors
Updated RFC4106 AES-GCM testing. Some test vectors were taken from
http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/
gcm/gcm-test-vectors.tar.gz
Signed-off-by: Adrian Hoban <adrian.hoban@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: Aidan O'Mahony <aidan.o.mahony@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 0bd82f5f6355775fbaf7d3c664432ce1b862be1e
Author: Tadeusz Struk <tadeusz.struk@intel.com>
Date: Thu Nov 4 15:00:45 2010 -0400
crypto: aesni-intel - RFC4106 AES-GCM Driver Using Intel New Instructions
This patch adds an optimized RFC4106 AES-GCM implementation for 64-bit
kernels. It supports 128-bit AES key size. This leverages the crypto
AEAD interface type to facilitate a combined AES & GCM operation to
be implemented in assembly code. The assembly code leverages Intel(R)
AES New Instructions and the PCLMULQDQ instruction.
Signed-off-by: Adrian Hoban <adrian.hoban@intel.com>
Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Gabriele Paoloni <gabriele.paoloni@intel.com>
Signed-off-by: Aidan O'Mahony <aidan.o.mahony@intel.com>
Signed-off-by: Erdinc Ozturk <erdinc.ozturk@intel.com>
Signed-off-by: James Guilford <james.guilford@intel.com>
Signed-off-by: Wajdi Feghali <wajdi.k.feghali@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 895be15745d59cc7ede0e1c203e3432b0abdb71c
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Thu Nov 4 14:58:12 2010 -0400
crypto: cast5 - simplify if-statements
I noticed that by factoring out common rounds from the
branches of the if-statements in the encryption and
decryption functions, the executable file size goes down
significantly, for crypto/cast5.ko from 26688 bytes
to 24336 bytes (amd64).
On my test system, I saw a slight speedup. This is the
first time I'm doing such a benchmark - I found a similar
one on the crypto mailing list, and I hope I did it right?
Before:
# cryptsetup create dm-test /dev/hda2 -c cast5-cbc-plain -s 128
Passsatz eingeben:
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,43484 s, 21,5 MB/s
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,4089 s, 21,8 MB/s
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,41091 s, 21,7 MB/s
After:
# cryptsetup create dm-test /dev/hda2 -c cast5-cbc-plain -s 128
Passsatz eingeben:
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,38128 s, 22,0 MB/s
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,29486 s, 22,8 MB/s
# dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50
52428800 Bytes (52 MB) kopiert, 2,37162 s, 22,1 MB/s
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 190683a9d5457e6d962c232ffbecac3ab158dddd
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e85eb11782259dc39502807f3ec903a7b82b1bab
Author: Philippe De Muyter <phdm@macqel.be>
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 <phdm@macqel.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1d7138de878d1d4210727c1200193e69596f93b3
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Cypher Wu <cypher.w@gmail.com>
Cc: Américo Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0
Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Date: Fri Nov 12 12:43:34 2010 -0800
stmmac: update the driver documentation
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit f92c8dd7a0eb18124521e2b549f88422e17f707b
Author: Bob Peterson <rpeterso@redhat.com>
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 <rpeterso@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
commit cb2d45da81c86d5191b19d0f67732a854bc0253c
Author: David Teigland <teigland@redhat.com>
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 <teigland@redhat.com>
commit dcce240ead802d42b1e45ad2fcb2ed4a399cb255
Author: Steven Whitehouse <swhiteho@redhat.com>
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 <swhiteho@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: David Teigland <teigland@redhat.com>
commit cb2b3cf1fedd31916b7c64d61e2d20d23bd3681a
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu Nov 11 17:18:01 2010 +0000
ASoC: Reset WM8962 with default ID value
The value makes no odds and it makes life easier with caches.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit c3e150095f409c364a6b0dc158b8f6a748c79647
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <mchehab@redhat.com>
commit 2fb4d3340d804223239549bb05df613f5b09fd73
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri Nov 12 10:02:40 2010 -0200
[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 <mchehab@redhat.com>
commit c90af318ea855f34cbfd35c2ea5e643148ca4de5
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1639cc0c5348957c076c0304005632d4a1b63252
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 87abb6bbdbcfbced2ce0bcad68dd89ac3ff9464b
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <dtor@mail.ru>
commit a309cdc778b9eece59b34e9e1c26e41476dbbcd6
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit c0dc8342656a1425c31dcc505072f2387f0f0c92
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit ca94ec43540ce5d93fd30a3bf88321b6f11ed51a
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 10ee2ded629b1571cef1182728d6f65dbe4c7f79
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu Nov 11 01:03:00 2010 -0800
Input: pcf_keypad - convert to dev_op_ops
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 2a0591596b302adc654a1caf6bd3d0063407ea4b
Author: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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 <dtor@mail.ru>
commit 161feb2417dd0c4324c2e8da24aaebd30a436d45
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 6ff92a6db2083ecd1a8e2742d9397159fd880987
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit 49cc69b6789b57d2d8ed78843c4219525b433b58
Author: Axel Lin <axel.lin@gmail.com>
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 <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
commit c753796769e4fb0cd813b6e5801b3c01f4681d4f
Author: David S. Miller <davem@davemloft.net>
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 <davem@davemloft.net>
commit 37bc9f5078c62bfa73edeb0053edceb3ed5e46a4
Author: Dirk Brandewie <dirk.brandewie@gmail.com>
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 <dirk.j.brandewie@intel.com>
LKML-Reference: <5bdcfb4f0206fa721570504e95659a03b815bc5e.1289331834.git.dirk.brandewie@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 91d8037f563e4a86ff8b02c994530989c7936427
Author: Dirk Brandewie <dirk.j.brandewie@intel.com>
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 <dirk.j.brandewie@intel.com>
LKML-Reference: <40b6751381c2275dc359db5a17989cce22ad8db7.1289331834.git.dirk.brandewie@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit c751e17b5371ad86cdde6cf5c0175e06f3ff0347
Author: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 8c79aad3bd8a379bd0bd144895b55098aca2ccea
Author: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Thu Nov 11 14:39:12 2010 -0800
xen/gntdev: add VM_PFNMAP to vma
These pages are from other domains, so don't have any local PFN.
VM_PFNMAP is the closest concept Linux has to this.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
commit 56385560d6d8fd4c89c4f328d3ff0ecc9c44c52d
Author: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue Mar 3 12:27:55 2009 -0800
xen/gntdev: allow usermode to map granted pages
The gntdev driver allows usermode to map granted pages from other
domains. This is typically used to implement a Xen backend driver
in user mode.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
commit a188301f0e78daed011dde56139630d88299a954
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Mon Feb 9 12:05:49 2009 -0800
xen: define gnttab_set_map_op/unmap_op
Impact: hypercall definitions
These functions populate the gnttab data structures used by the
granttab map and unmap ops and are used in the backend drivers.
Originally xen-unstable.hg 9625:c3bb51c443a7
[ Include Stefano's fix for phys_addr_t ]
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
commit 2adc2917ce4bfb482a6e3c05ff543cef151c9830
Author: Baurzhan Ismagulov <ibr@radix50.net>
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 <ibr@radix50.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5b04ec4ad8e2ffdc9d1f27fd6eb5118e919bc87d
Author: Baurzhan Ismagulov <ibr@radix50.net>
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 <michael@gandalf.sssup.it>
Signed-off-by: Bruno Morelli <bruno@evidence.eu.com>
Signed-off-by: Baurzhan Ismagulov <ibr@radix50.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 63295cb2ff4329f563579f3d20c5855a96a866d5
Author: Claudio Scordino <claudio@evidence.eu.com>
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 <claudio@evidence.eu.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Russell King <linux@arm.linux.org.uk>
Acked-by: Grant Edwards <grant.b.edwards@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5f9a31d63105c3e88bd6d026e7bc53f02a5ac042
Author: Alan Cox <alan@linux.intel.com>
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 <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c2f2f0000bb69f067fea12624272e6a58a811702
Author: Alan Cox <alan@linux.intel.com>
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 <ken.k.mills@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 304e12665a4a7b8b25dfe8c64fa4fd56a04a67ea
Author: Alexey Charkov <alchark@gmail.com>
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 <alchark@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit af3b8881f4c9852eefe9c7f1a997b3ecf580561b
Author: Russ Gorby <richardx.r.gorby@intel.com>
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 <richardx.r.gorby@intel.com>
[Some reworking and a major cleanup]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b36930dd508e00f0c5083bcd57d25de6d0375c76
Author: David Miller <davem@davemloft.net>
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 <davem@davemloft.net>
Signed-off-by: David Teigland <teigland@redhat.com>
commit 72cdd1d971c0deb1619c5c339270570c43647a78
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c7a471ec6528ede2acd45bb5e37c0f8a094ec001
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat Aug 21 09:42:05 2010 -0300
i7core_edac: use edac's own way to print errors
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c0c04c2a89cf6363da2940da59afd2e30001b991
Author: Jon Mason <jon.mason@exar.com>
Date: Thu Nov 11 04:26:04 2010 +0000
vxge: update driver version
Update vxge driver version
Signed-off-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2c91308f449c6705b81bd3370a0ec647e370f35c
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1901d042abf10d08a829961a63fd158f9844587e
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e7935c9669c27c5d530bff634c0c15f7a602d697
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c3150eac9f2e5f770b09d371f7716540219a46f6
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b81b37338412e3215670641e5025c85146521dea
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e8ac175615b9458a00193c55617b5b8865e67817
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 8424e00dfd5282026a93996a165fc4079d382169
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ddd62726e0bc1ffe0ab791b647f4178161ab451b
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4d2a5b406c02b224bd3f50992c8b02450c65a730
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 47f01db44b2470d9517848f6b73c75883ef5fda0
Author: Jon Mason <jon.mason@exar.com>
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 <jon.mason@exar.com>
Signed-off-by: Ram Vepa <ram.vepa@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5e19c6fc65fa55bcf4d5af2447151f7e320ead54
Author: Sheng Yang <sheng@linux.intel.com>
Date: Thu Nov 11 15:46:55 2010 +0800
PCI: Add mask bit definition for MSI-X table
Then we can use it instead of magic number 1.
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 4aec95ca3f8bd3a975c5daa09ca19ea198df6452
Author: Sheng Yang <sheng@linux.intel.com>
Date: Thu Nov 11 15:46:54 2010 +0800
PCI: MSI: Move MSI-X entry definition to pci_regs.h
Then it can be used by others.
Reviewed-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 0889bed207ec7be302ad6ab6106f449edcad76da
Author: Martin Wilck <martin.wilck@ts.fujitsu.com>
Date: Wed Nov 10 11:03:21 2010 +0100
PCI: fix size checks for mmap() on /proc/bus/pci files
The checks for valid mmaps of PCI resources made through /proc/bus/pci files
that were introduced in 9eff02e2042f96fb2aedd02e032eca1c5333d767 have several
problems:
1. mmap() calls on /proc/bus/pci files are made with real file offsets > 0,
whereas under /sys/bus/pci/devices, the start of the resource corresponds
to offset 0. This may lead to false negatives in pci_mmap_fits(), which
implicitly assumes the /sys/bus/pci/devices layout.
2. The loop in proc_bus_pci_mmap doesn't skip empty resouces. This leads
to false positives, because pci_mmap_fits() doesn't treat empty resources
correctly (the calculated size is 1 << (8*sizeof(resource_size_t)-PAGE_SHIFT)
in this case!).
3. If a user maps resources with BAR > 0, pci_mmap_fits will emit bogus
WARNINGS for the first resources that don't fit until the correct one is found.
On many controllers the first 2-4 BARs are used, and the others are empty.
In this case, an mmap attempt will first fail on the non-empty BARs
(including the "right" BAR because of 1.) and emit bogus WARNINGS because
of 3., and finally succeed on the first empty BAR because of 2.
This is certainly not the intended behaviour.
This patch addresses all 3 issues.
Updated with an enum type for the additional parameter for pci_mmap_fits().
Cc: stable@kernel.org
Signed-off-by: Martin Wilck <martin.wilck@ts.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit fd74376cce067d3ff7b533e22babea8504e51b78
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Wed Sep 22 11:09:19 2010 -0600
x86/PCI: coalesce overlapping host bridge windows
Some BIOSes provide PCI host bridge windows that overlap, e.g.,
pci_root PNP0A03:00: host bridge window [mem 0xb0000000-0xffffffff]
pci_root PNP0A03:00: host bridge window [mem 0xafffffff-0xdfffffff]
pci_root PNP0A03:00: host bridge window [mem 0xf0000000-0xffffffff]
If we simply insert these as children of iomem_resource, the second window
fails because it conflicts with the first, and the third is inserted as a
child of the first, i.e.,
b0000000-ffffffff PCI Bus 0000:00
f0000000-ffffffff PCI Bus 0000:00
When we claim PCI device resources, this can cause collisions like this
if we put them in the first window:
pci 0000:00:01.0: address space collision: [mem 0xff300000-0xff4fffff] conflicts with PCI Bus 0000:00 [mem 0xf0000000-0xffffffff]
Host bridge windows are top-level resources by definition, so it doesn't
make sense to make the third window a child of the first. This patch
coalesces any host bridge windows that overlap. For the example above,
the result is this single window:
pci_root PNP0A03:00: host bridge window [mem 0xafffffff-0xffffffff]
This fixes a 2.6.34 regression.
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=17011
Reported-and-tested-by: Anisse Astier <anisse@astier.eu>
Reported-and-tested-by: Pramod Dematagoda <pmd.lotr.gandalf@gmail.com>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 97c45a41a8d6aa1c1231ee8f7bf31e4e561e915f
Author: Steven Rostedt <rostedt@goodmis.org>
Date: Mon Nov 8 23:20:27 2010 -0500
PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
While testing various randconfigs with ktest.pl, I hit the following panic:
BUG: unable to handle kernel paging request at f7e54b03
IP: [<c0d63409>] ibmphp_access_ebda+0x101/0x19bb
Adding printks, I found that the loop that reads the ebda blocks
can move out of the mapped section.
ibmphp_access_ebda: start=f7e44c00 size=5120 end=f7e46000
ibmphp_access_ebda: io_mem=f7e44d80 offset=384
ibmphp_access_ebda: io_mem=f7e54b03 offset=65283
The start of the iomap was at f7e44c00 and had a size of 5120,
making the end f7e46000. We start with an offset of 0x180 or
384, giving the first read at 0xf7e44d80. Reading that location
yields 65283, which is much bigger than the 5120 that was allocated
and makes the next read at f7e54b03 which is outside the mapped area.
Perhaps this is a bug in the driver, or buggy hardware, but this patch
is more about not crashing my box on start up and just giving a warning
if it detects this error.
This patch at least lets my box boot with just a warning.
Cc: Chandru Siddalingappa <chandru@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 9656dffc089166434003949e4bd9678587ae788d
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Fri Nov 5 15:16:36 2010 -0400
PCI: read current power state at enable time
When we enable a PCI device, we avoid doing a lot of the initial setup
work if the device's enable count is non-zero. If we don't fetch the
power state though, we may later fail to set up MSI due to the unknown
status. So pick it up before we short circuit the rest due to a
pre-existing enable or mismatched enable/disable pair (as happens with
VGA devices, which are special in a special way).
Reported-by: Dave Airlie <airlied@linux.ie>
Tested-by: Dave Airlie <airlied@linux.ie>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
commit 6f207e9bb4219d261d9326597ca533f954f31755
Author: Feng Tang <feng.tang@intel.com>
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 <feng.tang@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101111155019.12924.569.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 8af27e1dc4e4dd7a7b04c2cd0fc3d419d91d45b0
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit a7f387d5afd5e1102f909ab611370014f1f59ae2
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Thu Nov 11 10:04:59 2010 +0000
ASoC: soc-cache: Add support for rbtree based register caching
This patch adds support for rbtree compression when storing the
register cache. It does this by not adding any uninitialized registers
(those whose value is 0). If any of those registers is written
with a nonzero value they get added into the rbtree.
Consider a sample device with a large sparse register map. The
register indices are between [0, 0x31ff]. An array of 12800 registers
is thus created each of which is 2 bytes. This results in a 25kB
region. This array normally lives outside soc-core, normally in the
driver itself. The original soc-core code would kmemdup this region
resulting in 50kB total memory. When using the rbtree compression
technique and __devinitconst on the original array the figures are
as follows. For this typical device, you might have 100 initialized
registers, that is registers that are nonzero by default. We build
an rbtree with 100 nodes, each of which is 24 bytes. This results
in ~2kB of memory. Assuming that the target arch can freeup the
memory used by the initial __devinitconst array, we end up using
about ~2kB bytes of actual memory. The memory footprint will increase
as uninitialized registers get written and thus new nodes created in
the rbtree. In practice, most of those registers are never changed.
If the target arch can't freeup the __devinitconst array, we end up
using a total of ~27kB. The difference between the rbtree and the LZO
caching techniques, is that if using the LZO technique the size of
the cache will increase slower as more uninitialized registers get
changed.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit cc28fb8e7d55d4d7c1661dc0b236f4faddecdd9e
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Thu Nov 11 10:04:58 2010 +0000
ASoC: soc-cache: Add support for LZO register caching
This patch adds support for LZO compression when storing the register
cache. The initial register defaults cache is marked as __devinitconst
and the only change required for a driver to use LZO compression is
to set the compress_type member in codec->driver to SND_SOC_LZO_COMPRESSION.
For a typical device whose register map would normally occupy 25kB or 50kB
by using the LZO compression technique, one can get down to ~5-7kB. There
might be a performance penalty associated with each individual read/write
due to decompressing/compressing the underlying cache, however that should not
be noticeable. These memory benefits depend on whether the target architecture
can get rid of the memory occupied by the original register defaults cache
which is marked as __devinitconst. Nevertheless there will be some memory
gain even if the target architecture can't get rid of the original register
map, this should be around ~30-32kB instead of 50kB.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 7a30a3db34cc7b2180a1a6c4a51d19d93c8a8b80
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Thu Nov 11 10:04:57 2010 +0000
ASoC: soc-cache: Add support for flat register caching
This patch introduces the new caching API and migrates the
old caching interface into the new one. The flat register caching
technique does not use compression at all and it is equivalent to
the old caching technique. One can still access codec->reg_cache
directly but this is not advised as that will not be portable
across different caching strategies.
None of the existing drivers need to be changed to adapt to this
caching technique. There should be no noticeable overhead associated
with using the new caching API.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit e86c2412c88fbe4676920c40348d3c547c9edb0d
Author: maximilian attems <max@stro.at>
Date: Fri Oct 29 15:55:50 2010 +0200
kbuild, deb-pkg: Fix build with paranoid umask
umask 077
make deb-pkg
<snipp ..>
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 <waldi@debian.org>
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 84e909303dbd3c8d882f152c17d1319f2873e147
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu Nov 4 00:07:02 2010 -0400
ASoC: Add DAPM trace events
Trace events for DAPM allow us to monitor the performance and behaviour
of DAPM with logging which can be built into the kernel permanantly, is
more suited to automated analysis and display and less likely to suffer
interference from other logging activity.
Currently trace events are generated for:
- Start and stop of DAPM processing
- Start and stop of bias level changes
- Power decisions for widgets
- Widget event execution start and stop
giving some view as to what is happening and where latencies occur.
Actual changes in widget power can be seen via the register write trace in
soc-core.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit a8b1d34f3ee1bc139ac5fbe3f84f6d16c90136bb
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 18:05:58 2010 -0400
ASoC: Add trace events for ASoC register read/write
The trace subsystem provides a convenient way of instrumenting the kernel
which can be left on all the time with extremely low impact on the system
unlike prints to the kernel log which can be very spammy. Begin adding
support for instrumenting ASoC via this interface by adding trace for the
register access primitives.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 68f89ad8c233a88b10404c5fd8a1109d12999962
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 23:51:49 2010 -0400
ASoC: Factor out boiler plate for DAPM event generation
Make the DAPM sequence execution look a bit nicer by factoring out the
code to invoke an event into a single function since it's all the same
pretty much.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ad78acafeed26f62c9e644f96eecb7c19bd78bb4
Author: Alexey Charkov <alchark@gmail.com>
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 <alchark@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8be8a9d3d16a25645b7869e4544a9d0ec386966a
Author: Tatyana Brokhman <tlinder@codeaurora.org>
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 <tlinder@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0eadcc09203349b11ca477ec367079b23d32ab91
Author: Tatyana Brokhman <tlinder@codeaurora.org>
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 <tlinder@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b73af61e3283068f680e58e091ceafcb88d74b22
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 00cb636ed87a65b512012ea4236348af19daef1e
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fe52f7922c446b2f604ef609153f1cef0ea17278
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1ccd7923fe521273d63d936129754e71a33ebe51
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 17a936117c587c23aafafdb9cd6d433a90daa83d
Author: Rahul Ruikar <rahul.ruikar@gmail.com>
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 <rahul.ruikar@gmail.com>
[mina86@mina86.com: updated commit message]
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d9385b6352da7fed50981f375c2ccb60354039a6
Author: Michal Nazarewicz <mina86@mina86.com>
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 <mina86@mina86.com>
Reported-by: Rahul Ruikar <rahul.ruikar@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 78bff3c65df33da47e93736bd8847b694084e5a9
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Oct 27 10:19:01 2010 +0200
USB: gadget: composite: Typo fix.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8b455561d28bcfac17d6910e64c616cf684da07f
Author: Julia Lawall <julia@diku.dk>
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/)
// <smpl>
@@
expression i;
@@
*i = ...;
i = ...;
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Thomas Dahlmann <dahlmann.thomas@arcor.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 06c3859fc9bd62edb7211b241eadd0cdc8ecbecd
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f7043ecbb3f7b8632a6d6470f8f95160ac868d0f
Author: Bill Pemberton <wfp5p@virginia.edu>
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 <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b
Author: Brett Rudley <brudley@broadcom.com>
Date: Wed Nov 10 17:19:41 2010 -0800
staging: brcm80211: Remove unused module parameters.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f013a13800ed0f5abf31b95ec995f6316f8c4500
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu Nov 11 11:57:17 2010 +0000
regulator: Fix typo in PCAP regulator_set_voltage()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 86071535f845fd054753122e564cee9406c84e70
Author: Vinod Koul <vinod.koul@intel.com>
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 <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101110174044.11340.78008.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 0146f26145af75d53e12dbf23a36996aff373680
Author: Feng Tang <feng.tang@intel.com>
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 <feng.tang@intel.com>
LKML-Reference: <20101110172911.3311.20593.stgit@localhost.localdomain>
[Fixed swapped arguments on IPC]
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
[Cleaned up and the device creation moved to arch/x86/platform]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 7309282c90d251cde77fe3b520a8276e25315c49
Author: Feng Tang <feng.tang@intel.com>
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 <feng.tang@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101110172837.3311.40483.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit cfb505a7ebd4c84206b4cc7d9f966d864a2ac05a
Author: Alek Du <alek.du@intel.com>
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 <alek.du@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101110164928.6365.94243.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 6174c3496d43b78969d4a989e1aabfbc55acbf15
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed Nov 10 17:08:26 2010 -0800
Revert "staging: batman-adv: Use linux/etherdevice.h address helper functions"
This reverts commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c.
Turns out the batman maintainers didn't like the implementation of it,
and the original author was going to rework it to meet their approval,
and I applied it without fully realizing all of this.
My fault.
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 319684b1cd15f24120b9513b38a949539c0b7938
Author: Brandon Philips <brandon@ifup.org>
Date: Sat Nov 6 21:19:22 2010 -0400
driver core: fix whitespace in class_attr_string
869dfc875e3 addded a long line and indented with spaces. Fix.
Signed-off-by: Brandon Philips <brandon@ifup.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610
Author: Hans J. Koch <hjk@hansjkoch.de>
Date: Sat Oct 30 00:36:47 2010 +0200
uio: Change mail address of Hans J. Koch
My old mail address doesn't exist anymore. This changes all occurrences
to my new address.
Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b17cd8d69a75f921d9d444cc3ac9b5b1d0b66ca0
Author: Brandon Philips <brandon@ifup.org>
Date: Sun Nov 7 01:28:24 2010 -0500
driver core: prune docs about device_interface
drivers/base/intf.c was removed before the beginning of (git) time but
its Documentation stuck around. Remove it.
Signed-off-by: Brandon Philips <brandon@ifup.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3701befc44eb9b0e5a0e0b7169448658919b9850
Author: Jesper Juhl <jj@chaosbits.net>
Date: Wed Nov 10 21:31:38 2010 +0100
Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values
Here's a patch against a copy of linux-next that I just cloned.
Don't pointlessly cast pointers returned by allocation functions that
return void pointers which are implicitly converted.
For drivers/staging/bcm/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit afabbe6db368fbed0569d31d402aceb631d9f854
Author: facugaich <facugaich@gmail.com>
Date: Wed Nov 10 10:39:33 2010 -0300
Staging: solo6x10: Fix checkpatch errors and most warnings
This patch fixes all errors and most warnings reported by
checkpatch.pl for all the files in the driver.
v2: Fix a typo and update the patch against the latest HEAD
Signed-off-by: Facundo Gaich <facugaich@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 16618c20e18d60b2c8908b7758228a62a450769a
Author: Alejandro R. Sedeño <asedeno@MIT.EDU>
Date: Wed Nov 10 01:42:02 2010 -0500
Staging: beceem: Move ZTE TU25's USB id to the beceem module
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b706113f1475ce983faabf12120ac4e90d512d02
Author: Alejandro R. Sedeño <asedeno@MIT.EDU>
Date: Wed Nov 10 01:42:01 2010 -0500
Staging: beceem: Use 32-bit integers for hardware register values
Switching to UINT because that's what the rest of this codebase uses.
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 10 10:04:30 2010 +0100
staging: ft1000: Create common return point.
When reg_ft1000_netdev() fails created kthread isn't stopped.
So add return point for stopping thread.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c8b124e21dbb7f4941f292fea446ce63d92d80dd
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 10 09:29:35 2010 +0100
staging: ft1000: Check return value of kthread_run.
kthread_run could fail so we will check return value.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a10bb4fb199bd7a1dc178a6228ad749f5070e0f9
Author: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue Nov 9 18:26:34 2010 -0600
staging: r8712u: Update TODO for sparse fixes
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6036f373ea03687d355634fa70fb04baa95ab75e
Author: Kees Cook <kees.cook@canonical.com>
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 <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
commit ebba638ae723d8a8fc2f7abce5ec18b688b791d7
Author: Kees Cook <kees.cook@canonical.com>
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 <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-4-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
commit ae84739c27b6b3725993202fe02ff35ab86468e1
Author: Kees Cook <kees.cook@canonical.com>
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 <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-3-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
commit c5cbac69422a9bffe7c7fd9a115130e272b547f5
Author: Kees Cook <kees.cook@canonical.com>
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 <kees.cook@canonical.com>
LKML-Reference: <1289414154-7829-2-git-send-email-kees.cook@canonical.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
commit ac2506675fc929f0f5fd6262d8c278adf5bdee65
Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Date: Wed Nov 10 11:06:22 2010 +0100
regulator: enable supply regulator only when use count is zero
Supply regulators are disabled only when the last
reference count is removed on the child regulator
(the use count goes from 1 to 0). This patch changes
the behaviour of enable so the supply regulator is
enabled only when the use count of the child
regulator goes from 0 to 1.
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 48a332b8ecdf8575bdcb99ed85814d1ae9b2fbd5
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 10 14:38:30 2010 +0000
regulator: Add basic trace facilities
Provide some basic trace facilities to the regulator API. We generate
events on regulator enable, disable and voltage setting over the actual
hardware operations (which are assumed to be the expensive ones which
require interaction with the actual device). This is intended to facilitate
debug of the performance and behaviour with consumers allowing unified
traces to be generated including the regulator operations within the
context of the other components of the system.
For enable we log the explicit delay for the voltage ramp separately to
the interaction with the hardware to highlight the time consumed in I/O.
We should add a similar delay for voltage changes, though there the
relatively small magnitude of the changes in the context of the I/O
costs makes it much less critical for most regulators.
Only hardware interactions are currently traced as the primary focus is
on the performance and synchronisation of actual hardware interactions.
Additional tracepoints for debugging of the logical operations can be
added later if required.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit d2f03ebfe8c63d1e3e1ab2352dd32d161546003e
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 10 14:38:29 2010 +0000
regulator: Report actual configured voltage to set_voltage()
Change the interface used by set_voltage() to report the selected value
to the regulator core in terms of a selector used by list_voltage().
This allows the regulator core to know the voltage that was chosen
without having to do an explict get_voltage(), which would be much more
expensive as it will generally access hardware.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 7d870936602533836bba821bd5c679c62c52a95f
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110
Author: Gerrit Renker <gerrit@erg.abdn.ac.uk>
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 <gerrit@erg.abdn.ac.uk>
commit 0c6202b3278b417444a59cecc59e6e5af04db7fd
Author: Ron Mercer <ron.mercer@qlogic.com>
Date: Wed Nov 10 09:29:46 2010 +0000
qlge: Version change to v1.00.00.27
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf
Author: Ron Mercer <ron.mercer@qlogic.com>
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 <jitendra.kalsaria@qlogic.com>
Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 87419858b66920fdc8ac7debd5195a96394bab46
Author: David Härdeman <david@hardeman.nu>
Date: Wed Nov 10 12:04:19 2010 -0200
[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 <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Tested-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit fd8d3bc09033a275d08536c698309e18ee3c14bf
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Tue Nov 9 14:40:28 2010 +0200
ASoC: Convert pop_dbg to use dev_info
Prints from pop_dbg are enabled when dapm_pop_time != 0. Convert it to
use dev_info so that parent device of DAPM context is printed.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit f7d41ae8361fb2d16fe059f65075d92c4efe562c
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Tue Nov 9 14:40:27 2010 +0200
ASoC: Update DAPM debug and error prints
Switch printk and pr_ prints to dev_ variants. It is helpful to see
parent device of DAPM context especially when there are multiple DAPM
contexts (codecs currently).
This is mostly simple conversion. Exceptions are in snd_soc_dapm_set_pin
that prints also pin state, uniform "dapm: unknown pin" error prints from
snd_soc_dapm_set_pin, snd_soc_dapm_force_enable_pin and
snd_soc_dapm_ignore_suspend, and pop_dbg which is converted by an another
patch.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 5bdb05f91b27b9361c4f348a4e05999f597df72e
Author: Darren Hart <dvhart@linux.intel.com>
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 <dvhart@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <1289252428-18383-1-git-send-email-dvhart@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit b41277dc7a18ee332d9e8078e978bacdf6e76157
Author: Darren Hart <dvhart@linux.intel.com>
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 <dvhart@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit ae791a2d2e382adc69990a144a7f1a6c4bc24f1e
Author: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
Cc: Darren Hart <dvhart@linux.intel.com>
LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com>
commit c7657ac0c3e4d4ab569296911164b7a2b0ff871a
Author: Borislav Petkov <borislav.petkov@amd.com>
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 <borislav.petkov@amd.com>
commit 1ea6be212eea5ce1e8fabadacb0c639ad87b2f00
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
commit 35202caebaa65c0371968007e544a596d81d1568
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 10 00:44:27 2010 -0200
[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 <mchehab@redhat.com>
commit 4d6e352a6f8fe652a8c8ff8d2a55d974f82befda
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 10 00:18:24 2010 -0200
[media] rc-core: Merge rc-sysfs.c into rc-main.c
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 5e17ac14c9a62df7052ef1e41afffbf614fc942b
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 10 00:09:57 2010 -0200
[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 <mchehab@redhat.com>
commit 6e2ec45d5bf747204209a7a6825dda96d4b365d1
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Nov 10 00:00:14 2010 -0200
[media] rename drivers/media/IR to drives/media/rc
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 7decaa557a20f48aabef35f817ec16ef563567b0
Author: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
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 <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit fd3ee6d3421bc05ce42ee7f48071aee72051af28
Author: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
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 <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a404ad1ff593589bdd34c48ebecddada9edbfaf3
Author: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
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 <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit d03f322c41890a86bf64d00314f0ec72738a7f21
Author: Marcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
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 <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 34177802001894e064c857cac2759f68119550cd
Author: Linus Walleij <linus.walleij@stericsson.com>
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 <marcin.mielczarczyk@tieto.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit f20f8f21e0402c785c342547f7e49eafc42cfb52
Author: Linus Walleij <linus.walleij@stericsson.com>
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 <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 2686b4b408c25349aee7b35558722d5730d67224
Author: Linus Walleij <linus.walleij@stericsson.com>
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 <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 5e4f083f78d03e9f8d2e327daccde16976f9bb00
Author: Yong Zhang <yong.zhang@windriver.com>
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 <yong.zhang0@gmail.com>
LKML-Reference: <1287892253-2587-1-git-send-email-yong.zhang0@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit da1d39e3903bc35be2b5e8d2116fdd5d337244d4
Author: Simon Horman <horms@verge.net.au>
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 <yusuke.goda.sx@renesas.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 3cf9b85b474e656a0856b88290c7a289ac5ea247
Author: Joe Perches <joe@perches.com>
Date: Fri Nov 5 16:12:38 2010 -0700
locking, lockdep: Convert sprintf_symbol to %pS
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jiri Kosina <trivial@kernel.org>
LKML-Reference: <1288998760-11775-6-git-send-email-joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit f6cd24777513fcc673d432cc29ef59881d3e4df1
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Reviewed-by: Andi Kleen <andi@firstfloor.org>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1288865628.2659.69.camel@edumazet-laptop>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 640dcfa0ff49ea1fcddad39e7c468683d9f00342
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit c724d07a56e60e91b0aa75193f86fb000545ffe4
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 830539d14379d0f5cb07832a3e4466418011f843
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 0ea2af1c15b730dba9ce741420352d298bcd7862
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit d2ecbab5960d9814a269d36723647d6ef391ba8f
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit 8c183ecee23991dd6c0476a537c6bae8afd2567e
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit c36940e678fc30779c99246c034deca1fed61ae4
Author: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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 <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit af9f14f7fc31f0d7b7cdf8f7f7f15a3c3794aea3
Author: Jarod Wilson <jarod@redhat.com>
Date: Tue Nov 9 18:42:37 2010 -0300
[media] IR: add tv power scancode to rc6 mce keymap
And clean up some stray spaces.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 3456794921e923649f275276da202e7685808807
Author: Jarod Wilson <jarod@redhat.com>
Date: Tue Nov 9 18:41:46 2010 -0300
[media] mceusb: buffer parsing fixups for 1st-gen device
If we pass in an offset, we shouldn't skip 2 bytes. And the first-gen
hardware generates a constant stream of interrupts, always with two
header bytes, and if there's been no IR, with nothing else. Bail from
ir processing without calling ir_handle_raw_event when we get such a
buffer delivered to us.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit fdb453f31fc0ca2fa2e10ce2406991ff83dafbf3
Author: Jarod Wilson <jarod@redhat.com>
Date: Tue Nov 9 18:41:03 2010 -0300
[media] mceusb: fix up reporting of trailing space
We were storing a bunch of spaces at the end of each signal, rather than
a single long space. The in-kernel decoders were actually okay with
this, but lirc isn't. As suggested by David Härdeman, switch to storing
samples using ir_raw_event_store_with_filter, which auto-merges the
consecutive space samples for us. This also allows us to bypass having
to store rawir samples in our device struct, further simplifying the
buffer parsing state machine. Both in-kernel decoders and lirc are happy
again with this change.
Also included in this patch is proper parsing of 0x9f 0x01 commands, the
removal of some magic number usage and some printk spew fixups.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit f84fe151e24d1735aa1e00d965e626540a9884ab
Author: Jarod Wilson <jarod@redhat.com>
Date: Tue Nov 9 18:11:04 2010 -0300
[media] nuvoton-cir: improve buffer parsing responsiveness
Rather than waiting for trigger bits, the formula for which was slightly
messy, and apparently, not actually 100% complete for some remotes, just
call ir_raw_event_handle whenever we finish parsing a chunk of data from
the rx fifo, similar to mceusb, as well as whenever we see an 'end of
signal data' 0x80 packet.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0d71fa1a3e62737061f6e1f991ccd5fa7124bb71
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 1c1c0d99afb2669da11e2609608a64f5dcdb36a2
Author: David Härdeman <david@hardeman.nu>
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 <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec
Author: David Härdeman <david@hardeman.nu>
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 <manio@skyboo.net> for testing my patches
(about one a day for two weeks!) on actual hardware.
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0a1c62dedc6e28a1117b00c4ccb4427bc91b9f29
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:10:35 2010 +0100
staging, spectra: 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/staging/spectra/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5ef3df5b9fed56e64e8544e36a175354d38d0206
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:10:44 2010 +0100
staging, wlags49_h2: 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/staging/wlags49_h2/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3c4e9c84970e555a80a4c92a5a3d3125c63f0e12
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:09:38 2010 +0100
staging, ath6kl: 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/staging/ath6kl/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 131a14b3f0330a844f79c6b87c0fe57ec86faf62
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:10:25 2010 +0100
staging, rt2860: 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/staging/rt2860/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ba120e36aedf159c9698b4c26fe41826a1a30214
Author: Jarkko Nikula <jhnikula@gmail.com>
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 <jhnikula@gmail.com>
Cc: Eduardo Valentin <eduardo.valentin@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 60a1d01bcd348ae1c791260d2df564d9ffc1ac97
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:10:15 2010 +0100
staging, keucr: 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/staging/keucr/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6ccb5d7c62845788be9aafef26132333a07708bb
Author: Justin P. Mattock <justinmattock@gmail.com>
Date: Mon Nov 8 13:41:46 2010 -0800
staging: Fix typos in rt2860
Here is a patch that fixes some typos, and comments in drivers/staging/rt2860
Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1ac586445db8e46f0007855c5c7161ff55484836
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:47 2010 -0800
staging: hv: Convert camel cased functions in ring_buffer.c to lower cases
staging: hv: Convert camel cased functions in ring_buffer.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fc8c72ebfa7547c044bab48fb8bba6906123f8c7
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:46 2010 -0800
staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases
staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 82f8bd40a017716bfadcf074b4c6110ebe4c7ba6
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:45 2010 -0800
staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases
staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 203df82d81a331e16caee4c2346cd382fcd820d6
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:44 2010 -0800
staging: hv: Convert camel cased functions in osd.c to lower cases
staging: hv: Convert camel cased functions in osd.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d39f12866d90829e1ae0440c0203dd5a162c8cd8
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:43 2010 -0800
staging: hv: Convert camel cased local variables in osd.c to lower cases
staging: hv: Convert camel cased local variables in osd.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d44890c8d2a83116463c230b59b9b9d356aafe85
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:42 2010 -0800
staging: hv: Convert camel cased functions in hv.c to lower cases
staging: hv: Convert camel cased functions in hv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b8dfb264f4f9e55f9cf8384cb782dfe5159c413c
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:41 2010 -0800
staging: hv: Convert camel cased local variables in hv.c to lower cases
staging: hv: Convert camel cased local variables in hv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6a0aaa185057801343e000183ef0695c2a2b75a9
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:40 2010 -0800
staging: hv: Convert camel cased struct fields in hv.h to lower cases
staging: hv: Convert camel cased struct fields in hv.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f6feebe073db4c97dc10f6fab54f9d4b5816886b
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:39 2010 -0800
staging: hv: Convert camel cased struct fields in hv_api.h to lower cases
staging: hv: Convert camel cased struct fields in hv_api.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c50f7fb28400bc4829c26bb4a2d6c06a45e90b1a
Author: Haiyang Zhang <haiyangz@microsoft.com>
Date: Mon Nov 8 14:04:38 2010 -0800
staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases
staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a32d4acab4a862c5cd297b73d625d813af8d4e0b
Author: Tracey Dent <tdent48227@gmail.com>
Date: Sat Nov 6 14:48:48 2010 -0400
Staging: speakup: spk_types: trival coding style issue
Checkpatch.pl gives WARNING: missing space after struct definition.
This patch fixes that warning that was on line 55.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3c9d46526db88218a311a72971efae1b4366d4c6
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sun Nov 7 07:37:03 2010 +0100
Staging: Cypress WestBridge OMAP3430 Kernel Hal: Remove unneeded local variables from alloc functions
In
drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c
the local variables 'ret_p' are not needed and should just go away.
I have no way to test this code, but I believe the change is obviously
correct. Please consider it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6f710907ff452ab67bd1161bc3f7a95f9a7e809d
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 18:21:59 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211netdev.c
This is a patch to the p80211netdev.c file that fixes warnings that were
found by the checkpatch.pl tool
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 869c4b4a715af94a14ec074c0a5528a562e3322b
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 15:59:50 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211conv.h
This is a patch to the p80211conv.h file that fixes two 80 character
line limit styling issues
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9f027eb6871335f6e16633df796263f983f08844
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 18:24:46 2010 +0200
Staging: asus_oled: fix coding style issue in asus_oled.c
This is a patch to the asus_oled.c file that fixes up brace and enum
warning found by the checkpatch.pl tool
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f83dfd065817ea3c7387b23afb2fd4d23fb470ff
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 18:23:44 2010 +0200
Staging: wlan-ng: fix coding style issues in prism2mgmt.c
This is a patch to prism2mgmt.c that fixes coding style issues found by
checkpatch.pl. Three instances of the 80 char line limit being exceeded
have been kept as is so that string literals are not split up.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c5de2157b801b9f38c7852b4d30fea8aff0c1bbd
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 18:23:09 2010 +0200
Staging: wlan-ng: fix coding style issues in p80211types.h
This is a patch that fixes various coding style issues in p80211types.h.
The typedef declarations have been kept as they seem necessary.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4314e5a68ab014092a55d5b2b26964952a97bc85
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 18:22:42 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211netdev.h
This is a patch to the p80211netdev.h file that fixes up warnings found
by the checkpatch.pl tool. The typedefs have been left in place as they
seem necessary.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5b84cc781058bb452f869d84bb24442ec51948c4
Author: Joe Perches <joe@perches.com>
Date: Thu Nov 4 20:07:59 2010 -0700
staging: Use vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4eb28f7197a2cbaf7a9be778d429a5fb9bb6172e
Author: Johan Meiring <johanmeiring@gmail.com>
Date: Sat Nov 6 15:46:54 2010 +0200
Staging: wlan-ng: fixed coding style issues in p80211conv.c
This is a patch to the p80211conv.c file that fixes a couple of coding
style issues found by the checkpatch.pl tool.
Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4c510e95aef6138242ed4bc7fe29ee184bea413f
Author: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sun Nov 7 12:22:18 2010 -0600
staging: r8712u: Remove extraneous variables from osdep_service.h
Jesper Juhl submitted a patch to remove one extraneous variable in
this file; however, there are several others.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Reviewed-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a2ac9d69d69d8df88d4096903f5f76fe2de2345b
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sun Nov 7 12:22:18 2010 -0600
staging: r8712u: Remove unneeded local variable in _malloc in osdep_service.h header
The variable 'pbuf' is not needed.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 268dfede46e24eef55a2ef7a10a462617936771e
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:11:36 2010 +0000
staging/easycap: Improve interface to the videodev module
The changes here represent an intermediate step towards bringing the
driver within the V4L2 framework.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ae59dad4fef271222d65ac6afe2889eb12ea6ca9
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:09:19 2010 +0000
staging/easycap: Eliminate BKL
No locking is required for normal operation of the driver, but locking
is needed to prevent an Oops during some hot-unplugging scenarios. The
BKL is replaced here by mutex locks together with traps to detect null
pointers following asynchronous device disconnection.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2a87a0b9220f8e0e6f204b0f61dc6e15ad64ccd4
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:07:12 2010 +0000
staging/easycap: Avoid compiler warning about frame size ... larger than ...
Replacing some of the large automatic variables by dynamically allocated
variables in the IOCTL routines gets rid of the compiler warning.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 94155cf4195bb3be0068481dc21e8688eda2e051
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:05:51 2010 +0000
staging/easycap: Add option to set the hardware audio gain
A new module parameter adjusts the gain of the AC'97 audio chip, if
one is present. Attenuation as well as amplification should be possible
according to the datasheet, but attenuation seems not to work yet.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 849322a0f114e52d05e16fe8349843c980cff2c6
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:03:50 2010 +0000
staging/easycap: Add option to show conspicuous indication of signal loss
A new module parameter turns on the option of displaying a testcard when
the analogue input signal is lost (more precisely: when the hardware
detects no field/frame synchronization). This feature has been requested
in the context of security cameras used at night.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 40b8d50ac98f8c8779aea7459f805e5a69fdb726
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:02:15 2010 +0000
staging/easycap: Implement interlaced modes and reduced framerates
Interlaced modes are requested by tvtime. Reduced framerates are
preferred by some userspace programs, e.g. astronomy applications.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f36bc37a48148f31f936557b811431b98dbfe347
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 20:00:35 2010 +0000
staging/easycap: Improve hardware initialization
Sometimes at startup the video urbs consistently and persistently deliver
bad data, each video frame (not isoc frame) containing an excess of
precisely two bytes. A brute-force cure implemented here is to
repeatedly reinitialize the registers of the SAA7113H chip and the
STK1160 USB bridge until good behaviour is obtained.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e68703cfe8dd2f5605c53b46fae6c9c027e7ef50
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 19:58:55 2010 +0000
staging/easycap: Make code re-entrant
In order to allow multiple EasyCAP dongles to operate simultaneously
without mutual interference all static variables have been eliminated
except for a persistent inventory of plugged-in dongles at module level.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ce36cedab3f865969653bf4360f7e364ab0937e4
Author: Mike Thomas <rmthomas@sciolus.org>
Date: Sun Nov 7 19:56:40 2010 +0000
staging/easycap: Remove obsolete routines
The so-called bridger routine has proved unnecessary following general
improvements elsewhere. The explain_() functions were a convenience
during early development, but are unnecessary and inappropriate now.
Signed-off-by: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 391a169e99c789d59ef2a6b0cb80d1c6f63238dd
Author: Jesper Juhl <jj@chaosbits.net>
Date: Thu Nov 4 22:27:42 2010 +0100
pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm wrappers.
Hi,
crypto_free_hash() and crypto_free_ablkcipher() are just wrappers around
crypto_free_tfm() which is itself just a wrapper around
crypto_destroy_tfm().
Passing crypto_destroy_tfm() a NULL pointer is valid, so there's no reason
to check for NULL first.
Removing the unneeded conditionals (which is what the patch does) brings
us the benefit of having to execute a few fewer test/branch instructions
and also reduces object code size slightly:
before:
text data bss dec hex filename
8630 112 3312 12054 2f16 drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: 48 85 ff test %rdi,%rdi
cdd: 74 0c je ceb <pohmelfs_crypto_engine_exit+0x2d>
cdf: 48 ff 05 00 00 00 00 incq 0x0(%rip) # ce6 <pohmelfs_crypto_engine_exit+0x28>
ce6: e8 58 fa ff ff callq 743 <crypto_free_hash>
ceb: 48 8b 7b 28 mov 0x28(%rbx),%rdi
cef: 48 85 ff test %rdi,%rdi
cf2: 75 09 jne cfd <pohmelfs_crypto_engine_exit+0x3f>
cf4: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfb <pohmelfs_crypto_engine_exit+0x3d>
cfb: eb 16 jmp d13 <pohmelfs_crypto_engine_exit+0x55>
cfd: 48 89 fe mov %rdi,%rsi
d00: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d07 <pohmelfs_crypto_engine_exit+0x49>
d07: e8 00 00 00 00 callq d0c <pohmelfs_crypto_engine_exit+0x4e>
d0c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d13 <pohmelfs_crypto_engine_exit+0x55>
d13: 48 8b 7b 18 mov 0x18(%rbx),%rdi
d17: e8 00 00 00 00 callq d1c <pohmelfs_crypto_engine_exit+0x5e>
d1c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d23 <pohmelfs_crypto_engine_exit+0x65>
d23: 5e pop %rsi
d24: 5b pop %rbx
d25: c9 leaveq
d26: c3 retq
after:
text data bss dec hex filename
8604 112 3296 12012 2eec drivers/staging/pohmelfs/crypto.o
0000000000000cbe <pohmelfs_crypto_engine_exit>:
cbe: 55 push %rbp
cbf: 48 89 e5 mov %rsp,%rbp
cc2: 53 push %rbx
cc3: 48 83 ec 08 sub $0x8,%rsp
cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe>
ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15>
cd3: 48 89 fb mov %rdi,%rbx
cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi
cda: e8 64 fa ff ff callq 743 <crypto_free_hash>
cdf: 48 8b 7b 28 mov 0x28(%rbx),%rdi
ce3: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cea <pohmelfs_crypto_engine_exit+0x2c>
cea: 48 89 fe mov %rdi,%rsi
ced: e8 00 00 00 00 callq cf2 <pohmelfs_crypto_engine_exit+0x34>
cf2: 48 8b 7b 18 mov 0x18(%rbx),%rdi
cf6: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfd <pohmelfs_crypto_engine_exit+0x3f>
cfd: e8 00 00 00 00 callq d02 <pohmelfs_crypto_engine_exit+0x44>
d02: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d09 <pohmelfs_crypto_engine_exit+0x4b>
d09: 5e pop %rsi
d0a: 5b pop %rbx
d0b: c9 leaveq
d0c: c3 retq
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c
Author: Tobias Klauser <tklauser@distanz.ch>
Date: Wed Nov 3 10:59:02 2010 +0100
staging: batman-adv: Use linux/etherdevice.h address helper functions
Replace custom ethernet address check functions by calls to the helpers
in linux/etherdevice.h
In one case where the address was tested for broadcast and multicast
address, the broadcast address check can be omitted as broadcast is also
a multicast address.
The patch is only compile-tested.
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e09f138e06d4f1ea63079e25bb55ee1dacff7933
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:55 2010 +0100
staging: ft1000: Get rid of UINT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c613f6f50f9d98015b8640f9aeff3b0c8e07548e
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:54 2010 +0100
staging: ft1000: Get rid of PCHAR typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 81584137d8c97ab6bd87c2b4091f6105f600e66e
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Thu Nov 4 07:37:13 2010 +0100
staging: ft1000: Get rid of BOOLEAN typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 84b7801d135ca90903df3a9170b9db5978fe8fce
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:52 2010 +0100
staging: ft1000: Get rid of ULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d44d76f93dafdbaeac0f1d541f3867777de65c8a
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:51 2010 +0100
staging: ft1000: Get rid of PULONG typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fc549a05e74edf9535862a4e517e63ade3908f75
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:50 2010 +0100
staging: ft1000: Get rid of USHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d1674983e0fdf3a18dbc4ac7f1f0912f7b1c246e
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:49 2010 +0100
staging: ft1000: GEt rid of PUSHORT typedef usage.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c8f775c88b1b84909d5d73b171a48302bf46b2f8
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:48 2010 +0100
staging: ft1000: Get rid of UCHAR typedef.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e2cb7da1671eb659c8edc81be9838afdd0b6b2cc
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Wed Nov 3 11:19:47 2010 +0100
staging: ft1000: Get rid of PUCHAR typedef.
PUCHAR typedef was replaces by u8 *.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 95112cb448b5962daeee68db8ee523b71266e28b
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 14:51:47 2010 +0100
staging: ft1000: Check return value.
Function ft1000_submit_rx_urb() could fail so add checking
for return value.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d7780865164f2efe3ea2fa6f1ebdf61ecc1f2a4d
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 14:51:46 2010 +0100
staging: ft1000: Correct return error values.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3b3291e868695194096591c4a5e3e302939e4c2b
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 14:51:45 2010 +0100
staging: ft1000: Use common return point.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 35e9403b052ff6cad71bc5d9a075385e0c62ab96
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 14:51:44 2010 +0100
staging: ft1000: Use specific error codes instead self defined.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d2b07455b85d20c72e4182fe7d53d8c70838f984
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 13:44:10 2010 +0100
staging: ft1000: Pseudo header handlig improved.
Handling for pseudo header was done by directly copying
data to tx buffer. This hide a functionality and make
code unreadable.
Use approach where fill pseudo_hdr structure first with data and then copy
to beginning of buffer.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 019bd3f825a7fc438b1e9ce7d145b03f13102aee
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 13:44:09 2010 +0100
staging: ft1000: Remove dead code.
Remove functions which was used nowhere. Also remove dead
variables used by this functions.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit eb21c1587ac3272d58592e775dc55af6266f7403
Author: Marek Belisko <marek.belisko@gmail.com>
Date: Tue Nov 2 13:44:08 2010 +0100
staging: ft1000: Use memset instead looping with for.
Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4d26d7e6ba3fffd224560acd586526bf2f2f4f73
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 22:29:31 2010 +0200
Staging: w35und: Kill struct hwdata ->SurpriseRemoveCount
This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not
used at all so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 87cb9a6310bc5183de196b25ef6adfda3080a744
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 22:29:30 2010 +0200
Staging: w35und: Kill struct hwdata ->HwStop
This patch kills the ->HwStop member of struct hwdata. It's a read-only
variable that's always zero so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4d0d302257d3d0eccf371aab49c74b41797bebc3
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 22:29:29 2010 +0200
Staging: w35und: Kill struct hwdata ->NullPacketCount
This patch kills the NullPacketCount member of struct hwdata. It's not used for
anything so it's safe to remove it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6112063d804aa0afc8d4462b22e36fc259393b64
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 22:29:28 2010 +0200
Staging: w35und: Kill empty Mds_Destroy function
The Mds_Destroy() function doesn't do anything so kill it.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9dd5f271441bbe85578c2b7841820d8bca26096c
Author: Mauro Schilman <maurito.s@gmail.com>
Date: Mon Nov 1 14:12:05 2010 -0300
Staging: frontier: fix space and * coding style issues in alphatrack.c
This is a patch to the alphatrack.c file that fixes up a space warning
and a space after '*' warning found by the checkpatch.pl tool
Signed-off-by: Mauro Schilman <maurito.s@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b5ef076141acc223e55aa298abd2d2f5fb844874
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 21:50:06 2010 +0200
Staging: w35und: Rename wbhal_s.h to wbhal.h
This patch renames the wbhal_s.h header file to wbhal.h now that it contains
both structure and function definitions.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 72ca8819f7f4ac4ddf82ab72ee614075821a3d00
Author: Pekka Enberg <penberg@kernel.org>
Date: Mon Nov 1 21:50:05 2010 +0200
Staging: w35und: Merge wbhal_f.h to wbhal_s.h
This patch merges HAL struct and function definitions into one header file.
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ba5c2b3ddcb7a6a0e942c7c2434f048d152f08c5
Author: Felipe Andres Besoain Pino <guest02@tux.(none)>
Date: Fri Oct 29 19:15:58 2010 -0300
staging: vt6656: resolved checkpatch finding
removed spaces at the start of a lines.
Signed-off-by: Felipe Andres Besoain Pino <fbesoain@gnome.cl>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 99b7bbb9b57da48f602732aaa107d7add49c842d
Author: Ariel Savini <arielsavini@gmail.com>
Date: Fri Oct 29 19:19:20 2010 -0300
staging: vt6656 resolved parenthesis not spaces
removes before parenthesis
Signed-off-by: Ariel Savini <arielsavini@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4a499de2d13786de626c3f689022d7ec25230911
Author: Mariano Reingart <reingart@gmail.com>
Date: Fri Oct 29 19:15:26 2010 -0300
staging: vt6656: resolved checkpatch finding
removed a C99 '//' comment and added a space around '='
Signed-off-by: Mariano Reingart <reingart@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fc4f55860254566b43e066bed0962c7cca72da84
Author: Matias De la Puente <mfpuente.ar@gmail.com>
Date: Fri Oct 29 19:07:45 2010 -0300
staging: vt6656: resolved checkpatch finding
removed parentesis and spaces at the start of a line of a return
Signed-off-by: Matias De la Puente <mfpuente.ar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit cc8b59d41fa597bb62bdca2c200e8509bc8bec2a
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 14:08:38 2010 -0700
Staging: solo6x10: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8892384803af7082056fe29faef02fd0c762493e
Author: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri Oct 29 15:19:27 2010 +0200
staging: get rid of dev_base_lock
dev_base_lock was the legacy rwlock used to protect netdevice list, and
is expected to vanish.
We now use RTNL and RCU locking.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e1ffd62b8fc87e842431cc693821d7f1ac70b9de
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:22 2010 -0400
staging: iio: adis16209: tuning spi delay to make hardware more stable
Looks like one spot was missed in the previous spi tune patch.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 817e5c65c511d4a83686333ae75507deb4b55d5e
Author: Graf Yang <graf.yang@analog.com>
Date: Wed Oct 27 21:44:21 2010 -0400
staging: iio: resolver: new driver for AD2S1210 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ffd7a62f0dffa92409dc769562a4997eb424a7d3
Author: Graf Yang <graf.yang@analog.com>
Date: Wed Oct 27 21:44:20 2010 -0400
staging: iio: resolver: new driver for AD2S1200/1205 devices
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f46d9f154ac3001b90e75ca646400a13b499a49e
Author: Graf Yang <graf.yang@analog.com>
Date: Wed Oct 27 21:44:19 2010 -0400
staging: iio: resolver: new driver for AD2S90 devices
This also kicks off the new resolver subsection.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 5b264a624ebc9a082873aa06ea641cbdc760e6e1
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:18 2010 -0400
staging: iio: meter: new driver for ADE7854/58/68/78 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2919fa54ef643364eab69bfff5a72e4aa50d3e39
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:17 2010 -0400
staging: iio: meter: new driver for ADE7759 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8210cfe9bd99fd63fae0b60c40fa793b8454e381
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:16 2010 -0400
staging: iio: meter: new driver for ADE7758 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8d97a5877b85ab0a2b346c2c111a8192d336495f
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:15 2010 -0400
staging: iio: meter: new driver for ADE7754 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 09434ef7c2eedca448d2701ffce229b5ccade64f
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:14 2010 -0400
staging: iio: meter: new driver for ADE7753/6 devices
This also kicks off the new meter subsection.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 0152a0585281a03d734f38effcfe9515874b7d48
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:13 2010 -0400
staging: iio: dds: new driver for AD9951 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2996a2dc38c58f96432a28fdd7f81ccfd692637d
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:12 2010 -0400
staging: iio: dds: new driver for AD9910 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a886689f6c36ccad01d9600a92029f80a2a6279f
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:11 2010 -0400
staging: iio: dds: new driver for AD9852/4 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a82ab27aa758e4b02f130d86be5c2fedf29c0c0a
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:10 2010 -0400
staging: iio: dds: new driver for AD9850/1 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4a8e6c33e88b09a3fdef022d1711dc13ce8cb7db
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:09 2010 -0400
staging: iio: dds: new driver for AD9832/3/4/5 devices
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit da6fcbdf764cbc8f539333a725411183a4253cfa
Author: Cliff Cai <cliff.cai@analog.com>
Date: Wed Oct 27 21:44:08 2010 -0400
staging: iio: dds: new driver for AD5930/2 devices
This is the initial driver in the new Direct Digital Synthesis section.
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6790e29fef61b20b213bd1cf5a025dc3412a4765
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:07 2010 -0400
staging: iio: dac: new driver for AD5624R devices
This is used to convert digital streams into voltages.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7a83f60d7bdf619cb7a37b5e0f6c128a91c6ecd0
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:06 2010 -0400
staging: iio: gyro: new driver for ADIS16130 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 1b2f99e1ae79b6039340571312ebbe0551d39c16
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:05 2010 -0400
staging: iio: gyro: new driver for ADIS16080 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e071f6b8e47834e9c91a299a5e773bebffe10e67
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:04 2010 -0400
staging: iio: gyro: new driver for ADIS16060 digital output gyros
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4f0cd86d66a81fd77912504d0e0b5883c473512e
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:44:03 2010 -0400
staging: iio: gyro: new driver for ADIS16251 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 06b86a75b148e44d489a960c047a8fc6926c841d
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:44:02 2010 -0400
staging: iio: adc: new driver for ADT7410 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a5d8c6bc2f87c1c5cb69fb3a22d1ef0110a9eacc
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:44:01 2010 -0400
staging: iio: adc: new driver for ADT7310 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d7713b6c56472b41e04ebcbdfdf85df84c8e82d6
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:44:00 2010 -0400
staging: iio: adc: new driver for ADT75 temperature sensors
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7924425db04a6107e49312edf53c158590d52aae
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:43:59 2010 -0400
staging: iio: adc: new driver for AD7816 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 671d85f2aa3dadc6e221b6f6f7e087bf487275e7
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:58 2010 -0400
staging: iio: adc: new driver for AD7745/6/7 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f84c26e61eedaa9eb21fe8a238d38fffb8d3c394
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:43:57 2010 -0400
staging: iio: adc: new driver for AD7314 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e8ada962bc2e34e964d370f721994387df7b1363
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:43:56 2010 -0400
staging: iio: adc: new driver for AD7298 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ddaecd5ba8cc3bc68b65b01cc8dbfedcac87254e
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:43:55 2010 -0400
staging: iio: adc: new driver for AD7291 devices
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a20ebd930081edaf21f354db195e7bb9820b18d8
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:54 2010 -0400
staging: iio: adc: new driver for AD7152/3 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 54c5be349bf66ed0c50c2e293803057d148a4c95
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:53 2010 -0400
staging: iio: adc: new driver for AD7150/1/6 devices
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 35f6b6b86ede34a9f8c029943842640b2ffbfa19
Author: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed Oct 27 21:43:52 2010 -0400
staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver
IIO driver for temperature sensor, ADC and DAC devices over SPI and I2C.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit bb6f19eafe3a1a5dd937ce66668e70aeaa1b0bf4
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:51 2010 -0400
staging: iio: new adis16204 driver
IIO driver for Programmable High-g Digital Impact Sensor and Recorder.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f11ba4f5774957415aa15eea7c8c8717126907ee
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:50 2010 -0400
staging: iio: new adis16203 driver
IIO driver for Programmable 360 Degrees Inclinometer adis16203 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f7fe1d1dd5a512a44f0ada40ff7f120664e2e082
Author: Barry Song <barry.song@analog.com>
Date: Wed Oct 27 21:43:49 2010 -0400
staging: iio: new adis16201 driver
IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts.
Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 6f125f17945a65e0bed37a4dfd7e5397a2c7a886
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Oct 27 21:43:48 2010 -0400
staging: iio: add ADI info to TODO
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit f733d02ab61787239d1ca05c30f6f393275a7899
Author: Michael Hennerich <michael.hennerich@analog.com>
Date: Wed Oct 27 21:43:47 2010 -0400
staging: iio: gyro: make sure grep can find the ADIS16265 support
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 61a4295b492f96878b4b47d577a173568530ecff
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Oct 27 21:43:46 2010 -0400
staging: iio: adis16350: add missing reference to temp offset
We declare this attr but never link it in to the attr list.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 3b785a8cfc6ac1bc837b0a1424056b6a4a1e544e
Author: Jesper Juhl <jj@chaosbits.net>
Date: Tue Nov 9 00:10:02 2010 +0100
Staging: brcm80211: Remove unnecessary casts of void ptr returning alloc function return values
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/staging/brcm80211/
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d4fcdc68564f49cbb4fdaf9b0ebfb5c3d02c81d3
Author: Ben Hutchings <ben@decadent.org.uk>
Date: Sun Nov 7 17:20:37 2010 +0000
Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures
Fix direct use of sk_buff::mac_header which is an offset rather
than a pointer on 64-bit architectures.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 69ec303a99ff68cfb5dbc6cefb043e53b6ba8945
Author: Brett Rudley <brudley@broadcom.com>
Date: Fri Nov 5 19:20:16 2010 -0700
staging: brcm80211: migrate #includes from headers into .c files.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 997dd24fe9aadf6e0b3652580e7c79372ccb600c
Author: Brett Rudley <brudley@broadcom.com>
Date: Wed Nov 3 19:53:59 2010 -0700
staging: brcm80211: Remove pkttag from osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit df0d8bb8daa1e8c3c2afcf93c46ef0294c78ac26
Author: Brett Rudley <brudley@broadcom.com>
Date: Wed Nov 3 19:53:58 2010 -0700
staging: brcm80211: Remove 'failed' field from osh
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 2578f7edf895fd4aad278134452cde1dc1b2fef5
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Sat Oct 30 00:10:29 2010 +0200
Staging: brcm80211: simplify expression
Simplify: ((a && b) || !a) => (b || !a)
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a28792e78669dc1bb984dd7798f0bccda741acbb
Author: Brett Rudley <brudley@broadcom.com>
Date: Mon Nov 1 17:10:18 2010 -0700
staging: brcm80211: Remove cruft from wlioctl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 9014378bf42912533299d37f14677f9dfa21268a
Author: Brett Rudley <brudley@broadcom.com>
Date: Mon Nov 1 17:10:17 2010 -0700
staging: brcm80211: Remove OSL_ERROR entry point
Get rid of generic OSL_ERROR and error code
translation to the only place that needs it: dhd.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 683ab518a19fe55de9b9f682c94f672951315fe2
Author: Brett Rudley <brudley@broadcom.com>
Date: Mon Nov 1 17:10:16 2010 -0700
staging: brcm80211: Remove dead code from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 8fb6b18884703d447af4c5ed1eeec02b489aa54b
Author: Brett Rudley <brudley@broadcom.com>
Date: Mon Nov 1 17:10:15 2010 -0700
staging: brcm80211: Remove abstraction layer for dma alignment
Directly align buffers instead of abstracting it.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 4766ae6ce7c5098a26136241576cd8a287d20484
Author: Brett Rudley <brudley@broadcom.com>
Date: Wed Oct 27 15:47:53 2010 -0700
staging: brcm80211: purge epivers.h
Purge include/epivers.h moving individual lines to where
they are needed and delete unused refs.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit eb8160364f007c668c423614e262b9b7fc7b2c74
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 18:37:24 2010 -0700
staging: brcm80211: Separate fullmac vs softmac defs in shared file
wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out
fullmac to purge extranous code in softmac and possibly as a step towards it own file.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7f7c3dbb3f6d8624109ee30ad5a8f6b23f0a72f4
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 15:23:09 2010 -0700
staging: brcm80211: Move #include from bcmutils.h out to .c files
Part of effort to move #includes out of .h files and unwind the include mess.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 11:55:23 2010 -0700
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit a52ba66cf2e06dc7b9ad655b74324e81f756dbd3
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 09:17:06 2010 -0700
staging: brcm80211: Move #includes out of d11.h
Move #includes out of d11.h and into .c files
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit ded6d25baa6bb0b3a41fa50a0427258c5d09ea7f
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 09:17:05 2010 -0700
staging: brcm80211: Purge unused includes from d11.h
Purge unused #includes from d11.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 53b6b34dfaa0263128d1e03bed0ba6fb40df88f8
Author: Brett Rudley <brudley@broadcom.com>
Date: Tue Oct 26 09:17:04 2010 -0700
staging: brcm80211: Purge unused lines from bcmdefs.h/wlc_pub.h
Purge unused lines
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit e38b67c7cd3d2e377868e4c8ff4772f14ec7c45b
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Mon Oct 25 23:43:14 2010 +0200
Staging: batman-adv: Remove useless braces
77099f0afe94928b5b0066a7efa5fa9f81696b54 added changes to vis.c which
trigger a checkpatch.pl warning about braces which are not necessary
anymore.
WARNING: braces {} are not necessary for any arm of this statement
+ if (entry->primary)
[...]
+ else {
[...]
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Marek Lindner <lindner_marek@yahoo.de>
Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit eba499d3e376983f4d521bac05bf7e9a634ace2f
Author: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Date: Tue Nov 2 17:38:45 2010 +0530
Staging: add Synaptics RMI4 touchpad driver support
Added the Synaptics RMI4 touchpad driver support.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Christopher Heiny <cheiny@synaptics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 78fd115e21087133be74bc6dd7a9bc1969aea8f8
Author: Ramesh Agarwal <ramesh.agarwal@intel.com>
Date: Fri Oct 22 14:00:20 2010 +0100
Staging: add Synaptics TM1217 Touchscreen Controller driver
This is submitted as a staging driver because there is a more generic driver
"on the way" for all these devices and has been for some time. The intent is
that as soon as the general drivers are in the mainstream this one will get
any leftovers integrated and then be dumped. Until this unspecified future
data at least people can actually use their hardware.
As its interface is simply input layer we can do that without pain.
Some clean up by Alan Cox
- Extract gpio support and IRQ support more sanely
- Tidying
Signed-off-by: Ramesh Agarwal <ramesh.agarwal@intel.com>
[avoid deference NULL ts if kzalloc fails]
[finger_touched may be used uninitialized]
[fix missing sync which confused twm]
Signed-off-by: Hong Liu <hong.liu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit fc2347e2023221ef04c6d9ce84019aa8c7e0ad6d
Author: Atul Sowani <sowani@gmail.com>
Date: Wed Nov 3 18:40:56 2010 +0530
Staging: xgifb: change obsolete pci_find_device() with pci_get_device()
Replaced obsolete pci_find_device() calls with pci_get_device() calls.
This is recommended in pci.txt filei in PCI Documentation.
Signed-off-by: Atul Sowani <sowani@gmail.com>
Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit af02b584bc0e1f46cf1477ad54ae18ec3842b6f4
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Oct 26 21:57:53 2010 +0200
Staging: trivial: fix typos concerning "controller"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit c4fb2bab7dea7780452e57166bd00cdfa9dba6ef
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Tue Oct 26 21:57:52 2010 +0200
Staging: trivial: fix typos concerning "configure"
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit dec34f85c62845a4d190a45aa5b5e9dd96797880
Author: Tracey Dent <tdent48227@gmail.com>
Date: Fri Oct 22 17:30:28 2010 -0400
Staging: msm: Makefile: replace the use of <module>-objs with <module>-y
Changed <module>-objs to <module>-y in Makefile.
Signed-off-by: Tracey Dent <tdent48227@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a
Author: Joe Perches <joe@perches.com>
Date: Wed Oct 20 18:51:06 2010 -0700
Staging: intel_sst: Use pr_fmt, fix misspellings
Remove leading "sst: " from format strings.
Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
Prefix is changed from "sst: " to "snd_intel_sst: "
Add missing newlines
Trim trailing spaces after newlines
Fix several different misspellings
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 074e61ec3751da9ab88ee66d3818574556c03489
Author: James Morris <jmorris@namei.org>
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 <akpm@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
commit 0656f6cf6c394ede78657595dd5a8ca7a1e64853
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon Nov 8 10:57:57 2010 +0200
ASoC: tpa6130a2: Revisit power-up sequence
There are no known problems with current power-up sequence which first sets
the /shutdown pin high and then enables the supply. However, swap the order
so that the device is kept in shutdown/reset mode during the supply voltage
transition since slowly rising voltages can usually cause problems if the
device is not kept in reset.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit edb40a23c8dc5b5be219bf4561074b6233bba65f
Author: Bruno Randolf <br1@einfach.org>
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 <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42
Author: Bruno Randolf <br1@einfach.org>
Date: Tue Oct 19 16:56:48 2010 +0900
ath5k: Optimize descriptor alignment
Similar to Felix Fietkau <nbd@openwrt.org> "ath9k_hw: optimize all descriptor
access functions" (13db2a80244908833502189a24de82a856668b8a).
Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a
Author: Mohammed Shafi Shajakhan <mshajakhan@atheros.com>
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 <mshajakhan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4
Author: Rafael J. Wysocki <rjw@sisk.pl>
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 <rjw@sisk.pl>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
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 <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 744bcb42a1ff1b9200e82dd074468877e31ff161
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 9fa23e1741404207c414fad69212a8763c138bf0
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 45684c75f9aa80eb477465bddcf79c9ad95206c7
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 4df3071ebd92ef7115b409da64d0eb405d24a631
Author: Felix Fietkau <nbd@openwrt.org>
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 <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 790a11f268373b60069bc1371dc05143107c607c
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Thu Oct 14 23:04:40 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Sun Oct 17 15:38:51 2010 +0200
b43: N-PHY: define registers names for 2056 radio
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543
Author: Rafał Miłecki <zajec5@gmail.com>
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 <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
commit 0903acc555955ff7bbe1b8324028fe44e5c16a91
Author: Roberto Sassu <roberto.sassu@polito.it>
Date: Wed Nov 3 11:11:40 2010 +0100
ecryptfs: open lower files with kthread credentials
Ecryptfs allows concurrent accesses to an encrypted file by opening the
relative lower inode only once and making the returned file descriptor
available until the ecryptfs inode is destroyed.
The file descriptor is obtained by calling the function dentry_open() for
the lower inode with flag O_RDWR and the credentials of the process that
issued the open request.
During this procedure two issues may be encountered when using ecryptfs in
conjunction with SELinux: first, a process needs read/write permission
for opening a file even with flag O_RDONLY; second a process needs the
'use' permission in the 'fd' class if the lower file was opened by another
process with different credentials.
This patch replaces the 'cred' structure of the current process, passed to
the function dentry_open(), with the one associated with the 'kthread'
kernel service.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit bd521248c7e2e8c45965014b748ac6b3790581b5
Author: Roberto Sassu <roberto.sassu@polito.it>
Date: Wed Nov 3 11:11:34 2010 +0100
ecryptfs: fixed testing of file descriptor flags
This patch replaces the check (lower_file->f_flags & O_RDONLY) with
((lower_file & O_ACCMODE) == O_RDONLY).
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit 783b0f84707c5a3676535dce3d6fa4fa8bde70a7
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d88f589406e1f05466897024aa16a2d08c5cbaf8
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 15c74c49f819bd7cca6c5175e703f373717af794
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2787d3ce27bbe4a26a46497893a61c7a3a521969
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 73a440b875bf1f63b9588a653dadcb1629337a40
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit cf838421b92ddad1d70c01030995ab2da135771d
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 673f0e5722d48f31fc5b9c0ed80ddf2719a560c6
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2543dcd656e3b57a36bca9293ea23c8a1d639598
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 8bdd1d53db86b801fd238501870f8c878d5cbb94
Author: Devin Heitmueller <dheitmueller@kernellabs.com>
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 <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit b95fccbc025cb5788776ed8b80dba20b24529b15
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Nov 9 17:06:44 2010 +0800
ASoC: Fix compile error if CONFIG_DEBUG_FS is not configured
Add soc_init_card_debugfs and soc_cleanup_card_debugfs functions to fix below error.
CC sound/soc/soc-core.o
sound/soc/soc-core.c: In function 'soc_probe':
sound/soc/soc-core.c:1689: error: implicit declaration of function 'soc_init_card_debugfs'
sound/soc/soc-core.c: In function 'soc_remove':
sound/soc/soc-core.c:1718: error: implicit declaration of function 'soc_cleanup_card_debugfs'
make[2]: *** [sound/soc/soc-core.o] Error 1
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 27b1fec2caa668c162cd1a862c69e087df277fae
Author: Rajendra Nayak <rnayak@ti.com>
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 <rnayak@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Jean Delvare <khali@linux-fr.org>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 4d17aeb1c5b2375769446d13012a98e6d265ec13
Author: Paul Walmsley <paul@pwsan.com>
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
<rnayak@ti.com>.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit f776471f620a07be234f40288a1fd9932d039e26
Author: Benoit Cousson <b-cousson@ti.com>
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 <b-cousson@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 4fe20e97c8b1082d16b38e9f4c53feeed143ab98
Author: Rajendra Nayak <rnayak@ti.com>
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
<paul@pwsan.com>.
OMAP3 fixes for correct IDLEST bit monitoring from
G, Manjunath Kondaiah <manjugk@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: G, Manjunath Kondaiah <manjugk@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 2004290f55f03c52e22044a5843928cf0f6cc56a
Author: Paul Walmsley <paul@pwsan.com>
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 <paul@pwsan.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 11:08:53 2010 +0000
net/ipv4/tcp.c: Update WARN uses
Coalesce long formats.
Align arguments.
Remove KERN_<level>.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit b194a3674fba6d9f9e470084d192c7cb99194a62
Author: Joe Perches <joe@perches.com>
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 <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 9c413ed55d5b52159e85a3937cda7f210a318048
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 11:08:34 2010 +0000
drivers/net/usb: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c389ff80d4b598f57d56aa807d396d4351cac8a4
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 11:08:33 2010 +0000
drivers/net/can: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e658e9fe65306346e827676a121eca3534ad75ff
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue Nov 9 09:12:42 2010 -0800
driver core: the development tree has switched to git
So change the MAINTAINERS file to show where the tree now is at.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit b884a94ed16d1a633e76f80fb1bd75d0e7373ce3
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
[fts: removed useless ifdef's and corrected comment]
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
commit 67eb6f9617a24dfb033b584d6b1b42b39cc9297a
Author: Jonathan Corbet <corbet@lwn.net>
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 <corbet@lwn.net>
Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
commit 751305d9b2fd3e03eaab7808e976241d85ca4353
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
commit 844d869f6565539d440596f2c767870eb442ae97
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit ba2c226dc03135e50e8d72b86477b8074ceea3b9
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c8dddd329806f6913674cb03b4fbac132ef97096
Author: Jean-François Moine <moinejf@free.fr>
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 <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 4b9aa89daab1e8cba4bfc2dadb6354b77e1efce3
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Oct 29 07:57:03 2010 -0300
[media] gspca - main: Fix a small code error
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9a9e1edd125ec33b86d28b44cd262c8a60275f4a
Author: Jean-François Moine <moinejf@free.fr>
Date: Fri Oct 29 07:56:06 2010 -0300
[media] gspca - main: Version change
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 18808c2b08da44fab315b91856713160c2f3113d
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 789e3e2557f656a5c603706a4bdb01423504eb68
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 75a2fa2e6b15d954a3455d0a7d87c22969765774
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c832d4e1b6d009d1b3521def131d95fd41094204
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d0d3259ad31dab3541cab05392bed950e25ce278
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit a59e5ec4ffb901314a4c8875253b48ef19303159
Author: Hans de Goede <hdegoede@redhat.com>
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 <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 7f05dec3dd70f086870fdc1d40dbe30db1fe0994
Author: Jacob Pan <jacob.jun.pan@linux.intel.com>
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 <jacob.jun.pan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20101109112800.20591.10802.stgit@localhost.localdomain>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 1da4b1c6a4dfb5a13d7147a27c1ac53fed09befd
Author: Feng Tang <feng.tang@intel.com>
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 <alek.du@linux.intel.com>
LKML-Reference: <20101109112158.20013.6158.stgit@localhost.localdomain>
[Clean ups, removal of 0.7 support]
Signed-off-by: Feng Tang <feng.tang@linux.intel.com>
[Clean ups]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 0fe04af4c71d96267d7dc95d79d7f228a384dc48
Author: Jarod Wilson <jarod@redhat.com>
Date: Fri Oct 29 00:07:39 2010 -0300
[media] mceusb: add support for Conexant Hybrid TV RDU253S
Another multi-function Conexant device. Interface 0 is IR, though on
this model, TX isn't wired up at all, so I've mixed in support for
models without TX (and verified that lircd says TX isn't supported when
trying to send w/this device).
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit c06e3aaa081760ae578693c42bc353f92f7bba7f
Author: Malcolm Priestley <tvboxspy@gmail.com>
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 <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 458503146ca642e7fd1cb0ae3cccb2ae0f9b97b3
Author: Malcolm Priestley <tvboxspy@gmail.com>
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 <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit a692be8ab428b37ad7b37b749d1e3de11c0770c5
Author: Malcolm Priestley <tvboxspy@gmail.com>
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 <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 8eb5e30293e2460a37feaaa94abc7c6ede6cc29d
Author: Stefan Ringel <stefan.ringel@arcor.de>
Date: Wed Oct 27 16:48:05 2010 -0300
[media] tm6000: bugfix set tv standards
bugfix set tv standards
Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 731205c1c11f5b1d1d42ffb0de43928094b4235b
Author: Daniel Drake <dsd@laptop.org>
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 <dsd@laptop.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 8b3147df0f4f2b49a4724f2c5972bc94bec2cecc
Author: Daniel Drake <dsd@laptop.org>
Date: Wed Oct 27 10:45:32 2010 -0300
[media] cafe_ccic: fix subdev configuration
For some reason, commit 1aafeb30104a is missing one change that was
included in the email submission.
The sensor configuration must be passed down to the ov7670 subdev.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit eb8dbdf7c2e030e94a28116f64e1d6dbc280ebf9
Author: Joe Perches <joe@perches.com>
Date: Mon Oct 25 23:44:25 2010 -0300
[media] drivers/media: Removed unnecessary KERN_<level>s from dprintk uses
Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit d6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf
Author: Alexey Charkov <alchark@gmail.com>
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 <alchark@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
commit a9b27bcc6acf2491609f51aa592ec67311d4518d
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit f020c92de48246510623162fb22d60d91810cc56
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 16b259203c513ed28bd31cc9a981e0d3ad517943
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit 973a34aa8593dbfe84386343c694f5beecb51d8a
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <davidel@xmailserver.org>
Reported-by: Alban Crequy <alban.crequy@collabora.co.uk>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5456f09aaf88731e16dbcea7522cb330b6846415
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <alban.crequy@collabora.co.uk>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 67426b756c4d52c511c4b22b269accea171692a8
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <alban.crequy@collabora.co.uk>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 840a185dddfd098b78b96a30da4cad722a7aef18
Author: Eric Dumazet <eric.dumazet@gmail.com>
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 <eric.dumazet@gmail.com>
Cc: "Ed L. Cashin" <ecashin@coraid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c
Author: Arce, Abraham <x0066660@ti.com>
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 <x0066660@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 12fc83f588c4b669c74afac8fe268db92037e652
Author: Roberto Sassu <roberto.sassu@polito.it>
Date: Wed Nov 3 11:11:28 2010 +0100
ecryptfs: test lower_file pointer when lower_file_mutex is locked
This patch prevents the lower_file pointer in the 'ecryptfs_inode_info'
structure to be checked when the mutex 'lower_file_mutex' is not locked.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit c65b788ce32e9cd1c7d221551275774f1aa83084
Author: Roberto Sassu <roberto.sassu@polito.it>
Date: Wed Nov 3 11:11:22 2010 +0100
ecryptfs: missing initialization of the superblock 'magic' field
This patch initializes the 'magic' field of ecryptfs filesystems to
ECRYPTFS_SUPER_MAGIC.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit 20508e805779ceffd782eff9e98dddb04d2ea613
Author: Roberto Sassu <roberto.sassu@polito.it>
Date: Wed Nov 3 11:11:15 2010 +0100
ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h
The definition of ECRYPTFS_SUPER_MAGIC has been moved to the include
file 'linux/magic.h' to become available to other kernel subsystems.
Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit 0aa34b16f9f34a81bd50c097f1953877614220db
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Mon Nov 8 10:41:53 2010 +0000
ASoC: Remove unneeded use of address-of operator
There is no need to use '&' in this case. Either way, if a is an array
of some type, then a == &a == &a[0].
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 5aaa062c27273d21d1f52ddc20e697b6466057d4
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Mon Nov 8 15:37:07 2010 +0000
ASoC: soc-cache: Use BUG_ON() for unsupported hw_read() calls
Instead of dereferencing a NULL function pointer and falling apart
use BUG_ON() for any unimplemented hw_read() calls.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 5bf68592e72eb0ded154efaaf43b39aab6964fc3
Author: Ben Collins <bcollins@bluecherry.net>
Date: Mon Nov 8 10:07:42 2010 -0500
solo6x10: [P2M] Fix memory leak
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit e31e62aa824bd7982fa31114e09c6848ae3d3902
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat Oct 23 13:35:58 2010 -0300
[media] cx231xx: Add IR support for Pixelview Hybrid SBTVD
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 0d1220ae0be9e701db2b9f7367431c8542b50d74
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <mchehab@redhat.com>
commit 7679b95730fce8269b540e5a7eed19f817d9496c
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <mchehab@redhat.com>
commit d9f5df9afe62db2c87dc997fbda290806b7e49e8
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun Oct 3 05:27:59 2010 -0300
[media] Add support for Kworld SBTVD board
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 2d1b6c2a1905bea923c30d0d7ae47a240c16ee8a
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <mchehab@redhat.com>
commit 9bb63ec07854cac8fccf453c41506fb6228efc2d
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed Sep 29 11:07:08 2010 -0300
[media] cx231xx: use callback to set agc on PixelView
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit e97fc3930a7e979c930f1935d25043c88f98d551
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon Sep 27 23:44:27 2010 -0300
[media] add digital support for PV SBTVD hybrid
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 4938aef783fdf06b405c08361aacaea1c986ad25
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sun Sep 26 20:44:31 2010 -0300
[media] Add analog support for Pixelvied Hybrid SBTVD
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9d5822edbb30a52159c02bb2b2b2731df9f126b5
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <mchehab@redhat.com>
commit da03b47557ccd5af2e0be3471be62147bdd7a5cf
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 9b4418ecba4411518105c6c66308e2ab81260226
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
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 <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
commit 6f80dfe55fcbde1e588bc2cfa1273403b710872d
Author: Christoph Hellwig <hch@tuxera.com>
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 <hch@tuxera.com>
commit c046fd4dd613b22b35379665a8f7656d17bde0b3
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Fri Nov 5 18:41:25 2010 +0000
ASoC: WM8770: Initial driver
The WM8770 is a high performance, multi-channel audio
codec. The WM8770 is ideal for surround sound processing
applications for home hi-fi, automotive and other audio
visual equipment.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3a45b8672d3f8542e430e7a5c7366ec9bdded054
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Fri Nov 5 20:35:21 2010 +0200
ASoC: Move pop time from DAPM context to sound card
Based on discussion the dapm_pop_time in debugsfs should be per card rather
than per device. Single pop time value for entire card is cleaner when the
DAPM sequencing is extended to cross-device paths.
debugfs/asoc/{card->name}/{codec dir}/dapm_pop_time
->
debugfs/asoc/{card->name}/dapm_pop_time
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit d6ce4cf3967dca78f967cd0bf70b175084885f40
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Fri Nov 5 20:35:20 2010 +0200
ASoC: Move codec debugfs directories under parent card directory
Make use of sound card debugfs directory and move codec directories under
the parent card debugfs directory.
debugfs/asoc/{codec dir} -> debugfs/asoc/{card->name}/{codec dir}.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit a6052154944c822993d04ca8f8d8926e8b73b749
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Fri Nov 5 20:35:19 2010 +0200
ASoC: Add sound card directory under debugfs/asoc/
There will be need to have sound card specific debugfs entries. This patch
introduces a new debugfs/asoc/{card->name}/ directory but does not add yet
any entries there.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit ce6120cca2589ede530200c7cfe11ac9f144333c
Author: Liam Girdwood <lrg@slimlogic.co.uk>
Date: Fri Nov 5 15:53:46 2010 +0200
ASoC: Decouple DAPM from CODECs
Decoupling Dynamic Audio Power Management (DAPM) from codec devices is
required when developing ASoC further. Such as for other ASoC components to
have DAPM widgets or when extending DAPM to handle cross-device paths.
This patch decouples DAPM related variables from struct snd_soc_codec and
moves them to new struct snd_soc_dapm_context that is used to encapsulate
DAPM context of a device. ASoC core and API of DAPM functions are modified
to use DAPM context instead of codec.
This patch does not change current functionality and a large part of changes
come because of structure and internal API changes.
Core implementation is from Liam Girdwood <lrg@slimlogic.co.uk> with some
minor core changes, codecs and machine driver conversions from
Jarkko Nikula <jhnikula@gmail.com>.
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Mike Frysinger <vapier.adi@gmail.com>
Cc: Cliff Cai <cliff.cai@analog.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Ryan Mallon <ryan@bluewatersys.com>
Cc: Timur Tabi <timur@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Jassi Brar <jassi.brar@samsung.com>
Cc: Daniel Gloeckner <dg@emlix.com>
Cc: Kuninori Morimoto <morimoto.kuninori@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 803ba375da7158d6aee6274a17bc48780daa0f38
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Oct 22 16:38:22 2010 +0800
regulator: twl-regulator - fix twlreg_set_mode
The Singular Message is 16 bits:
DEV_GRP[15:13] MT[12] RES_ID[11:4] RES_STATE[3:0]
Current implementation return immedially after sucessfuly write MSB part.
To properly set mode, we need to write the complete message ( MSB and LSB ).
In twl.h, now we have defines for PM Master module register offsets,
use it instead of hard coded 0x15/0x16.
Use "message & 0xff" to ensure we send correct value for LSB.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Lesly Arackal Manuel <leslyam@ti.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 1c2bd6529e7652db5aa66aa4f259d38a41173c09
Author: Mattias Wallin <mattias.wallin@stericsson.com>
Date: Thu Nov 4 11:01:31 2010 +0100
regulator: lock supply in regulator enable
This patch add locks around regulator supply enable.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 543c7798c1c7a57cd9afe29165dc5271bc65b86c
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 5 15:27:17 2010 +0800
regulator: Return proper error for regulator_register()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit fa54beef3b95337d5f77624a70132809293161ad
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 5 21:51:32 2010 +0800
regulator: Ensure enough delay time for enabling regulator
Integer division will truncate the result, this patch ensures we have
enough delay time for enabling regulator.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 6b4b8ed9e10c1c65d9c15877d733090bc995ae6b
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Nov 5 15:25:12 2010 +0800
regulator: Remove a redundant device_remove_file call in create_regulator
We already have device_remove_file() in error path,
no need to call it before goto link_name_err.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 98072e4d977aabe6a39abb95951cd8bf2c2202d5
Author: Pavel Emelyanov <xemul@parallels.com>
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 <cl@linux.com>
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
commit 716ce5d4a6f81653507c21b152eb7629d150ce7a
Author: Pekka Enberg <penberg@kernel.org>
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 <sfr@canb.auug.org.au>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
commit 4a92379bdfb48680a5e6775dd53a586df7b6b0b1
Author: Richard Kennedy <richard@rsk.demon.co.uk>
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 <richard@rsk.demon.co.uk>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
commit 0d24db337e6d81c0c620ab65cc6947bd6553f742
Author: Christoph Lameter <cl@linux.com>
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 <kosaki.motohiro@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
commit 62d69e6a57c5b5d52a607b1ce73ff6af65c992eb
Author: Enric Balletbo i Serra <eballetbo@gmail.com>
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 <eballetbo@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
commit 0e4de059d90c96930ab237e7d4fbb7e3814afcb6
Author: Ben Collins <bcollins@bluecherry.net>
Date: Fri Nov 5 10:29:33 2010 -0400
solo6x10: Implement working P2M descriptor more DMA
We have to insert 1 dead descriptor first (all zereos), and then the real
data descriptors after that.
Everything uses descriptor mode now (8800 interrupts per second for display
v4l2 is now down to ~96).
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit 22e2fda5660cdf62513acabdb5c82a5af415f838
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu Nov 4 17:05:45 2010 +0100
ASoC: i.MX: we can do mono
Whether we can do mono or not depends on the codec. No need
to limit this in the ssi driver.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 319fb3bacc517829cbd4d758f3b8969fdbde5c92
Author: Ben Collins <bcollins@bluecherry.net>
Date: Thu Nov 4 23:20:31 2010 -0400
solo6x10: Updates to videobuf-dma-sg functions for latest kernel
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit f62de9be26ce2144ad0dcf292727e4f58577d401
Author: Ben Collins <bcollins@bluecherry.net>
Date: Thu Nov 4 22:51:17 2010 -0400
solo6x10: Conversion to videobuf-dma-sg (from dma-cont)
Full rewrite of the P2M DMA Engine to support scatter gather and take
advantage of some of the features of the hardware. This includes using
repeat DMA operations and line-mode transfers (for copying OSG and
video display buffers).
What isn't working: For some reason, descriptor mode is not working. I've
implemented a psuedo version (still has one-interrupt per DMA operation),
but we would get huge improvements if we could hand off a ring of
descriptors to the P2M and get back one interrupt when it was done with
all of them.
Documentation is very vague on this, and even the ODM example code
half attempts to get it right, but comments it out of the driver
because it just doesn't work *sigh*
Converts all v4l2 to dma-sg. So long slow dma-contiguous, but hello
more interrupts :(
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit 1194cf4308d786c69b808ec3aa8704d01d130e94
Author: Ben Collins <bcollins@bluecherry.net>
Date: Thu Nov 4 22:42:25 2010 -0400
solo6x10: Update TODO
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit 98e2d5a802518694465368406c5f1b020f4df998
Author: Ben Collins <bcollins@bluecherry.net>
Date: Thu Nov 4 22:37:15 2010 -0400
solo6x10: Spaces to tabs
Signed-off-by: Ben Collins <bcollins@bluecherry.net>
commit 90246e79af062fcbb8c3728a5f29cb19b3468f59
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu Nov 4 13:00:22 2010 -0500
crypto: hash - Fix async import on shash algorithm
The function shash_async_import did not initialise the descriptor
correctly prior to calling the underlying shash import function.
This patch adds the required initialisation.
Reported-by: Miloslav Trmac <mitr@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
commit 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b
Author: Rob Herring <r.herring@freescale.com>
Date: Wed Oct 6 16:18:08 2010 +0100
ARM: 6432/1: move timer-sp.c from versatile to common
From: Rob Herring <rob.herring@smooth-stone.com>
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 <rob.herring@smooth-stone.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 64d2dc384e41e2b7acead6804593ddaaf8aad8e1
Author: Leif Lindholm <leif.lindholm@arm.com>
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 <leif.lindholm@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 247055aa21ffef1c49dd64710d5e94c2aee19b58
Author: Catalin Marinas <catalin.marinas@arm.com>
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 <cbouatmailru@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 5a39ce5b491a10f4a15bd30b26e55d3533b5f587
Author: Henrik Rydberg <rydberg@euromail.se>
Date: Wed Oct 13 15:58:17 2010 +0200
HID: egalax: Use kzalloc
To avoid unnecessary explicit initialization, allocate zeroed memory.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 11e16eb365f4f6979cfcb2a2d379338b383590d9
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 14:45:07 2010 -0400
ASoC: Use pm_wakeup_event() in WM8962 jack detection
Ensure that the system does not suspend while we process a WM8962 jack
event by using pm_wakeup_event() to block the suspend while we're waiting
for the jack to settle. Use a slightly longer timeout than the jack waits
to allow for other stuff to take over and delays in scheduling.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 7b0f42b59a01a2cc563c5f8670133b819e5c9895
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 13:48:04 2010 -0400
ASoC: Remove register write trace from WM8994
We now have trace in the ASoC core so we don't need to our own trace in
the driver.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 9db3b9bcc7f53487da8766b32e2d790ad03c53b9
Author: Ross Kirk <Ross.Kirk@nexor.com>
Date: Fri Oct 22 16:43:17 2010 +0100
audit: error message typo correction
Fixes a typo in the error message raised by audit when auditd has died.
Signed-off-by: Ross Kirk <ross.kirk@nexor.com>
--
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 11dbf0acb4aba818a4f0600996216be55667b400
Author: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Date: Wed Nov 3 16:50:36 2010 +0000
ASoC: soc-cache: Remove unnecessary debugging info
No need to print the register-value pair again, as we've already hooked
snd_soc_write() for that matter.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit c3753707991218aa2c18449a921847877533aa09
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon Nov 1 15:41:57 2010 -0400
ASoC: Push snd_soc_write() and snd_soc_read() into the source file
Facilitating adding trace type stuff. For a first pass add some dev_dbg()
statements into them.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 3f58fd84b0c0bd482151259ee0d2921974e1fe4c
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 09:35:31 2010 -0400
ASoC: Convert soc-jack code to use request_any_context_irq()
Allow the standard soc-jack GPIO based jack handling to handle the use of
GPIOs which may sleep (such as those on GPIO expanders) by converting the
code to use request_any_context_irq().
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit a4bc6926d05b60bf70aab2db2c6715e15118cbdc
Author: Jiri Kosina <jkosina@suse.cz>
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 <jkosina@suse.cz>
commit 99b9f758bbc904f22faffcf4d83205f4a5e7bc0c
Author: Edgar (gimli) Hucek <gimli@dark-green.com>
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 <gimli@dark-green.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 6d2ad1e318adbf593746305746b0c1252d5949ae
Author: matt mooney <mfm@muteddisk.com>
Date: Mon Sep 27 19:04:44 2010 -0700
powerpc: remove cast from void*
Unnecessary cast from void* in assignment.
Signed-off-by: matt mooney <mfm@muteddisk.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 414c73abfd0e565950f3b02336cf516147f0e104
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon Nov 1 14:03:56 2010 +0200
ASoC: tlv320aic3x: Add support to shared common reset line
This is aimed to configurations where multiple aic3x codecs share the same
reset line and are powered from same supply voltages.
Currently aic3x_probe will fail if trying to request already requested
gpio_reset and passing -1 to another aic3x instances cause that those
instances cannot release reset in aic3x_set_power. That is, another
instances can work only if primary aic3x instance is powered and reset is
released.
Solve this by implementing a list of probed instances that is used for
checking if other instance shares the same gpio_reset number. If a shared
reset line exists, then only first instance tries to request and configure
it and the last instance releases it.
Runtime modifications are not needed since aic3x_regulator_event with help
of regulator framework takes already care that reset is pulled down only
when some or all supplies are disabled meaning that all instances using them
are idle.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 79ee820d2aa24ac2577ca4e89ecc49c26d099707
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Mon Nov 1 14:03:55 2010 +0200
ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset
I promised to convert this at some point.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 355ffa8e6be246f65b14fdec34c8a5bd36089065
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Nov 3 00:08:04 2010 -0400
regulator: Staticise mc13783_powermisc_rmw()
It is not used outside this driver so no need to make the symbol global.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 587d145200f26758940099fbbc301fdd43d3f391
Author: Joe Perches <joe@perches.com>
Date: Mon Oct 25 19:44:21 2010 -0700
HID: Remove KERN_DEBUG from dbg_hid use
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 8d814961234fda66f01bb0505f166537913d745c
Author: Andrea Gelmini <andrea.gelmini@gelma.net>
Date: Sat Oct 16 15:19:24 2010 +0200
drivers: scsi: fix typo in comment
Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 2146dcfd15ad55cfdd18b45e1e6601d6a86f0cbe
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Wed Nov 3 12:26:35 2010 +0100
ALSA: oxygen: add HiFier Serenade support
Add support for the TempoTec/MediaTek HiFier Serenade sound card.
The PCI ID was already there, but the driver handled it like the
Fantasia model, which resulted in a dummy recording device. As
a stereo output-only card, this model is to be handled exactly
like the HG2PCI.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 18f24839f18f1934c1e37e86ce8f3fecbb0328c9
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Wed Nov 3 11:36:33 2010 +0100
ALSA: oxygen: reorganize PCI IDs
Sort the PCI IDs so that they make logical sense. Also move the card
name comments into this list because the model symbols should be (more)
self-explanationary.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 2903a8435d7f5051129f8d7dba716d66be09ec22
Author: Mattias Wallin <mattias.wallin@stericsson.com>
Date: Tue Nov 2 14:55:34 2010 +0100
regulator: regulator disable supply fix
This patch fixes a disable failure when regulator supply is used.
A while loop in regulator disable checks for supply pointer != NULL
but the pointer is not always updated, resulting in the while loop
running too many times causing a disable failure.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 31f86bacfc9c8f6a3f25fa991c1f373374a9f25b
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Tue Nov 2 17:18:23 2010 +0100
ALSA: oxygen: add Kuroutoshikou CMI8787-HG2PCI support
Add support for the Kuroutoshikou CMI8787-HG2PCI sound card.
[replaced non-latin letters in the patch by tiwai]
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 45c1de8e20cec40b6846def0aeca09cb1bfb839b
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Tue Nov 2 17:08:37 2010 +0100
ALSA: oxygen: merge HiFier driver into snd-oxygen
The snd-hifier driver contains more duplicated code than model-specific
code, so it does not make sense for it to be a separate driver.
Handling the two-channel output restriction can be easily done in the
generic driver.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit de7fd0fc989727d657d40f6ddf2fb99639bd6262
Author: Michael Witten <mfwitten@gmail.com>
Date: Wed Oct 27 23:11:10 2010 +0000
Kconfig: typo: boad -> board
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 1ed7c2077aa236b378dd28319e664422ef010e9b
Author: Michael Witten <mfwitten@gmail.com>
Date: Fri Mar 26 21:41:10 2010 +0000
Docs: typo: Complete -> Completely
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit f1d7854a3921fa7832572f5836120ef9854525cc
Author: Edward Shishkin <edward.shishkin@gmail.com>
Date: Sat Oct 30 00:11:50 2010 +0200
ecryptfs: fix truncation error in ecryptfs_read_update_atime
This is similar to the bug found in direct-io not so long ago.
Fix up truncation (ssize_t->int). This only matters with >2G
reads/writes, which the kernel doesn't permit.
Signed-off-by: Edward Shishkin <edward.shishkin@gmail.com>
Cc: Jeff Moyer <jmoyer@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Eric Sandeen <esandeen@redhat.com>
Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
commit b595076a180a56d1bb170e6eceda6eb9d76f4cd3
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date: Mon Nov 1 15:38:34 2010 -0400
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 6aaccece1c483f189f76f1282b3984ff4c7ecb0a
Author: Michael Witten <mfwitten@gmail.com>
Date: Mon Nov 1 17:50:12 2010 +0000
Kconfig: typo: and -> an
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 04561c5aa243c98cae93cde27e05740df787e692
Author: Ignaz Forster <ignaz.forster@gmx.de>
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 <ignaz.forster@gmx.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 2932af344a86cb1bd84ca8cc217ee016e8fb5255
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 14:18:16 2010 -0400
beceem: update TODO list
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 349fa79498df313c70e2a4b7c16688be0a91dd0b
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 14:09:05 2010 -0400
beceem: dump control packet information
Add control packet information is useful for debugging.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 4ea4f7a0d3d7a9961bf77f0860df8dd4a213b8a3
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 14:06:24 2010 -0400
beceem: change startup messages
Change the regsister/unregister routines to generate better
messages, and control arrival of new frames when USB device is
unplugged.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 9c5d77009db6ff09d02a7b0a99a70c0dfd3af6c6
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 13:59:01 2010 -0400
beceem: don't overrun user buffer on read
Serious bug in original code, if app reads 10 bytes but 20 byte msg
received memory would get overwritten.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 473f89fff76568a9f30c53b458e6323d48b0ab95
Author: Jarkko Nikula <jhnikula@gmail.com>
Date: Fri Oct 29 16:47:44 2010 +0300
ASoC: Fix SND_SOC_ALL_CODECS typo for alc5623
Include alc5623.c in SND_SOC_ALL_CODECS when dependencies are met.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 5cf084f44ac24189ef3373010da49e26d651aa06
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 13:57:35 2010 -0400
beceem: eliminate unused bcm_jiffies
Unused, unneeded, and bogus.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 78afa9990fdbbf01227104300a657be3f3caa167
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 13:54:21 2010 -0400
beceem: fix definition of VLAN header type
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit cacd92222dd4e04424fa532cf1a222e67c30709b
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 13:34:35 2010 -0400
beceem: statistics and transmit queue changes
Use standard network statistics variables and routines.
Transmit counters are per queue, and skb mapping is already in
skb and does not need to be recomputed. Move SearchVcId to only
place it is used.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit b5ebd85b2bcc0c0a2171e4cc74c61debdc903ddf
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:28:39 2010 -0400
beceem: do classification even if device is offline
Since classification and queue control are separate, allow
classification even if device is down now; this avoids races
on startup/shutdown.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 429a5908fe3bc4d9ca2512b94cd10b69d50bf91f
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:27:20 2010 -0400
beceem: off by one on queue index
The driver allocates 18 queues (0..16) are for traffic, and 17
is a bit bucket.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 9dd47ee7dd535649a2c32d509631c7a3d793f2e1
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:24:00 2010 -0400
beceem: make local functions static
Use namespace tool from kernel scripts to identify dead code and
functions that should be static.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 45400554923867c8479621e55a76e0612192dafb
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:21:32 2010 -0400
beceem: remove unused code to dump header
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit ac1b1ae7f84dcde6d6fefc7f8ca27c4e5bd92c22
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:20:09 2010 -0400
beceem: transmit code cleanup
Eliminate global variable in transmit path
The Leader can be on the stack, and get rid of unnecessary timeval.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 1da9badcf02dd6532df9bde8fc05648e74982f2c
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 11:58:01 2010 -0400
beceem: allow multicast/broadcast
Even though wimax isn't really a broadcast medium, pretend it is.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 9ec4475bf10bb2c30cd5e927bc453aa307f58123
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:18:36 2010 -0400
beceem: debug message format changes
Add more debug messages and make them similar to other drivers
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit e4d46254da76106e48b7cadc59fb410291e2da4b
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 11:39:05 2010 -0400
beceem: use get_seconds for elapsed time
get_seconds is lower overhead and fine if all driver wants to do
is keep track of seconds.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 2d08748ae53bf07fe6fcaf4f3d40449b471ce351
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:14:01 2010 -0400
beceem: module initialization
Get rid of boot messages and put in correct place.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 4fd64dd0c1b9317ffe6fdaf3de788e14df880d8d
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 12:12:31 2010 -0400
beceem: add network device message level control
Provide standard interface to control verbosity of debug messages
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit e39e3be66eed17f27a9de322e5220d33e70a90a6
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 11:14:29 2010 -0400
beceem: change format of debug message
Statistic point is now u32 (like it has to be).
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 3349d95b3f8c3becb9e6dbe0be978bf663174fef
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 11:12:56 2010 -0400
beceem: clean up adapter structure
Remove dead fields, change fields that only have true/false to boolean;
and rearrange to save space.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 9e0a3169a34ba5fd04bde058a63fa0a36f2d7ed3
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 10:17:54 2010 -0400
beceem: create class on module installation
First step to supporting multiple devices, create device class
when module is initialized.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 46c3790eb523931a803bb3c28c5bf8bbfc8acf48
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 10:16:29 2010 -0400
beceem: convert to kernel coding style
Change indentation etc, to conform to acceptable kernel style
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 5afb5145a13ac26f3c7ab273140a83958bc038f0
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 10:07:20 2010 -0400
beceem: remove useless debug function entry messages
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 957ea3b57056e79c945d8bc39fd6eeb3c2a7ed9e
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 10:05:34 2010 -0400
beceem: remove problematic debug print messages
Not worth bothering to change printf format of messages which
are basically noise.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 032100f65295d594fc0481e840efe8b6c1e398af
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 10:03:29 2010 -0400
beceem: remove unnecessary usb class
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit ada692b09f4707a8e06b087b1546d9f5b3f2d37d
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 09:26:47 2010 -0400
beceem: fix character device ioctl
Sparse caught several places where ioctl interface was incorrectly using user
memory. Fix all the ioctl cases for casting and __user annotation.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit c5ebe2278ba600ff48663ec84c6e7f34d291503f
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 08:42:44 2010 -0400
beceem: fix printf format strings
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 0980f2e8144ea0021a09be41176b736d76ca3db7
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 00:04:52 2010 -0400
beceem: reserve one queue for bit-bucket
This preserves the semantics of the original driver (unclassified packets
are dropped), but does it in a clean way; and fixes crash when packet
is sent to offline device.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 3644c1a2f12b15e1c8bfb9ebfaacbd177011a72d
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 00:03:03 2010 -0400
beceem: remove dead code
Remove commented out with '#if 0'
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 937110581650eaa517f045fb7b86b9828ba693ad
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun Oct 31 23:55:21 2010 -0400
beceem: support multiple queues
Current kernels have multi-queue support which can be used by
this device. This has the advantage that a single type of traffic
will not block other types.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 20f48653fcf51f6d1246b5f3f86b40ed779385b2
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun Oct 31 23:52:36 2010 -0400
beceem: get rid of unnecessary inline usage
Many routines were tagged with inline_ but GCC does a better
job of deciding this.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 26a0e39ac8ed1f38b31baeb901bc76501466d34e
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun Oct 31 23:47:35 2010 -0400
beceem: fold unregister_netdevice into AdapterFree
The function unregister_netdevice only called unregister_netdev.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 7441698fe9eb0eb473cf1699d9cd8dd06dfeaf77
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 09:53:58 2010 -0400
beceem: remove ARP spoofing
Linux support NOARP flag, so the whole Arp spoofing routines
are not needed.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 6ba8fe77ddd3a25daa8409333295b90c26a43bae
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun Oct 31 23:43:55 2010 -0400
beceem: print better message on bad ioctl
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit e614e28eac1afcdc3d1275f3e1478aa3e5acc500
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 09:52:14 2010 -0400
beceem: remove indirection to Adapter structure
Allocate Adapter structure as part of network device.
Signed-off-by: Stephen Hemminber <shemminger@vyatta.com>
commit 2515ab628f227b0711393993fe3228e167cc988f
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 21:39:54 2010 -0700
beceem: Add proper carrier and link management
Start with carrier off.
Don't track up/down status in driver private flag.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit d7affd0f58c9f68441b4ce631d07fad2e6a448db
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 17:15:06 2010 -0700
beceem: reduce transmit queue len
Reduce transmit queue length to avoid excess buffering
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 9c6e9aa830071a442fb72ab05c15e2b2609636e3
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 17:13:52 2010 -0700
beceem: remove dead code
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit d21d6dde0280f0897ce6de1948bfaa5633867b28
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 17:12:37 2010 -0700
beceem: add ethtool support
This adds basic ethtool support to get driver info and settings
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 71e253b1699fb777be68cb1028a90e21ea6ff8d8
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 09:49:30 2010 -0400
beceem: make transmit thread interruptible
Kernel complains loudly if thread does long uninterruptible sleep.
Also, dont wake up every 10ms even if no data present (wastes power).
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 37b7a97884ba64bf7d403351ac2a9476ab4f1bba
Author: Paul Mundt <lethal@linux-sh.org>
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 <lethal@linux-sh.org>
commit de85f9858969f50467bf39ee992ef871ae2492d3
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 17:02:39 2010 -0700
beceem: name threads with device name
This is the convention used by Intel Wimax
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 082e889b475c46e71be6e779f15ab095f888e03f
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon Nov 1 09:35:21 2010 -0400
beceem: remove OS wrapper library
Use native kernel functions for kmalloc/kfree directly
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit c5113e3c111b03c8eaf3fb0ef39e33dc25171adc
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 21:26:06 2010 -0700
beceem: use kernel print_hex_dump function
No longer need special hex dump routine
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 260cfedc495c388d7c5e3efffeae7ae30a863426
Author: Joe Perches <joe@perches.com>
Date: Sat Oct 30 14:08:27 2010 -0700
firewire: core: Update WARN uses
Add missing newlines.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
commit bf01ca1b35ff26a4c16c22b9ce7554f0d3a45ba7
Author: Jesper Juhl <jj@chaosbits.net>
Date: Sat Oct 30 15:32:32 2010 +0200
VIA Chrome camera: remove duplicate includes
The VIA Chrome integrated camera controller driver includes both 'linux/pci.h'
and 'linux/device.h' twice. This gets rid of the duplicates.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit 71c0993943c5663f67a908dfd21a571674a71793
Author: Jesper Juhl <jj@chaosbits.net>
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 <jj@chaosbits.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
commit 0ad008fcbc39572ab7078975cdf7e902fbc39ce6
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 16:44:07 2010 -0700
beceem: cleanup network device setup
Change how network device is setup:
* set pointer to device object so sysfs has eth0/device symlink
* set network device type
* eliminate all the compatiablity with older kernels.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 92bc60580e55d18494a23ba8ae642a464ebfd7a6
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:22:10 2010 -0700
beceem: get rid of OS dependent data structure
The only part of this structure still used was the network
device stats, and in recent kernel these are available in
network device itself.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 2b5e625882a7130c339e4ad2ac2b8f0422f11919
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:20:11 2010 -0700
beceem: eliminate dead code
Get rid of empty header file and unused declarations
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit d52db0b4b34410019e1546e3ccbe761b9e4ddd76
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:18:27 2010 -0700
beceem: eliminate network registered state variable
Just use presence of pointer
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 3705a843bd98b3ccb7c4b6addfc182fe805a73ed
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:14:16 2010 -0700
beceem: remove bogus network device notifier
Network device should not be messing with refcounts directly.
See Documentation/networking/netdevices.txt
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 2564a148d5326f1d36202e497b3dd0a17422c636
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:11:12 2010 -0700
beceem: cleanup debug level infrastructure
Add module parameter to control debug level and do code cleanup
The whole debug stuff should eventually be removed.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 047a5f2b503d0ba17704c9714b296cbf06ec087e
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:04:18 2010 -0700
beceem: eliminate unused USB stubs
USB layer does not require these reset function stubs
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 5abe61ade9a137b35aa29919334dde7f3a30b248
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 08:02:08 2010 -0700
beceem: remove version ifdef's
Remove code to support older kernel API's
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 07:51:47 2010 -0700
beceem: remove ifdef's
There were a lot of ifdef's for driver options which have no
configuration options. Choose the current value and remove the
ifdef.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit 2e44f765dfd3a8592c2d6b6005be061eccdee137
Author: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri Oct 29 07:44:45 2010 -0700
beceem: add module information
Add description and version information to the driver.
Make USB device table exported as alias so device will be
autoloaded. Get rid of useless noise message on boot.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
commit e0b58be59e4e278480b120ba827b8cfee7c7ddbd
Author: Ian Campbell <ian.campbell@citrix.com>
Date: Thu Sep 30 12:37:26 2010 +0100
xen: implement XENMEM_machphys_mapping
This hypercall allows Xen to specify a non-default location for the
machine to physical mapping. This capability is used when running a 32
bit domain 0 on a 64 bit hypervisor to shrink the hypervisor hole to
exactly the size required.
[ Impact: add Xen hypercall definitions ]
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
commit b0438a1b71955c425c304a2a483765ef24841766
Author: Nicolas Kaiser <nikai@nikai.net>
Date: Fri Oct 29 11:41:42 2010 +0200
telephony: fix return value
If copy_from_user fails, the return value gets overwritten.
Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
commit fec6dd833e733b5d9588a1f1e4d81118b79b5774
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed Oct 27 13:48:36 2010 -0700
ASoC: Store DC offset correction for wm_hubs devices in class W mode
Providing the analogue configuration of the output path remains the same
the DC offset corrected by the DC servo will remain identical so we can
skip the callibration, reducing the startup time for the headphone output.
Implement this for the wm_hubs devices as has been done for several other
CODECs.
Don't do this if we have any analogue paths enabled since offsets may be
being introduced by the analogue paths which could vary outside the
control of the driver.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit cdefba03e44bd3b3311a3849a81ec7030dfa1519
Author: Thomas Renninger <trenn@suse.de>
Date: Mon Oct 25 21:11:16 2010 +0200
PNP: Set up pnp_debug via module and not via boot param.
Cleanup only, no functional change (pnp.debug can be enabled
and disabled at runtime, but that's not a real enhancement).
This one depends on another PNP cleanup patch:
PNP: Compile all pnp built-in stuff in one module namespace
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 803711afdbea5c6a6dd2b46eca76097f6d50fb53
Author: Thomas Renninger <trenn@suse.de>
Date: Mon Oct 25 21:11:15 2010 +0200
PNP: Compile all pnp built-in stuff in one module namespace
This is cleanup mostly, nothing urgent.
I came up with it when looking at dynamic debug which can
enable pr_debug messages at runtime or boot param
for a specific module.
Advantages:
- Any pnp code can make use of the moduleparam.h interface, the modules
will show up as pnp.param.
- Passing pnp.ddebug as kernel boot param will enable all pnp debug messages
with my previous patch and CONFIG_DYNAMIC_DEBUG enabled.
Signed-off-by: Thomas Renninger <trenn@suse.de>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
commit b21590bb041028afc7ba9a1154f29d4e27e110ab
Author: Axel Lin <axel.lin@gmail.com>
Date: Tue Oct 26 07:55:54 2010 +0800
regulator: max8952 - fix max8952_set_voltage
In current implementation, vid is declared as u8,
then "vid == -1" is always false, and "vid >= 0" is always true.
Thus change it to s8.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 05f00c9ca1d583e3f4383864fa00fb522ec34546
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Oct 25 10:11:07 2010 +0800
regulator: max8952 - fix max8952_pmic_probe error path
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 7e6120c57cf92f005f72c6345c0961415099881e
Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date: Mon Oct 25 11:34:23 2010 +0300
ASoC: TWL4030: Use usleep_range when appropriate
Change the busy loop delays with usleep_range or msleep calls.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit eb48c9cb2053e7bb5f7f8f0371cb578a0d439450
Author: Robert Richter <robert.richter@amd.com>
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 <robert.richter@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1288015419-29543-6-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 0a17941e71f089b128514f7b5b486e20072ca7dc
Author: Robert Richter <robert.richter@amd.com>
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 <robert.richter@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1288015419-29543-5-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit bbaff08dca3c34d0fb6b4c4051354184e33e3df8
Author: Robert Richter <robert.richter@amd.com>
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 <robert.richter@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1288015419-29543-4-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 7203a0494084541575bac6dfc4e153f9e28869b8
Author: Robert Richter <robert.richter@amd.com>
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 <robert.richter@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1288015419-29543-3-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 9c37c9d89773ee9da9f6af28ee37d931bd045711
Author: Robert Richter <robert.richter@amd.com>
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 <robert.richter@amd.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
LKML-Reference: <1288015419-29543-2-git-send-email-robert.richter@amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 7fb2b870d6a3b92f6750ac2b72858fd098dc9e3f
Author: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
commit fe7de49f9d4e53f24ec9ef762a503f70b562341c
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
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 <kosaki.motohiro@jp.fujitsu.com>
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: James Morris <jmorris@namei.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 23f9b267159b4c7ff59d2e6c8ed31693eff841e3
Author: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
LKML-Reference: <1287510389-8388-2-git-send-email-dirk.brandewie@gmail.com>
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
commit 5a7ae78fd478624df3059cb6f55056b85d074acc
Author: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
LKML-Reference: <1287510389-8388-1-git-send-email-dirk.brandewie@gmail.com>
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
commit 30c4f2af6134cf9ee3cea439832b22868b4c547d
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
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 <stefanr@s5r6.in-berlin.de>
commit fd35fbcdd1b2579a6e00a1545f7124e4005d0474
Author: H. Peter Anvin <hpa@zytor.com>
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 <torvalds@linux-foundation.org>
LKML-Reference: <AANLkTi=RKyHLNTq6iomZOXkc6Zw1j9iAgsq8388XmzwN@mail.gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
commit 466bd3030973910118ca601da8072be97a1e2209
Author: Yong Zhang <yong.zhang@windriver.com>
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 <yong.zhang0@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 1118e2cd33d47254854e1ba3ba8e32802ff14fdf
Author: Yong Zhang <yong.zhang@windriver.com>
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 <yong.zhang0@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 6f1bc451e6a79470b122a37ee1fc6bbca450f444
Author: Yong Zhang <yong.zhang@windriver.com>
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 <yong.zhang0@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit d906401114861585c990ff0290c002b5d22fc71a
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Date: Thu Oct 21 19:40:03 2010 +0200
ASoC: kirkwood: Add audio support to hp t5325 thin clients
This patch is adding support for hp t5325 thin clients.
There's a alc5623 codec connected to the i2s interface.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 6f4bc952c60b26ecfcb013fb9a7e9474023e046e
Author: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Date: Thu Oct 21 19:40:02 2010 +0200
ASoC: add support for alc562[123] codecs
This patch is adding support for alc562[123] codecs. It's based
on the source code available in HP source code and other places.
Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 20f33a03f0cf87e51165f7084f697acfb68e865b
Author: Namhyung Kim <namhyung@gmail.com>
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 <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit dd6414b50fa2b1cd247a8aa8f8bd42414b7453e1
Author: Phil Carmody <ext-phil.2.carmody@nokia.com>
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 <ext-phil.2.carmody@nokia.com>
Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit 2bf1c05e3c406925e498d06da66b4828f0209ea6
Author: Nikitas Angelinas <nikitasangelinas@googlemail.com>
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 <nikitasangelinas@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit aaabe31c25a439b92cc281b14ca18b85bae7e7a6
Author: Changli Gao <xiaosuo@gmail.com>
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 <xiaosuo@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd
Author: Richard Kennedy <richard@rsk.demon.co.uk>
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 <richard@rsk.demon.co.uk>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit a386b5af8edda1c742ce9f77891e112eefffc005
Author: Kasper Pedersen <kkp2010@kasperkp.dk>
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 <kkp2010@kasperkp.dk>
Acked-by: john stultz <johnstul@us.ibm.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
commit a729250f1f765bdd850255a9ef558014597e951c
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed Oct 13 13:39:46 2010 +0200
firewire: core: use non-reentrant workqueue with rescuer
firewire-core manages the following types of work items:
fw_card.br_work:
- resets the bus on a card and possibly sends a PHY packet before that
- does not sleep for long or not at all
- is scheduled via fw_schedule_bus_reset() by
- firewire-ohci's pci_probe method
- firewire-ohci's set_config_rom method, called by kernelspace
protocol drivers and userspace drivers which add/remove
Configuration ROM descriptors
- userspace drivers which use the bus reset ioctl
- itself if the last reset happened less than 2 seconds ago
fw_card.bm_work:
- performs bus management duties
- usually does not (but may in corner cases) sleep for long
- is scheduled via fw_schedule_bm_work() by
- firewire-ohci's self-ID-complete IRQ handler tasklet
- firewire-core's fw_device.work instances whenever the root node
device was (successfully or unsuccessfully) discovered,
refreshed, or rediscovered
- itself in case of resource allocation failures or in order to
obey the 125ms bus manager arbitration interval
fw_device.work:
- performs node probe, update, shutdown, revival, removal; including
kernel driver probe, update, shutdown and bus reset notification to
userspace drivers
- usually sleeps moderately long, in corner cases very long
- is scheduled by
- firewire-ohci's self-ID-complete IRQ handler tasklet via the
core's fw_node_event
- firewire-ohci's pci_remove method via core's fw_destroy_nodes/
fw_node_event
- itself during retries, e.g. while a node is powering up
iso_resource.work:
- accesses registers at the Isochronous Resource Manager node
- usually does not (but may in corner cases) sleep for long
- is scheduled via schedule_iso_resource() by
- the owning userspace driver at addition and removal of the
resource
- firewire-core's fw_device.work instances after bus reset
- itself in case of resource allocation if necessary to obey the
1000ms reallocation period after bus reset
fw_card.br_work instances should not, and instances of the others must
not, be executed in parallel by multiple CPUs -- but were not protected
against that. Hence allocate a non-reentrant workqueue for them.
fw_device.work may be used in the memory reclaim path in case of SBP-2
device updates. Hence we need a workqueue with rescuer and cannot use
system_nrt_wq.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Reviewed-by: Tejun Heo <tj@kernel.org>
commit e58fddd8bec8dd8726c7ecb0c0305c2cae06783a
Author: Anand Gadiyar <gadiyar@ti.com>
Date: Mon Oct 11 22:05:55 2010 +0530
regulator: fix build when CONFIG_REGULATOR_DUMMY=n
Commit f03f91826 (regulator: Add option for machine drivers
to enable the dummy regulator) in the regulators tree
seems to have introduced the following build break when
CONFIG_REGULATOR_DUMMY is disabled. Fix this.
CC drivers/regulator/dummy.o
drivers/regulator/dummy.c:41: error: redefinition of 'regulator_dummy_init'
drivers/regulator/dummy.h:28: note: previous definition of 'regulator_dummy_init' was here
make[2]: *** [drivers/regulator/dummy.o] Error 1
make[1]: *** [drivers/regulator] Error 2
make: *** [drivers] Error 2
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit aa1ac05c1e6f93554ce54a883a21f1374862288d
Author: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon Sep 27 09:32:49 2010 +0300
ARM: h1940: add UDA1380 to i2c devices list
Register UDA1380 codec during H1940 machine init
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
commit 13a6d73ceb418605301d206d2a897a968ac2dc67
Author: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Mon Sep 27 09:28:00 2010 +0300
h1940: Fix backlight and LCD power functions
Current implementation of LCD and backlight power control functions
is not complete, as result PDA consumes power in suspend.
Fix this issue by managing state of some latch bits, just like
WinMobile does.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
commit f50f1a6386e10fc76b52da455225a1ffd7d8a2b9
Author: Jeffrey Carlyle <jeff.carlyle@motorola.com>
Date: Fri Oct 8 14:49:19 2010 -0500
regulator: avoid deadlock when disabling regulator with supply
I have a regulator A that sets regulator B as its supply. When I call
set_supply to add B as the supply for A, regulator A gets added to the
supply_list for regulator B.
When I call regulator_disable(A), I end up with a call chain like this:
regulator_disable(A)
> mutex_lock(A)
> _regulator_disable(A)
>> _regulator_disable(B)
>>> _notifier_call_chain(B)
>>>> mutex_lock(A)
Which results in dead lock since we are trying to acquire the mutex lock
for regulator A which we already hold.
This patch addresses this issue by moving the call to disable regulator
B outside of the lock aquired inside the initial call to
regulator_disable.
This change also addresses the issue of not acquiring the mutex for
regulator B before calling _regulator_disable(B).
Signed-off-by: Jeffrey Carlyle <jeff.carlyle@motorola.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit f03f918261ac3f5aff4bf95668ee0572663001c1
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue Oct 5 19:18:32 2010 -0700
regulator: Add option for machine drivers to enable the dummy regulator
Allow machine drivers to explicitly enable the use of the dummy regulator,
enabling simpler support for systems with only a few specific supplies
visible to software.
It is strongly recommended that this is not used on systems with
substantial software control over their PMICs, for maximum functionality
constrints should be as fully specified as possible.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 5231e92e133d6db6681a4485b1794a01469ca9ad
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:46:28 2010 -0600
xen: cleancache shim to Xen Transcendent Memory
This patch provides a shim between the kernel-internal cleancache
API (see Documentation/mm/cleancache.txt) and the Xen Transcendent
Memory ABI (see http://oss.oracle.com/projects/tmem).
Xen tmem provides "hypervisor RAM" as an ephemeral page-oriented
pseudo-RAM store for cleancache pages, shared cleancache pages,
and frontswap pages. Tmem provides enterprise-quality concurrency,
full save/restore and live migration support, compression
and deduplication.
A presentation showing up to 8% faster performance and up to 52%
reduction in sectors read on a kernel compile workload, despite
aggressive in-kernel page reclamation ("self-ballooning") can be
found at:
http://oss.oracle.com/projects/tmem/dist/documentation/presentations/TranscendentMemoryXenSummit2010.pdf
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 91bf812da0c4f2efd0883fe02dc057853de731b1
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:20 2010 -0600
ocfs2: add cleancache support
This eighth patch of eight in this cleancache series "opts-in"
cleancache for ocfs2. Clustered filesystems must explicitly enable
cleancache by calling cleancache_init_shared_fs anytime an instance
of the filesystem is mounted. Ocfs2 is currently the only user of
the clustered filesystem interface but nevertheless, the cleancache
hooks in the VFS layer are sufficient for ocfs2 including the matching
cleancache_flush_fs hook which must be called on unmount.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
[v5: jeremy@goop.org: simplify init hook and any future fs init changes]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Nitin Gupta <ngupta@vflare.org>
commit e87f3cfad14b68a32dde7cdc080f0307c250dcb8
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:19 2010 -0600
ext4: add cleancache support
This seventh patch of eight in this cleancache series "opts-in"
cleancache for ext4. Filesystems must explicitly enable cleancache
by calling cleancache_init_fs anytime an instance of the filesystem
is mounted. For ext4, all other cleancache hooks are in
the VFS layer including the matching cleancache_flush_fs
hook which must be called on unmount.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
[v5: jeremy@goop.org: simplify init hook and any future fs init changes]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit fecdec5a1ef8c129432b4c45d64919f4014db226
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:19 2010 -0600
btrfs: add cleancache support
This sixth patch of eight in this cleancache series "opts-in"
cleancache for btrfs. Filesystems must explicitly enable
cleancache by calling cleancache_init_fs anytime an instance
of the filesystem is mounted. Btrfs uses its own readpage
which must be hooked, but all other cleancache hooks are in
the VFS layer including the matching cleancache_flush_fs hook
which must be called on unmount.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
[v5: jeremy@goop.org: simplify init hook and any future fs init changes]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 5b597c4a97813a41c167c6e0cb2b4723bfdafc1f
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:19 2010 -0600
ext3: add cleancache support
This fifth patch of eight in this cleancache series "opts-in"
cleancache for ext3. Filesystems must explicitly enable
cleancache by calling cleancache_init_fs anytime an instance
of the filesystem is mounted. For ext3, all other cleancache
hooks are in the VFS layer including the matching cleancache_flush_fs
hook which must be called on unmount.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
[v5: jeremy@goop.org: simplify init hook and any future fs init changes]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 03e838947c8abe29a9d7abfaf7fd9125a46b70e9
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:18 2010 -0600
mm/fs: add hooks to support cleancache
This fourth patch of eight in this cleancache series provides the
core hooks in VFS for: initializing cleancache per filesystem;
capturing clean pages reclaimed by page cache; attempting to get
pages from cleancache before filesystem read; and ensuring coherency
between pagecache, disk, and cleancache. Note that the placement
of these hooks has been stable since 2.6.18.
All hooks become no-ops if CONFIG_CLEANCACHE is unset, or become
a check of a boolean global if CONFIG_CLEANCACHE is set but no
cleancache "backend" has claimed cleancache_ops.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 83137a5649ec8a0bb769c68024b0532733087482
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:18 2010 -0600
mm: cleancache core ops functions and config
This third patch of eight in this cleancache series provides
the core code for cleancache that interfaces between the hooks in
VFS and individual filesystems and a cleancache backend. It also
includes build and config patches.
Two new files are added: mm/cleancache.c and include/linux/cleancache.h.
Note that CONFIG_CLEANCACHE defaults to on; in systems that do
not provide a cleancache backend, all hooks devolve to a simple
check of a global enable flag, so performance impact should
be negligible but can be reduced to zero impact if config'ed off.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
Credits: Cleancache_ops design derived from Jeremy Fitzhardinge
design for tmem
[v7: dan.magenheimer@oracle.com: cleanup sysfs and remove cleancache prefix]
[v6: JBeulich@novell.com: robustly handle buggy fs encode_fh actor definition]
[v5: jeremy@goop.org: clean up global usage and static var names]
[v5: jeremy@goop.org: simplify init hook and any future fs init changes]
[v5: hch@infradead.org: cleaner non-global interface for ops registration]
[v4: adilger@sun.com: interface must support exportfs FS's]
[v4: hch@infradead.org: interface must support 64-bit FS on 32-bit kernel]
[v3: akpm@linux-foundation.org: use one ops struct to avoid pointer hops]
[v3: akpm@linux-foundation.org: document and ensure PageLocked reqts are met]
[v3: ngupta@vflare.org: fix success/fail codes, change funcs to void]
[v2: viro@ZenIV.linux.org.uk: use sane types]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Nitin Gupta <ngupta@vflare.org>
Acked-by: Minchan Kim <minchan.kim@gmail.com>
Acked-by: Andreas Dilger <adilger@sun.com>
Acked-by: Jan Beulich <JBeulich@novell.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
commit 8b53f238859d3fca74c4c52ee1af8d6b5daafcc5
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:17 2010 -0600
fs: add field to superblock to support cleancache
This second patch of eight in this cleancache series adds a field to
the generic superblock to squirrel away a pool identifier that is
dynamically provided by cleancache-enabled filesystems at mount time
to uniquely identify files and pages belonging to this mounted filesystem.
Details and a FAQ can be found in Documentation/vm/cleancache.txt
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 8ce54aa9fe37fc08b7ab4ca6582cc383051ffa74
Author: Dan Magenheimer <dan.magenheimer@oracle.com>
Date: Fri Oct 8 13:45:17 2010 -0600
mm/fs: cleancache documentation
This patchset introduces cleancache, an optional new feature exposed
by the VFS layer that potentially dramatically increases page cache
effectiveness for many workloads in many environments at a negligible
cost. It does this by providing a "page-accessible memory" (PAM) interface
to "pseudo-RAM", which is memory/storage provided by a "cleancache backend"
that is not otherwise visible to and/or directly addressable by the kernel.
Instead of being discarded, hooks in the reclaim code "put" clean
pages to cleancache. Filesystems that "opt-in" may "get" pages
from cleancache that were previously put, but pages in cleancache are
"ephemeral", meaning they may disappear at any time. And the size
of cleancache is entirely dynamic and unknowable to the kernel.
Filesystems currently supported by this patchset include ext3, ext4,
btrfs, and ocfs2. Other filesystems (especially those built entirely
on VFS) should be easy to add, but should first be thoroughly tested to
ensure coherency.
Details and a FAQ are provided in Documentation/vm/cleancache.txt
This first patch of eight in this cleancache series only adds two
new documentation files.
[v3: akpm@linux-foundation.org: document sysfs API]
[v3: hch@infradead.org: move detailed description to Documentation/vm]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Reviewed-by: Jeremy Fitzhardinge <jeremy@goop.org>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik Van Riel <riel@redhat.com>
Cc: Jan Beulich <JBeulich@novell.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Andreas Dilger <adilger@sun.com>
Cc: Ted Ts'o <tytso@mit.edu>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <joel.becker@oracle.com>
Cc: Nitin Gupta <ngupta@vflare.org>
commit 8e8be45e8e55daa381028aec339829929ddb53a5
Author: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
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 <paulmck@linux.vnet.ibm.com>
commit 0f0a2632138ff38e355286f6b6be4c323a26ca54
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Oct 1 13:56:27 2010 +0800
regulator: max8649 - fix setting extclk_freq
The SYNC bits are BIT6 and BIT7 of MAX8649_SYNC register.
pdata->extclk_freq could be [0|1|2].
(MAX8649_EXTCLK_26MHZ|MAX8649_EXTCLK_13MHZ|MAX8649_EXTCLK_19MHZ)
It requires to left shift 6 bits to properly set extclk_freq.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 863e7e51318108c8802875034b28f325152546a0
Author: Cyril Chemparathy <cyril@ti.com>
Date: Wed Sep 22 12:30:15 2010 -0400
regulator: fix typo in current units
This patch fixes a typo that incorrectly reports mA numbers as uA.
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit f7021c8ddd5358a6bc9e6f65fc84227cb01dfe9c
Author: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun Sep 19 16:55:01 2010 +0400
regulator: fix device_register() error handling
If device_register() fails then call put_device().
See comment to device_register.
Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit aab39cddbabf6e8fa28c9f20f8be63e75ab70912
Author: Axel Lin <axel.lin@gmail.com>
Date: Sat Sep 18 13:13:28 2010 +0800
Regulator: lp3972 cleanup
This patch includes below fixes based on Mark's comment.
- Return actual error if i2c_smbus_read_byte_data() fail
- Add spaces around bitwise AND operator(&) to improve readability
- Add comment to explain why we need to update voltage change control register
for LDO1 and LDO5
- Logging the value for diagnostics if chip reported incorrect voltage value
- Add __devinit annotation for setup_regulators()
- Show system control register1 value if the value is mismatched
- Logging the value for diagnostics if failed to detect device
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit ee7f28be2703da24f4756fb60e7a41c9447a1f6f
Author: Jean Sacren <sakiwit@gmail.com>
Date: Fri Sep 10 23:13:33 2010 -0600
scripts: Enable error messages while hush up unnecessary warnings
As no error was handled, we wouldn't be able to know when an error does
occur. The fix preserves error messages while it doesn't let unnecessary
compiling warnings show up.
Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 01437f8d3d0dd8337bcc0385ebdef5b327232880
Author: Axel Lin <axel.lin@gmail.com>
Date: Thu Sep 16 16:48:49 2010 +0800
Regulator: LP3972 PMIC regulator driver
This patch adds regulator drivers for National Semiconductors LP3972 PMIC.
This LP3972 PMIC controller has 3 DC/DC voltage converters and 5 low drop-out
(LDO) regulators. LP3972 PMIC controller uses I2C interface.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit e39d5ef678045d61812c1401f04fe8edb14d6359
Author: Anatolij Gustschin <agust@denx.de>
Date: Mon Aug 9 07:58:48 2010 +0200
powerpc/5xxx: extend mpc8xxx_gpio driver to support mpc512x gpios
The GPIO controller of MPC512x is slightly different from
8xxx GPIO controllers. The register interface is the same
except the external interrupt control register. The MPC512x
GPIO controller differentiates between four interrupt event
types and therefore provides two interrupt control registers,
GPICR1 and GPICR2. GPIO[0:15] interrupt event types are
configured in GPICR1 register, GPIO[16:31] - in GPICR2 register.
This patch adds MPC512x speciffic set_type() callback and
updates config file and comments. Additionally the gpio chip
registration function is changed to use for_each_matching_node()
preventing multiple registration if a node claimes compatibility
with another gpio controller type.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
commit 99aeeac513836e37a09b0a3f01c8a145f8c2875a
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Sep 6 14:06:07 2010 +0800
regulator: wm8350-regulator - fix the logic of checking REGULATOR_MODE_STANDBY mode
In wm8350_dcdc_set_mode(), we set DCx_SLEEP bit of WM8350_DCDC_SLEEP_OPTIONS
register for REGULATOR_MODE_STANDBY mode.
( DCx_SLEEP bits: 0: Normal DC-DC operation 1: Select LDO mode )
In wm8350_dcdc_get_mode(), current logic to determinate
REGULATOR_MODE_STANDBY mode is just reverse.
( sleep is set should mean REGULATOR_MODE_STANDBY mode. )
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 1d853367b1dda25f6f2ce461eb1a123cb7169d8b
Author: Axel Lin <axel.lin@gmail.com>
Date: Mon Sep 6 16:48:13 2010 +0800
regulator: wm831x-ldo - fix the logic to set REGULATOR_MODE_IDLE and REGULATOR_MODE_STANDBY modes
Problem description in current implementation:
When setting REGULATOR_MODE_IDLE mode, current implementation set
WM831X_LDO1_LP_MODE bit of ctrl_reg (which is wrong, it should clear the bit).
But due to a missing break statement for case REGULATOR_MODE_IDLE, the code
fall through to case REGULATOR_MODE_STANDBY and then clear
WM831X_LDO1_LP_MODE bit. So it still looks OK when checking the status
by wm831x_gp_ldo_get_mode().
When setting REGULATOR_MODE_STANDBY mode, it just does not work.
wm831x_gp_ldo_get_mode() will still return REGULATOR_MODE_IDLE because
the accordingly WM831X_LDO1_LP_MODE bit is clear.
Correct behavior should be:
Clear WM831X_LDO1_LP_MODE bit of ctrl_reg for REGULATOR_MODE_IDLE mode.
Set WM831X_LDO1_LP_MODE bit of ctrl_reg for REGULATOR_MODE_STANDBY mode.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 6fc0c7f26487caa033107c8d548b348e1ccae811
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Sep 1 13:09:41 2010 +0800
regulator: isl6271a-regulator - fix regulator_desc parameter for regulator_register()
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 2f432ce02167ae06c7acdaa3783c1ff1b57e9e1a
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Sep 1 10:29:18 2010 +0800
regulator: ad5398 - fix a memory leak
In current implementation, the address return from regulator_register()
is different from the address for regulator_unregister().
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 8b13fc8da9682945caf885426f7dc101874a82a7
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Aug 27 22:33:38 2010 +0100
regulator: Update e-mail address for Liam Girdwood
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 24368dff986be1d44521c56920830311a181d61b
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri Aug 27 22:33:38 2010 +0100
regulator: Update e-mail address for Liam Girdwood
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit c0ff9feea59ef5060eb29ff40888b63447c5e3fc
Author: Axel Lin <axel.lin@gmail.com>
Date: Fri Aug 27 16:37:34 2010 +0800
regulator: set max8998->dev to &pdev->dev.
max8998->dev is NULL in current implementation, set it to &pdev->dev.
regulator_register() still return success if max8998->dev is NULL,
but rdev->dev.parent will be set to NULL which is incorrect.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 97b7bae2e53c43af7734f7ff124c5b5af5b2292a
Author: Axel Lin <axel.lin@gmail.com>
Date: Sun Aug 22 22:42:42 2010 +0800
regulator: tps6586x-regulator - fix bit_mask parameter for tps6586x_set_bits()
The third parameter of tps6586x_set_bits() is the bit_mask,
thus we should use (1 << ri->go_bit) instead of ri->go_bit.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 49b804585887eebbd6fe0b541e6d04ca716a6e24
Author: Axel Lin <axel.lin@gmail.com>
Date: Sun Aug 22 22:38:15 2010 +0800
regulator: tps6586x-regulator - fix value range checking for val
val is used as array index of ri->voltages.
Thus the valid value range should be 0 .. ri->desc.n_voltages - 1.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 08aa2fcd862ec152b5adbc2b750d31cc367b0ab8
Author: Axel Lin <axel.lin@gmail.com>
Date: Sun Aug 22 15:26:49 2010 +0800
regulator: max8998 - set max8998->num_regulators
Set max8998->num_regulators = pdata->num_regulators,
otherwise it's default value is 0.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit b9bccdd3f274f07c4b22ee674d797c0b9c294f7e
Author: Axel Lin <axel.lin@gmail.com>
Date: Sun Aug 22 15:26:49 2010 +0800
regulator: max8998 - set max8998->num_regulators
Set max8998->num_regulators = pdata->num_regulators,
otherwise it's default value is 0.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit f033f0a8de2d0d776693e72ce2b8226c2fefae24
Author: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Fri Aug 20 14:43:56 2010 +0900
MAX8952 PMIC Driver Initial Release
MAX8952 PMIC is used to provide voltage output between 770mV - 1400mV
with DVS support. In this initial release, users can set voltages for
four DVS modes, RAMP delay values, and SYNC frequency.
Controlling FPWM/SYNC_MODE/Pull-Down/Ramp Modes and reading CHIP_ID
is not supported in this release.
If GPIO of EN is not valid in platform data, the driver assumes that it
is always-on. If GPIO of VID0 or VID1 is invalid, the driver pulls down
VID0 and VID1 to fix DVS mode as 0 and disables DVS support.
We assume that V_OUT is capable to provide every voltage from 770mV to
1.40V in 10mV steps although the data sheet has some ambiguity on it.
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
--
v2:
- Style correction
- Can accept platform_data with invalid GPIOs
- Removed unnecessary features
- Improved error handling
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit e514d7b783eeee0390ea24434845883020b053f9
Author: Axel Lin <axel.lin@gmail.com>
Date: Thu Aug 19 10:29:19 2010 +0800
regulator: max8998 - fix memory allocation size for max8998->rdev
We only use max8998->rdev[0] .. max8998->rdev[pdata->num_regulators-1],
max8998->rdev[pdata->num_regulators] is not used.
Thus fix the memory allocation size.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 264222206688023c34207c990eff42042458a6ca
Author: Axel Lin <axel.lin@gmail.com>
Date: Sat Aug 14 22:32:13 2010 +0800
regulator: tps6507x - remove incorrect comments
This driver is a platform driver, not a i2c driver.
Thus remove incorrect tps6507x_remove comments.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 5c2dca152b66a7c1c222f64a7bab538742073199
Author: Axel Lin <axel.lin@gmail.com>
Date: Wed Aug 18 11:37:21 2010 +0800
regulator: max1586 - improve the logic of choosing selector
A little bit improvement in the logic of choosing selector.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit 5307db46533e384712ff6faa5ff6026c51c458a6
Author: Axel Lin <axel.lin@gmail.com>
Date: Sat Aug 14 21:44:04 2010 +0800
regulator: ab8500 - fix the logic to remove already registered regulators in error path
In current implementation, ab8500_regulator_info[0].regulator is not
unregistered if the error happen at i > 0.
This patch fixes the resource leak and also improves the readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit d19e72dd426bd0eaf1f4728b687c8223899491ce
Author: Axel Lin <axel.lin@gmail.com>
Date: Sat Aug 14 21:31:01 2010 +0800
regulator: ab3100 - fix the logic to remove already registered regulators in error path
In current implementation, ab3100_regulators[0].rdev is not unregistered if
the error happen at i > 0.
This patch fixes the resource leak and also improves the readability.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit a20e3f3bb81cd606b4e5847a980abbf5f606248f
Author: Dan Carpenter <error27@gmail.com>
Date: Sat Aug 14 11:03:16 2010 +0200
regulator/ab8500: move dereference below the check for NULL
I moved the dereference of "ab8500" below the check for NULL.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
commit d47aaa4132a7016e035f2daeb41c722f145d630a
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jul 8 18:40:37 2010 +0200
ALSA: hda - Limit the amp value to write
Check the amp max value at put callbacks and set the upper limit
so that the driver won't write any invalid value over the defined
range.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 8a90758774bf5ed1310fc9e45a8b31c6c7a10f47
Author: Takashi Iwai <tiwai@suse.de>
Date: Thu Jul 8 18:39:00 2010 +0200
ALSA: hda - Add beep mixer support to Conexant codecs
Added the beep mixer controls to Conexant codecs.
They simply control the digital beep generator widget.
For cx5047, I couldn't find any beep generator, so it's not implemented
there.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 9554c87306e1ced2ef1131829ca0f45f92e57b90
Author: Michal Marek <mmarek@suse.cz>
Date: Mon Jul 5 23:36:16 2010 +0200
kbuild: Fix path to scripts/setlocalversion
Commit 0a564b2 broke LOCALVERSION for O=... builds. Ouch.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Michal Marek <mmarek@suse.cz>
commit 1989da53561f67eb84aa87f138c7319ec2451815
Author: Takashi Iwai <tiwai@suse.de>
Date: Mon Jul 5 16:50:13 2010 +0200
ALSA: hda - Restore cleared pin controls on resume
Many codecs now clear the pin controls at suspend via snd_hda_shutup_pins()
for reducing the click noise at power-off. But this leaves some pins
uninitialized, and they'll be never recovered after resume.
This patch adds the proper recovery of cleared pin controls on resume.
Also it adds a check of bus->shutdown so that pins won't be cleared at
module unloading.
Reference: Kernel bug 16339
http://bugzilla.kernel.org/show_bug.cgi?id=16339
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit a4b4433c511cf4361bb0afabba69e16632002d32
Author: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu May 27 14:04:36 2010 +0100
leds: Fix leds-gpio openfirmware compile issue
Fix a compile issue when openfirmware is enabled from commit
2146325df2c2640059a9e064890c30c6e259b458.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
commit bb8367c13488aa12fa43072d51baae2fa19eac54
Author: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu May 27 13:08:33 2010 +0100
leds: Kconfig fixes
Soekris net5501 is x86 only and cleanup some undeeded dependencies
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
commit 944afcb4c53f3b841d63ce337fe37b71cea2f52f
Author: Chris Zankel <chris@zankel.net>
Date: Tue May 25 01:29:35 2010 -0700
xtensa: disable PCI for the iss target
The iss is an emulation target, which doesn't have PCI.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit 17d1061f5d87eff7d50942399414845d1f7a8a08
Author: Gregory Haskins <ghaskins@novell.com>
Date: Thu May 20 11:39:57 2010 -0400
vbus: add explicit slab.h include to bus-proxy
This changed in recent mainline, so we need to include it directly now
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 266c05e565adf322a1dff3e2f5d2f02dd6578f1d
Author: Tejun Heo <tj@kernel.org>
Date: Wed May 19 16:01:25 2010 -0400
vbus: update gfp/slab.h includes
Implicit slab.h inclusion via percpu.h is about to go away. Make sure
gfp.h or slab.h is included as necessary.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
commit 087a94a14b4b7be00d33a1fc5a9d70bc0489edc0
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date: Tue Dec 8 16:12:32 2009 -0500
ioq: clearly specify endianness
The IOQ code uses structures which are designed to be shared between
disparate systems, such as 32-bit and 64-bit, as well as Linux and Windows.
Since IOQ is primarily intended to be used by qemu/kvm, which support
virtual guests with a different CPU architecture than the host, clearly
define the endianness for the shared structures.
The endianness is defined to be little-endian, to avoid byte swapping in
the most common case: x86.
Note that the cookie member was not changed to have a fixed endianness.
This is because it is only intended for use by one side of the IOQ.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
commit 250d6b5f115b08b0ad7ba2d1ea9fd2fb82b0762e
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date: Tue Dec 8 16:12:30 2009 -0500
vbus: fix lots of sparse "dubious signed bitfield" warnings
The sparse utility gave tons of warnings about signed bitfields. A simple
inspection shows that they are all used as booleans, so convert them to the
correct type.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
commit a30987b93ed1764962ede67c72155a4c3b20383b
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date: Tue Dec 8 16:12:29 2009 -0500
vbus-enet: fix sparse warnings
Fix the following sparse warnings:
drivers/net/vbus-enet.c:411:9: warning: Using plain integer as NULL pointer
drivers/net/vbus-enet.c:1250:24: warning: Using plain integer as NULL pointer
drivers/net/vbus-enet.c:1326:24: warning: Using plain integer as NULL pointer
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
commit 7c80bf975ac5798e32aafc0a33996627dcd94996
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date: Tue Dec 8 16:12:28 2009 -0500
vbus: pci-bridge: fix sparse warnings
The sparse tool caught many missing static declarations. Add them.
There are still many address space errors, but I'm unsure about the best
way to fix these.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
commit c8fcbd0691f7b498fdd908dcf7f718598ab392fa
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date: Tue Dec 8 16:12:27 2009 -0500
shm_signal: clearly specify endianness
The shm_signal code uses structures which are designed to be shared between
disparate systems, such as 32-bit and 64-bit, as well as Linux and Windows.
Since shm_signal is primarily intended to be used by qemu/kvm, which
supports virtual guests with a different CPU architecture than the host,
clearly define an endianness for the shared structures.
The endianness is defined to be little-endian, to avoid byte swapping in
the most common case: x86.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
commit 703c68eaeedc1153965f1dc93e21912959e4df51
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:46 2009 -0500
vbus: fix pcibridge busmaster support
We should technically enable the busmaster bit, even though its not
actually used on the host side
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit d86efb46b8cf33cf57702a2629f848c91149fbde
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:45 2009 -0500
vbus: add autoprobe capability to guest
This enables the guest to automatically load the appropriate driver
when vbus devices are detected.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 5a61684fd5ecd09439a76fcc6bc0333e72a368ca
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:45 2009 -0500
venet: add missing ethtool include
It's sloppy to use the facility without officially including its header
file.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit d2a9180fe14b87d470f54422d9be10272a269bc6
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:44 2009 -0500
vbus: make library code properly declared as GPL
This facilitates building the shm-signal and ioq libraries as kernel
modules.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 93a4f24670feacdec6fe8d38af217b95560a2260
Author: Jaswinder Singh Rajput <jaswinder@kernel.org>
Date: Mon Dec 7 11:46:44 2009 -0500
ioq: includecheck fix
fix the following 'make includecheck' warning:
include/linux/ioq.h: linux/shm_signal.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit a071f18ff1e54d9cb8728762017cfbcfc67e3165
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:43 2009 -0500
vbus: remove create_irq() references from the pcibridge
We cannot rely on create_irq() being available in all circumstances,
therefore lets remove it from the code for now until we can figure
out a way to support it with config options.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 492364da69bebfdcdee8ee5a13a72e1367772aac
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:43 2009 -0500
fix irq resource leak
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit ed79a661c9f9bc6902aecde7946047ecbaa95e3b
Author: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Mon Dec 7 11:46:41 2009 -0500
trivial: fix a typo in SHM_SIGNAL config description
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 861d486d295178ff714e4e6a1b49715ece457831
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon Dec 7 11:46:41 2009 -0500
Eliminate all cast warnings in vbus-enet.c and pci-bridge.c.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit ca397e6770d285638fbf258023aa73943825f345
Author: Patrick Mullaney <pmullaney@novell.com>
Date: Mon Dec 7 11:46:40 2009 -0500
vbus-enet: fix l4ro pool non-atomic allocations in softirq context
The current code exhibits odd behavior in the guest when receiving L4RO
packets. This was tracked down to the improper allocation of
GFP_KERNEL memory from softirq context
Signed-off-by: Patrick Mullaney <pmullaney@novell.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 0cc264e0848ce93f3400a118f31745bd8ae21bac
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:40 2009 -0500
vbus: fix kmalloc() from interrupt context to use GFP_ATOMIC
DEVADD events currently perform a GFP_KERNEL allocation for the device
object in interrupt context. This is technically illegal, although we
have gotten away with it to date by sheer luck that the allocation
never tried to swap or otherwise sleep.
Lets fix this properly by making sure that we only allocated the space
for the device object using GFP_KERNEL from process-context. We achieve
this by generating a temporary GFP_ATOMIC relay for the event and
deferring the actual device allocation/registration to process context.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit ebf6e9fcb51eaba6a503be0eeca8346903a681dc
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:39 2009 -0500
venet: fix locking issue with dev_kfree_skb()
We currently hold the priv->lock with interrupts disabled while calling
dev_kfree_skb(). lockdep indicated that this arrangement is problematic
with higher stack components which handle the wmem facility. It is
probably a bad idea to hold the lock/interrupts over the duration of this
function independent of the lock-conflict issue, so lets rectify this.
This new design switches to a finer-grained model, where we acquire/release
the lock for each packet that we reap from the tx queue. This adds
theoretical lock acquistion overhead, but gains the ability to release
the skbs without holding a lock and while improving critical section
granularity.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 5ad6ec1fe158f294472ab40a697e7a469071ec3a
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:38 2009 -0500
net: fix vbus-enet Kconfig dependencies
We currently select VBUS_PROXY when vbus-enet is enabled, which is
the wrong direction. Not all platforms will define VBUS-PROXY, and
venet depends on its inclusion. Therefore, lets fix vbus-enet to
properly depend on the presence of VBUS_PROXY to get this right.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 90499f8fab010cd836edafe8b77a7e20aea10baf
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:38 2009 -0500
vbus: register shm-signal events as standard Linux IRQ vectors
This will allow us to view the vector statistics in a uniform way, as
well as pave the way for supporting irqbalance in the future.
The VBUS PCI-BRIDGE will present itself as an irqchip device to the
kernel proper. Each shm-signal that is created by a specific driver
will show up as a "VBUS-edge" IRQ in /proc/interrupts. For instane,
here is example output from running a venet device as "eth1" (see
vectors 28-31):
vbus-guest:/home/ghaskins # cat /proc/interrupts
CPU0
0: 89 IO-APIC-edge timer
1: 6 IO-APIC-edge i8042
4: 1620 IO-APIC-edge serial
6: 2 IO-APIC-edge floppy
7: 0 IO-APIC-edge parport0
8: 0 IO-APIC-edge rtc0
9: 0 IO-APIC-fasteoi acpi
10: 0 IO-APIC-fasteoi virtio1
12: 90 IO-APIC-edge i8042
14: 3474 IO-APIC-edge ata_piix
15: 7778 IO-APIC-edge ata_piix
24: 185849 PCI-MSI-edge vbus
25: 0 PCI-MSI-edge virtio0-config
26: 210 PCI-MSI-edge virtio0-input
27: 28 PCI-MSI-edge virtio0-output
28: 167062 VBUS-edge eth1-evq
29: 0 VBUS-edge eth1-pageq
30: 161593 VBUS-edge eth1-rx
31: 0 VBUS-edge eth1-tx
NMI: 0 Non-maskable interrupts
LOC: 72010 Local timer interrupts
SPU: 0 Spurious interrupts
CNT: 0 Performance counter interrupts
PND: 0 Performance pending work
RES: 0 Rescheduling interrupts
CAL: 0 Function call interrupts
TLB: 0 TLB shootdowns
TRM: 0 Thermal event interrupts
THR: 0 Threshold APIC interrupts
MCE: 0 Machine check exceptions
MCP: 20 Machine check polls
ERR: 0
MIS: 0
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit d13a210b1f8467f7da72b03614abe76f85e8f4f5
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:37 2009 -0500
vbus: allow shmsignals to be named
This will allow the signals to be displayed to the end-user in some
meaningful way later in the series, such as for statistics, etc.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit db0f60d177b1be342e65206d5f07c2d294fdacf5
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:36 2009 -0500
venet: add Layer-4 Reassembler Offload (L4RO) support
This is the converse to GSO. It lets us receive fully reassembled L4
frames from the host. This allows us to reduce the interrupt rate of
the guest, take advantage of host-based hardware that does reassembly,
and to skip the SAR overhead for localhost (host->guest, guest->guest)
connectivity.
We accomplish this by re-using the SG support from the transmit/GSO side
and supplying a "page-queue" of free pages to use for when we need
frames larger than MTU.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 2fda9b634440289645aa6f44667bb9ac5c6e3e6a
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:36 2009 -0500
venet: add a tx-complete event for out-of-order support
This paves the way for zero-copy support since we cannot predict
the order in which paged-skbs may actually be consumed.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 673b116d70b280f1a29e97ae9b012ae9ed3139c0
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:35 2009 -0500
venet: use an skblist for outstanding descriptors
This will be useful later in the series so that we can switch to
an asynchronous model.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit a9be6cebf76429049dc06bfa625447c183a87773
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:34 2009 -0500
venet: add eventq protocol
This adds an event-channel for passing host->guest messages to the
guest driver. We will use this later in the series for linkstate and
asynchronous transmit-complete events.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit e83a9641f76fe50dccf8321e2e4a4123ecf32bd0
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:34 2009 -0500
venet: cache the ringlen values at init
We want to prevent the condition where changes to the module-params
could affect the run-time validity of the ringstate
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 111509b0557a5eb99a5961c8fc741d75e21d208b
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:34 2009 -0500
venet: report actual used descriptor size
This should reduce wasted effort copying parts of the descriptor
which are not in use, since the descriptors are typically pre-allocated
to their maximum size.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 10727192eea619c06d275e27f6ac7169178d7637
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:33 2009 -0500
venet: add pre-mapped tx descriptor feature
What: Pre-allocate and map our scatter-gather descriptors.
Why: The host cannot directly access guest memory, and therefore any
indirection adds additional overhead. We currently implement
scattergather by pushing a pointer to the sg-descriptor, which points
to the actual SKB. This means the host must take an extra read
just to obtain the pointer to the SKB data.
Therefore we introduce a new shared-memory region that consists of
pre-allocated scattergather descriptors. The host may then decode
a descriptor pointer as an offset to this pre-mapped region and
save time/overhead.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 15bcd2456941d55ec630f34ec9fb10285a43c17a
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:32 2009 -0500
venet: fix gso.hdr_len to report correct length
This seemed to have worked for TSO4/6 frames, but breaks for UFO. In
either case, its just plain wrong, so lets get the header set properly.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit f2a1cf400b519c36d10880b61b7fa29848265686
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:32 2009 -0500
venet: Update maintainer
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 47630e2be1d8fc2fb93667b0990959755c9044be
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:31 2009 -0500
net: add vbus_enet driver
A virtualized 802.x network device based on the VBUS interface. It can be
used with any hypervisor/kernel that supports the virtual-ethernet/vbus
protocol.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
Acked-by: David S. Miller <davem@davemloft.net>
commit 8ef390e24db3fec6f7af3ebb945d7a2322878ca9
Author: Rakib Mullick <rakib.mullick@gmail.com>
Date: Mon Dec 7 11:46:30 2009 -0500
vbus: Fix section mismatch warnings in pci-bridge.c
The functions vbus_pci_open, _ioq_init, eventq_init,
vbus_pci_eventq_register are
annoted with __init and referenced from a function __devinit
vbus_pci_probe, which
causes a section mismatch.So annote those functions with __devinit.
We were warned by the following warnings:
LD drivers/vbus/vbus-pcibridge.o
WARNING: drivers/vbus/vbus-pcibridge.o(.devinit.text+0x19e): Section
mismatch in reference from the function vbus_pci_probe() to the
function .init.text:vbus_pci_open()
The function __devinit vbus_pci_probe() references
a function __init vbus_pci_open().
If vbus_pci_open is only used by vbus_pci_probe then
annotate vbus_pci_open with a matching annotation.
WARNING: drivers/vbus/vbus-pcibridge.o(.devinit.text+0x1f4): Section
mismatch in reference from the function vbus_pci_probe() to the
function .init.text:_ioq_init()
The function __devinit vbus_pci_probe() references
a function __init _ioq_init().
If _ioq_init is only used by vbus_pci_probe then
annotate _ioq_init with a matching annotation.
WARNING: drivers/vbus/vbus-pcibridge.o(.devinit.text+0x240): Section
mismatch in reference from the function vbus_pci_probe() to the
function .init.text:eventq_init()
The function __devinit vbus_pci_probe() references
a function __init eventq_init().
If eventq_init is only used by vbus_pci_probe then
annotate eventq_init with a matching annotation.
WARNING: drivers/vbus/vbus-pcibridge.o(.devinit.text+0x45a): Section
mismatch in reference from the function vbus_pci_probe() to the
function .init.text:vbus_pci_eventq_register()
The function __devinit vbus_pci_probe() references
a function __init vbus_pci_eventq_register().
If vbus_pci_eventq_register is only used by vbus_pci_probe then
annotate vbus_pci_eventq_register with a matching annotation.
Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit e98ca3ff93853be06b0d9391ab2af1fa8680559f
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon Dec 7 11:46:30 2009 -0500
vbus-proxy also uses ioq, so it should select IOQ.
When CONFIG_VBUS_PROXY=[ym] and VBUS_PCIBRIDGE=n:
ERROR: "ioq_init" [drivers/vbus/vbus-proxy.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 7be02d6465bf6cf995ab2affc56f7fa03d738d39
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:29 2009 -0500
ioq: add driver-side vbus helpers
It will be a common pattern to map an IOQ over the VBUS shared-memory
interfaces. Therefore, we provide a helper function to generalize
the allocation and registration of an IOQ to make this use case
simple and easy.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit f4bf6de3477905440e255de19a5d94752066276a
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:29 2009 -0500
vbus-proxy: add a pci-to-vbus bridge
This patch adds a pci-based bridge driver to interface between the a
host VBUS and the guest's vbus-proxy bus model. It completes the guest
side notion of a "vbus-connector", and requires a cooresponding
host-side connector (in this case, the pci-bridge model) to comlete
the connection.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 18dc365707fd63860f02a26b49acb1b19b3f67ed
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:28 2009 -0500
vbus: add a "vbus-proxy" bus model for vbus_driver objects
This will generally be used for hypervisors to publish any host-side
virtual devices up to a guest. The guest will have the opportunity
to consume any devices present on the vbus-proxy as if they were
platform devices, similar to existing buses like PCI.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 04e542f5e055003020b159371e2309dc60d0cbef
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:27 2009 -0500
ioq: Add basic definitions for a shared-memory, lockless queue
IOQ allows asynchronous communication between two end-points via a common
shared-memory region. Memory is synchronized using pure barriers (i.e.
lockless), and updates are communicated via an embedded shm-signal. The
design of the interface allows one code base to universally provide both
sides of a given channel.
We will use this mechanism later in the series to efficiently move data
in and out of a guest kernel from various sources, including both
infrastructure level and application level transports.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit 86613d42e6440339e9653a35d69ee5d6db361069
Author: Gregory Haskins <ghaskins@novell.com>
Date: Mon Dec 7 11:46:26 2009 -0500
shm-signal: shared-memory signals
shm-signal provides a generic shared-memory based bidirectional
signaling mechanism. It is used in conjunction with an existing
signal transport (such as posix-signals, interrupts, pipes, etc) to
increase the efficiency of the transport since the state information
is directly accessible to both sides of the link. The shared-memory
design provides very cheap access to features such as event-masking
and spurious delivery mititgation, and is useful implementing higher
level shared-memory constructs such as rings.
We will use this mechanism as the basis for a shared-memory interface
later in the series.
Signed-off-by: Gregory Haskins <ghaskins@novell.com>
commit ddbb5dd99c40a695d5d75645b5a18bef394acb16
Author: Arnd Bergmann <arnd@arndb.de>
Date: Tue Apr 27 22:30:06 2010 +0200
logfs: kill BKL
logfs does not need the BKL, so use ->unlocked_ioctl instead
of ->ioctl in file operations.
Signed-off-by: Joern Engel <joern@logfs.org>
commit 0c2345ea9b9632168921016aa658112ef722e80a
Author: Marc Gauthier <marc@tensilica.com>
Date: Tue May 4 14:55:44 2010 -0700
xtensa: fix ccount_read() prototype to fix compile warning
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit e392ebec6d8716eae1da34cacfa1b5ecabf9461a
Author: Marc Gauthier <marc@tensilica.com>
Date: Tue May 4 14:51:33 2010 -0700
xtensa: add xtavnet platform (based on Avnet LX60 and LX200 boards)
Add support for the Tensilica-configured Avnet emulation boards.
These include the LX60 (XT-AV60) and LX200 (XT-AV200) boards.
Note that because these are FPGA based, any number of different processor
variants can run on them. The larger LX200 can also support SMP.
Documentation for these boards is available from Tensilica
(e.g. in their free eval downloads) in documents titled,
"Tensilica Avnet LX60 (XT-AV60) Board User's Guide", and
"Tensilica Avnet LX200 (XT-AV200) Board User's Guide".
Derived from the arch/xtensa/platforms/lx60 platform code in
git://git.linux-xtensa.org/git/kernel/xtensa-2.6.29-smp.git,
Signed-off-by: Dan Nicolaescu <dann@xtensa-linux.org>
Signed-off-by: Pete Delaney <piet@tensilica.com>
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit 3c279fa067f1fd7bfad901c438b3b25c87ad0002
Author: Marc Gauthier <marc@tensilica.com>
Date: Fri May 7 01:21:32 2010 -0700
xtensa: fix cross-compilation to accept uclibc and glibc toolchain prefixes
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit b44b10c61a8fd49836071fad278bab53d0f8e510
Author: Marc Gauthier <marc@tensilica.com>
Date: Tue May 4 13:43:29 2010 -0700
xtensa: define NO_IRQ appropriately for the architecture
Interrupt number zero (0) is valid for the Xtensa port,
so define NO_IRQ as (-1). And use it to override the 8250 driver
hack that compares interrupt numbers with 0 instead of NO_IRQ.
Signed-off-by: Piet Delaney <piet@tensilica.com>
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit ee2827624631ad1dc72c8f21607da7c1023e5236
Author: Marc Gauthier <marc@tensilica.com>
Date: Tue May 4 12:59:21 2010 -0700
xtensa: fix linker script preprocessing - use LINKER_SCRIPT macro
Fix custom linker script preprocessing rule to define LINKER_SCRIPT
like the standard macro. And use it in coprocessor.h to avoid both
C and assembler material in the linker script.
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit d763159dff587caff4457b7774621b9a5f7cffd7
Author: Marc Gauthier <marc@tensilica.com>
Date: Tue May 4 11:23:12 2010 -0700
xtensa: fix ioremap_nocache(), and add ioread32()/iowrite32()
ioremap_nocache() was returning a cached instead of uncached address.
Add missing ioread32() and iowrite32() functions, used by ethoc driver.
More to be added, just adding the minimum required for now.
Signed-off-by: Marc Gauthier <marc@tensilica.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
commit 0c0b269f75f9e883142c2917e922f2901a04fdd9
Author: Chris Zankel <chris@zankel.net>
Date: Sun May 2 08:37:20 2010 -0700
xtensa: Fix the network driver for the simulator target
Network methods have moved to the net_device_ops structure.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit 579442ed76b2401be463856a4652b3a1589e438d
Author: Chris Zankel <chris@zankel.net>
Date: Sun May 2 01:05:13 2010 -0700
xtensa: Shuffle include statements to fix linker script
The linker script was including assembly macros from the coprocessor
header file that is not otherwise used by the script.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit ea3f65e81c841fa38b48f57087a6adadab766961
Author: Chris Zankel <chris@zankel.net>
Date: Sun May 2 01:00:22 2010 -0700
xtensa: Add -mforce-no-pic option, if supported
GCC is configured to always compile with PIC enabled for the Xtensa
architecture. This fails when nfsroot is enabled as the code uses a
non-conformant segment that mismatches in permissione with a read-only
segment.
A patch has been submitted to GCC to add the machine-option 'force-no-pic'
that disables PIC.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit 61ebd67557d38b3f9aa4a5adc867e6e7cfa07e91
Author: Chris Zankel <chris@zankel.net>
Date: Sat May 1 23:05:29 2010 -0700
xtensa: Fixes due to bss boundary symbol name changes.
The bss start and end symbols have changed to __bss_start and __bss_stop.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit e63be843632dbe8efb1fb10eed5219b8b50eab1f
Author: Chris Zankel <chris@zankel.net>
Date: Sat May 1 23:00:07 2010 -0700
xtensa: Fix linker script patch-up
The Xtensa architecture requires to patch the generated linker script
to insert precede certain sections with a .literal section. Ammend the
sed script to fix-up only sequences that start with a '*':
'*(.init.text)' -> '*(.init.literal .init.text)'
Signed-off-by: Chris Zankel <chris@zankel.net>
commit e31e48c0474a1429f3fbcee7bd0c951d9616c53a
Author: Chris Zankel <chris@zankel.net>
Date: Sat May 1 22:55:21 2010 -0700
xtensa: Fix FLUSH_DCACHE macro for some variants.
Define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE also for processor configurations
that don't have cache-aliasing.
Signed-off-by: Chris Zankel <chris@zankel.net>
commit d5dd90f242931ad47321ff1032659cc4024da37e
Author: Jody@Tritech <Jody@Tritech>
Date: Sat Feb 6 10:46:26 2010 -0500
ALSA: hda-intel: Avoid divide by zero crash
On my AMD780V chipset, hda_intel.c can crash the kernel with a divide by
zero
for as-yet unknown reasons. A simple check for zero prevents it, though
the problem that causes it remains. Since the workaround is harmless and
won't affect anyone except victims of this bug, it should be safe;
moreover,
because this crash can be triggered by a user-mode application, there are
denial of service implications on the systems affected by the bug without
the patch.
Signed-off-by: Jody Bruchon <jody@nctritech.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 7f32e2e05c240201b42b58dec1b4a072e2127792
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu Jan 7 12:58:56 2010 -0700
agp/hp: fail gracefully if we don't find an IOC
Bail out if we don't find an enclosing IOC. Previously, if we didn't
find one, we tried to set things up using garbage for the SBA/IOC register
address, which causes a crash.
This crash only happens if firmware supplies a defective ACPI namespace, so
it doesn't fix any problems in the field.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 5a7ac14ea395f596383f08bc6e0de102e9a8e6a5
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Thu Jan 7 12:58:51 2010 -0700
agp/hp: fixup hp agp after ACPI changes
Commit 15b8dd53f5ffa changed the string in info->hardware_id from a static
array to a pointer and added a length field. But instead of changing
"sizeof(array)" to "length", we changed it to "sizeof(length)" (== 4),
which corrupts the string we're trying to null-terminate.
We no longer even need to null-terminate the string, but we *do* need to
check whether we found a HID. If there's no HID, we used to have an empty
array, but now we have a null pointer.
The combination of these defects causes this oops:
Unable to handle kernel NULL pointer dereference (address 0000000000000003)
modprobe[895]: Oops 8804682956800 [1]
ip is at zx1_gart_probe+0xd0/0xcc0 [hp_agp]
http://marc.info/?l=linux-ia64&m=126264484923647&w=2
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Reported-by: Émeric Maschino <emeric.maschino@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 61bc99ad5265dc6c4ad12541246dd73610bd2a34
Author: Kevin Winchester <kjwinchester@gmail.com>
Date: Tue Nov 17 14:38:45 2009 -0800
agp: correct missing cleanup on error in agp_add_bridge
While investigating a kmemleak detected leak, I encountered the
agp_add_bridge function. It appears to be responsible for freeing
the agp_bridge_data in the case of a failure, but it is only doing
so for some errors.
Fix it to always free the bridge data if a failure condition is
encountered.
Signed-off-by: Kevin Winchester <kjwinchester@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6e6e9876a032578c1df688755425a9b3ac63528e
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Fri Nov 27 11:24:13 2009 +0100
media/radio: New driver for the radio FM module on Miro PCM20 sound card
This is recreated driver for the FM module found on Miro
PCM20 sound cards. This driver was removed around the 2.6.2x
kernels because it relied on the removed OSS module. Now, it
uses a current ALSA module (snd-miro) and is adapted to v4l2
layer.
It provides only basic functionality: frequency changing and
FM module muting.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 9d4bd671dd9a9b33942f9761e4e0302af46e6d73
Author: Clemens Ladisch <clemens@ladisch.de>
Date: Thu Oct 22 09:06:19 2009 +0200
sound: usb-audio: allow switching altsetting on Roland USB MIDI devices
Add a mixer control to select between the two altsettings on Roland USB
MIDI devices where the input endpoint is either bulk or interrupt.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 3996b482af72ce2c315a6dba3f8a7c2194ea6653
Author: Robert Hancock <hancockrwd@gmail.com>
Date: Wed Oct 7 20:19:21 2009 -0600
ALSA: ice1724: increase SPDIF and independent stereo buffer sizes
Increase the default and maximum PCM buffer prellocation size for ice1724's
SPDIF and independent stereo pair outputs to 256K, which is the hardware's
maximum supported size. This allows a reduction in interrupt rate and
potentially power usage when an application is not latency-critical.
Signed-off-by: Robert Hancock <hancockrwd@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit eb0cdd212e398463646fcf48e32bec2654a193d4
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Wed Oct 7 22:51:34 2009 +0200
ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off()
Fix following circular locking in the opl3 driver.
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-rc3 #87
-------------------------------------------------------
swapper/0 is trying to acquire lock:
(&opl3->voice_lock){..-...}, at: [<cca748fe>] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
but task is already holding lock:
(&opl3->sys_timer_lock){..-...}, at: [<cca75169>] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&opl3->sys_timer_lock){..-...}:
[<c02461d5>] validate_chain+0xa25/0x1040
[<c0246aca>] __lock_acquire+0x2da/0xab0
[<c024731a>] lock_acquire+0x7a/0xa0
[<c044c300>] _spin_lock_irqsave+0x40/0x60
[<cca75046>] snd_opl3_note_on+0x686/0x790 [snd_opl3_synth]
[<cca68912>] snd_midi_process_event+0x322/0x590 [snd_seq_midi_emul]
[<cca74245>] snd_opl3_synth_event_input+0x15/0x20 [snd_opl3_synth]
[<cca4dcc0>] snd_seq_deliver_single_event+0x100/0x200 [snd_seq]
[<cca4de07>] snd_seq_deliver_event+0x47/0x1f0 [snd_seq]
[<cca4e50b>] snd_seq_dispatch_event+0x3b/0x140 [snd_seq]
[<cca5008c>] snd_seq_check_queue+0x10c/0x120 [snd_seq]
[<cca5037b>] snd_seq_enqueue_event+0x6b/0xe0 [snd_seq]
[<cca4e0fd>] snd_seq_client_enqueue_event+0xdd/0x100 [snd_seq]
[<cca4eb7a>] snd_seq_write+0xea/0x190 [snd_seq]
[<c02827b6>] vfs_write+0x96/0x160
[<c0282c9d>] sys_write+0x3d/0x70
[<c0202c45>] syscall_call+0x7/0xb
-> #0 (&opl3->voice_lock){..-...}:
[<c02467e6>] validate_chain+0x1036/0x1040
[<c0246aca>] __lock_acquire+0x2da/0xab0
[<c024731a>] lock_acquire+0x7a/0xa0
[<c044c300>] _spin_lock_irqsave+0x40/0x60
[<cca748fe>] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
[<cca751f0>] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth]
[<c022ac46>] run_timer_softirq+0x166/0x1e0
[<c02269e8>] __do_softirq+0x78/0x110
[<c0226ac6>] do_softirq+0x46/0x50
[<c0226e26>] irq_exit+0x36/0x40
[<c0204bd2>] do_IRQ+0x42/0xb0
[<c020328e>] common_interrupt+0x2e/0x40
[<c021092f>] apm_cpu_idle+0x10f/0x290
[<c0201b11>] cpu_idle+0x21/0x40
[<c04443cd>] rest_init+0x4d/0x60
[<c055c835>] start_kernel+0x235/0x280
[<c055c066>] i386_start_kernel+0x66/0x70
other info that might help us debug this:
2 locks held by swapper/0:
#0: (&opl3->tlist){+.-...}, at: [<c022abd0>] run_timer_softirq+0xf0/0x1e0
#1: (&opl3->sys_timer_lock){..-...}, at: [<cca75169>] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth]
stack backtrace:
Pid: 0, comm: swapper Not tainted 2.6.32-rc3 #87
Call Trace:
[<c0245188>] print_circular_bug+0xc8/0xd0
[<c02467e6>] validate_chain+0x1036/0x1040
[<c0247f14>] ? check_usage_forwards+0x54/0xd0
[<c0246aca>] __lock_acquire+0x2da/0xab0
[<c024731a>] lock_acquire+0x7a/0xa0
[<cca748fe>] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
[<c044c300>] _spin_lock_irqsave+0x40/0x60
[<cca748fe>] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
[<cca748fe>] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth]
[<c044c307>] ? _spin_lock_irqsave+0x47/0x60
[<cca751f0>] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth]
[<c022ac46>] run_timer_softirq+0x166/0x1e0
[<c022abd0>] ? run_timer_softirq+0xf0/0x1e0
[<cca75150>] ? snd_opl3_timer_func+0x0/0xc0 [snd_opl3_synth]
[<c02269e8>] __do_softirq+0x78/0x110
[<c044c0fd>] ? _spin_unlock+0x1d/0x20
[<c025915f>] ? handle_level_irq+0xaf/0xe0
[<c0226ac6>] do_softirq+0x46/0x50
[<c0226e26>] irq_exit+0x36/0x40
[<c0204bd2>] do_IRQ+0x42/0xb0
[<c024463c>] ? trace_hardirqs_on_caller+0x12c/0x180
[<c020328e>] common_interrupt+0x2e/0x40
[<c0208d88>] ? default_idle+0x38/0x50
[<c021092f>] apm_cpu_idle+0x10f/0x290
[<c0201b11>] cpu_idle+0x21/0x40
[<c04443cd>] rest_init+0x4d/0x60
[<c055c835>] start_kernel+0x235/0x280
[<c055c210>] ? unknown_bootoption+0x0/0x210
[<c055c066>] i386_start_kernel+0x66/0x70
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit b4e0ab5ae4735e94761c0e9fc1489b5c3a215489
Author: pavel <pavel@insite.cz>
Date: Tue Oct 6 16:04:11 2009 +0200
ALSA: ICE1712/24 - Change the Multi Track Peak control (level meters) from MIXER to PCM type
* PLEASE NOTE - this change requires the corresponding update of
envy24control for ice1712 - kind of an ABI change.
* The "Multi Track Peak" control is read-only level meters indicator.
* The control is VERY confusing to most users since it is currently displayed
in regular mixers. E.g. alsamixer ignores its read-only status
and allows changing the levels with keys which makes no sense.
Signed-off-by: Pavel Hofman <pavel.hofman@ivitera.com>
Acked-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
commit 36b21230589ee51763afcc9ba2d126973f3ae96c
Author: Jaswinder Singh Rajput <jaswinder@infradead.org>
Date: Sat Dec 27 15:21:36 2008 +0530
x86: eliminate atleast 10684 sparse warnings
Impact: cleanup, avoid 10000+ sparse warnings
Eliminate 1434 sparse warnings like:
include/linux/list.h:106:16: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1434 sparse warnings like:
include/linux/list.h:107:16: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1434 sparse warnings like:
include/linux/list.h:579:12: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1434 sparse warnings like:
include/linux/list.h:580:13: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1237 sparse warnings like:
include/linux/rculist.h:97:16: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1237 sparse warnings like:
include/linux/rculist.h:143:14: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1237 sparse warnings like:
include/linux/rculist.h:260:13: warning: constant 0xdead000000000000 is so big it is unsigned long
Eliminate 1237 sparse warnings like:
include/linux/rculist.h:280:15: warning: constant 0xdead000000000000 is so big it is unsigned long
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d31ec1c47b10e268794e7b739b2009ac6a19eb8b
Author: Ingo Molnar <mingo@elte.hu>
Date: Tue Jul 22 09:40:43 2008 +0200
poison-pointers: clean up, add comments
- remove stray 'L' (noticed by Andrew Morton)
- add more comments about the purpose of this change
- fix spelling (noticed by Andrew Morton)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit d23db9bbd91baaa1b22e7839e1e932bc6ae0582b
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Jul 14 18:03:27 2008 +0200
x86: change LIST_POISON to 0xdead000000000000
Linus observed:
| > + default 0xffffc10000000000 if X86_64
|
| This looks like a singularly bad pointer value on x86-64.
|
| Why not pick something that is *guaranteed* to fault? The above looks like
| any future setup that supports 41 bits of addressing and has extended the
| page tables (yes, it will happen eventually) will find that to be a
| perfectly valid address?
|
| It's also visually confusing, since it's visually very close to a real
| kernel pointer too.
Correct - so change the poison value to 0xdead000000000000.
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
commit 948f984df52511bb0efa5c026813b0c34de43aa0
Author: Avi Kivity <avi@qumranet.com>
Date: Tue May 20 14:39:25 2008 +0300
core, x86: make LIST_POISON less deadly
The list macros use LIST_POISON1 and LIST_POISON2 as undereferencable
pointers in order to trap erronous use of freed list_heads. Unfortunately
userspace can arrange for those pointers to actually be dereferencable,
potentially turning an oops to an expolit.
To avoid this allow architectures (currently x86_64 only) to override
the default values for these pointers with truly-undereferencable values.
This is easy on x86_64 as the virtual address space is large and contains
permanently unmapped ranges.
Other 64-bit architectures will likely find similar unmapped ranges.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
